Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a safeguard to map command #529

Merged
merged 9 commits into from
Oct 2, 2023
Merged

Add a safeguard to map command #529

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ad9738d
add a safeguard to map command
catornot Aug 2, 2023
cc61f34
add RefreshMapList into the command
catornot Aug 2, 2023
52823a5
reduce nesting and improve the warn msg
catornot Aug 3, 2023
705cab8
add a warning for missing map name
catornot Aug 4, 2023
8dfc703
Merge branch 'main' into map_safeguard
Alystrasz Aug 6, 2023
aa1c9e8
reconstruct map concommand
catornot Aug 9, 2023
ffae7c5
Merge branch 'map_safeguard' of https://github.com/catornot/Northstar…
catornot Aug 9, 2023
0757e7a
use nullptr instead of std::nullptr_t
catornot Aug 27, 2023
dfc26d1
Merge branch 'main' into map_safeguard
catornot Oct 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions NorthstarDLL/util/printmaps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@ struct MapVPKInfo
// our current list of maps in the game
std::vector<MapVPKInfo> vMapList;

FnCommandCallback_t OriginalMapCommand = NULL;
typedef void (*Host_Map_helperType)(const CCommand&, void*);
typedef void (*Host_Changelevel_fType)(const CCommand&);

Host_Map_helperType Host_Map_helper;
Host_Changelevel_fType Host_Changelevel_f;

void RefreshMapList()
{
Expand Down Expand Up @@ -184,7 +188,9 @@ void ConCommand_maps(const CCommand& args)
spdlog::info("({}) {}", PrintMapSource.at(map.source), map.name);
}

void ConCommand_map(const CCommand& args)
// clang-format off
AUTOHOOK(Host_Map_f, engine.dll + 0x15B340, void, __fastcall, (const CCommand& args))
// clang-format on
{
RefreshMapList();

Expand All @@ -194,12 +200,16 @@ void ConCommand_map(const CCommand& args)
spdlog::warn("Map load failed: {} not found or invalid", args.Arg(1));
return;
}
else
else if (args.ArgC() == 1)
{
spdlog::warn("Map load failed: no map name provided");
return;
}

OriginalMapCommand(args);
if (*R2::g_pServerState >= R2::server_state_t::ss_active)
return Host_Changelevel_f(args);
else
return Host_Map_helper(args, std::nullptr_t());
catornot marked this conversation as resolved.
Show resolved Hide resolved
}

void InitialiseMapsPrint()
Expand All @@ -208,8 +218,10 @@ void InitialiseMapsPrint()

ConCommand* mapsCommand = R2::g_pCVar->FindCommand("maps");
mapsCommand->m_pCommandCallback = ConCommand_maps;
}

ConCommand* mapCommand = R2::g_pCVar->FindCommand("map");
OriginalMapCommand = mapCommand->m_pCommandCallback;
mapCommand->m_pCommandCallback = ConCommand_map;
ON_DLL_LOAD("engine.dll", Host_Map_f, (CModule module))
{
Host_Map_helper = module.Offset(0x15AEF0).RCast<Host_Map_helperType>();
Host_Changelevel_f = module.Offset(0x15AAD0).RCast<Host_Changelevel_fType>();
}