← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/heroproto.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/heroproto.cpp
28
28
#define debug(x)
29
29
 
30
30
HeroProto::HeroProto(const HeroProto& a)
31
 
    :ArmyProto(a), d_gender(a.d_gender), d_owner_id(a.d_owner_id)
 
31
    :ArmyProto(a), OwnerId(a), d_gender(a.d_gender)
32
32
{
33
33
}
34
34
 
35
35
HeroProto::HeroProto(const ArmyProto& a)
36
 
    :ArmyProto(a), d_owner_id(8)
 
36
    :ArmyProto(a), OwnerId()
37
37
{
38
38
  d_gender = a.getGender();
39
39
}
40
40
 
41
41
HeroProto::HeroProto()
42
 
  :ArmyProto(), d_gender(Hero::FEMALE), d_owner_id(0)
 
42
  :ArmyProto(), OwnerId(), d_gender(Hero::FEMALE)
43
43
{
44
44
}
45
45
 
48
48
}
49
49
 
50
50
HeroProto::HeroProto(XML_Helper* helper)
51
 
  :ArmyProto(helper)
 
51
  :ArmyProto(helper), OwnerId(helper)
52
52
{
53
53
  std::string gender_str;
54
54
  if (!helper->getData(gender_str, "gender"))
55
55
    d_gender = Hero::NONE;
56
56
  else
57
57
    d_gender = Hero::genderFromString(gender_str);
58
 
  helper->getData(d_owner_id, "owner");
59
58
  helper->getData(d_type_id, "type");
60
59
  helper->getData(d_armyset, "armyset");
61
60
}
69
68
  retval &= ArmyProto::saveData(helper);
70
69
  std::string gender_str = Hero::genderToString(Hero::Gender(d_gender));
71
70
  retval &= helper->saveData("gender", gender_str);
72
 
  retval &= helper->saveData("owner", d_owner_id);
 
71
  retval &= OwnerId::save(helper);
73
72
  retval &= helper->saveData("armyset", d_armyset);
74
73
  retval &= helper->saveData("type", d_type_id);
75
74