cpp/openttd-patchpack/source Changeset - r19392:c9b4216afa41

Changeset - r19392:c9b4216afa41

Parent rev.

Child rev.

[Not reviewed]

master

0 11 1

frosch - 12 years ago 2012-06-01 10:44:45
frosch@openttd.org

(svn r24309) -Codechange: Split some functions from gui.h to settings_gui.h

12 files changed with 39 insertions and 7 deletions:

projects/openttd_vs100.vcxproj

projects/openttd_vs100.vcxproj.filters

projects/openttd_vs80.vcproj

projects/openttd_vs90.vcproj

source.list

src/ai/ai_gui.cpp

src/cheat_gui.cpp

src/gui.h

src/industry_gui.cpp

src/newgrf_gui.cpp

src/settings_gui.cpp

src/settings_gui.h

0 comments (0 inline, 0 general)

projects/openttd_vs100.vcxproj

➞

Show inline comments

@@ @@ -536,12 +536,13 @@ @@
     <ClInclude Include="..\src\roadveh.h" />
     <ClInclude Include="..\src\screenshot.h" />
     <ClInclude Include="..\src\sdl.h" />
     <ClInclude Include="..\src\sound\sdl_s.h" />
     <ClInclude Include="..\src\video\sdl_v.h" />
     <ClInclude Include="..\src\settings_func.h" />
     <ClInclude Include="..\src\settings_gui.h" />
     <ClInclude Include="..\src\settings_internal.h" />
     <ClInclude Include="..\src\settings_type.h" />
     <ClInclude Include="..\src\ship.h" />
     <ClInclude Include="..\src\signal_func.h" />
     <ClInclude Include="..\src\signal_type.h" />
     <ClInclude Include="..\src\signs_base.h" />

projects/openttd_vs100.vcxproj.filters

➞

Show inline comments

@@ @@ -843,12 +843,15 @@ @@
     <ClInclude Include="..\src\video\sdl_v.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\src\settings_func.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\src\settings_gui.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\src\settings_internal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\src\settings_type.h">
       <Filter>Header Files</Filter>
     </ClInclude>

projects/openttd_vs80.vcproj

➞

Show inline comments

@@ @@ -1428,12 +1428,16 @@ @@
 			</File>
 			<File
 				RelativePath=".\..\src\settings_func.h"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\settings_gui.h"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\settings_internal.h"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\settings_type.h"
+				>

projects/openttd_vs90.vcproj

➞

Show inline comments

@@ @@ -1425,12 +1425,16 @@ @@
 			</File>
 			<File
 				RelativePath=".\..\src\settings_func.h"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\settings_gui.h"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\settings_internal.h"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\settings_type.h"
+				>

source.list

➞

Show inline comments

@@ @@ -269,12 +269,13 @@ roadstop_base.h @@
 roadveh.h
 screenshot.h
 sdl.h
 sound/sdl_s.h
 video/sdl_v.h
 settings_func.h
 settings_gui.h
 settings_internal.h
 settings_type.h
 ship.h
 signal_func.h
 signal_type.h
 signs_base.h

src/ai/ai_gui.cpp

➞

Show inline comments

@@ @@ -9,13 +9,13 @@ @@
 /** @file ai_gui.cpp %Window for configuring the AIs */
 #include "../stdafx.h"
 #include "../table/sprites.h"
 #include "../error.h"
-#include "../gui.h"
+#include "../settings_gui.h"
 #include "../querystring_gui.h"
 #include "../company_base.h"
 #include "../company_gui.h"
 #include "../strings_func.h"
 #include "../window_func.h"
 #include "../gfx_func.h"

src/cheat_gui.cpp

➞

Show inline comments

@@ @@ -19,13 +19,13 @@ @@
 #include "textbuf_gui.h"
 #include "window_gui.h"
 #include "string_func.h"
 #include "strings_func.h"
 #include "window_func.h"
 #include "rail_gui.h"
-#include "gui.h"
+#include "settings_gui.h"
 #include "company_gui.h"
 #include "widgets/cheat_widget.h"
 #include "table/sprites.h"

src/gui.h

➞

Show inline comments

@@ @@ -10,13 +10,12 @@ @@
 /** @file gui.h GUI functions that shouldn't be here. */
 #ifndef GUI_H
 #define GUI_H
 #include "vehicle_type.h"
 #include "gfx_type.h"
 #include "economy_type.h"
 #include "tile_type.h"
 #include "transport_type.h"
 struct Window;
@@ @@ -25,14 +24,12 @@ void HandleOnEditText(const char *str); @@
 void InitializeGUI();
 /* settings_gui.cpp */
 void ShowGameOptions();
 void ShowGameDifficulty();
 void ShowGameSettings();
 void DrawArrowButtons(int x, int y, Colours button_colour, byte state, bool clickable_left, bool clickable_right);
 void DrawBoolButton(int x, int y, bool state, bool clickable);
 /* train_gui.cpp */
 void ShowOrdersWindow(const Vehicle *v);
 /* dock_gui.cpp */
 Window *ShowBuildDocksToolbar();

src/industry_gui.cpp

➞

Show inline comments

@@ @@ -9,12 +9,13 @@ @@
 /** @file industry_gui.cpp GUIs related to industries. */
 #include "stdafx.h"
 #include "error.h"
 #include "gui.h"
 #include "settings_gui.h"
 #include "sound_func.h"
 #include "window_func.h"
 #include "textbuf_gui.h"
 #include "command_func.h"
 #include "viewport_func.h"
 #include "industry.h"

src/newgrf_gui.cpp

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
  */
 /** @file newgrf_gui.cpp GUI to change NewGRF settings. */
 #include "stdafx.h"
 #include "error.h"
-#include "gui.h"
+#include "settings_gui.h"
 #include "newgrf.h"
 #include "strings_func.h"
 #include "window_func.h"
 #include "gamelog.h"
 #include "settings_type.h"
 #include "settings_func.h"

src/settings_gui.cpp

➞

Show inline comments

@@ @@ -9,13 +9,13 @@ @@
 /** @file settings_gui.cpp GUI for settings. */
 #include "stdafx.h"
 #include "currency.h"
 #include "error.h"
-#include "gui.h"
+#include "settings_gui.h"
 #include "textbuf_gui.h"
 #include "command_func.h"
 #include "screenshot.h"
 #include "network/network.h"
 #include "town.h"
 #include "settings_internal.h"

src/settings_gui.h

➞

Show inline comments

@@ new file 100644 @@
 /* $Id$ */
 /*
  * This file is part of OpenTTD.
  * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
  * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file settings_gui.h Functions for setting GUIs. */
 #ifndef SETTING_GUI_H
 #define SETTING_GUI_H
 #include "gfx_type.h"
 void DrawArrowButtons(int x, int y, Colours button_colour, byte state, bool clickable_left, bool clickable_right);
 void DrawBoolButton(int x, int y, bool state, bool clickable);
 #endif /* SETTING_GUI_H */

0 comments (0 inline, 0 general)