Unify names between games, format

Author: gennariarmando

plugin_III/game_III/CPtrList.h

@@ -5,47 +5,36 @@
     Do not delete this comment block. Respect others' work!
 */
 #pragma once
-
 #include "PluginBase.h"
-
-class CPtrNode {
-public:
-    void     *m_ptr; // usually a ptr to CEntity
-    CPtrNode *m_pPrev;
-    CPtrNode* m_pNext;
-
-    CPtrNode() {}
-
-    inline CPtrNode(void *Ptr) : m_ptr(Ptr) {}
-
-    static void operator delete(void* data);
-    static void* operator new(unsigned int size);
-};
-
-VALIDATE_SIZE(CPtrNode, 0xC);
+#include "CPtrNode.h"
 
 class CPtrList {
-public:
-    CPtrNode *m_pLast;
+protected:
+    CPtrNode *m_pHead;
 
+public:
     void Flush();
 
     inline void Add(CPtrNode *node) {
         node->m_pNext = nullptr;
-        node->m_pPrev = m_pLast;
-        if (m_pLast)
-            m_pLast->m_pNext = node;
-        m_pLast = node;
+        node->m_pPrev = m_pHead;
+        if (m_pHead)
+            m_pHead->m_pNext = node;
+        m_pHead = node;
     }
 
     inline void Remove(CPtrNode *node) {
-        if (m_pLast == node)
-            m_pLast = node->m_pPrev;
+        if (m_pHead == node)
+            m_pHead = node->m_pPrev;
         if (node->m_pNext)
             node->m_pNext->m_pPrev = node->m_pPrev;
         if (node->m_pPrev)
             node->m_pPrev->m_pNext = node->m_pNext;
     }
+
+	inline CPtrNode* GetNode() {
+        return m_pHead;
+    }
 };
 
 VALIDATE_SIZE(CPtrList, 0x4);

plugin_III/game_III/CPtrNode.h

@@ -0,0 +1,24 @@
+/*
+    Plugin-SDK (Grand Theft Auto 3) header file
+    Authors: GTA Community. See more here
+    https://github.com/DK22Pac/plugin-sdk
+    Do not delete this comment block. Respect others' work!
+*/
+#pragma once
+#include "PluginBase.h"
+
+class CPtrNode {
+public:
+    void* m_pVoid; // usually a ptr to CEntity
+    CPtrNode* m_pPrev;
+    CPtrNode* m_pNext;
+
+    CPtrNode() {}
+
+    inline CPtrNode(void* item) : m_pVoid(item) {}
+
+    static void operator delete(void* data);
+    static void* operator new(unsigned int size);
+};
+
+VALIDATE_SIZE(CPtrNode, 0xC);

plugin_III/game_III/CWorld.h

@@ -20,6 +20,8 @@
 #define WORLD_MAX_X (WORLD_MIN_X + WORLD_SIZE_X)
 #define WORLD_MAX_Y (WORLD_MIN_Y + WORLD_SIZE_Y)
 
+#define MAP_Z_LOW_LIMIT -100.0f
+
 #include "PluginBase.h"
 #include "CEntity.h"
 #include "CStoredCollPoly.h"
@@ -119,22 +121,22 @@ class CWorld {
         }
     }
 
