From 6ad96d5e693022f32606876911ed3f1003e65486 Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Fri, 16 Jul 2021 18:12:56 -0700
Subject: [PATCH] Removed luigi sound config

---
 src/game/characters.c | 2 +-
 src/pc/configfile.c   | 2 --
 src/pc/configfile.h   | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/game/characters.c b/src/game/characters.c
index db9d60e8c..420e0065b 100644
--- a/src/game/characters.c
+++ b/src/game/characters.c
@@ -115,5 +115,5 @@ struct Character gCharacters[CT_MAX] = {
 
 struct Character* get_character_sound(struct MarioState* m) {
     if (m == NULL || m->character == NULL) { return &gCharacters[CT_MARIO]; }
-    return configLuigiSounds ? m->character : &gCharacters[CT_MARIO];
+    return m->character;
 }
\ No newline at end of file
diff --git a/src/pc/configfile.c b/src/pc/configfile.c
index a6428abb6..1b948d017 100644
--- a/src/pc/configfile.c
+++ b/src/pc/configfile.c
@@ -106,7 +106,6 @@ unsigned int configPlayerInteraction         = 1;
 unsigned int configPlayerKnockbackStrength   = 25;
 bool         configStayInLevelAfterStar      = 0;
 unsigned int configNetworkSystem             = 0;
-bool         configLuigiSounds               = true;
 
 static const struct ConfigOption options[] = {
     {.name = "fullscreen",           .type = CONFIG_TYPE_BOOL, .boolValue = &configWindow.fullscreen},
@@ -166,7 +165,6 @@ static const struct ConfigOption options[] = {
     {.name = "coop_player_knockback_strength", .type = CONFIG_TYPE_UINT  , .uintValue   = &configPlayerKnockbackStrength},
     {.name = "coop_stay_in_level_after_star",  .type = CONFIG_TYPE_UINT  , .boolValue   = &configStayInLevelAfterStar},
     {.name = "coop_network_system",            .type = CONFIG_TYPE_UINT  , .uintValue   = &configNetworkSystem},
-    {.name = "coop_luigi_sounds",              .type = CONFIG_TYPE_BOOL  , .boolValue   = &configLuigiSounds},
 };
 
 // Reads an entire line from a file (excluding the newline character) and returns an allocated string
diff --git a/src/pc/configfile.h b/src/pc/configfile.h
index 91fbc60a8..b71ecc7a4 100644
--- a/src/pc/configfile.h
+++ b/src/pc/configfile.h
@@ -72,7 +72,6 @@ extern unsigned int configPlayerInteraction;
 extern unsigned int configPlayerKnockbackStrength;
 extern bool         configStayInLevelAfterStar;
 extern unsigned int configNetworkSystem;
-extern bool         configLuigiSounds;
 
 void configfile_load(const char *filename);
 void configfile_save(const char *filename);