1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00

fixed static enums; added missing headers

This commit is contained in:
anyc
2014-05-19 21:10:32 +02:00
parent 82fa4439bf
commit e6c90c6ebb
23 changed files with 30 additions and 18 deletions

View File

@@ -21,6 +21,7 @@
#include <stdio.h>
#include <shlobj.h>
#include <windows.h>
#include <tchar.h>
#include <SDL_keycode.h>
#include "addresses.h"
#include "config.h"

View File

@@ -20,6 +20,8 @@
#include <assert.h>
#include <stdio.h>
#include <stdint.h>
#include <string.h>
#include <windows.h>
#include "addresses.h"
#include "gfx.h"

View File

@@ -18,6 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
#include <string.h>
#include "addresses.h"
#include "audio.h"
#include "date.h"

View File

@@ -19,6 +19,7 @@
*****************************************************************************/
#include <windows.h>
#include <string.h>
#include "addresses.h"
#include "rct2.h"
#include "sawyercoding.h"

View File

@@ -19,6 +19,7 @@
*****************************************************************************/
#include <windows.h>
#include <string.h>
#include "addresses.h"
#include "date.h"
#include "finance.h"

View File

@@ -18,6 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
#include <string.h>
#include "addresses.h"
#include "tutorial.h"
#include "window_error.h"

View File

@@ -18,6 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
#include <string.h>
#include "addresses.h"
#include "audio.h"
#include "gfx.h"

View File