-    static float GetSectorX(float f) {
+    static inline float GetSectorX(float f) {
         return ((f - WORLD_MIN_X) / SECTOR_SIZE_X);
     }
-    static float GetSectorY(float f) {
+    static inline float GetSectorY(float f) {
         return ((f - WORLD_MIN_Y) / SECTOR_SIZE_Y);
     }
-    static int32_t GetSectorIndexX(float f) {
+    static inline int32_t GetSectorIndexX(float f) {
         return (int)GetSectorX(f);
     }
-    static int32_t GetSectorIndexY(float f) {
+    static inline int32_t GetSectorIndexY(float f) {
         return (int)GetSectorY(f);
     }
-    static float GetWorldX(int x) {
+    static inline float GetWorldX(int x) {
         return x * SECTOR_SIZE_X + WORLD_MIN_X;
     }
-    static float GetWorldY(int y) {
+    static inline float GetWorldY(int y) {
         return y * SECTOR_SIZE_Y + WORLD_MIN_Y;
     }
 };

plugin_sa/game_sa/CEntity.cpp

@@ -48,9 +48,11 @@ void CEntity::DeleteRwObject()
 	((void (__thiscall *)(CEntity *))(*(void ***)this)[8])(this);
 }
 
-CRect* CEntity::GetBoundRect(CRect* rect)
+CRect CEntity::GetBoundRect()
 {
-	return ((CRect* (__thiscall *)(CEntity *, CRect*))(*(void ***)this)[9])(this, rect);
+	CRect out;
+	((CRect* (__thiscall *)(CEntity *, CRect*))(*(void ***)this)[9])(this, &out);
+	return out;
 }
 
 void CEntity::ProcessControl()

plugin_sa/game_sa/CEntity.h

@@ -87,7 +87,7 @@ class PLUGIN_API CEntity : public CPlaceable {
     void SetModelIndexNoCreate(unsigned int index);
     void CreateRwObject();
     void DeleteRwObject();
-    CRect* GetBoundRect(CRect* rect);
+    CRect GetBoundRect();
     void ProcessControl();
     void ProcessCollision();
     void ProcessShift();

plugin_sa/game_sa/CPtrList.h

@@ -10,14 +10,15 @@
 
 class PLUGIN_API CPtrList {
 protected:
-    CPtrNode *pNode;
+    CPtrNode *m_pHead;
+
 public:
     inline CPtrNode *GetNode() {
-        return pNode;
+        return m_pHead;
     }
 
     inline CPtrList() {
-        pNode = nullptr;
+        m_pHead = nullptr;
     }
 
     // get elements count

plugin_sa/game_sa/CPtrListDoubleLink.h

@@ -12,7 +12,7 @@
 class PLUGIN_API CPtrListDoubleLink : public CPtrList {
 public:
     inline CPtrNodeDoubleLink *GetNode() {
-        return reinterpret_cast<CPtrNodeDoubleLink *>(pNode);
+        return reinterpret_cast<CPtrNodeDoubleLink *>(this->m_pHead);
     }
 
     inline ~CPtrListDoubleLink() {

plugin_sa/game_sa/CPtrListSingleLink.h

@@ -12,7 +12,7 @@
 class PLUGIN_API CPtrListSingleLink : public CPtrList {
 public:
     inline CPtrNodeSingleLink *GetNode() {
-        return reinterpret_cast<CPtrNodeSingleLink *>(pNode);
+        return reinterpret_cast<CPtrNodeSingleLink *>(this->m_pHead);
     }
 
     inline ~CPtrListSingleLink() {

plugin_sa/game_sa/CPtrNode.h

@@ -1,18 +1,18 @@
 /*
-    Plugin-SDK (Grand Theft Auto San Andreas) header file
-    Authors: GTA Community. See more here
-    https://github.com/DK22Pac/plugin-sdk
-    Do not delete this comment block. Respect others' work!
+	Plugin-SDK (Grand Theft Auto San Andreas) header file
+	Authors: GTA Community. See more here
+	https://github.com/DK22Pac/plugin-sdk
+	Do not delete this comment block. Respect others' work!
 */
 #pragma once
 #include "PluginBase.h"
 
 class PLUGIN_API CPtrNode {
 public:
-    void *pItem;
-    CPtrNode *pNext;
+	void* m_pVoid;
+	CPtrNode* m_pNext;
 
-    inline CPtrNode(void *item) : pItem(item) {}
+	inline CPtrNode(void* item) : m_pVoid(item) {}
 };
 
 VALIDATE_SIZE(CPtrNode, 8);

plugin_sa/game_sa/CSector.h

@@ -6,12 +6,13 @@
 */
 #pragma once
 #include "PluginBase.h"
+#include "CPtrListSingleLink.h"
 #include "CPtrListDoubleLink.h"
 
 class PLUGIN_API CSector {
 public:
-    CPtrListDoubleLink m_buildings;
-    CPtrListDoubleLink m_dummies;
+    CPtrListSingleLink m_buildingList;
+    CPtrListDoubleLink m_dummyList;
 };
 
 VALIDATE_SIZE(CSector, 8);