Remove skill_t

kraflab · Jul 22, 2023 · 186eb04 · 186eb04
1 parent 4dac81b
commit 186eb04
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/prboom2/src/doomdef.h b/prboom2/src/doomdef.h
@@ -190,15 +190,6 @@ typedef enum {
 #define MTF_SKILL4  0x00080000
 #define MTF_SKILL5  0x00100000
 
-typedef enum {
-  sk_none=-1, //jff 3/24/98 create unpicked skill setting
-  sk_baby=0,
-  sk_easy,
-  sk_medium,
-  sk_hard,
-  sk_nightmare
-} skill_t;
-
 //
 // Key cards.
 //

diff --git a/prboom2/src/dsda/analysis.c b/prboom2/src/dsda/analysis.c
@@ -115,6 +115,9 @@ void dsda_WriteAnalysis(void) {
   return;
 }
 
+#define SKILL4 3
+#define SKILL5 4
+
 const char* dsda_DetectCategory(void) {
   dboolean satisfies_max;
   dboolean satisfies_respawn;
@@ -153,7 +156,7 @@ const char* dsda_DetectCategory(void) {
   if (solo_net) return "Other";
   if (dsda_reborn) return "Other";
 
-  if (gameskill == sk_hard) {
+  if (gameskill == SKILL4) {
     if (dsda_nomo && !dsda_respawn && !dsda_fast) {
       if (satisfies_100s) return "NoMo 100S";
 
@@ -181,7 +184,7 @@ const char* dsda_DetectCategory(void) {
 
     return "UV Speed";
   }
-  else if (gameskill == sk_nightmare) {
+  else if (gameskill == SKILL5) {
     if (nomonsters) return "Other";
     if (satisfies_100s) return "NM 100S";