mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 00:00:00 +00:00
Add NUMONSCREENTIMERENTRIES in config.h
This commit is contained in:
parent
ecd70a5f17
commit
bcf44d361d
14
src/User.cpp
14
src/User.cpp
|
@ -16,7 +16,7 @@ char* CTheScripts::ScriptSpace = (char*)0x74B248;
|
||||||
|
|
||||||
int COnscreenTimer::Init() {
|
int COnscreenTimer::Init() {
|
||||||
m_bDisabled = false;
|
m_bDisabled = false;
|
||||||
for(uint32 i = 0; i < 1; i++) {
|
for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) {
|
||||||
m_sEntries[i].m_nTimerOffset = 0;
|
m_sEntries[i].m_nTimerOffset = 0;
|
||||||
m_sEntries[i].m_nCounterOffset = 0;
|
m_sEntries[i].m_nCounterOffset = 0;
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@ int COnscreenTimer::Init() {
|
||||||
|
|
||||||
void COnscreenTimer::Process() {
|
void COnscreenTimer::Process() {
|
||||||
if(CReplay::Mode != 1 && !m_bDisabled) {
|
if(CReplay::Mode != 1 && !m_bDisabled) {
|
||||||
for(uint32 i = 0; i < 1; i++) {
|
for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) {
|
||||||
m_sEntries[i].Process();
|
m_sEntries[i].Process();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -43,7 +43,7 @@ void COnscreenTimer::Process() {
|
||||||
void COnscreenTimer::ProcessForDisplay() {
|
void COnscreenTimer::ProcessForDisplay() {
|
||||||
if(CHud::m_Wants_To_Draw_Hud) {
|
if(CHud::m_Wants_To_Draw_Hud) {
|
||||||
m_bProcessed = false;
|
m_bProcessed = false;
|
||||||
for(uint32 i = 0; i < 1; i++) {
|
for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) {
|
||||||
if(m_sEntries[i].ProcessForDisplay()) {
|
if(m_sEntries[i].ProcessForDisplay()) {
|
||||||
m_bProcessed = true;
|
m_bProcessed = true;
|
||||||
}
|
}
|
||||||
|
@ -52,7 +52,7 @@ void COnscreenTimer::ProcessForDisplay() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void COnscreenTimer::ClearCounter(uint32 offset) {
|
void COnscreenTimer::ClearCounter(uint32 offset) {
|
||||||
for(uint32 i = 0; i < 1; i++) {
|
for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) {
|
||||||
if(offset == m_sEntries[i].m_nCounterOffset) {
|
if(offset == m_sEntries[i].m_nCounterOffset) {
|
||||||
m_sEntries[i].m_nCounterOffset = 0;
|
m_sEntries[i].m_nCounterOffset = 0;
|
||||||
m_sEntries[i].m_aCounterText[0] = 0;
|
m_sEntries[i].m_aCounterText[0] = 0;
|
||||||
|
@ -63,7 +63,7 @@ void COnscreenTimer::ClearCounter(uint32 offset) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void COnscreenTimer::ClearClock(uint32 offset) {
|
void COnscreenTimer::ClearClock(uint32 offset) {
|
||||||
for(uint32 i = 0; i < 1; i++) {
|
for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) {
|
||||||
if(offset == m_sEntries[i].m_nTimerOffset) {
|
if(offset == m_sEntries[i].m_nTimerOffset) {
|
||||||
m_sEntries[i].m_nTimerOffset = 0;
|
m_sEntries[i].m_nTimerOffset = 0;
|
||||||
m_sEntries[i].m_aTimerText[0] = 0;
|
m_sEntries[i].m_aTimerText[0] = 0;
|
||||||
|
@ -74,7 +74,7 @@ void COnscreenTimer::ClearClock(uint32 offset) {
|
||||||
|
|
||||||
void COnscreenTimer::AddCounter(uint32 offset, uint16 type, char* text) {
|
void COnscreenTimer::AddCounter(uint32 offset, uint16 type, char* text) {
|
||||||
uint32 i = 0;
|
uint32 i = 0;
|
||||||
for(uint32 i = 0; i < 1; i++) {
|
for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) {
|
||||||
if(m_sEntries[i].m_nCounterOffset == 0) {
|
if(m_sEntries[i].m_nCounterOffset == 0) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -93,7 +93,7 @@ void COnscreenTimer::AddCounter(uint32 offset, uint16 type, char* text) {
|
||||||
|
|
||||||
void COnscreenTimer::AddClock(uint32 offset, char* text) {
|
void COnscreenTimer::AddClock(uint32 offset, char* text) {
|
||||||
uint32 i = 0;
|
uint32 i = 0;
|
||||||
for(uint32 i = 0; i < 1; i++) {
|
for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) {
|
||||||
if(m_sEntries[i].m_nTimerOffset == 0) {
|
if(m_sEntries[i].m_nTimerOffset == 0) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,7 @@ public:
|
||||||
class COnscreenTimer
|
class COnscreenTimer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
COnscreenTimerEntry m_sEntries[1];
|
COnscreenTimerEntry m_sEntries[NUMONSCREENTIMERENTRIES];
|
||||||
bool m_bProcessed;
|
bool m_bProcessed;
|
||||||
bool m_bDisabled;
|
bool m_bDisabled;
|
||||||
char field_119[2];
|
char field_119[2];
|
||||||
|
|
21
src/config.h
21
src/config.h
|
@ -1,7 +1,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
enum Config {
|
enum Config {
|
||||||
NUMCDIMAGES = 50, // was 12
|
NUMCDIMAGES = 50, // was 12
|
||||||
|
|
||||||
MODELINFOSIZE = 5500,
|
MODELINFOSIZE = 5500,
|
||||||
TXDSTORESIZE = 850,
|
TXDSTORESIZE = 850,
|
||||||
|
@ -14,17 +14,17 @@ enum Config {
|
||||||
VEHICLEMODELSIZE = 120,
|
VEHICLEMODELSIZE = 120,
|
||||||
TWODFXSIZE = 2000,
|
TWODFXSIZE = 2000,
|
||||||
|
|
||||||
NUMOBJECTINFO = 168, // object.dat
|
NUMOBJECTINFO = 168, // object.dat
|
||||||
|
|
||||||
// Pool sizes
|
// Pool sizes
|
||||||
NUMPTRNODES = 30000, // 26000 on PS2
|
NUMPTRNODES = 30000, // 26000 on PS2
|
||||||
NUMENTRYINFOS = 5400, // 3200 on PS2
|
NUMENTRYINFOS = 5400, // 3200 on PS2
|
||||||
NUMPEDS = 140, // 90 on PS2
|
NUMPEDS = 140, // 90 on PS2
|
||||||
NUMVEHICLES = 110, // 70 on PS2
|
NUMVEHICLES = 110, // 70 on PS2
|
||||||
NUMBUILDINGS = 5500, // 4915 on PS2
|
NUMBUILDINGS = 5500, // 4915 on PS2
|
||||||
NUMTREADABLES = 1214,
|
NUMTREADABLES = 1214,
|
||||||
NUMOBJECTS = 450,
|
NUMOBJECTS = 450,
|
||||||
NUMDUMMIES = 2802, // 2368 on PS2
|
NUMDUMMIES = 2802, // 2368 on PS2
|
||||||
NUMAUDIOSCRIPTOBJECTS = 256,
|
NUMAUDIOSCRIPTOBJECTS = 256,
|
||||||
|
|
||||||
// Link list lengths
|
// Link list lengths
|
||||||
|
@ -42,7 +42,6 @@ enum Config {
|
||||||
NUMATTRIBZONES = 288,
|
NUMATTRIBZONES = 288,
|
||||||
NUMZONEINDICES = 55000,
|
NUMZONEINDICES = 55000,
|
||||||
|
|
||||||
|
|
||||||
NUMPEDSTATS = 35,
|
NUMPEDSTATS = 35,
|
||||||
NUMHANDLINGS = 57,
|
NUMHANDLINGS = 57,
|
||||||
|
|
||||||
|
@ -54,7 +53,9 @@ enum Config {
|
||||||
NUMEXTRADIRECTIONALS = 4,
|
NUMEXTRADIRECTIONALS = 4,
|
||||||
NUMANTENNAS = 8,
|
NUMANTENNAS = 8,
|
||||||
NUMCORONAS = 56,
|
NUMCORONAS = 56,
|
||||||
NUMPOINTLIGHTS = 32
|
NUMPOINTLIGHTS = 32,
|
||||||
|
|
||||||
|
NUMONSCREENTIMERENTRIES = 1
|
||||||
};
|
};
|
||||||
|
|
||||||
#define GTA3_1_1_PATCH
|
#define GTA3_1_1_PATCH
|
||||||
|
|
Loading…
Reference in a new issue