From 647ee0de64b74f714aea04b6e3bd0b4fb06f8694 Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 23 Dec 2012 21:06:37 +0000 Subject: (svn r24842) -Remove: News settings window. --- src/script/api/game/game_window.hpp.sq | 9 --------- src/script/api/script_window.hpp | 15 --------------- src/script/api/template/template_window.hpp.sq | 2 -- 3 files changed, 26 deletions(-) (limited to 'src/script') diff --git a/src/script/api/game/game_window.hpp.sq b/src/script/api/game/game_window.hpp.sq index 0eae42af4..4702f672d 100644 --- a/src/script/api/game/game_window.hpp.sq +++ b/src/script/api/game/game_window.hpp.sq @@ -24,7 +24,6 @@ void SQGSWindow_Register(Squirrel *engine) SQGSWindow.DefSQConst(engine, ScriptWindow::WN_GAME_OPTIONS_AI, "WN_GAME_OPTIONS_AI"); SQGSWindow.DefSQConst(engine, ScriptWindow::WN_GAME_OPTIONS_ABOUT, "WN_GAME_OPTIONS_ABOUT"); 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_SETTINGS, "WN_GAME_OPTIONS_GAME_SETTINGS"); SQGSWindow.DefSQConst(engine, ScriptWindow::WN_QUERY_STRING, "WN_QUERY_STRING"); @@ -809,14 +808,6 @@ void SQGSWindow_Register(Squirrel *engine) SQGSWindow.DefSQConst(engine, ScriptWindow::WID_MH_STICKYBOX, "WID_MH_STICKYBOX"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_MH_BACKGROUND, "WID_MH_BACKGROUND"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_MH_SCROLLBAR, "WID_MH_SCROLLBAR"); - SQGSWindow.DefSQConst(engine, ScriptWindow::WID_MO_BACKGROUND, "WID_MO_BACKGROUND"); - SQGSWindow.DefSQConst(engine, ScriptWindow::WID_MO_LABEL, "WID_MO_LABEL"); - SQGSWindow.DefSQConst(engine, ScriptWindow::WID_MO_DROP_SUMMARY, "WID_MO_DROP_SUMMARY"); - SQGSWindow.DefSQConst(engine, ScriptWindow::WID_MO_LABEL_SUMMARY, "WID_MO_LABEL_SUMMARY"); - SQGSWindow.DefSQConst(engine, ScriptWindow::WID_MO_SOUNDTICKER, "WID_MO_SOUNDTICKER"); - SQGSWindow.DefSQConst(engine, ScriptWindow::WID_MO_SOUNDTICKER_LABEL, "WID_MO_SOUNDTICKER_LABEL"); - SQGSWindow.DefSQConst(engine, ScriptWindow::WID_MO_START_OPTION, "WID_MO_START_OPTION"); - SQGSWindow.DefSQConst(engine, ScriptWindow::WID_MO_END_OPTION, "WID_MO_END_OPTION"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_BO_CLASS_LIST, "WID_BO_CLASS_LIST"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_BO_SCROLLBAR, "WID_BO_SCROLLBAR"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_BO_OBJECT_MATRIX, "WID_BO_OBJECT_MATRIX"); diff --git a/src/script/api/script_window.hpp b/src/script/api/script_window.hpp index 3bdc0c18e..679e43add 100644 --- a/src/script/api/script_window.hpp +++ b/src/script/api/script_window.hpp @@ -94,7 +94,6 @@ public: WN_GAME_OPTIONS_AI = ::WN_GAME_OPTIONS_AI, ///< AI settings. WN_GAME_OPTIONS_ABOUT = ::WN_GAME_OPTIONS_ABOUT, ///< About window. 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_SETTINGS = ::WN_GAME_OPTIONS_GAME_SETTINGS, ///< Game settings. @@ -679,7 +678,6 @@ public: * - #WN_GAME_OPTIONS_AI = #AIConfigWidgets * - #WN_GAME_OPTIONS_ABOUT = #AboutWidgets * - #WN_GAME_OPTIONS_NEWGRF_STATE = #NewGRFStateWidgets - * - #WN_GAME_OPTIONS_MESSAGE_OPTION = #MessageOptionWidgets * - #WN_GAME_OPTIONS_GAME_OPTIONS = #GameOptionsWidgets * - #WN_GAME_OPTIONS_GAME_SETTINGS = #GameSettingsWidgets */ @@ -1837,19 +1835,6 @@ public: WID_MH_SCROLLBAR = ::WID_MH_SCROLLBAR, ///< Scrollbar for the list. }; - /** Widgets of the #MessageOptionsWindow class. */ - enum MessageOptionWidgets { - WID_MO_BACKGROUND = ::WID_MO_BACKGROUND, ///< Background of the window. - WID_MO_LABEL = ::WID_MO_LABEL, ///< Top label. - WID_MO_DROP_SUMMARY = ::WID_MO_DROP_SUMMARY, ///< Dropdown that adjusts at once the level for all settings. - WID_MO_LABEL_SUMMARY = ::WID_MO_LABEL_SUMMARY, ///< Label of the summary drop down. - WID_MO_SOUNDTICKER = ::WID_MO_SOUNDTICKER, ///< Button for (de)activating sound on events. - WID_MO_SOUNDTICKER_LABEL = ::WID_MO_SOUNDTICKER_LABEL, ///< Label of the soundticker button. - - WID_MO_START_OPTION = ::WID_MO_START_OPTION, ///< First widget that is part of a group [<][label][>] [description]. - WID_MO_END_OPTION = ::WID_MO_END_OPTION, ///< First widget after the groups. - }; - /* automatically generated from ../../widgets/object_widget.h */ /** Widgets of the #BuildObjectWindow class. */ enum BuildObjectWidgets { diff --git a/src/script/api/template/template_window.hpp.sq b/src/script/api/template/template_window.hpp.sq index ac521c4cc..846bcf806 100644 --- a/src/script/api/template/template_window.hpp.sq +++ b/src/script/api/template/template_window.hpp.sq @@ -165,8 +165,6 @@ namespace SQConvert { template <> inline int Return(HSQUIRRELVM vm, ScriptWindow::NewsWidgets res) { sq_pushinteger(vm, (int32)res); return 1; } template <> inline ScriptWindow::MessageHistoryWidgets GetParam(ForceType, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger(vm, index, &tmp); return (ScriptWindow::MessageHistoryWidgets)tmp; } template <> inline int Return(HSQUIRRELVM vm, ScriptWindow::MessageHistoryWidgets res) { sq_pushinteger(vm, (int32)res); return 1; } - template <> inline ScriptWindow::MessageOptionWidgets GetParam(ForceType, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger(vm, index, &tmp); return (ScriptWindow::MessageOptionWidgets)tmp; } - template <> inline int Return(HSQUIRRELVM vm, ScriptWindow::MessageOptionWidgets res) { sq_pushinteger(vm, (int32)res); return 1; } template <> inline ScriptWindow::BuildObjectWidgets GetParam(ForceType, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger(vm, index, &tmp); return (ScriptWindow::BuildObjectWidgets)tmp; } template <> inline int Return(HSQUIRRELVM vm, ScriptWindow::BuildObjectWidgets res) { sq_pushinteger(vm, (int32)res); return 1; } template <> inline ScriptWindow::OrderWidgets GetParam(ForceType, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger(vm, index, &tmp); return (ScriptWindow::OrderWidgets)tmp; } -- cgit v1.2.3-54-g00ecf