Mirrors/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2021-02-19 17:49:54 +01:00
Code Issues Projects Releases Wiki Activity

Darkel fixes

Browse Source
This commit is contained in:
Sergeanur 2020-08-14 17:34:04 +03:00
parent e1ca6c6b79
commit 489743da41
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/control/Darkel.cpp
View File

@ -30,9 +30,9 @@ int8 CDarkel::InterruptedWeapon;
* makes game handle sounds & messages instead of SCM (just like in GTA2) * makes game handle sounds & messages instead of SCM (just like in GTA2)
* but it's never been used in the game. Has unused sliding text when frenzy completed etc. * but it's never been used in the game. Has unused sliding text when frenzy completed etc.
*/ */
int8 CDarkel::bStandardSoundAndMessages; bool CDarkel::bStandardSoundAndMessages;
int8 CDarkel::bNeedHeadShot; bool CDarkel::bNeedHeadShot;
int8 CDarkel::bProperKillFrenzy; bool CDarkel::bProperKillFrenzy;
uint16 CDarkel::Status; uint16 CDarkel::Status;
uint16 CDarkel::RegisteredKills[NUM_DEFAULT_MODELS]; uint16 CDarkel::RegisteredKills[NUM_DEFAULT_MODELS];
int32 CDarkel::ModelToKill; int32 CDarkel::ModelToKill;
@ -108,9 +108,15 @@ CDarkel::DrawMessages()
sprintf(gString, "%d", (CDarkel::KillsNeeded >= 0 ? CDarkel::KillsNeeded : 0)); sprintf(gString, "%d", (CDarkel::KillsNeeded >= 0 ? CDarkel::KillsNeeded : 0));
AsciiToUnicode(gString, gUString); AsciiToUnicode(gString, gUString);
CFont::SetColor(CRGBA(0, 0, 0, 255)); CFont::SetColor(CRGBA(0, 0, 0, 255));
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(35.0f), SCREEN_SCALE_Y(144.0f), gUString); #ifdef FIX_BUGS
#define DARKEL_COUNTER_HEIGHT 143.0f
#else
#define DARKEL_COUNTER_HEIGHT 128.0f
#endif
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(35.0f), SCREEN_SCALE_Y(DARKEL_COUNTER_HEIGHT + 1.0f), gUString);
CFont::SetColor(CRGBA(255, 128, 128, 255)); CFont::SetColor(CRGBA(255, 128, 128, 255));
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(34.0f), SCREEN_SCALE_Y(143.0f), gUString); CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(34.0f), SCREEN_SCALE_Y(DARKEL_COUNTER_HEIGHT), gUString);
#undef DARKEL_COUNTER_HEIGHT
break; break;
} }
case KILLFRENZY_PASSED: case KILLFRENZY_PASSED:

6
src/control/Darkel.h
View File

@ -24,9 +24,9 @@ private:
static int32 AmmoInterruptedWeapon; static int32 AmmoInterruptedWeapon;
static int32 KillsNeeded; static int32 KillsNeeded;
static int8 InterruptedWeapon; static int8 InterruptedWeapon;
static int8 bStandardSoundAndMessages; static bool bStandardSoundAndMessages;
static int8 bNeedHeadShot; static bool bNeedHeadShot;
static int8 bProperKillFrenzy; static bool bProperKillFrenzy;
static uint16 Status; static uint16 Status;
static uint16 RegisteredKills[NUM_DEFAULT_MODELS]; static uint16 RegisteredKills[NUM_DEFAULT_MODELS];
static int32 ModelToKill; static int32 ModelToKill;