archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-27 11:22:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Onscreen timer

Browse Source
This commit is contained in:
Nikolay Korolev
2021-08-26 00:34:31 +03:00
parent d750a1101b
commit 9187873396
9 changed files with 229 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
src/control/OnscreenTimer.cpp
View File

@ -9,18 +9,31 @@
#include "OnscreenTimer.h"
#include "Camera.h"
CRGBA gbColour(255, 255, 255, 255);
CRGBA gbColour2(255, 255, 255, 255);
void
COnscreenTimer::Init()
{
m_bDisabled = false;
for(uint32 i = 0; i < NUMONSCREENCOUNTERS; i++) {
m_sCounters[i].m_nCounterOffset = 0;
m_sCounters[i].m_nTotal = -1;
for(uint32 j = 0; j < ARRAY_SIZE(m_sCounters[0].m_aCounterText); j++)
m_sCounters[i].m_aCounterText[j] = '\0';
for (uint32 j = 0; j < ARRAY_SIZE(m_sCounters[0].m_aCounterText1); j++) {
m_sCounters[i].m_aCounterText1[j] = '\0';
}
for (uint32 j = 0; j < ARRAY_SIZE(m_sCounters[0].m_aCounterText2); j++) {
m_sCounters[i].m_aCounterText2[j] = '\0';
}
m_sCounters[i].m_nType = COUNTER_DISPLAY_NUMBER;
m_sCounters[i].m_nTypeOfTotal = 0;
m_sCounters[i].m_bCounterProcessed = false;
m_sCounters[i].m_colour1 = CRGBA(112, 132, 157, 255);
m_sCounters[i].m_colour2 = CRGBA(42, 58, 81, 255);
}
for(uint32 i = 0; i < NUMONSCREENCLOCKS; i++) {
m_sClocks[i].m_nClockOffset = 0;
@ -30,6 +43,8 @@ COnscreenTimer::Init()
m_sClocks[i].m_bClockProcessed = false;
m_sClocks[i].m_bClockGoingDown = true;
m_sClocks[i].m_aClockColour = CRGBA(244, 225, 91, 255);
m_sClocks[i].m_bClockTickThisFrame = false;
}
}
@ -44,6 +59,10 @@ COnscreenTimer::Process()
void
COnscreenTimer::ProcessForDisplay()
{
#ifdef GTA_NETWORK
if (gIsMultiplayerGame)
return;
#endif
if(CHud::m_Wants_To_Draw_Hud) {
m_bProcessed = false;
for(uint32 i = 0; i < NUMONSCREENCLOCKS; i++) {
@ -71,9 +90,12 @@ COnscreenTimer::ClearCounter(uint32 offset)
for(uint32 i = 0; i < NUMONSCREENCOUNTERS; i++) {
if(offset == m_sCounters[i].m_nCounterOffset) {
m_sCounters[i].m_nCounterOffset = 0;
m_sCounters[i].m_aCounterText[0] = '\0';
m_sCounters[i].m_aCounterText1[0] = '\0';
m_sCounters[i].m_aCounterText2[0] = '\0';
m_sCounters[i].m_nTypeOfTotal = 0;
m_sCounters[i].m_nType = COUNTER_DISPLAY_NUMBER;
m_sCounters[i].m_bCounterProcessed = false;
m_sCounters[i].m_bAddDollarPrefix = false;
}
}
}
@ -87,22 +109,45 @@ COnscreenTimer::ClearClock(uint32 offset)
m_sClocks[i].m_aClockText[0] = '\0';
m_sClocks[i].m_bClockProcessed = false;
m_sClocks[i].m_bClockGoingDown = true;
m_sClocks[i].m_bClockTickThisFrame = false;
}
}
void
COnscreenTimer::AddCounter(uint32 offset, uint16 type, char* text, uint16 pos)
COnscreenTimer::AddCounter(uint32 offset, uint16 type, char* text1, uint16 pos, int32 total, char* text2, uint16 totalType)
{
if (m_sCounters[pos].m_aCounterText[0] != '\0')
if (m_sCounters[pos].m_nCounterOffset)
return;
m_sCounters[pos].m_nCounterOffset = offset;
if(text)
strncpy(m_sCounters[pos].m_aCounterText, text, ARRAY_SIZE(m_sCounters[0].m_aCounterText));
m_sCounters[pos].m_nTotal = total;
if(text1)
strncpy(m_sCounters[pos].m_aCounterText1, text1, ARRAY_SIZE(m_sCounters[0].m_aCounterText1));
else
m_sCounters[pos].m_aCounterText[0] = '\0';
m_sCounters[pos].m_aCounterText1[0] = '\0';
if (text2)
strncpy(m_sCounters[pos].m_aCounterText2, text2, ARRAY_SIZE(m_sCounters[0].m_aCounterText2));
else
m_sCounters[pos].m_aCounterText2[0] = '\0';
m_sCounters[pos].m_nTypeOfTotal = totalType;
m_sCounters[pos].m_nType = type;
m_sCounters[pos].m_bAddDollarPrefix = 0;
if (gbColour == CRGBA(255, 255, 255, 255))
m_sCounters[pos].m_colour1 = CRGBA(112, 132, 157, 255);
else {
m_sCounters[pos].m_colour1 = gbColour;
gbColour = CRGBA(255, 255, 255, 255);
}
if (gbColour == CRGBA(255, 255, 255, 255))
m_sCounters[pos].m_colour2 = CRGBA(42, 58, 81, 255);
else {
m_sCounters[pos].m_colour2 = gbColour;
gbColour = CRGBA(255, 255, 255, 255);
}
}
void
@ -112,6 +157,13 @@ COnscreenTimer::AddClock(uint32 offset, char* text, bool bGoingDown)
if(m_sClocks[i].m_nClockOffset == 0) {
m_sClocks[i].m_nClockOffset = offset;
m_sClocks[i].m_bClockGoingDown = bGoingDown;
m_sClocks[i].m_bClockTickThisFrame = false;
if (gbColour == CRGBA(255, 255, 255, 255))
m_sClocks[i].m_aClockColour = CRGBA(244, 225, 91, 255);
else {
m_sClocks[i].m_aClockColour = gbColour;
gbColour = CRGBA(255, 255, 255, 255);
}
if(text)
strncpy(m_sClocks[i].m_aClockText, text, ARRAY_SIZE(m_sClocks[0].m_aClockText));
else
@ -140,8 +192,12 @@ COnscreenTimerEntry::Process()
}
else {
int32 oldTimeSeconds = oldTime / 1000;
if (oldTimeSeconds < 12 && newTime / 1000 != oldTimeSeconds && !TheCamera.m_WideScreenOn) {
DMAudio.PlayFrontEndSound(SOUND_CLOCK_TICK, newTime / 1000);
if (oldTimeSeconds < 12) {
m_bClockTickThisFrame = false;
if (newTime / 1000 != oldTimeSeconds) {
m_bClockTickThisFrame = true;
DMAudio.PlayFrontEndSound(SOUND_CLOCK_TICK, newTime / 1000);
}
}
}
}
@ -161,5 +217,28 @@ void
COnscreenCounterEntry::ProcessForDisplayCounter()
{
uint32 counter = *CTheScripts::GetPointerToScriptVariable(m_nCounterOffset);
sprintf(m_aCounterBuffer, "%d", counter);
char prefix[2] = { '\0' };
if (m_bAddDollarPrefix)
sprintf(prefix, "$");
#ifdef FIX_BUGS
char suffix[3] = { '\0' };
#else
char suffix[2] = { '\0' };
#endif
if (m_nTotal != -1) {
m_nTotal = Min(99, m_nTotal);
sprintf(suffix, "/%d", m_nTotal);
}
sprintf(m_aCounterBuffer, "%s%d%s", prefix, counter, suffix);
}
void
COnscreenTimer::ChangeCounterPrefix(uint32 offset, bool bChange)
{
for (uint32 i = 0; i < NUMONSCREENCOUNTERS; i++) {
if (offset == m_sCounters[i].m_nCounterOffset) {
m_sCounters[i].m_bAddDollarPrefix = bChange;
return;
}
}
}

