Fix functions that return structs to return structs, not pointers

Author: ZivDero

AbstractClass.h

@@ -87,11 +87,11 @@ class NOVTABLE AbstractClass : public IPersistStream, public IRTTITypeInfo, publ
 	virtual HouseClass* GetOwningHouse() const R0;
 	virtual int GetArrayIndex() const R0;
 	virtual bool IsDead() const R0;
-	virtual CoordStruct* GetCoords(CoordStruct* pCrd) const R0;
-	virtual CoordStruct* GetDestination(CoordStruct* pCrd, TechnoClass* pDocker = nullptr) const R0; // where this is moving, or a building's dock for a techno. iow, a rendez-vous point
+	virtual CoordStruct GetCoords() const RT(CoordStruct);
+	virtual CoordStruct GetDestination(TechnoClass* pDocker = nullptr) const RT(CoordStruct); // where this is moving, or a building's dock for a techno. iow, a rendez-vous point
 	virtual bool IsOnFloor() const R0;
 	virtual bool IsInAir() const R0;
-	virtual CoordStruct* GetCenterCoords(CoordStruct* pCrd) const R0;
+	virtual CoordStruct GetCenterCoords() const RT(CoordStruct);
 	virtual void Update() RX;
 
 	//non-virtual
@@ -104,24 +104,6 @@ class NOVTABLE AbstractClass : public IPersistStream, public IRTTITypeInfo, publ
 		AnnounceExpiredPointer(this, removed);
 	}
 
-	CoordStruct GetCoords() const {
-		CoordStruct ret;
-		this->GetCoords(&ret);
-		return ret;
-	}
-
-	CoordStruct GetDestination(TechnoClass* pDocker = nullptr) const {
-		CoordStruct ret;
-		this->GetDestination(&ret, pDocker);
-		return ret;
-	}
-
-	CoordStruct GetCenterCoords() const {
-		CoordStruct ret;
-		this->GetCenterCoords(&ret);
-		return ret;
-	}
-
 	DirStruct* GetTargetDirection(DirStruct* pDir, AbstractClass* pTarget) const
 		{ JMP_THIS(0x5F3DB0); }
 

BounceClass.h

@@ -29,24 +29,12 @@ class BounceClass
 			double maxVelocity, const Vector3D<float>& velocity, double angularVelocity)
 		{ JMP_THIS(0x4397E0); }
 
-	CoordStruct* GetCoords(CoordStruct* pBuffer) const
+	CoordStruct GetCoords() const
 		{ JMP_THIS(0x4399A0); }
 
-	CoordStruct GetCoords() const {
-		CoordStruct buffer;
-		this->GetCoords(&buffer);
-		return buffer;
-	}
-
-	Matrix3D* GetDrawingMatrix(Matrix3D* pBuffer) const
+	Matrix3D GetDrawingMatrix() const
 		{ JMP_THIS(0x4399E0); }
 
-	Matrix3D GetDrawingMatrix() const {
-		Matrix3D buffer;
-		this->GetDrawingMatrix(&buffer);
-		return buffer;
-	}
-
 	Status Update()
 		{ JMP_THIS(0x439B00); }
 

BuildingClass.h

@@ -200,7 +200,7 @@ class NOVTABLE BuildingClass : public TechnoClass
 	bool CheckFog()
 		{ JMP_THIS(0x457A10); }
 
-	Matrix3D* GetVoxelBarrelOffsetMatrix(Matrix3D& ret)
+	Matrix3D GetVoxelBarrelOffsetMatrix()
 		{ JMP_THIS(0x458810); }
 
 	// returns false if this is a gate that is closed, true otherwise

CCINIClass.h

@@ -150,10 +150,10 @@ class NOVTABLE INIClass
 	//Reads three integer values.
 	int* Read3Integers(int* pBuffer, const char* pSection, const char* pKey, int* pDefault)
 		{ JMP_THIS(0x529CA0); }
-	CoordStruct* ReadPoint3D(CoordStruct& ret, const char* pSection, const char* pKey, CoordStruct& defValue)
+	CoordStruct ReadPoint3D(const char* pSection, const char* pKey, CoordStruct& defValue)
 		{ JMP_THIS(0x529CA0); }
 	void GetPoint3D(const char* pSection, const char* pKey, CoordStruct& value)
-		{ ReadPoint3D(value, pSection, pKey, value); }
+		{ value = ReadPoint3D(pSection, pKey, value); }
 
 	//Reads three byte values.
 	byte* Read3Bytes(byte* pBuffer, const char* pSection, const char* pKey, byte* pDefault)

CellClass.h

