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

remove outcommented code

Browse source
This commit is contained in:
gfgtdf 2014-10-31 21:10:28 +01:00
parent afa7af6cdb
commit 9d52c08039
3 changed files with 0 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/mp_game_utils.cpp
View file

@ -131,20 +131,6 @@ config initial_level_config(saved_game& state)
game_config().find_child("modification", "id", mods[i]));
}
#if 0
// we have this alredy in [multiplayer]. If removing this causes a bug than that's most likley bacause some is searchin for this information at the wrng place (not in [multiplayer])
// If game was reloaded, params won't contain all required information and so we
// need to take it from the actual level config.
if (params.saved_game) {
level["observer"] = level.child("multiplayer")["observer"];
level["shuffle_sides"] = level.child("multiplayer")["shuffle_sides"];
} else {
level["observer"] = params.allow_observers;
level["shuffle_sides"] = params.shuffle_sides;
}
#endif
// This will force connecting clients to be using the same version number as us.
level["version"] = game_config::version;
return level;

18
src/play_controller.cpp
View file

@ -248,24 +248,6 @@ void play_controller::init(CVideo& video){
browse_ = true;
init_managers();
#if 0
// [era] and [modification] childs don't exist anymore in level_
// the events are now added in saved_game::expand_mp_events
// add era & mod events for MP game
if (const config &era_cfg = level_.child("era")) {
game_events::add_events(era_cfg.child_range("event"), "era_events");
}
if (level_.child_or_empty("modification")) {
BOOST_FOREACH (const config& mod_cfg, level_.child_range("modification")) {
game_events::add_events(mod_cfg.child_range("event"),
"mod_" + mod_cfg["id"].str() + "_events");
BOOST_FOREACH (const config::any_child& var_cfg, mod_cfg.child("variables").all_children_range()) {
gamestate_.gamedata_.add_variable_cfg(var_cfg.key, var_cfg.cfg);
}
}
}
#endif
loadscreen::global_loadscreen->start_stage("start game");
loadscreen_manager->reset();
}

37
src/synced_checkup.cpp
View file

@ -36,43 +36,6 @@ checkup::~checkup()
{
}
#if 0
void checkup::unit_checksum(const map_location& loc, bool local)
{
unit_map::iterator u = resources::units->find(loc);
bool equals;
config real;
config expected;
if (!u.valid()) {
std::stringstream message;
message << "non existent unit to checksum at " << loc.x+1 << "," << loc.y+1 << "!";
resources::screen->add_chat_message(time(NULL), "verification", 1, message.str(),
events::chat_handler::MESSAGE_PRIVATE, false);
}
else
{
expected["checksum"] = get_checksum(*u);
}
if(local)
{
equals = local_checkup(expected, real);
}
else
{
equals = this->networked_checkup(expected, real);
}
if(!equals && ((game_config::mp_debug && !local) || local))
{
std::stringstream message;
message << "checksum mismatch at " << loc.x+1 << "," << loc.y+1 << "!";
resources::screen->add_chat_message(time(NULL), "verification", 1, message.str(),
events::chat_handler::MESSAGE_PRIVATE, false);
}
}
#endif
ignored_checkup::ignored_checkup()
{