From 3d4791f2915a5b1f38c34a0cf01e0dffc588af8c Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Sun, 31 Jan 2021 21:06:38 +0100
Subject: Revert "First batch of fixes (CallAndMessage)"

This reverts commit 7a3b80a9b7f414967fe59f89ab0fe5416735babe.
---
 src/control/Pickups.cpp | 9 +--------
 src/control/Script.cpp  | 9 ++-------
 src/control/Script4.cpp | 9 ++-------
 src/control/Script6.cpp | 6 ++----
 4 files changed, 7 insertions(+), 26 deletions(-)

(limited to 'src/control')

diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp
index 8318bc1a..96a8a670 100644
--- a/src/control/Pickups.cpp
+++ b/src/control/Pickups.cpp
@@ -814,9 +814,6 @@ void
 CPickups::RenderPickUpText()
 {
 	wchar *strToPrint;
-#ifdef FIX_BUGS
-	strToPrint = nil;
-#endif
 	for (int32 i = 0; i < NumMessages; i++) {
 		if (aMessages[i].m_quantity <= 39) {
 			switch (aMessages[i].m_quantity) // could use some enum maybe
@@ -1288,11 +1285,7 @@ CPacManPickups::GeneratePMPickUpsForRace(int32 race)
 	int i = 0;
 
 	if (race == 0) pPos = aRacePoints1; // there's only one available
-
-	if(!pPos) {
-		debug("This shouldn't happen");
-		return;
-	}
+	assert(pPos != nil);
 
 	while (!pPos->IsZero()) {
 		while (aPMPickUps[i].m_eType != PACMAN_NONE)
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index 83f43276..e70bd508 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -3439,13 +3439,8 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
 		}
 		else {
 			CVehicle* car;
-			if(!CModelInfo::IsBikeModel(ScriptParams[0])) car = new CAutomobile(ScriptParams[0], MISSION_VEHICLE);
-#ifdef FIX_BUGS
-			else {
-				debug("This shouldn't happen");
-				return 0;
-			}
-#endif
+			if (!CModelInfo::IsBikeModel(ScriptParams[0]))
+				car = new CAutomobile(ScriptParams[0], MISSION_VEHICLE);
 			CVector pos = *(CVector*)&ScriptParams[1];
 			if (pos.z <= MAP_Z_LOW_LIMIT)
 				pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
diff --git a/src/control/Script4.cpp b/src/control/Script4.cpp
index 740a8e2e..40f9f2f1 100644
--- a/src/control/Script4.cpp
+++ b/src/control/Script4.cpp
@@ -1817,13 +1817,8 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		if (model == -1)
 			return 0;
 		CVehicle* car;
-		if(!CModelInfo::IsBikeModel(model)) car = new CAutomobile(model, RANDOM_VEHICLE);
-#ifdef FIX_BUGS
-		else {
-			debug("This shouldn't happen");
-			return 0;
-		}
-#endif
+		if (!CModelInfo::IsBikeModel(model))
+			car = new CAutomobile(model, RANDOM_VEHICLE);
 		CVector pos = *(CVector*)&ScriptParams[0];
 		pos.z += car->GetDistanceFromCentreOfMassToBaseOfModel();
 		car->SetPosition(pos);
diff --git a/src/control/Script6.cpp b/src/control/Script6.cpp
index f8e2d8f1..31be6987 100644
--- a/src/control/Script6.cpp
+++ b/src/control/Script6.cpp
@@ -971,10 +971,8 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 					pClosestEntity = apEntities[i];
 				}
 			}
-#ifdef FIX_BUGS
-			if(pClosestEntity)
-#endif
-				if(pClosestEntity->IsDummy()) pClosestEntity = nil;
+			if (pClosestEntity->IsDummy())
+				pClosestEntity = nil;
 		}
 		if (pClosestEntity) {
 			script_assert(pClosestEntity->IsObject());
-- 
cgit v1.2.3