mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 05:30:00 +00:00
Load LCS radar blips
This commit is contained in:
Sergeanur
parent
7091ab5e75
commit
b5deee823c
|
|
@ -54,7 +54,7 @@ CSprite2d CRadar::SpraySprite;
|
|||
CSprite2d CRadar::TShirtSprite;
|
||||
CSprite2d CRadar::TommySprite;
|
||||
CSprite2d CRadar::PhoneSprite;
|
||||
CSprite2d CRadar::RadioWildstyleSprite;
|
||||
/*CSprite2d CRadar::RadioWildstyleSprite;
|
||||
CSprite2d CRadar::RadioFlashSprite;
|
||||
CSprite2d CRadar::RadioKChatSprite;
|
||||
CSprite2d CRadar::RadioFeverSprite;
|
||||
|
|
@ -62,7 +62,39 @@ CSprite2d CRadar::RadioVRockSprite;
|
|||
CSprite2d CRadar::RadioVCPRSprite;
|
||||
CSprite2d CRadar::RadioEspantosoSprite;
|
||||
CSprite2d CRadar::RadioEmotionSprite;
|
||||
CSprite2d CRadar::RadioWaveSprite;
|
||||
CSprite2d CRadar::RadioWaveSprite;*/
|
||||
CSprite2d CRadar::EightBallSprite;
|
||||
CSprite2d CRadar::BurnerSprite;
|
||||
CSprite2d CRadar::CiprianiSprite;
|
||||
CSprite2d CRadar::DonaldSprite;
|
||||
CSprite2d CRadar::JosephSprite;
|
||||
CSprite2d CRadar::LeoneSprite;
|
||||
CSprite2d CRadar::MariaSprite;
|
||||
CSprite2d CRadar::McraySprite;
|
||||
CSprite2d CRadar::ToshikoSprite;
|
||||
CSprite2d CRadar::VincenzoSprite;
|
||||
CSprite2d CRadar::BombSprite;
|
||||
CSprite2d CRadar::ClothesShopSprite;
|
||||
CSprite2d CRadar::PropertyRedSprite;
|
||||
CSprite2d CRadar::PhilCassidySprite;
|
||||
CSprite2d CRadar::PowerupSprite;
|
||||
CSprite2d CRadar::MPBase;
|
||||
CSprite2d CRadar::MPCheckPoint;
|
||||
CSprite2d CRadar::MPPlayer;
|
||||
CSprite2d CRadar::MPObjective;
|
||||
CSprite2d CRadar::MPCar;
|
||||
CSprite2d CRadar::MPTank;
|
||||
CSprite2d CRadar::MPCarLockup;
|
||||
CSprite2d CRadar::MPTargetPlayer;
|
||||
CSprite2d CRadar::MapHereSprite0;
|
||||
CSprite2d CRadar::MapHereSprite1;
|
||||
CSprite2d CRadar::MapHereSprite2;
|
||||
CSprite2d CRadar::MapHereSprite3;
|
||||
CSprite2d CRadar::MapHereSprite4;
|
||||
CSprite2d CRadar::MapHereSprite5;
|
||||
CSprite2d CRadar::MapHereSprite6;
|
||||
CSprite2d CRadar::MapHereSprite7;
|
||||
CSprite2d CRadar::MapWayPoint;
|
||||
|
||||
CSprite2d *CRadar::RadarSprites[RADAR_SPRITE_COUNT] = {
|
||||
nil,
|
||||
|
|
@ -96,20 +128,38 @@ CSprite2d *CRadar::RadarSprites[RADAR_SPRITE_COUNT] = {
|
|||
&TShirtSprite,
|
||||
&TommySprite,
|
||||
&PhoneSprite,
|
||||
&RadioWildstyleSprite,
|
||||
&RadioFlashSprite,
|
||||
&RadioKChatSprite,
|
||||
&RadioFeverSprite,
|
||||
&RadioVRockSprite,
|
||||
&RadioVCPRSprite,
|
||||
&RadioEspantosoSprite,
|
||||
&RadioEmotionSprite,
|
||||
&RadioWaveSprite, // tmp hack
|
||||
&RadioWaveSprite,
|
||||
&RadioWaveSprite,
|
||||
&RadioWaveSprite,
|
||||
&RadioWaveSprite,
|
||||
&RadioWaveSprite
|
||||
&EightBallSprite,
|
||||
&BurnerSprite,
|
||||
&CiprianiSprite,
|
||||
&DonaldSprite,
|
||||
&JosephSprite,
|
||||
&LeoneSprite,
|
||||
&MariaSprite,
|
||||
&McraySprite,
|
||||
&ToshikoSprite,
|
||||
&VincenzoSprite,
|
||||
&BombSprite,
|
||||
&ClothesShopSprite,
|
||||
&PropertyRedSprite,
|
||||
&PhilCassidySprite,
|
||||
&PowerupSprite,
|
||||
&MPBase,
|
||||
&MPCheckPoint,
|
||||
&MPPlayer,
|
||||
&MPObjective,
|
||||
&MPCar,
|
||||
&MPTank,
|
||||
&MPCarLockup,
|
||||
&MPTargetPlayer,
|
||||
&MapHereSprite0,
|
||||
&MapHereSprite1,
|
||||
&MapHereSprite2,
|
||||
&MapHereSprite3,
|
||||
&MapHereSprite4,
|
||||
&MapHereSprite5,
|
||||
&MapHereSprite6,
|
||||
&MapHereSprite7,
|
||||
&MapWayPoint,
|
||||
};
|
||||
|
||||
// Why this doesn't coincide with world coordinates i don't know
|
||||
|
|
@ -1025,7 +1075,7 @@ CRadar::LoadTextures()
|
|||
TShirtSprite.SetTexture("tshirt");
|
||||
TommySprite.SetTexture("tommy");
|
||||
PhoneSprite.SetTexture("phone");
|
||||
RadioWildstyleSprite.SetTexture("RWildstyle");
|
||||
/*RadioWildstyleSprite.SetTexture("RWildstyle");
|
||||
RadioFlashSprite.SetTexture("RFlash");
|
||||
RadioKChatSprite.SetTexture("RKchat");
|
||||
RadioFeverSprite.SetTexture("RFever");
|
||||
|
|
@ -1033,7 +1083,39 @@ CRadar::LoadTextures()
|
|||
RadioVCPRSprite.SetTexture("RVCPR");
|
||||
RadioEspantosoSprite.SetTexture("REspantoso");
|
||||
RadioEmotionSprite.SetTexture("REmotion");
|
||||
RadioWaveSprite.SetTexture("RWave");
|
||||
RadioWaveSprite.SetTexture("RWave");*/
|
||||
EightBallSprite.SetTexture("radar_8Ball");
|
||||
BurnerSprite.SetTexture("radar_Burner");
|
||||
CiprianiSprite.SetTexture("radar_Cipriani");
|
||||
DonaldSprite.SetTexture("radar_Donald");
|
||||
JosephSprite.SetTexture("radar_Joseph");
|
||||
LeoneSprite.SetTexture("radar_Leone");
|
||||
MariaSprite.SetTexture("radar_Maria");
|
||||
McraySprite.SetTexture("radar_McRay");
|
||||
ToshikoSprite.SetTexture("radar_Toshiko");
|
||||
VincenzoSprite.SetTexture("radar_Vincenzo");
|
||||
BombSprite.SetTexture("radar_Bomb");
|
||||
ClothesShopSprite.SetTexture("radar_cShop");
|
||||
PropertyRedSprite.SetTexture("radar_propertyR");
|
||||
PhilCassidySprite.SetTexture("radar_flag");
|
||||
PowerupSprite.SetTexture("radar_powerup");
|
||||
MPBase.SetTexture("mp_base");
|
||||
MPCheckPoint.SetTexture("radar_mp_checkpoint");
|
||||
MPPlayer.SetTexture("mp_player");
|
||||
MPObjective.SetTexture("mp_objective");
|
||||
MPCar.SetTexture("mp_car");
|
||||
MPTank.SetTexture("mp_tank");
|
||||
MPCarLockup.SetTexture("mp_carlockup");
|
||||
MPTargetPlayer.SetTexture("mp_targetplayer");
|
||||
MapHereSprite0.SetTexture("radar_arrow");
|
||||
MapHereSprite1.SetTexture("radar_arrow_01");
|
||||
MapHereSprite2.SetTexture("radar_arrow_02");
|
||||
MapHereSprite3.SetTexture("radar_arrow_03");
|
||||
MapHereSprite4.SetTexture("radar_arrow_04");
|
||||
MapHereSprite5.SetTexture("radar_arrow_05");
|
||||
MapHereSprite6.SetTexture("radar_arrow_06");
|
||||
MapHereSprite7.SetTexture("radar_arrow_07");
|
||||
MapWayPoint.SetTexture("radar_player_target");
|
||||
CTxdStore::PopCurrentTxd();
|
||||
}
|
||||
|
||||
|
|
@ -1221,7 +1303,39 @@ void CRadar::Shutdown()
|
|||
TShirtSprite.Delete();
|
||||
TommySprite.Delete();
|
||||
PhoneSprite.Delete();
|
||||
RadioWildstyleSprite.Delete();
|
||||
EightBallSprite.Delete();
|
||||
BurnerSprite.Delete();
|
||||
CiprianiSprite.Delete();
|
||||
DonaldSprite.Delete();
|
||||
JosephSprite.Delete();
|
||||
LeoneSprite.Delete();
|
||||
MariaSprite.Delete();
|
||||
McraySprite.Delete();
|
||||
ToshikoSprite.Delete();
|
||||
VincenzoSprite.Delete();
|
||||
BombSprite.Delete();
|
||||
ClothesShopSprite.Delete();
|
||||
PropertyRedSprite.Delete();
|
||||
PhilCassidySprite.Delete();
|
||||
PowerupSprite.Delete();
|
||||
MPBase.Delete();
|
||||
MPCheckPoint.Delete();
|
||||
MPPlayer.Delete();
|
||||
MPObjective.Delete();
|
||||
MPCar.Delete();
|
||||
MPTank.Delete();
|
||||
MPCarLockup.Delete();
|
||||
MPTargetPlayer.Delete();
|
||||
MapHereSprite0.Delete();
|
||||
MapHereSprite1.Delete();
|
||||
MapHereSprite2.Delete();
|
||||
MapHereSprite3.Delete();
|
||||
MapHereSprite4.Delete();
|
||||
MapHereSprite5.Delete();
|
||||
MapHereSprite6.Delete();
|
||||
MapHereSprite7.Delete();
|
||||
MapWayPoint.Delete();
|
||||
/*RadioWildstyleSprite.Delete();
|
||||
RadioFlashSprite.Delete();
|
||||
RadioKChatSprite.Delete();
|
||||
RadioFeverSprite.Delete();
|
||||
|
|
@ -1229,7 +1343,7 @@ void CRadar::Shutdown()
|
|||
RadioVCPRSprite.Delete();
|
||||
RadioEspantosoSprite.Delete();
|
||||
RadioEmotionSprite.Delete();
|
||||
RadioWaveSprite.Delete();
|
||||
RadioWaveSprite.Delete();*/
|
||||
RemoveRadarSections();
|
||||
}
|
||||
|
||||
|
|
@ -1672,7 +1786,7 @@ CRadar::DrawLegend(int32 x, int32 y, int32 sprite)
|
|||
case RADAR_SPRITE_PHONE:
|
||||
text = TheText.Get("LG_25");
|
||||
break;
|
||||
case RADAR_SPRITE_RADIO_WILDSTYLE:
|
||||
/*case RADAR_SPRITE_RADIO_WILDSTYLE:
|
||||
text = TheText.Get("LG_26");
|
||||
break;
|
||||
case RADAR_SPRITE_RADIO_FLASH:
|
||||
|
|
@ -1698,7 +1812,7 @@ CRadar::DrawLegend(int32 x, int32 y, int32 sprite)
|
|||
break;
|
||||
case RADAR_SPRITE_RADIO_WAVE:
|
||||
text = TheText.Get("LG_34");
|
||||
break;
|
||||
break;*/
|
||||
default:
|
||||
text = TheText.Get("LG_34"); // tmp hack
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -83,20 +83,38 @@ enum eRadarSprite
|
|||
RADAR_SPRITE_TSHIRT,
|
||||
RADAR_SPRITE_TOMMY,
|
||||
RADAR_SPRITE_PHONE,
|
||||
RADAR_SPRITE_RADIO_WILDSTYLE,
|
||||
RADAR_SPRITE_RADIO_FLASH,
|
||||
RADAR_SPRITE_RADIO_KCHAT,
|
||||
RADAR_SPRITE_RADIO_FEVER,
|
||||
RADAR_SPRITE_RADIO_VROCK,
|
||||
RADAR_SPRITE_RADIO_VCPR,
|
||||
RADAR_SPRITE_RADIO_ESPANTOSO,
|
||||
RADAR_SPRITE_RADIO_EMOTION,
|
||||
RADAR_SPRITE_RADIO_WAVE,
|
||||
RADAR_SPRITE_40, // tmp
|
||||
RADAR_SPRITE_41,
|
||||
RADAR_SPRITE_42,
|
||||
RADAR_SPRITE_43,
|
||||
RADAR_SPRITE_44,
|
||||
RADAR_SPRITE_EIGHTBALL,
|
||||
RADAR_SPRITE_BURNER,
|
||||
RADAR_SPRITE_CIPRIANI,
|
||||
RADAR_SPRITE_DONALD,
|
||||
RADAR_SPRITE_JOSEPH,
|
||||
RADAR_SPRITE_LEONE,
|
||||
RADAR_SPRITE_MARIA,
|
||||
RADAR_SPRITE_MCRAY,
|
||||
RADAR_SPRITE_TOSHIKO,
|
||||
RADAR_SPRITE_VINCENZO, // tmp
|
||||
RADAR_SPRITE_BOMB,
|
||||
RADAR_SPRITE_CLOTHES,
|
||||
RADAR_SPRITE_PROPERTY_RED,
|
||||
RADAR_SPRITE_PHIL_CASSIDY,
|
||||
RADAR_SPRITE_POWERUP,
|
||||
RADAR_SPRITE_MPBASE,
|
||||
RADAR_SPRITE_MPCHECKPOINT,
|
||||
RADAR_SPRITE_MPPLAYER,
|
||||
RADAR_SPRITE_MPOBJECTIVE,
|
||||
RADAR_SPRITE_MPCAR,
|
||||
RADAR_SPRITE_MPTANK,
|
||||
RADAR_SPRITE_MPCARLOCKUP,
|
||||
RADAR_SPRITE_MPTARGETPLAYER,
|
||||
RADAR_SPRITE_MAPHERE0,
|
||||
RADAR_SPRITE_MAPHERE1,
|
||||
RADAR_SPRITE_MAPHERE2,
|
||||
RADAR_SPRITE_MAPHERE3,
|
||||
RADAR_SPRITE_MAPHERE4,
|
||||
RADAR_SPRITE_MAPHERE5,
|
||||
RADAR_SPRITE_MAPHERE6,
|
||||
RADAR_SPRITE_MAPHERE7,
|
||||
RADAR_SPRITE_MAPWAYPOINT,
|
||||
|
||||
RADAR_SPRITE_COUNT
|
||||
};
|
||||
|
|
@ -219,7 +237,7 @@ public:
|
|||
static CSprite2d TShirtSprite;
|
||||
static CSprite2d TommySprite;
|
||||
static CSprite2d PhoneSprite;
|
||||
static CSprite2d RadioWildstyleSprite;
|
||||
/* static CSprite2d RadioWildstyleSprite;
|
||||
static CSprite2d RadioFlashSprite;
|
||||
static CSprite2d RadioKChatSprite;
|
||||
static CSprite2d RadioFeverSprite;
|
||||
|
|
@ -227,7 +245,39 @@ public:
|
|||
static CSprite2d RadioVCPRSprite;
|
||||
static CSprite2d RadioEspantosoSprite;
|
||||
static CSprite2d RadioEmotionSprite;
|
||||
static CSprite2d RadioWaveSprite;
|
||||
static CSprite2d RadioWaveSprite;*/
|
||||
static CSprite2d EightBallSprite;
|
||||
static CSprite2d BurnerSprite;
|
||||
static CSprite2d CiprianiSprite;
|
||||
static CSprite2d DonaldSprite;
|
||||
static CSprite2d JosephSprite;
|
||||
static CSprite2d LeoneSprite;
|
||||
static CSprite2d MariaSprite;
|
||||
static CSprite2d McraySprite;
|
||||
static CSprite2d ToshikoSprite;
|
||||
static CSprite2d VincenzoSprite;
|
||||
static CSprite2d BombSprite;
|
||||
static CSprite2d ClothesShopSprite;
|
||||
static CSprite2d PropertyRedSprite;
|
||||
static CSprite2d PhilCassidySprite;
|
||||
static CSprite2d PowerupSprite;
|
||||
static CSprite2d MPBase;
|
||||
static CSprite2d MPCheckPoint;
|
||||
static CSprite2d MPPlayer;
|
||||
static CSprite2d MPObjective;
|
||||
static CSprite2d MPCar;
|
||||
static CSprite2d MPTank;
|
||||
static CSprite2d MPCarLockup;
|
||||
static CSprite2d MPTargetPlayer;
|
||||
static CSprite2d MapHereSprite0;
|
||||
static CSprite2d MapHereSprite1;
|
||||
static CSprite2d MapHereSprite2;
|
||||
static CSprite2d MapHereSprite3;
|
||||
static CSprite2d MapHereSprite4;
|
||||
static CSprite2d MapHereSprite5;
|
||||
static CSprite2d MapHereSprite6;
|
||||
static CSprite2d MapHereSprite7;
|
||||
static CSprite2d MapWayPoint;
|
||||
static CSprite2d *RadarSprites[RADAR_SPRITE_COUNT];
|
||||
static float cachedCos;
|
||||
static float cachedSin;
|
||||
|
|
|
|||
Loading…
Reference in a new issue