github.com/td512.re3
1
0
Fork 0
mirror of https://github.com/td512/re3.git synced 2026-01-30 18:46:12 +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
parent 881d61f811 a4922d5cb7
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);