0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert 'option to disable most of spmp patch'

Browse source 
That commit was meant as a plan b in case we couldn't fix the spmp
related bugs which are now fixed.
This commit is contained in:
gfgtdf 2015-08-27 15:25:21 +02:00
parent 30dc78636b
commit 2fb119d964
4 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/game_config.cpp
View file

@ -49,7 +49,6 @@ namespace game_config
const int gold_carryover_percentage = 80;
const std::string version = VERSION;
std::string default_terrain;
bool spmp_hotfix = false;
#ifdef REVISION
const std::string revision = VERSION " (" REVISION ")";
#elif defined(VCS_SHORT_HASH) && defined(VCS_WC_MODIFIED)

1
src/game_config.hpp
View file

@ -41,7 +41,6 @@ namespace game_config
extern const std::string version;
extern const std::string revision;
extern std::string default_terrain;
extern bool spmp_hotfix;
inline int kill_xp(int level)
{

2
src/game_initialization/playcampaign.cpp
View file

@ -365,7 +365,7 @@ LEVEL_RESULT play_game(game_display& disp, saved_game& gamestate,
// Retrieve next scenario data.
gamestate.expand_scenario();
if (gamestate.valid() && (game_type == game_classification::CAMPAIGN_TYPE::MULTIPLAYER || !game_config::spmp_hotfix)) {
if (gamestate.valid()) {
//note that although starting_pos is const it might be changed by gamestate.some_non_const_operation() .
const config& starting_pos = gamestate.get_starting_pos();

5
src/game_initialization/singleplayer.cpp
View file

@ -1,7 +1,6 @@
#include "singleplayer.hpp"
#include "config.hpp"
#include "config_assign.hpp"
#include "game_config.hpp"
#include "game_config_manager.hpp"
#include "gui/dialogs/campaign_selection.hpp"
#include "gui/dialogs/message.hpp"
@ -122,9 +121,7 @@ bool enter_create_mode(game_display& disp, const config& game_config,
std::cerr << "Cannot load scenario with id=" << state.get_scenario_id() << "\n";
return false;
}
if (!game_config::spmp_hotfix) {
configure_canceled = !enter_configure_mode(disp, game_config_manager::get()->game_config(), state, local_players_only);
}
configure_canceled = !enter_configure_mode(disp, game_config_manager::get()->game_config(), state, local_players_only);
} while (configure_canceled);