Merge remote-tracking branch 'origin/miami' into lcs

# Conflicts: # src/core/re3.cpp
2025-07-26 00:02:45 +00:00 · 2021-01-23 17:54:46 +02:00
parent defbb01aaa 770456d0c8
commit e9689a0a07
16 changed files with 561 additions and 189 deletions
--- a/src/render/WaterCreatures.cpp
+++ b/src/render/WaterCreatures.cpp
@ -6,6 +6,7 @@
 #include "Camera.h"
 #include "PlayerPed.h"
 #include "General.h"
+#include "Object.h"

 /*
 int CWaterCreatures::nNumActiveSeaLifeForms;
--- a/src/render/WaterCreatures.h
+++ b/src/render/WaterCreatures.h
@ -1,5 +1,6 @@
 #pragma once
-#include "Object.h"
+
+class CObject;

 /*
 enum eFishSlotState {