[Widelands-cvs] SF.net SVN: widelands:[4474] trunk/src/map_io/ widelands_map_bobdata_data_packet.cc

[<si...@us...>]

Revision: 4474
          http://widelands.svn.sourceforge.net/widelands/?rev=4474&view=rev
Author:   sigra
Date:     2009-08-10 00:54:47 +0000 (Mon, 10 Aug 2009)

Log Message:
-----------
Reject the savegame if it contains a soldier with hp_max < hp_current (which is invalid and should never have been saved).

Modified Paths:
--------------
    trunk/src/map_io/widelands_map_bobdata_data_packet.cc

Modified: trunk/src/map_io/widelands_map_bobdata_data_packet.cc
===================================================================
--- trunk/src/map_io/widelands_map_bobdata_data_packet.cc	2009-08-10 00:47:25 UTC (rev 4473)
+++ trunk/src/map_io/widelands_map_bobdata_data_packet.cc	2009-08-10 00:54:47 UTC (rev 4474)
@@ -400,6 +400,10 @@
 							soldier->m_hp_max =
 								broken_hp_compensation + fr.Unsigned32();
 						}
+						if (soldier->m_hp_max < soldier->m_hp_current)
+							throw wexception
+								("hp_max (%u) < hp_current (%u)",
+								 soldier->m_hp_max, soldier->m_hp_current);
 						if (soldier->m_hp_max < min_hp) {
 							//  The soldier's type's definition may have changed, so
 							//  that max_hp must be larger. Adjust it and scale up the


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.