mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-07-06 16:24:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'Fire-Head/master' into Standalone

Browse source 
# Conflicts:
#	src/render/Coronas.cpp
This commit is contained in:
Sergeanur 2020-04-17 10:17:38 +03:00
commit b9c8ce0d37
129 changed files with 1316 additions and 1365 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/objects/Object.h
View file

@ -73,8 +73,8 @@ public:
CEntity *m_pCollidingEntity;
int8 m_colour1, m_colour2;
static int16 &nNoTempObjects;
static int16 &nBodyCastHealth;
static int16 nNoTempObjects;
static int16 nBodyCastHealth;
static void *operator new(size_t);
static void *operator new(size_t, int);