From da378077f78a1773a6c4bf5a768c6ebb5a7c75b5 Mon Sep 17 00:00:00 2001
From: withmorten <morten.with@gmail.com>
Date: Sun, 31 Jan 2021 02:08:42 +0100
Subject: [PATCH 1/5] renderer fix from miami

---
 src/render/Renderer.cpp      | 4 ++++
 src/rw/VisibilityPlugins.cpp | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
index d41f27e3..2c224677 100644
--- a/src/render/Renderer.cpp
+++ b/src/render/Renderer.cpp
@@ -1396,6 +1396,10 @@ CRenderer::ScanSectorPoly(RwV2d *poly, int32 numVertices, void (*scanfunc)(CPtrL
 void
 CRenderer::InsertEntityIntoList(CEntity *ent)
 {
+#ifdef FIX_BUGS
+	if (!ent->m_rwObject) return;
+#endif
+
 #ifdef NEW_RENDERER
 	// TODO: there are more flags being checked here
 	if(gbNewRenderer && (ent->IsVehicle() || ent->IsPed()))
diff --git a/src/rw/VisibilityPlugins.cpp b/src/rw/VisibilityPlugins.cpp
index 32461d1c..051a6883 100644
--- a/src/rw/VisibilityPlugins.cpp
+++ b/src/rw/VisibilityPlugins.cpp
@@ -192,6 +192,10 @@ CVisibilityPlugins::InitAlphaEntityList(void)
 bool
 CVisibilityPlugins::InsertEntityIntoSortedList(CEntity *e, float dist)
 {
+#ifdef FIX_BUGS
+	if (!e->m_rwObject) return true;
+#endif
+
 	AlphaObjectInfo item;
 	item.entity = e;
 	item.sort = dist;

From 5de4e88d7a7637d9e0f806855a8f0d66b4f2f276 Mon Sep 17 00:00:00 2001
From: shfil <filip.gawin@zoho.com>
Date: Sun, 31 Jan 2021 15:00:36 +0100
Subject: [PATCH 2/5] fix realloc

---
 src/core/re3.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 37b2cdf0..474a4644 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -690,7 +690,7 @@ void CTweakVars::Add(CTweakVar *var)
 		TweakVarsListSize = 0;
 	}
 	if(TweakVarsListSize > 63)
-		TweakVarsList = (CTweakVar**) realloc(TweakVarsList, (TweakVarsListSize + 1) * sizeof(*var));
+		TweakVarsList = (CTweakVar**) realloc(TweakVarsList, (TweakVarsListSize + 1) * sizeof(CTweakVar*));
 
 	TweakVarsList[TweakVarsListSize++] = var;
 //	TweakVarsList.push_back(var);

From 7a3b80a9b7f414967fe59f89ab0fe5416735babe Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Sun, 31 Jan 2021 20:44:39 +0100
Subject: [PATCH 3/5] First batch of fixes (CallAndMessage)

---
 src/control/Pickups.cpp         |  9 ++++++-
 src/control/Script.cpp          |  9 +++++--
 src/control/Script4.cpp         |  9 +++++--
 src/control/Script6.cpp         |  6 +++--
 src/core/Camera.cpp             | 25 ++++++++++---------
 src/core/FileLoader.cpp         |  9 +++++++
 src/core/Pools.cpp              | 10 ++++++--
 src/core/Radar.cpp              |  3 +++
 src/entities/Entity.cpp         |  6 +++++
 src/entities/Physical.cpp       | 27 +++++++++++---------
 src/peds/Ped.cpp                | 16 ++++++------
 src/peds/PedAI.cpp              | 44 ++++++++++++++++++++++++++-------
 src/render/WaterLevel.cpp       |  5 +++-
 src/save/GenericGameStorage.cpp |  3 +++
 src/vehicles/CarGen.cpp         |  7 +++++-
 15 files changed, 139 insertions(+), 49 deletions(-)

diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp
index 96a8a670..8318bc1a 100644
--- a/src/control/Pickups.cpp
+++ b/src/control/Pickups.cpp
@@ -814,6 +814,9 @@ 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
@@ -1285,7 +1288,11 @@ CPacManPickups::GeneratePMPickUpsForRace(int32 race)
 	int i = 0;
 
 	if (race == 0) pPos = aRacePoints1; // there's only one available
-	assert(pPos != nil);
+
+	if(!pPos) {
+		debug("This shouldn't happen");
+		return;
+	}
 
 	while (!pPos->IsZero()) {
 		while (aPMPickUps[i].m_eType != PACMAN_NONE)
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index e70bd508..83f43276 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -3439,8 +3439,13 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
 		}
 		else {
 			CVehicle* car;
-			if (!CModelInfo::IsBikeModel(ScriptParams[0]))
-				car = new CAutomobile(ScriptParams[0], MISSION_VEHICLE);
+			if(!CModelInfo::IsBikeModel(ScriptParams[0])) car = new CAutomobile(ScriptParams[0], MISSION_VEHICLE);
+#ifdef FIX_BUGS
+			else {
+				debug("This shouldn't happen");
+				return 0;
+			}
+#endif
 			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 40f9f2f1..740a8e2e 100644
--- a/src/control/Script4.cpp
+++ b/src/control/Script4.cpp
@@ -1817,8 +1817,13 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		if (model == -1)
 			return 0;
 		CVehicle* car;
-		if (!CModelInfo::IsBikeModel(model))
-			car = new CAutomobile(model, RANDOM_VEHICLE);
+		if(!CModelInfo::IsBikeModel(model)) car = new CAutomobile(model, RANDOM_VEHICLE);
+#ifdef FIX_BUGS
+		else {
+			debug("This shouldn't happen");
+			return 0;
+		}
+#endif
 		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 31be6987..f8e2d8f1 100644
--- a/src/control/Script6.cpp
+++ b/src/control/Script6.cpp
@@ -971,8 +971,10 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 					pClosestEntity = apEntities[i];
 				}
 			}
-			if (pClosestEntity->IsDummy())
-				pClosestEntity = nil;
+#ifdef FIX_BUGS
+			if(pClosestEntity)
+#endif
+				if(pClosestEntity->IsDummy()) pClosestEntity = nil;
 		}
 		if (pClosestEntity) {
 			script_assert(pClosestEntity->IsObject());
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index 2ce4e754..712e9d09 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -1699,10 +1699,12 @@ CCamera::CamControl(void)
 		Cams[ActiveCam].CamTargetEntity = pTargetEntity;
 
 	// Ped visibility
-	if((Cams[ActiveCam].Mode == CCam::MODE_1STPERSON ||
-	    Cams[ActiveCam].Mode == CCam::MODE_SNIPER ||
-	    Cams[ActiveCam].Mode == CCam::MODE_M16_1STPERSON ||
-	    Cams[ActiveCam].Mode == CCam::MODE_ROCKETLAUNCHER) && pTargetEntity->IsPed() ||
+	if(((Cams[ActiveCam].Mode == CCam::MODE_1STPERSON || Cams[ActiveCam].Mode == CCam::MODE_SNIPER || Cams[ActiveCam].Mode == CCam::MODE_M16_1STPERSON ||
+	    Cams[ActiveCam].Mode == CCam::MODE_ROCKETLAUNCHER) &&
+#ifdef FIX_BUGS
+	       pTargetEntity &&
+#endif
+	       pTargetEntity->IsPed()) ||
 	   Cams[ActiveCam].Mode == CCam::MODE_FLYBY)
 		FindPlayerPed()->bIsVisible = false;
 	else
@@ -1754,14 +1756,15 @@ CCamera::UpdateTargetEntity(void)
 		   PLAYER->m_pMyVehicle &&
 		   PLAYER->m_pMyVehicle->CanPedOpenLocks(PLAYER))
 			cantOpen = false;
-
-		if(PLAYER->GetPedState() == PED_ENTER_CAR && !cantOpen){
-			if(!enteringCar && CarZoomIndicator != CAM_ZOOM_1STPRS){
-				pTargetEntity = PLAYER->m_pMyVehicle;
-				if(PLAYER->m_pMyVehicle == nil)
-					pTargetEntity = PLAYER;
+#ifdef FIX_BUGS
+		if(PLAYER)
+#endif
+			if(PLAYER->GetPedState() == PED_ENTER_CAR && !cantOpen) {
+				if(!enteringCar && CarZoomIndicator != CAM_ZOOM_1STPRS) {
+					pTargetEntity = PLAYER->m_pMyVehicle;
+					if(PLAYER->m_pMyVehicle == nil) pTargetEntity = PLAYER;
+				}
 			}
-		}
 
 		if((PLAYER->GetPedState() == PED_CARJACK || PLAYER->GetPedState() == PED_OPEN_DOOR) && !cantOpen){
 			if(!enteringCar && CarZoomIndicator != CAM_ZOOM_1STPRS)
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
index 22e0159c..7724d919 100644
--- a/src/core/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -1090,6 +1090,9 @@ CFileLoader::LoadObject(const char *line)
 	char model[24], txd[24];
 	float dist[3];
 	uint32 flags;
+#ifdef FIX_BUGS
+	flags = 0;
+#endif
 	int damaged;
 	CSimpleModelInfo *mi;
 
@@ -1186,6 +1189,9 @@ CFileLoader::LoadTimeObject(const char *line)
 	char model[24], txd[24];
 	float dist[3];
 	uint32 flags;
+#ifdef FIX_BUGS
+	flags = 0;
+#endif
 	int timeOn, timeOff;
 	int damaged;
 	CTimeModelInfo *mi, *other;
@@ -1790,6 +1796,9 @@ CFileLoader::ReloadObject(const char *line)
 	char model[24], txd[24];
 	float dist[3];
 	uint32 flags;
+#ifdef FIX_BUGS
+	flags = 0;
+#endif
 	CSimpleModelInfo *mi;
 
 	if(sscanf(line, "%d %s %s %d", &id, model, txd, &numObjs) != 4)
diff --git a/src/core/Pools.cpp b/src/core/Pools.cpp
index 39cfb1d4..54055243 100644
--- a/src/core/Pools.cpp
+++ b/src/core/Pools.cpp
@@ -144,8 +144,11 @@ INITSAVEBUF
 			pVehicle = new(slot) CBoat(model, RANDOM_VEHICLE);
 		else if (type == VEHICLE_TYPE_CAR)
 			pVehicle = new(slot) CAutomobile(model, RANDOM_VEHICLE);
-		else
+		else {
 			assert(0);
+			debug("This shouldn't happen");
+			return;
+		}
 		--CCarCtrl::NumRandomCars;
 		pVehicle->Load(buf);
 		CWorld::Add(pVehicle);
@@ -518,8 +521,11 @@ INITSAVEBUF
 
 		if (pedtype == PEDTYPE_PLAYER1)
 			pPed = new(ref) CPlayerPed();
-		else
+		else {
 			assert(0);
+			debug("This shouldn't happen");
+			return;
+		}
 
 		pPed->Load(buf);
 		if (pedtype == PEDTYPE_PLAYER1) {
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp
index 4fd7f1a5..7f778498 100644
--- a/src/core/Radar.cpp
+++ b/src/core/Radar.cpp
@@ -404,6 +404,9 @@ void CRadar::Draw3dMarkers()
 			case BLIP_CHAR:
 			{
 				CEntity *entity = CPools::GetPedPool()->GetAt(ms_RadarTrace[i].m_nEntityHandle);
+#ifdef FIX_BUGS
+				if(!entity) break;
+#endif
 				if (entity != nil) {
 					if (((CPed*)entity)->InVehicle())
 						entity = ((CPed * )entity)->m_pMyVehicle;
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp
index 4885d631..dc70a31a 100644
--- a/src/entities/Entity.cpp
+++ b/src/entities/Entity.cpp
@@ -504,6 +504,9 @@ CEntity::Add(void)
 			case ENTITY_TYPE_DUMMY:
 				list = &s->m_lists[ENTITYLIST_DUMMIES_OVERLAP];
 				break;
+#ifdef FIX_BUGS
+			default: debug("This shouldn't happen"); return;
+#endif
 			}
 			list->InsertItem(this);
 		}
@@ -564,6 +567,9 @@ CEntity::Remove(void)
 			case ENTITY_TYPE_DUMMY:
 				list = &s->m_lists[ENTITYLIST_DUMMIES_OVERLAP];
 				break;
+#ifdef FIX_BUGS
+			default: debug("This shouldn't happen"); return;
+#endif
 			}
 			list->RemoveItem(this);
 		}
diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp
index ed01297e..4088f1d1 100644
--- a/src/entities/Physical.cpp
+++ b/src/entities/Physical.cpp
@@ -126,6 +126,8 @@ CPhysical::Add(void)
 				break;
 			default:
 				assert(0);
+				debug("This shouldn't happen");
+				return;
 			}
 			CPtrNode *node = list->InsertItem(this);
 			assert(node);
@@ -191,17 +193,20 @@ CPhysical::RemoveAndAdd(void)
 				list = &s->m_lists[ENTITYLIST_OBJECTS_OVERLAP];
 				break;
 			}
-			if(next){
-				// If we still have old nodes, use them
-				next->list->RemoveNode(next->listnode);
-				list->InsertNode(next->listnode);
-				next->list = list;
-				next->sector = s;
-				next = next->next;
-			}else{
-				CPtrNode *node = list->InsertItem(this);
-				m_entryInfoList.InsertItem(list, node, s);
-			}
+#ifdef FIX_BUGS
+			if(list)
+#endif
+				if(next) {
+					// If we still have old nodes, use them
+					next->list->RemoveNode(next->listnode);
+					list->InsertNode(next->listnode);
+					next->list = list;
+					next->sector = s;
+					next = next->next;
+				} else {
+					CPtrNode *node = list->InsertItem(this);
+					m_entryInfoList.InsertItem(list, node, s);
+				}
 		}
 
 	// Remove old nodes we no longer need
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 87e77ef3..a498e251 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -4348,13 +4348,15 @@ CPed::PedSetDraggedOutCarCB(CAnimBlendAssociation *dragAssoc, void *arg)
 	}
 #endif
 
