Address some compiler warnings

electricbrass · electricbrass · commit c5663969cbb0 · 2025-03-08T17:58:25.000-06:00
diff --git a/client/sdl/i_input_sdl20.cpp b/client/sdl/i_input_sdl20.cpp
@@ -912,8 +912,7 @@ void ISDL20InputSubsystem::shutdownKeyboard(int id)
 std::vector<IInputDeviceInfo> ISDL20InputSubsystem::getMouseDevices() const
 {
 	std::vector<IInputDeviceInfo> devices;
-	devices.push_back(IInputDeviceInfo());
-	IInputDeviceInfo& sdl_device_info = devices.back();
+	IInputDeviceInfo& sdl_device_info = devices.emplace_back();
 	sdl_device_info.mId = 0;
 	sdl_device_info.mDeviceName = "SDL 2.0 mouse";
 	return devices;
@@ -970,8 +969,7 @@ std::vector<IInputDeviceInfo> ISDL20InputSubsystem::getJoystickDevices() const
 	std::vector<IInputDeviceInfo> devices;
 	for (int i = 0; i < SDL_NumJoysticks(); i++)
 	{
-		devices.push_back(IInputDeviceInfo());
-		IInputDeviceInfo& device_info = devices.back();
+		IInputDeviceInfo& device_info = devices.emplace_back();
 		device_info.mId = i;
 		const char* name = SDL_GameControllerNameForIndex(i);
 		device_info.mDeviceName = fmt::format("SDL 2.0 joystick ({})", name ? name : "unknown");
diff --git a/client/src/s_sound.cpp b/client/src/s_sound.cpp
@@ -560,16 +560,16 @@ int S_CalculateSoundPriority(const fixed_t* pt, int channel, int attenuation)
 	return priority;
 }
 
-static int ResolveSound(int soundid)
+static size_t ResolveSound(size_t soundid)
 {
 	const sfxinfo_t& sfx = S_sfx[soundid];
 
 	if (sfx.israndom)
 	{
 		while (S_sfx[soundid].israndom)
 		{
-			std::vector<int>& list = S_rnd[soundid];
-			soundid = list[P_Random() % static_cast<int>(list.size())];
+			std::vector<size_t>& list = S_rnd[soundid];
+			soundid = list[P_Random() % list.size()];
 		}
 		return soundid;
 	}
@@ -593,15 +593,15 @@ static void S_StartSound(fixed_t* pt, fixed_t x, fixed_t y, int channel,
 		return;
 
   	// check for bogus sound #
-	if (sfx_id < 1 || sfx_id > static_cast<int>(S_sfx.size()) - 1)
+	if (sfx_id < 0 || sfx_id > static_cast<int>(S_sfx.size()) - 1)
 	{
 		DPrintf("Bad sfx #: %d\n", sfx_id);
 		return;
 	}
 
 	sfxinfo_t* sfxinfo = &S_sfx[sfx_id];
 
-	while (sfxinfo->link != static_cast<int>(sfxinfo_t::NO_LINK))
+	while (sfxinfo->link != static_cast<size_t>(sfxinfo_t::NO_LINK))
 	{
 		sfx_id = ResolveSound(sfxinfo->link);
 		sfxinfo = &S_sfx[sfx_id];
@@ -610,7 +610,7 @@ static void S_StartSound(fixed_t* pt, fixed_t x, fixed_t y, int channel,
 	if (!sfxinfo->data)
 	{
 		I_LoadSound(sfxinfo);
-		while (sfxinfo->link != static_cast<int>(sfxinfo_t::NO_LINK))
+		while (sfxinfo->link != static_cast<size_t>(sfxinfo_t::NO_LINK))
 		{
 			sfx_id = ResolveSound(sfxinfo->link);
 			sfxinfo = &S_sfx[sfx_id];
@@ -1202,7 +1202,7 @@ int S_FindSoundByLump(int lump)
 	return -1;
 }
 
-int S_AddSoundLump(const char *logicalname, int lump)
+size_t S_AddSoundLump(const char *logicalname, int lump)
 {
 	sfxinfo_t& new_sfx = S_sfx.emplace_back();
 
@@ -1220,7 +1220,7 @@ void S_ClearSoundLumps()
 	S_rnd.clear();
 }
 
-int FindSoundNoHash(const char* logicalname)
+size_t FindSoundNoHash(const char* logicalname)
 {
 	for (size_t i = 0; i < S_sfx.size(); i++)
 		if (iequals(logicalname, S_sfx[i].name))
@@ -1229,24 +1229,24 @@ int FindSoundNoHash(const char* logicalname)
 	return S_sfx.size();
 }
 
-int FindSoundTentative(const char* name)
+size_t FindSoundTentative(const char* name)
 {
-	int id = FindSoundNoHash(name);
-	if (id == static_cast<int>(S_sfx.size()))
+	size_t id = FindSoundNoHash(name);
+	if (id == S_sfx.size())
 	{
 		id = S_AddSoundLump(name, -1);
 	}
 	return id;
 }
 
-int S_AddSound(const char *logicalname, const char *lumpname)
+size_t S_AddSound(const char *logicalname, const char *lumpname)
 {
-	int sfxid = FindSoundNoHash(logicalname);
+	size_t sfxid = FindSoundNoHash(logicalname);
 
 	const int lump = lumpname ? W_CheckNumForName(lumpname) : -1;
 
 	// Otherwise, prepare a new one.
-	if (sfxid != static_cast<int>(S_sfx.size()))
+	if (sfxid != S_sfx.size())
 	{
 		sfxinfo_t& sfx = S_sfx[sfxid];
 
@@ -1264,7 +1264,7 @@ int S_AddSound(const char *logicalname, const char *lumpname)
 	return sfxid;
 }
 
-void S_AddRandomSound(int owner, std::vector<int>& list)
+void S_AddRandomSound(size_t owner, std::vector<size_t>& list)
 {
 	S_rnd[owner] = list;
 	S_sfx[owner].link = owner;
@@ -1395,22 +1395,22 @@ void S_ParseSndInfo()
 				else if (os.compareTokenNoCase("alias"))
 				{
 					os.mustScan();
-					const int sfxfrom = S_AddSound(os.getToken().c_str(), NULL);
+					const size_t sfxfrom = S_AddSound(os.getToken().c_str(), NULL);
 					os.mustScan();
 					S_sfx[sfxfrom].link = FindSoundTentative(os.getToken().c_str());
 				}
 				else if (os.compareTokenNoCase("random"))
 				{
-					std::vector<int> list;
+					std::vector<size_t> list;
 
 					os.mustScan();
-					const int owner = S_AddSound(os.getToken().c_str(), NULL);
+					const size_t owner = S_AddSound(os.getToken().c_str(), NULL);
 
 					os.mustScan();
 					os.assertTokenIs("{");
 					while (os.scan() && !os.compareToken("}"))
 					{
-						const int sfxto = FindSoundTentative(os.getToken().c_str());
+						const size_t sfxto = FindSoundTentative(os.getToken().c_str());
 
 						if (owner == sfxto)
 						{
diff --git a/common/g_level.cpp b/common/g_level.cpp
@@ -116,8 +116,7 @@ void LevelInfos::clearSnapshots()
 // Add a new levelinfo and return it by reference
 level_pwad_info_t& LevelInfos::create()
 {
-	m_infos.emplace_back();
-	return m_infos.back();
+	return m_infos.emplace_back();
 }
 
 // Find a levelinfo by mapname
@@ -239,8 +238,7 @@ void ClusterInfos::clear()
 // Add a new levelinfo and return it by reference
 cluster_info_t& ClusterInfos::create()
 {
-	m_infos.emplace_back();
-	return m_infos.back();
+	return m_infos.emplace_back();
 }
 
 // Find a clusterinfo by mapname
diff --git a/common/g_mapinfo.cpp b/common/g_mapinfo.cpp
@@ -877,16 +877,14 @@ void MIType_Map07Special(OScanner& os, bool newStyleMapInfo, void* data, unsigne
 	    *static_cast<std::vector<bossaction_t>*>(data);
 
 	// mancubus
-	bossactionvector.emplace_back();
-	bossaction_t& mancaction = bossactionvector.back();
+	bossaction_t& mancaction = bossactionvector.emplace_back();
 
 	mancaction.type = MT_FATSO;
 	mancaction.special = 23;
 	mancaction.tag = 666;
 
 	// arachnotron
-	bossactionvector.emplace_back();
-	bossaction_t& arachnoaction = bossactionvector.back();
+	bossaction_t& arachnoaction = bossactionvector.emplace_back();
 
 	arachnoaction.type = MT_BABY;
 	arachnoaction.special = 30;
@@ -956,8 +954,7 @@ void MIType_SpecialAction_ExitLevel(OScanner& os, bool newStyleMapInfo, void* da
 		}
 	}
 
-	bossactionvector.emplace_back();
-	bossaction_t& action = bossactionvector.back();
+	bossaction_t& action = bossactionvector.emplace_back();
 	action.special = 11;
 	action.tag = 0;
 }
@@ -978,8 +975,7 @@ void MIType_SpecialAction_OpenDoor(OScanner& os, bool newStyleMapInfo, void* dat
 		}
 	}
 
-	bossactionvector.emplace_back();
-	bossaction_t& action = bossactionvector.back();
+	bossaction_t& action = bossactionvector.emplace_back();
 	action.special = 29;
 	action.tag = 666;
 }
@@ -1000,8 +996,7 @@ void MIType_SpecialAction_LowerFloor(OScanner& os, bool newStyleMapInfo, void* d
 		}
 	}
 
-	bossactionvector.emplace_back();
-	bossaction_t& action = bossactionvector.back();
+	bossaction_t& action = bossactionvector.emplace_back();
 	action.special = 23;
 	action.tag = 666;
 }
diff --git a/common/p_spec.cpp b/common/p_spec.cpp
@@ -264,8 +264,7 @@ void P_AddMovingCeiling(sector_t *sector)
 	}
 	else
 	{
-		movingsectors.emplace_back();
-		movesec = &(movingsectors.back());
+		movesec = &(movingsectors.emplace_back());
 	}
 
 	movesec->sector = sector;
@@ -299,8 +298,7 @@ void P_AddMovingFloor(sector_t *sector)
 	}
 	else
 	{
-		movingsectors.emplace_back();
-		movesec = &(movingsectors.back());
+		movesec = &(movingsectors.emplace_back());
 	}
 
 	movesec->sector = sector;
diff --git a/common/p_unlag.cpp b/common/p_unlag.cpp
@@ -373,7 +373,7 @@ void Unlag::registerPlayer(byte player_id)
 	if (!validplayer(idplayer(player_id)))
 		return;
 
-	player_history.push_back(PlayerHistoryRecord());
+	player_history.emplace_back();
 	player_history.back().player_id = player_id;
 	player_history.back().history_size = 0;
 	player_history.back().changed_flags = false;
diff --git a/common/s_sound.h b/common/s_sound.h
@@ -45,7 +45,7 @@ struct sfxinfo_struct
 	unsigned looping;           // Looping sample handle
 	void* data;
 
-	int link;
+	size_t link;
 	enum { NO_LINK = 0xffffffff };
 
 	int lumpnum;              // lump number of sfx
@@ -60,7 +60,7 @@ struct sfxinfo_struct
 inline std::vector<sfxinfo_t> S_sfx;
 
 // map of every sound id for sounds that have randomized variants
-inline std::map<int, std::vector<int>> S_rnd;
+inline std::map<size_t, std::vector<size_t>> S_rnd;
 
 // Initializes sound stuff, including volume
 // Sets channels, SFX and music volume,
@@ -166,9 +166,9 @@ void S_ParseSndInfo();
 void S_HashSounds();
 int S_FindSound(const char* logicalname);
 int S_FindSoundByLump(int lump);
-int S_AddSound(const char* logicalname, const char* lumpname); // Add sound by lumpname
-int S_AddSoundLump(char* logicalname, int lump);         // Add sound by lump index
-void S_AddRandomSound(int owner, std::vector<int>& list);
+size_t S_AddSound(const char* logicalname, const char* lumpname); // Add sound by lumpname
+size_t S_AddSoundLump(char* logicalname, int lump);         // Add sound by lump index
+void S_AddRandomSound(size_t owner, std::vector<size_t>& list);
 void S_ClearSoundLumps();
 
 void UV_SoundAvoidPlayer(AActor* mo, byte channel, const char* name, byte attenuation);
diff --git a/server/src/s_sound.cpp b/server/src/s_sound.cpp
@@ -264,10 +264,9 @@ int S_FindSoundByLump(int lump)
 	return -1;
 }
 
-int S_AddSoundLump(const char *logicalname, int lump)
+size_t S_AddSoundLump(const char *logicalname, int lump)
 {
-	S_sfx.emplace_back();
-	sfxinfo_t& new_sfx = S_sfx.back();
+	sfxinfo_t& new_sfx = S_sfx.emplace_back();
 
 	// logicalname MUST be < MAX_SNDNAME chars long
 	strcpy(new_sfx.name, logicalname);
@@ -283,7 +282,7 @@ void S_ClearSoundLumps()
 	S_rnd.clear();
 }
 
-int FindSoundNoHash(const char* logicalname)
+size_t FindSoundNoHash(const char* logicalname)
 {
 	for (size_t i = 0; i < S_sfx.size(); i++)
 		if (iequals(logicalname, S_sfx[i].name))
@@ -292,24 +291,24 @@ int FindSoundNoHash(const char* logicalname)
 	return S_sfx.size();
 }
 
-int FindSoundTentative(const char* name)
+size_t FindSoundTentative(const char* name)
 {
-	int id = FindSoundNoHash(name);
-	if (id == static_cast<int>(S_sfx.size()))
+	size_t id = FindSoundNoHash(name);
+	if (id == S_sfx.size())
 	{
 		id = S_AddSoundLump(name, -1);
 	}
 	return id;
 }
 
-int S_AddSound(const char *logicalname, const char *lumpname)
+size_t S_AddSound(const char *logicalname, const char *lumpname)
 {
-	int sfxid = FindSoundNoHash(logicalname);
+	size_t sfxid = FindSoundNoHash(logicalname);
 
 	const int lump = lumpname ? W_CheckNumForName(lumpname) : -1;
 
 	// Otherwise, prepare a new one.
-	if (sfxid != static_cast<int>(S_sfx.size()))
+	if (sfxid != S_sfx.size())
 	{
 		sfxinfo_t& sfx = S_sfx[sfxid];
 
@@ -327,7 +326,7 @@ int S_AddSound(const char *logicalname, const char *lumpname)
 	return sfxid;
 }
 
-void S_AddRandomSound(int owner, std::vector<int>& list)
+void S_AddRandomSound(size_t owner, std::vector<size_t>& list)
 {
 	S_rnd[owner] = list;
 	S_sfx[owner].link = owner;
@@ -460,22 +459,22 @@ void S_ParseSndInfo()
 				else if (os.compareTokenNoCase("alias"))
 				{
 					os.mustScan();
-					const int sfxfrom = S_AddSound(os.getToken().c_str(), NULL);
+					const size_t sfxfrom = S_AddSound(os.getToken().c_str(), NULL);
 					os.mustScan();
 					S_sfx[sfxfrom].link = FindSoundTentative(os.getToken().c_str());
 				}
 				else if (os.compareTokenNoCase("random"))
 				{
-					std::vector<int> list;
+					std::vector<size_t> list;
 
 					os.mustScan();
-					const int owner = S_AddSound(os.getToken().c_str(), NULL);
+					const size_t owner = S_AddSound(os.getToken().c_str(), NULL);
 
 					os.mustScan();
 					os.assertTokenIs("{");
 					while (os.scan() && !os.compareToken("}"))
 					{
-						const int sfxto = FindSoundTentative(os.getToken().c_str());
+						const size_t sfxto = FindSoundTentative(os.getToken().c_str());
 
 						if (owner == sfxto)
 						{
diff --git a/server/src/sv_main.cpp b/server/src/sv_main.cpp
@@ -515,8 +515,7 @@ Players::iterator SV_GetFreeClient(void)
 			free_player_ids.insert(i);
 	}
 
-	players.emplace_back();
-	players.back().playerstate = PST_CONTACT;
+	players.emplace_back().playerstate = PST_CONTACT;
 
 	// generate player id
 	std::set<byte>::iterator id = free_player_ids.begin();
diff --git a/tests/unit-tests/src/t_stubs.cpp b/tests/unit-tests/src/t_stubs.cpp
diff --git a/tests/unit-tests/test/t_olumpname.cpp b/tests/unit-tests/test/t_olumpname.cpp

Original file line number	Diff line number	Diff line change
`@@ -560,16 +560,16 @@ int S_CalculateSoundPriority(const fixed_t* pt, int channel, int attenuation)`
`560`	`560`	`return priority;`
`561`	`561`	`}`
`562`	`562`
`563`		`-static int ResolveSound(int soundid)`
	`563`	`+static size_t ResolveSound(size_t soundid)`
`564`	`564`	`{`
`565`	`565`	`const sfxinfo_t& sfx = S_sfx[soundid];`
`566`	`566`
`567`	`567`	`if (sfx.israndom)`
`568`	`568`	`{`
`569`	`569`	`while (S_sfx[soundid].israndom)`
`570`	`570`	`{`
`571`		`- std::vector<int>& list = S_rnd[soundid];`
`572`		`- soundid = list[P_Random() % static_cast<int>(list.size())];`
	`571`	`+ std::vector<size_t>& list = S_rnd[soundid];`
	`572`	`+ soundid = list[P_Random() % list.size()];`
`573`	`573`	`}`
`574`	`574`	`return soundid;`
`575`	`575`	`}`
`@@ -593,15 +593,15 @@ static void S_StartSound(fixed_t* pt, fixed_t x, fixed_t y, int channel,`
`593`	`593`	`return;`
`594`	`594`
`595`	`595`	`// check for bogus sound #`
`596`		`- if (sfx_id < 1 \|\| sfx_id > static_cast<int>(S_sfx.size()) - 1)`
	`596`	`+ if (sfx_id < 0 \|\| sfx_id > static_cast<int>(S_sfx.size()) - 1)`
`597`	`597`	`{`
`598`	`598`	`DPrintf("Bad sfx #: %d\n", sfx_id);`
`599`	`599`	`return;`
`600`	`600`	`}`
`601`	`601`
`602`	`602`	`sfxinfo_t* sfxinfo = &S_sfx[sfx_id];`
`603`	`603`
`604`		`- while (sfxinfo->link != static_cast<int>(sfxinfo_t::NO_LINK))`
	`604`	`+ while (sfxinfo->link != static_cast<size_t>(sfxinfo_t::NO_LINK))`
`605`	`605`	`{`
`606`	`606`	`sfx_id = ResolveSound(sfxinfo->link);`
`607`	`607`	`sfxinfo = &S_sfx[sfx_id];`
`@@ -610,7 +610,7 @@ static void S_StartSound(fixed_t* pt, fixed_t x, fixed_t y, int channel,`
`610`	`610`	`if (!sfxinfo->data)`
`611`	`611`	`{`
`612`	`612`	`I_LoadSound(sfxinfo);`
`613`		`- while (sfxinfo->link != static_cast<int>(sfxinfo_t::NO_LINK))`
	`613`	`+ while (sfxinfo->link != static_cast<size_t>(sfxinfo_t::NO_LINK))`
`614`	`614`	`{`
`615`	`615`	`sfx_id = ResolveSound(sfxinfo->link);`
`616`	`616`	`sfxinfo = &S_sfx[sfx_id];`
`@@ -1202,7 +1202,7 @@ int S_FindSoundByLump(int lump)`
`1202`	`1202`	`return -1;`
`1203`	`1203`	`}`
`1204`	`1204`
`1205`		`-int S_AddSoundLump(const char *logicalname, int lump)`
	`1205`	`+size_t S_AddSoundLump(const char *logicalname, int lump)`
`1206`	`1206`	`{`
`1207`	`1207`	`sfxinfo_t& new_sfx = S_sfx.emplace_back();`
`1208`	`1208`
`@@ -1220,7 +1220,7 @@ void S_ClearSoundLumps()`
`1220`	`1220`	`S_rnd.clear();`
`1221`	`1221`	`}`
`1222`	`1222`
`1223`		`-int FindSoundNoHash(const char* logicalname)`
	`1223`	`+size_t FindSoundNoHash(const char* logicalname)`
`1224`	`1224`	`{`
`1225`	`1225`	`for (size_t i = 0; i < S_sfx.size(); i++)`
`1226`	`1226`	`if (iequals(logicalname, S_sfx[i].name))`
`@@ -1229,24 +1229,24 @@ int FindSoundNoHash(const char* logicalname)`
`1229`	`1229`	`return S_sfx.size();`
`1230`	`1230`	`}`
`1231`	`1231`
`1232`		`-int FindSoundTentative(const char* name)`
	`1232`	`+size_t FindSoundTentative(const char* name)`
`1233`	`1233`	`{`
`1234`		`- int id = FindSoundNoHash(name);`
`1235`		`- if (id == static_cast<int>(S_sfx.size()))`
	`1234`	`+ size_t id = FindSoundNoHash(name);`
	`1235`	`+ if (id == S_sfx.size())`
`1236`	`1236`	`{`
`1237`	`1237`	`id = S_AddSoundLump(name, -1);`
`1238`	`1238`	`}`
`1239`	`1239`	`return id;`
`1240`	`1240`	`}`
`1241`	`1241`
`1242`		`-int S_AddSound(const char logicalname, const char lumpname)`
	`1242`	`+size_t S_AddSound(const char logicalname, const char lumpname)`
`1243`	`1243`	`{`
`1244`		`- int sfxid = FindSoundNoHash(logicalname);`
	`1244`	`+ size_t sfxid = FindSoundNoHash(logicalname);`
`1245`	`1245`
`1246`	`1246`	`const int lump = lumpname ? W_CheckNumForName(lumpname) : -1;`
`1247`	`1247`
`1248`	`1248`	`// Otherwise, prepare a new one.`
`1249`		`- if (sfxid != static_cast<int>(S_sfx.size()))`
	`1249`	`+ if (sfxid != S_sfx.size())`
`1250`	`1250`	`{`
`1251`	`1251`	`sfxinfo_t& sfx = S_sfx[sfxid];`
`1252`	`1252`
`@@ -1264,7 +1264,7 @@ int S_AddSound(const char logicalname, const char lumpname)`
`1264`	`1264`	`return sfxid;`
`1265`	`1265`	`}`
`1266`	`1266`
`1267`		`-void S_AddRandomSound(int owner, std::vector<int>& list)`
	`1267`	`+void S_AddRandomSound(size_t owner, std::vector<size_t>& list)`
`1268`	`1268`	`{`
`1269`	`1269`	`S_rnd[owner] = list;`
`1270`	`1270`	`S_sfx[owner].link = owner;`
`@@ -1395,22 +1395,22 @@ void S_ParseSndInfo()`
`1395`	`1395`	`else if (os.compareTokenNoCase("alias"))`
`1396`	`1396`	`{`
`1397`	`1397`	`os.mustScan();`
`1398`		`- const int sfxfrom = S_AddSound(os.getToken().c_str(), NULL);`
	`1398`	`+ const size_t sfxfrom = S_AddSound(os.getToken().c_str(), NULL);`
`1399`	`1399`	`os.mustScan();`
`1400`	`1400`	`S_sfx[sfxfrom].link = FindSoundTentative(os.getToken().c_str());`
`1401`	`1401`	`}`
`1402`	`1402`	`else if (os.compareTokenNoCase("random"))`
`1403`	`1403`	`{`
`1404`		`- std::vector<int> list;`
	`1404`	`+ std::vector<size_t> list;`
`1405`	`1405`
`1406`	`1406`	`os.mustScan();`
`1407`		`- const int owner = S_AddSound(os.getToken().c_str(), NULL);`
	`1407`	`+ const size_t owner = S_AddSound(os.getToken().c_str(), NULL);`
`1408`	`1408`
`1409`	`1409`	`os.mustScan();`
`1410`	`1410`	`os.assertTokenIs("{");`
`1411`	`1411`	`while (os.scan() && !os.compareToken("}"))`
`1412`	`1412`	`{`
`1413`		`- const int sfxto = FindSoundTentative(os.getToken().c_str());`
	`1413`	`+ const size_t sfxto = FindSoundTentative(os.getToken().c_str());`
`1414`	`1414`
`1415`	`1415`	`if (owner == sfxto)`
`1416`	`1416`	`{`
Original file line number	Diff line number	Diff line change
`@@ -116,8 +116,7 @@ void LevelInfos::clearSnapshots()`
`116`	`116`	`// Add a new levelinfo and return it by reference`
`117`	`117`	`level_pwad_info_t& LevelInfos::create()`
`118`	`118`	`{`
`119`		`- m_infos.emplace_back();`
`120`		`- return m_infos.back();`
	`119`	`+ return m_infos.emplace_back();`
`121`	`120`	`}`
`122`	`121`
`123`	`122`	`// Find a levelinfo by mapname`
`@@ -239,8 +238,7 @@ void ClusterInfos::clear()`
`239`	`238`	`// Add a new levelinfo and return it by reference`
`240`	`239`	`cluster_info_t& ClusterInfos::create()`
`241`	`240`	`{`
`242`		`- m_infos.emplace_back();`
`243`		`- return m_infos.back();`
	`241`	`+ return m_infos.emplace_back();`
`244`	`242`	`}`
`245`	`243`
`246`	`244`	`// Find a clusterinfo by mapname`
Original file line number	Diff line number	Diff line change
`@@ -877,16 +877,14 @@ void MIType_Map07Special(OScanner& os, bool newStyleMapInfo, void* data, unsigne`
`877`	`877`	`static_cast<std::vector<bossaction_t>>(data);`
`878`	`878`
`879`	`879`	`// mancubus`
`880`		`- bossactionvector.emplace_back();`
`881`		`- bossaction_t& mancaction = bossactionvector.back();`
	`880`	`+ bossaction_t& mancaction = bossactionvector.emplace_back();`
`882`	`881`
`883`	`882`	`mancaction.type = MT_FATSO;`
`884`	`883`	`mancaction.special = 23;`
`885`	`884`	`mancaction.tag = 666;`
`886`	`885`
`887`	`886`	`// arachnotron`
`888`		`- bossactionvector.emplace_back();`
`889`		`- bossaction_t& arachnoaction = bossactionvector.back();`
	`887`	`+ bossaction_t& arachnoaction = bossactionvector.emplace_back();`
`890`	`888`
`891`	`889`	`arachnoaction.type = MT_BABY;`
`892`	`890`	`arachnoaction.special = 30;`
`@@ -956,8 +954,7 @@ void MIType_SpecialAction_ExitLevel(OScanner& os, bool newStyleMapInfo, void* da`
`956`	`954`	`}`
`957`	`955`	`}`
`958`	`956`
`959`		`- bossactionvector.emplace_back();`
`960`		`- bossaction_t& action = bossactionvector.back();`
	`957`	`+ bossaction_t& action = bossactionvector.emplace_back();`
`961`	`958`	`action.special = 11;`
`962`	`959`	`action.tag = 0;`
`963`	`960`	`}`
`@@ -978,8 +975,7 @@ void MIType_SpecialAction_OpenDoor(OScanner& os, bool newStyleMapInfo, void* dat`
`978`	`975`	`}`
`979`	`976`	`}`
`980`	`977`
`981`		`- bossactionvector.emplace_back();`
`982`		`- bossaction_t& action = bossactionvector.back();`
	`978`	`+ bossaction_t& action = bossactionvector.emplace_back();`
`983`	`979`	`action.special = 29;`
`984`	`980`	`action.tag = 666;`
`985`	`981`	`}`
`@@ -1000,8 +996,7 @@ void MIType_SpecialAction_LowerFloor(OScanner& os, bool newStyleMapInfo, void* d`
`1000`	`996`	`}`
`1001`	`997`	`}`
`1002`	`998`
`1003`		`- bossactionvector.emplace_back();`
`1004`		`- bossaction_t& action = bossactionvector.back();`
	`999`	`+ bossaction_t& action = bossactionvector.emplace_back();`
`1005`	`1000`	`action.special = 23;`
`1006`	`1001`	`action.tag = 666;`
`1007`	`1002`	`}`
Original file line number	Diff line number	Diff line change
`@@ -264,8 +264,7 @@ void P_AddMovingCeiling(sector_t *sector)`
`264`	`264`	`}`
`265`	`265`	`else`
`266`	`266`	`{`
`267`		`- movingsectors.emplace_back();`
`268`		`- movesec = &(movingsectors.back());`
	`267`	`+ movesec = &(movingsectors.emplace_back());`
`269`	`268`	`}`
`270`	`269`
`271`	`270`	`movesec->sector = sector;`
`@@ -299,8 +298,7 @@ void P_AddMovingFloor(sector_t *sector)`
`299`	`298`	`}`
`300`	`299`	`else`
`301`	`300`	`{`
`302`		`- movingsectors.emplace_back();`
`303`		`- movesec = &(movingsectors.back());`
	`301`	`+ movesec = &(movingsectors.emplace_back());`
`304`	`302`	`}`
`305`	`303`
`306`	`304`	`movesec->sector = sector;`
Original file line number	Diff line number	Diff line change
`@@ -264,10 +264,9 @@ int S_FindSoundByLump(int lump)`
`264`	`264`	`return -1;`
`265`	`265`	`}`
`266`	`266`
`267`		`-int S_AddSoundLump(const char *logicalname, int lump)`
	`267`	`+size_t S_AddSoundLump(const char *logicalname, int lump)`
`268`	`268`	`{`
`269`		`- S_sfx.emplace_back();`
`270`		`- sfxinfo_t& new_sfx = S_sfx.back();`
	`269`	`+ sfxinfo_t& new_sfx = S_sfx.emplace_back();`
`271`	`270`
`272`	`271`	`// logicalname MUST be < MAX_SNDNAME chars long`
`273`	`272`	`strcpy(new_sfx.name, logicalname);`
`@@ -283,7 +282,7 @@ void S_ClearSoundLumps()`
`283`	`282`	`S_rnd.clear();`
`284`	`283`	`}`
`285`	`284`
`286`		`-int FindSoundNoHash(const char* logicalname)`
	`285`	`+size_t FindSoundNoHash(const char* logicalname)`
`287`	`286`	`{`
`288`	`287`	`for (size_t i = 0; i < S_sfx.size(); i++)`
`289`	`288`	`if (iequals(logicalname, S_sfx[i].name))`
`@@ -292,24 +291,24 @@ int FindSoundNoHash(const char* logicalname)`
`292`	`291`	`return S_sfx.size();`
`293`	`292`	`}`
`294`	`293`
`295`		`-int FindSoundTentative(const char* name)`
	`294`	`+size_t FindSoundTentative(const char* name)`
`296`	`295`	`{`
`297`		`- int id = FindSoundNoHash(name);`
`298`		`- if (id == static_cast<int>(S_sfx.size()))`
	`296`	`+ size_t id = FindSoundNoHash(name);`
	`297`	`+ if (id == S_sfx.size())`
`299`	`298`	`{`
`300`	`299`	`id = S_AddSoundLump(name, -1);`
`301`	`300`	`}`
`302`	`301`	`return id;`
`303`	`302`	`}`
`304`	`303`
`305`		`-int S_AddSound(const char logicalname, const char lumpname)`
	`304`	`+size_t S_AddSound(const char logicalname, const char lumpname)`
`306`	`305`	`{`
`307`		`- int sfxid = FindSoundNoHash(logicalname);`
	`306`	`+ size_t sfxid = FindSoundNoHash(logicalname);`
`308`	`307`
`309`	`308`	`const int lump = lumpname ? W_CheckNumForName(lumpname) : -1;`
`310`	`309`
`311`	`310`	`// Otherwise, prepare a new one.`
`312`		`- if (sfxid != static_cast<int>(S_sfx.size()))`
	`311`	`+ if (sfxid != S_sfx.size())`
`313`	`312`	`{`
`314`	`313`	`sfxinfo_t& sfx = S_sfx[sfxid];`
`315`	`314`
`@@ -327,7 +326,7 @@ int S_AddSound(const char logicalname, const char lumpname)`
`327`	`326`	`return sfxid;`
`328`	`327`	`}`
`329`	`328`
`330`		`-void S_AddRandomSound(int owner, std::vector<int>& list)`
	`329`	`+void S_AddRandomSound(size_t owner, std::vector<size_t>& list)`
`331`	`330`	`{`
`332`	`331`	`S_rnd[owner] = list;`
`333`	`332`	`S_sfx[owner].link = owner;`
`@@ -460,22 +459,22 @@ void S_ParseSndInfo()`
`460`	`459`	`else if (os.compareTokenNoCase("alias"))`
`461`	`460`	`{`
`462`	`461`	`os.mustScan();`
`463`		`- const int sfxfrom = S_AddSound(os.getToken().c_str(), NULL);`
	`462`	`+ const size_t sfxfrom = S_AddSound(os.getToken().c_str(), NULL);`
`464`	`463`	`os.mustScan();`
`465`	`464`	`S_sfx[sfxfrom].link = FindSoundTentative(os.getToken().c_str());`
`466`	`465`	`}`
`467`	`466`	`else if (os.compareTokenNoCase("random"))`
`468`	`467`	`{`
`469`		`- std::vector<int> list;`
	`468`	`+ std::vector<size_t> list;`
`470`	`469`
`471`	`470`	`os.mustScan();`
`472`		`- const int owner = S_AddSound(os.getToken().c_str(), NULL);`
	`471`	`+ const size_t owner = S_AddSound(os.getToken().c_str(), NULL);`
`473`	`472`
`474`	`473`	`os.mustScan();`
`475`	`474`	`os.assertTokenIs("{");`
`476`	`475`	`while (os.scan() && !os.compareToken("}"))`
`477`	`476`	`{`
`478`		`- const int sfxto = FindSoundTentative(os.getToken().c_str());`
	`477`	`+ const size_t sfxto = FindSoundTentative(os.getToken().c_str());`
`479`	`478`
`480`	`479`	`if (owner == sfxto)`
`481`	`480`	`{`
Original file line number	Diff line number	Diff line change
`@@ -515,8 +515,7 @@ Players::iterator SV_GetFreeClient(void)`
`515`	`515`	`free_player_ids.insert(i);`
`516`	`516`	`}`
`517`	`517`
`518`		`- players.emplace_back();`
`519`		`- players.back().playerstate = PST_CONTACT;`
	`518`	`+ players.emplace_back().playerstate = PST_CONTACT;`
`520`	`519`
`521`	`520`	`// generate player id`
`522`	`521`	`std::set<byte>::iterator id = free_player_ids.begin();`