← Back to branch summary

~ubuntu-branches/ubuntu/trusty/lordsawar/trusty

« back to all changes in this revision

Viewing changes to src/heroproto.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Barry deFreese, Barry deFreese
  • Date: 2009-10-21 08:02:12 UTC
  • mfrom: (1.1.8 upstream) (5.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20091021080212-wpmd6xdaxrgnn63y
Tags: 0.1.6-1
[ Barry deFreese ]
* New upstream release.
  + Drop libsdl-image1.2 from build-deps, no longer needed.
* Add README.source for quilt patch system.
* Clean up debian/copyright some.
* Bump Standards Version to 3.8.3. (No changes needed).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/heroproto.cpp
2
2
//
3
3
//  This program is free software; you can redistribute it and/or modify
4
4
//  it under the terms of the GNU General Public License as published by
5
 
//  the Free Software Foundation; either version 2 of the License, or
 
5
//  the Free Software Foundation; either version 3 of the License, or
6
6
//  (at your option) any later version.
7
7
//
8
8
//  This program is distributed in the hope that it will be useful,
28
28
#define debug(x)
29
29
 
30
30
HeroProto::HeroProto(const HeroProto& a)
31
 
    :ArmyProto(a), d_gender(a.d_gender)
 
31
    :ArmyProto(a), d_gender(a.d_gender), d_owner_id(a.d_owner_id)
32
32
{
33
33
}
34
34
 
35
35
HeroProto::HeroProto(const ArmyProto& a)
36
 
    :ArmyProto(a), d_gender(Hero::NONE)
 
36
    :ArmyProto(a), d_owner_id(8)
37
37
{
 
38
  d_gender = a.getGender();
38
39
}
39
40
 
40
41
HeroProto::HeroProto()
41
 
  :ArmyProto(), d_gender(Hero::NONE)
 
42
  :ArmyProto(), d_gender(Hero::FEMALE), d_owner_id(0)
42
43
{
43
44
}
44
45
 
54
55
    d_gender = Hero::NONE;
55
56
  else
56
57
    d_gender = Hero::genderFromString(gender_str);
 
58
  helper->getData(d_owner_id, "owner");
57
59
  helper->getData(d_type_id, "type");
58
60
  helper->getData(d_armyset, "armyset");
59
61
}
67
69
  retval &= ArmyProto::saveData(helper);
68
70
  std::string gender_str = Hero::genderToString(Hero::Gender(d_gender));
69
71
  retval &= helper->saveData("gender", gender_str);
 
72
  retval &= helper->saveData("owner", d_owner_id);
70
73
  retval &= helper->saveData("armyset", d_armyset);
71
74
  retval &= helper->saveData("type", d_type_id);
72
75