-	if (quickJackedAssoc) {
-		dragAssoc->SetDeleteCallback(PedSetQuickDraggedOutCarPositionCB, ped);
-	} else {
-		dragAssoc->SetDeleteCallback(PedSetDraggedOutCarPositionCB, ped);
-		if (ped->CanSetPedState())
-			CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_GETUP1, 1000.0f);
-	}
+#ifdef FIX_BUGS
+	if(dragAssoc)
+#endif
+		if(quickJackedAssoc) {
+			dragAssoc->SetDeleteCallback(PedSetQuickDraggedOutCarPositionCB, ped);
+		} else {
+			dragAssoc->SetDeleteCallback(PedSetDraggedOutCarPositionCB, ped);
+			if(ped->CanSetPedState()) CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_GETUP1, 1000.0f);
+		}
 
 	ped->ReplaceWeaponWhenExitingVehicle();
 
diff --git a/src/peds/PedAI.cpp b/src/peds/PedAI.cpp
index 089c8d9d..73958a43 100644
--- a/src/peds/PedAI.cpp
+++ b/src/peds/PedAI.cpp
@@ -2244,6 +2244,9 @@ CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg)
 			enterDoor = DOOR_REAR_LEFT;
 			break;
 		default:
+#ifdef FIX_BUGS
+			enterDoor = DOOR_BONNET;
+#endif
 			break;
 	}
 
