TPlunger: removed duplicated code.

Ref PR#52.

README.md

@@ -13,13 +13,14 @@ Supports data files from Windows and Full Tilt versions of the game.
 
 ## 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.
 

SpaceCadetPinball/TPlunger.cpp

@@ -54,28 +54,6 @@ int TPlunger::Message(int code, float value)
 			PullbackTimer(0, this);
 		}
 		return 0;
-	case 1005:
-	case 1009:
-	case 1010:
-		{
-			Threshold = 0.0;
-			if (PullbackTimer_)
-				timer::kill(PullbackTimer_);
-			PullbackTimer_ = 0;
-			if (code == 1005)
-				loader::play_sound(SoundIndexP2);
-			auto bmp = ListBitmap->at(0);
-			auto zMap = ListZMap->at(0);
-			render::sprite_set(
-				RenderSprite,
-				bmp,
-				zMap,
-				bmp->XPosition - PinballTable->XOffset,
-				bmp->YPosition - PinballTable->YOffset);
-
-			timer::set(Unknown4F, this, PlungerReleasedTimer);
-			break;
-		}
 	case 1015:
 		{
 			auto ball = PinballTable->BallList.at(0);
@@ -100,11 +78,18 @@ int TPlunger::Message(int code, float value)
 		Boost = static_cast<float>(MaxPullback);
 		timer::set(0.2f, this, PlungerReleasedTimer);
 		break;
+	case 1005:
+	case 1009:
+	case 1010:
 	case 1024:
 		{
-			if (BallFeedTimer_)
+			if (code == 1024)
-				timer::kill(BallFeedTimer_);
+			{
-			BallFeedTimer_ = 0;
+				if (BallFeedTimer_)
+					timer::kill(BallFeedTimer_);
+				BallFeedTimer_ = 0;
+			}
+
 			Threshold = 0.0;
 			if (PullbackTimer_)
 				timer::kill(PullbackTimer_);

SpaceCadetPinball/control.cpp

@@ -1019,7 +1019,7 @@ void control::LaunchRampControl(int code, TPinballComponent* caller)
 			{
 				sound = control_soundwave21_tag.Component;
 			}
-			else if (someFlag <= 1 || someFlag > 3)
+			else if (someFlag < 1 || someFlag > 3)
 			{
 				sound = control_soundwave24_tag.Component;
 			}
@@ -2148,7 +2148,7 @@ void control::HyperspaceKickOutControl(int code, TPinballComponent* caller)
 		}
 		else
 		{
-			if (someFlag <= 1 || someFlag > 3)
+			if (someFlag < 1 || someFlag > 3)
 			{
 				auto duration = control_soundwave41_tag.Component->Play();
 				control_soundwave36_1_tag.Component->Play();
@@ -2919,7 +2919,7 @@ void control::GameoverController(int code, TPinballComponent* caller)
 
 	if (missionMsg & 0x200)
 	{
-		int highscoreId = missionMsg % 4;
+		int highscoreId = missionMsg % 5;
 		int highScore = pb::highscore_table[highscoreId].Score;
 		auto nextHidhscoreId = highscoreId + 1;
 		if (highScore > 0)

SpaceCadetPinball/fullscrn.cpp

@@ -57,10 +57,11 @@ int fullscrn::enableFullscreen()
 {
 	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 0;
 }
@@ -69,8 +70,8 @@ int fullscrn::disableFullscreen()
 {
 	if (display_changed)
 	{
-		SDL_SetWindowFullscreen(winmain::MainWindow, 0);
+		if (SDL_SetWindowFullscreen(winmain::MainWindow, 0) == 0)
-		display_changed = 0;
+			display_changed = 0;
 	}
 
 	return 0;

SpaceCadetPinball/midi.cpp

@@ -316,7 +316,11 @@ std::vector<uint8_t>* midi::MdsToMidi(std::string file)
 	while (false);
 
 	delete[] fileBuf;
-	if (returnCode && midiOut)
+	if (returnCode && midiOut) 
+	{
 		delete midiOut;
+		midiOut = nullptr;
+	}
+
 	return midiOut;
 }