widelands

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

  1. unhandled_version_error
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 7569
Proposed branch: lp:~widelands-dev/widelands/unhandled_version_error
Merge into: lp:widelands
Diff against target: 1284 lines (+164/-112)
59 files modified
src/economy/cmd_call_economy_balance.cc (+1/-1)
src/economy/economy_data_packet.cc (+1/-1)
src/economy/fleet.cc (+1/-1)
src/economy/portdock.cc (+1/-1)
src/economy/request.cc (+1/-1)
src/economy/shippingitem.cc (+1/-1)
src/economy/transfer.cc (+1/-1)
src/economy/ware_instance.cc (+1/-1)
src/economy/wares_queue.cc (+1/-1)
src/game_io/game_class_packet.cc (+1/-1)
src/game_io/game_cmd_queue_packet.cc (+1/-1)
src/game_io/game_interactive_player_packet.cc (+1/-1)
src/game_io/game_player_economies_packet.cc (+1/-1)
src/game_io/game_player_info_packet.cc (+1/-1)
src/game_io/game_preload_packet.cc (+1/-1)
src/logic/battle.cc (+1/-1)
src/logic/bob.cc (+1/-1)
src/logic/carrier.cc (+1/-1)
src/logic/cmd_calculate_statistics.cc (+1/-1)
src/logic/cmd_incorporate.cc (+1/-1)
src/logic/cmd_luacoroutine.cc (+1/-1)
src/logic/cmd_luascript.cc (+1/-1)
src/logic/cmd_queue.cc (+1/-1)
src/logic/critter.cc (+1/-1)
src/logic/game_data_error.cc (+4/-2)
src/logic/game_data_error.h (+1/-1)
src/logic/immovable.cc (+4/-3)
src/logic/instances.cc (+4/-3)
src/logic/path.cc (+1/-1)
src/logic/playercommand.cc (+57/-29)
src/logic/replay.cc (+1/-1)
src/logic/requirements.cc (+1/-1)
src/logic/ship.cc (+1/-1)
src/logic/soldier.cc (+1/-1)
src/logic/worker.cc (+1/-1)
src/map_io/map_allowed_building_types_packet.cc (+1/-1)
src/map_io/map_allowed_worker_types_packet.cc (+1/-1)
src/map_io/map_bob_packet.cc (+1/-1)
src/map_io/map_building_packet.cc (+1/-1)
src/map_io/map_buildingdata_packet.cc (+15/-8)
src/map_io/map_elemental_packet.cc (+1/-1)
src/map_io/map_exploration_packet.cc (+1/-1)
src/map_io/map_extradata_packet.cc (+1/-1)
src/map_io/map_flag_packet.cc (+1/-1)
src/map_io/map_flagdata_packet.cc (+1/-1)
src/map_io/map_heights_packet.cc (+1/-1)
src/map_io/map_node_ownership_packet.cc (+1/-1)
src/map_io/map_object_packet.cc (+1/-1)
src/map_io/map_objective_packet.cc (+1/-1)
src/map_io/map_player_names_and_tribes_packet.cc (+1/-1)
src/map_io/map_player_position_packet.cc (+1/-1)
src/map_io/map_players_view_packet.cc (+27/-14)
src/map_io/map_port_spaces_packet.cc (+1/-1)
src/map_io/map_resources_packet.cc (+1/-1)
src/map_io/map_road_packet.cc (+1/-1)
src/map_io/map_roaddata_packet.cc (+1/-1)
src/map_io/map_scripting_packet.cc (+1/-1)
src/map_io/map_terrain_packet.cc (+1/-1)
src/map_io/map_version_packet.cc (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/unhandled_version_error
Reviewer Review Type Date Requested Status
TiborB Approve
Review via email: mp+275630@code.launchpad.net

Description of the change

Added packet names to UnhandledVersionError to make debugging easier.

The important bit to review is in src/logic/game_data_error.cc:

http://bazaar.launchpad.net/~widelands-dev/widelands/unhandled_version_error/revision/7567#src/logic/game_data_error.cc

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

I tested it, it works as supposed

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/economy/cmd_call_economy_balance.cc'
2--- src/economy/cmd_call_economy_balance.cc 2014-10-12 07:35:42 +0000
3+++ src/economy/cmd_call_economy_balance.cc 2015-10-24 15:45:00 +0000
4@@ -65,7 +65,7 @@
5 m_flag = &mol.get<Flag>(serial);
6 m_timerid = fr.unsigned_32();
7 } else {
8- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
9+ throw UnhandledVersionError("CmdCallEconomyBalance", packet_version, kCurrentPacketVersion);
10 }
11 } catch (const WException & e) {
12 throw wexception("call economy balance: %s", e.what());
13
14=== modified file 'src/economy/economy_data_packet.cc'
15--- src/economy/economy_data_packet.cc 2014-10-12 07:35:42 +0000
16+++ src/economy/economy_data_packet.cc 2015-10-24 15:45:00 +0000
17@@ -89,7 +89,7 @@
18 }
19 m_eco->m_request_timerid = fr.unsigned_32();
20 } else {
21- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
22+ throw UnhandledVersionError("EconomyDataPacket", packet_version, kCurrentPacketVersion);
23 }
24 } catch (const std::exception & e) {
25 throw GameDataError("economy: %s", e.what());
26
27=== modified file 'src/economy/fleet.cc'
28--- src/economy/fleet.cc 2015-10-04 18:30:05 +0000
29+++ src/economy/fleet.cc 2015-10-24 15:45:00 +0000
30@@ -972,7 +972,7 @@
31 loader->init(egbase, mol, *(new Fleet(*owner)));
32 loader->load(fr);
33 } else {
34- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
35+ throw UnhandledVersionError("Fleet", packet_version, kCurrentPacketVersion);
36 }
37 } catch (const std::exception & e) {
38 throw wexception("loading portdock: %s", e.what());
39
40=== modified file 'src/economy/portdock.cc'
41--- src/economy/portdock.cc 2015-10-04 18:30:05 +0000
42+++ src/economy/portdock.cc 2015-10-24 15:45:00 +0000
43@@ -544,7 +544,7 @@
44 loader->init(egbase, mol, *new PortDock(nullptr));
45 loader->load(fr);
46 } else {
47- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
48+ throw UnhandledVersionError("PortDock", packet_version, kCurrentPacketVersion);
49 }
50 } catch (const std::exception& e) {
51 throw wexception("loading portdock: %s", e.what());
52
53=== modified file 'src/economy/request.cc'
54--- src/economy/request.cc 2014-10-12 07:35:42 +0000
55+++ src/economy/request.cc 2015-10-24 15:45:00 +0000
56@@ -168,7 +168,7 @@
57 if (!is_open() && m_economy)
58 m_economy->remove_request(*this);
59 } else {
60- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
61+ throw UnhandledVersionError("Request", packet_version, kCurrentPacketVersion);
62 }
63 } catch (const WException & e) {
64 throw wexception("request: %s", e.what());
65
66=== modified file 'src/economy/shippingitem.cc'
67--- src/economy/shippingitem.cc 2015-04-15 10:06:45 +0000
68+++ src/economy/shippingitem.cc 2015-10-24 15:45:00 +0000
69@@ -172,7 +172,7 @@
70 if (packet_version == kCurrentPacketVersion) {
71 m_serial = fr.unsigned_32();
72 } else {
73- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
74+ throw UnhandledVersionError("ShippingItem", packet_version, kCurrentPacketVersion);
75 }
76 } catch (const WException & e) {
77 throw GameDataError("shipping item: %s", e.what());
78
79=== modified file 'src/economy/transfer.cc'
80--- src/economy/transfer.cc 2014-10-12 07:35:42 +0000
81+++ src/economy/transfer.cc 2015-10-24 15:45:00 +0000
82@@ -321,7 +321,7 @@
83 if (packet_version == kCurrentPacketVersion) {
84 rd.destination = fr.unsigned_32();
85 } else {
86- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
87+ throw UnhandledVersionError("Transfer", packet_version, kCurrentPacketVersion);
88 }
89 } catch (const WException & e) {
90 throw wexception("transfer: %s", e.what());
91
92=== modified file 'src/economy/ware_instance.cc'
93--- src/economy/ware_instance.cc 2015-04-15 12:59:16 +0000
94+++ src/economy/ware_instance.cc 2015-10-24 15:45:00 +0000
95@@ -642,7 +642,7 @@
96
97 return loader.release();
98 } else {
99- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
100+ throw UnhandledVersionError("WareInstance", packet_version, kCurrentPacketVersion);
101 }
102 } catch (const std::exception & e) {
103 throw wexception("WareInstance: %s", e.what());
104
105=== modified file 'src/economy/wares_queue.cc'
106--- src/economy/wares_queue.cc 2015-04-11 21:03:05 +0000
107+++ src/economy/wares_queue.cc 2015-10-24 15:45:00 +0000
108@@ -282,7 +282,7 @@
109 if (m_owner.get_economy())
110 add_to_economy(*m_owner.get_economy());
111 } else {
112- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
113+ throw UnhandledVersionError("WaresQueue", packet_version, kCurrentPacketVersion);
114 }
115 } catch (const GameDataError & e) {
116 throw GameDataError("waresqueue: %s", e.what());
117
118=== modified file 'src/game_io/game_class_packet.cc'
119--- src/game_io/game_class_packet.cc 2015-06-06 09:48:42 +0000
120+++ src/game_io/game_class_packet.cc 2015-10-24 15:45:00 +0000
121@@ -38,7 +38,7 @@
122 if (packet_version == kCurrentPacketVersion) {
123 game.gametime_ = fr.unsigned_32();
124 } else {
125- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
126+ throw UnhandledVersionError("GameClassPacket", packet_version, kCurrentPacketVersion);
127 }
128 } catch (const WException & e) {
129 throw GameDataError("game class: %s", e.what());
130
131=== modified file 'src/game_io/game_cmd_queue_packet.cc'
132--- src/game_io/game_cmd_queue_packet.cc 2014-10-12 07:35:42 +0000
133+++ src/game_io/game_cmd_queue_packet.cc 2015-10-24 15:45:00 +0000
134@@ -69,7 +69,7 @@
135 ++ cmdq.m_ncmds;
136 }
137 } else {
138- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
139+ throw UnhandledVersionError("GameCmdQueuePacket", packet_version, kCurrentPacketVersion);
140 }
141 } catch (const WException & e) {
142 throw GameDataError("command queue: %s", e.what());
143
144=== modified file 'src/game_io/game_interactive_player_packet.cc'
145--- src/game_io/game_interactive_player_packet.cc 2014-10-12 07:35:42 +0000
146+++ src/game_io/game_interactive_player_packet.cc 2015-10-24 15:45:00 +0000
147@@ -77,7 +77,7 @@
148 ipl->set_player_number(player_number);
149 }
150 } else {
151- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
152+ throw UnhandledVersionError("GameInteractivePlayerPacket", packet_version, kCurrentPacketVersion);
153 }
154 } catch (const WException & e) {
155 throw GameDataError("interactive player: %s", e.what());
156
157=== modified file 'src/game_io/game_player_economies_packet.cc'
158--- src/game_io/game_player_economies_packet.cc 2015-05-10 15:25:34 +0000
159+++ src/game_io/game_player_economies_packet.cc 2015-10-24 15:45:00 +0000
160@@ -85,7 +85,7 @@
161 throw GameDataError("player %u: %s", p, e.what());
162 }
163 } else {
164- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
165+ throw UnhandledVersionError("GamePlayerEconomiesPacket", packet_version, kCurrentPacketVersion);
166 }
167 } catch (const WException & e) {
168 throw GameDataError("economies: %s", e.what());
169
170=== modified file 'src/game_io/game_player_info_packet.cc'
171--- src/game_io/game_player_info_packet.cc 2014-10-12 07:35:42 +0000
172+++ src/game_io/game_player_info_packet.cc 2015-10-24 15:45:00 +0000
173@@ -72,7 +72,7 @@
174 }
175 game.read_statistics(fr);
176 } else {
177- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
178+ throw UnhandledVersionError("GamePlayerInfoPacket", packet_version, kCurrentPacketVersion);
179 }
180 } catch (const WException & e) {
181 throw GameDataError("player info: %s", e.what());
182
183=== modified file 'src/game_io/game_preload_packet.cc'
184--- src/game_io/game_preload_packet.cc 2015-06-06 14:24:16 +0000
185+++ src/game_io/game_preload_packet.cc 2015-10-24 15:45:00 +0000
186@@ -70,7 +70,7 @@
187 m_savetimestamp = static_cast<time_t>(s.get_natural("savetimestamp"));
188 m_gametype = static_cast<GameController::GameType>(s.get_natural("gametype"));
189 } else {
190- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
191+ throw UnhandledVersionError("GamePreloadPacket", packet_version, kCurrentPacketVersion);
192 }
193 } catch (const WException & e) {
194 throw GameDataError("preload: %s", e.what());
195
196=== modified file 'src/logic/battle.cc'
197--- src/logic/battle.cc 2015-10-04 18:30:05 +0000
198+++ src/logic/battle.cc 2015-10-24 15:45:00 +0000
199@@ -425,7 +425,7 @@
200 loader->init(egbase, mol, *new Battle);
201 loader->load(fr);
202 } else {
203- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
204+ throw UnhandledVersionError("Battle", packet_version, kCurrentPacketVersion);
205 }
206 } catch (const std::exception & e) {
207 throw wexception("Loading Battle: %s", e.what());
208
209=== modified file 'src/logic/bob.cc'
210--- src/logic/bob.cc 2015-04-11 21:03:05 +0000
211+++ src/logic/bob.cc 2015-10-24 15:45:00 +0000
212@@ -1146,7 +1146,7 @@
213 state.program = get_program(programname);
214 }
215 } else {
216- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
217+ throw UnhandledVersionError("Bob", packet_version, kCurrentPacketVersion);
218 }
219 } catch (const WException & e) {
220 throw wexception("loading bob: %s", e.what());
221
222=== modified file 'src/logic/carrier.cc'
223--- src/logic/carrier.cc 2015-04-11 21:03:05 +0000
224+++ src/logic/carrier.cc 2015-10-24 15:45:00 +0000
225@@ -603,7 +603,7 @@
226 Carrier & carrier = get<Carrier>();
227 carrier.m_promised_pickup_to = fr.signed_32();
228 } else {
229- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
230+ throw UnhandledVersionError("Carrier", packet_version, kCurrentPacketVersion);
231 }
232 } catch (const WException & e) {
233 throw wexception("loading carrier: %s", e.what());
234
235=== modified file 'src/logic/cmd_calculate_statistics.cc'
236--- src/logic/cmd_calculate_statistics.cc 2014-10-12 07:35:42 +0000
237+++ src/logic/cmd_calculate_statistics.cc 2015-10-24 15:45:00 +0000
238@@ -44,7 +44,7 @@
239 if (packet_version == kCurrentPacketVersion) {
240 GameLogicCommand::read(fr, egbase, mol);
241 } else {
242- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
243+ throw UnhandledVersionError("CmdCalculateStatistics", packet_version, kCurrentPacketVersion);
244 }
245 } catch (const WException & e) {
246 throw GameDataError("calculate statistics function: %s", e.what());
247
248=== modified file 'src/logic/cmd_incorporate.cc'
249--- src/logic/cmd_incorporate.cc 2014-10-12 07:35:42 +0000
250+++ src/logic/cmd_incorporate.cc 2015-10-24 15:45:00 +0000
251@@ -44,7 +44,7 @@
252 throw wexception("worker %u: %s", worker_serial, e.what());
253 }
254 } else {
255- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
256+ throw UnhandledVersionError("CmdIncorporate", packet_version, kCurrentPacketVersion);
257 }
258
259 } catch (const WException & e) {
260
261=== modified file 'src/logic/cmd_luacoroutine.cc'
262--- src/logic/cmd_luacoroutine.cc 2015-04-11 21:03:05 +0000
263+++ src/logic/cmd_luacoroutine.cc 2015-10-24 15:45:00 +0000
264@@ -72,7 +72,7 @@
265
266 m_cr = lgi->read_coroutine(fr);
267 } else {
268- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
269+ throw UnhandledVersionError("CmdLuaCoroutine", packet_version, kCurrentPacketVersion);
270 }
271 } catch (const WException & e) {
272 throw GameDataError("lua function: %s", e.what());
273
274=== modified file 'src/logic/cmd_luascript.cc'
275--- src/logic/cmd_luascript.cc 2015-04-11 21:03:05 +0000
276+++ src/logic/cmd_luascript.cc 2015-10-24 15:45:00 +0000
277@@ -55,7 +55,7 @@
278 GameLogicCommand::read(fr, egbase, mol);
279 script_ = fr.string();
280 } else {
281- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
282+ throw UnhandledVersionError("CmdLuaScript", packet_version, kCurrentPacketVersion);
283 }
284 } catch (const WException & e) {
285 throw GameDataError("lua: %s", e.what());
286
287=== modified file 'src/logic/cmd_queue.cc'
288--- src/logic/cmd_queue.cc 2014-10-12 07:35:42 +0000
289+++ src/logic/cmd_queue.cc 2015-10-24 15:45:00 +0000
290@@ -178,7 +178,7 @@
291 throw GameDataError
292 ("duetime (%i) < gametime (%i)", duetime(), gametime);
293 } else {
294- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
295+ throw UnhandledVersionError("GameLogicCommand", packet_version, kCurrentPacketVersion);
296 }
297 } catch (const WException & e) {
298 throw GameDataError("game logic: %s", e.what());
299
300=== modified file 'src/logic/critter.cc'
301--- src/logic/critter.cc 2015-04-11 21:03:05 +0000
302+++ src/logic/critter.cc 2015-10-24 15:45:00 +0000
303@@ -432,7 +432,7 @@
304 loader->init(egbase, mol, descr->create_object());
305 loader->load(fr);
306 } else {
307- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
308+ throw UnhandledVersionError("Critter", packet_version, kCurrentPacketVersion);
309 }
310 } catch (const std::exception & e) {
311 throw wexception("loading critter: %s", e.what());
312
313=== modified file 'src/logic/game_data_error.cc'
314--- src/logic/game_data_error.cc 2014-10-12 07:35:42 +0000
315+++ src/logic/game_data_error.cc 2015-10-24 15:45:00 +0000
316@@ -41,12 +41,14 @@
317 }
318
319
320-UnhandledVersionError::UnhandledVersionError(int32_t packet_version,
321+UnhandledVersionError::UnhandledVersionError(const char* packet_name, int32_t packet_version,
322 int32_t current_packet_version)
323 {
324- m_what = (boost::format("\n\nUnhandledVersionError: %s\n\nSaved Version: %i\nCurrent Version: %i")
325+ m_what = (boost::format
326+ ("\n\nUnhandledVersionError: %s\n\nPacket Name: %s\nSaved Version: %i\nCurrent Version: %i")
327 % _("This game was saved using an older version of Widelands and cannot be loaded anymore, "
328 "or it's a new version that can't be handled yet.")
329+ % packet_name
330 % static_cast<int>(packet_version)
331 % static_cast<int>(current_packet_version)).str();
332 }
333
334=== modified file 'src/logic/game_data_error.h'
335--- src/logic/game_data_error.h 2014-10-12 07:35:42 +0000
336+++ src/logic/game_data_error.h 2015-10-24 15:45:00 +0000
337@@ -40,7 +40,7 @@
338 /// \param packet_version: The version of the packet that Widelands is trying to load.
339 /// \param current_packet_version: The packet version that Widelands is currently using.
340 struct UnhandledVersionError : public GameDataError {
341- explicit UnhandledVersionError(int32_t packet_version,
342+ explicit UnhandledVersionError(const char* packet_name, int32_t packet_version,
343 int32_t current_packet_version);
344
345 char const * what() const noexcept override {return m_what.c_str();}
346
347=== modified file 'src/logic/immovable.cc'
348--- src/logic/immovable.cc 2015-10-04 18:30:05 +0000
349+++ src/logic/immovable.cc 2015-10-24 15:45:00 +0000
350@@ -790,7 +790,7 @@
351 loader->init(egbase, mol, *imm);
352 loader->load(fr, packet_version);
353 } else {
354- throw UnhandledVersionError(packet_version, kCurrentPacketVersionImmovable);
355+ throw UnhandledVersionError("Immovable", packet_version, kCurrentPacketVersionImmovable);
356 }
357 } catch (const std::exception & e) {
358 throw wexception("immovable type: %s", e.what());
359@@ -1171,7 +1171,8 @@
360 if (packet_version == kCurrentPacketVersionConstructionData) {
361 d->delivered.load(fr, *imm.descr().get_owner_tribe());
362 } else {
363- throw UnhandledVersionError(packet_version, kCurrentPacketVersionConstructionData);
364+ throw UnhandledVersionError("ActConstructionData",
365+ packet_version, kCurrentPacketVersionConstructionData);
366 }
367 } catch (const WException & e) {
368 delete d;
369@@ -1471,7 +1472,7 @@
370
371 imm.m_owner = owner;
372 } else {
373- throw UnhandledVersionError(packet_version, kCurrentPacketVersionPlayerImmovable);
374+ throw UnhandledVersionError("PlayerImmovable", packet_version, kCurrentPacketVersionPlayerImmovable);
375 }
376 } catch (const std::exception & e) {
377 throw wexception("loading player immovable: %s", e.what());
378
379=== modified file 'src/logic/instances.cc'
380--- src/logic/instances.cc 2015-05-10 15:25:34 +0000
381+++ src/logic/instances.cc 2015-10-24 15:45:00 +0000
382@@ -68,7 +68,8 @@
383 else
384 obj_serial = 0;
385 } else {
386- throw UnhandledVersionError(packet_version, kCurrentPacketVersionDestroyMapObject);
387+ throw UnhandledVersionError("CmdDestroyMapObject",
388+ packet_version, kCurrentPacketVersionDestroyMapObject);
389 }
390 } catch (const WException & e) {
391 throw GameDataError("destroy map object: %s", e.what());
392@@ -121,7 +122,7 @@
393 obj_serial = 0;
394 arg = fr.unsigned_32();
395 } else {
396- throw UnhandledVersionError(packet_version, kCurrentPacketVersionCmdAct);
397+ throw UnhandledVersionError("CmdAct", packet_version, kCurrentPacketVersionCmdAct);
398 }
399 } catch (const WException & e) {
400 throw wexception("act: %s", e.what());
401@@ -517,7 +518,7 @@
402
403 uint8_t const packet_version = fr.unsigned_8();
404 if (packet_version <= 0 || packet_version > kCurrentPacketVersionMapObject) {
405- throw UnhandledVersionError(packet_version, kCurrentPacketVersionMapObject);
406+ throw UnhandledVersionError("MapObject", packet_version, kCurrentPacketVersionMapObject);
407 }
408
409 Serial const serial = fr.unsigned_32();
410
411=== modified file 'src/logic/path.cc'
412--- src/logic/path.cc 2014-10-12 07:35:42 +0000
413+++ src/logic/path.cc 2015-10-24 15:45:00 +0000
414@@ -95,7 +95,7 @@
415 while (steps--)
416 append(map, read_direction_8(&fr));
417 } else {
418- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
419+ throw UnhandledVersionError("Path", packet_version, kCurrentPacketVersion);
420 }
421 } catch (const WException & e) {
422 throw GameDataError("player names and tribes: %s", e.what());
423
424=== modified file 'src/logic/playercommand.cc'
425--- src/logic/playercommand.cc 2015-04-15 12:13:52 +0000
426+++ src/logic/playercommand.cc 2015-10-24 15:45:00 +0000
427@@ -164,7 +164,7 @@
428 throw GameDataError("player %u does not exist", m_sender);
429 m_cmdserial = fr.unsigned_32();
430 } else {
431- throw UnhandledVersionError(packet_version, kCurrentPacketVersionPlayerCommand);
432+ throw UnhandledVersionError("PlayerCommand", packet_version, kCurrentPacketVersionPlayerCommand);
433 }
434 } catch (const WException & e) {
435 throw GameDataError("player command: %s", e.what());
436@@ -205,7 +205,8 @@
437 serial = get_object_serial_or_zero<PlayerImmovable>(fr.unsigned_32(), mol);
438 recurse = 2 <= packet_version ? fr.unsigned_8() : false;
439 } else {
440- throw UnhandledVersionError(packet_version, kCurrentPacketVersionCmdBulldoze);
441+ throw UnhandledVersionError("CmdBulldoze",
442+ packet_version, kCurrentPacketVersionCmdBulldoze);
443 }
444 } catch (const WException & e) {
445 throw GameDataError("bulldoze: %s", e.what());
446@@ -258,7 +259,8 @@
447 bi = fr.unsigned_16();
448 coords = read_coords_32(&fr, egbase.map().extent());
449 } else {
450- throw UnhandledVersionError(packet_version, kCurrentPacketVersionCmdBuild);
451+ throw UnhandledVersionError("CmdBuild",
452+ packet_version, kCurrentPacketVersionCmdBuild);
453 }
454
455 } catch (const WException & e) {
456@@ -309,7 +311,8 @@
457 PlayerCommand::read(fr, egbase, mol);
458 coords = read_coords_32(&fr, egbase.map().extent());
459 } else {
460- throw UnhandledVersionError(packet_version, kCurrentPacketVersionCmdBuildFlag);
461+ throw UnhandledVersionError("CmdBuildFlag",
462+ packet_version, kCurrentPacketVersionCmdBuildFlag);
463 }
464 } catch (const WException & e) {
465 throw GameDataError("build flag: %s", e.what());
466@@ -398,7 +401,8 @@
467 for (Path::StepVector::size_type i = 0; i < nsteps; ++i)
468 steps[i] = fr.unsigned_8();
469 } else {
470- throw UnhandledVersionError(packet_version, kCurrentPacketVersionCmdBuildRoad);
471+ throw UnhandledVersionError("CmdBuildRoad",
472+ packet_version, kCurrentPacketVersionCmdBuildRoad);
473 }
474 } catch (const WException & e) {
475 throw GameDataError("build road: %s", e.what());
476@@ -454,7 +458,8 @@
477 fr .unsigned_8 ();
478 serial = get_object_serial_or_zero<Flag>(fr.unsigned_32(), mol);
479 } else {
480- throw UnhandledVersionError(packet_version, kCurrentPacketVersionCmdFlagAction);
481+ throw UnhandledVersionError("CmdFlagAction",
482+ packet_version, kCurrentPacketVersionCmdFlagAction);
483 }
484 } catch (const WException & e) {
485 throw GameDataError("flag action: %s", e.what());
486@@ -506,7 +511,8 @@
487 PlayerCommand::read(fr, egbase, mol);
488 serial = get_object_serial_or_zero<Building>(fr.unsigned_32(), mol);
489 } else {
490- throw UnhandledVersionError(packet_version, kCurrentPacketVersionCmdStartStopBuilding);
491+ throw UnhandledVersionError("CmdStartStopBuilding",
492+ packet_version, kCurrentPacketVersionCmdStartStopBuilding);
493 }
494 } catch (const WException & e) {
495 throw GameDataError("start/stop building: %s", e.what());
496@@ -574,7 +580,8 @@
497 preference = fr.unsigned_8();
498 serial = get_object_serial_or_zero<MilitarySite>(fr.unsigned_32(), mol);
499 } else {
500- throw UnhandledVersionError(packet_version, kCurrentPacketVersionSoldierPreference);
501+ throw UnhandledVersionError("CmdMilitarySiteSetSoldierPreference",
502+ packet_version, kCurrentPacketVersionSoldierPreference);
503 }
504 } catch (const WException & e) {
505 throw GameDataError("start/stop building: %s", e.what());
506@@ -614,7 +621,8 @@
507 PlayerCommand::read(fr, egbase, mol);
508 serial = get_object_serial_or_zero<Warehouse>(fr.unsigned_32(), mol);
509 } else {
510- throw UnhandledVersionError(packet_version, kCurrentPacketVersionExpedition);
511+ throw UnhandledVersionError("CmdStartOrCancelExpedition",
512+ packet_version, kCurrentPacketVersionExpedition);
513 }
514 } catch (const WException & e) {
515 throw GameDataError("start/stop building: %s", e.what());
516@@ -668,7 +676,8 @@
517 serial = get_object_serial_or_zero<Building>(fr.unsigned_32(), mol);
518 bi = fr.unsigned_16();
519 } else {
520- throw UnhandledVersionError(packet_version, kCurrentPacketVersionCmdEnhanceBuilding);
521+ throw UnhandledVersionError("CmdEnhanceBuilding",
522+ packet_version, kCurrentPacketVersionCmdEnhanceBuilding);
523 }
524 } catch (const WException & e) {
525 throw GameDataError("enhance building: %s", e.what());
526@@ -721,7 +730,8 @@
527 PlayerCommand::read(fr, egbase, mol);
528 serial = get_object_serial_or_zero<Building>(fr.unsigned_32(), mol);
529 } else {
530- throw UnhandledVersionError(packet_version, kCurrentPacketVersionDismantleBuilding);
531+ throw UnhandledVersionError("CmdDismantleBuilding",
532+ packet_version, kCurrentPacketVersionDismantleBuilding);
533 }
534 } catch (const WException & e) {
535 throw GameDataError("dismantle building: %s", e.what());
536@@ -772,7 +782,8 @@
537 PlayerCommand::read(fr, egbase, mol);
538 serial = get_object_serial_or_zero<Worker>(fr.unsigned_32(), mol);
539 } else {
540- throw UnhandledVersionError(packet_version, kCurrentPacketVersionCmdEvictWorker);
541+ throw UnhandledVersionError("CmdEvictWorker",
542+ packet_version, kCurrentPacketVersionCmdEvictWorker);
543 }
544 } catch (const WException & e) {
545 throw GameDataError("evict worker: %s", e.what());
546@@ -840,7 +851,8 @@
547 // direction
548 dir = static_cast<WalkingDir>(fr.unsigned_8());
549 } else {
550- throw UnhandledVersionError(packet_version, kCurrentPacketVersionShipScoutDirection);
551+ throw UnhandledVersionError("CmdShipScoutDirection",
552+ packet_version, kCurrentPacketVersionShipScoutDirection);
553 }
554 } catch (const WException & e) {
555 throw GameDataError("Ship scout: %s", e.what());
556@@ -908,7 +920,8 @@
557 // Coords
558 coords = read_coords_32(&fr);
559 } else {
560- throw UnhandledVersionError(packet_version, kCurrentPacketVersionShipConstructPort);
561+ throw UnhandledVersionError("CmdShipConstructPort",
562+ packet_version, kCurrentPacketVersionShipConstructPort);
563 }
564 } catch (const WException & e) {
565 throw GameDataError("Ship construct port: %s", e.what());
566@@ -978,7 +991,8 @@
567 serial = get_object_serial_or_zero<Ship>(fr.unsigned_32(), mol);
568 island_explore_direction = static_cast<IslandExploreDirection>(fr.unsigned_8());
569 } else {
570- throw UnhandledVersionError(packet_version, kCurrentPacketVersionShipExploreIsland);
571+ throw UnhandledVersionError("CmdShipExploreIsland",
572+ packet_version, kCurrentPacketVersionShipExploreIsland);
573 }
574 } catch (const WException & e) {
575 throw GameDataError("Ship explore: %s", e.what());
576@@ -1033,7 +1047,8 @@
577 PlayerCommand::read(fr, egbase, mol);
578 serial = get_object_serial_or_zero<Ship>(fr.unsigned_32(), mol);
579 } else {
580- throw UnhandledVersionError(packet_version, kCurrentPacketVersionCmdShipSink);
581+ throw UnhandledVersionError("CmdShipSink", packet_version,
582+ kCurrentPacketVersionCmdShipSink);
583 }
584 } catch (const WException & e) {
585 throw GameDataError("Ship explore: %s", e.what());
586@@ -1085,7 +1100,8 @@
587 PlayerCommand::read(fr, egbase, mol);
588 serial = get_object_serial_or_zero<Ship>(fr.unsigned_32(), mol);
589 } else {
590- throw UnhandledVersionError(packet_version, kCurrentPacketVersionShipCancelExpedition);
591+ throw UnhandledVersionError("CmdShipCancelExpedition",
592+ packet_version, kCurrentPacketVersionShipCancelExpedition);
593 }
594 } catch (const WException & e) {
595 throw GameDataError("Ship explore: %s", e.what());
596@@ -1156,7 +1172,8 @@
597 m_index = fr.signed_32();
598 m_priority = fr.signed_32();
599 } else {
600- throw UnhandledVersionError(packet_version, kCurrentPacketVersionCmdSetWarePriority);
601+ throw UnhandledVersionError("CmdSetWarePriority",
602+ packet_version, kCurrentPacketVersionCmdSetWarePriority);
603 }
604
605 } catch (const WException & e) {
606@@ -1231,7 +1248,8 @@
607 m_index = fr.signed_32();
608 m_max_fill = fr.unsigned_32();
609 } else {
610- throw UnhandledVersionError(packet_version, kCurrentPacketVersionCmdSetWareMaxFill);
611+ throw UnhandledVersionError("CmdSetWareMaxFill",
612+ packet_version, kCurrentPacketVersionCmdSetWareMaxFill);
613 }
614 } catch (const WException & e) {
615 throw GameDataError("set ware max fill: %s", e.what());
616@@ -1339,7 +1357,8 @@
617 CmdChangeTargetQuantity::read(fr, egbase, mol);
618 m_permanent = fr.unsigned_32();
619 } else {
620- throw UnhandledVersionError(packet_version, kCurrentPacketVersionSetWareTargetQuantity);
621+ throw UnhandledVersionError("CmdSetWareTargetQuantity",
622+ packet_version, kCurrentPacketVersionSetWareTargetQuantity);
623 }
624 } catch (const WException & e) {
625 throw GameDataError("set ware target quantity: %s", e.what());
626@@ -1402,7 +1421,8 @@
627 if (packet_version == kCurrentPacketVersionResetWareTargetQuantity) {
628 CmdChangeTargetQuantity::read(fr, egbase, mol);
629 } else {
630- throw UnhandledVersionError(packet_version, kCurrentPacketVersionResetWareTargetQuantity);
631+ throw UnhandledVersionError("CmdResetWareTargetQuantity",
632+ packet_version, kCurrentPacketVersionResetWareTargetQuantity);
633 }
634 } catch (const WException & e) {
635 throw GameDataError("reset target quantity: %s", e.what());
636@@ -1459,7 +1479,8 @@
637 CmdChangeTargetQuantity::read(fr, egbase, mol);
638 m_permanent = fr.unsigned_32();
639 } else {
640- throw UnhandledVersionError(packet_version, kCurrentPacketVersionSetWorkerTargetQuantity);
641+ throw UnhandledVersionError("CmdSetWorkerTargetQuantity",
642+ packet_version, kCurrentPacketVersionSetWorkerTargetQuantity);
643 }
644 } catch (const WException & e) {
645 throw GameDataError("set worker target quantity: %s", e.what());
646@@ -1522,7 +1543,8 @@
647 if (packet_version == kCurrentPacketVersionResetWorkerTargetQuantity) {
648 CmdChangeTargetQuantity::read(fr, egbase, mol);
649 } else {
650- throw UnhandledVersionError(packet_version, kCurrentPacketVersionResetWorkerTargetQuantity);
651+ throw UnhandledVersionError("CmdResetWorkerTargetQuantity",
652+ packet_version, kCurrentPacketVersionResetWorkerTargetQuantity);
653 }
654 } catch (const WException & e) {
655 throw GameDataError("reset worker target quantity: %s", e.what());
656@@ -1578,7 +1600,8 @@
657 attribute = fr.unsigned_16();
658 value = fr.unsigned_16();
659 } else {
660- throw UnhandledVersionError(packet_version, kCurrentPacketVersionChangeTrainingOptions);
661+ throw UnhandledVersionError("CmdChangeTrainingOptions",
662+ packet_version, kCurrentPacketVersionChangeTrainingOptions);
663 }
664 } catch (const WException & e) {
665 throw GameDataError("change training options: %s", e.what());
666@@ -1636,7 +1659,8 @@
667 serial = get_object_serial_or_zero<PlayerImmovable>(fr.unsigned_32(), mol);
668 soldier = get_object_serial_or_zero<Soldier>(fr.unsigned_32(), mol);
669 } else {
670- throw UnhandledVersionError(packet_version, kCurrentPacketVersionCmdDropSoldier);
671+ throw UnhandledVersionError("CmdDropSoldier",
672+ packet_version, kCurrentPacketVersionCmdDropSoldier);
673 }
674 } catch (const WException & e) {
675 throw GameDataError("drop soldier: %s", e.what());
676@@ -1696,7 +1720,8 @@
677 serial = get_object_serial_or_zero<Building>(fr.unsigned_32(), mol);
678 val = fr.signed_16();
679 } else {
680- throw UnhandledVersionError(packet_version, kCurrentPacketVersionChangeSoldierCapacity);
681+ throw UnhandledVersionError("CmdChangeSoldierCapacity",
682+ packet_version, kCurrentPacketVersionChangeSoldierCapacity);
683 }
684 } catch (const WException & e) {
685 throw GameDataError("change soldier capacity: %s", e.what());
686@@ -1781,7 +1806,8 @@
687 fr .unsigned_8 ();
688 number = fr.unsigned_8 ();
689 } else {
690- throw UnhandledVersionError(packet_version, kCurrentPacketVersionCmdEnemyFlagAction);
691+ throw UnhandledVersionError("CmdEnemyFlagAction",
692+ packet_version, kCurrentPacketVersionCmdEnemyFlagAction);
693 }
694 } catch (const WException & e) {
695 throw GameDataError("enemy flag action: %s", e.what());
696@@ -1826,7 +1852,8 @@
697 throw GameDataError
698 ("(player %u): message id is null", sender());
699 } else {
700- throw UnhandledVersionError(packet_version, kCurrentPacketVersionPlayerMessageCommand);
701+ throw UnhandledVersionError("PlayerMessageCommand",
702+ packet_version, kCurrentPacketVersionPlayerMessageCommand);
703 }
704 } catch (const WException & e) {
705 throw GameDataError("player message: %s", e.what());
706@@ -1977,7 +2004,8 @@
707 m_ware = WareIndex(fr.unsigned_8());
708 m_policy = static_cast<Warehouse::StockPolicy>(fr.unsigned_8());
709 } else {
710- throw UnhandledVersionError(packet_version, kCurrentPacketVersionCmdSetStockPolicy);
711+ throw UnhandledVersionError("CmdSetStockPolicy",
712+ packet_version, kCurrentPacketVersionCmdSetStockPolicy);
713 }
714 } catch (const std::exception & e) {
715 throw GameDataError("Cmd_SetStockPolicy: %s", e.what());
716
717=== modified file 'src/logic/replay.cc'
718--- src/logic/replay.cc 2015-04-15 12:59:16 +0000
719+++ src/logic/replay.cc 2015-10-24 15:45:00 +0000
720@@ -106,7 +106,7 @@
721
722 const uint8_t packet_version = m_cmdlog->unsigned_8();
723 if (packet_version != kCurrentPacketVersion) {
724- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
725+ throw UnhandledVersionError("ReplayReader", packet_version, kCurrentPacketVersion);
726 }
727 game.rng().read_state(*m_cmdlog);
728 }
729
730=== modified file 'src/logic/requirements.cc'
731--- src/logic/requirements.cc 2015-04-11 21:03:05 +0000
732+++ src/logic/requirements.cc 2015-10-24 15:45:00 +0000
733@@ -45,7 +45,7 @@
734 if (packet_version == kCurrentPacketVersion) {
735 *this = RequirementsStorage::read(fr, egbase, mol);
736 } else {
737- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
738+ throw UnhandledVersionError("Requirements", packet_version, kCurrentPacketVersion);
739 }
740 } catch (const WException & e) {
741 throw wexception("requirements: %s", e.what());
742
743=== modified file 'src/logic/ship.cc'
744--- src/logic/ship.cc 2015-10-18 18:31:35 +0000
745+++ src/logic/ship.cc 2015-10-24 15:45:00 +0000
746@@ -1117,7 +1117,7 @@
747 loader->init(egbase, mol, descr->create_object());
748 loader->load(fr);
749 } else {
750- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
751+ throw UnhandledVersionError("Ship", packet_version, kCurrentPacketVersion);
752 }
753 } catch (const std::exception& e) {
754 throw wexception("loading ship: %s", e.what());
755
756=== modified file 'src/logic/soldier.cc'
757--- src/logic/soldier.cc 2015-04-14 18:34:40 +0000
758+++ src/logic/soldier.cc 2015-10-24 15:45:00 +0000
759@@ -1882,7 +1882,7 @@
760
761 m_battle = fr.unsigned_32();
762 } else {
763- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
764+ throw UnhandledVersionError("Soldier", packet_version, kCurrentPacketVersion);
765 }
766 } catch (const std::exception & e) {
767 throw wexception("loading soldier: %s", e.what());
768
769=== modified file 'src/logic/worker.cc'
770--- src/logic/worker.cc 2015-05-10 15:25:34 +0000
771+++ src/logic/worker.cc 2015-10-24 15:45:00 +0000
772@@ -2980,7 +2980,7 @@
773 worker.m_transfer->read(fr, m_transfer);
774 }
775 } else {
776- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
777+ throw UnhandledVersionError("Worker", packet_version, kCurrentPacketVersion);
778 }
779 } catch (const std::exception& e) {
780 throw wexception("loading worker: %s", e.what());
781
782=== modified file 'src/map_io/map_allowed_building_types_packet.cc'
783--- src/map_io/map_allowed_building_types_packet.cc 2014-10-31 07:46:04 +0000
784+++ src/map_io/map_allowed_building_types_packet.cc 2015-10-24 15:45:00 +0000
785@@ -90,7 +90,7 @@
786 }
787 }
788 } else {
789- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
790+ throw UnhandledVersionError("MapAllowedBuildingTypesPacket", packet_version, kCurrentPacketVersion);
791 }
792 } catch (const WException & e) {
793 throw GameDataError("allowed buildings: %s", e.what());
794
795=== modified file 'src/map_io/map_allowed_worker_types_packet.cc'
796--- src/map_io/map_allowed_worker_types_packet.cc 2014-10-31 07:46:04 +0000
797+++ src/map_io/map_allowed_worker_types_packet.cc 2015-10-24 15:45:00 +0000
798@@ -75,7 +75,7 @@
799 }
800 }
801 } else {
802- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
803+ throw UnhandledVersionError("MapAllowedWorkerTypesPacket", packet_version, kCurrentPacketVersion);
804 }
805 } catch (const WException & e) {
806 throw GameDataError("allowed worker types: %s", e.what());
807
808=== modified file 'src/map_io/map_bob_packet.cc'
809--- src/map_io/map_bob_packet.cc 2014-10-12 07:35:42 +0000
810+++ src/map_io/map_bob_packet.cc 2015-10-24 15:45:00 +0000
811@@ -87,7 +87,7 @@
812 }
813 }
814 else {
815- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
816+ throw UnhandledVersionError("MapBobPacket", packet_version, kCurrentPacketVersion);
817 }
818 } catch (const WException& e) {
819 throw GameDataError("bobs: %s", e.what());
820
821=== modified file 'src/map_io/map_building_packet.cc'
822--- src/map_io/map_building_packet.cc 2015-10-19 19:43:19 +0000
823+++ src/map_io/map_building_packet.cc 2015-10-24 15:45:00 +0000
824@@ -109,7 +109,7 @@
825 }
826 }
827 } else {
828- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
829+ throw UnhandledVersionError("MapBuildingPacket", packet_version, kCurrentPacketVersion);
830 }
831 } catch (const WException & e) {
832 throw GameDataError("buildings: %s", e.what());
833
834=== modified file 'src/map_io/map_buildingdata_packet.cc'
835--- src/map_io/map_buildingdata_packet.cc 2015-04-15 12:59:16 +0000
836+++ src/map_io/map_buildingdata_packet.cc 2015-10-24 15:45:00 +0000
837@@ -209,7 +209,7 @@
838 }
839 }
840 } else {
841- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
842+ throw UnhandledVersionError("MapBuildingdataPacket", packet_version, kCurrentPacketVersion);
843 }
844 } catch (const WException & e) {
845 throw GameDataError("buildingdata: %s", e.what());
846@@ -270,7 +270,8 @@
847 pfb.m_work_completed = fr.unsigned_32();
848 pfb.m_work_steps = fr.unsigned_32();
849 } else {
850- throw UnhandledVersionError(packet_version, kCurrentPacketPFBuilding);
851+ throw UnhandledVersionError("MapBuildingdataPacket - Partially Finished Building",
852+ packet_version, kCurrentPacketPFBuilding);
853 }
854 } catch (const WException & e) {
855 throw GameDataError("partially_constructed_buildings: %s", e.what());
856@@ -298,7 +299,8 @@
857
858 constructionsite.m_fetchfromflag = fr. signed_32();
859 } else {
860- throw UnhandledVersionError(packet_version, kCurrentPacketVersionConstructionsite);
861+ throw UnhandledVersionError("MapBuildingdataPacket - Constructionsite",
862+ packet_version, kCurrentPacketVersionConstructionsite);
863 }
864 } catch (const WException & e) {
865 throw GameDataError("constructionsite: %s", e.what());
866@@ -318,7 +320,8 @@
867
868 // Nothing to do
869 } else {
870- throw UnhandledVersionError(packet_version, kCurrentPacketVersionDismantlesite);
871+ throw UnhandledVersionError("MapBuildingdataPacket - Dismantlesite",
872+ packet_version, kCurrentPacketVersionDismantlesite);
873 }
874 } catch (const WException & e) {
875 throw GameDataError("dismantlesite: %s", e.what());
876@@ -500,7 +503,8 @@
877 warehouse.m_next_military_act = game.get_gametime();
878 //log("Read warehouse stuff for %p\n", &warehouse);
879 } else {
880- throw UnhandledVersionError(packet_version, kCurrentPacketVersionWarehouse);
881+ throw UnhandledVersionError("MapBuildingdataPacket - Warehouse",
882+ packet_version, kCurrentPacketVersionWarehouse);
883 }
884 } catch (const WException & e) {
885 throw GameDataError("warehouse: %s", e.what());
886@@ -578,7 +582,8 @@
887 militarysite.m_doing_upgrade_request = 0 != fr.unsigned_8() ? true : false;
888
889 } else {
890- throw UnhandledVersionError(packet_version, kCurrentPacketVersionMilitarysite);
891+ throw UnhandledVersionError("MapBuildingdataPacket - Militarysite",
892+ packet_version, kCurrentPacketVersionMilitarysite);
893 }
894
895 // If the site's capacity is outside the allowed range (can happen if
896@@ -777,7 +782,8 @@
897 productionsite.m_statistics_string_on_changed_statistics = fr.c_string();
898 productionsite.m_production_result = fr.c_string();
899 } else {
900- throw UnhandledVersionError(packet_version, kCurrentPacketVersionProductionsite);
901+ throw UnhandledVersionError("MapBuildingdataPacket - Productionsite",
902+ packet_version, kCurrentPacketVersionProductionsite);
903 }
904
905 } catch (const WException & e) {
906@@ -845,7 +851,8 @@
907 trainingsite.training_failure_count[std::make_pair(traintype, trainlevel)] = t;
908 }
909 } else {
910- throw UnhandledVersionError(packet_version, kCurrentPacketVersionTrainingsite);
911+ throw UnhandledVersionError("MapBuildingdataPacket - Trainingsite",
912+ packet_version, kCurrentPacketVersionTrainingsite);
913 }
914
915 // If the site's capacity is outside the allowed range (can happen if
916
917=== modified file 'src/map_io/map_elemental_packet.cc'
918--- src/map_io/map_elemental_packet.cc 2015-04-11 21:03:05 +0000
919+++ src/map_io/map_elemental_packet.cc 2015-10-24 15:45:00 +0000
920@@ -103,7 +103,7 @@
921 teamsection_key = (boost::format("teams%02i") % team_section_id).str().c_str();
922 }
923 } else
924- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
925+ throw UnhandledVersionError("MapElementalPacket", packet_version, kCurrentPacketVersion);
926 } catch (const WException & e) {
927 throw GameDataError("elemental data: %s", e.what());
928 }
929
930=== modified file 'src/map_io/map_exploration_packet.cc'
931--- src/map_io/map_exploration_packet.cc 2014-10-12 07:35:42 +0000
932+++ src/map_io/map_exploration_packet.cc 2015-10-24 15:45:00 +0000
933@@ -73,7 +73,7 @@
934 }
935 }
936 } else {
937- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
938+ throw UnhandledVersionError("MapExplorationPacket", packet_version, kCurrentPacketVersion);
939 }
940 } catch (const WException & e) {
941 throw GameDataError("seen: %s", e.what());
942
943=== modified file 'src/map_io/map_extradata_packet.cc'
944--- src/map_io/map_extradata_packet.cc 2015-04-11 21:03:05 +0000
945+++ src/map_io/map_extradata_packet.cc 2015-10-24 15:45:00 +0000
946@@ -66,7 +66,7 @@
947 }
948 }
949 } else {
950- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
951+ throw UnhandledVersionError("MapExtradataPacket", packet_version, kCurrentPacketVersion);
952 }
953 } catch (const WException & e) {
954 throw GameDataError("extradata: %s", e.what());
955
956=== modified file 'src/map_io/map_flag_packet.cc'
957--- src/map_io/map_flag_packet.cc 2015-04-11 21:03:05 +0000
958+++ src/map_io/map_flag_packet.cc 2015-10-24 15:45:00 +0000
959@@ -118,7 +118,7 @@
960 }
961 }
962 } else {
963- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
964+ throw UnhandledVersionError("MapFlagPacket", packet_version, kCurrentPacketVersion);
965 }
966 } catch (const WException & e) {
967 throw GameDataError("flags: %s", e.what());
968
969=== modified file 'src/map_io/map_flagdata_packet.cc'
970--- src/map_io/map_flagdata_packet.cc 2015-04-11 21:03:05 +0000
971+++ src/map_io/map_flagdata_packet.cc 2015-10-24 15:45:00 +0000
972@@ -167,7 +167,7 @@
973 }
974 }
975 } else {
976- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
977+ throw UnhandledVersionError("MapFlagdataPacket", packet_version, kCurrentPacketVersion);
978 }
979 } catch (const WException & e) {
980 throw GameDataError("flagdata: %s", e.what());
981
982=== modified file 'src/map_io/map_heights_packet.cc'
983--- src/map_io/map_heights_packet.cc 2014-10-12 07:35:42 +0000
984+++ src/map_io/map_heights_packet.cc 2015-10-24 15:45:00 +0000
985@@ -45,7 +45,7 @@
986 for (MapIndex i = 0; i < max_index; ++i)
987 map[i].set_height(fr.unsigned_8());
988 } else {
989- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
990+ throw UnhandledVersionError("MapHeightsPacket", packet_version, kCurrentPacketVersion);
991 }
992 } catch (const WException & e) {
993 throw GameDataError("heights: %s", e.what());
994
995=== modified file 'src/map_io/map_node_ownership_packet.cc'
996--- src/map_io/map_node_ownership_packet.cc 2014-10-12 07:35:42 +0000
997+++ src/map_io/map_node_ownership_packet.cc 2015-10-24 15:45:00 +0000
998@@ -57,7 +57,7 @@
999 for (MapIndex i = 0; i < max_index; ++i)
1000 map[i].set_owned_by(fr.unsigned_8());
1001 } else {
1002- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
1003+ throw UnhandledVersionError("MapNodeOwnershipPacket", packet_version, kCurrentPacketVersion);
1004 }
1005 } catch (const WException & e) {
1006 throw GameDataError("ownership: %s", e.what());
1007
1008=== modified file 'src/map_io/map_object_packet.cc'
1009--- src/map_io/map_object_packet.cc 2014-10-12 07:35:42 +0000
1010+++ src/map_io/map_object_packet.cc 2015-10-24 15:45:00 +0000
1011@@ -98,7 +98,7 @@
1012 throw GameDataError("unknown object header %u", header);
1013 }
1014 } else {
1015- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
1016+ throw UnhandledVersionError("MapObjectPacket", packet_version, kCurrentPacketVersion);
1017 }
1018 } catch (const std::exception & e) {
1019 throw GameDataError("map objects: %s", e.what());
1020
1021=== modified file 'src/map_io/map_objective_packet.cc'
1022--- src/map_io/map_objective_packet.cc 2014-10-12 07:35:42 +0000
1023+++ src/map_io/map_objective_packet.cc 2015-10-24 15:45:00 +0000
1024@@ -64,7 +64,7 @@
1025 }
1026 }
1027 } else {
1028- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
1029+ throw UnhandledVersionError("MapObjectivePacket", packet_version, kCurrentPacketVersion);
1030 }
1031 } catch (const WException & e) {
1032 throw GameDataError("Objectives: %s", e.what());
1033
1034=== modified file 'src/map_io/map_player_names_and_tribes_packet.cc'
1035--- src/map_io/map_player_names_and_tribes_packet.cc 2014-10-31 07:46:04 +0000
1036+++ src/map_io/map_player_names_and_tribes_packet.cc 2015-10-24 15:45:00 +0000
1037@@ -75,7 +75,7 @@
1038 map->set_scenario_player_closeable(p, s.get_bool ("closeable", false));
1039 }
1040 } else {
1041- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
1042+ throw UnhandledVersionError("MapPlayerNamesAndTribesPacket", packet_version, kCurrentPacketVersion);
1043 }
1044 } catch (const WException & e) {
1045 throw GameDataError("player names and tribes: %s", e.what());
1046
1047=== modified file 'src/map_io/map_player_position_packet.cc'
1048--- src/map_io/map_player_position_packet.cc 2014-10-31 07:46:04 +0000
1049+++ src/map_io/map_player_position_packet.cc 2015-10-24 15:45:00 +0000
1050@@ -58,7 +58,7 @@
1051 }
1052 }
1053 } else {
1054- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
1055+ throw UnhandledVersionError("MapPlayerPositionPacket", packet_version, kCurrentPacketVersion);
1056 }
1057 } catch (const WException & e) {
1058 throw GameDataError("player positions: %s", e.what());
1059
1060=== modified file 'src/map_io/map_players_view_packet.cc'
1061--- src/map_io/map_players_view_packet.cc 2015-04-15 17:52:52 +0000
1062+++ src/map_io/map_players_view_packet.cc 2015-10-24 15:45:00 +0000
1063@@ -347,7 +347,7 @@
1064 m.csi.completedtime = immovables_file.unsigned_32();
1065 }
1066 } else {
1067- throw UnhandledVersionError(version, kCurrentPacketVersionImmovables);
1068+ throw UnhandledVersionError("MapPlayersViewPacket", version, kCurrentPacketVersionImmovables);
1069 }
1070 break;
1071 case 4: // The player sees a port dock
1072@@ -660,7 +660,8 @@
1073 if (node_immovable_kinds_file_version == kCurrentPacketVersionImmovableKinds) {
1074 imm_kind = node_immovable_kinds_file.unsigned_8();
1075 } else {
1076- throw UnhandledVersionError(node_immovable_kinds_file_version,
1077+ throw UnhandledVersionError("MapPlayersViewPacket - Node Immovable kinds",
1078+ node_immovable_kinds_file_version,
1079 kCurrentPacketVersionImmovableKinds);
1080 }
1081 MapObjectData mod =
1082@@ -677,7 +678,8 @@
1083 f_player_field.border_br = borders & 4;
1084 f_player_field.border_bl = borders & 8;
1085 } else {
1086- throw UnhandledVersionError(border_file_version, kCurrentPacketVersionBorder);
1087+ throw UnhandledVersionError("MapPlayersViewPacket - Border file",
1088+ border_file_version, kCurrentPacketVersionBorder);
1089 }
1090 break;
1091 }
1092@@ -720,13 +722,15 @@
1093 if (terrains_file_version == kCurrentPacketVersionTerrains) {
1094 f_player_field.terrains.d = terrains_file.unsigned_8();
1095 } else {
1096- throw UnhandledVersionError(terrains_file_version, kCurrentPacketVersionTerrains);
1097+ throw UnhandledVersionError("MapPlayersViewPacket - Terrains",
1098+ terrains_file_version, kCurrentPacketVersionTerrains);
1099 }
1100 uint8_t im_kind = 0;
1101 if (triangle_immovable_kinds_file_version == kCurrentPacketVersionImmovableKinds) {
1102 im_kind = triangle_immovable_kinds_file.unsigned_8();
1103 } else {
1104- throw UnhandledVersionError(triangle_immovable_kinds_file_version,
1105+ throw UnhandledVersionError("MapPlayersViewPacket - Triangle Immovable kinds",
1106+ triangle_immovable_kinds_file_version,
1107 kCurrentPacketVersionImmovableKinds);
1108 }
1109 MapObjectData mod =
1110@@ -747,13 +751,15 @@
1111 if (terrains_file_version == kCurrentPacketVersionTerrains) {
1112 f_player_field.terrains.r = terrains_file.unsigned_8();
1113 } else {
1114- throw UnhandledVersionError(terrains_file_version, kCurrentPacketVersionTerrains);
1115+ throw UnhandledVersionError("MapPlayersViewPacket - Terrains",
1116+ terrains_file_version, kCurrentPacketVersionTerrains);
1117 }
1118 uint8_t im_kind = 0;
1119 if (triangle_immovable_kinds_file_version == kCurrentPacketVersionImmovableKinds) {
1120 im_kind = triangle_immovable_kinds_file.unsigned_8();
1121 } else {
1122- throw UnhandledVersionError(triangle_immovable_kinds_file_version,
1123+ throw UnhandledVersionError("MapPlayersViewPacket - Triangle Immovable kinds",
1124+ triangle_immovable_kinds_file_version,
1125 kCurrentPacketVersionImmovableKinds);
1126 }
1127 MapObjectData mod =
1128@@ -772,7 +778,8 @@
1129 if (road_file_version == kCurrentPacketVersionRoads) {
1130 roads = roads_file.unsigned_8();
1131 } else {
1132- throw UnhandledVersionError(road_file_version, kCurrentPacketVersionRoads);
1133+ throw UnhandledVersionError("MapPlayersViewPacket - Road file",
1134+ road_file_version, kCurrentPacketVersionRoads);
1135 }
1136 }
1137 if (f_seen | br_seen) {
1138@@ -783,7 +790,8 @@
1139 if (road_file_version == kCurrentPacketVersionRoads) {
1140 roads |= roads_file.unsigned_8();
1141 } else {
1142- throw UnhandledVersionError(road_file_version, kCurrentPacketVersionRoads);
1143+ throw UnhandledVersionError("MapPlayersViewPacket - Road file",
1144+ road_file_version, kCurrentPacketVersionRoads);
1145 }
1146 }
1147 if (f_seen | r_seen) {
1148@@ -794,7 +802,8 @@
1149 if (road_file_version == kCurrentPacketVersionRoads) {
1150 roads |= roads_file.unsigned_8();
1151 } else {
1152- throw UnhandledVersionError(road_file_version, kCurrentPacketVersionRoads);
1153+ throw UnhandledVersionError("MapPlayersViewPacket - Road file",
1154+ road_file_version, kCurrentPacketVersionRoads);
1155 }
1156 }
1157 roads |= f.field->get_roads() & mask;
1158@@ -811,13 +820,15 @@
1159 survey = (f_everseen & bl_everseen & br_everseen)
1160 && surveys_file.unsigned_8();
1161 } else {
1162- throw UnhandledVersionError(surveys_file_version, kCurrentPacketVersionSurveys);
1163+ throw UnhandledVersionError("MapPlayersViewPacket - Surveys file",
1164+ surveys_file_version, kCurrentPacketVersionSurveys);
1165 }
1166 if (survey) {
1167 if (survey_amounts_file_version == kCurrentPacketVersionSurveyAmounts) {
1168 f_player_field.resource_amounts.d = survey_amounts_file.unsigned_8();
1169 } else {
1170- throw UnhandledVersionError(survey_amounts_file_version,
1171+ throw UnhandledVersionError("MapPlayersViewPacket - Survey amounts",
1172+ survey_amounts_file_version,
1173 kCurrentPacketVersionSurveyAmounts);
1174 }
1175 try {
1176@@ -847,13 +858,15 @@
1177 survey = (f_everseen & br_everseen & r_everseen)
1178 && surveys_file.unsigned_8();
1179 } else {
1180- throw UnhandledVersionError(surveys_file_version, kCurrentPacketVersionSurveys);
1181+ throw UnhandledVersionError("MapPlayersViewPacket - Surveys file",
1182+ surveys_file_version, kCurrentPacketVersionSurveys);
1183 }
1184 if (survey) {
1185 if (survey_amounts_file_version == kCurrentPacketVersionSurveyAmounts) {
1186 f_player_field.resource_amounts.r = survey_amounts_file.unsigned_8();
1187 } else {
1188- throw UnhandledVersionError(survey_amounts_file_version,
1189+ throw UnhandledVersionError("MapPlayersViewPacket - Survey amounts",
1190+ survey_amounts_file_version,
1191 kCurrentPacketVersionSurveyAmounts);
1192 }
1193 try {
1194
1195=== modified file 'src/map_io/map_port_spaces_packet.cc'
1196--- src/map_io/map_port_spaces_packet.cc 2015-04-11 21:03:05 +0000
1197+++ src/map_io/map_port_spaces_packet.cc 2015-10-24 15:45:00 +0000
1198@@ -56,7 +56,7 @@
1199 map.set_port_space(get_safe_coords(std::to_string(static_cast<unsigned int>(i)), ext, &s2), true);
1200 }
1201 } else {
1202- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
1203+ throw UnhandledVersionError("MapPortSpacesPacket", packet_version, kCurrentPacketVersion);
1204 }
1205 } catch (const WException & e) {
1206 throw GameDataError("port_spaces data: %s", e.what());
1207
1208=== modified file 'src/map_io/map_resources_packet.cc'
1209--- src/map_io/map_resources_packet.cc 2015-04-11 21:03:05 +0000
1210+++ src/map_io/map_resources_packet.cc 2015-10-24 15:45:00 +0000
1211@@ -90,7 +90,7 @@
1212 }
1213 }
1214 } else {
1215- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
1216+ throw UnhandledVersionError("MapResourcesPacket", packet_version, kCurrentPacketVersion);
1217 }
1218 } catch (const WException & e) {
1219 throw GameDataError("port spaces: %s", e.what());
1220
1221=== modified file 'src/map_io/map_road_packet.cc'
1222--- src/map_io/map_road_packet.cc 2014-10-12 07:35:42 +0000
1223+++ src/map_io/map_road_packet.cc 2015-10-24 15:45:00 +0000
1224@@ -61,7 +61,7 @@
1225 }
1226 }
1227 } else {
1228- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
1229+ throw UnhandledVersionError("MapRoadPacket", packet_version, kCurrentPacketVersion);
1230 }
1231 } catch (const WException & e) {
1232 throw GameDataError("road: %s", e.what());
1233
1234=== modified file 'src/map_io/map_roaddata_packet.cc'
1235--- src/map_io/map_roaddata_packet.cc 2015-04-11 21:03:05 +0000
1236+++ src/map_io/map_roaddata_packet.cc 2015-10-24 15:45:00 +0000
1237@@ -177,7 +177,7 @@
1238 }
1239 }
1240 } else {
1241- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
1242+ throw UnhandledVersionError("MapRoaddataPacket", packet_version, kCurrentPacketVersion);
1243 }
1244 } catch (const WException & e) {
1245 throw GameDataError("roaddata: %s", e.what());
1246
1247=== modified file 'src/map_io/map_scripting_packet.cc'
1248--- src/map_io/map_scripting_packet.cc 2015-04-11 21:03:05 +0000
1249+++ src/map_io/map_scripting_packet.cc 2015-10-24 15:45:00 +0000
1250@@ -64,7 +64,7 @@
1251 upcast(LuaGameInterface, lgi, &g->lua());
1252 lgi->read_global_env(fr, mol, fr.unsigned_32());
1253 } else {
1254- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
1255+ throw UnhandledVersionError("MapScriptingPacket", packet_version, kCurrentPacketVersion);
1256 }
1257 } catch (const WException & e) {
1258 throw GameDataError("scripting: %s", e.what());
1259
1260=== modified file 'src/map_io/map_terrain_packet.cc'
1261--- src/map_io/map_terrain_packet.cc 2014-10-12 07:35:42 +0000
1262+++ src/map_io/map_terrain_packet.cc 2015-10-24 15:45:00 +0000
1263@@ -74,7 +74,7 @@
1264 f.set_terrain_d(smap[fr.unsigned_8()]);
1265 }
1266 } else {
1267- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
1268+ throw UnhandledVersionError("MapTerrainPacket", packet_version, kCurrentPacketVersion);
1269 }
1270 } catch (const WException & e) {
1271 throw GameDataError("terrain: %s", e.what());
1272
1273=== modified file 'src/map_io/map_version_packet.cc'
1274--- src/map_io/map_version_packet.cc 2014-10-12 07:35:42 +0000
1275+++ src/map_io/map_version_packet.cc 2015-10-24 15:45:00 +0000
1276@@ -68,7 +68,7 @@
1277 uint32_t ts = static_cast<uint32_t>(globv.get_safe_int("map_version_timestamp"));
1278 map.m_map_version.m_map_version_timestamp = ts;
1279 } else {
1280- throw UnhandledVersionError(packet_version, kCurrentPacketVersion);
1281+ throw UnhandledVersionError("MapVersionPacket", packet_version, kCurrentPacketVersion);
1282 }
1283 } catch (const WException & e) {
1284 throw GameDataError("version: %s", e.what());

Subscribers

People subscribed via source and target branches

to status/vote changes: