← Back to branch summary

~ubuntu-branches/ubuntu/natty/lordsawar/natty

« back to all changes in this revision

Viewing changes to src/armybase.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/armybase.cpp
54
54
  std::string army_bonus_str;
55
55
  helper->getData(army_bonus_str, "army_bonus");
56
56
  d_army_bonus = bonusFlagsFromString(army_bonus_str);
57
 
 
58
57
  helper->getData(d_max_moves, "max_moves");
59
58
  helper->getData(d_strength, "strength");
60
59
  helper->getData(d_sight, "sight");
279
278
    return ArmyBase::SUBALLNONHEROBONUS;
280
279
  else if (str == "ArmyBase::SUBALLHEROBONUS")
281
280
    return ArmyBase::SUBALLHEROBONUS;
 
281
  else if (str == "ArmyBase::FORTIFY")
 
282
    return ArmyBase::FORTIFY;
282
283
  return ArmyBase::ADD1STRINOPEN;
283
284
}