diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-04-16 00:56:15 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-04-16 00:56:15 +0200 |
| commit | f435455bdee2bbe6a55f12fb8854659260b7a559 (patch) | |
| tree | 067fd961924225a38658e3064ee6e3b313741aba | |
| parent | Fix misplaced targeting (diff) | |
| download | re3-f435455bdee2bbe6a55f12fb8854659260b7a559.tar re3-f435455bdee2bbe6a55f12fb8854659260b7a559.tar.gz re3-f435455bdee2bbe6a55f12fb8854659260b7a559.tar.bz2 re3-f435455bdee2bbe6a55f12fb8854659260b7a559.tar.lz re3-f435455bdee2bbe6a55f12fb8854659260b7a559.tar.xz re3-f435455bdee2bbe6a55f12fb8854659260b7a559.tar.zst re3-f435455bdee2bbe6a55f12fb8854659260b7a559.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/weapons/Explosion.cpp | 2 | ||||
| -rw-r--r-- | src/weapons/Explosion.h | 2 | ||||
| -rw-r--r-- | src/weapons/ProjectileInfo.cpp | 4 | ||||
| -rw-r--r-- | src/weapons/ProjectileInfo.h | 8 | ||||
| -rw-r--r-- | src/weapons/WeaponEffects.cpp (renamed from src/render/WeaponEffects.cpp) | 0 | ||||
| -rw-r--r-- | src/weapons/WeaponEffects.h (renamed from src/render/WeaponEffects.h) | 0 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/weapons/Explosion.cpp b/src/weapons/Explosion.cpp index 3d00052a..02243702 100644 --- a/src/weapons/Explosion.cpp +++ b/src/weapons/Explosion.cpp @@ -19,7 +19,7 @@ #include "WaterLevel.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 RwRGBA colMedExpl = { 0, 0, 0, 0 }; diff --git a/src/weapons/Explosion.h b/src/weapons/Explosion.h index 45e2d5bb..bf54328c 100644 --- a/src/weapons/Explosion.h +++ b/src/weapons/Explosion.h @@ -46,4 +46,4 @@ public: static void RemoveAllExplosionsInArea(CVector pos, float radius); }; -extern CExplosion (&gaExplosion)[NUM_EXPLOSIONS];
\ No newline at end of file +extern CExplosion gaExplosion[NUM_EXPLOSIONS];
\ No newline at end of file diff --git a/src/weapons/ProjectileInfo.cpp b/src/weapons/ProjectileInfo.cpp index b33d2d62..8f04278c 100644 --- a/src/weapons/ProjectileInfo.cpp +++ b/src/weapons/ProjectileInfo.cpp @@ -13,8 +13,8 @@ #include "Weapon.h" #include "World.h" -CProjectileInfo (&gaProjectileInfo)[NUM_PROJECTILES] = *(CProjectileInfo(*)[NUM_PROJECTILES])*(uintptr*)0x64ED50; -CProjectile* (&CProjectileInfo::ms_apProjectile)[NUM_PROJECTILES] = *(CProjectile*(*)[NUM_PROJECTILES])*(uintptr*)0x87C748; +CProjectileInfo gaProjectileInfo[NUM_PROJECTILES]; +CProjectile *CProjectileInfo::ms_apProjectile[NUM_PROJECTILES]; void CProjectileInfo::Initialise() diff --git a/src/weapons/ProjectileInfo.h b/src/weapons/ProjectileInfo.h index a4ea369a..b88322f9 100644 --- a/src/weapons/ProjectileInfo.h +++ b/src/weapons/ProjectileInfo.h @@ -9,14 +9,14 @@ class CProjectileInfo { public: eWeaponType m_eWeaponType; - CEntity* m_pSource; + CEntity *m_pSource; uint32 m_nExplosionTime; bool m_bInUse; CVector m_vecPos; public: - static CProjectileInfo* GetProjectileInfo(int32 id); - static CProjectile* (&ms_apProjectile)[NUM_PROJECTILES]; + static CProjectileInfo *GetProjectileInfo(int32 id); + static CProjectile *ms_apProjectile[NUM_PROJECTILES]; static void Initialise(); 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); }; -extern CProjectileInfo (&gaProjectileInfo)[NUM_PROJECTILES];
\ No newline at end of file +extern CProjectileInfo gaProjectileInfo[NUM_PROJECTILES];
\ No newline at end of file diff --git a/src/render/WeaponEffects.cpp b/src/weapons/WeaponEffects.cpp index 2ed9e662..2ed9e662 100644 --- a/src/render/WeaponEffects.cpp +++ b/src/weapons/WeaponEffects.cpp diff --git a/src/render/WeaponEffects.h b/src/weapons/WeaponEffects.h index 31c5a309..31c5a309 100644 --- a/src/render/WeaponEffects.h +++ b/src/weapons/WeaponEffects.h |