24
src/control/OnscreenTimer.h
View File

@ -1,5 +1,7 @@
#pragma once
#include "common.h"
enum
{
COUNTER_DISPLAY_NUMBER,
@ -14,27 +16,31 @@ public:
char m_aClockBuffer[40];
bool m_bClockProcessed;
bool m_bClockGoingDown;
CRGBA m_aClockColour;
bool m_bClockTickThisFrame;
void Process();
void ProcessForDisplayClock();
};
VALIDATE_SIZE(COnscreenTimerEntry, 0x3C);
class COnscreenCounterEntry
{
public:
uint32 m_nCounterOffset;
char m_aCounterText[10];
int32 m_nTotal;
char m_aCounterText1[10];
char m_aCounterText2[10];
uint16 m_nTypeOfTotal;
uint16 m_nType;
char m_aCounterBuffer[40];
bool m_bCounterProcessed;
CRGBA m_colour1;
CRGBA m_colour2;
bool m_bAddDollarPrefix;
void ProcessForDisplayCounter();
};
VALIDATE_SIZE(COnscreenCounterEntry, 0x3C);
class COnscreenTimer
{
public:
@ -50,8 +56,12 @@ public:
void ClearCounter(uint32 offset);
void ClearClock(uint32 offset);
void AddCounter(uint32 offset, uint16 type, char* text, uint16 pos);
void AddCounter(uint32 offset, uint16 type, char* text, uint16 pos, int32, char*, uint16);
void AddClock(uint32 offset, char* text, bool bGoingDown);
void ChangeCounterPrefix(uint32 offset, bool bChange);
};
VALIDATE_SIZE(COnscreenTimer, 0xF4);
extern CRGBA gbColour;
extern CRGBA gbColour2;

