dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r24791) -Remove: Difficulty settings window.

Browse Source
This commit is contained in:
frosch
2012-12-05 19:37:15 +00:00
parent 76fef0843c
commit 5d80d59aa6
71 changed files with 20 additions and 1740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/script/api/game/game_window.hpp.sq
View File

@@ -26,7 +26,6 @@ void SQGSWindow_Register(Squirrel *engine)
SQGSWindow.DefSQConst(engine, ScriptWindow::WN_GAME_OPTIONS_NEWGRF_STATE, "WN_GAME_OPTIONS_NEWGRF_STATE");
SQGSWindow.DefSQConst(engine, ScriptWindow::WN_GAME_OPTIONS_MESSAGE_OPTION, "WN_GAME_OPTIONS_MESSAGE_OPTION");
SQGSWindow.DefSQConst(engine, ScriptWindow::WN_GAME_OPTIONS_GAME_OPTIONS, "WN_GAME_OPTIONS_GAME_OPTIONS");
SQGSWindow.DefSQConst(engine, ScriptWindow::WN_GAME_OPTIONS_GAME_DIFFICULTY, "WN_GAME_OPTIONS_GAME_DIFFICULTY");
SQGSWindow.DefSQConst(engine, ScriptWindow::WN_GAME_OPTIONS_GAME_SETTINGS, "WN_GAME_OPTIONS_GAME_SETTINGS");
SQGSWindow.DefSQConst(engine, ScriptWindow::WN_QUERY_STRING, "WN_QUERY_STRING");
SQGSWindow.DefSQConst(engine, ScriptWindow::WN_QUERY_STRING_SIGN, "WN_QUERY_STRING_SIGN");
@@ -579,7 +578,7 @@ void SQGSWindow_Register(Squirrel *engine)
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_SGI_TRANSLATION_SELECTION, "WID_SGI_TRANSLATION_SELECTION");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_SGI_TRANSLATION, "WID_SGI_TRANSLATION");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_SGI_OPTIONS, "WID_SGI_OPTIONS");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_SGI_DIFFICULTIES, "WID_SGI_DIFFICULTIES");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_SGI_HIGHSCORE, "WID_SGI_HIGHSCORE");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_SGI_SETTINGS_OPTIONS, "WID_SGI_SETTINGS_OPTIONS");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_SGI_GRF_SETTINGS, "WID_SGI_GRF_SETTINGS");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_SGI_CONTENT_DOWNLOAD, "WID_SGI_CONTENT_DOWNLOAD");
@@ -990,10 +989,6 @@ void SQGSWindow_Register(Squirrel *engine)
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_GO_BASE_MUSIC_STATUS, "WID_GO_BASE_MUSIC_STATUS");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_GO_BASE_MUSIC_TEXTFILE, "WID_GO_BASE_MUSIC_TEXTFILE");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_GO_BASE_MUSIC_DESCRIPTION, "WID_GO_BASE_MUSIC_DESCRIPTION");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_GD_HIGHSCORE, "WID_GD_HIGHSCORE");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_GD_ACCEPT, "WID_GD_ACCEPT");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_GD_CANCEL, "WID_GD_CANCEL");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_GD_OPTIONS_START, "WID_GD_OPTIONS_START");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_GS_FILTER, "WID_GS_FILTER");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_GS_OPTIONSPANEL, "WID_GS_OPTIONSPANEL");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_GS_SCROLLBAR, "WID_GS_SCROLLBAR");

13
src/script/api/script_window.hpp
View File

