summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-08-14 16:34:04 +0200
committerSergeanur <s.anureev@yandex.ua>2020-08-14 16:34:04 +0200
commit489743da419b0da842e82dc6d430f6f3d8752055 (patch)
tree6797489801334caedd99b310c657d5b4f6b52e21 /src
parentMove stuff to vendor (diff)
downloadre3-489743da419b0da842e82dc6d430f6f3d8752055.tar
re3-489743da419b0da842e82dc6d430f6f3d8752055.tar.gz
re3-489743da419b0da842e82dc6d430f6f3d8752055.tar.bz2
re3-489743da419b0da842e82dc6d430f6f3d8752055.tar.lz
re3-489743da419b0da842e82dc6d430f6f3d8752055.tar.xz
re3-489743da419b0da842e82dc6d430f6f3d8752055.tar.zst
re3-489743da419b0da842e82dc6d430f6f3d8752055.zip
Diffstat (limited to 'src')
-rw-r--r--src/control/Darkel.cpp16
-rw-r--r--src/control/Darkel.h6
2 files changed, 14 insertions, 8 deletions
diff --git a/src/control/Darkel.cpp b/src/control/Darkel.cpp
index cfd58340..02627f33 100644
--- a/src/control/Darkel.cpp
+++ b/src/control/Darkel.cpp
@@ -30,9 +30,9 @@ int8 CDarkel::InterruptedWeapon;
* 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.
*/
-int8 CDarkel::bStandardSoundAndMessages;
-int8 CDarkel::bNeedHeadShot;
-int8 CDarkel::bProperKillFrenzy;
+bool CDarkel::bStandardSoundAndMessages;
+bool CDarkel::bNeedHeadShot;
+bool CDarkel::bProperKillFrenzy;
uint16 CDarkel::Status;
uint16 CDarkel::RegisteredKills[NUM_DEFAULT_MODELS];
int32 CDarkel::ModelToKill;
@@ -108,9 +108,15 @@ CDarkel::DrawMessages()
sprintf(gString, "%d", (CDarkel::KillsNeeded >= 0 ? CDarkel::KillsNeeded : 0));
AsciiToUnicode(gString, gUString);
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::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;
}
case KILLFRENZY_PASSED:
diff --git a/src/control/Darkel.h b/src/control/Darkel.h
index 14529c63..0f5c2329 100644
--- a/src/control/Darkel.h
+++ b/src/control/Darkel.h
@@ -24,9 +24,9 @@ private:
static int32 AmmoInterruptedWeapon;
static int32 KillsNeeded;
static int8 InterruptedWeapon;
- static int8 bStandardSoundAndMessages;
- static int8 bNeedHeadShot;
- static int8 bProperKillFrenzy;
+ static bool bStandardSoundAndMessages;
+ static bool bNeedHeadShot;
+ static bool bProperKillFrenzy;
static uint16 Status;
static uint16 RegisteredKills[NUM_DEFAULT_MODELS];
static int32 ModelToKill;