@@ -2356,7 +2359,7 @@ CPed::PedAnimDoorOpenCB(CAnimBlendAssociation* animAssoc, void* arg)
 		case CAR_DOOR_RR: door = DOOR_REAR_RIGHT; pedInSeat = veh->pPassengers[2]; break;
 		case CAR_DOOR_LF: door = DOOR_FRONT_LEFT; pedInSeat = veh->pDriver; break;
 		case CAR_DOOR_LR: door = DOOR_REAR_LEFT; pedInSeat = veh->pPassengers[1]; break;
-		default: assert(0);
+		default: assert(0); debug("This shouldn't happen"); return;
 	}
 
 	if (ped->m_fHealth == 0.0f || CPad::GetPad(0)->ArePlayerControlsDisabled() && pedInSeat && pedInSeat->IsPlayer()) {
@@ -2554,6 +2557,9 @@ CPed::PedAnimPullPedOutCB(CAnimBlendAssociation* animAssoc, void* arg)
 				case PEDTYPE_PLAYER4:
 					padNo = 3;
 					break;
+				default:
+					padNo = 0;
+					break;
 			}
 			CPad *pad = CPad::GetPad(padNo);
 
@@ -2657,6 +2663,9 @@ CPed::PedAnimGetInCB(CAnimBlendAssociation *animAssoc, void *arg)
 			enterDoor = DOOR_REAR_LEFT;
 			break;
 		default:
+#ifdef FIX_BUGS
+			enterDoor = DOOR_BONNET;
+#endif
 			break;
 	}
 	if (!veh->IsDoorMissing(enterDoor)) {
@@ -2752,12 +2761,15 @@ CPed::PedAnimDoorCloseCB(CAnimBlendAssociation *animAssoc, void *arg)
 			veh->ProcessOpenDoor(ped->m_vehDoor, ANIM_CAR_CLOSEDOOR_LHS, 1.0f);
 
 		eDoors door;
-		switch (ped->m_vehDoor) {
-			case CAR_DOOR_RF: door = DOOR_FRONT_RIGHT; break;
-			case CAR_DOOR_RR: door = DOOR_REAR_RIGHT; break;
-			case CAR_DOOR_LF: door = DOOR_FRONT_LEFT; break;
-			case CAR_DOOR_LR: door = DOOR_REAR_LEFT; break;
-			default: assert(0);
+		switch(ped->m_vehDoor) {
+		case CAR_DOOR_RF: door = DOOR_FRONT_RIGHT; break;
+		case CAR_DOOR_RR: door = DOOR_REAR_RIGHT; break;
+		case CAR_DOOR_LF: door = DOOR_FRONT_LEFT; break;
+		case CAR_DOOR_LR: door = DOOR_REAR_LEFT; break;
+		default:
+			assert(0);
+			debug("This shouldn't happen");
+			return;
 		}
 
 		if (veh->Damage.GetDoorStatus(door) == DOOR_STATUS_SWINGING)
@@ -2926,6 +2938,9 @@ CPed::PedAnimStepOutCarCB(CAnimBlendAssociation* animAssoc, void* arg)
 			door = DOOR_REAR_LEFT;
 			break;
 		default:
+#ifdef FIX_BUGS
+			door = DOOR_BONNET;
+#endif
 			break;
 	}
 	bool closeDoor = !veh->IsDoorMissing(door);
@@ -2947,6 +2962,12 @@ CPed::PedAnimStepOutCarCB(CAnimBlendAssociation* animAssoc, void* arg)
 			case PEDTYPE_PLAYER4:
 				padNo = 3;
 				break;
+			default:
+#ifdef FIX_BUGS
+				padNo = 0;
+				debug("This shouldn't happen");
+#endif
+				break;
 		}
 		CPad* pad = CPad::GetPad(padNo);
 		bool engineIsIntact = veh->IsCar() && ((CAutomobile*)veh)->Damage.GetEngineStatus() >= 225;
@@ -3285,6 +3306,9 @@ CPed::SetCarJack(CVehicle* car)
 {
 	uint8 doorFlag;
 	eDoors door;
+#ifdef FIX_BUGS
+	door = DOOR_BONNET;
+#endif
 	CPed *pedInSeat = nil;
 
 	if (car->IsBoat())
@@ -3440,8 +3464,10 @@ CPed::BeingDraggedFromCar(void)
 
 		if (!dontRunAnim)
 			m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, enterAnim);
-
-		m_pVehicleAnim->SetFinishCallback(PedSetDraggedOutCarCB, this);
+#ifdef FIX_BUGS
+		if(m_pVehicleAnim)
+#endif
+			m_pVehicleAnim->SetFinishCallback(PedSetDraggedOutCarCB, this);
 		lineUpType = LINE_UP_TO_CAR_START;
 	} else if (m_pVehicleAnim->currentTime <= 1.4f) {
 		m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp
index 7aa01f5a..231ae14f 100644
--- a/src/render/WaterLevel.cpp
+++ b/src/render/WaterLevel.cpp
@@ -745,7 +745,10 @@ CWaterLevel::RenderWater()
 						if ( fHugeSectorDistToCamSqr >= SQR(500.0f) /*fHugeSectorNearDist*/ )
 						{
 							float fZ;
-	
+#ifdef FIX_BUGS
+							fZ = 0.f;
+#endif
+
 							if ( aWaterBlockList[2*x+0][2*y+0] >= 0 )
 								fZ = ms_aWaterZs[ aWaterBlockList[2*x+0][2*y+0] ];
 	
diff --git a/src/save/GenericGameStorage.cpp b/src/save/GenericGameStorage.cpp
index a7cafec8..d0f9e7ba 100644
--- a/src/save/GenericGameStorage.cpp
+++ b/src/save/GenericGameStorage.cpp
@@ -251,6 +251,9 @@ GenericLoad()
 	uint8 *buf;
 	int32 file;
 	uint32 size;
+#ifdef FIX_BUGS
+	size = 0;
+#endif
 #ifdef MISSION_REPLAY
 	int8 qs;
 #endif
diff --git a/src/vehicles/CarGen.cpp b/src/vehicles/CarGen.cpp
index 7524444b..9a0e5847 100644
--- a/src/vehicles/CarGen.cpp
+++ b/src/vehicles/CarGen.cpp
@@ -100,7 +100,12 @@ void CCarGenerator::DoInternalProcessing()
 			// So game crashes if it's bike :D
 			if (((CVehicleModelInfo*)CModelInfo::GetModelInfo(m_nModelIndex))->m_vehicleType != VEHICLE_TYPE_BIKE)
 				pCar = new CAutomobile(m_nModelIndex, PARKED_VEHICLE);
-
+#ifdef FIX_BUGS
+			else {
+				debug("This shouldn't happen");
+				return;
+			}
+#endif
 			pCar->SetIsStatic(false);
 			pCar->bEngineOn = false;
 			pos.z += pCar->GetDistanceFromCentreOfMassToBaseOfModel();

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: [PATCH 4/5] 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 ++---
 src/core/Camera.cpp             | 25 +++++++++----------
 src/core/FileLoader.cpp         |  9 -------
 src/core/Pools.cpp              | 10 ++------
 src/core/Radar.cpp              |  3 ---
 src/entities/Entity.cpp         |  6 -----
 src/entities/Physical.cpp       | 27 +++++++++-----------
 src/peds/Ped.cpp                | 16 ++++++------
 src/peds/PedAI.cpp              | 44 +++++++--------------------------
 src/render/WaterLevel.cpp       |  5 +---
 src/save/GenericGameStorage.cpp |  3 ---
 src/vehicles/CarGen.cpp         |  7 +-----
 15 files changed, 49 insertions(+), 139 deletions(-)

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());
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index 712e9d09..2ce4e754 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -1699,12 +1699,10 @@ CCamera::CamControl(void)
 		Cams[ActiveCam].CamTargetEntity = pTargetEntity;
 
 	// Ped visibility
-	if(((Cams[ActiveCam].Mode == CCam::MODE_1STPERSON || Cams[ActiveCam].Mode == CCam::MODE_SNIPER || Cams[ActiveCam].Mode == CCam::MODE_M16_1STPERSON ||
-	    Cams[ActiveCam].Mode == CCam::MODE_ROCKETLAUNCHER) &&
-#ifdef FIX_BUGS
-	       pTargetEntity &&
-#endif
-	       pTargetEntity->IsPed()) ||
+	if((Cams[ActiveCam].Mode == CCam::MODE_1STPERSON ||
+	    Cams[ActiveCam].Mode == CCam::MODE_SNIPER ||
+	    Cams[ActiveCam].Mode == CCam::MODE_M16_1STPERSON ||
+	    Cams[ActiveCam].Mode == CCam::MODE_ROCKETLAUNCHER) && pTargetEntity->IsPed() ||
 	   Cams[ActiveCam].Mode == CCam::MODE_FLYBY)
 		FindPlayerPed()->bIsVisible = false;
 	else
@@ -1756,15 +1754,14 @@ CCamera::UpdateTargetEntity(void)
 		   PLAYER->m_pMyVehicle &&
 		   PLAYER->m_pMyVehicle->CanPedOpenLocks(PLAYER))
 			cantOpen = false;
-#ifdef FIX_BUGS
-		if(PLAYER)
-#endif
-			if(PLAYER->GetPedState() == PED_ENTER_CAR && !cantOpen) {
-				if(!enteringCar && CarZoomIndicator != CAM_ZOOM_1STPRS) {
-					pTargetEntity = PLAYER->m_pMyVehicle;
-					if(PLAYER->m_pMyVehicle == nil) pTargetEntity = PLAYER;
-				}
+
+		if(PLAYER->GetPedState() == PED_ENTER_CAR && !cantOpen){
+			if(!enteringCar && CarZoomIndicator != CAM_ZOOM_1STPRS){
+				pTargetEntity = PLAYER->m_pMyVehicle;
+				if(PLAYER->m_pMyVehicle == nil)
+					pTargetEntity = PLAYER;
 			}
+		}
 
 		if((PLAYER->GetPedState() == PED_CARJACK || PLAYER->GetPedState() == PED_OPEN_DOOR) && !cantOpen){
 			if(!enteringCar && CarZoomIndicator != CAM_ZOOM_1STPRS)
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
index 7724d919..22e0159c 100644
--- a/src/core/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -1090,9 +1090,6 @@ CFileLoader::LoadObject(const char *line)
 	char model[24], txd[24];
 	float dist[3];
 	uint32 flags;
-#ifdef FIX_BUGS
-	flags = 0;
-#endif
 	int damaged;
 	CSimpleModelInfo *mi;
 
@@ -1189,9 +1186,6 @@ CFileLoader::LoadTimeObject(const char *line)
 	char model[24], txd[24];
 	float dist[3];
 	uint32 flags;
-#ifdef FIX_BUGS
-	flags = 0;
-#endif
 	int timeOn, timeOff;
 	int damaged;
 	CTimeModelInfo *mi, *other;
@@ -1796,9 +1790,6 @@ CFileLoader::ReloadObject(const char *line)
 	char model[24], txd[24];
 	float dist[3];
 	uint32 flags;
-#ifdef FIX_BUGS
-	flags = 0;
-#endif
 	CSimpleModelInfo *mi;
 
 	if(sscanf(line, "%d %s %s %d", &id, model, txd, &numObjs) != 4)
diff --git a/src/core/Pools.cpp b/src/core/Pools.cpp
index 54055243..39cfb1d4 100644
--- a/src/core/Pools.cpp
+++ b/src/core/Pools.cpp
@@ -144,11 +144,8 @@ INITSAVEBUF
 			pVehicle = new(slot) CBoat(model, RANDOM_VEHICLE);
 		else if (type == VEHICLE_TYPE_CAR)
 			pVehicle = new(slot) CAutomobile(model, RANDOM_VEHICLE);
-		else {
+		else
 			assert(0);
-			debug("This shouldn't happen");
-			return;
-		}
 		--CCarCtrl::NumRandomCars;
 		pVehicle->Load(buf);
 		CWorld::Add(pVehicle);
@@ -521,11 +518,8 @@ INITSAVEBUF
 
 		if (pedtype == PEDTYPE_PLAYER1)
 			pPed = new(ref) CPlayerPed();
-		else {
+		else
 			assert(0);
-			debug("This shouldn't happen");
-			return;
-		}
 
 		pPed->Load(buf);
 		if (pedtype == PEDTYPE_PLAYER1) {
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp
index 7f778498..4fd7f1a5 100644
--- a/src/core/Radar.cpp
+++ b/src/core/Radar.cpp
@@ -404,9 +404,6 @@ void CRadar::Draw3dMarkers()
 			case BLIP_CHAR:
 			{
 				CEntity *entity = CPools::GetPedPool()->GetAt(ms_RadarTrace[i].m_nEntityHandle);
-#ifdef FIX_BUGS
-				if(!entity) break;
-#endif
 				if (entity != nil) {
 					if (((CPed*)entity)->InVehicle())
 						entity = ((CPed * )entity)->m_pMyVehicle;
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp
index dc70a31a..4885d631 100644
--- a/src/entities/Entity.cpp
+++ b/src/entities/Entity.cpp
@@ -504,9 +504,6 @@ CEntity::Add(void)
 			case ENTITY_TYPE_DUMMY:
 				list = &s->m_lists[ENTITYLIST_DUMMIES_OVERLAP];
 				break;
-#ifdef FIX_BUGS
-			default: debug("This shouldn't happen"); return;
-#endif
 			}
 			list->InsertItem(this);
 		}
@@ -567,9 +564,6 @@ CEntity::Remove(void)
 			case ENTITY_TYPE_DUMMY:
 				list = &s->m_lists[ENTITYLIST_DUMMIES_OVERLAP];
 				break;
-#ifdef FIX_BUGS
-			default: debug("This shouldn't happen"); return;
-#endif
 			}
 			list->RemoveItem(this);
 		}
diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp
index 4088f1d1..ed01297e 100644
--- a/src/entities/Physical.cpp
+++ b/src/entities/Physical.cpp
@@ -126,8 +126,6 @@ CPhysical::Add(void)
 				break;
 			default:
 				assert(0);
-				debug("This shouldn't happen");
-				return;
 			}
 			CPtrNode *node = list->InsertItem(this);
 			assert(node);
@@ -193,20 +191,17 @@ CPhysical::RemoveAndAdd(void)
 				list = &s->m_lists[ENTITYLIST_OBJECTS_OVERLAP];
 				break;
 			}
-#ifdef FIX_BUGS
-			if(list)
-#endif
-				if(next) {
-					// If we still have old nodes, use them
-					next->list->RemoveNode(next->listnode);
-					list->InsertNode(next->listnode);
-					next->list = list;
-					next->sector = s;
-					next = next->next;
-				} else {
-					CPtrNode *node = list->InsertItem(this);
-					m_entryInfoList.InsertItem(list, node, s);
-				}
+			if(next){
+				// If we still have old nodes, use them
+				next->list->RemoveNode(next->listnode);
+				list->InsertNode(next->listnode);
+				next->list = list;
+				next->sector = s;
+				next = next->next;
+			}else{
+				CPtrNode *node = list->InsertItem(this);
+				m_entryInfoList.InsertItem(list, node, s);
+			}
 		}
 
 	// Remove old nodes we no longer need
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index a498e251..87e77ef3 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -4348,15 +4348,13 @@ CPed::PedSetDraggedOutCarCB(CAnimBlendAssociation *dragAssoc, void *arg)
 	}
 #endif
 
-#ifdef FIX_BUGS
-	if(dragAssoc)
-#endif
-		if(quickJackedAssoc) {
-			dragAssoc->SetDeleteCallback(PedSetQuickDraggedOutCarPositionCB, ped);
-		} else {
-			dragAssoc->SetDeleteCallback(PedSetDraggedOutCarPositionCB, ped);
-			if(ped->CanSetPedState()) CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_GETUP1, 1000.0f);
-		}
+	if (quickJackedAssoc) {
+		dragAssoc->SetDeleteCallback(PedSetQuickDraggedOutCarPositionCB, ped);
+	} else {
+		dragAssoc->SetDeleteCallback(PedSetDraggedOutCarPositionCB, ped);
+		if (ped->CanSetPedState())
+			CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_GETUP1, 1000.0f);
+	}
 
 	ped->ReplaceWeaponWhenExitingVehicle();
 
