Merge pull request #465 from erorcun/erorcun

Various fixes

src/control/Script.cpp

@@ -6909,7 +6909,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 			CVector cp3 = tmp_matrix * CVector(pColModel->boundingBox.min.x, pColModel->boundingBox.max.y, pColModel->boundingBox.min.z);
 			CVector cp4 = tmp_matrix * CVector(pColModel->boundingBox.min.x, pColModel->boundingBox.min.y, pColModel->boundingBox.max.z);
 			int16 collisions;
-			CWorld::FindObjectsIntersectingAngledCollisionBox(pColModel->boundingBox, tmp_matrix, pos,
+			CWorld::FindObjectsIntersectingAngledCollisionBox(pColModel->boundingBox, tmp_matrix, newPosition,
 				min(cp1.x, min(cp2.x, min(cp3.x, cp4.x))),
 				min(cp1.y, min(cp2.y, min(cp3.y, cp4.y))),
 				max(cp1.x, max(cp2.x, max(cp3.x, cp4.x))),

src/core/Frontend.cpp

@@ -118,7 +118,7 @@ const CRGBA TEXT_COLOR = CRGBA(150, 110, 30, 255);
 const CRGBA TEXT_COLOR = CRGBA(235, 170, 50, 255); // PC briefs text color
 #endif
 
-const float menuXYpadding = MENUACTION_POS_Y; // *(float*)0x5F355C;	// not original name
+const float menuXYpadding = MENUACTION_POS_Y; // TODO this is non-existant, remove it
 float MENU_TEXT_SIZE_X = SMALLTEXT_X_SCALE;
 float MENU_TEXT_SIZE_Y = SMALLTEXT_Y_SCALE;
 
@@ -754,9 +754,9 @@ CMenuManager::Draw()
 
 #ifdef FIX_BUGS
 		// Label is wrapped from right by StretchX(40)px, but wrapped from left by 40px. And this is only place R* didn't use StretchX in here.
-		CFont::PrintString(MENU_X_LEFT_ALIGNED(MENU_X_MARGIN), MENU_Y(menuXYpadding), str);
+		CFont::PrintString(MENU_X_LEFT_ALIGNED(MENU_X_MARGIN), MENU_Y(MENUACTION_POS_Y), str);
 #else
-		CFont::PrintString(MENU_X_MARGIN, menuXYpadding, str);
+		CFont::PrintString(MENU_X_MARGIN, MENUACTION_POS_Y, str);
 #endif
 	}
 
@@ -3181,7 +3181,7 @@ CMenuManager::PrintBriefs()
 	CFont::SetRightJustifyOff();
 	CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X * 0.7), MENU_Y(MENU_TEXT_SIZE_Y * 0.9)); // second mulipliers are double, idk why
 
-	float nextY = 40.0f;
+	float nextY = BRIEFS_TOP_MARGIN;
 	CRGBA newColor;
 	for (int i = 4; i >= 0; i--) {
 		tPreviousBrief &brief = CMessages::PreviousBriefs[i];
@@ -3214,8 +3214,8 @@ CMenuManager::PrintBriefs()
 			newColor.a = FadeIn(255);
 			CFont::SetColor(newColor);
 #endif
-			CFont::PrintString(MENU_X_LEFT_ALIGNED(50.0f), nextY, gUString);
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(BRIEFS_LINE_X), nextY, gUString);
-			nextY += MENU_Y(menuXYpadding);
+			nextY += MENU_Y(BRIEFS_LINE_HEIGHT);
 		}
 	}
 
@@ -3252,6 +3252,9 @@ void
 CMenuManager::PrintStats()
 {
 	int rowNum = ConstructStatLine(99999);
+#ifdef GTA3_1_1_PATCH
+	CFont::SetFontStyle(FONT_BANK);
+#endif
 	CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X * 0.7), MENU_Y(MENU_TEXT_SIZE_Y * 0.9)); // second mulipliers are double, idk why
 	float nextYChange, y, alphaMult;
 

src/core/Frontend.h

@@ -68,6 +68,10 @@
 #define STATS_RATING_X 24.0f
 #define STATS_RATING_Y 20.0f
 
+#define BRIEFS_TOP_MARGIN 40.0f
+#define BRIEFS_LINE_X 50.0f
+#define BRIEFS_LINE_HEIGHT 60.0f
+
 #define CONTSETUP_STANDARD_ROW_HEIGHT 10.7f
 #define CONTSETUP_CLASSIC_ROW_HEIGHT 9.0f
 #define CONTSETUP_BOUND_HIGHLIGHT_HEIGHT 10

src/peds/Population.cpp

@@ -1050,7 +1050,7 @@ CPopulation::TestSafeForRealObject(CDummyObject *dummy)
 	if (maxY >= NUMSECTORS_Y) maxY = NUMSECTORS_Y;
 #endif
 
-	static CColPoint aTempColPoints;
+	static CColPoint aTempColPoints[MAX_COLLISION_POINTS];
 
 	for (int curY = minY; curY <= maxY; curY++) {
 		for (int curX = minX; curX <= maxX; curX++) {
@@ -1061,7 +1061,7 @@ CPopulation::TestSafeForRealObject(CDummyObject *dummy)
 				if (veh->m_scanCode != CWorld::GetCurrentScanCode()) {
 					if (veh->GetIsTouching(colCentre, colRadius)) {
 						veh->m_scanCode = CWorld::GetCurrentScanCode();
-						if (CCollision::ProcessColModels(dummy->GetMatrix(), *dummyCol, veh->GetMatrix(), *veh->GetColModel(), &aTempColPoints, nil, nil) > 0)
+						if (CCollision::ProcessColModels(dummy->GetMatrix(), *dummyCol, veh->GetMatrix(), *veh->GetColModel(), aTempColPoints, nil, nil) > 0)
 							return false;
 					}
 				}
@@ -1072,7 +1072,7 @@ CPopulation::TestSafeForRealObject(CDummyObject *dummy)
 				if (veh->m_scanCode != CWorld::GetCurrentScanCode()) {
 					if (veh->GetIsTouching(colCentre, colRadius)) {
 						veh->m_scanCode = CWorld::GetCurrentScanCode();
-						if (CCollision::ProcessColModels(dummy->GetMatrix(), *dummyCol, veh->GetMatrix(), *veh->GetColModel(), &aTempColPoints, nil, nil) > 0)
+						if (CCollision::ProcessColModels(dummy->GetMatrix(), *dummyCol, veh->GetMatrix(), *veh->GetColModel(), aTempColPoints, nil, nil) > 0)
 							return false;
 					}
 				}

src/render/Renderer.cpp

@@ -194,8 +194,6 @@ CRenderer::RenderRoads(void)
 	DeActivateDirectional();
 	SetAmbientColours();
 
-	ThePaths.m_pathNodes[-1].group = 6;
-
 	for(i = 0; i < ms_nNoOfVisibleEntities; i++){
 		t = (CTreadable*)ms_aVisibleEntityPtrs[i];
 		if(t->IsBuilding() && t->GetIsATreadable()){