← Back to branch summary

~ubuntu-branches/ubuntu/maverick/lordsawar/maverick

« back to all changes in this revision

Viewing changes to src/QCityOccupy.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Barry deFreese
  • Date: 2010-04-10 09:29:33 UTC
  • mfrom: (1.1.9 upstream) (5.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20100410092933-23uq4dxig30kmtcw
Tags: 0.1.8-1
* New upstream release.
* Add misc:Depends for -data package.
* Bump Standards Version to 3.8.4. (No changes needed).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/QCityOccupy.cpp
146
146
void QuestCityOccupy::cityAction(City *c, CityDefeatedAction action, 
147
147
                                 bool heroIsCulprit, int gold)
148
148
{
149
 
  if (!isActive())
 
149
  if (isPendingDeletion())
150
150
    return;
 
151
  Hero *h = getHero();
 
152
  if (!h || h->getHP() <= 0)
 
153
    {
 
154
      deactivate();
 
155
      return;
 
156
    }
151
157
  if (!c)
152
158
    return;
153
159
  if (c->getId() != d_city)