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

Replace our own integer types with standard ones

Browse Source
This commit is contained in:
Michael Steenbeek
2018-06-20 17:28:51 +02:00
parent ec3a1e575e
commit 1b08fb4e69
618 changed files with 33440 additions and 33449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/Intro.cpp
View File

@@ -21,10 +21,10 @@
#define PALETTE_G1_IDX_DEVELOPER 23217
#define PALETTE_G1_IDX_LOGO 23224
uint8 gIntroState;
uint8_t gIntroState;
// Used mainly for timing but also for Y coordinate and fading.
static sint32 _introStateCounter;
static int32_t _introStateCounter;
static void *_soundChannel = nullptr;
static bool _chainLiftFinished;
@@ -151,7 +151,7 @@ void intro_update()
void intro_draw(rct_drawpixelinfo *dpi)
{
sint32 screenWidth = context_get_width();
int32_t screenWidth = context_get_width();
switch (gIntroState) {
case INTRO_STATE_DISCLAIMER_1:
@@ -224,7 +224,7 @@ static void screen_intro_process_mouse_input()
*/
static void screen_intro_process_keyboard_input()
{
const uint8 * keys = context_get_keys_state();
const uint8_t * keys = context_get_keys_state();
for (int i = 0; i < 256; i++) {
if (keys[i] != 0) {
screen_intro_skip_part();
@@ -249,9 +249,9 @@ static void screen_intro_skip_part()
static void screen_intro_draw_logo(rct_drawpixelinfo *dpi)
{
sint32 screenWidth = context_get_width();
sint32 imageWidth = 640;
sint32 imageX = (screenWidth - imageWidth) / 2;
int32_t screenWidth = context_get_width();
int32_t imageWidth = 640;
int32_t imageX = (screenWidth - imageWidth) / 2;
drawing_engine_invalidate_image(SPR_INTRO_LOGO_00);
drawing_engine_invalidate_image(SPR_INTRO_LOGO_10);