mirror of
https://github.com/k4zmu2a/SpaceCadetPinball.git
synced 2023-12-30 21:52:56 +00:00
Bugs and suggestions from PR# 48.
This commit is contained in:
parent
9088c44b3e
commit
348d79ef38
@ -1019,7 +1019,7 @@ void control::LaunchRampControl(int code, TPinballComponent* caller)
|
|||||||
{
|
{
|
||||||
sound = control_soundwave21_tag.Component;
|
sound = control_soundwave21_tag.Component;
|
||||||
}
|
}
|
||||||
else if (someFlag <= 1 || someFlag > 3)
|
else if (someFlag < 1 || someFlag > 3)
|
||||||
{
|
{
|
||||||
sound = control_soundwave24_tag.Component;
|
sound = control_soundwave24_tag.Component;
|
||||||
}
|
}
|
||||||
@ -2148,7 +2148,7 @@ void control::HyperspaceKickOutControl(int code, TPinballComponent* caller)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (someFlag <= 1 || someFlag > 3)
|
if (someFlag < 1 || someFlag > 3)
|
||||||
{
|
{
|
||||||
auto duration = control_soundwave41_tag.Component->Play();
|
auto duration = control_soundwave41_tag.Component->Play();
|
||||||
control_soundwave36_1_tag.Component->Play();
|
control_soundwave36_1_tag.Component->Play();
|
||||||
@ -2919,7 +2919,7 @@ void control::GameoverController(int code, TPinballComponent* caller)
|
|||||||
|
|
||||||
if (missionMsg & 0x200)
|
if (missionMsg & 0x200)
|
||||||
{
|
{
|
||||||
int highscoreId = missionMsg % 4;
|
int highscoreId = missionMsg % 5;
|
||||||
int highScore = pb::highscore_table[highscoreId].Score;
|
int highScore = pb::highscore_table[highscoreId].Score;
|
||||||
auto nextHidhscoreId = highscoreId + 1;
|
auto nextHidhscoreId = highscoreId + 1;
|
||||||
if (highScore > 0)
|
if (highScore > 0)
|
||||||
|
@ -57,10 +57,11 @@ int fullscrn::enableFullscreen()
|
|||||||
{
|
{
|
||||||
if (!display_changed)
|
if (!display_changed)
|
||||||
{
|
{
|
||||||
SDL_SetWindowFullscreen(winmain::MainWindow, SDL_WINDOW_FULLSCREEN_DESKTOP);
|
if (SDL_SetWindowFullscreen(winmain::MainWindow, SDL_WINDOW_FULLSCREEN_DESKTOP) == 0)
|
||||||
display_changed = 1;
|
{
|
||||||
if (display_changed)
|
display_changed = 1;
|
||||||
return 1;
|
return 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -69,8 +70,8 @@ int fullscrn::disableFullscreen()
|
|||||||
{
|
{
|
||||||
if (display_changed)
|
if (display_changed)
|
||||||
{
|
{
|
||||||
SDL_SetWindowFullscreen(winmain::MainWindow, 0);
|
if (SDL_SetWindowFullscreen(winmain::MainWindow, 0) == 0)
|
||||||
display_changed = 0;
|
display_changed = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -316,7 +316,11 @@ std::vector<uint8_t>* midi::MdsToMidi(std::string file)
|
|||||||
while (false);
|
while (false);
|
||||||
|
|
||||||
delete[] fileBuf;
|
delete[] fileBuf;
|
||||||
if (returnCode && midiOut)
|
if (returnCode && midiOut)
|
||||||
|
{
|
||||||
delete midiOut;
|
delete midiOut;
|
||||||
|
midiOut = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
return midiOut;
|
return midiOut;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user