ADded support for enitty information printing, print current armor values for ships, print death messages

1 files changed, 7 insertions, 0 deletions

diff --git a/src/game/base/savegame.cc b/src/game/base/savegame.cc
index 90f3a57..85388f0 100644
--- a/src/game/base/savegame.cc
+++ b/src/game/base/savegame.cc
@@ -25,6 +25,7 @@ void SaveGame::load_game(core::Player *player, filesystem::IniFile & inifile)
 	core::Item *item = 0;
 	std::string itemtype;
 	std::string itemlabel;
+	float armor;
 
 	while (inifile.getline()) {
 
@@ -137,6 +138,9 @@ void SaveGame::load_game(core::Player *player, filesystem::IniFile & inifile)
 					if (ship) {
 						ship->set_spawn(spawn_entity);
 					}
+				} else if (inifile.got_key_float("armor", armor)) {
+					continue;
+					
 				} else {
 					inifile.unknown_key();
 				}
@@ -204,6 +208,8 @@ void SaveGame::load_game(core::Player *player, filesystem::IniFile & inifile)
 		ship->inventory()->recalculate();
 		ship->inventory()->set_dirty();
 		
+		ship->set_armor(armor);
+		
 		if (!zone) {
 			zone = Default::zone;
 		}
@@ -283,6 +289,7 @@ void SaveGame::ship_to_stream(Ship *ship, std::ostream & os)
 		os << ship->spawn()->zone()->label() << ":" << ship->spawn()->label();
 	}
 	os << std::endl;
+	os << "armor=" << ship->armor() << std::endl;
 }
 
 void SaveGame::inventory_to_stream(core::Inventory *inventory, std::ostream & os)