Changes were made to allow compilation in Carbide C++ 2.7 and the Nokia S60v5 SDK. Important code from the OpenGL ES 1.1 backend was commented out since it prevented compilation

src/animation/AnimBlendAssociation.h

@@ -84,7 +84,11 @@ public:
 	inline float GetTimeLeft() { return hierarchy->totalLength - currentTime; }
 
 	static CAnimBlendAssociation *FromLink(CAnimBlendLink *l) {
-		return (CAnimBlendAssociation*)((uint8*)l - offsetof(CAnimBlendAssociation, link));
+		#ifdef S60V5
+			return (CAnimBlendAssociation*)((uint8*)l - OFFSET_OF(CAnimBlendAssociation, link));
+		#else
+			return (CAnimBlendAssociation*)((uint8*)l - offsetof(CAnimBlendAssociation, link));
+		#endif
 	}
 };
 

src/animation/AnimBlendHierarchy.h

@@ -30,4 +30,4 @@ public:
 	void MoveMemory(bool onlyone = false);
 };
 
-VALIDATE_SIZE(CAnimBlendHierarchy, 0x28);
+VALIDATE_SIZE(CAnimBlendHierarchy, 0x28);

src/animation/AnimationId.h

@@ -207,4 +207,4 @@ enum AnimationId
 	ANIM_STD_PHONE_TALK,
 
 	ANIM_STD_NUM
-};
+};

src/audio/sampman.h

@@ -670,4 +670,4 @@ static char StreamedNameTable[][25] =
 	"AUDIO\\k1_b.WAV",
 	"AUDIO\\cat1.WAV"
 };
-#endif
+#endif

src/collision/ColBox.h

@@ -13,4 +13,4 @@ struct CColBox
 	CVector GetSize(void) { return max - min; }
 
 	CColBox& operator=(const CColBox &other);
-};
+};

src/collision/ColLine.h

@@ -11,4 +11,4 @@ struct CColLine
 	CColLine(void) { };
 	CColLine(const CVector &p0, const CVector &p1) { this->p0 = p0; this->p1 = p1; };
 	void Set(const CVector &p0, const CVector &p1);
-};
+};

src/collision/ColModel.h

@@ -34,4 +34,4 @@ struct CColModel
 	void GetTrianglePoint(CVector &v, int i) const;
 
 	CColModel& operator=(const CColModel& other);
-};
+};

src/collision/ColSphere.h

@@ -10,4 +10,4 @@ struct CColSphere
 	uint8 surface;
 	uint8 piece;
 	void Set(float radius, const CVector &center, uint8 surf = SURFACE_DEFAULT, uint8 piece = 0);
-};
+};

src/collision/ColTriangle.h

@@ -65,4 +65,4 @@ struct CColTrianglePlane
 	void GetNormal(CVector &n) const { n = normal; }
 	float CalcPoint(const CVector &v) const { return DotProduct(normal, v) - dist; };
 #endif
-};
+};

src/collision/CompressedVector.h

@@ -33,4 +33,4 @@ struct CompressedVector
 	CVector Get(void) const { return CVector(x, y, z); };
 	void Set(float x, float y, float z) { this->x = x; this->y = y; this->z = z; };
 #endif
-};
+};

src/core/Accident.h

@@ -28,4 +28,4 @@ public:
 	bool WorkToDoForMedics();
 };
 
-extern CAccidentManager gAccidentManager;
+extern CAccidentManager gAccidentManager;

src/core/EventList.h

@@ -62,4 +62,4 @@ public:
 	static void ReportCrimeForEvent(eEventType type, intptr, bool);
 };
 
-extern CEvent gaEvent[NUMEVENTS];
+extern CEvent gaEvent[NUMEVENTS];

src/core/Range2D.h

@@ -8,4 +8,4 @@ public:
 	bool IsInRange(CVector2D vec);
 	void DebugShowRange(float, int);
 	CVector2D GetRandomPointInRange();
-};
+};

src/core/re3.cpp

@@ -69,7 +69,7 @@ myrand(void)
 {
 #ifdef USE_PS2_RAND
 	// Use our own implementation of rand, stolen from PS2
-	myrand_seed = 0x5851F42D4C957F2D * myrand_seed + 1;
+	myrand_seed = 0x5851F42D4C957F2DULL * myrand_seed + 1;
 	return ((myrand_seed >> 32) & 0x7FFFFFFF);
 #else
 	// or original codewarrior rand

src/extras/debugmenu.h

@@ -201,4 +201,4 @@ inline DebugMenuEntry *DebugMenuAddVarBool8(const char *path, const char *name,
 {
 	return DebugMenuAddVarBool8(path, name, (int8_t*)ptr, triggerFunc);
 }
-#endif
+#endif

src/math/Matrix.cpp

@@ -541,4 +541,4 @@ CCompressedMatrixNotAligned::DecompressIntoFullMatrix(CMatrix &other)
 	other.GetUp() = CrossProduct(other.GetRight(), other.GetForward());
 	other.GetPosition() = m_vecPos;
 	other.Reorthogonalise();
-}
+}

src/math/Quaternion.cpp

@@ -174,4 +174,4 @@ CQuaternion::Set(float f1, float f2, float f3)
 	y = ((s1 * c2) * c3) + ((s2 * c1) * s3);
 	z = ((s2 * c1) * c3) - ((s1 * c2) * s3);
 	w = ((c2 * c1) * c3) + ((s2 * s1) * s3);
