From 4d51094236b79b5d525c771d6cd3d990b9e64df8 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Add GameEditData struct to contain *_info arrays --- src/game.hpp | 12 +++++++----- src/game_edit_data.hpp | 9 +++++++++ src/game_edit_data_fwd.hpp | 3 +++ 3 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 src/game_edit_data.hpp create mode 100644 src/game_edit_data_fwd.hpp diff --git a/src/game.hpp b/src/game.hpp index b4894fd6..5da479c9 100644 --- a/src/game.hpp +++ b/src/game.hpp @@ -1,6 +1,8 @@ #pragma once #include "game_fwd.hpp" + +#include "game_edit_data.hpp" #include "grid.hpp" #include "h-basic.h" #include "player_defs.hpp" @@ -23,9 +25,9 @@ struct Game { */ std::array player_hp { }; -}; + /** + * Game edit data + */ + GameEditData edit_data; -/** - * Game instance - */ -extern Game *game; +}; diff --git a/src/game_edit_data.hpp b/src/game_edit_data.hpp new file mode 100644 index 00000000..e05f6d60 --- /dev/null +++ b/src/game_edit_data.hpp @@ -0,0 +1,9 @@ +#pragma once + +/** + * Game edit data, i.e. the parsed contents of the edit .txt + * files. + */ +struct GameEditData { + +}; diff --git a/src/game_edit_data_fwd.hpp b/src/game_edit_data_fwd.hpp new file mode 100644 index 00000000..3c986dfa --- /dev/null +++ b/src/game_edit_data_fwd.hpp @@ -0,0 +1,3 @@ +#pragma once + +struct GameEditData; -- cgit v1.2.3