diff --git a/src/data/card.cpp b/src/data/card.cpp index a85a5963..80f13d95 100644 --- a/src/data/card.cpp +++ b/src/data/card.cpp @@ -16,13 +16,11 @@ DECLARE_TYPEOF_COLLECTION(FieldP); // ----------------------------------------------------------------------------- : Card -IMPLEMENT_DYNAMIC_ARG(Game*, game_for_new_cards, nullptr); - Card::Card() { - if (!game_for_new_cards()) { - throw InternalError(_("game_for_new_cards not set")); + if (!game_for_reading()) { + throw InternalError(_("game_for_reading not set")); } - data.init(game_for_new_cards()->card_fields); + data.init(game_for_reading()->card_fields); } Card::Card(const Game& game) { diff --git a/src/data/card.hpp b/src/data/card.hpp index b4671e61..765d357d 100644 --- a/src/data/card.hpp +++ b/src/data/card.hpp @@ -11,7 +11,6 @@ #include #include -#include class Game; DECLARE_POINTER_TYPE(Field); @@ -20,9 +19,6 @@ DECLARE_POINTER_TYPE(StyleSheet); // ----------------------------------------------------------------------------- : Card -/// Game that is used for cards constructed with the default constructor -DECLARE_DYNAMIC_ARG(Game*, game_for_new_cards); - /// A card from a card Set class Card { public: diff --git a/src/data/game.cpp b/src/data/game.cpp index 63c60b21..7198dd9c 100644 --- a/src/data/game.cpp +++ b/src/data/game.cpp @@ -14,6 +14,8 @@ // ----------------------------------------------------------------------------- : Game +IMPLEMENT_DYNAMIC_ARG(Game*, game_for_reading, nullptr); + GameP Game::byName(const String& name) { return packages.open(name + _(".mse-game")); } @@ -35,7 +37,6 @@ InputStreamP Game::openIconFile() { } IMPLEMENT_REFLECTION(Game) { -// ioMseVersion(io, fileName, fileVersion); REFLECT(full_name); REFLECT_N("icon", icon_filename); REFLECT(init_script); diff --git a/src/data/game.hpp b/src/data/game.hpp index 5b3c0022..bd56937b 100644 --- a/src/data/game.hpp +++ b/src/data/game.hpp @@ -12,15 +12,20 @@ #include #include #include