-}
+}

src/math/Rect.cpp

@@ -14,4 +14,4 @@ CRect::CRect(float l, float t, float r, float b)
 	top = t;
 	right = r;
 	bottom = b;
-}
+}

src/math/Vector.h

@@ -126,4 +126,4 @@ class CMatrix;
 
 CVector Multiply3x3(const CMatrix &mat, const CVector &vec);
 CVector Multiply3x3(const CVector &vec, const CMatrix &mat);
-CVector operator*(const CMatrix &mat, const CVector &vec);
+CVector operator*(const CMatrix &mat, const CVector &vec);

src/modelinfo/MloModelInfo.h

@@ -11,4 +11,4 @@ public:
 public:
 	CMloModelInfo(void) : CClumpModelInfo(MITYPE_MLO) {}
 	void ConstructClump();
-};
+};

src/modelinfo/ModelIndices.h

@@ -506,4 +506,4 @@ IsFence(int16 id)
 {
 	return id == MI_FENCE ||
 		id == MI_FENCE2;
-}
+}

src/modelinfo/PedModelInfo.h

@@ -64,4 +64,4 @@ public:
 };
 #ifndef PED_SKIN
 VALIDATE_SIZE(CPedModelInfo, 0x48);
-#endif
+#endif

src/modelinfo/XtraCompsModelInfo.h

@@ -10,4 +10,4 @@ public:
 	void Shutdown(void) {};
 	RwObject *CreateInstance(void) { return nil; }
 	void SetClump(RpClump*) {};
-};
+};

src/peds/CivilianPed.cpp

@@ -464,4 +464,4 @@ CPed::RunToReportCrime(eCrimeType crimeToReport)
 	m_phoneId = phoneId;
 	m_crimeToReportOnPhone = crimeToReport;
 	return true;
-}
+}

src/peds/PedChat.cpp

@@ -149,4 +149,4 @@ CPed::Say(uint16 audio)
 			m_queuedSound = audio;
 		}
 	}
-}
+}

src/peds/PedDebug.cpp

@@ -307,4 +307,4 @@ CPed::DebugRenderClosePedText()
 {
 	// TODO: mobile code
 }
-#endif
+#endif

src/peds/PedPlacement.h

@@ -5,4 +5,4 @@ public:
 	static void FindZCoorForPed(CVector* pos);
 	static CEntity* IsPositionClearOfCars(Const CVector*);
 	static bool IsPositionClearForPed(CVector*);
-};
+};

src/peds/PedType.h

@@ -170,4 +170,4 @@ public:
 	static ePedStats GetPedStatType(char *name);
 };
 
-VALIDATE_SIZE(CPedStats, 0x34);
+VALIDATE_SIZE(CPedStats, 0x34);

src/renderer/Console.h

@@ -24,4 +24,4 @@ public:
 
 extern CConsole TheConsole;
 
-void cprintf(char*, ...);
+void cprintf(char*, ...);

src/rw/RwHelper.h

@@ -60,4 +60,4 @@ void RestoreAlphaTest();
 #else
 #define SetAlphaTest(a) (0)
 #define RestoreAlphaTest() (0)
-#endif
+#endif

src/save/SaveBuf.h

@@ -70,4 +70,4 @@ ZeroSaveBuf(uint8 *&buf, uint32 length)
 	} while(0)
 #else
 #define CheckSaveHeader(buf, a, b, c, d, size) SkipSaveBuf(buf, 8);
-#endif
+#endif

src/skel/symbian/symbian.cpp

@@ -406,7 +406,9 @@ public:
 
 		openParams.width = RsGlobal.width;
 		openParams.height = RsGlobal.height;
-		openParams.windowtitle = RsGlobal.appName;
+		#ifndef S60V5
+			openParams.windowtitle = RsGlobal.appName;
+		#endif
 		
 		ControlsManager.MakeControllerActionsBlank();
 		ControlsManager.InitDefaultControlConfiguration();

src/vehicles/Boat.h

@@ -78,4 +78,4 @@ VALIDATE_SIZE(CBoat, 0x484);
 
 extern float MAX_WAKE_LENGTH;
 extern float MIN_WAKE_INTERVAL;
-extern float WAKE_LIFETIME;
+extern float WAKE_LIFETIME;

src/weapons/Weapon.h

@@ -75,4 +75,4 @@ public:
 };
 VALIDATE_SIZE(CWeapon, 0x18);
 
-void FireOneInstantHitRound(CVector *source, CVector *target, int32 damage);
+void FireOneInstantHitRound(CVector *source, CVector *target, int32 damage);

src/weapons/WeaponInfo.h

@@ -49,4 +49,4 @@ public:
 	bool IsFlagSet(uint32 flag) const { return (m_Flags & flag) != 0; }
 };
 
-VALIDATE_SIZE(CWeaponInfo, 0x54);
+VALIDATE_SIZE(CWeaponInfo, 0x54);

src/weapons/WeaponType.h

@@ -46,4 +46,4 @@ enum eWeaponState
 	WEAPONSTATE_RELOADING,
 	WEAPONSTATE_OUT_OF_AMMO,
 	WEAPONSTATE_MELEE_MADECONTACT
-};
+};