fixes

Author: themuffinator

src/server/commands/command_cheats.cpp

@@ -128,7 +128,7 @@ namespace Commands {
 		for (int i = 0; i < static_cast<int>(globals.numEntities); ++i) {
 			gentity_t* e = &g_entities[i];
 			if (e->inUse) {
-				gi.Com_PrintFmt("%3i: %s\n", i, e->className);
+				gi.Com_PrintFmt("{}: {}\n", i, e->className);
 			}
 		}
 		gi.Client_Print(ent, PRINT_HIGH, "-------------------\n");
@@ -140,11 +140,11 @@ namespace Commands {
 		for (int i = 0; i < static_cast<int>(globals.numEntities); ++i) {
 			gentity_t* e = &g_entities[i];
 			if (e->inUse && (e->svFlags & SVF_MONSTER)) {
-				gi.Com_PrintFmt("%3i: %s at %.1f %.1f %.1f\n", i, e->className, e->s.origin[0], e->s.origin[1], e->s.origin[2]);
+				gi.Com_PrintFmt("{}: {} at {}\n", i, e->className, e->s.origin);
 				count++;
 			}
 		}
-		gi.Com_PrintFmt("Total monsters: %i\n", count);
+		gi.Com_PrintFmt("Total monsters: {}\n", count);
 		gi.Client_Print(ent, PRINT_HIGH, "--------------------\n");
 	}
 

src/server/commands/command_client.cpp

@@ -341,12 +341,12 @@ Enables administrative permissions when the correct password is supplied.
 
 			default:
 			// Unknown impulses silently ignored (classic Q1 feel), but a hint helps once.
-			gi.LocClient_Print(ent, PRINT_LOW, "impulse %d ignored (supported: 1..8, 9, 10, 12, 21, 255)\n", n);
+			gi.LocClient_Print(ent, PRINT_LOW, "impulse {} ignored (supported: 1..8, 9, 10, 12, 21, 255)\n", n);
 			return;
 		}
 
 		if (!handled && n >= 1 && n <= 8) {
-			gi.LocClient_Print(ent, PRINT_LOW, "You do not have a valid weapon for impulse %d\n", n);
+			gi.LocClient_Print(ent, PRINT_LOW, "You do not have a valid weapon for impulse {}\n", n);
 		}
 	}
 

src/server/gameplay/g_client_cfg.cpp

@@ -92,12 +92,12 @@ void ClientConfigStore::SaveInternal(const std::string& playerID, int skillRatin
 			Json::CharReaderBuilder builder;
 			std::string errs;
 			if (!Json::parseFromStream(builder, in, &cfg, &errs)) {
-				gi_.Com_PrintFmt("%s: parse error in %s: %s\n", __FUNCTION__, path.c_str(), errs.c_str());
+				gi_.Com_PrintFmt("{}: parse error in {}: {}\n", __FUNCTION__, path.c_str(), errs.c_str());
 				cfg = Json::Value(Json::objectValue);
 			}
 		}
 		else {
-			gi_.Com_PrintFmt("%s: creating new player config for missing file %s\n", __FUNCTION__, path.c_str());
+			gi_.Com_PrintFmt("{}: creating new player config for missing file {}\n", __FUNCTION__, path.c_str());
 		}
 	}
 