6
src/control/Script10.cpp
View File

@ -242,7 +242,7 @@ int8 CRunningScript::ProcessCommands1600To1699(int32 command)
{
uint16 offset = (uint8*)GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL) - CTheScripts::ScriptSpace;
CollectParameters(&m_nIp, 1);
//CUserDisplay::OnscnTimer.ChangeCounterPrefix(offset, GET_INTEGER_PARAMS(0));
CUserDisplay::OnscnTimer.ChangeCounterPrefix(offset, GET_INTEGER_PARAM(0) != 0);
return 0;
}
case COMMAND_STORE_PLAYER_OUTFIT:
@ -263,7 +263,7 @@ int8 CRunningScript::ProcessCommands1600To1699(int32 command)
wchar* text = TheText.Get((char*)&CTheScripts::ScriptSpace[m_nIp]);
strncpy(onscreen_str1, (char*)&CTheScripts::ScriptSpace[m_nIp], KEY_LENGTH_IN_SCRIPT);
m_nIp += KEY_LENGTH_IN_SCRIPT;
CUserDisplay::OnscnTimer.AddCounter(var, GET_INTEGER_PARAM(1), onscreen_str1, 0); // TODO - second set of data
CUserDisplay::OnscnTimer.AddCounter(var, GET_INTEGER_PARAM(1), onscreen_str1, 0, GET_INTEGER_PARAM(0), nil, 0);
return 0;
}
case COMMAND_SET_PLAYER_CURRENT_WEAPON_AMMO_IN_CLIP:
@ -322,7 +322,7 @@ int8 CRunningScript::ProcessCommands1600To1699(int32 command)
wchar* text2 = TheText.Get((char*)&CTheScripts::ScriptSpace[m_nIp]);
strncpy(onscreen_str2, (char*)&CTheScripts::ScriptSpace[m_nIp], KEY_LENGTH_IN_SCRIPT);
m_nIp += KEY_LENGTH_IN_SCRIPT;
CUserDisplay::OnscnTimer.AddCounter(var, GET_INTEGER_PARAM(1), onscreen_str1, 0); // TODO - second set of data
CUserDisplay::OnscnTimer.AddCounter(var, GET_INTEGER_PARAM(1), onscreen_str2, 0, GET_INTEGER_PARAM(0), onscreen_str1, GET_INTEGER_PARAM(2));
return 0;
}
case COMMAND_GET_PLAYER_STORED_WEAPON:

