1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use SoldierID

Browse Source
This commit is contained in:
Asdow
2024-11-21 23:56:57 +02:00
parent 0d97e36c34
commit d960403514
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TacticalAI/AIInternals.h
+5 -5
View File
@@ -154,14 +154,14 @@ public:
class UnderFire class UnderFire
{ {
private: private:
BOOLEAN fEnable; BOOLEAN fEnable;
UINT16 usUnderFireCnt; UINT16 usUnderFireCnt;
UINT16 usUnderFireID[MAXUNDERFIRE]; SoldierID usUnderFireID[MAXUNDERFIRE];
UINT8 ubUnderFireCTH[MAXUNDERFIRE]; UINT8 ubUnderFireCTH[MAXUNDERFIRE];
public: public:
UnderFire(void){ Clear(); fEnable = FALSE; } UnderFire(void){ Clear(); fEnable = FALSE; }
void Clear(void); void Clear(void);
void Add(UINT16 usID, UINT8 ubCTH); void Add(SoldierID usID, UINT8 ubCTH);
void Enable(void){ fEnable=TRUE; } void Enable(void){ fEnable=TRUE; }
void Disable(void){ fEnable=FALSE; } void Disable(void){ fEnable=FALSE; }
UINT16 GetUnderFireCnt(void){ return(usUnderFireCnt); } UINT16 GetUnderFireCnt(void){ return(usUnderFireCnt); }
TacticalAI/Attacks.cpp
+4 -4
View File
@@ -3417,11 +3417,11 @@ UnderFire gUnderFire;
void UnderFire::Clear(void) void UnderFire::Clear(void)
{ {
usUnderFireCnt = 0; usUnderFireCnt = 0;
memset(usUnderFireID, 0, sizeof(usUnderFireID)); memset(usUnderFireID, TOTAL_SOLDIERS, sizeof(usUnderFireID));
memset(ubUnderFireCTH, 0, sizeof(ubUnderFireCTH)); memset(ubUnderFireCTH, 0, sizeof(ubUnderFireCTH));
} }
void UnderFire::Add(UINT16 usID, UINT8 ubCTH) void UnderFire::Add(SoldierID usID, UINT8 ubCTH)
{ {
if (!fEnable) if (!fEnable)
return; return;
@@ -3448,7 +3448,7 @@ UINT16 UnderFire::Count(INT8 bTeam)
UINT16 cnt = 0; UINT16 cnt = 0;
for (UINT16 i = 0; i < usUnderFireCnt; i++) for (UINT16 i = 0; i < usUnderFireCnt; i++)
{ {
if (MercPtrs[usUnderFireID[i]]->bTeam == bTeam) if (usUnderFireID[i]->bTeam == bTeam)
++cnt; ++cnt;
} }
return(cnt); return(cnt);
@@ -3459,7 +3459,7 @@ UINT8 UnderFire::Chance(INT8 bTeam, INT8 bSide, BOOLEAN fCheckNeutral)
UINT8 cth = 0; UINT8 cth = 0;
for (UINT16 i = 0; i < usUnderFireCnt; i++) for (UINT16 i = 0; i < usUnderFireCnt; i++)
{ {
if ((MercPtrs[usUnderFireID[i]]->bTeam == bTeam || MercPtrs[usUnderFireID[i]]->bSide == bSide || fCheckNeutral && MercPtrs[usUnderFireID[i]]->aiData.bNeutral) && if ((usUnderFireID[i]->bTeam == bTeam || usUnderFireID[i]->bSide == bSide || fCheckNeutral && usUnderFireID[i]->aiData.bNeutral) &&
ubUnderFireCTH[i] > cth) ubUnderFireCTH[i] > cth)
{ {
cth = ubUnderFireCTH[i]; cth = ubUnderFireCTH[i];