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

show the oos savegame dialog when receiving a debug command in mp

Browse source 
with a different text of course.

fixes #2683
This commit is contained in:
gfgtdf 2018-03-24 12:05:52 +01:00 • committed by Charles Dang
parent da2081de77
commit 7621af926b
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/play_controller.hpp
View file

@ -365,7 +365,6 @@ public:
void show_objectives() const;
protected:
struct scoped_savegame_snapshot
{
scoped_savegame_snapshot(const play_controller& controller);
@ -374,6 +373,9 @@ protected:
const play_controller& controller_;
};
saved_game& get_saved_game() { return saved_game_; }
protected:
friend struct scoped_savegame_snapshot;
void play_slice_catch();

24
src/synced_commands.cpp
View file

@ -32,6 +32,7 @@
#include "units/helper.hpp"
#include "recall_list_manager.hpp"
#include "resources.hpp"
#include "savegame.hpp"
#include "scripting/game_lua_kernel.hpp"
#include "formula/string_utils.hpp"
#include "units/types.hpp"
@ -389,11 +390,24 @@ namespace
{
void debug_notification(const char* message)
{
utils::string_map symbols;
symbols["player"] = resources::controller->current_team().current_player();
display::announce_options announce_options;
announce_options.lifetime = 250;
display::get_singleton()->announce(VGETTEXT(message, symbols), font::NORMAL_COLOR, announce_options);
auto& controller = *resources::controller;
auto& current_team = controller.current_team();
static bool ignore = false;
bool show_long_message = controller.is_replay() || !current_team.is_local();
if(show_long_message && !ignore) {
play_controller::scoped_savegame_snapshot snapshot(controller);
std::stringstream sbuilder;
// TODO: improve message and mark translatable.
sbuilder << "The game detected the use of a debug command, maybe another player is cheating";
sbuilder << "\n\n" << "details:" << "\n\n" << VGETTEXT(message, {{"player", current_team.current_player()}});
savegame::oos_savegame save(controller.get_saved_game(), ignore);
save.save_game_interactive(sbuilder.str(), savegame::savegame::YES_NO); // can throw quit_game_exception
}
else {
display::announce_options announce_options;
display::get_singleton()->announce(VGETTEXT(message, {{"player", current_team.current_player()}}), font::NORMAL_COLOR, announce_options);
}
}
}
SYNCED_COMMAND_HANDLER_FUNCTION(debug_unit, child, use_undo, /*show*/, /*error_handler*/)