widelands

Merge lp:~mquinson/widelands/cleanup-MilitarySiteDesc into lp:widelands

  1. cleanup-MilitarySiteDesc
  2. Merge into trunk
Proposed by Martin Quinson
Status: Merged
Merged at revision: 6863
Proposed branch: lp:~mquinson/widelands/cleanup-MilitarySiteDesc
Merge into: lp:widelands
Diff against target: 67 lines (+4/-14)
2 files modified
src/logic/militarysite.cc (+4/-9)
src/logic/militarysite.h (+0/-5)
To merge this branch: bzr merge lp:~mquinson/widelands/cleanup-MilitarySiteDesc
Reviewer Review Type Date Requested Status
SirVer Approve
Review via email: mp+210080@code.launchpad.net

Description of the change

This is a small cleanup reducing the amount of dupplicated data in memory.

This is my first patch on launchpad, so please be patient ;)

(I'm emptty on IRC)

To post a comment you must log in.
Revision history for this message
GunChleoc (gunchleoc) wrote :

Thanks for cleaning up after me :)

Revision history for this message
SirVer (sirver) wrote :

Good catch! Thanks for this. Merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/logic/militarysite.cc'
2--- src/logic/militarysite.cc 2014-03-05 18:46:29 +0000
3+++ src/logic/militarysite.cc 2014-03-09 09:43:03 +0000
4@@ -93,11 +93,6 @@
5 m_capacity (ms_descr.get_max_number_of_soldiers()),
6 m_nexthealtime(0),
7 m_soldier_preference(ms_descr.m_prefers_heroes_at_start ? kPrefersHeroes : kPrefersRookies),
8-m_occupied_str(ms_descr.m_occupied_str),
9-m_aggressor_str(ms_descr.m_aggressor_str),
10-m_attack_str(ms_descr.m_attack_str),
11-m_defeated_enemy_str(ms_descr.m_defeated_enemy_str),
12-m_defeated_you_str(ms_descr.m_defeated_you_str),
13 m_soldier_upgrade_try(false),
14 m_doing_upgrade_request(false)
15 {
16@@ -250,7 +245,7 @@
17 (*game,
18 "site_occupied",
19 descname(),
20- m_occupied_str,
21+ descr().m_occupied_str,
22 true);
23 }
24 }
25@@ -846,7 +841,7 @@
26 (game,
27 "site_lost",
28 _("Militarysite lost!"),
29- m_defeated_enemy_str,
30+ descr().m_defeated_enemy_str,
31 false);
32 }
33
34@@ -900,7 +895,7 @@
35 (game,
36 "site_defeated",
37 _("Enemy at site defeated!"),
38- newsite->m_defeated_you_str,
39+ newsite->descr().m_defeated_you_str,
40 true);
41
42 return false;
43@@ -946,7 +941,7 @@
44 (game,
45 "under_attack",
46 _("You are under attack"),
47- discovered ? m_aggressor_str : m_attack_str,
48+ discovered ? descr().m_aggressor_str : descr().m_attack_str,
49 false,
50 60 * 1000, 5);
51 }
52
53=== modified file 'src/logic/militarysite.h'
54--- src/logic/militarysite.h 2014-03-03 20:50:30 +0000
55+++ src/logic/militarysite.h 2014-03-09 09:43:03 +0000
56@@ -170,11 +170,6 @@
57 };
58 std::vector<SoldierJob> m_soldierjobs;
59 SoldierPreference m_soldier_preference;
60- std::string m_occupied_str;
61- std::string m_aggressor_str;
62- std::string m_attack_str;
63- std::string m_defeated_enemy_str;
64- std::string m_defeated_you_str;
65 int32_t m_next_swap_soldiers_time;
66 bool m_soldier_upgrade_try; // optimization -- if everybody is zero-level, do not downgrade
67 bool m_doing_upgrade_request;

Subscribers

People subscribed via source and target branches

to status/vote changes: