From b41f93fcd67bb76d095c600312cf88201b667f05 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Sat, 26 Dec 2020 13:45:53 +0100
Subject: [PATCH] garage cam fix

---
 src/core/Camera.cpp | 46 ++++++++++++++++++++++++---------------------
 src/core/ZoneCull.h | 12 ++++++------
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index 9c0da263..d245bb5a 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -1137,27 +1137,31 @@ CCamera::CamControl(void)
 						}else{
 							whichDoor = 1;
 							garageDoorPos1 = Cams[ActiveCam].Source;
-							garageCenter = CVector((stairsZone->minx+stairsZone->maxx)/2.0f, (stairsZone->miny+stairsZone->maxy)/2.0f, 0.0f);
-							if(pTargetEntity->GetPosition().x > 376.0f && pTargetEntity->GetPosition().x < 383.0f &&
-							   pTargetEntity->GetPosition().y > -496.0f && pTargetEntity->GetPosition().y < -489.0f &&
-							   pTargetEntity->GetPosition().z > 11.6f && pTargetEntity->GetPosition().z < 13.6f){
-//							if((garageCenter-garageDoorPos1).Magnitude() > 15.0f){
-								bool bClearViewOutside = true;
-								CVector dirOutside = pTargetEntity->GetPosition() - garageCenter;
-								dirOutside.z = 0.0f;
-								dirOutside.Normalise();
-								float zoneDim = stairsZone->maxx - stairsZone->minx;
-								if(zoneDim < stairsZone->maxy - stairsZone->miny)
-									zoneDim = stairsZone->maxy - stairsZone->miny;
-								zoneDim *= 2.0f;
-								CVector posOutside = pTargetEntity->GetPosition() + zoneDim*dirOutside;
-								if(!CWorld::GetIsLineOfSightClear(pTargetEntity->GetPosition(), posOutside, true, false, false, false, false, false, true)){
-									posOutside = pTargetEntity->GetPosition() - zoneDim*dirOutside;
-									if(!CWorld::GetIsLineOfSightClear(pTargetEntity->GetPosition(), posOutside, true, false, false, false, false, false, true))
-										bClearViewOutside = false;
+
+							if(stairsZone){	// always true
+								garageCenter = CVector((stairsZone->minx+stairsZone->maxx)/2, (stairsZone->miny+stairsZone->maxy)/2, 0.0f);
+								if(pTargetEntity->GetPosition().x > 376.0f && pTargetEntity->GetPosition().x < 383.0f &&
+								   pTargetEntity->GetPosition().y > -496.0f && pTargetEntity->GetPosition().y < -489.0f &&
+								   pTargetEntity->GetPosition().z > 11.6f && pTargetEntity->GetPosition().z < 13.6f){
+									garageDoorPos1 = CVector(382.6f, -489.6f, 13.1f);
+								}else{
+									bool bClearViewOutside = true;
+									CVector dirOutside = pTargetEntity->GetPosition() - garageCenter;
+									dirOutside.z = 0.0f;
+									dirOutside.Normalise();
+									float zoneDim = stairsZone->maxx - stairsZone->minx;
+									if(zoneDim < stairsZone->maxy - stairsZone->miny)
+										zoneDim = stairsZone->maxy - stairsZone->miny;
+									zoneDim *= 2.0f;
+									CVector posOutside = pTargetEntity->GetPosition() + zoneDim*dirOutside;
+									if(!CWorld::GetIsLineOfSightClear(pTargetEntity->GetPosition(), posOutside, true, false, false, false, false, false, true)){
+										posOutside = pTargetEntity->GetPosition() - zoneDim*dirOutside;
+										if(!CWorld::GetIsLineOfSightClear(pTargetEntity->GetPosition(), posOutside, true, false, false, false, false, false, true))
+											bClearViewOutside = false;
+									}
+									if(bClearViewOutside)
+										garageDoorPos1 = posOutside;
 								}
-								if(bClearViewOutside)
-									garageDoorPos1 = posOutside;
 							}
 						}
 
@@ -1167,7 +1171,7 @@ CCamera::CamControl(void)
 							garageCenter.z = 0.0f;
 						}else{
 							garageDoorPos1.z = 0.0f;
-							if(stairs == nil)	// how can this be true?
+							if(!stairs)	// how can this be true?
 								garageCenter = CVector(pTargetEntity->GetPosition().x, pTargetEntity->GetPosition().y, 0.0f);
 						}
 						if(whichDoor == 1)
diff --git a/src/core/ZoneCull.h b/src/core/ZoneCull.h
index 8200b09a..d7780caf 100644
--- a/src/core/ZoneCull.h
+++ b/src/core/ZoneCull.h
@@ -17,12 +17,12 @@ enum eZoneAttribs
 
 struct CAttributeZone
 {
-	float minx;
-	float maxx;
-	float miny;
-	float maxy;
-	float minz;
-	float maxz;
+	int16 minx;
+	int16 maxx;
+	int16 miny;
+	int16 maxy;
+	int16 minz;
+	int16 maxz;
 	int16 attributes;
 	int16 wantedLevel;
 };