mirrors
/
SpaceCadetPinball
mirror of https://github.com/k4zmu2a/SpaceCadetPinball.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'k4zmu2a:master' into master

This commit is contained in:
toxie 2021-10-18 09:13:17 +02:00 committed by GitHub
parent d106f0f771 348d79ef38
commit 08e922c258
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -14,12 +14,13 @@ Supports data files from Windows and Full Tilt versions of the game.
## Known source ports ## Known source ports
| Platform | Author | URL | | Platform | Author | URL |
| --------------- | --------- | ---------------------------------------------------------------------------------------------------------- | | ------------------ | ---------- | ---------------------------------------------------------------------------------------------------------- |
| PS Vita | Axiom | <https://github.com/suicvne/SpaceCadetPinball_Vita> | | PS Vita | Axiom | <https://github.com/suicvne/SpaceCadetPinball_Vita> |
| Emscripten | alula | <https://github.com/alula/SpaceCadetPinball> <br> Play online: <https://alula.github.io/SpaceCadetPinball> | | Emscripten | alula | <https://github.com/alula/SpaceCadetPinball> <br> Play online: <https://alula.github.io/SpaceCadetPinball> |
| Nintendo Switch | averne | <https://github.com/averne/SpaceCadetPinball-NX> | | Nintendo Switch | averne | <https://github.com/averne/SpaceCadetPinball-NX> |
| webOS TV | mariotaku | <https://github.com/webosbrew/SpaceCadetPinball> | | webOS TV | mariotaku | <https://github.com/webosbrew/SpaceCadetPinball> |
| Android (WIP) | Iscle | https://github.com/Iscle/SpaceCadetPinball | | Android (WIP) | Iscle | https://github.com/Iscle/SpaceCadetPinball |
| Nintendo Wii (WIP) | MaikelChan | https://github.com/MaikelChan/SpaceCadetPinball |
Platforms covered by this project: desktop Windows, Linux and macOS. Platforms covered by this project: desktop Windows, Linux and macOS.

6
SpaceCadetPinball/control.cpp
View File

@ -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)

7
SpaceCadetPinball/fullscrn.cpp
View File

@ -57,11 +57,12 @@ 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; display_changed = 1;
if (display_changed)
return 1; return 1;
} }
}
return 0; return 0;
} }
@ -69,7 +70,7 @@ 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;
} }

4
SpaceCadetPinball/midi.cpp
View File

@ -317,6 +317,10 @@ std::vector<uint8_t>* midi::MdsToMidi(std::string file)
delete[] fileBuf; delete[] fileBuf;
if (returnCode && midiOut) if (returnCode && midiOut)
{
delete midiOut; delete midiOut;
midiOut = nullptr;
}
return midiOut; return midiOut;
} }