Skip to content

Commit 36d4aa6

Browse files
committed
Fixes
1 parent d45eb5c commit 36d4aa6

40 files changed

+897
-399
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ jobs:
6868
rm lua-*.tar.gz
6969
mv lua-* lua
7070
cd lua
71-
make MYCFLAGS='-m32' MYLDFLAGS='-m32'
71+
make CC=g++ MYCFLAGS='-m32' MYLDFLAGS='-m32'
7272
mv src/liblua.a ../liblua.a
7373
make clean
74-
make MYCFLAGS='-fPIC'
74+
make CC=g++ MYCFLAGS='-fPIC'
7575
mv src/liblua.a ../libluax64.a
7676
popd
7777

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 MYCFLAGS='-m32' MYLDFLAGS='-m32'
92+
make CC=g++ MYCFLAGS='-m32' MYLDFLAGS='-m32'
9393
mv src/liblua.a ../liblua.a
9494
make clean
95-
make MYCFLAGS="-fPIC"
95+
make CC=g++ MYCFLAGS="-fPIC"
9696
mv src/liblua.a ../libluax64.a
9797
cd ../..
9898
```

cfg/sigsegv_convars.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ sig_mvm_print_parse_errors "1" // Print mission parse errors in console
264264
sig_banned_missions_file "banned_missions.txt" // Location of a file containing banned missions list
265265
sig_send_bots_to_spectator_immediately "0" // Bots should be send to spectator immediately after dying
266266
sig_only_read_missions_from_directory "" // Only read missions from specified directory relative to tf/. Also removes maps with no available missions from voting
267+
sig_mvm_blu_players_sound_fixup "1" // Fixup blu players sounds so they use human sounds unless set otherwise. Set to 0 if it conflicts with other plugins
267268
sig_pop_popmgr_extensions "1" // Mod: enable extended KV in CPopulationManager::Parse
268269
sig_mvm_robot_multiplier "0" // Multiply robot count in missions
269270
sig_mvm_robot_multiplier_tank_hp "0.5" // Tank HP multiplier for robot multiplier mode
@@ -295,7 +296,7 @@ sig_robot_building_stomp_contact_addknown "1" // OnContact stomp (instant, gian
295296
sig_robot_building_stomp_stuck_nodamage "1" // OnStuck stomp (delayed, all robots): prevent damage from being done
296297
sig_robot_building_stomp_stuck_addknown "1" // OnStuck stomp (delayed, all robots): make robot immediately aware of building
297298
sig_robot_building_stomp "0" // Mod: replace robots' stuck-with-building-stomp ability with something less stupid
298-
sig_robot_no_canteens "0" // Mod: don't give stock canteens to robots, because that's idiotic
299+
sig_robot_no_canteens "1" // Mod: don't give stock canteens or spellbooks or grapples to robots, because that's idiotic
299300
sig_robot_spawn_protection_fix "1" // Mod: make robot spawn protection only involve TF_COND_INVULNERABLE_HIDE_UNLESS_DAMAGED
300301
sig_robot_spawn_setname "0" // Mod: use SetPlayerName instead of cl_name in CTFBotSpawner::Spawn
301302
sig_robot_standable_heads "0" // Mod: remove the sliding force that prevents players from standing on robots' heads

gamedata/sigsegv/misc.txt

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3263,6 +3263,32 @@
32633263
type "sym"
32643264
sym "_ZN15CTFMapsWorkshop7RefreshEv"
32653265
}
3266+
"CGameClient::FileDenied"
3267+
{
3268+
lib "engine"
3269+
type "sym"
3270+
sym "_ZThn4_N11CGameClient10FileDeniedEPKcj"
3271+
sym64 "_ZThn8_N11CGameClient10FileDeniedEPKcj"
3272+
}
3273+
"CGameClient::FileReceived"
3274+
{
3275+
lib "engine"
3276+
type "sym"
3277+
sym "_ZThn4_N11CGameClient12FileReceivedEPKcj"
3278+
sym64 "_ZThn8_N11CGameClient12FileReceivedEPKcj"
3279+
}
3280+
"CNetChan::HandleUpload"
3281+
{
3282+
lib "engine"
3283+
type "sym"
3284+
sym "_ZN8CNetChan12HandleUploadEPNS_15dataFragments_sEP18INetChannelHandler"
3285+
}
3286+
"CNetChan::IsValidFileForTransfer"
3287+
{
3288+
lib "engine"
3289+
type "sym"
3290+
sym "_ZN8CNetChan22IsValidFileForTransferEPKc"
3291+
}
32663292

32673293
}
32683294
"addrs_group"

gamedata/sigsegv/population.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
"CPopulationManager::SetPopulationFilename" "_ZN18CPopulationManager21SetPopulationFilenameEPKc"
6969
"CPopulationManager::GetPlayerCurrencySpent" "_ZN18CPopulationManager22GetPlayerCurrencySpentEP9CTFPlayer"
7070
"CPopulationManager::FindOrAddPlayerUpgradeHistory" "_ZN18CPopulationManager29FindOrAddPlayerUpgradeHistoryE8CSteamID"
71+
"CPopulationManager::FindPopulationFileByShortName" "_ZN18CPopulationManager29FindPopulationFileByShortNameEPKcR10CUtlString"
7172

7273

7374
"CMissionPopulator::~CMissionPopulator [D0]" "_ZN17CMissionPopulatorD0Ev"

mvm-reversed/server/NextBot/NextBotBehavior.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,8 @@ class Action : public INextBotEventResponder, public IContextualQuery
374374
virtual bool IsAbleToBlockMovementOf(const INextBot *nextbot) const;
375375

376376
T *GetActor() const;
377+
378+
void DeleteThis();
377379

378380
protected:
379381
Behavior<T> *GetBehavior() const;

src/abi.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44

55
#if defined __clang__
6-
#error TODO
6+
#include <cxxabi.h>
77
#elif defined __GNUC__
88
#include <cxxabi.h>
99
#elif defined _MSC_VER
@@ -129,11 +129,7 @@ template<class C, typename RET, typename... PARAMS> using MemberPtrTypeRegcall
129129
template<class C, typename RET, typename... PARAMS> using MemberPtrTypeConstRegcall = RET (C::*)(PARAMS...) const __gcc_regcall;
130130
#endif
131131

132-
#if defined __clang__
133-
134-
#error TODO
135-
136-
#elif defined __GNUC__
132+
#if defined __clang__ || defined __GNUC__
137133

138134
template<class C, typename RET, typename... PARAMS>
139135
union MemberPtrUnion

src/link/link.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ class VTableThunk : public ILinkage
504504
}
505505

506506
#if defined __clang__
507-
#error TODO
507+
ptrdiff_t adj = -offsetof(vtable, vfptrs);
508508
#elif defined __GNUC__
509509
ptrdiff_t adj = -offsetof(vtable, vfptrs);
510510
#elif defined _MSC_VER

0 commit comments

Comments
 (0)