@@ -270,13 +270,13 @@ void ClientConfigStore::SaveInternal(const std::string& playerID, int skillRatin
 
 	try {
 		if (!EnsurePlayerConfigDirectory()) {
-			gi_.Com_PrintFmt("%s: failed to ensure player config directory\n", __FUNCTION__);
+			gi_.Com_PrintFmt("{}: failed to ensure player config directory\n", __FUNCTION__);
 			return;
 		}
 
 		std::ofstream out(path);
 		if (!out.is_open()) {
-			gi_.Com_PrintFmt("%s: failed to write %s\n", __FUNCTION__, path.c_str());
+			gi_.Com_PrintFmt("{}: failed to write {}\n", __FUNCTION__, path.c_str());
 			return;
 		}
 
@@ -286,10 +286,10 @@ void ClientConfigStore::SaveInternal(const std::string& playerID, int skillRatin
 		writer->write(cfg, &out);
 		out.close();
 
-		gi_.Com_PrintFmt("%s: saved updates for %s\n", __FUNCTION__, playerID.c_str());
+		gi_.Com_PrintFmt("{}: saved updates for {}\n", __FUNCTION__, playerID.c_str());
 	}
 	catch (const std::exception& e) {
-		gi_.Com_PrintFmt("%s: exception: %s\n", __FUNCTION__, e.what());
+		gi_.Com_PrintFmt("{}: exception: {}\n", __FUNCTION__, e.what());
 	}
 }
 /*

src/server/gameplay/g_spawn.cpp

@@ -78,7 +78,7 @@ namespace {
 	*/
 	static std::string BuildMapEntityContext(const gentity_t* ent)
 	{
-		const char* map_name = level.mapName.empty() ? "<unknown>" : level.mapName.c_str();
+		const char* map_name = level.mapName.empty() ? "<unknown>" : level.mapName.data();
 		const int32_t ent_num = ent ? static_cast<int32_t>(ent - g_entities) : -1;
 		const char* class_name = (ent && ent->className) ? ent->className : "<unset>";
 		const char* model_name = (ent && ent->model) ? ent->model : "<unset>";
@@ -699,6 +699,9 @@ static const std::initializer_list<spawn_t> spawns = {
 			worr::Logf(worr::LogLevel::Warn, "{}: null entity provided; skipping map fixes {}", __FUNCTION__, BuildMapEntityContext(ent));
 			return;
 		}
+		if (!ent->inUse) {
+			return;
+		}
 		if (!ent->className || !ent->model) {
 			worr::Logf(worr::LogLevel::Warn, "{}: missing data; skipping map fixes {}", __FUNCTION__, BuildMapEntityContext(ent));
 			return;

src/server/gameplay/g_spawn_points.cpp

@@ -1074,9 +1074,15 @@ bool SelectSpawnPoint(gentity_t* ent, Vector3& origin, Vector3& angles, bool for
 			return false;
 		}
 
+		// Validate spot one more time before dereferencing
+		if (!spot || !spot->inUse) {
+			gi.Com_PrintFmt("{}: selected spawn point is invalid\n", __FUNCTION__);
+			return false;
+		}
+
 		// Place slightly above pad if allowed
 		const float zlift = match_allowSpawnPads->integer ? 9.0f : 1.0f;
-		origin = spot->s.origin + Vector3{ 0.0f, 0.0f, zlift };
+		origin = spot->s.origin + gvec3_t{ 0.0f, 0.0f, zlift };
 		angles = spot->s.angles;
 
 		// Ensure no roll; optionally zero pitch if desired

src/server/menu/menu_page_setup.cpp

@@ -28,7 +28,7 @@ struct MatchSetupState {
 
 static void FinishMatchSetup(gentity_t* ent, MatchSetupState* state) {
 	// Example: Apply config and broadcast
-	gi.Com_PrintFmt("Match setup complete: gametype=%s modifier=%s players=%d length=%s type=%s bestof=%s\n",
+	gi.Com_PrintFmt("Match setup complete: gametype={} modifier={} players={} length={} type={} bestof={}\n",
 		state->gametype.c_str(), state->modifier.c_str(), state->maxPlayers,
 		state->length.c_str(), state->type.c_str(), state->bestOf.c_str());
 
@@ -133,7 +133,7 @@ static void OpenSetupMaxPlayersMenu(gentity_t* ent, MatchSetupState* state) {
 	MenuBuilder b;
 	b.add("Max Players", MenuAlign::Center).spacer();
 	for (int count : {2, 4, 8, 16}) {
-		b.add(G_Fmt("%d", count).data(), MenuAlign::Left, [=](gentity_t* e, Menu& m) {
+		b.add(G_Fmt("{}", count).data(), MenuAlign::Left, [=](gentity_t* e, Menu& m) {
 			state->maxPlayers = count;
 			OpenSetupMatchLengthMenu(e, state);
 			});