Replaced some more raw values with enums

src/common/GameModeSettings.cpp

@@ -1,23 +1,23 @@
 #include "GameModeSettings.h"
 
 ClassicGameModeSettings::ClassicGameModeSettings()
-    : style(0)          	//Respawn on death
+    : style(DeathStyle::Respawn)  //Respawn on death
     , scoring(0)        	//All kills will score
 {}
 
 FragGameModeSettings::FragGameModeSettings()
-    : style(0)          	//Respawn on death
+    : style(DeathStyle::Respawn)  //Respawn on death
     , scoring(0)        	//All kills will score
 {}
 
 TimeGameModeSettings::TimeGameModeSettings()
-    : style(0)              //Respawn on death
+    : style(DeathStyle::Respawn)  //Respawn on death
     , scoring(0)            //All kills will score
     , percentextratime(10)  //10% chance of a heart spawning
 {}
 
 JailGameModeSettings::JailGameModeSettings()
-    : style(1)              //defaults to color jail play
+    : style(JailStyle::Owned)  //defaults to color jail play
     , tagfree(true)         //players on same team can free player by touching
     , timetofree(1240)      //20 seconds of jail
     , percentkey(30)        //30% chance of a key spawning
@@ -74,7 +74,7 @@ TagGameModeSettings::TagGameModeSettings()
 
 StarGameModeSettings::StarGameModeSettings()
     : time(30)              //default to 30 seconds
-    , shine(0)              //default to hot potato (ztar)
+    , shine(StarStyle::Ztar)  //default to hot potato (ztar)
     , percentextratime(10)  //10 percent chance of an extra time poweurp spawning
 {}
 

src/common/GameModeSettings.h

@@ -1,33 +1,34 @@
 #ifndef GAMEMODESETTINGS_H
 #define GAMEMODESETTINGS_H
 
