mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Explicitly initialise globals in entrance.cpp

Browse Source
This commit is contained in:
Michał Janiszewski
2017-04-24 21:46:58 +02:00
parent a4b5b32839
commit ea26ae9866
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/windows/map.c
View File

@@ -1,4 +1,4 @@
#pragma region Copyright (c) 2014-2016 OpenRCT2 Developers
#pragma region Copyright (c) 2014-2017 OpenRCT2 Developers
/*****************************************************************************
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
@@ -1270,7 +1270,7 @@ static void window_map_place_park_entrance_tool_update(sint32 x, sint32 y)
}
park_entrance_remove_ghost();
gParkEntranceGhostPrice = park_entrance_place_ghost(mapX, mapY, mapZ, direction);
park_entrance_place_ghost(mapX, mapY, mapZ, direction);
}
/**

11
src/openrct2/world/entrance.cpp
View File

@@ -1,4 +1,4 @@
#pragma region Copyright (c) 2014-2016 OpenRCT2 Developers
#pragma region Copyright (c) 2014-2017 OpenRCT2 Developers
/*****************************************************************************
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
@@ -30,10 +30,9 @@ extern "C"
#include "../ride/track.h"
}
bool gParkEntranceGhostExists;
rct_xyz16 gParkEntranceGhostPosition;
uint8 gParkEntranceGhostDirection;
money32 gParkEntranceGhostPrice;
bool gParkEntranceGhostExists = false;
rct_xyz16 gParkEntranceGhostPosition = { 0, 0, 0 };
uint8 gParkEntranceGhostDirection = 0;
rct_xyzd16 gParkEntrances[MAX_PARK_ENTRANCES];
rct_xyzd16 gRideEntranceExitGhostPosition;
@@ -865,4 +864,4 @@ extern "C"
return;
} while (!map_element_is_last_for_tile(mapElement++));
}
}
}

3
src/openrct2/world/entrance.h
View File

@@ -1,4 +1,4 @@
#pragma region Copyright (c) 2014-2016 OpenRCT2 Developers
#pragma region Copyright (c) 2014-2017 OpenRCT2 Developers
/*****************************************************************************
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
@@ -38,7 +38,6 @@ typedef struct rct_map_element rct_map_element;
extern bool gParkEntranceGhostExists;
extern rct_xyz16 gParkEntranceGhostPosition;
extern uint8 gParkEntranceGhostDirection;
extern money32 gParkEntranceGhostPrice;
#define MAX_PARK_ENTRANCES 4