diff --git a/src/peds/PedAI.cpp b/src/peds/PedAI.cpp
index 73958a43..089c8d9d 100644
--- a/src/peds/PedAI.cpp
+++ b/src/peds/PedAI.cpp
@@ -2244,9 +2244,6 @@ CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg)
 			enterDoor = DOOR_REAR_LEFT;
 			break;
 		default:
-#ifdef FIX_BUGS
-			enterDoor = DOOR_BONNET;
-#endif
 			break;
 	}
 
@@ -2359,7 +2356,7 @@ CPed::PedAnimDoorOpenCB(CAnimBlendAssociation* animAssoc, void* arg)
 		case CAR_DOOR_RR: door = DOOR_REAR_RIGHT; pedInSeat = veh->pPassengers[2]; break;
 		case CAR_DOOR_LF: door = DOOR_FRONT_LEFT; pedInSeat = veh->pDriver; break;
 		case CAR_DOOR_LR: door = DOOR_REAR_LEFT; pedInSeat = veh->pPassengers[1]; break;
-		default: assert(0); debug("This shouldn't happen"); return;
+		default: assert(0);
 	}
 
 	if (ped->m_fHealth == 0.0f || CPad::GetPad(0)->ArePlayerControlsDisabled() && pedInSeat && pedInSeat->IsPlayer()) {
@@ -2557,9 +2554,6 @@ CPed::PedAnimPullPedOutCB(CAnimBlendAssociation* animAssoc, void* arg)
 				case PEDTYPE_PLAYER4:
 					padNo = 3;
 					break;
-				default:
-					padNo = 0;
-					break;
 			}
 			CPad *pad = CPad::GetPad(padNo);
 
@@ -2663,9 +2657,6 @@ CPed::PedAnimGetInCB(CAnimBlendAssociation *animAssoc, void *arg)
 			enterDoor = DOOR_REAR_LEFT;
 			break;
 		default:
-#ifdef FIX_BUGS
-			enterDoor = DOOR_BONNET;
-#endif
 			break;
 	}
 	if (!veh->IsDoorMissing(enterDoor)) {
@@ -2761,15 +2752,12 @@ CPed::PedAnimDoorCloseCB(CAnimBlendAssociation *animAssoc, void *arg)
 			veh->ProcessOpenDoor(ped->m_vehDoor, ANIM_CAR_CLOSEDOOR_LHS, 1.0f);
 
 		eDoors door;
-		switch(ped->m_vehDoor) {
-		case CAR_DOOR_RF: door = DOOR_FRONT_RIGHT; break;
-		case CAR_DOOR_RR: door = DOOR_REAR_RIGHT; break;
-		case CAR_DOOR_LF: door = DOOR_FRONT_LEFT; break;
-		case CAR_DOOR_LR: door = DOOR_REAR_LEFT; break;
-		default:
-			assert(0);
-			debug("This shouldn't happen");
-			return;
+		switch (ped->m_vehDoor) {
+			case CAR_DOOR_RF: door = DOOR_FRONT_RIGHT; break;
+			case CAR_DOOR_RR: door = DOOR_REAR_RIGHT; break;
+			case CAR_DOOR_LF: door = DOOR_FRONT_LEFT; break;
+			case CAR_DOOR_LR: door = DOOR_REAR_LEFT; break;
+			default: assert(0);
 		}
 
 		if (veh->Damage.GetDoorStatus(door) == DOOR_STATUS_SWINGING)
@@ -2938,9 +2926,6 @@ CPed::PedAnimStepOutCarCB(CAnimBlendAssociation* animAssoc, void* arg)
 			door = DOOR_REAR_LEFT;
 			break;
 		default:
-#ifdef FIX_BUGS
-			door = DOOR_BONNET;
-#endif
 			break;
 	}
 	bool closeDoor = !veh->IsDoorMissing(door);
@@ -2962,12 +2947,6 @@ CPed::PedAnimStepOutCarCB(CAnimBlendAssociation* animAssoc, void* arg)
 			case PEDTYPE_PLAYER4:
 				padNo = 3;
 				break;
-			default:
-#ifdef FIX_BUGS
-				padNo = 0;
-				debug("This shouldn't happen");
-#endif
-				break;
 		}
 		CPad* pad = CPad::GetPad(padNo);
 		bool engineIsIntact = veh->IsCar() && ((CAutomobile*)veh)->Damage.GetEngineStatus() >= 225;