@@ -96,7 +96,6 @@ public:
WN_GAME_OPTIONS_NEWGRF_STATE = ::WN_GAME_OPTIONS_NEWGRF_STATE, ///< NewGRF settings.
WN_GAME_OPTIONS_MESSAGE_OPTION = ::WN_GAME_OPTIONS_MESSAGE_OPTION, ///< News settings.
WN_GAME_OPTIONS_GAME_OPTIONS = ::WN_GAME_OPTIONS_GAME_OPTIONS, ///< Game options.
WN_GAME_OPTIONS_GAME_DIFFICULTY = ::WN_GAME_OPTIONS_GAME_DIFFICULTY, ///< Game difficulty.
WN_GAME_OPTIONS_GAME_SETTINGS = ::WN_GAME_OPTIONS_GAME_SETTINGS, ///< Game settings.
WN_QUERY_STRING = ::WN_QUERY_STRING, ///< Query string.
@@ -682,7 +681,6 @@ public:
* - #WN_GAME_OPTIONS_NEWGRF_STATE = #NewGRFStateWidgets
* - #WN_GAME_OPTIONS_MESSAGE_OPTION = #MessageOptionWidgets
* - #WN_GAME_OPTIONS_GAME_OPTIONS = #GameOptionsWidgets
* - #WN_GAME_OPTIONS_GAME_DIFFICULTY = #GameDifficultyWidgets
* - #WN_GAME_OPTIONS_GAME_SETTINGS = #GameSettingsWidgets
*/
WC_GAME_OPTIONS = ::WC_GAME_OPTIONS,
@@ -1478,7 +1476,7 @@ public:
WID_SGI_TRANSLATION_SELECTION = ::WID_SGI_TRANSLATION_SELECTION, ///< Translation selection.
WID_SGI_TRANSLATION = ::WID_SGI_TRANSLATION, ///< Translation.
WID_SGI_OPTIONS = ::WID_SGI_OPTIONS, ///< Options button.
WID_SGI_DIFFICULTIES = ::WID_SGI_DIFFICULTIES, ///< Difficulties button.
WID_SGI_HIGHSCORE = ::WID_SGI_HIGHSCORE, ///< Highscore button.
WID_SGI_SETTINGS_OPTIONS = ::WID_SGI_SETTINGS_OPTIONS, ///< Settings button.
WID_SGI_GRF_SETTINGS = ::WID_SGI_GRF_SETTINGS, ///< NewGRF button.
WID_SGI_CONTENT_DOWNLOAD = ::WID_SGI_CONTENT_DOWNLOAD, ///< Content Download button.
@@ -2096,15 +2094,6 @@ public:
WID_GO_BASE_MUSIC_DESCRIPTION = ::WID_GO_BASE_MUSIC_DESCRIPTION, ///< Description of selected base music set.
};
/** Widgets of the #GameDifficultyWindow class. */
enum GameDifficultyWidgets {
WID_GD_HIGHSCORE = ::WID_GD_HIGHSCORE, ///< Highscore button.
WID_GD_ACCEPT = ::WID_GD_ACCEPT, ///< Accept button.
WID_GD_CANCEL = ::WID_GD_CANCEL, ///< Cancel button.
WID_GD_OPTIONS_START = ::WID_GD_OPTIONS_START, ///< Start of the options.
};
/** Widgets of the #GameSettingsWindow class. */
enum GameSettingsWidgets {
WID_GS_FILTER = ::WID_GS_FILTER, ///< Text filter.

2
src/script/api/template/template_window.hpp.sq
View File

@@ -191,8 +191,6 @@ namespace SQConvert {
template <> inline int Return<ScriptWindow::BuildRoadStationWidgets>(HSQUIRRELVM vm, ScriptWindow::BuildRoadStationWidgets res) { sq_pushinteger(vm, (int32)res); return 1; }
template <> inline ScriptWindow::GameOptionsWidgets GetParam(ForceType<ScriptWindow::GameOptionsWidgets>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger(vm, index, &tmp); return (ScriptWindow::GameOptionsWidgets)tmp; }
template <> inline int Return<ScriptWindow::GameOptionsWidgets>(HSQUIRRELVM vm, ScriptWindow::GameOptionsWidgets res) { sq_pushinteger(vm, (int32)res); return 1; }
template <> inline ScriptWindow::GameDifficultyWidgets GetParam(ForceType<ScriptWindow::GameDifficultyWidgets>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger(vm, index, &tmp); return (ScriptWindow::GameDifficultyWidgets)tmp; }
template <> inline int Return<ScriptWindow::GameDifficultyWidgets>(HSQUIRRELVM vm, ScriptWindow::GameDifficultyWidgets res) { sq_pushinteger(vm, (int32)res); return 1; }
template <> inline ScriptWindow::GameSettingsWidgets GetParam(ForceType<ScriptWindow::GameSettingsWidgets>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger(vm, index, &tmp); return (ScriptWindow::GameSettingsWidgets)tmp; }
template <> inline int Return<ScriptWindow::GameSettingsWidgets>(HSQUIRRELVM vm, ScriptWindow::GameSettingsWidgets res) { sq_pushinteger(vm, (int32)res); return 1; }
template <> inline ScriptWindow::CustomCurrencyWidgets GetParam(ForceType<ScriptWindow::CustomCurrencyWidgets>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger(vm, index, &tmp); return (ScriptWindow::CustomCurrencyWidgets)tmp; }