diff --git a/regamedll/dlls/gamerules.h b/regamedll/dlls/gamerules.h
index f29cae67..97793dbd 100644
--- a/regamedll/dlls/gamerules.h
+++ b/regamedll/dlls/gamerules.h
@@ -647,7 +647,7 @@ public:
 	VFUNC void BalanceTeams();
 	VFUNC void SwapAllPlayers();
 	VFUNC void UpdateTeamScores();
-	VFUNC void EndRoundMessage(const char *sentence, int event);
+	VFUNC void EndRoundMessage(const char *sentence, ScenarioEventEndRound event);
 	VFUNC void SetAccountRules(RewardRules rules, int amount) { m_rgRewardAccountRules[rules] = static_cast<RewardAccount>(amount); }
 	VFUNC RewardAccount GetAccountRules(RewardRules rules) const { return m_rgRewardAccountRules[rules]; }
 
@@ -890,7 +890,6 @@ void SV_CareerAddTask_f();
 void SV_CareerMatchLimit_f();
 void Broadcast(const char *sentence);
 char *GetTeam(int team);
-void EndRoundMessage(const char *sentence, int event);
 void DestroyMapCycle(mapcycle_t *cycle);
 int ReloadMapCycleFile(char *filename, mapcycle_t *cycle);
 int CountPlayers();
diff --git a/regamedll/dlls/ggrenade.cpp b/regamedll/dlls/ggrenade.cpp
index a67289c4..d6516113 100644
--- a/regamedll/dlls/ggrenade.cpp
+++ b/regamedll/dlls/ggrenade.cpp
@@ -1190,7 +1190,7 @@ CGrenade *CGrenade::__API_HOOK(ShootSatchelCharge)(entvars_t *pevOwner, VectorRe
 	TraceResult tr;
 	UTIL_TraceLine(vecStart,  vecStart + Vector(0, 0, -8192), ignore_monsters, ENT(pevOwner), &tr);
 	pGrenade->pev->oldorigin = (tr.flFraction == 1.0) ? vecStart : tr.vecEndPos;
-	
+
 	pGrenade->pev->nextthink = gpGlobals->time + 0.01f;
 #else
 	pGrenade->pev->nextthink = gpGlobals->time + 0.1f;
@@ -1283,7 +1283,7 @@ void CGrenade::C4Think()
 	{
 #ifdef REGAMEDLL_FIXES
 		pev->origin = pev->oldorigin;
-		
+
 		if (DROP_TO_FLOOR(edict()) > 0)
 		{
 			pev->velocity = g_vecZero;
diff --git a/regamedll/dlls/multiplay_gamerules.cpp b/regamedll/dlls/multiplay_gamerules.cpp
index f3605866..c1b06840 100644
--- a/regamedll/dlls/multiplay_gamerules.cpp
+++ b/regamedll/dlls/multiplay_gamerules.cpp
@@ -155,7 +155,7 @@ char *GetTeam(int team)
 	}
 }
 
-void CHalfLifeMultiplay::EndRoundMessage(const char *sentence, int event)
+void CHalfLifeMultiplay::EndRoundMessage(const char *sentence, ScenarioEventEndRound event)
 {
 	char *team = nullptr;
 	const char *message = sentence;
@@ -1978,7 +1978,7 @@ void EXT_FUNC CHalfLifeMultiplay::__API_HOOK(RestartRound)()
 	// Reset game variables
 	m_flIntermissionEndTime = 0;
 	m_flIntermissionStartTime = 0;
-	m_flRestartRoundTime = 0.0;
+	m_flRestartRoundTime = 0;
 	m_iAccountTerrorist = m_iAccountCT = 0;
 	m_iHostagesRescued = 0;
 	m_iHostagesTouched = 0;
diff --git a/regamedll/dlls/wpn_shared/wpn_c4.cpp b/regamedll/dlls/wpn_shared/wpn_c4.cpp
index b9ab8d09..e180e54c 100644
--- a/regamedll/dlls/wpn_shared/wpn_c4.cpp
+++ b/regamedll/dlls/wpn_shared/wpn_c4.cpp
@@ -106,7 +106,7 @@ void CC4::PrimaryAttack()
 
 	int inBombZone = (m_pPlayer->m_signals.GetState() & SIGNAL_BOMB) == SIGNAL_BOMB;
 	int onGround = (m_pPlayer->pev->flags & FL_ONGROUND) == FL_ONGROUND;
-	
+
 #ifdef REGAMEDLL_FIXES
 	if (!onGround)
 	{
@@ -114,8 +114,8 @@ void CC4::PrimaryAttack()
 		UTIL_TraceLine(m_pPlayer->pev->origin, m_pPlayer->pev->origin + Vector(0, 0, -8192), ignore_monsters, m_pPlayer->edict(), &tr);
 		onGround = tr.flFraction != 1.0;
 	}
-#endif	
-	
+#endif
+
 	bool bPlaceBomb = (onGround && inBombZone);
 
 	if (!m_bStartedArming)