@@ -3306,9 +3285,6 @@ CPed::SetCarJack(CVehicle* car)
 {
 	uint8 doorFlag;
 	eDoors door;
-#ifdef FIX_BUGS
-	door = DOOR_BONNET;
-#endif
 	CPed *pedInSeat = nil;
 
 	if (car->IsBoat())
@@ -3464,10 +3440,8 @@ CPed::BeingDraggedFromCar(void)
 
 		if (!dontRunAnim)
 			m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, enterAnim);
-#ifdef FIX_BUGS
-		if(m_pVehicleAnim)
-#endif
-			m_pVehicleAnim->SetFinishCallback(PedSetDraggedOutCarCB, this);
+
+		m_pVehicleAnim->SetFinishCallback(PedSetDraggedOutCarCB, this);
 		lineUpType = LINE_UP_TO_CAR_START;
 	} else if (m_pVehicleAnim->currentTime <= 1.4f) {
 		m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp
index 231ae14f..7aa01f5a 100644
--- a/src/render/WaterLevel.cpp
+++ b/src/render/WaterLevel.cpp
@@ -745,10 +745,7 @@ CWaterLevel::RenderWater()
 						if ( fHugeSectorDistToCamSqr >= SQR(500.0f) /*fHugeSectorNearDist*/ )
 						{
 							float fZ;
-#ifdef FIX_BUGS
-							fZ = 0.f;
-#endif
-
+	
 							if ( aWaterBlockList[2*x+0][2*y+0] >= 0 )
 								fZ = ms_aWaterZs[ aWaterBlockList[2*x+0][2*y+0] ];
 	
diff --git a/src/save/GenericGameStorage.cpp b/src/save/GenericGameStorage.cpp
index d0f9e7ba..a7cafec8 100644
--- a/src/save/GenericGameStorage.cpp
+++ b/src/save/GenericGameStorage.cpp
@@ -251,9 +251,6 @@ GenericLoad()
 	uint8 *buf;
 	int32 file;
 	uint32 size;
-#ifdef FIX_BUGS
-	size = 0;
-#endif
 #ifdef MISSION_REPLAY
 	int8 qs;
 #endif
diff --git a/src/vehicles/CarGen.cpp b/src/vehicles/CarGen.cpp
index 9a0e5847..7524444b 100644
--- a/src/vehicles/CarGen.cpp
+++ b/src/vehicles/CarGen.cpp
@@ -100,12 +100,7 @@ void CCarGenerator::DoInternalProcessing()
 			// So game crashes if it's bike :D
 			if (((CVehicleModelInfo*)CModelInfo::GetModelInfo(m_nModelIndex))->m_vehicleType != VEHICLE_TYPE_BIKE)
 				pCar = new CAutomobile(m_nModelIndex, PARKED_VEHICLE);
-#ifdef FIX_BUGS
-			else {
-				debug("This shouldn't happen");
-				return;
-			}
-#endif
+
 			pCar->SetIsStatic(false);
 			pCar->bEngineOn = false;
 			pos.z += pCar->GetDistanceFromCentreOfMassToBaseOfModel();

From 4afa7b86aefdb98eab039e76bdaf0c6f75c67cfa Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sun, 31 Jan 2021 23:44:30 +0200
Subject: [PATCH 5/5] Add radio off text

---
 gamefiles/TEXT/american.gxt | Bin 220146 -> 220176 bytes
 src/audio/MusicManager.cpp  |   4 ++--
 utils/gxt/american.txt      |   3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gamefiles/TEXT/american.gxt b/gamefiles/TEXT/american.gxt
index cf4bb1e537a7ed4f0ca43b2455bfbe51dde8435f..756fafa301e5a9e12e6e0d9ed307629a277800bf 100644
GIT binary patch
delta 7058
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

delta 7077
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

diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp
index 54c1b0bc..ad304985 100644
--- a/src/audio/MusicManager.cpp
+++ b/src/audio/MusicManager.cpp
@@ -163,13 +163,13 @@ cMusicManager::DisplayRadioStationName()
 		case CHATTERBOX: string = TheText.Get("FEA_FM8"); break;
 		case USERTRACK: string = TheText.Get("FEA_FM9"); break;
 #ifdef RADIO_OFF_TEXT
-		case RADIO_OFF: case POLICE_RADIO: string = TheText.Get("FEM_OFF"); break;
+		case RADIO_OFF: case POLICE_RADIO: string = TheText.Get("FEA_FMN"); break;
 #endif
 		default: return;
 		};
 
 #ifdef RADIO_OFF_TEXT
-		if(pRetune == USERTRACK && !SampleManager.IsMP3RadioChannelAvailable()) { string = TheText.Get("FEM_OFF"); }
+		if(pRetune == USERTRACK && !SampleManager.IsMP3RadioChannelAvailable()) { string = TheText.Get("FEA_FMN"); }
 #else
 		if(pRetune > CHATTERBOX && !SampleManager.IsMP3RadioChannelAvailable()) { return; }
 #endif
diff --git a/utils/gxt/american.txt b/utils/gxt/american.txt
index 95e9d280..3b010736 100644
--- a/utils/gxt/american.txt
+++ b/utils/gxt/american.txt
@@ -8070,6 +8070,9 @@ INVERT PAD VERTICALLY
 [FEM_TWP]
 Toggle Waypoint
 
+[FEA_FMN]
+RADIO OFF
+
 { end of file }
 
 [DUMMY]