mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-15 06:39:01 +00:00
Code Issues Projects Releases Wiki Activity

Removed refs from weapons/, WeaponEffects moved

Browse source
This commit is contained in:
Sergeanur 2020-04-16 01:56:15 +03:00
parent b9a8ad9481
commit f435455bde
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/weapons/Explosion.cpp
View file

@ -19,7 +19,7 @@
#include "WaterLevel.h" #include "WaterLevel.h"
#include "World.h" #include "World.h"
CExplosion(&gaExplosion)[NUM_EXPLOSIONS] = *(CExplosion(*)[NUM_EXPLOSIONS])*(uintptr*)0x64E208; CExplosion gaExplosion[NUM_EXPLOSIONS];
// these two were not initialised in original code, I'm really not sure what were they meant to be // these two were not initialised in original code, I'm really not sure what were they meant to be
RwRGBA colMedExpl = { 0, 0, 0, 0 }; RwRGBA colMedExpl = { 0, 0, 0, 0 };

2
src/weapons/Explosion.h
View file

@ -46,4 +46,4 @@ public:
static void RemoveAllExplosionsInArea(CVector pos, float radius); static void RemoveAllExplosionsInArea(CVector pos, float radius);
}; };
extern CExplosion (&gaExplosion)[NUM_EXPLOSIONS]; extern CExplosion gaExplosion[NUM_EXPLOSIONS];

4
src/weapons/ProjectileInfo.cpp
View file

@ -13,8 +13,8 @@
#include "Weapon.h" #include "Weapon.h"
#include "World.h" #include "World.h"
CProjectileInfo (&gaProjectileInfo)[NUM_PROJECTILES] = *(CProjectileInfo(*)[NUM_PROJECTILES])*(uintptr*)0x64ED50; CProjectileInfo gaProjectileInfo[NUM_PROJECTILES];
CProjectile* (&CProjectileInfo::ms_apProjectile)[NUM_PROJECTILES] = *(CProjectile*(*)[NUM_PROJECTILES])*(uintptr*)0x87C748; CProjectile *CProjectileInfo::ms_apProjectile[NUM_PROJECTILES];
void void
CProjectileInfo::Initialise() CProjectileInfo::Initialise()

8
src/weapons/ProjectileInfo.h
View file

@ -9,14 +9,14 @@ class CProjectileInfo
{ {
public: public:
eWeaponType m_eWeaponType; eWeaponType m_eWeaponType;
CEntity* m_pSource; CEntity *m_pSource;
uint32 m_nExplosionTime; uint32 m_nExplosionTime;
bool m_bInUse; bool m_bInUse;
CVector m_vecPos; CVector m_vecPos;
public: public:
static CProjectileInfo* GetProjectileInfo(int32 id); static CProjectileInfo *GetProjectileInfo(int32 id);
static CProjectile* (&ms_apProjectile)[NUM_PROJECTILES]; static CProjectile *ms_apProjectile[NUM_PROJECTILES];
static void Initialise(); static void Initialise();
static void Shutdown(); static void Shutdown();
@ -29,4 +29,4 @@ public:
static bool IsProjectileInRange(float x1, float x2, float y1, float y2, float z1, float z2, bool remove); static bool IsProjectileInRange(float x1, float x2, float y1, float y2, float z1, float z2, bool remove);
}; };
extern CProjectileInfo (&gaProjectileInfo)[NUM_PROJECTILES]; extern CProjectileInfo gaProjectileInfo[NUM_PROJECTILES];

0
src/render/WeaponEffects.cpp → src/weapons/WeaponEffects.cpp
View file

0
src/render/WeaponEffects.h → src/weapons/WeaponEffects.h
View file