2
src/control/Script2.cpp
View File

@ -190,7 +190,7 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
{
uint16 counter = (uint8*)GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL) - CTheScripts::ScriptSpace;
CollectParameters(&m_nIp, 1);
CUserDisplay::OnscnTimer.AddCounter(counter, GET_INTEGER_PARAM(0), nil, 0);
CUserDisplay::OnscnTimer.AddCounter(counter, GET_INTEGER_PARAM(0), nil, 0, -1, nil, 0);
return 0;
}
case COMMAND_CLEAR_ONSCREEN_COUNTER:

2
src/control/Script4.cpp
View File

@ -1771,7 +1771,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
wchar* text = TheText.Get((char*)&CTheScripts::ScriptSpace[m_nIp]); // ???
strncpy(onscreen_str, (char*)&CTheScripts::ScriptSpace[m_nIp], KEY_LENGTH_IN_SCRIPT);
m_nIp += KEY_LENGTH_IN_SCRIPT;
CUserDisplay::OnscnTimer.AddCounter(var, GET_INTEGER_PARAM(0), onscreen_str, 0);
CUserDisplay::OnscnTimer.AddCounter(var, GET_INTEGER_PARAM(0), onscreen_str, 0, -1, nil, 0);
return 0;
}
case COMMAND_CREATE_RANDOM_CAR_FOR_CAR_PARK:

2
src/control/Script7.cpp
View File

@ -570,7 +570,7 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command)
wchar* text = TheText.Get((char*)&CTheScripts::ScriptSpace[m_nIp]); // ???
strncpy(onscreen_str, (char*)&CTheScripts::ScriptSpace[m_nIp], KEY_LENGTH_IN_SCRIPT);
m_nIp += KEY_LENGTH_IN_SCRIPT;
CUserDisplay::OnscnTimer.AddCounter(var, GET_INTEGER_PARAM(0), onscreen_str, GET_INTEGER_PARAM(1) - 1); // TODO: last params are -1, nil, 0
CUserDisplay::OnscnTimer.AddCounter(var, GET_INTEGER_PARAM(0), onscreen_str, GET_INTEGER_PARAM(1) - 1, -1, nil, 0); // TODO: last params are -1, nil, 0
return 0;
}
case COMMAND_ADD_SET_PIECE:

5
src/control/Script9.cpp
View File

@ -13,6 +13,7 @@
#include "Hud.h"
#include "Messages.h"
#include "Object.h"
#include "OnscreenTimer.h"
#include "Pad.h"
#include "Ped.h"
#include "Pools.h"
@ -617,11 +618,11 @@ int8 CRunningScript::ProcessCommands1500To1599(int32 command)
return 0;
case COMMAND_SET_ONSCREEN_TIMER_COLOUR:
CollectParameters(&m_nIp, 4);
// gbColour = CRGBA(GET_INTEGER_PARAM(0), GET_INTEGER_PARAM(1), GET_INTEGER_PARAM(2), GET_INTEGER_PARAM(3));
gbColour = CRGBA(GET_INTEGER_PARAM(0), GET_INTEGER_PARAM(1), GET_INTEGER_PARAM(2), GET_INTEGER_PARAM(3));
return 0;
case COMMAND_SET_ONSCREEN_TIMER_BACKGROUND_COLOUR:
CollectParameters(&m_nIp, 4);
// gbColour2 = CRGBA(GET_INTEGER_PARAM(0), GET_INTEGER_PARAM(1), GET_INTEGER_PARAM(2), GET_INTEGER_PARAM(3));
gbColour2 = CRGBA(GET_INTEGER_PARAM(0), GET_INTEGER_PARAM(1), GET_INTEGER_PARAM(2), GET_INTEGER_PARAM(3));
return 0;
case COMMAND_REMOVE_CAR_BOOT:
{