Merge branch 'main' into expose-version

ASpoonPlaysGames · Oct 3, 2023 · 029808f · 029808f
2 parents d8fabd9 + d6f0cd5
commit 029808f
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/NorthstarDLL/client/rejectconnectionfixes.cpp b/NorthstarDLL/client/rejectconnectionfixes.cpp
@@ -25,7 +25,7 @@ void,, (bool a1, const char* fmt, ...))
 		R2::Cbuf_AddText(R2::Cbuf_GetCurrentPlayer(), "disconnect", R2::cmd_source_t::kCommandSrcCode);
 	}
 
-	return COM_ExplainDisconnection(a1, buf);
+	return COM_ExplainDisconnection(a1, "%s", buf);
 }
 
 ON_DLL_LOAD_CLIENT("engine.dll", RejectConnectionFixes, (CModule module))

diff --git a/NorthstarDLL/util/printmaps.cpp b/NorthstarDLL/util/printmaps.cpp
@@ -31,6 +31,12 @@ struct MapVPKInfo
 // our current list of maps in the game
 std::vector<MapVPKInfo> vMapList;
 
+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()
 {
 	// Only update the maps list every 10 seconds max to we avoid constantly reading fs
@@ -182,10 +188,40 @@ void ConCommand_maps(const CCommand& args)
 			spdlog::info("({}) {}", PrintMapSource.at(map.source), map.name);
 }
 
+// clang-format off
+AUTOHOOK(Host_Map_f, engine.dll + 0x15B340, void, __fastcall, (const CCommand& args))
+// clang-format on
+{
+	RefreshMapList();
+
+	if (args.ArgC() > 1 &&
+		std::find_if(vMapList.begin(), vMapList.end(), [&](MapVPKInfo map) -> bool { return map.name == args.Arg(1); }) == vMapList.end())
+	{
+		spdlog::warn("Map load failed: {} not found or invalid", args.Arg(1));
+		return;
+	}
+	else if (args.ArgC() == 1)
+	{
+		spdlog::warn("Map load failed: no map name provided");
+		return;
+	}
+
+	if (*R2::g_pServerState >= R2::server_state_t::ss_active)
+		return Host_Changelevel_f(args);
+	else
+		return Host_Map_helper(args, nullptr);
+}
+
 void InitialiseMapsPrint()
 {
 	AUTOHOOK_DISPATCH()
 
 	ConCommand* mapsCommand = R2::g_pCVar->FindCommand("maps");
 	mapsCommand->m_pCommandCallback = ConCommand_maps;
 }
+
+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>();
+}