diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index 3e6e0a2b2..801a7cfc8 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -10857,22 +10857,12 @@ void faketimerhandler(void)
     sampletimer();
 }
 
-void SetGamePalette(int32_t j)
+void SetGamePalette(int32_t palid)
 {
-    switch (j)
-    {
-    default:
-        j=0;
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-        if (acurpalette==j)
-            return;
-        acurpalette=j;
-        setbrightness(GAMMA_CALC,j,2);
-        break;
-    }
+    if ((unsigned)palid >= MAXBASEPALS)
+        palid = 0;
+
+    setbrightness(GAMMA_CALC, palid, 2);
 }
 
 static void SearchSectors(int32_t dir)  // <0: backwards, >=0: forwards
diff --git a/polymer/eduke32/source/mapster32.h b/polymer/eduke32/source/mapster32.h
index 4c51148cd..915f5c39f 100644
--- a/polymer/eduke32/source/mapster32.h
+++ b/polymer/eduke32/source/mapster32.h
@@ -75,8 +75,6 @@ static int32_t updownunits=1024;
 
 //int32_t intro=0;
 
-static int32_t acurpalette=0;
-
 //void ContextHelp(int16_t spritenum);
 //void ResetKeys();