upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-07 16:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove some unused commented out code.

Browse Source 
Added in 2007-08-07T17:28:04Z!koraq@xs4all.nl and unused since. nNa discovered the unwanted
translatable strings it added, so remove the code to remove the strings.
This commit is contained in:
Mark de Wever 2010-10-08 19:45:36 +00:00
parent 59e3676759
commit 3a1fa9c1fa
7 changed files with 0 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hotkeys.cpp
View File

@ -200,10 +200,6 @@ const struct {
{ hotkey::HOTKEY_CUSTOM_CMD, "customcommand", N_("Custom command"), false, hotkey::SCOPE_GAME },
{ hotkey::HOTKEY_AI_FORMULA, "aiformula", N_("Run AI formula"), false, hotkey::SCOPE_GAME },
{ hotkey::HOTKEY_CLEAR_MSG, "clearmessages", N_("Clear messages"), false, hotkey::SCOPE_GAME },
#ifdef USRCMD2
{ hotkey::HOTKEY_USER_CMD_2, "usercommand#2", N_("User-Command#2"), false, hotkey::SCOPE_GAME },
{ hotkey::HOTKEY_USER_CMD_3, "usercommand#3", N_("User-Command#3"), false, hotkey::SCOPE_GAME },
#endif
{
hotkey::TITLE_SCREEN__RELOAD_WML
, "title_screen__reload_wml"
@ -891,16 +887,6 @@ bool command_executor::execute_command(HOTKEY_COMMAND command, int /*index*/)
case HOTKEY_CLEAR_MSG:
clear_messages();
break;
#ifdef USRCMD2
case HOTKEY_USER_CMD_2:
//user_command();
user_command_2();
break;
case HOTKEY_USER_CMD_3:
user_command_3();
break;
#endif
case HOTKEY_LANGUAGE:
change_language();
break;

8
src/hotkeys.hpp
View File

@ -104,10 +104,6 @@ enum HOTKEY_COMMAND {
HOTKEY_CUSTOM_CMD,
HOTKEY_AI_FORMULA,
HOTKEY_CLEAR_MSG,
#ifdef USRCMD2
HOTKEY_USER_CMD_2,
HOTKEY_USER_CMD_3,
#endif
/* Gui2 specific hotkeys. */
TITLE_SCREEN__RELOAD_WML,
TITLE_SCREEN__NEXT_TIP,
@ -303,10 +299,6 @@ public:
virtual void custom_command() {}
virtual void ai_formula() {}
virtual void clear_messages() {}
#ifdef USRCMD2
virtual void user_command_2() {}
virtual void user_command_3() {}
#endif
virtual void change_language() {}
virtual void play_replay() {}
virtual void reset_replay() {}

17
src/menu_events.cpp
View File

@ -3619,23 +3619,6 @@ void menu_handler::clear_messages()
gui_->clear_chat_messages(); // also clear debug-messages and WML-error-messages
}
#ifdef USRCMD2
// not used yet - for future hotkey-commands:
void menu_handler::user_command_2()
{
gui2::show_transient_message(*gui_.video(), "Test", "User-Command#2");
//sound::play_bell(game_config::sounds::turn_bell);
sound::play_bell("bell.wav");
}
void menu_handler::user_command_3()
{
gui2::show_transient_message(*gui_.video(), "Info", _("User-Command#3"));
//gui2::show_error_message(disp().video(), "User-Command#3");
//sound::play_sound("heal.wav");
sound::play_sound("select.wav");
}
#endif
void menu_handler::change_controller(const std::string& side, const std::string& controller)
{
config cfg;

4
src/menu_events.hpp
View File

@ -85,10 +85,6 @@ public:
void custom_command();
void ai_formula();
void clear_messages();
#ifdef USRCMD2
void user_command_2();
void user_command_3();
#endif
std::vector<std::string> get_commands_list();
unit_map::iterator current_unit();

5
src/play_controller.cpp
View File

@ -774,11 +774,6 @@ bool play_controller::can_execute_command(hotkey::HOTKEY_COMMAND command, int in
case hotkey::HOTKEY_CUSTOM_CMD:
case hotkey::HOTKEY_AI_FORMULA:
case hotkey::HOTKEY_CLEAR_MSG:
#ifdef USRCMD2
//%%
case hotkey::HOTKEY_USER_CMD_2:
case hotkey::HOTKEY_USER_CMD_3:
#endif
return true;
// Commands that have some preconditions:

11
src/playsingle_controller.cpp
View File

@ -239,17 +239,6 @@ void playsingle_controller::whiteboard_bump_down_action()
whiteboard_manager_->contextual_bump_down_action();
}
#ifdef USRCMD2
void playsingle_controller::user_command_2(){
menu_handler_.user_command_2();
}
void playsingle_controller::user_command_3(){
menu_handler_.user_command_3();
}
#endif
void playsingle_controller::report_victory(
std::ostringstream &report, int player_gold, int remaining_gold,
int finishing_bonus_per_turn, int turns_left, int finishing_bonus)

4
src/playsingle_controller.hpp
View File

@ -64,10 +64,6 @@ public:
virtual void whiteboard_delete_action();
virtual void whiteboard_bump_up_action();
virtual void whiteboard_bump_down_action();
#ifdef USRCMD2
virtual void user_command_2();
virtual void user_command_3();
#endif
void linger();
virtual void force_end_level(LEVEL_RESULT res)