Skip to content

Commit 68ff117

Browse files
rafradekrafradek
committed
fix some issues, robot limit uses tf_mvm_max_invaders
1 parent dfc9b35 commit 68ff117

15 files changed

+173
-272
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ tar -xf lua-*.tar.gz
8989
rm lua-*.tar.gz
9090
mv lua-* lua
9191
cd lua
92-
make CC=g++ MYCFLAGS='-m32' MYLDFLAGS='-m32'
92+
make CC=g++ MYCFLAGS='-m32 -DLUA_USE_LONGJMP' MYLDFLAGS='-m32'
9393
mv src/liblua.a ../liblua.a
9494
make clean
95-
make CC=g++ MYCFLAGS="-fPIC"
95+
make CC=g++ MYCFLAGS="-fPIC -DLUA_USE_LONGJMP"
9696
mv src/liblua.a ../libluax64.a
9797
cd ../..
9898
```

‎cfg/sigsegv_convars.cfg

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,7 @@ sig_mvm_robosapper_override_duration "-1.0" // Mod: robo sapper duration (usual
181181
sig_mvm_robosapper_override_stun_minibosses "0" // Mod: robo sapper will apply full stun to minibosses instead of just partial stun (usual: 0)
182182
sig_mvm_robosapper_override_stun_amount "0.85" // Mod: robo sapper will apply specified stun amount (usual: 0.85)
183183
sig_mvm_robosapper_override "0" // Mod: enable overriding aspects of the robo sapper in MvM mode
184-
sig_mvm_robot_limit_fix_red "0" // Mod: fix problems with enforcement of the MvM robot limit when bots are on red team
185-
sig_mvm_robot_limit_override "22" // Mod: override the max number of MvM robots that are allowed to be spawned at once (normally 22)
184+
sig_mvm_robot_limit_fix_red "1" // Mod: fix problems with enforcement of the MvM robot limit when bots are on red team
186185
sig_mvm_robot_limit "1" // Mod: modify/enhance/fix some population manager code related to the 22-robot limit in MvM
187186
sig_mvm_sapper_allow_multiple_active "0" // Mod: allow multiple sappers to exist per player simultaneously in MvM mode
188187
sig_mvm_sentrybuster_enhancements "0" // Mod: enhanced sentry busters

‎gamedata/sigsegv/NextBotManager.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,21 @@
77
"#supported"
88
{
99
engine "tf2"
10+
engine "css"
11+
engine "ep1"
12+
engine "ep2"
13+
engine "hl2dm"
14+
engine "dods"
15+
engine "sdk2013"
16+
engine "l4d"
17+
engine "nd"
18+
engine "l4d2"
19+
engine "blade"
20+
engine "insurgency"
21+
engine "contagion"
22+
engine "bms"
23+
engine "doi"
24+
engine "pkvii"
1025
}
1126

1227
"sigsegv"

‎gamedata/sigsegv/debugoverlay.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,21 @@
77
"#supported"
88
{
99
engine "tf2"
10+
engine "css"
11+
engine "ep1"
12+
engine "ep2"
13+
engine "hl2dm"
14+
engine "dods"
15+
engine "sdk2013"
16+
engine "l4d"
17+
engine "nd"
18+
engine "l4d2"
19+
engine "blade"
20+
engine "insurgency"
21+
engine "contagion"
22+
engine "bms"
23+
engine "doi"
24+
engine "pkvii"
1025
}
1126

1227
"sigsegv"

‎gamedata/sigsegv/globals.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
"g_pScriptVM" "g_pScriptVM"
142142
"g_GameStringPool" "_ZL16g_GameStringPool"
143143
"steamgameserverapicontext" "steamgameserverapicontext"
144-
144+
"gEntList" "gEntList"
145145
}
146146

147147
"addrs_group"

‎gamedata/sigsegv/misc.txt

Lines changed: 29 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -3312,6 +3312,31 @@
33123312
type "sym"
33133313
sym "_Z16TE_BeamRingPointR16IRecipientFilterfRK6Vectorffiiiiffifiiiiii"
33143314
}
3315+
"CDeltaBitsReader::ReadNextPropIndex"
3316+
{
3317+
lib "engine"
3318+
type "sym"
3319+
sym "_ZN16CDeltaBitsReader17ReadNextPropIndexEv"
3320+
}
3321+
3322+
"CGlobalEntityList::FindEntityByClassname"
3323+
{
3324+
type "pattern"
3325+
sym "_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKcP17IEntityFindFilter"
3326+
seg "text"
3327+
seek "558bec5356578bf98b4d0885c974158b01ff50088b3081e6ff0f00004603f68b34f7eb068bb70400010085f674318b5d0c8b3e85ff75106880a47010ff1574f26a1083c404eb11395f5c741c538bcfe8ac9ffaff84c075108b760c85f675d25f5e33c05b5dc208008bc75f5e5b5dc20800"
3328+
mask "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00000000ffffffffffffffffffffffffffff00000000ffff00000000ffffffffffffffffffffffffffff00000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
3329+
}
3330+
"CTeamplayRoundBasedRules::BroadcastSound"
3331+
{
3332+
type "sym"
3333+
sym "_ZN24CTeamplayRoundBasedRules14BroadcastSoundEiPKciP11CBasePlayer"
3334+
}
3335+
"CBaseProjectile::IsDestroyable"
3336+
{
3337+
type "sym"
3338+
sym "_ZN15CBaseProjectile13IsDestroyableEb"
3339+
}
33153340
}
33163341
"addrs_group"
33173342
{
@@ -3419,6 +3444,10 @@
34193444
"VScriptRunScript" "_Z16VScriptRunScriptPKcP9HSCRIPT__b"
34203445
"CServerGameDLL::GetServerBrowserMapOverride" "_ZN14CServerGameDLL27GetServerBrowserMapOverrideEv"
34213446

3447+
"CTeam::GetName" "_ZNK5CTeam7GetNameEv"
3448+
"CTeam::GetNumPlayers" "_ZNK5CTeam13GetNumPlayersEv"
3449+
"CTeam::GetPlayer" "_ZNK5CTeam9GetPlayerEi"
3450+
"CTeam::GetTeamNumber" "_ZNK5CTeam13GetTeamNumberEv"
34223451
}
34233452

34243453
"addrs_group"
@@ -3559,21 +3588,6 @@
35593588
{
35603589
"addrs"
35613590
{
3562-
"CGlobalEntityList::FindEntityByClassname"
3563-
{
3564-
type "sym"
3565-
sym "_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc"
3566-
}
3567-
"CTeamplayRoundBasedRules::BroadcastSound"
3568-
{
3569-
type "sym"
3570-
sym "_ZN24CTeamplayRoundBasedRules14BroadcastSoundEiPKci"
3571-
}
3572-
"CBaseProjectile::IsDestroyable"
3573-
{
3574-
type "sym"
3575-
sym "_ZN15CBaseProjectile13IsDestroyableEv"
3576-
}
35773591
"CCSBot::IsVisible"
35783592
{
35793593
type "sym"
@@ -3591,64 +3605,8 @@
35913605
}
35923606

35933607
}
3594-
"addrs_group"
3595-
{
3596-
"[common]"
3597-
{
3598-
type "sym"
3599-
lib "server"
3600-
}
3601-
"CTeam::GetName" "_ZN5CTeam7GetNameEv"
3602-
"CTeam::GetNumPlayers" "_ZN5CTeam13GetNumPlayersEv"
3603-
"CTeam::GetPlayer" "_ZN5CTeam9GetPlayerEi"
3604-
"CTeam::GetTeamNumber" "_ZNK5CTeam13GetTeamNumberEv"
3605-
}
36063608

36073609
}
36083610
}
3609-
"#default"
3610-
{
3611-
"#supported"
3612-
{
3613-
engine "tf2"
3614-
}
3615-
"sigsegv"
3616-
{
3617-
3618-
"addrs"
3619-
{
3620-
"CGlobalEntityList::FindEntityByClassname"
3621-
{
3622-
type "pattern"
3623-
sym "_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKcP17IEntityFindFilter"
3624-
seg "text"
3625-
seek "558bec5356578bf98b4d0885c974158b01ff50088b3081e6ff0f00004603f68b34f7eb068bb70400010085f674318b5d0c8b3e85ff75106880a47010ff1574f26a1083c404eb11395f5c741c538bcfe8ac9ffaff84c075108b760c85f675d25f5e33c05b5dc208008bc75f5e5b5dc20800"
3626-
mask "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00000000ffffffffffffffffffffffffffff00000000ffff00000000ffffffffffffffffffffffffffff00000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
3627-
}
3628-
"CTeamplayRoundBasedRules::BroadcastSound"
3629-
{
3630-
type "sym"
3631-
sym "_ZN24CTeamplayRoundBasedRules14BroadcastSoundEiPKciP11CBasePlayer"
3632-
}
3633-
"CBaseProjectile::IsDestroyable"
3634-
{
3635-
type "sym"
3636-
sym "_ZN15CBaseProjectile13IsDestroyableEb"
3637-
}
3638-
}
3639-
"addrs_group"
3640-
{
3641-
"[common]"
3642-
{
3643-
type "sym"
3644-
lib "server"
3645-
}
3646-
"CTeam::GetName" "_ZNK5CTeam7GetNameEv"
3647-
"CTeam::GetNumPlayers" "_ZNK5CTeam13GetNumPlayersEv"
3648-
"CTeam::GetPlayer" "_ZNK5CTeam9GetPlayerEi"
3649-
"CTeam::GetTeamNumber" "_ZNK5CTeam13GetTeamNumberEv"
3650-
}
3651-
}
3652-
}
36533611

36543612
}

‎src/mod/bot/guard_action.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ ActionResult<Actor> CTFBotGuardAction<Actor>::Update(Actor *actor, float dt)
193193
if (this->m_hTrackTarget != nullptr){
194194
m_hTrackTarget->m_OnPass->FireOutput(Variant(), actor, m_hTrackTarget);
195195
}
196-
TriggerList(actor, node.m_onReachedOutput, nullptr);
196+
TriggerList(actor, node.m_onReachedOutput);
197197
}
198198
m_bNodeCompleted = true;
199199
}
@@ -203,7 +203,7 @@ ActionResult<Actor> CTFBotGuardAction<Actor>::Update(Actor *actor, float dt)
203203
if (this->m_hTrackTarget != nullptr) {
204204
this->m_hTrackTarget = this->m_hTrackTarget->GetNext();
205205
if (this->m_hTrackTarget == nullptr) {
206-
TriggerList(actor, this->m_Path->m_onTrackEndOutput, nullptr);
206+
TriggerList(actor, this->m_Path->m_onTrackEndOutput);
207207
m_bTrackCompleted = true;
208208
}
209209
}

0 commit comments

Comments
 (0)