Add "ezshoot" and disable the sound device/midi device/cd drive dropdowns in the startup window

git-svn-id: https://svn.eduke32.com/eduke32@199 1a8010ca-5511-0410-912e-c29ae57300e0

polymer/eduke32/ChangeLog

@@ -5,7 +5,10 @@
  - Core: added widescreen support for Polymost
  - Core: added support for toggling correct HUD model rendering on/off
  - Core: removed broken support for linking OpenGL statically
+ - Core: added support for DDS textures (JF)
+ - Core: added support for dynamically loading GTK (JF)
 
+ - Game: new startup window (JF)
  - Game: added support for using the mouse and a joystick simultaneously (JF)
  - Game: fixed an issue preventing skill selection, bonus screen and episode ending animation sounds from playing
  - Game: fixed a problem where the player was unable to exit some pools of water in some maps
@@ -24,7 +27,7 @@
  - CON: reworked findnearactor3d, findnearactor3dvar, findnearsprite3d, and findnearsprite3dvar
  - CON: added findnearactorz, findnearactorzvar, findnearspritez, and findnearspritezvar
  - CON: added WEAPON_FLAG_RESET (65536) to weapon system in order to properly emulate the chaingun and freezer
- - CON: fixed eshoot
+ - CON: fixed "eshoot" and added "ezshoot"
  - CON: reworked weapon system; note that your custom weapons may need adjustments to work again
 
 ==1.4.0 beta 1=

polymer/eduke32/source/gamedef.c

@@ -438,6 +438,7 @@ char *keyw[] = {
                    "findnearactorzvar",        // 292
                    "findnearspritez",          // 293
                    "findnearspritezvar",       // 294
+                   "ezshoot",                  // 295
                    "<null>"
                };
 
@@ -3475,6 +3476,7 @@ char parsecommand(void)
 
     case CON_RANDVAR:
     case CON_ZSHOOT:
+    case CON_EZSHOOT:
         if(!CheckEventSync(current_event))
             ReportError(WARNING_EVENTSYNC);
     case CON_SETVAR:
@@ -3496,7 +3498,7 @@ char parsecommand(void)
         //printf("Found [add|set]var at line= %ld\n",line_number);
 
         // get the ID of the DEF
-        if(tw != CON_ZSHOOT)
+        if(tw != CON_ZSHOOT && tw != CON_EZSHOOT)
             transvartype(GAMEVAR_FLAG_READONLY);
         else transvar();
 

polymer/eduke32/source/gamedef.h

@@ -724,5 +724,6 @@ enum keywords {
     CON_FINDNEARACTORZVAR,  // 292
     CON_FINDNEARSPRITEZ,    // 293
     CON_FINDNEARSPRITEZVAR, // 294
+    CON_EZSHOOT,            // 295
     END
 };

polymer/eduke32/source/gameexec.c

@@ -4514,23 +4514,24 @@ SKIPJIBS:
         }
 
     case CON_ESHOOT:
+    case CON_EZSHOOT:
+    case CON_ZSHOOT:
         {
             long lReturn=-1;
 
             insptr++;
-            if(g_sp->sectnum >= 0 && g_sp->sectnum < MAXSECTORS)
+            if(tw == CON_ZSHOOT || tw == CON_EZSHOOT)
-                lReturn = shoot(g_i,*insptr++);
-            SetGameVarID(g_iReturnVarID, lReturn, g_i, g_p);
-            break;
-        }
-
-    case CON_ZSHOOT:
             {
-            insptr++;
                 hittype[g_i].temp_data[9] = GetGameVarID(*insptr++, g_i, g_p);
                 if (hittype[g_i].temp_data[9] == 0)
                     hittype[g_i].temp_data[9] = 1;
-            shoot(g_i,*insptr++);
+            }
+            if(g_sp->sectnum >= 0 && g_sp->sectnum < MAXSECTORS)
+            {
+                lReturn = shoot(g_i,*insptr++);
+                if(tw == CON_EZSHOOT || tw == CON_ESHOOT)
+                    SetGameVarID(g_iReturnVarID, lReturn, g_i, g_p);
+            }
             hittype[g_i].temp_data[9]=0;
             break;
         }

polymer/eduke32/source/misc/gameres.rc

@@ -29,12 +29,12 @@ BEGIN
 	CONTROL "",               IDCVMODE, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 6, 80, 56
 	CONTROL "&Fullscreen",    IDCFULLSCREEN, "BUTTON", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 148, 8, 49, 10
 
-	CONTROL "S&ound driver:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 28, 50, 8
+	CONTROL "S&ound driver:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_DISABLED | WS_VISIBLE, 5, 28, 50, 8
-	CONTROL "",               IDCSOUNDDRV, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 26, 110, 56
+	CONTROL "",               IDCSOUNDDRV, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_DISABLED | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 26, 110, 56
-	CONTROL "&MIDI device:",  -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 44, 50, 8
+	CONTROL "&MIDI device:",  -1, "STATIC", SS_LEFT | WS_CHILD | WS_DISABLED | WS_VISIBLE, 5, 44, 50, 8
-	CONTROL "",               IDCMIDIDEV, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 42, 110, 56
+	CONTROL "",               IDCMIDIDEV, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_DISABLED | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 42, 110, 56
-	CONTROL "C&D drive:",     -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 60, 50, 8
+	CONTROL "C&D drive:",     -1, "STATIC", SS_LEFT | WS_CHILD | WS_DISABLED | WS_VISIBLE, 5, 60, 50, 8
-	CONTROL "",               IDCCDADEV, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 58, 40, 56
+	CONTROL "",               IDCCDADEV, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_DISABLED | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 58, 40, 56
 
 	CONTROL "Input devices:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 80, 50, 8
 	CONTROL "Mo&use",         IDCINPUTMOUSE, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 60, 80, 49, 8