From 16cd8b8aaa18e06a6a10d9a9b6c1c04ef2bf19d6 Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Mon, 28 Jul 2014 06:44:14 +0000
Subject: [PATCH] Progress towards KenBuild Editor, part 2.

DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4560 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/build/include/m32script.h    |  5 +-
 polymer/eduke32/source/astub.c               | 48 ++++++++------------
 polymer/eduke32/source/common_game.h         | 11 +++++
 polymer/eduke32/source/game.h                | 11 -----
 polymer/eduke32/source/m32exec.c             |  9 +---
 polymer/eduke32/source/testgame/src/bstub.c  | 11 +++++
 polymer/eduke32/source/testgame/src/common.c |  4 ++
 7 files changed, 47 insertions(+), 52 deletions(-)

diff --git a/polymer/eduke32/build/include/m32script.h b/polymer/eduke32/build/include/m32script.h
index 831929b74..a19ac1645 100644
--- a/polymer/eduke32/build/include/m32script.h
+++ b/polymer/eduke32/build/include/m32script.h
@@ -53,10 +53,7 @@ extern int32_t __fastcall Gv_GetVarX(register int32_t id);
 extern void __fastcall Gv_SetVarX(register int32_t id, register int32_t lValue);
 extern int32_t __fastcall Gv_GetVarN(register int32_t id);  // 'N' for "no side-effects"... vars and locals only!
 
-extern void SetGAMEPalette(void);
-extern void SetWATERPalette(void);
-extern void SetSLIMEPalette(void);
-extern void SetBOSS1Palette(void);
+extern void SetGamePalette(int32_t);
 
 extern int32_t *constants, constants_allocsize;
 extern int32_t g_numSavedConstants;
diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index 22bf32c43..9c624ccc9 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -6089,15 +6089,15 @@ static void Keys3d(void)
     if (cursectnum>=0 && sector[cursectnum].lotag==2)
     {
         if (sector[cursectnum].ceilingpicnum==FLOORSLIME)
-            SetSLIMEPalette();
+            SetGamePalette(SLIMEPAL);
         else
-            SetWATERPalette();
+            SetGamePalette(WATERPAL);
     }
-    else SetGAMEPalette();
+    else SetGamePalette(BASEPAL);
 
     if (keystatus[buildkeys[BK_MODE2D_3D]])  // Enter
     {
-        SetGAMEPalette();
+        SetGamePalette(BASEPAL);
         FX_StopAllSounds();
         S_ClearSoundLocks();
 
@@ -11989,32 +11989,22 @@ void faketimerhandler(void)
     sampletimer();
 }
 
-void SetBOSS1Palette(void)
+void SetGamePalette(int32_t j)
 {
-    if (acurpalette==3) return;
-    acurpalette=3;
-    setbrightness(GAMMA_CALC,5,2);
-}
-
-void SetSLIMEPalette(void)
-{
-    if (acurpalette==2) return;
-    acurpalette=2;
-    setbrightness(GAMMA_CALC,2,2);
-}
-
-void SetWATERPalette(void)
-{
-    if (acurpalette==1) return;
-    acurpalette=1;
-    setbrightness(GAMMA_CALC,1,2);
-}
-
-void SetGAMEPalette(void)
-{
-    if (acurpalette==0) return;
-    acurpalette=0;
-    setbrightness(GAMMA_CALC,0,2);
+    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;
+    }
 }
 
 static void SearchSectors(int32_t dir)  // <0: backwards, >=0: forwards
diff --git a/polymer/eduke32/source/common_game.h b/polymer/eduke32/source/common_game.h
index 2bd5ab3b6..7c6b50627 100644
--- a/polymer/eduke32/source/common_game.h
+++ b/polymer/eduke32/source/common_game.h
@@ -43,6 +43,17 @@ enum instpath_t {
     NUMINSTPATHS
 };
 
+typedef enum basepal_ {
+    BASEPAL = 0,
+    WATERPAL,
+    SLIMEPAL,
+    DREALMSPAL,
+    TITLEPAL,
+    ENDINGPAL,  // 5
+    ANIMPAL,
+    BASEPALCOUNT
+} basepal_t;
+
 extern const char *g_gameNamePtr;
 
 extern const char *defaultgamegrp[GAMECOUNT];
diff --git a/polymer/eduke32/source/game.h b/polymer/eduke32/source/game.h
index 76e27716a..64afe2851 100644
--- a/polymer/eduke32/source/game.h
+++ b/polymer/eduke32/source/game.h
@@ -84,17 +84,6 @@ enum LogoFlags_t {
     LOGO_NODUKETEAMPIC     = 0x00100000,
 };
 
-typedef enum basepal_ {
-    BASEPAL = 0,
-    WATERPAL,
-    SLIMEPAL,
-    DREALMSPAL,
-    TITLEPAL,
-    ENDINGPAL,  // 5
-    ANIMPAL,
-    BASEPALCOUNT
-} basepal_t; 
-
 enum ScreenTextFlags_t {
     TEXT_XRIGHT          = 0x00000001,
     TEXT_XCENTER         = 0x00000002,
diff --git a/polymer/eduke32/source/m32exec.c b/polymer/eduke32/source/m32exec.c
index 30e3816c0..d15240727 100644
--- a/polymer/eduke32/source/m32exec.c
+++ b/polymer/eduke32/source/m32exec.c
@@ -2935,14 +2935,7 @@ dodefault:
 
         case CON_SETGAMEPALETTE:
             insptr++;
-            switch (Gv_GetVarX(*insptr++))
-            {
-            default:
-            case 0: SetGAMEPalette(); break;
-            case 1: SetWATERPalette(); break;
-            case 2: SetSLIMEPalette(); break;
-            case 3: SetBOSS1Palette(); break;
-            }
+            SetGamePalette(Gv_GetVarX(*insptr++));
             continue;
 
 // *** sounds
diff --git a/polymer/eduke32/source/testgame/src/bstub.c b/polymer/eduke32/source/testgame/src/bstub.c
index b116c2792..8866611dd 100644
--- a/polymer/eduke32/source/testgame/src/bstub.c
+++ b/polymer/eduke32/source/testgame/src/bstub.c
@@ -20,6 +20,17 @@
 const char* AppProperName = "KenBuild Editor";
 const char* AppTechnicalName = "testeditor";
 
+#if defined(_WIN32)
+#define DEFAULT_GAME_EXEC "testgame.exe"
+#define DEFAULT_GAME_LOCAL_EXEC "testgame.exe"
+#else
+#define DEFAULT_GAME_EXEC "eduke32"
+#define DEFAULT_GAME_LOCAL_EXEC "./eduke32"
+#endif
+
+const char* DefaultGameExec = DEFAULT_GAME_EXEC;
+const char* DefaultGameLocalExec = DEFAULT_GAME_LOCAL_EXEC;
+
 #define SETUPFILENAME "testeditor.cfg"
 const char *defaultsetupfilename = SETUPFILENAME;
 char setupfilename[BMAX_PATH] = SETUPFILENAME;
diff --git a/polymer/eduke32/source/testgame/src/common.c b/polymer/eduke32/source/testgame/src/common.c
index f455bfa4a..1f599cee4 100644
--- a/polymer/eduke32/source/testgame/src/common.c
+++ b/polymer/eduke32/source/testgame/src/common.c
@@ -9,6 +9,10 @@ const char *G_DefaultDefFile(void)
 {
     return "kenbuild.def";
 }
+const char *G_DefFile(void)
+{
+    return "kenbuild.def";
+}
 
 uint8_t *basepaltable[1] = {
     palette