mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-24 17:35:41 +00:00
Code Issues Projects Releases Wiki Activity

little cleanup

Browse source
This commit is contained in:
aap 2019-06-12 13:46:02 +02:00
parent 71059e6a59
commit 01babd43b1
5 changed files with 59 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
src/User.cpp
View file

@ -1,4 +1,3 @@
#include "User.h"
#include "common.h" #include "common.h"
#include "patcher.h" #include "patcher.h"
@ -6,15 +5,15 @@
#include "Hud.h" #include "Hud.h"
#include "Replay.h" #include "Replay.h"
#include "Timer.h" #include "Timer.h"
#include "Script.h"
#include "User.h"
CPlaceName& CUserDisplay::PlaceName = *(CPlaceName*)0x8F29BC; CPlaceName& CUserDisplay::PlaceName = *(CPlaceName*)0x8F29BC;
COnscreenTimer& CUserDisplay::OnscnTimer = *(COnscreenTimer*)0x862238; COnscreenTimer& CUserDisplay::OnscnTimer = *(COnscreenTimer*)0x862238;
CPager& CUserDisplay::Pager = *(CPager*)0x8F2744; CPager& CUserDisplay::Pager = *(CPager*)0x8F2744;
CCurrentVehicle& CUserDisplay::CurrentVehicle = *(CCurrentVehicle*)0x8F5FE8; CCurrentVehicle& CUserDisplay::CurrentVehicle = *(CCurrentVehicle*)0x8F5FE8;
char* CTheScripts::ScriptSpace = (char*)0x74B248; void COnscreenTimer::Init() {
int COnscreenTimer::Init() {
m_bDisabled = false; m_bDisabled = false;
for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) { for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) {
m_sEntries[i].m_nTimerOffset = 0; m_sEntries[i].m_nTimerOffset = 0;
@ -29,11 +28,10 @@ int COnscreenTimer::Init() {
m_sEntries[i].m_bTimerProcessed = 0; m_sEntries[i].m_bTimerProcessed = 0;
m_sEntries[i].m_bCounterProcessed = 0; m_sEntries[i].m_bCounterProcessed = 0;
} }
return 1;
} }
void COnscreenTimer::Process() { void COnscreenTimer::Process() {
if(CReplay::Mode != 1 && !m_bDisabled) { if(CReplay::Mode != CReplay::MODE_1 && !m_bDisabled) {
for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) { for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) {
m_sEntries[i].Process(); m_sEntries[i].Process();
} }
@ -83,7 +81,7 @@ void COnscreenTimer::AddCounter(uint32 offset, uint16 type, char* text) {
m_sEntries[i].m_nCounterOffset = offset; m_sEntries[i].m_nCounterOffset = offset;
if(text) { if(text) {
strncpy((char*)m_sEntries[i].m_aCounterText, text, 10); strncpy(m_sEntries[i].m_aCounterText, text, 10);
} else { } else {
m_sEntries[i].m_aCounterText[0] = 0; m_sEntries[i].m_aCounterText[0] = 0;
} }
@ -102,28 +100,31 @@ void COnscreenTimer::AddClock(uint32 offset, char* text) {
m_sEntries[i].m_nTimerOffset = offset; m_sEntries[i].m_nTimerOffset = offset;
if(text) { if(text) {
strncpy((char*)m_sEntries[i].m_aTimerText, text, 10u); strncpy(m_sEntries[i].m_aTimerText, text, 10);
} else { } else {
m_sEntries[i].m_aTimerText[0] = 0; m_sEntries[i].m_aTimerText[0] = 0;
} }
} }
void COnscreenTimerEntry::Process() { void COnscreenTimerEntry::Process() {
if(m_nTimerOffset) { if(m_nTimerOffset == 0) {
uint32* timerPtr = (uint32*)&CTheScripts::ScriptSpace[m_nTimerOffset]; return;
uint32 oldTime = *timerPtr; }
int32 newTime = int32(oldTime - uint32(20.0f * CTimer::GetTimeStep()));
if(newTime < 0) { uint32* timerPtr = (uint32*)&CTheScripts::ScriptSpace[m_nTimerOffset];
*timerPtr = 0; uint32 oldTime = *timerPtr;
m_bTimerProcessed = 0; int32 newTime = int32(oldTime - uint32(20.0f * CTimer::GetTimeStep()));
m_nTimerOffset = 0; if(newTime < 0) {
m_aTimerText[0] = 0; *timerPtr = 0;
} else { m_bTimerProcessed = 0;
*timerPtr = (uint32)newTime; m_nTimerOffset = 0;
uint32 oldTimeSeconds = oldTime / 1000; m_aTimerText[0] = 0;
if(oldTimeSeconds <= 11 && newTime / 1000 != oldTimeSeconds) { } else {
DMAudio.PlayFrontEndSound(0x93u, newTime / 1000); *timerPtr = (uint32)newTime;
} uint32 oldTimeSeconds = oldTime / 1000;
if(oldTimeSeconds <= 11 && newTime / 1000 != oldTimeSeconds) {
// TODO: use an enum here
DMAudio.PlayFrontEndSound(0x93, newTime / 1000);
} }
} }
} }
@ -132,16 +133,16 @@ bool COnscreenTimerEntry::ProcessForDisplay() {
m_bTimerProcessed = false; m_bTimerProcessed = false;
m_bCounterProcessed = false; m_bCounterProcessed = false;
if(!m_nTimerOffset && !m_nCounterOffset) { if(m_nTimerOffset == 0 && m_nCounterOffset == 0) {
return false; return false;
} }
if(m_nTimerOffset) { if(m_nTimerOffset != 0) {
m_bTimerProcessed = true; m_bTimerProcessed = true;
ProcessForDisplayTimer(); ProcessForDisplayTimer();
} }
if(m_nCounterOffset) { if(m_nCounterOffset != 0) {
m_bCounterProcessed = true; m_bCounterProcessed = true;
ProcessForDisplayCounter(); ProcessForDisplayCounter();
} }
@ -160,16 +161,16 @@ int COnscreenTimerEntry::ProcessForDisplayCounter() {
} }
STARTPATCHES STARTPATCHES
InjectHook(0x429160, &COnscreenTimerEntry::Process, PATCH_JUMP); InjectHook(0x429160, &COnscreenTimerEntry::Process, PATCH_JUMP);
InjectHook(0x429110, &COnscreenTimerEntry::ProcessForDisplay, PATCH_JUMP); InjectHook(0x429110, &COnscreenTimerEntry::ProcessForDisplay, PATCH_JUMP);
InjectHook(0x429080, &COnscreenTimerEntry::ProcessForDisplayTimer, PATCH_JUMP); InjectHook(0x429080, &COnscreenTimerEntry::ProcessForDisplayTimer, PATCH_JUMP);
InjectHook(0x4290F0, &COnscreenTimerEntry::ProcessForDisplayCounter, PATCH_JUMP); InjectHook(0x4290F0, &COnscreenTimerEntry::ProcessForDisplayCounter, PATCH_JUMP);
InjectHook(0x429220, &COnscreenTimer::Init, PATCH_JUMP); InjectHook(0x429220, &COnscreenTimer::Init, PATCH_JUMP);
InjectHook(0x429320, &COnscreenTimer::Process, PATCH_JUMP); InjectHook(0x429320, &COnscreenTimer::Process, PATCH_JUMP);
InjectHook(0x4292E0, &COnscreenTimer::ProcessForDisplay, PATCH_JUMP); InjectHook(0x4292E0, &COnscreenTimer::ProcessForDisplay, PATCH_JUMP);
InjectHook(0x429450, &COnscreenTimer::ClearCounter, PATCH_JUMP); InjectHook(0x429450, &COnscreenTimer::ClearCounter, PATCH_JUMP);
InjectHook(0x429410, &COnscreenTimer::ClearClock, PATCH_JUMP); InjectHook(0x429410, &COnscreenTimer::ClearClock, PATCH_JUMP);
InjectHook(0x4293B0, &COnscreenTimer::AddCounter, PATCH_JUMP); InjectHook(0x4293B0, &COnscreenTimer::AddCounter, PATCH_JUMP);
InjectHook(0x429350, &COnscreenTimer::AddClock, PATCH_JUMP); InjectHook(0x429350, &COnscreenTimer::AddClock, PATCH_JUMP);
ENDPATCHES ENDPATCHES

14
src/User.h
View file

@ -1,14 +1,12 @@
#pragma once #pragma once
#include "common.h"
class COnscreenTimerEntry class COnscreenTimerEntry
{ {
public: public:
uint32 m_nTimerOffset; uint32 m_nTimerOffset;
uint32 m_nCounterOffset; uint32 m_nCounterOffset;
uint8 m_aTimerText[10]; char m_aTimerText[10];
uint8 m_aCounterText[10]; char m_aCounterText[10];
uint16 m_nType; uint16 m_nType;
char m_bCounterBuffer[42]; char m_bCounterBuffer[42];
char m_bTimerBuffer[42]; char m_bTimerBuffer[42];
@ -24,20 +22,14 @@ public:
static_assert(sizeof(COnscreenTimerEntry) == 0x74, "COnscreenTimerEntry: error"); static_assert(sizeof(COnscreenTimerEntry) == 0x74, "COnscreenTimerEntry: error");
class CTheScripts{
public:
static char *ScriptSpace;//[163840]
};
class COnscreenTimer class COnscreenTimer
{ {
public: public:
COnscreenTimerEntry m_sEntries[NUMONSCREENTIMERENTRIES]; COnscreenTimerEntry m_sEntries[NUMONSCREENTIMERENTRIES];
bool m_bProcessed; bool m_bProcessed;
bool m_bDisabled; bool m_bDisabled;
char field_119[2];
int Init(); void Init();
void Process(); void Process();
void ProcessForDisplay(); void ProcessForDisplay();

6
src/control/Replay.h
View file

@ -3,7 +3,11 @@
class CReplay class CReplay
{ {
public: public:
static void Display(void); enum {
MODE_1
};
static uint8 &Mode; static uint8 &Mode;
static void Display(void);
}; };

6
src/control/Script.cpp Normal file
View file

@ -0,0 +1,6 @@
#include "common.h"
#include "patcher.h"
#include "Script.h"
uint8 *CTheScripts::ScriptSpace = (uint8*)0x74B248;

7
src/control/Script.h Normal file
View file

@ -0,0 +1,7 @@
#pragma once
class CTheScripts
{
public:
static uint8 *ScriptSpace;//[160*1024]
};