Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
rafradek committed Oct 25, 2024
1 parent d45eb5c commit 36d4aa6
Show file tree
Hide file tree
Showing 40 changed files with 897 additions and 399 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ jobs:
rm lua-*.tar.gz
mv lua-* lua
cd lua
make MYCFLAGS='-m32' MYLDFLAGS='-m32'
make CC=g++ MYCFLAGS='-m32' MYLDFLAGS='-m32'
mv src/liblua.a ../liblua.a
make clean
make MYCFLAGS='-fPIC'
make CC=g++ MYCFLAGS='-fPIC'
mv src/liblua.a ../libluax64.a
popd
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@ tar -xf lua-*.tar.gz
rm lua-*.tar.gz
mv lua-* lua
cd lua
make MYCFLAGS='-m32' MYLDFLAGS='-m32'
make CC=g++ MYCFLAGS='-m32' MYLDFLAGS='-m32'
mv src/liblua.a ../liblua.a
make clean
make MYCFLAGS="-fPIC"
make CC=g++ MYCFLAGS="-fPIC"
mv src/liblua.a ../libluax64.a
cd ../..
```
Expand Down
3 changes: 2 additions & 1 deletion cfg/sigsegv_convars.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ sig_mvm_print_parse_errors "1" // Print mission parse errors in console
sig_banned_missions_file "banned_missions.txt" // Location of a file containing banned missions list
sig_send_bots_to_spectator_immediately "0" // Bots should be send to spectator immediately after dying
sig_only_read_missions_from_directory "" // Only read missions from specified directory relative to tf/. Also removes maps with no available missions from voting
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
sig_pop_popmgr_extensions "1" // Mod: enable extended KV in CPopulationManager::Parse
sig_mvm_robot_multiplier "0" // Multiply robot count in missions
sig_mvm_robot_multiplier_tank_hp "0.5" // Tank HP multiplier for robot multiplier mode
Expand Down Expand Up @@ -295,7 +296,7 @@ sig_robot_building_stomp_contact_addknown "1" // OnContact stomp (instant, gian
sig_robot_building_stomp_stuck_nodamage "1" // OnStuck stomp (delayed, all robots): prevent damage from being done
sig_robot_building_stomp_stuck_addknown "1" // OnStuck stomp (delayed, all robots): make robot immediately aware of building
sig_robot_building_stomp "0" // Mod: replace robots' stuck-with-building-stomp ability with something less stupid
sig_robot_no_canteens "0" // Mod: don't give stock canteens to robots, because that's idiotic
sig_robot_no_canteens "1" // Mod: don't give stock canteens or spellbooks or grapples to robots, because that's idiotic
sig_robot_spawn_protection_fix "1" // Mod: make robot spawn protection only involve TF_COND_INVULNERABLE_HIDE_UNLESS_DAMAGED
sig_robot_spawn_setname "0" // Mod: use SetPlayerName instead of cl_name in CTFBotSpawner::Spawn
sig_robot_standable_heads "0" // Mod: remove the sliding force that prevents players from standing on robots' heads
Expand Down
26 changes: 26 additions & 0 deletions gamedata/sigsegv/misc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3263,6 +3263,32 @@
type "sym"
sym "_ZN15CTFMapsWorkshop7RefreshEv"
}
"CGameClient::FileDenied"
{
lib "engine"
type "sym"
sym "_ZThn4_N11CGameClient10FileDeniedEPKcj"
sym64 "_ZThn8_N11CGameClient10FileDeniedEPKcj"
}
"CGameClient::FileReceived"
{
lib "engine"
type "sym"
sym "_ZThn4_N11CGameClient12FileReceivedEPKcj"
sym64 "_ZThn8_N11CGameClient12FileReceivedEPKcj"
}
"CNetChan::HandleUpload"
{
lib "engine"
type "sym"
sym "_ZN8CNetChan12HandleUploadEPNS_15dataFragments_sEP18INetChannelHandler"
}
"CNetChan::IsValidFileForTransfer"
{
lib "engine"
type "sym"
sym "_ZN8CNetChan22IsValidFileForTransferEPKc"
}

}
"addrs_group"
Expand Down
1 change: 1 addition & 0 deletions gamedata/sigsegv/population.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
"CPopulationManager::SetPopulationFilename" "_ZN18CPopulationManager21SetPopulationFilenameEPKc"
"CPopulationManager::GetPlayerCurrencySpent" "_ZN18CPopulationManager22GetPlayerCurrencySpentEP9CTFPlayer"
"CPopulationManager::FindOrAddPlayerUpgradeHistory" "_ZN18CPopulationManager29FindOrAddPlayerUpgradeHistoryE8CSteamID"
"CPopulationManager::FindPopulationFileByShortName" "_ZN18CPopulationManager29FindPopulationFileByShortNameEPKcR10CUtlString"


"CMissionPopulator::~CMissionPopulator [D0]" "_ZN17CMissionPopulatorD0Ev"
Expand Down
2 changes: 2 additions & 0 deletions mvm-reversed/server/NextBot/NextBotBehavior.h
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,8 @@ class Action : public INextBotEventResponder, public IContextualQuery
virtual bool IsAbleToBlockMovementOf(const INextBot *nextbot) const;

T *GetActor() const;

void DeleteThis();

protected:
Behavior<T> *GetBehavior() const;
Expand Down
8 changes: 2 additions & 6 deletions src/abi.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@


#if defined __clang__
#error TODO
#include <cxxabi.h>
#elif defined __GNUC__
#include <cxxabi.h>
#elif defined _MSC_VER
Expand Down Expand Up @@ -129,11 +129,7 @@ template<class C, typename RET, typename... PARAMS> using MemberPtrTypeRegcall
template<class C, typename RET, typename... PARAMS> using MemberPtrTypeConstRegcall = RET (C::*)(PARAMS...) const __gcc_regcall;
#endif

#if defined __clang__

#error TODO

#elif defined __GNUC__
#if defined __clang__ || defined __GNUC__

template<class C, typename RET, typename... PARAMS>
union MemberPtrUnion
Expand Down
2 changes: 1 addition & 1 deletion src/link/link.h
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ class VTableThunk : public ILinkage
}

#if defined __clang__
#error TODO
ptrdiff_t adj = -offsetof(vtable, vfptrs);
#elif defined __GNUC__
ptrdiff_t adj = -offsetof(vtable, vfptrs);
#elif defined _MSC_VER
Expand Down
Loading

0 comments on commit 36d4aa6

Please sign in to comment.