+#include "GameplayStyles.h"
 #include "GlobalConstants.h"
 #include "MatchTypes.h"
 
 struct ClassicGameModeSettings {
-    short style;			//on kill, either respawn the player or shield them and let them keep playing
+    DeathStyle style;		//on kill, either respawn the player or shield them and let them keep playing
     short scoring;			//When to credit a score, all kills or push kills only (sumo mode)
 
     ClassicGameModeSettings();
 };
 
 struct FragGameModeSettings {
-    short style;			//on kill, either respawn the player or shield them and let them keep playing
+    DeathStyle style;		//on kill, either respawn the player or shield them and let them keep playing
     short scoring;			//When to credit a score, all kills or push kills only (sumo mode)
 
     FragGameModeSettings();
 };
 
 struct TimeGameModeSettings {
-    short style;			//on kill, either respawn the player or shield them and let them keep playing
+    DeathStyle style;		//on kill, either respawn the player or shield them and let them keep playing
     short scoring;			//When to credit a score, all kills or push kills only (sumo mode)
     short percentextratime; //percent chance a stopwatch with extra game time will spawn
 
     TimeGameModeSettings();
 };
 
 struct JailGameModeSettings {
-    short style;			//Style of play: classic, owned, free for all
+    JailStyle style;		//Style of play: classic, owned, free for all
     bool tagfree;			//Free jailed player by tagging on same team
     short timetofree;		//Time it takes for a jailed player to be freed
     short percentkey;		//percent chance a jail key will spawn
@@ -84,7 +85,7 @@ struct TagGameModeSettings {
 
 struct StarGameModeSettings {
     short time;				//Time to get rid or keep star
-    short shine;			//If we are playing shine mode vs. ztar vs. stars mode
+    StarStyle shine;		//If we are playing shine mode vs. ztar vs. stars mode
     short percentextratime; //percent chance a stopwatch with extra game time will spawn
 
     StarGameModeSettings();

src/common/GameplayStyles.h

@@ -18,3 +18,24 @@ enum class TournamentControlStyle : unsigned char {
     RandomLoser,
     RoundRobin,
 };
+
+
+enum class DeathStyle : unsigned char {
+    Respawn,
+    Shield,
+};
+
+
+enum class JailStyle : unsigned char {
+    Classic,
+    Owned,
+    FreeForAll,
+};
+
+
+enum class StarStyle : unsigned char {
+    Ztar,
+    Shine,
+    Multi,
+    Random,
+};

src/common/ui/MI_SelectField.cpp

@@ -381,3 +381,6 @@ template class MI_SelectField<SpawnStyle>;
 #include "GameplayStyles.h"
 template class MI_SelectField<TeamCollisionStyle>;
 template class MI_SelectField<TournamentControlStyle>;
+template class MI_SelectField<DeathStyle>;
+template class MI_SelectField<JailStyle>;
+template class MI_SelectField<StarStyle>;

src/smw/gamemodes/Classic.cpp

@@ -68,7 +68,7 @@ PlayerKillType CGM_Classic::playerkilledplayer(CPlayer &inflictor, CPlayer &othe
         }
     }
 
-    if (game_values.gamemode->gamemode == game_mode_classic && game_values.gamemodesettings.classic.style == 1) {
+    if (game_values.gamemode->gamemode == game_mode_classic && game_values.gamemodesettings.classic.style == DeathStyle::Shield) {
         ifSoundOnPlay(rm->sfx_powerdown);
         other.Shield().reset();
         return PlayerKillType::NonKill;
@@ -116,7 +116,7 @@ PlayerKillType CGM_Classic::playerkilledself(CPlayer &player, KillStyle style)
             }
         }
 
-        if (game_values.gamemode->gamemode == game_mode_classic && game_values.gamemodesettings.classic.style == 1) {
+        if (game_values.gamemode->gamemode == game_mode_classic && game_values.gamemodesettings.classic.style == DeathStyle::Shield) {
             ifSoundOnPlay(rm->sfx_powerdown);
             player.Shield().reset();
             return PlayerKillType::NonKill;

src/smw/gamemodes/Frag.cpp

@@ -34,7 +34,7 @@ PlayerKillType CGM_Frag::playerkilledplayer(CPlayer &inflictor, CPlayer &other,
 
     PlayerKillType iRet = CheckWinner(&inflictor);
 
-    if (game_values.gamemode->gamemode == game_mode_frag && game_values.gamemodesettings.frag.style == 1) {
+    if (game_values.gamemode->gamemode == game_mode_frag && game_values.gamemodesettings.frag.style == DeathStyle::Shield) {
         ifSoundOnPlay(rm->sfx_powerdown);
         other.Shield().reset();
         return PlayerKillType::NonKill;
@@ -50,7 +50,7 @@ PlayerKillType CGM_Frag::playerkilledself(CPlayer &player, KillStyle style)
     if (!gameover) {
         player.Score().AdjustScore(-1);
 
-        if (game_values.gamemode->gamemode == game_mode_frag && game_values.gamemodesettings.frag.style == 1) {
+        if (game_values.gamemode->gamemode == game_mode_frag && game_values.gamemodesettings.frag.style == DeathStyle::Shield) {
             ifSoundOnPlay(rm->sfx_powerdown);
             player.Shield().reset();
             return PlayerKillType::NonKill;

src/smw/gamemodes/Jail.cpp

@@ -40,7 +40,7 @@ PlayerKillType CGM_Jail::playerkilledplayer(CPlayer &inflictor, CPlayer &other,
             other.Jail().lockInBy(inflictor);
 
             //Apply rules for "Classic" jail
-            if (game_values.gamemodesettings.jail.style == 0) {
+            if (game_values.gamemodesettings.jail.style == JailStyle::Classic) {
                 short jailedteams[4];
 
                 short i;
@@ -91,7 +91,7 @@ PlayerKillType CGM_Jail::playerkilledplayer(CPlayer &inflictor, CPlayer &other,
                 }
             }
             //Apply rules for "Owned" jail
-            else if (game_values.gamemodesettings.jail.style == 1) {
+            else if (game_values.gamemodesettings.jail.style == JailStyle::Owned) {
                 short jailedteams[4] = {-1, -1, -1, -1};
 
                 //Figure out which teams have been jailed

src/smw/gamemodes/Star.cpp

@@ -27,7 +27,7 @@ CGM_Star::CGM_Star() : CGM_TimeLimit()
     goal = 5;
     gamemode = game_mode_star;
     SetupModeStrings("Star", "Lives", 1);
-    iCurrentModeType = 0;
+    iCurrentModeType = StarStyle::Ztar;
 };
 
 void CGM_Star::init()
@@ -38,12 +38,9 @@ void CGM_Star::init()
 
     gameClock.Init(game_values.gamemodesettings.star.time < 1 ? 30 : game_values.gamemodesettings.star.time, true);
 
-    if (game_values.gamemodesettings.star.shine < 0 || game_values.gamemodesettings.star.shine > 3)
-        game_values.gamemodesettings.star.shine = 0;
-
     iCurrentModeType = game_values.gamemodesettings.star.shine;
-    if (iCurrentModeType == 3)
-        iCurrentModeType = RANDOM_INT(3);
+    if (iCurrentModeType == StarStyle::Random)
+        iCurrentModeType = static_cast<StarStyle>(RANDOM_INT(3));
 
     fReverseScoring = goal == -1;
 
@@ -77,7 +74,7 @@ void CGM_Star::SetupMode()
     }
 
     //If multi star, add more stars
-    if (iCurrentModeType == 2) {
+    if (iCurrentModeType == StarStyle::Multi) {
         CPlayer * players[4];
         short iNumPlayers = GetScoreRankedPlayerList(players, fReverseScoring);
 
@@ -89,9 +86,9 @@ void CGM_Star::SetupMode()
             objectcontainer[1].add(starItem[iStar]);
         }
     } else { //otherwise, add just a single star
-        starPlayer[0] = GetHighestScorePlayer(!fReverseScoring && iCurrentModeType == 0);
+        starPlayer[0] = GetHighestScorePlayer(!fReverseScoring && iCurrentModeType == StarStyle::Ztar);
 
-        starItem[0] = new CO_Star(&rm->spr_star, iCurrentModeType == 0 ? 0 : 1, 0);
+        starItem[0] = new CO_Star(&rm->spr_star, iCurrentModeType == StarStyle::Ztar ? 0 : 1, 0);
         objectcontainer[1].add(starItem[0]);
     }
 }
@@ -104,7 +101,7 @@ void CGM_Star::think()
     }
 
     //Make sure there is a star player(s)
-    if (iCurrentModeType == 2) {
+    if (iCurrentModeType == StarStyle::Multi) {
         for (short iStar1 = 0; iStar1 < list_players_cnt - 1; iStar1++) {
             //If we're missing a star player, then reassign them all
             if (!starPlayer[iStar1]) {
@@ -122,7 +119,7 @@ void CGM_Star::think()
         }
     } else {
         if (!starPlayer[0]) {
-            starPlayer[0] = GetHighestScorePlayer(!fReverseScoring && !game_values.gamemodesettings.star.shine);
+            starPlayer[0] = GetHighestScorePlayer(!fReverseScoring && game_values.gamemodesettings.star.shine == StarStyle::Ztar);
             starItem[0]->placeStar();
         }
     }
@@ -138,7 +135,7 @@ void CGM_Star::think()
         gameClock.SetTime(game_values.gamemodesettings.star.time < 1 ? 30 : game_values.gamemodesettings.star.time);
         ifSoundOnPlay(rm->sfx_thunder);
 
-        if (iCurrentModeType == 0) {
+        if (iCurrentModeType == StarStyle::Ztar) {
             if (score[starPlayer[0]->getTeamID()]->score > 1 || fReverseScoring)
                 starPlayer[0]->KillPlayerMapHazard(true, KillStyle::Environment, false);
 
@@ -155,7 +152,7 @@ void CGM_Star::think()
 
             starPlayer[0] = GetHighestScorePlayer(!fReverseScoring);
             starItem[0]->placeStar();
-        } else if (iCurrentModeType == 1) {
+        } else if (iCurrentModeType == StarStyle::Shine) {
             for (short iPlayer = 0; iPlayer < list_players_cnt; iPlayer++) {
                 if (starPlayer[0]->getTeamID() == list_players[iPlayer]->getTeamID())
                     continue;
@@ -182,7 +179,7 @@ void CGM_Star::think()
 
             starPlayer[0] = GetHighestScorePlayer(false);
             starItem[0]->placeStar();
-        } else if (iCurrentModeType == 2) {
+        } else if (iCurrentModeType == StarStyle::Multi) {
             for (short iPlayer = 0; iPlayer < list_players_cnt; iPlayer++) {
                 bool fFound = false;
                 for (short iStar = 0; iStar < list_players_cnt - 1; iStar++) {
@@ -208,14 +205,14 @@ void CGM_Star::think()
                         fDisplayTimer = !RemoveTeam(list_players[iPlayer]->getTeamID());
 
                         //Don't setup the mode if this is a random game because it will be setup below
-                        if (game_values.gamemodesettings.star.shine != 3) {
+                        if (game_values.gamemodesettings.star.shine != StarStyle::Random) {
                             SetupMode();
                             fNeedRebalance = false;
                         }
                     }
                 }
 
-                if (game_values.gamemodesettings.star.shine != 3 && fNeedRebalance) {
+                if (game_values.gamemodesettings.star.shine != StarStyle::Random && fNeedRebalance) {
                     CPlayer * players[4];
                     short iNumPlayers = GetScoreRankedPlayerList(players, fReverseScoring);
 
@@ -253,9 +250,8 @@ void CGM_Star::think()
         }
 
         //If random game, then choose a new game type
-        if (game_values.gamemodesettings.star.shine == 3 && fDisplayTimer) {
-#pragma warning ("neagix: This should be 4, possibly?")
-            iCurrentModeType = RANDOM_INT(3);
+        if (game_values.gamemodesettings.star.shine == StarStyle::Random && fDisplayTimer) {
+            iCurrentModeType = static_cast<StarStyle>(RANDOM_INT(3));
             SetupMode();
         }
     }
@@ -311,11 +307,11 @@ CPlayer * CGM_Star::swapplayer(short id, CPlayer * player)
 
     starPlayer[id] = player;
 
-    if (iCurrentModeType == 2)
+    if (iCurrentModeType == StarStyle::Multi)
         starItem[id]->setPlayerColor(starPlayer[id]->getColorID());
 
     if (starItem[id]->getType() == 1)
-        eyecandy[2].add(new EC_GravText(&rm->game_font_large, player->centerX(), player->bottomY(), iCurrentModeType == 2 ? "Star Get!" : "Shine Get!", -VELJUMP*1.5));
+        eyecandy[2].add(new EC_GravText(&rm->game_font_large, player->centerX(), player->bottomY(), iCurrentModeType == StarStyle::Multi ? "Star Get!" : "Shine Get!", -VELJUMP*1.5));
     else
         eyecandy[2].add(new EC_GravText(&rm->game_font_large, player->centerX(), player->bottomY(), "Ztarred!", -VELJUMP*1.5));
 

src/smw/gamemodes/Star.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "TimeLimit.h"
+#include "GameplayStyles.h"
 
 class CO_Star;
 
@@ -27,7 +28,7 @@ class CGM_Star : public CGM_TimeLimit
         return starPlayer[id];
     }
 
-    short getcurrentmodetype() {
+    StarStyle getcurrentmodetype() const {
         return iCurrentModeType;
     }
 
@@ -42,6 +43,6 @@ class CGM_Star : public CGM_TimeLimit
 
         CO_Star * starItem[3];
         CPlayer * starPlayer[3];
-        short iCurrentModeType;
+        StarStyle iCurrentModeType;
         bool fDisplayTimer;
 };

src/smw/gamemodes/TimeLimit.cpp

@@ -65,7 +65,7 @@ PlayerKillType CGM_TimeLimit::playerkilledplayer(CPlayer &inflictor, CPlayer &ot
                 inflictor.Score().AdjustScore(1);
         }
 
-        if (game_values.gamemode->gamemode == game_mode_timelimit && game_values.gamemodesettings.time.style == 1) {
+        if (game_values.gamemode->gamemode == game_mode_timelimit && game_values.gamemodesettings.time.style == DeathStyle::Shield) {
             ifSoundOnPlay(rm->sfx_powerdown);
             other.Shield().reset();
             return PlayerKillType::NonKill;