widelands

Merge lp:~widelands-dev/widelands/mapobject_cleanup_misc into lp:widelands

  1. mapobject_cleanup_misc
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 7092
Proposed branch: lp:~widelands-dev/widelands/mapobject_cleanup_misc
Merge into: lp:widelands
Diff against target: 174 lines (+13/-21)
11 files modified
src/economy/fleet.cc (+1/-1)
src/economy/portdock.cc (+2/-2)
src/logic/bob.cc (+4/-4)
src/logic/bob.h (+0/-2)
src/logic/immovable.cc (+1/-1)
src/logic/immovable.h (+0/-4)
src/logic/ship.cc (+1/-1)
src/logic/ship.h (+0/-2)
src/logic/soldier.cc (+1/-1)
src/logic/worker.cc (+2/-2)
src/wui/shipwindow.cc (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/mapobject_cleanup_misc
Reviewer Review Type Date Requested Status
SirVer Approve
Review via email: mp+226756@code.launchpad.net

Description of the change

MapObject cleanup for misc objects

To post a comment you must log in.
Revision history for this message
SirVer (sirver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/economy/fleet.cc'
2--- src/economy/fleet.cc 2014-07-05 12:17:03 +0000
3+++ src/economy/fleet.cc 2014-07-14 22:50:41 +0000
4@@ -661,7 +661,7 @@
5 // Check if ship has currently a different destination
6 if (dst && dst != &pd)
7 continue;
8- if (ship.get_nritems() >= ship.get_capacity())
9+ if (ship.get_nritems() >= ship.descr().get_capacity())
10 continue;
11
12 molog("... ship %u takes care of it\n", ship.serial());
13
14=== modified file 'src/economy/portdock.cc'
15--- src/economy/portdock.cc 2014-07-05 12:17:03 +0000
16+++ src/economy/portdock.cc 2014-07-14 22:50:41 +0000
17@@ -349,8 +349,8 @@
18 }
19 }
20
21- if (ship.get_nritems() < ship.get_capacity() && !m_waiting.empty()) {
22- uint32_t nrload = std::min<uint32_t>(m_waiting.size(), ship.get_capacity() - ship.get_nritems());
23+ if (ship.get_nritems() < ship.descr().get_capacity() && !m_waiting.empty()) {
24+ uint32_t nrload = std::min<uint32_t>(m_waiting.size(), ship.descr().get_capacity() - ship.get_nritems());
25
26 while (nrload--) {
27 // Check if the item has still a valid destination
28
29=== modified file 'src/logic/bob.cc'
30--- src/logic/bob.cc 2014-07-03 19:26:30 +0000
31+++ src/logic/bob.cc 2014-07-14 22:50:41 +0000
32@@ -936,12 +936,12 @@
33 void Bob::set_owner(Player * const player)
34 {
35 if (m_owner && m_position.field)
36- m_owner->unsee_area(Area<FCoords>(get_position(), vision_range()));
37+ m_owner->unsee_area(Area<FCoords>(get_position(), descr().vision_range()));
38
39 m_owner = player;
40
41 if (m_owner != nullptr && m_position.field)
42- m_owner->see_area(Area<FCoords>(get_position(), vision_range()));
43+ m_owner->see_area(Area<FCoords>(get_position(), descr().vision_range()));
44 }
45
46
47@@ -970,10 +970,10 @@
48 *m_linkpprev = this;
49
50 if (m_owner != nullptr) {
51- m_owner->see_area(Area<FCoords>(get_position(), vision_range()));
52+ m_owner->see_area(Area<FCoords>(get_position(), descr().vision_range()));
53
54 if (oldposition.field)
55- m_owner->unsee_area(Area<FCoords>(oldposition, vision_range()));
56+ m_owner->unsee_area(Area<FCoords>(oldposition, descr().vision_range()));
57 }
58
59 // Since pretty much everything in Widelands eventually results in the
60
61=== modified file 'src/logic/bob.h'
62--- src/logic/bob.h 2014-07-05 16:41:51 +0000
63+++ src/logic/bob.h 2014-07-14 22:50:41 +0000
64@@ -244,8 +244,6 @@
65 const FCoords & get_position() const {return m_position;}
66 Bob * get_next_bob() const {return m_linknext;}
67
68- uint32_t vision_range() const {return descr().vision_range();}
69-
70 /// Check whether this bob should be able to move onto the given node.
71 ///
72 /// \param commit indicates whether this function is called from the
73
74=== modified file 'src/logic/immovable.cc'
75--- src/logic/immovable.cc 2014-07-08 05:04:53 +0000
76+++ src/logic/immovable.cc 2014-07-14 22:50:41 +0000
77@@ -729,7 +729,7 @@
78 fw.Unsigned8(header_Immovable);
79 fw.Unsigned8(IMMOVABLE_SAVEGAME_VERSION);
80
81- if (const Tribe_Descr * const tribe = get_owner_tribe())
82+ if (const Tribe_Descr * const tribe = descr().get_owner_tribe())
83 fw.String(tribe->name());
84 else
85 fw.CString("world");
86
87=== modified file 'src/logic/immovable.h'
88--- src/logic/immovable.h 2014-07-06 08:17:24 +0000
89+++ src/logic/immovable.h 2014-07-14 22:50:41 +0000
90@@ -183,10 +183,6 @@
91 bool construct_ware(Game & game, Ware_Index index);
92 bool construct_remaining_buildcost(Game & game, Buildcost * buildcost);
93
94- Tribe_Descr const * get_owner_tribe() const {
95- return descr().get_owner_tribe();
96- }
97-
98 bool is_reserved_by_worker() const;
99 void set_reserved_by_worker(bool reserve);
100
101
102=== modified file 'src/logic/ship.cc'
103--- src/logic/ship.cc 2014-07-14 07:31:18 +0000
104+++ src/logic/ship.cc 2014-07-14 22:50:41 +0000
105@@ -352,7 +352,7 @@
106 if (m_ship_state == EXP_SCOUTING) {
107 // Check surrounding fields for port buildspaces
108 std::unique_ptr<std::list<Coords> > temp_port_buildspaces(new std::list<Coords>());
109- MapRegion<Area<Coords> > mr(map, Area<Coords>(position, vision_range()));
110+ MapRegion<Area<Coords> > mr(map, Area<Coords>(position, descr().vision_range()));
111 bool new_port_space = false;
112 do {
113 if (map.is_port_space(mr.location())) {
114
115=== modified file 'src/logic/ship.h'
116--- src/logic/ship.h 2014-07-05 16:41:51 +0000
117+++ src/logic/ship.h 2014-07-14 22:50:41 +0000
118@@ -97,8 +97,6 @@
119
120 virtual void log_general_info(const Editor_Game_Base &) override;
121
122- uint32_t get_capacity() const {return descr().get_capacity();}
123- virtual uint32_t vision_range() const {return descr().vision_range();}
124 uint32_t get_nritems() const {return m_items.size();}
125 const ShippingItem & get_item(uint32_t idx) const {return m_items[idx];}
126
127
128=== modified file 'src/logic/soldier.cc'
129--- src/logic/soldier.cc 2014-07-05 12:48:58 +0000
130+++ src/logic/soldier.cc 2014-07-14 22:50:41 +0000
131@@ -926,7 +926,7 @@
132 // Try to find our land
133 Map* map = game.get_map();
134 std::vector<Coords> coords;
135- uint32_t maxdist = vision_range() * 2;
136+ uint32_t maxdist = descr().vision_range() * 2;
137 Area<FCoords> area(map->get_fcoords(get_position()), maxdist);
138 if
139 (map->find_reachable_fields
140
141=== modified file 'src/logic/worker.cc'
142--- src/logic/worker.cc 2014-07-06 08:17:24 +0000
143+++ src/logic/worker.cc 2014-07-14 22:50:41 +0000
144@@ -2563,7 +2563,7 @@
145 // We always have a high probability to see flags within our vision range,
146 // but with some luck we see flags that are even further away.
147 std::vector<ImmovableFound> flags;
148- int32_t vision = vision_range();
149+ int32_t vision = descr().vision_range();
150 int32_t maxdist = 4 * vision;
151 if
152 (map.find_immovables
153@@ -2625,7 +2625,7 @@
154 if
155 (start_task_movepath
156 (game,
157- game.random_location(get_position(), vision_range()),
158+ game.random_location(get_position(), descr().vision_range()),
159 4,
160 descr().get_right_walk_anims(does_carry_ware())))
161 return;
162
163=== modified file 'src/wui/shipwindow.cc'
164--- src/wui/shipwindow.cc 2014-07-03 19:26:30 +0000
165+++ src/wui/shipwindow.cc 2014-07-14 22:50:41 +0000
166@@ -99,7 +99,7 @@
167 UI::Box * vbox = new UI::Box(this, 0, 0, UI::Box::Vertical);
168
169 m_display = new ItemWaresDisplay(vbox, *ship.get_owner());
170- m_display->set_capacity(ship.get_capacity());
171+ m_display->set_capacity(ship.descr().get_capacity());
172 vbox->add(m_display, UI::Box::AlignCenter, false);
173
174 // Expedition buttons

Subscribers

People subscribed via source and target branches

to status/vote changes: