diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-03-17 18:47:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-17 18:47:12 +0100 |
| commit | 31d16d395eb6582b20a157764ce8b0da608ef3d8 (patch) | |
| tree | 4443d13dedf97357acfe2e9b859d1ed431fdbbf0 /src/core/Radar.h | |
| parent | Merge pull request #347 from Nick007J/master (diff) | |
| parent | Merge branch 'master' into Radar2 (diff) | |
| download | re3-31d16d395eb6582b20a157764ce8b0da608ef3d8.tar re3-31d16d395eb6582b20a157764ce8b0da608ef3d8.tar.gz re3-31d16d395eb6582b20a157764ce8b0da608ef3d8.tar.bz2 re3-31d16d395eb6582b20a157764ce8b0da608ef3d8.tar.lz re3-31d16d395eb6582b20a157764ce8b0da608ef3d8.tar.xz re3-31d16d395eb6582b20a157764ce8b0da608ef3d8.tar.zst re3-31d16d395eb6582b20a157764ce8b0da608ef3d8.zip | |
Diffstat (limited to 'src/core/Radar.h')
| -rw-r--r-- | src/core/Radar.h | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/src/core/Radar.h b/src/core/Radar.h index 5b2174d7..b0400b0d 100644 --- a/src/core/Radar.h +++ b/src/core/Radar.h @@ -59,7 +59,7 @@ struct CBlip int32 m_nEntityHandle; CVector2D m_vec2DPos; CVector m_vecPos; - int16 m_BlipIndex; + uint16 m_BlipIndex; bool m_bDim; bool m_bInUse; float m_Radius; @@ -80,26 +80,26 @@ class CRadar public: static float &m_radarRange; static CBlip (&ms_RadarTrace)[NUMRADARBLIPS]; - static CSprite2d *AsukaSprite; - static CSprite2d *BombSprite; - static CSprite2d *CatSprite; - static CSprite2d *CentreSprite; - static CSprite2d *CopcarSprite; - static CSprite2d *DonSprite; - static CSprite2d *EightSprite; - static CSprite2d *ElSprite; - static CSprite2d *IceSprite; - static CSprite2d *JoeySprite; - static CSprite2d *KenjiSprite; - static CSprite2d *LizSprite; - static CSprite2d *LuigiSprite; - static CSprite2d *NorthSprite; - static CSprite2d *RaySprite; - static CSprite2d *SalSprite; - static CSprite2d *SaveSprite; - static CSprite2d *SpraySprite; - static CSprite2d *TonySprite; - static CSprite2d *WeaponSprite; + static CSprite2d AsukaSprite; + static CSprite2d BombSprite; + static CSprite2d CatSprite; + static CSprite2d CentreSprite; + static CSprite2d CopcarSprite; + static CSprite2d DonSprite; + static CSprite2d EightSprite; + static CSprite2d ElSprite; + static CSprite2d IceSprite; + static CSprite2d JoeySprite; + static CSprite2d KenjiSprite; + static CSprite2d LizSprite; + static CSprite2d LuigiSprite; + static CSprite2d NorthSprite; + static CSprite2d RaySprite; + static CSprite2d SalSprite; + static CSprite2d SaveSprite; + static CSprite2d SpraySprite; + static CSprite2d TonySprite; + static CSprite2d WeaponSprite; static CSprite2d *RadarSprites[21]; public: @@ -125,12 +125,11 @@ public: static uint32 GetRadarTraceColour(uint32 color, bool bright); static void Initialise(); static float LimitRadarPoint(CVector2D &point); - static void LoadAllRadarBlips(int32); + static void LoadAllRadarBlips(uint8 *buf, uint32 size); static void LoadTextures(); static void RemoveRadarSections(); - static void RemoveMapSection(int32 x, int32 y); static void RequestMapSection(int32 x, int32 y); - static void SaveAllRadarBlips(uint8 *buf, uint32 *size); + static void SaveAllRadarBlips(uint8*, uint32*); static void SetBlipSprite(int32 i, int32 icon); static int32 SetCoordBlip(eBlipType type, CVector pos, int32, eBlipDisplay); static int32 SetEntityBlip(eBlipType type, int32, int32, eBlipDisplay); |