upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-09 00:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix some compiler warnings

Browse Source
This commit is contained in:
gfgtdf 2015-09-09 17:44:51 +02:00
parent 81b6c3ab99
commit 02990bafbf
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game_state.cpp
View File

@ -61,7 +61,7 @@ game_state::game_state(const config & level, play_controller & pc, const tdata_c
{
init(pc.ticks(), pc, level);
}
game_state::game_state(const config & level, play_controller & pc, const tdata_cache & tdata, game_board& board) :
game_state::game_state(const config & level, play_controller & pc, game_board& board) :
gamedata_(level),
board_(board),
tod_manager_(level),

2
src/game_state.hpp
View File

@ -65,7 +65,7 @@ public:
game_state(const config & level, play_controller &, const tdata_cache & tdata);
/// The third parameter is an optimisation.
game_state(const config & level, play_controller &, const tdata_cache & tdata, game_board& board);
game_state(const config & level, play_controller &, game_board& board);
~game_state();

2
src/play_controller.cpp
View File

@ -138,6 +138,7 @@ play_controller::play_controller(const config& level, saved_game& state_of_game,
: controller_base(game_config, video)
, observer()
, savegame_config()
, ticks_(ticks)
, tdata_(tdata)
, gamestate_()
, level_()
@ -161,7 +162,6 @@ play_controller::play_controller(const config& level, saved_game& state_of_game,
, skip_replay_(skip_replay)
, linger_(false)
, init_side_done_now_(false)
, ticks_(ticks)
, victory_when_enemies_defeated_(level["victory_when_enemies_defeated"].to_bool(true))
, remove_from_carryover_on_defeat_(level["remove_from_carryover_on_defeat"].to_bool(true))
, end_level_data_()

2
src/play_controller.hpp
View File

@ -261,6 +261,7 @@ protected:
//gamestate
const tdata_cache & tdata_;
boost::scoped_ptr<game_state> gamestate_;
config level_;
saved_game & saved_game_;
//managers
@ -318,7 +319,6 @@ private:
std::vector<std::string> victory_music_;
std::vector<std::string> defeat_music_;
config level_;
hotkey::scope_changer scope_;
// used to sync with the mpserver, not persistent in savefiles.
int server_request_number_;