github.com/td512.re3
1
0
Fork 0
mirror of https://github.com/td512/re3.git synced 2026-01-29 10:40:51 +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.cpp
View File

@@ -12,8 +12,8 @@
#include "World.h"
#include "Floater.h"
int16 &CObject::nNoTempObjects = *(int16*)0x95CCA2;
int16 &CObject::nBodyCastHealth = *(int16*)0x5F7D4C; // 1000
int16 CObject::nNoTempObjects;
int16 CObject::nBodyCastHealth = 1000;
void *CObject::operator new(size_t sz) { return CPools::GetObjectPool()->New(); }
void *CObject::operator new(size_t sz, int handle) { return CPools::GetObjectPool()->New(handle);};