@@ -186,15 +186,8 @@ class NOVTABLE CellClass : public AbstractClass
 		{ JMP_THIS(0x47B3A0); }
 
 	// Factors in cell height from ramps, level etc.
-	CoordStruct* GetCellCoords(CoordStruct* pOutBuffer) const
-		{ JMP_THIS(0x480A30); }
-
 	CoordStruct GetCellCoords() const
-	{
-		CoordStruct buffer;
-		GetCellCoords(&buffer);
-		return buffer;
-	}
+		{ JMP_THIS(0x480A30); }
 
 	void ActivateVeins()
 		{ JMP_THIS(0x486920); }
@@ -337,7 +330,7 @@ class NOVTABLE CellClass : public AbstractClass
 		CALL(0x489270);
 	}
 
-	CoordStruct* FindInfantrySubposition(CoordStruct* pOutBuffer, const CoordStruct& coords, bool ignoreContents, bool alt, bool useCellCoords)
+	CoordStruct FindInfantrySubposition(CoordStruct* pOutBuffer, const CoordStruct& coords, bool ignoreContents, bool alt, bool useCellCoords)
 		{ JMP_THIS(0x481180); }
 
 	CoordStruct FindInfantrySubposition(const CoordStruct& coords, bool ignoreContents, bool alt, bool useCellCoords)

DisplayClass.h

@@ -56,15 +56,9 @@ class NOVTABLE DisplayClass : public MapClass
 		{ JMP_THIS(0x692610); }
 
 	/* pass in CurrentFoundationData and receive the width/height of a bounding rectangle in cells */
-	CellStruct* FoundationBoundsSize(CellStruct& outBuffer, CellStruct const* const pFoundationData) const
+	CellStruct FoundationBoundsSize(CellStruct const* const pFoundationData) const
 		{ JMP_THIS(0x4A94F0); }
 
-	CellStruct FoundationBoundsSize(CellStruct const* const pFoundationData) const {
-		CellStruct outBuffer;
-		FoundationBoundsSize(outBuffer, pFoundationData);
-		return outBuffer;
-	}
-
 	/* marks or unmarks the cells pointed to by CurrentFoundationData as containing a building */
 	void MarkFoundation(CellStruct * BaseCell, bool Mark)
 		{ JMP_THIS(0x4A95A0); }

DropPodLocomotionClass.h

@@ -19,7 +19,7 @@ class NOVTABLE DropPodLocomotionClass : public LocomotionClass, public IPiggybac
 
 	//ILocomotion
 	virtual bool __stdcall Is_Moving() R0;
-	virtual CoordStruct* __stdcall Destination(CoordStruct* pcoord) R0;
+	virtual CoordStruct __stdcall Destination() RT(CoordStruct);
 	virtual bool __stdcall Process() R0;
 	virtual void __stdcall Move_To(CoordStruct to) RX;
 	virtual void __stdcall Stop_Moving() RX;

EBolt.h

@@ -27,15 +27,9 @@ class EBolt
 	void ClearOwner()
 		{ JMP_THIS(0x4C1E50); }
 
-	CoordStruct* GetSourceCoords(CoordStruct* outBuffer) const
+	CoordStruct GetSourceCoords() const
 		{ JMP_THIS(0x4C2B40); }
 
-	CoordStruct GetSourceCoords() const {
-		CoordStruct buffer;
-		GetSourceCoords(&buffer);
-		return buffer;
-	}
-
 	void Fire(CoordStruct P1, CoordStruct P2, DWORD arg18)
 		{ JMP_THIS(0x4C2A60); }
 

FlyLocomotionClass.h

@@ -16,7 +16,7 @@ class NOVTABLE FlyLocomotionClass : public LocomotionClass
 
 	//ILocomotion
 	virtual bool __stdcall Is_Moving() R0;
-	virtual CoordStruct* __stdcall Destination(CoordStruct* pcoord) R0;
+	virtual CoordStruct __stdcall Destination() RT(CoordStruct);
 	virtual bool __stdcall Process() R0;
 	virtual void __stdcall Move_To(CoordStruct to) RX;
 	virtual void __stdcall Stop_Moving() RX;

FootClass.h

@@ -41,7 +41,7 @@ class NOVTABLE FootClass : public TechnoClass
 	virtual bool CanDeployNow() const R0;
 	virtual void AddSensorsAt(CellStruct cell) RX;
 	virtual void RemoveSensorsAt(CellStruct cell) RX;
-	virtual CoordStruct* vt_entry_4F0(CoordStruct* pCrd) R0;
+	virtual CoordStruct vt_entry_4F0() RT(CoordStruct);
 	virtual void vt_entry_4F4() RX;
 	virtual bool vt_entry_4F8() R0;
 	virtual bool MoveTo(CoordStruct* pCrd) R0;