From 8cab028a213eb483a1840e9fea1f7d138587e704 Mon Sep 17 00:00:00 2001 From: LuxLuma Date: Wed, 30 Sep 2020 22:58:48 +0100 Subject: [PATCH 1/5] Not really sure how this was changed. --- gamerules.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gamerules.h b/gamerules.h index 699e7fa..ea08e1c 100644 --- a/gamerules.h +++ b/gamerules.h @@ -205,7 +205,7 @@ struct CTerrorGameRules_vtable }; struct CTerrorGameRules { - void * vptr; + CTerrorGameRules_vtable * vptr; char BaseClassStuff[912]; // ignoring a bunch of stuff //int m_iSurvivorScore[2]; int m_iCampaignScore[2]; // 916 From 75aefdae3a31b42a7452d9f451002ded2e4c96b8 Mon Sep 17 00:00:00 2001 From: LuxLuma Date: Wed, 30 Sep 2020 23:15:47 +0100 Subject: [PATCH 2/5] Fixed unknown1076 being too big CDirector->ChallengeModePtr is at offset 1416 --- director.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/director.h b/director.h index b156f44..cfa1188 100644 --- a/director.h +++ b/director.h @@ -288,7 +288,7 @@ struct CDirector { bool m_bIsSecondRoundFinished; // This one too bool m_bUnknownJunk; // probably related CountdownTimer TransitionTimeoutTimer; // 0x428 - char unknown1076[368]; // 0x434 + char unknown1076[308]; // 0x434 CDirectorTacticalServices * TacticalServicesPtr; // 0x5a4 CDirectorItemManager * ItemManagerPtr; CDirectorMusicBanks * MusicBanksPtr; @@ -301,4 +301,4 @@ struct CDirector { char unknown1420[8]; }; -#endif //_INCLUDE_DIRECTOR_H_ +#endif //_INCLUDE_DIRECTOR_H_ \ No newline at end of file From 14cf3491b53f4b3f12754f26f98b2164abcc02b8 Mon Sep 17 00:00:00 2001 From: LuxLuma Date: Tue, 17 Nov 2020 03:38:29 +0000 Subject: [PATCH 3/5] ScripedHUD offsets --- gamerules.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gamerules.h b/gamerules.h index ea08e1c..b5d455a 100644 --- a/gamerules.h +++ b/gamerules.h @@ -245,7 +245,18 @@ struct CTerrorGameRules bool m_bChallengeModeActive; // implied padding[3]; int m_iSacrificeEscapees; - float m_flUnknown1160; + float m_flHoldoutCooldownEndTime; + int m_iScriptedHUDInts[15]; + float m_fScriptedHUDFloats[15]; + int m_iScriptedHUDFlags[15]; + float m_fScriptedHUDPosX[15]; + float m_fScriptedHUDPosY[15]; + float m_fScriptedHUDWidth[15]; + float m_fScriptedHUDHeight[15]; + int m_iScriptedHUDTimerMode[4]; + float m_fScriptedHUDTimerBase[4]; + float m_fScriptedHUDTimerAdd[4]; + float m_szScriptedHUDStringSet[15][255];//assumed 255 not checked it's actual size FIXME }; /* VTable for CTerrorGameRules: (0, 0) From e56b9aab63dfb4088070ff25827a8c633ef8da18 Mon Sep 17 00:00:00 2001 From: LuxLuma Date: Tue, 17 Nov 2020 05:09:14 +0000 Subject: [PATCH 4/5] Update gamerules.h --- gamerules.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gamerules.h b/gamerules.h index b5d455a..7af832f 100644 --- a/gamerules.h +++ b/gamerules.h @@ -256,7 +256,7 @@ struct CTerrorGameRules int m_iScriptedHUDTimerMode[4]; float m_fScriptedHUDTimerBase[4]; float m_fScriptedHUDTimerAdd[4]; - float m_szScriptedHUDStringSet[15][255];//assumed 255 not checked it's actual size FIXME + char m_szScriptedHUDStringSet[15][255];//assumed 255 not checked it's actual size FIXME }; /* VTable for CTerrorGameRules: (0, 0) From dbfeb7d985abd44dacdeee423e7eb109c77bcf0e Mon Sep 17 00:00:00 2001 From: LuxLuma Date: Wed, 2 Dec 2020 11:06:39 +0000 Subject: [PATCH 5/5] m_szScriptedHUDStringSet Proper size --- gamerules.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gamerules.h b/gamerules.h index 7af832f..5d632d3 100644 --- a/gamerules.h +++ b/gamerules.h @@ -256,7 +256,7 @@ struct CTerrorGameRules int m_iScriptedHUDTimerMode[4]; float m_fScriptedHUDTimerBase[4]; float m_fScriptedHUDTimerAdd[4]; - char m_szScriptedHUDStringSet[15][255];//assumed 255 not checked it's actual size FIXME + char m_szScriptedHUDStringSet[15][128]; }; /* VTable for CTerrorGameRules: (0, 0)