From 025a4defa7cc1ad42c86fe9e1b49d1cb6fa45737 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sat, 2 Mar 2013 11:21:08 +0000 Subject: Corrected line number in a loadgame error message. --- src/game/base/savegame.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/game/base/savegame.cc b/src/game/base/savegame.cc index ca911ec..789bdb1 100644 --- a/src/game/base/savegame.cc +++ b/src/game/base/savegame.cc @@ -152,13 +152,17 @@ void SaveGame::load_game(core::Player *player, filesystem::IniFile & inifile) } else if (inifile.in_section("item")) { if (inifile.got_key_label("type", itemtype)) { - continue; + core::InfoType *item_infotype = core::InfoType::find(itemtype); + if (!itemtype.size() || !item_infotype) { + inifile.unknown_error("invalid item type '" + itemtype +"'"); + continue; + } } else if (inifile.got_key_label("label", itemlabel)) { if (!item && ship) { core::InfoType *item_infotype = core::InfoType::find(itemtype); if (!itemtype.size() || !item_infotype) { - inifile.unknown_error("invalid item type '" + itemtype +"'"); + // inifile.unknown_error("invalid item type '" + itemtype +"'"); continue; } @@ -167,6 +171,7 @@ void SaveGame::load_game(core::Player *player, filesystem::IniFile & inifile) inifile.unknown_error("invalid item label '" + itemlabel +"'"); continue; } + item = new core::Item(item_info); ship->inventory()->add(item); } -- cgit v1.2.3