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

Close #12457: Rename INTRO_STATE to use PascalCase

Browse Source
This commit is contained in:
frutiemax
2020-07-26 09:32:53 -04:00
parent 0f1788d273
commit 6598ae14aa
10 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/openrct2/Intro.cpp
View File

@@ -22,7 +22,7 @@
constexpr int32_t PALETTE_G1_IDX_DEVELOPER = 23217;
constexpr int32_t PALETTE_G1_IDX_LOGO = 23224;
INTRO_STATE gIntroState;
IntroState gIntroState;
// Used mainly for timing but also for Y coordinate and fading.
static int32_t _introStateCounter;
@@ -43,12 +43,12 @@ void intro_update()
switch (gIntroState)
{
case INTRO_STATE::INTRO_STATE_DISCLAIMER_1:
case INTRO_STATE::INTRO_STATE_DISCLAIMER_2:
case IntroState::Disclaimer1:
case IntroState::Disclaimer2:
// Originally used for the disclaimer text
gIntroState = INTRO_STATE::INTRO_STATE_PUBLISHER_BEGIN;
gIntroState = IntroState::PublisherBegin;
[[fallthrough]];
case INTRO_STATE::INTRO_STATE_PUBLISHER_BEGIN:
case IntroState::PublisherBegin:
load_palette();
// Set the Y for the Infogrames logo
@@ -57,9 +57,9 @@ void intro_update()
// Play the chain lift sound
_soundChannel = Mixer_Play_Effect(SoundId::LiftBM, MIXER_LOOP_INFINITE, MIXER_VOLUME_MAX, 0.5f, 1, true);
_chainLiftFinished = false;
gIntroState = INTRO_STATE::INTRO_STATE_PUBLISHER_SCROLL;
gIntroState = IntroState::PublisherScroll;
break;
case INTRO_STATE::INTRO_STATE_PUBLISHER_SCROLL:
case IntroState::PublisherScroll:
// Move the Infogrames logo down
_introStateCounter += 5;
@@ -67,17 +67,17 @@ void intro_update()
if (_introStateCounter > context_get_height() - 120)
{
_introStateCounter = -116;
gIntroState = INTRO_STATE::INTRO_STATE_DEVELOPER_BEGIN;
gIntroState = IntroState::DeveloperBegin;
}
break;
case INTRO_STATE::INTRO_STATE_DEVELOPER_BEGIN:
case IntroState::DeveloperBegin:
// Set the Y for the Chris Sawyer logo
_introStateCounter = -116;
gIntroState = INTRO_STATE::INTRO_STATE_DEVELOPER_SCROLL;
gIntroState = IntroState::DeveloperScroll;
break;
case INTRO_STATE::INTRO_STATE_DEVELOPER_SCROLL:
case IntroState::DeveloperScroll:
_introStateCounter += 5;
// Check if logo is almost scrolled to the bottom
@@ -110,20 +110,20 @@ void intro_update()
// Play long peep scream sound
_soundChannel = Mixer_Play_Effect(SoundId::Scream1, MIXER_LOOP_NONE, MIXER_VOLUME_MAX, 0.5f, 1, false);
gIntroState = INTRO_STATE::INTRO_STATE_LOGO_FADE_IN;
gIntroState = IntroState::LogoFadeIn;
_introStateCounter = 0;
}
break;
case INTRO_STATE::INTRO_STATE_LOGO_FADE_IN:
case IntroState::LogoFadeIn:
// Fade in, add 4 / 256 to fading
_introStateCounter += 0x400;
if (_introStateCounter > 0xFF00)
{
gIntroState = INTRO_STATE::INTRO_STATE_LOGO_WAIT;
gIntroState = IntroState::LogoWait;
_introStateCounter = 0;
}
break;
case INTRO_STATE::INTRO_STATE_LOGO_WAIT:
case IntroState::LogoWait:
// Wait 80 game ticks
_introStateCounter++;
if (_introStateCounter >= 80)
@@ -131,18 +131,18 @@ void intro_update()
// Set fading to 256
_introStateCounter = 0xFF00;
gIntroState = INTRO_STATE::INTRO_STATE_LOGO_FADE_OUT;
gIntroState = IntroState::LogoFadeOut;
}
break;
case INTRO_STATE::INTRO_STATE_LOGO_FADE_OUT:
case IntroState::LogoFadeOut:
// Fade out, subtract 4 / 256 from fading
_introStateCounter -= 0x400;
if (_introStateCounter < 0)
{
gIntroState = INTRO_STATE::INTRO_STATE_CLEAR;
gIntroState = IntroState::Clear;
}
break;
case INTRO_STATE::INTRO_STATE_CLEAR:
case IntroState::Clear:
// Stop any playing sound
if (_soundChannel != nullptr)
{
@@ -151,11 +151,11 @@ void intro_update()
}
// Move to next part
gIntroState = INTRO_STATE::INTRO_STATE_FINISH;
gIntroState = IntroState::Finish;
_introStateCounter = 0;
break;
case INTRO_STATE::INTRO_STATE_FINISH:
gIntroState = INTRO_STATE::INTRO_STATE_NONE;
case IntroState::Finish:
gIntroState = IntroState::None;
load_palette();
audio_start_title_music();
break;
@@ -170,13 +170,13 @@ void intro_draw(rct_drawpixelinfo* dpi)
switch (gIntroState)
{
case INTRO_STATE::INTRO_STATE_DISCLAIMER_1:
case INTRO_STATE::INTRO_STATE_DISCLAIMER_2:
case IntroState::Disclaimer1:
case IntroState::Disclaimer2:
break;
case INTRO_STATE::INTRO_STATE_PUBLISHER_BEGIN:
case IntroState::PublisherBegin:
gfx_clear(dpi, BACKROUND_COLOUR_DARK);
break;
case INTRO_STATE::INTRO_STATE_PUBLISHER_SCROLL:
case IntroState::PublisherScroll:
gfx_clear(dpi, BACKROUND_COLOUR_DARK);
// Draw a white rectangle for the logo background (gives a bit of white margin)
@@ -192,18 +192,18 @@ void intro_draw(rct_drawpixelinfo* dpi)
gfx_draw_sprite(dpi, SPR_INTRO_INFOGRAMES_01, { (screenWidth / 2) - 320 + 69, _introStateCounter + 319 }, 0);
gfx_draw_sprite(dpi, SPR_INTRO_INFOGRAMES_11, { (screenWidth / 2) - 320 + 319, _introStateCounter + 319 }, 0);
break;
case INTRO_STATE::INTRO_STATE_DEVELOPER_BEGIN:
case IntroState::DeveloperBegin:
gfx_clear(dpi, BACKROUND_COLOUR_DARK);
gfx_transpose_palette(PALETTE_G1_IDX_DEVELOPER, 255);
break;
case INTRO_STATE::INTRO_STATE_DEVELOPER_SCROLL:
case IntroState::DeveloperScroll:
gfx_clear(dpi, BACKROUND_COLOUR_DARK);
// Draw Chris Sawyer logo
gfx_draw_sprite(dpi, SPR_INTRO_CHRIS_SAWYER_00, { (screenWidth / 2) - 320 + 70, _introStateCounter }, 0);
gfx_draw_sprite(dpi, SPR_INTRO_CHRIS_SAWYER_10, { (screenWidth / 2) - 320 + 320, _introStateCounter }, 0);
break;
case INTRO_STATE::INTRO_STATE_LOGO_FADE_IN:
case IntroState::LogoFadeIn:
if (_introStateCounter <= 0xFF00)
{
gfx_transpose_palette(PALETTE_G1_IDX_LOGO, (_introStateCounter >> 8) & 0xFF);
@@ -214,10 +214,10 @@ void intro_draw(rct_drawpixelinfo* dpi)
}
screen_intro_draw_logo(dpi);
break;
case INTRO_STATE::INTRO_STATE_LOGO_WAIT:
case IntroState::LogoWait:
screen_intro_draw_logo(dpi);
break;
case INTRO_STATE::INTRO_STATE_LOGO_FADE_OUT:
case IntroState::LogoFadeOut:
if (_introStateCounter >= 0)
{
gfx_transpose_palette(PALETTE_G1_IDX_LOGO, (_introStateCounter >> 8) & 0xFF);
@@ -228,7 +228,7 @@ void intro_draw(rct_drawpixelinfo* dpi)
}
screen_intro_draw_logo(dpi);
break;
case INTRO_STATE::INTRO_STATE_CLEAR:
case IntroState::Clear:
gfx_clear(dpi, BACKROUND_COLOUR_DARK);
break;
default:
@@ -265,13 +265,13 @@ static void screen_intro_skip_part()
{
switch (gIntroState)
{
case INTRO_STATE::INTRO_STATE_NONE:
case IntroState::None:
break;
case INTRO_STATE::INTRO_STATE_DISCLAIMER_2:
gIntroState = INTRO_STATE::INTRO_STATE_PUBLISHER_BEGIN;
case IntroState::Disclaimer2:
gIntroState = IntroState::PublisherBegin;
break;
default:
gIntroState = INTRO_STATE::INTRO_STATE_CLEAR;
gIntroState = IntroState::Clear;
break;
}
}