mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-27 09:45:42 +00:00
Code Issues Projects Releases Wiki Activity

script revision

Browse source
This commit is contained in:
Nikolay Korolev 2020-05-20 20:40:04 +03:00
parent fec0028e12
commit d84650fbe5
5 changed files with 328 additions and 187 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/control/OnscreenTimer.cpp
View file

@ -20,8 +20,9 @@ void COnscreenTimer::Init() {
} }
m_sEntries[i].m_nType = COUNTER_DISPLAY_NUMBER; m_sEntries[i].m_nType = COUNTER_DISPLAY_NUMBER;
m_sEntries[i].m_bTimerProcessed = 0; m_sEntries[i].m_bTimerProcessed = false;
m_sEntries[i].m_bCounterProcessed = 0; m_sEntries[i].m_bCounterProcessed = false;
m_sEntries[i].m_bTimerGoingDown = true;
} }
} }
@ -65,26 +66,21 @@ void COnscreenTimer::ClearClock(uint32 offset) {
} }
} }
void COnscreenTimer::AddCounter(uint32 offset, uint16 type, char* text) { void COnscreenTimer::AddCounter(uint32 offset, uint16 type, char* text, uint16 pos) {
uint32 i = 0;
for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) { m_sEntries[pos].m_nCounterOffset = offset;
if(m_sEntries[i].m_nCounterOffset == 0) { if (m_sEntries[pos].m_aCounterText[0] != '\0')
break;
}
return; return;
}
m_sEntries[i].m_nCounterOffset = offset;
if(text) { if(text) {
strncpy(m_sEntries[i].m_aCounterText, text, 10); strncpy(m_sEntries[pos].m_aCounterText, text, 10);
} else { } else {
m_sEntries[i].m_aCounterText[0] = 0; m_sEntries[pos].m_aCounterText[0] = 0;
} }
m_sEntries[i].m_nType = type; m_sEntries[pos].m_nType = type;
} }
void COnscreenTimer::AddClock(uint32 offset, char* text) { void COnscreenTimer::AddClock(uint32 offset, char* text, bool bGoingDown) {
uint32 i = 0; uint32 i = 0;
for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) { for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) {
if(m_sEntries[i].m_nTimerOffset == 0) { if(m_sEntries[i].m_nTimerOffset == 0) {
@ -94,6 +90,7 @@ void COnscreenTimer::AddClock(uint32 offset, char* text) {
} }
m_sEntries[i].m_nTimerOffset = offset; m_sEntries[i].m_nTimerOffset = offset;
m_sEntries[i].m_bTimerGoingDown = bGoingDown;
if(text) { if(text) {
strncpy(m_sEntries[i].m_aTimerText, text, 10); strncpy(m_sEntries[i].m_aTimerText, text, 10);
} else { } else {
@ -108,13 +105,15 @@ void COnscreenTimerEntry::Process() {
int32* timerPtr = CTheScripts::GetPointerToScriptVariable(m_nTimerOffset); int32* timerPtr = CTheScripts::GetPointerToScriptVariable(m_nTimerOffset);
int32 oldTime = *timerPtr; int32 oldTime = *timerPtr;
int32 newTime = oldTime - int32(CTimer::GetTimeStepInSeconds() * 1000); if (m_bTimerGoingDown) {
int32 newTime = oldTime - int32(CTimer::GetTimeStepInMilliseconds());
if (newTime < 0) { if (newTime < 0) {
*timerPtr = 0; *timerPtr = 0;
m_bTimerProcessed = 0; m_bTimerProcessed = 0;
m_nTimerOffset = 0; m_nTimerOffset = 0;
m_aTimerText[0] = 0; m_aTimerText[0] = 0;
} else { }
else {
*timerPtr = newTime; *timerPtr = newTime;
int32 oldTimeSeconds = oldTime / 1000; int32 oldTimeSeconds = oldTime / 1000;
if (oldTimeSeconds < 12 && newTime / 1000 != oldTimeSeconds) { if (oldTimeSeconds < 12 && newTime / 1000 != oldTimeSeconds) {
@ -122,6 +121,9 @@ void COnscreenTimerEntry::Process() {
} }
} }
} }
else
*timerPtr = oldTime + int32(CTimer::GetTimeStepInMilliseconds());
}
bool COnscreenTimerEntry::ProcessForDisplay() { bool COnscreenTimerEntry::ProcessForDisplay() {
m_bTimerProcessed = false; m_bTimerProcessed = false;

5
src/control/OnscreenTimer.h
View file

@ -17,6 +17,7 @@ public:
char m_bCounterBuffer[42]; char m_bCounterBuffer[42];
char m_bTimerBuffer[42]; char m_bTimerBuffer[42];
bool m_bTimerProcessed; bool m_bTimerProcessed;
bool m_bTimerGoingDown;
bool m_bCounterProcessed; bool m_bCounterProcessed;
void Process(); void Process();
@ -42,8 +43,8 @@ public:
void ClearCounter(uint32 offset); void ClearCounter(uint32 offset);
void ClearClock(uint32 offset); void ClearClock(uint32 offset);
void AddCounter(uint32 offset, uint16 type, char* text); void AddCounter(uint32 offset, uint16 type, char* text, uint16 pos);
void AddClock(uint32 offset, char* text); void AddClock(uint32 offset, char* text, bool bGoingDown);
}; };
VALIDATE_SIZE(COnscreenTimer, 0x78); VALIDATE_SIZE(COnscreenTimer, 0x78);

426
src/control/Script.cpp
View file

File diff suppressed because it is too large Load diff

8
src/control/Script.h
View file

@ -485,10 +485,11 @@ private:
float LimitAngleOnCircle(float angle) { return angle < 0.0f ? angle + 360.0f : angle; } float LimitAngleOnCircle(float angle) { return angle < 0.0f ? angle + 360.0f : angle; }
bool ThisIsAValidRandomPed(uint32 pedtype) { bool ThisIsAValidRandomPed(uint32 pedtype, int civ, int gang, int criminal) {
switch (pedtype) { switch (pedtype) {
case PEDTYPE_CIVMALE: case PEDTYPE_CIVMALE:
case PEDTYPE_CIVFEMALE: case PEDTYPE_CIVFEMALE:
return civ;
case PEDTYPE_GANG1: case PEDTYPE_GANG1:
case PEDTYPE_GANG2: case PEDTYPE_GANG2:
case PEDTYPE_GANG3: case PEDTYPE_GANG3:
@ -498,13 +499,16 @@ private:
case PEDTYPE_GANG7: case PEDTYPE_GANG7:
case PEDTYPE_GANG8: case PEDTYPE_GANG8:
case PEDTYPE_GANG9: case PEDTYPE_GANG9:
return gang;
case PEDTYPE_CRIMINAL: case PEDTYPE_CRIMINAL:
case PEDTYPE_PROSTITUTE: case PEDTYPE_PROSTITUTE:
return true; return criminal;
default: default:
return false; return false;
} }
} }
bool CheckDamagedWeaponType(int32 type, int32 actual);
static bool ThisIsAValidRandomCop(int32 mi, bool cop, bool swat, bool fbi, bool army, bool miami); static bool ThisIsAValidRandomCop(int32 mi, bool cop, bool swat, bool fbi, bool army, bool miami);
}; };

2
src/weapons/WeaponType.h
View file

@ -44,6 +44,8 @@ enum eWeaponType
WEAPONTYPE_UNIDENTIFIED, WEAPONTYPE_UNIDENTIFIED,
WEAPONTYPE_TOTALWEAPONS = WEAPONTYPE_LAST_WEAPONTYPE, WEAPONTYPE_TOTALWEAPONS = WEAPONTYPE_LAST_WEAPONTYPE,
WEAPONTYPE_ANYMELEE = 46,
WEAPONTYPE_ANYWEAPON = 47
}; };
enum { enum {