@@ -25,7 +25,7 @@
#include "widget.h"
#include "window.h"
static enum WINDOW_ABOUT_WIDGET_IDX {
enum WINDOW_ABOUT_WIDGET_IDX {
WIDX_BACKGROUND,
WIDX_TITLE,
WIDX_CLOSE,
@@ -33,7 +33,7 @@ static enum WINDOW_ABOUT_WIDGET_IDX {
WIDX_PUBLISHER_CREDITS
};
static rct_widget window_about_widgets[] = {
rct_widget window_about_widgets[] = {
{ WWT_FRAME, 0, 0, 399, 0, 329, 0x0FFFFFFFF, STR_NONE }, // panel / background
{ WWT_CAPTION, 0, 1, 398, 1, 14, STR_ROLLERCOASTER_TYCOON_2, STR_WINDOW_TITLE_TIP }, // title bar
{ WWT_CLOSEBOX, 0, 387, 397, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // close x button

View File

@@ -26,7 +26,7 @@
#include "widget.h"
#include "window.h"
static enum WINDOW_BANNER_WIDGET_IDX {
enum WINDOW_BANNER_WIDGET_IDX {
WIDX_BACKGROUND,
WIDX_TITLE,
WIDX_CLOSE,
@@ -39,7 +39,7 @@ static enum WINDOW_BANNER_WIDGET_IDX {
WIDX_TEXT_COLOR_DROPDOWN_BUTTON
};
static rct_widget window_banner_widgets[] = {
rct_widget window_banner_widgets[] = {
{ WWT_FRAME, 0, 0, 112, 0, 95, 0x0FFFFFFFF, 65535}, // panel / background
{ WWT_CAPTION, 0, 1, 111, 1, 14, 0xBA9, STR_WINDOW_TITLE_TIP}, // title bar
{ WWT_CLOSEBOX, 0, 100, 110, 2, 13, 0x338, STR_CLOSE_WINDOW_TIP}, // close x button

View File

@@ -38,7 +38,7 @@ enum {
WINDOW_CHEATS_PAGE_GUESTS
};
static enum WINDOW_CHEATS_WIDGET_IDX {
enum WINDOW_CHEATS_WIDGET_IDX {
WIDX_BACKGROUND,
WIDX_TITLE,
WIDX_CLOSE,

View File

@@ -25,7 +25,7 @@
#include "widget.h"
#include "window.h"
static enum WINDOW_CLEAR_SCENERY_WIDGET_IDX {
enum WINDOW_CLEAR_SCENERY_WIDGET_IDX {
WIDX_BACKGROUND,
WIDX_TITLE,
WIDX_CLOSE,
@@ -34,7 +34,7 @@ static enum WINDOW_CLEAR_SCENERY_WIDGET_IDX {
WIDX_INCREMENT
};
static rct_widget window_clear_scenery_widgets[] = {
rct_widget window_clear_scenery_widgets[] = {
{ WWT_FRAME, 0, 0, 97, 0, 66, -1, STR_NONE }, // panel / background
{ WWT_CAPTION, 0, 1, 96, 1, 14, STR_CLEAR_SCENERY, STR_WINDOW_TITLE_TIP }, // title bar
{ WWT_CLOSEBOX, 0, 85, 95, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // close x button

View File

@@ -49,7 +49,7 @@ typedef struct {
uint8 flags; // 0x0B
} rct_path_type;
static enum WINDOW_FOOTPATH_WIDGET_IDX {
enum WINDOW_FOOTPATH_WIDGET_IDX {
WIDX_BACKGROUND,
WIDX_TITLE,
WIDX_CLOSE,

View File

@@ -18,6 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
#include <string.h>
#include "addresses.h"
#include "climate.h"
#include "date.h"
@@ -30,7 +31,7 @@
#include "widget.h"
#include "window.h"
static enum WINDOW_GAME_BOTTOM_TOOLBAR_WIDGET_IDX {
enum WINDOW_GAME_BOTTOM_TOOLBAR_WIDGET_IDX {
WIDX_LEFT_OUTSET,
WIDX_LEFT_INSET,
WIDX_MONEY,

View File

@@ -18,6 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
#include <string.h>
#include "addresses.h"
#include "game.h"
#include "sprites.h"
@@ -361,7 +362,7 @@ static void window_game_top_toolbar_dropdown()
src++;
} while (*src != '.' && *src != '\0');
strcpy(src, ".SV6");
strcpy(RCT2_ADDRESS_SAVED_GAMES_PATH_2, 0x0141EF68);
strcpy((char*) RCT2_ADDRESS_SAVED_GAMES_PATH_2, (char*) 0x0141EF68);
eax = 0;
if (RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) & 8)

View File

@@ -26,7 +26,7 @@
#include "window.h"
#include "window_dropdown.h"
static enum WINDOW_LAND_WIDGET_IDX {
enum WINDOW_LAND_WIDGET_IDX {
WIDX_BACKGROUND,
WIDX_TITLE,
WIDX_CLOSE,

View File

@@ -24,7 +24,7 @@
#include "widget.h"
#include "window.h"
static enum WINDOW_MAP_WIDGET_IDX {
enum WINDOW_MAP_WIDGET_IDX {
WIDX_BACKGROUND,
WIDX_TITLE,
WIDX_CLOSE,

View File

@@ -28,7 +28,7 @@
#include "widget.h"
#include "window.h"
static enum WINDOW_NEWS_WIDGET_IDX {
enum WINDOW_NEWS_WIDGET_IDX {
WIDX_BACKGROUND,
WIDX_TITLE,
WIDX_CLOSE,

View File

@@ -28,7 +28,7 @@
#include "window.h"
#include "window_dropdown.h"
static enum WINDOW_OPTIONS_WIDGET_IDX {
enum WINDOW_OPTIONS_WIDGET_IDX {
WIDX_BACKGROUND,
WIDX_TITLE,
WIDX_CLOSE,
@@ -107,7 +107,7 @@ static void window_options_mousedown();
static void window_options_dropdown();
static void window_options_update(rct_window *w);
static void window_options_paint();
static void window_options_draw_dropdown_box(w, widget, num_items);
static void window_options_draw_dropdown_box(rct_window *w, rct_widget *widget, int num_items);
static void window_options_update_height_markers();
static void* window_options_events[] = {

View File

@@ -18,6 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
#include <string.h>
#include "addresses.h"
#include "config.h"
#include "date.h"

View File

@@ -34,7 +34,7 @@ enum {
PAGE_KIOSKS_AND_FACILITIES
};
static enum WINDOW_RIDE_LIST_WIDGET_IDX {
enum WINDOW_RIDE_LIST_WIDGET_IDX {
WIDX_BACKGROUND,
WIDX_TITLE,
WIDX_CLOSE,

View File

@@ -28,7 +28,7 @@
#include "window.h"
#include "audio.h"
static enum WINDOW_SAVE_PROMPT_WIDGET_IDX {
enum WINDOW_SAVE_PROMPT_WIDGET_IDX {
WIDX_BACKGROUND,
WIDX_TITLE,
WIDX_CLOSE,

View File

@@ -18,6 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
#include <string.h>
#include "addresses.h"
#include "audio.h"
#include "date.h"

View File

@@ -25,7 +25,7 @@
#include "widget.h"
#include "window.h"
static enum WINDOW_WATER_WIDGET_IDX {
enum WINDOW_WATER_WIDGET_IDX {
WIDX_BACKGROUND,
WIDX_TITLE,
WIDX_CLOSE,