diff --git a/polymer/build/MakeDistributions b/polymer/build/MakeDistributions
index 5b2d3a41c..0304fa882 100644
--- a/polymer/build/MakeDistributions
+++ b/polymer/build/MakeDistributions
@@ -1,12 +1,12 @@
# GNU Makefile to prepare source and binary distributions.
# make -f MakeDistributions [source|binary]
-SOURCEFILES=build.cfg buildlic.txt ChangeLog game.cfg LICENSE \
+SOURCEFILES=buildlic.txt ChangeLog LICENSE \
Makefile Makefile.deps Makefile.shared Makefile.msvc Makefile.watcom \
MakeDistributions makegnu.bat makemsc.bat makew.bat NAMES.H README
-BINARYFILES=build.cfg build.exe buildlic.txt ChangeLog fmod.dll \
- game.cfg game.exe LICENSE NAMES.H neatsong.ogg README
+BINARYFILES=build.exe buildlic.txt ChangeLog fmod.dll \
+ game.exe LICENSE NAMES.H neatsong.ogg README
BINARYCHECKS=checkfmoddll checkneatsongogg
@@ -29,7 +29,8 @@ source:
find . -name "*.rej" -exec rm -rf '{}' ';';
find . -name "*.mine" -exec rm -rf '{}' ';';
find . -name "*.c.r*" -exec rm -rf '{}' ';';
- cp -R src rsrc include devcpp osx $(sourcedir)
+ find . -name "*.h.r*" -exec rm -rf '{}' ';';
+ cp -R src rsrc include devcpp watcomhax testgame $(sourcedir)
find $(sourcedir) | grep -i svn | xargs rm -rf
rm -f $(sourcedir)/src/tmp/*
touch $(sourcedir)/src/tmp/keep.me
diff --git a/polymer/eduke32/ChangeLog b/polymer/eduke32/ChangeLog
index 3b9397ca1..6c4205929 100644
--- a/polymer/eduke32/ChangeLog
+++ b/polymer/eduke32/ChangeLog
@@ -1,6 +1,7 @@
=EDuke32 ChangeLog=
==1.4.0 beta 2=
+ - Core: reworked/enhanced Polymost shading
- Core: cleaned up code to properly build without Polymost/OpenGL support
- Core: added widescreen support for Polymost
- Core: added support for toggling correct HUD model rendering on/off
@@ -29,6 +30,7 @@
- CON: added WEAPON_FLAG_RESET (65536) to weapon system in order to properly emulate the chaingun and freezer
- CON: fixed "eshoot" and added "ezshoot"
- CON: reworked weapon system; note that your custom weapons may need adjustments to work again
+ - CON: updated sample enhance.con
==1.4.0 beta 1=
- Core: added support for defining dummy tiles in the def files to eliminate the need for placeholders for hightile art
diff --git a/polymer/eduke32/ChangeLog.html b/polymer/eduke32/ChangeLog.html
index dbd06cb18..712b2627b 100644
--- a/polymer/eduke32/ChangeLog.html
+++ b/polymer/eduke32/ChangeLog.html
@@ -51,107 +51,50 @@
-
+
ChangeLog for EDuke32
- 1.4.0 beta 1, released May 11, 2006
+ 1.4.0 beta 2, released July 18, 2006
Core changes
- - added support for defining dummy tiles in the def files to eliminate the need for placeholders for hightile art
- - added a temporary projection hack to reduce HOM at the top and bottom of the screen
- - fixed P2P multiplayer with more than two players
- - fixed a nasty memory corruption issue with screen tinting that resulted in crashes in the classic renderer
- - fixed a palette issue with the in-game textured 2D map in Polymost
- - fixed a mouse input bug in winlayer that resulted in loss of input precision
- - modified the def loader to perform two passes; one to load GRPs early in game startup, and one to do the rest later on
- - tweaks to caching system to leave more memory available for hightile art
- - proper alpha sorting on md3 models
- - removed usegoodalpha in favor of an alternate sprite sorting algorithm (note: rendering glitches may occur)
- - attempt to correct display perspective in order to properly display HUD models
- - netcode packet rate now 26 (was 40)
- - don't use 100% CPU when waiting for players to join a multiplayer game
- - reduce mouse wheel input lock time to 25ms (was 100ms)
-
-
+ reworked/enhanced Polymost shading
+ cleaned up code to properly build without Polymost/OpenGL support
+ added widescreen support for Polymost
+ added support for toggling correct HUD model rendering on/off
+ removed broken support for linking OpenGL statically
+ added support for DDS textures (JF)
+ added support for dynamically loading GTK (JF)
+
Game changes
-
- - completely reworked mouse sensitivity and added an input filter slider
- - changed the weapon switching to be less restrictive in order to assist weapon changes via mouse wheel
- - added support for alt+enter to switch between fullscreen and windowed mode
- - added an option to disable demo playback cameras
- - added support for scaling the crosshair to 1/2 or 1/4 normal size
- - added an option to enable autoaim only for hitscan weapons (bullets)
- - changed the default video mode to 1024x768x32 and added several fallback choices
- - reworked the quicksave and quickload functions such as to not prompt the player on use
- - set the default controls to WSAD + mouse aiming
- - restore the pause key behavior from Duke 1.5 wherein the "GAME PAUSED" message isn't displayed when shift is pressed while pausing
- - fixed an infinite loop and a palette corruption bug regarding the video setup menu and switching to the classic renderer
- - fixed an issue where the automap would scroll itself and/or jitter when the game was paused while moving
- - fixed pistol timing to more closely match Duke 1.5
- - fixed long-standing quick kick animation bug
- - fixed kick attack speed to more closely match Duke 1.5
- - fixed an issue with shift+F5 not allowing selection of music defined for episode 5 and up
- - changed the default menu background to something more pleasing
- - restructured the option menus to make more sense
- - expanded the "HUD weapon" menu option to allow displaying a weapon's pickup sprite instead of the HUD art
+
+ - new startup window (JF)
+ - added support for using the mouse and a joystick simultaneously (JF)
+ - fixed an issue preventing skill selection, bonus screen and episode ending animation sounds from playing
+ - fixed a problem where the player was unable to exit some pools of water in some maps
+ - made further adjustments to the weapon properties in order to more closely emulate Duke 1.5
+ - fixed an issue where you could disable map exits in multiplayer, have all players quit, start a single player game and then have exits continue to kill you
+
+ Multiplayer changes
+
+ - fixed numerous minor bugs in the voting system
+ - added a more noticeable message to indicate that the player hasn't voted yet in an active vote
+ - added support for /me in text chat
+ - increased size of player chat icon
+ - added "nat-free" support from Adam Fazakerley
+ - fixed inventory respawn bug
+ - minor fixes to DukesterX 1.5 compatibility wrapper
+
+ CON changes
+
+ - reworked movement_lock member of the player struct to use bit flags
+ - reworked findnearactor3d, findnearactor3dvar, findnearsprite3d, and findnearsprite3dvar
+ - added findnearactorz, findnearactorzvar, findnearspritez, and findnearspritezvar
+ - added WEAPON_FLAG_RESET (65536) to weapon system in order to properly emulate the chaingun and freezer
+ - fixed "eshoot" and added "ezshoot"
+ - reworked weapon system; note that your custom weapons may need adjustments to work again
+ - updated sample enhance.con
- Multiplayer changes
-
- - Duke Talk menu option can now be set to "all" to hear enemy pain sounds
- - added an option to disable nuke button exits in deathmatch
- - greatly improved the text chat by increasing the text buffer size and by implementing basic line wrapping
- - added a voting system for map changes along with a menu option to automatically vote yes or no
- - added an icon above the heads of other players for when they're chatting or using the menu
- - added an option to automatically send messages to all players rather than prompting
- - added an option to display the name of the opponent you're currently aiming at
- - added a player setup menu to configure player name, color, macros, and weapon/aiming options mid-game
- - added support for Rancidmeat network configuration files via -rmnet command line parameter
- - detect and correct internal vs external IP address issues when using Rancidmeat configuration files
- - added dummy duke3d_w32.exe to facilitate EDuke32 multiplayer via DukesterX 1.5
- - added support for in-game selection and loading of different user maps
- - added support for various player death messages which can be redefined in the CONs
- - added support for Quake-style color codes in player names and text chat (code format is ^<palette>)
- - limit player name to 10 characters (not counting color codes)
- - fixed issue where multiple players trying to step on the same shrunken enemy would kill the game
- - fixed issue where briefly tapping the jump key would produce a lag effect during the resulting jump
- - fixed issue where using the jetpack + steroids would produce a lag effect in P2P mode
- - fixed several out-of-sync issues
- - fixed a long-standing bug wherein a player death could be counted as both a death and a suicide
- - fixed screen resizing issue when typing - and = in chat
-
-
- CON changes
-
- - added "save" command to allow the creation of automatic checkpoints
- - added "cansee" and "canseespr" commands to easily determine whether two sprites or sets of coordinates have visibility
- - added "definegamefuncname" command to change the key names used in the configuration file and in the control setup menus
- - added additional safety checks to get/setuserdef/player/sector/sprite/wall/input
- - added support for Quake-style color codes in quotes (code format is ^<palette>)
- - added extra timing checks to the weapon system; note that weapons with strange TOTALTIME and FIREDELAY values may no longer fire
- - save quotes, dynamic-to-static tile remapping information, extended sprite flags and sprite caching info to savegames
- - reworked the quote system to use dynamically allocated memory and doubled the length of each individual quote
- - fixed a savegame issue where some gamevar values may not have been restored properly and added more sanity checks to savegame loading
- - fixed an issue with FRAMEEFFECT1 sprites ending up with the wrong tspr->picnum
- - fixed a potential issue where custom projectiles that hit a player wouldn't knock the player back
- - fixed a bug in the findnearactor3d command and further sped up findnearactor3d and findnearsprite3d
- - fixed an issue where tab characters in CON files could screw up label names
- - fixed a crash that occurred when hitscan type custom projectiles with trails were fired at a wall from a distance of 0
- - removed the RENDERSIZE attribute for weapons
- - made slight optimizations to various commands
-
-
- Console changes
-
- - added the following cvars: "crosshair", "cl_autoaim", "cl_automsg", "cl_autovote", "cl_democams", "cl_drawweapon", "cl_idplayers", "cl_messagetime", "cl_mousefilter", "cl_showcoords", "cl_showfps", "cl_smoothinput", "cl_statusbarmode", "cl_statusbarscale", "cl_weaponswitch" and "r_precache"
- - added "addpath" command to add a new directory to the game's virtual filesystem pool
-
-
- Mapster32 changes
-
- - better smoothing of mouse input when using 3D mode mouselook
- - add ' F key combo to replace nonexistent tiles with tile 0
-
Please see JonoF's JFDuke3D release notes here for information on features JFDuke3D shares with EDuke32
Richard "TerminX" Gobeille (terminx@gmail.com)
diff --git a/polymer/eduke32/MakeDistributions b/polymer/eduke32/MakeDistributions
index 815b56c04..cccefa0c0 100644
--- a/polymer/eduke32/MakeDistributions
+++ b/polymer/eduke32/MakeDistributions
@@ -1,12 +1,12 @@
# GNU Makefile to prepare source and binary distributions.
# make -f MakeDistributions [source|binary]
-SOURCEFILES=build.cfg GNU.TXT \
+SOURCEFILES=GNU.TXT \
Makefile Makefile.deps Makefile.msvc Makefile.watcom MakeDistributions \
makemsc.bat makew.bat ChangeLog.html duke3d.def.sample \
SEHELP.HLP STHELP.HLP ChangeLog enhance.con.sample
-BINARYFILES=build.cfg mapster32.exe eduke32.exe GNU.TXT \
+BINARYFILES=mapster32.exe eduke32.exe GNU.TXT \
ChangeLog.html setup.exe duke3d.def.sample SEHELP.HLP STHELP.HLP \
ChangeLog enhance.con.sample duke3d_w32.exe
@@ -31,7 +31,8 @@ source:
find . -name "*.rej" -exec rm -rf '{}' ';';
find . -name "*.mine" -exec rm -rf '{}' ';';
find . -name "*.c.r*" -exec rm -rf '{}' ';';
- cp -R source rsrc $(sourcedir)
+ find . -name "*.h.r*" -exec rm -rf '{}' ';';
+ cp -R source rsrc watcomhax $(sourcedir)
find $(sourcedir) | grep -i svn | xargs rm -rf
kzip -r $(sourcedir).zip $(sourcedir)
diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile
index ac3f83924..15a6c7b94 100644
--- a/polymer/eduke32/Makefile
+++ b/polymer/eduke32/Makefile
@@ -26,7 +26,7 @@ o=o
ifneq (0,$(RELEASE))
# debugging disabled
- debug=-fomit-frame-pointer -O1
+ debug=-fomit-frame-pointer -O2
else
# debugging enabled
debug=-ggdb -O0
diff --git a/polymer/eduke32/enhance.con.sample b/polymer/eduke32/enhance.con.sample
index 9190667d7..ce784df47 100644
--- a/polymer/eduke32/enhance.con.sample
+++ b/polymer/eduke32/enhance.con.sample
@@ -86,7 +86,11 @@ enum events {
EVENT_GETMENUTILE,
EVENT_SPAWN,
EVENT_LOGO,
- EVENT_EGS
+ EVENT_EGS,
+ EVENT_DOFIRE,
+ EVENT_PRESSEDFIRE,
+ EVENT_USE,
+ EVENT_PROCESSINPUT
};
*/
@@ -148,6 +152,8 @@ enum projectilelabels {
// 4096 Spawn Type 2 (Shotgun shells)
// 8192 Spawn Type 3 (CHAINGUN shells)
// 16384 Semi-automatic
+// 32768 Pistol reload sound hack
+// 65536 Cycle kickback_pic back to 1 if fire is held down, else set to 0
// TRIPBOMB_CONTROL
// 1 Tripwire. Trip Bomb works with tripwire.
@@ -157,213 +163,227 @@ enum projectilelabels {
// 1 Detonator. Pipe Bomb works with detonator.
// 2 On timer. Pipe Bomb works on timer
-gamevar WEAPON0_WORKSLIKE 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON0_CLIP 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON0_RELOAD 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON0_FIREDELAY 7 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON0_TOTALTIME 14 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON0_HOLDDELAY 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON0_FLAGS 288 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON0_SHOOTS 2521 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON0_SPAWNTIME 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON0_SPAWN 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON0_SHOTSPERBURST 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON0_INITIALSOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON0_FIRESOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON0_SOUND2TIME 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON0_SOUND2SOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON0_RENDERSIZE 0 GAMEVAR_FLAG_PERPLAYER
-
-gamevar WEAPON1_WORKSLIKE 1 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON1_CLIP 12 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON1_RELOAD 27 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON1_FIREDELAY 2 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON1_TOTALTIME 6 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON1_HOLDDELAY 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON1_FLAGS 4 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON1_SHOOTS 2595 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON1_SPAWNTIME 2 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON1_SPAWN 2533 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON1_SHOTSPERBURST 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON1_INITIALSOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON1_FIRESOUND 3 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON1_SOUND2TIME 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON1_SOUND2SOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON1_RENDERSIZE 0 GAMEVAR_FLAG_PERPLAYER
-
-gamevar WEAPON2_WORKSLIKE 2 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON2_CLIP 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON2_RELOAD 13 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON2_FIREDELAY 4 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON2_TOTALTIME 31 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON2_HOLDDELAY 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON2_FLAGS 1024 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON2_SHOOTS 2613 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON2_SPAWNTIME 24 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON2_SPAWN 2535 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON2_SHOTSPERBURST 7 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON2_INITIALSOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON2_FIRESOUND 109 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON2_SOUND2TIME 15 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON2_SOUND2SOUND 169 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON2_RENDERSIZE 0 GAMEVAR_FLAG_PERPLAYER
-
-gamevar WEAPON3_WORKSLIKE 3 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON3_CLIP 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON3_RELOAD 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON3_FIREDELAY 4 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON3_TOTALTIME 10 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON3_HOLDDELAY 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON3_FLAGS 8276 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON3_SHOOTS 2536 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON3_SPAWNTIME 1 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON3_SPAWN 2533 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON3_SHOTSPERBURST 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON3_INITIALSOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON3_FIRESOUND 6 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON3_SOUND2TIME 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON3_SOUND2SOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON3_RENDERSIZE 0 GAMEVAR_FLAG_PERPLAYER
-
-gamevar WEAPON4_WORKSLIKE 4 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON4_CLIP 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON4_RELOAD 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON4_FIREDELAY 4 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON4_TOTALTIME 20 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON4_HOLDDELAY 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON4_FLAGS 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON4_SHOOTS 2605 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON4_SPAWNTIME 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON4_SPAWN 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON4_SHOTSPERBURST 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON4_INITIALSOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON4_FIRESOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON4_SOUND2TIME 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON4_SOUND2SOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON4_RENDERSIZE 0 GAMEVAR_FLAG_PERPLAYER
-
-gamevar WEAPON5_WORKSLIKE 5 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON5_CLIP 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON5_RELOAD 30 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON5_FIREDELAY 6 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON5_TOTALTIME 19 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON5_HOLDDELAY 12 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON5_FLAGS 512 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON5_SHOOTS 26 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON5_SPAWNTIME 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON5_SPAWN 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON5_SHOTSPERBURST 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON5_INITIALSOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON5_FIRESOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON5_SOUND2TIME 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON5_SOUND2SOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON5_RENDERSIZE 0 GAMEVAR_FLAG_PERPLAYER
-
-gamevar WEAPON6_WORKSLIKE 6 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON6_CLIP 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON6_RELOAD 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON6_FIREDELAY 10 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON6_TOTALTIME 12 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON6_HOLDDELAY 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON6_FLAGS 2 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON6_SHOOTS 2556 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON6_SPAWNTIME 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON6_SPAWN 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON6_SHOTSPERBURST 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON6_INITIALSOUND 11 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON6_FIRESOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON6_SOUND2TIME 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON6_SOUND2SOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON6_RENDERSIZE 0 GAMEVAR_FLAG_PERPLAYER
-
-gamevar WEAPON7_WORKSLIKE 7 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON7_CLIP 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON7_RELOAD 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON7_FIREDELAY 3 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON7_TOTALTIME 5 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON7_HOLDDELAY 5 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON7_FLAGS 72 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON7_SHOOTS 2605 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON7_SPAWNTIME 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON7_SPAWN 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON7_SHOTSPERBURST 2 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON7_INITIALSOUND 10 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON7_FIRESOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON7_SOUND2TIME 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON7_SOUND2SOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON7_RENDERSIZE 0 GAMEVAR_FLAG_PERPLAYER
-
-gamevar WEAPON8_WORKSLIKE 8 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON8_CLIP 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON8_RELOAD 16 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON8_FIREDELAY 3 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON8_TOTALTIME 40 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON8_HOLDDELAY 7 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON8_FLAGS 3072 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON8_SHOOTS 2563 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON8_SPAWNTIME 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON8_SPAWN 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON8_SHOTSPERBURST 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON8_INITIALSOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON8_FIRESOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON8_SOUND2TIME 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON8_SOUND2SOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON8_RENDERSIZE 0 GAMEVAR_FLAG_PERPLAYER
-
-gamevar WEAPON9_WORKSLIKE 9 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON9_CLIP 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON9_RELOAD 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON9_FIREDELAY 3 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON9_TOTALTIME 8 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON9_HOLDDELAY 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON9_FLAGS 20 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON9_SHOOTS 1641 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON9_SPAWNTIME 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON9_SPAWN 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON9_SHOTSPERBURST 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON9_INITIALSOUND 10 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON9_FIRESOUND 10 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON9_SOUND2TIME 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON9_SOUND2SOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON9_RENDERSIZE 0 GAMEVAR_FLAG_PERPLAYER
-
-gamevar WEAPON10_WORKSLIKE 10 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON10_CLIP 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON10_RELOAD 10 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON10_FIREDELAY 2 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON10_TOTALTIME 10 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON10_HOLDDELAY 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON10_FLAGS 384 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON10_SHOOTS 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON10_SPAWNTIME 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON10_SPAWN 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON10_SHOTSPERBURST 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON10_INITIALSOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON10_FIRESOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON10_SOUND2TIME 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON10_SOUND2SOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON10_RENDERSIZE 0 GAMEVAR_FLAG_PERPLAYER
-
-gamevar WEAPON11_WORKSLIKE 11 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON11_CLIP 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON11_RELOAD 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON11_FIREDELAY 2 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON11_TOTALTIME 5 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON11_HOLDDELAY 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON11_FLAGS 2 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON11_SHOOTS 2448 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON11_SPAWNTIME 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON11_SPAWN 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON11_SHOTSPERBURST 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON11_INITIALSOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON11_FIRESOUND 388 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON11_SOUND2TIME 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON11_SOUND2SOUND 0 GAMEVAR_FLAG_PERPLAYER
-gamevar WEAPON11_RENDERSIZE 0 GAMEVAR_FLAG_PERPLAYER
-
-gamevar GRENADE_LIFETIME 120 GAMEVAR_FLAG_PERPLAYER
-gamevar GRENADE_LIFETIME_VAR 30 GAMEVAR_FLAG_PERPLAYER
-gamevar STICKYBOMB_LIFETIME 120 GAMEVAR_FLAG_PERPLAYER
-gamevar STICKYBOMB_LIFETIME_VAR 30 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON0_WORKSLIKE 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON0_CLIP 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON0_RELOAD 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON0_FIREDELAY 7 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON0_TOTALTIME 14 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON0_HOLDDELAY 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON0_FLAGS 292 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON0_SHOOTS 2521 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON0_SPAWNTIME 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON0_SPAWN 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON0_SHOTSPERBURST 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON0_INITIALSOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON0_FIRESOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON0_SOUND2TIME 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON0_SOUND2SOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON0_RELOADSOUND1 4 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON0_RELOADSOUND2 5 GAMEVAR_FLAG_PERPLAYER
+
+gamevar WEAPON1_WORKSLIKE 1 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON1_CLIP 12 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON1_RELOAD 27 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON1_FIREDELAY 2 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON1_TOTALTIME 5 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON1_HOLDDELAY 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON1_FLAGS 32768 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON1_SHOOTS 2595 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON1_SPAWNTIME 2 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON1_SPAWN 2533 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON1_SHOTSPERBURST 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON1_INITIALSOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON1_FIRESOUND 3 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON1_SOUND2TIME 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON1_SOUND2SOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON1_RELOADSOUND1 4 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON1_RELOADSOUND2 5 GAMEVAR_FLAG_PERPLAYER
+
+gamevar WEAPON2_WORKSLIKE 2 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON2_CLIP 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON2_RELOAD 13 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON2_FIREDELAY 4 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON2_TOTALTIME 30 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON2_HOLDDELAY 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON2_FLAGS 1024 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON2_SHOOTS 2613 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON2_SPAWNTIME 24 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON2_SPAWN 2535 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON2_SHOTSPERBURST 7 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON2_INITIALSOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON2_FIRESOUND 109 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON2_SOUND2TIME 15 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON2_SOUND2SOUND 169 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON2_RELOADSOUND1 4 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON2_RELOADSOUND2 5 GAMEVAR_FLAG_PERPLAYER
+
+gamevar WEAPON3_WORKSLIKE 3 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON3_CLIP 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON3_RELOAD 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON3_FIREDELAY 3 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON3_TOTALTIME 12 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON3_HOLDDELAY 3 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON3_FLAGS 73812 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON3_SHOOTS 2536 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON3_SPAWNTIME 1 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON3_SPAWN 2533 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON3_SHOTSPERBURST 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON3_INITIALSOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON3_FIRESOUND 6 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON3_SOUND2TIME 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON3_SOUND2SOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON3_RELOADSOUND1 4 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON3_RELOADSOUND2 5 GAMEVAR_FLAG_PERPLAYER
+
+gamevar WEAPON4_WORKSLIKE 4 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON4_CLIP 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON4_RELOAD 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON4_FIREDELAY 4 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON4_TOTALTIME 20 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON4_HOLDDELAY 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON4_FLAGS 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON4_SHOOTS 2605 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON4_SPAWNTIME 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON4_SPAWN 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON4_SHOTSPERBURST 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON4_INITIALSOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON4_FIRESOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON4_SOUND2TIME 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON4_SOUND2SOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON4_RELOADSOUND1 4 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON4_RELOADSOUND2 5 GAMEVAR_FLAG_PERPLAYER
+
+gamevar WEAPON5_WORKSLIKE 5 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON5_CLIP 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON5_RELOAD 30 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON5_FIREDELAY 6 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON5_TOTALTIME 19 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON5_HOLDDELAY 12 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON5_FLAGS 512 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON5_SHOOTS 26 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON5_SPAWNTIME 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON5_SPAWN 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON5_SHOTSPERBURST 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON5_INITIALSOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON5_FIRESOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON5_SOUND2TIME 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON5_SOUND2SOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON5_RELOADSOUND1 4 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON5_RELOADSOUND2 5 GAMEVAR_FLAG_PERPLAYER
+
+gamevar WEAPON6_WORKSLIKE 6 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON6_CLIP 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON6_RELOAD 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON6_FIREDELAY 10 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON6_TOTALTIME 12 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON6_HOLDDELAY 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON6_FLAGS 2 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON6_SHOOTS 2556 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON6_SPAWNTIME 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON6_SPAWN 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON6_SHOTSPERBURST 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON6_INITIALSOUND 11 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON6_FIRESOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON6_SOUND2TIME 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON6_SOUND2SOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON6_RELOADSOUND1 4 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON6_RELOADSOUND2 5 GAMEVAR_FLAG_PERPLAYER
+
+gamevar WEAPON7_WORKSLIKE 7 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON7_CLIP 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON7_RELOAD 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON7_FIREDELAY 3 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON7_TOTALTIME 6 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON7_HOLDDELAY 5 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON7_FLAGS 72 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON7_SHOOTS 2605 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON7_SPAWNTIME 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON7_SPAWN 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON7_SHOTSPERBURST 2 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON7_INITIALSOUND 10 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON7_FIRESOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON7_SOUND2TIME 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON7_SOUND2SOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON7_RELOADSOUND1 4 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON7_RELOADSOUND2 5 GAMEVAR_FLAG_PERPLAYER
+
+gamevar WEAPON8_WORKSLIKE 8 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON8_CLIP 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON8_RELOAD 16 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON8_FIREDELAY 3 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON8_TOTALTIME 16 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON8_HOLDDELAY 7 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON8_FLAGS 3072 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON8_SHOOTS 2563 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON8_SPAWNTIME 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON8_SPAWN 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON8_SHOTSPERBURST 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON8_INITIALSOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON8_FIRESOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON8_SOUND2TIME 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON8_SOUND2SOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON8_RELOADSOUND1 4 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON8_RELOADSOUND2 5 GAMEVAR_FLAG_PERPLAYER
+
+gamevar WEAPON9_WORKSLIKE 9 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON9_CLIP 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON9_RELOAD 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON9_FIREDELAY 3 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON9_TOTALTIME 5 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON9_HOLDDELAY 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON9_FLAGS 65536 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON9_SHOOTS 1641 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON9_SPAWNTIME 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON9_SPAWN 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON9_SHOTSPERBURST 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON9_INITIALSOUND 10 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON9_FIRESOUND 10 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON9_SOUND2TIME 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON9_SOUND2SOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON9_RELOADSOUND1 4 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON9_RELOADSOUND2 5 GAMEVAR_FLAG_PERPLAYER
+
+gamevar WEAPON10_WORKSLIKE 10 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON10_CLIP 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON10_RELOAD 10 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON10_FIREDELAY 2 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON10_TOTALTIME 10 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON10_HOLDDELAY 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON10_FLAGS 384 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON10_SHOOTS 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON10_SPAWNTIME 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON10_SPAWN 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON10_SHOTSPERBURST 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON10_INITIALSOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON10_FIRESOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON10_SOUND2TIME 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON10_SOUND2SOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON10_RELOADSOUND1 4 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON10_RELOADSOUND2 5 GAMEVAR_FLAG_PERPLAYER
+
+gamevar WEAPON11_WORKSLIKE 11 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON11_CLIP 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON11_RELOAD 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON11_FIREDELAY 4 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON11_TOTALTIME 5 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON11_HOLDDELAY 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON11_FLAGS 2 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON11_SHOOTS 2448 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON11_SPAWNTIME 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON11_SPAWN 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON11_SHOTSPERBURST 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON11_INITIALSOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON11_FIRESOUND 388 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON11_SOUND2TIME 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON11_SOUND2SOUND 0 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON11_RELOADSOUND1 4 GAMEVAR_FLAG_PERPLAYER
+gamevar WEAPON11_RELOADSOUND2 5 GAMEVAR_FLAG_PERPLAYER
+
+gamevar GRENADE_LIFETIME 120 GAMEVAR_FLAG_PERPLAYER
+gamevar GRENADE_LIFETIME_VAR 30 GAMEVAR_FLAG_PERPLAYER
+
+gamevar STICKYBOMB_LIFETIME 120 GAMEVAR_FLAG_PERPLAYER
+gamevar STICKYBOMB_LIFETIME_VAR 30 GAMEVAR_FLAG_PERPLAYER
+
gamevar TRIPBOMB_CONTROL 1 GAMEVAR_FLAG_PERPLAYER // set value to 2 for timed bomb
-gamevar PIPEBOMB_CONTROL 1 GAMEVAR_FLAG_PERPLAYER // set value to 2 for grenade behavior
+gamevar PIPEBOMB_CONTROL 1 GAMEVAR_FLAG_PERPLAYER // set value to 2 for grenade behavior
diff --git a/polymer/eduke32/installer/eduke32.nsi b/polymer/eduke32/installer/eduke32.nsi
index 37287dbbe..69454760d 100755
--- a/polymer/eduke32/installer/eduke32.nsi
+++ b/polymer/eduke32/installer/eduke32.nsi
@@ -2,7 +2,7 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "EDuke32"
-!define PRODUCT_VERSION "1.4.0 beta 1"
+!define PRODUCT_VERSION "1.4.0 beta 2"
!define PRODUCT_PUBLISHER "EDuke32 Team"
!define PRODUCT_WEB_SITE "http://www.eduke32.com"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}"
@@ -83,7 +83,6 @@ SectionEnd
Section "Level editor" SEC_EDITOR
SetOutPath "$INSTDIR"
SetOverwrite ifnewer
- File "..\build.cfg"
File "..\mapster32.exe"
CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Mapster32.lnk" "$INSTDIR\mapster32.exe"
@@ -147,7 +146,6 @@ Section Uninstall
Delete "$INSTDIR\duke3d.def.sample"
Delete "$INSTDIR\enhance.con.sample"
Delete "$INSTDIR\mapster32.exe"
- Delete "$INSTDIR\build.cfg"
Delete "$INSTDIR\setup.exe"
Delete "$INSTDIR\ChangeLog.html"
Delete "$INSTDIR\ChangeLog"
diff --git a/polymer/eduke32/source/config.c b/polymer/eduke32/source/config.c
index 02eda5cad..a76aecac0 100644
--- a/polymer/eduke32/source/config.c
+++ b/polymer/eduke32/source/config.c
@@ -227,7 +227,7 @@ void CONFIG_SetDefaults( void )
SoundToggle = 1;
ud.automsg = 0;
ud.autovote = 0;
- ud.brightness = 16;
+ ud.brightness = 8;
ud.color = 0;
ud.crosshair = 2;
ud.democams = 1;
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index d9457d578..cafb8c8a3 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -44,7 +44,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "util_lib.h"
-#define VERSION " 1.4.0svn"
+#define VERSION " 1.4.0 beta 2"
#define HEAD "EDuke32"VERSION" (shareware mode)"
#define HEAD2 "EDuke32"VERSION
diff --git a/polymer/eduke32/source/jfaud_sounds.cpp b/polymer/eduke32/source/jfaud_sounds.cpp
index 0234f5c88..f5bf972f8 100644
--- a/polymer/eduke32/source/jfaud_sounds.cpp
+++ b/polymer/eduke32/source/jfaud_sounds.cpp
@@ -263,6 +263,12 @@ void AudioUpdate(void)
if (chans[i].chan) jfaud->FreeSound(chans[i].chan);
chans[i].chan = NULL;
chans[i].done = false;
+
+ if (chans[i].owner >= 0 &&
+ sprite[chans[i].owner].picnum == MUSICANDSFX &&
+ sector[sprite[chans[i].owner].sectnum].lotag < 3 &&
+ sprite[chans[i].owner].lotag < 999)
+ hittype[chans[i].owner].temp_data[0] = 0;
}
jfaud->Update(false); // don't age the cache here
}
@@ -589,10 +595,7 @@ void pan3dsound(void)
if (PN != MUSICANDSFX && !cansee(cx,cy,cz-(24<<8),cs,sx,sy,sz-(24<<8),SECT) )
gain *= OCCLUDEDFACTOR;
- if(PN == MUSICANDSFX && SLT < 999) {
- numenvsnds++;
- rolloff = 1.0;
- }
+ if(PN == MUSICANDSFX && SLT < 999) rolloff = 1.0;
if( soundm[ chans[j].soundnum ]&SOUNDM_GLOBAL ) global = 1;
switch(chans[j].soundnum) {
@@ -647,13 +650,8 @@ void FX_SetReverbDelay( int delay )
int FX_VoiceAvailable( int priority )
{
- int j;
-
if (!jfaud) return 0;
- for (j=NumVoices-1;j>=0;j--) {
- if (!chans[j].chan || !jfaud->IsValidSound(chans[j].chan)) return 1;
- }
- return 0;
+ return 1;
}
int FX_PlayVOC3D( char *ptr, int pitchoffset, int angle, int distance,
diff --git a/polymer/eduke32/source/sector.c b/polymer/eduke32/source/sector.c
index 889da2302..a30b354f7 100644
--- a/polymer/eduke32/source/sector.c
+++ b/polymer/eduke32/source/sector.c
@@ -34,11 +34,9 @@ short callsound(short sn,short whatsprite)
haltsoundhack = 0;
return -1;
}
-// initprintf("begin callsound(%d,%d)\n",sn,whatsprite);
i = headspritesect[sn];
while(i >= 0)
{
-// initprintf("callsound(%d,%d) i=%d T1-6=%d,%d,%d,%d,%d,%d PN=%d SLT=%d SHT=%d\n",sn,whatsprite,i,T1,T2,T3,T4,T5,T6,PN,SLT,SHT);
if( PN == MUSICANDSFX && SLT < 1000 )
{
if(whatsprite == -1) whatsprite = i;
@@ -67,12 +65,10 @@ short callsound(short sn,short whatsprite)
T6 = whatsprite;
T1 = 0;
}
-// initprintf("end callsound(%d,%d)\n",sn,whatsprite);
return SLT;
}
i = nextspritesect[i];
}
-// initprintf("end callsound(%d,%d) -1\n",sn,whatsprite);
return -1;
}
diff --git a/polymer/eduke32/source/startwin.game.c b/polymer/eduke32/source/startwin.game.c
index e01b57117..77bd3e48c 100755
--- a/polymer/eduke32/source/startwin.game.c
+++ b/polymer/eduke32/source/startwin.game.c
@@ -27,11 +27,11 @@
static struct audioenumdrv *wavedevs = NULL;
static struct {
- int fullscreen;
- int xdim, ydim, bpp;
- int forcesetup;
- int usemouse, usejoy;
- char selectedgrp[BMAX_PATH+1];
+ int fullscreen;
+ int xdim, ydim, bpp;
+ int forcesetup;
+ int usemouse, usejoy;
+ char selectedgrp[BMAX_PATH+1];
} settings;
static HWND startupdlg = NULL;
@@ -44,512 +44,512 @@ static int done = -1, mode = TAB_CONFIG;
static void PopulateForm(int pgs)
{
- HWND hwnd;
- char buf[256];
- int i,j;
+ HWND hwnd;
+ char buf[256];
+ int i,j;
- if (pgs & POPULATE_VIDEO) {
- int mode;
+ if (pgs & POPULATE_VIDEO) {
+ int mode;
- hwnd = GetDlgItem(pages[TAB_CONFIG], IDCVMODE);
+ hwnd = GetDlgItem(pages[TAB_CONFIG], IDCVMODE);
- mode = checkvideomode(&settings.xdim, &settings.ydim, settings.bpp, settings.fullscreen, 1);
- if (mode < 0) {
- int cd[] = { 32, 24, 16, 15, 8, 0 };
- for (i=0; cd[i]; ) { if (cd[i] >= settings.bpp) i++; else break; }
- for ( ; cd[i]; i++) {
- mode = checkvideomode(&settings.xdim, &settings.ydim, cd[i], settings.fullscreen, 1);
- if (mode < 0) continue;
- settings.bpp = cd[i];
- break;
- }
- }
+ mode = checkvideomode(&settings.xdim, &settings.ydim, settings.bpp, settings.fullscreen, 1);
+ if (mode < 0) {
+ int cd[] = { 32, 24, 16, 15, 8, 0 };
+ for (i=0; cd[i]; ) { if (cd[i] >= settings.bpp) i++; else break; }
+ for ( ; cd[i]; i++) {
+ mode = checkvideomode(&settings.xdim, &settings.ydim, cd[i], settings.fullscreen, 1);
+ if (mode < 0) continue;
+ settings.bpp = cd[i];
+ break;
+ }
+ }
- Button_SetCheck(GetDlgItem(pages[TAB_CONFIG], IDCFULLSCREEN), (settings.fullscreen ? BST_CHECKED : BST_UNCHECKED));
- ComboBox_ResetContent(hwnd);
- for (i=0; idevs;
- for (i=0; wavedevs->drvs[i]; i++) {
- strcpy(buf, wavedevs->drvs[i]);
- if (d->devs) {
- strcat(buf, ":");
- n = buf + strlen(buf);
- for (j=0; d->devs[j]; j++) {
- strcpy(n, d->devs[j]);
- ComboBox_AddString(hwnd, buf);
- }
- } else {
- ComboBox_AddString(hwnd, buf);
- }
- d = d->next;
- }
- }
+ hwnd = GetDlgItem(pages[TAB_CONFIG], IDCSOUNDDRV);
+ ComboBox_ResetContent(hwnd);
+ if (wavedevs) {
+ d = wavedevs->devs;
+ for (i=0; wavedevs->drvs[i]; i++) {
+ strcpy(buf, wavedevs->drvs[i]);
+ if (d->devs) {
+ strcat(buf, ":");
+ n = buf + strlen(buf);
+ for (j=0; d->devs[j]; j++) {
+ strcpy(n, d->devs[j]);
+ ComboBox_AddString(hwnd, buf);
+ }
+ } else {
+ ComboBox_AddString(hwnd, buf);
+ }
+ d = d->next;
+ }
+ }
- Button_SetCheck(GetDlgItem(pages[TAB_CONFIG], IDCALWAYSSHOW), (settings.forcesetup ? BST_CHECKED : BST_UNCHECKED));
+ Button_SetCheck(GetDlgItem(pages[TAB_CONFIG], IDCALWAYSSHOW), (settings.forcesetup ? BST_CHECKED : BST_UNCHECKED));
- Button_SetCheck(GetDlgItem(pages[TAB_CONFIG], IDCINPUTMOUSE), (settings.usemouse ? BST_CHECKED : BST_UNCHECKED));
- Button_SetCheck(GetDlgItem(pages[TAB_CONFIG], IDCINPUTJOY), (settings.usejoy ? BST_CHECKED : BST_UNCHECKED));
- }
+ Button_SetCheck(GetDlgItem(pages[TAB_CONFIG], IDCINPUTMOUSE), (settings.usemouse ? BST_CHECKED : BST_UNCHECKED));
+ Button_SetCheck(GetDlgItem(pages[TAB_CONFIG], IDCINPUTJOY), (settings.usejoy ? BST_CHECKED : BST_UNCHECKED));
+ }
- if (pgs & POPULATE_GAME) {
- struct grpfile *fg;
- int i, j;
- char buf[128+BMAX_PATH];
+ if (pgs & POPULATE_GAME) {
+ struct grpfile *fg;
+ int i, j;
+ char buf[128+BMAX_PATH];
- hwnd = GetDlgItem(pages[TAB_GAME], IDGDATA);
+ hwnd = GetDlgItem(pages[TAB_GAME], IDGDATA);
- for (fg = foundgrps; fg; fg=fg->next) {
- for (i = 0; icrcval == grpfiles[i].crcval) break;
- if (i == numgrpfiles) continue; // unrecognised grp file
+ for (fg = foundgrps; fg; fg=fg->next) {
+ for (i = 0; icrcval == grpfiles[i].crcval) break;
+ if (i == numgrpfiles) continue; // unrecognised grp file
- Bsprintf(buf, "%s\t%s", grpfiles[i].name, fg->name);
- j = ListBox_AddString(hwnd, buf);
- ListBox_SetItemData(hwnd, j, (LPARAM)fg);
- if (!Bstrcasecmp(fg->name, settings.selectedgrp)) ListBox_SetCurSel(hwnd, j);
- }
- }
+ Bsprintf(buf, "%s\t%s", grpfiles[i].name, fg->name);
+ j = ListBox_AddString(hwnd, buf);
+ ListBox_SetItemData(hwnd, j, (LPARAM)fg);
+ if (!Bstrcasecmp(fg->name, settings.selectedgrp)) ListBox_SetCurSel(hwnd, j);
+ }
+ }
}
static INT_PTR CALLBACK ConfigPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
- switch (uMsg) {
- case WM_COMMAND:
- switch (LOWORD(wParam)) {
- case IDCFULLSCREEN:
- settings.fullscreen = !settings.fullscreen;
- PopulateForm(POPULATE_VIDEO);
- return TRUE;
- case IDCVMODE:
- if (HIWORD(wParam) == CBN_SELCHANGE) {
- int i;
- i = ComboBox_GetCurSel((HWND)lParam);
- if (i != CB_ERR) i = ComboBox_GetItemData((HWND)lParam, i);
- if (i != CB_ERR) {
- settings.xdim = validmode[i].xdim;
- settings.ydim = validmode[i].ydim;
- settings.bpp = validmode[i].bpp;
- }
- }
- return TRUE;
- case IDCALWAYSSHOW:
- settings.forcesetup = IsDlgButtonChecked(hwndDlg, IDCALWAYSSHOW) == BST_CHECKED;
- return TRUE;
- case IDCINPUTMOUSE:
- settings.usemouse = IsDlgButtonChecked(hwndDlg, IDCINPUTMOUSE) == BST_CHECKED;
- return TRUE;
- case IDCINPUTJOY:
- settings.usejoy = IsDlgButtonChecked(hwndDlg, IDCINPUTJOY) == BST_CHECKED;
- return TRUE;
- default: break;
- }
- break;
- default: break;
- }
- return FALSE;
+ switch (uMsg) {
+ case WM_COMMAND:
+ switch (LOWORD(wParam)) {
+ case IDCFULLSCREEN:
+ settings.fullscreen = !settings.fullscreen;
+ PopulateForm(POPULATE_VIDEO);
+ return TRUE;
+ case IDCVMODE:
+ if (HIWORD(wParam) == CBN_SELCHANGE) {
+ int i;
+ i = ComboBox_GetCurSel((HWND)lParam);
+ if (i != CB_ERR) i = ComboBox_GetItemData((HWND)lParam, i);
+ if (i != CB_ERR) {
+ settings.xdim = validmode[i].xdim;
+ settings.ydim = validmode[i].ydim;
+ settings.bpp = validmode[i].bpp;
+ }
+ }
+ return TRUE;
+ case IDCALWAYSSHOW:
+ settings.forcesetup = IsDlgButtonChecked(hwndDlg, IDCALWAYSSHOW) == BST_CHECKED;
+ return TRUE;
+ case IDCINPUTMOUSE:
+ settings.usemouse = IsDlgButtonChecked(hwndDlg, IDCINPUTMOUSE) == BST_CHECKED;
+ return TRUE;
+ case IDCINPUTJOY:
+ settings.usejoy = IsDlgButtonChecked(hwndDlg, IDCINPUTJOY) == BST_CHECKED;
+ return TRUE;
+ default: break;
+ }
+ break;
+ default: break;
+ }
+ return FALSE;
}
static INT_PTR CALLBACK GamePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
- switch (uMsg) {
- case WM_COMMAND:
- switch (LOWORD(wParam)) {
- case IDGDATA: {
- int i;
- i = ListBox_GetCurSel((HWND)lParam);
- if (i != CB_ERR) i = ListBox_GetItemData((HWND)lParam, i);
- if (i != CB_ERR) strcpy(settings.selectedgrp, ((struct grpfile*)i)->name);
- return TRUE;
- }
- default: break;
- }
- break;
- default: break;
- }
- return FALSE;
+ switch (uMsg) {
+ case WM_COMMAND:
+ switch (LOWORD(wParam)) {
+ case IDGDATA: {
+ int i;
+ i = ListBox_GetCurSel((HWND)lParam);
+ if (i != CB_ERR) i = ListBox_GetItemData((HWND)lParam, i);
+ if (i != CB_ERR) strcpy(settings.selectedgrp, ((struct grpfile*)i)->name);
+ return TRUE;
+ }
+ default: break;
+ }
+ break;
+ default: break;
+ }
+ return FALSE;
}
static void SetPage(int n)
{
- HWND tab;
- int cur;
- tab = GetDlgItem(startupdlg, WIN_STARTWIN_TABCTL);
- cur = (int)SendMessage(tab, TCM_GETCURSEL,0,0);
- ShowWindow(pages[cur],SW_HIDE);
- SendMessage(tab, TCM_SETCURSEL, n, 0);
- ShowWindow(pages[n],SW_SHOW);
- mode = n;
+ HWND tab;
+ int cur;
+ tab = GetDlgItem(startupdlg, WIN_STARTWIN_TABCTL);
+ cur = (int)SendMessage(tab, TCM_GETCURSEL,0,0);
+ ShowWindow(pages[cur],SW_HIDE);
+ SendMessage(tab, TCM_SETCURSEL, n, 0);
+ ShowWindow(pages[n],SW_SHOW);
+ mode = n;
- SetFocus(GetDlgItem(startupdlg, WIN_STARTWIN_TABCTL));
+ SetFocus(GetDlgItem(startupdlg, WIN_STARTWIN_TABCTL));
}
static void EnableConfig(int n)
{
- //EnableWindow(GetDlgItem(startupdlg, WIN_STARTWIN_CANCEL), n);
- EnableWindow(GetDlgItem(startupdlg, WIN_STARTWIN_START), n);
- EnableWindow(GetDlgItem(pages[TAB_CONFIG], IDCFULLSCREEN), n);
- EnableWindow(GetDlgItem(pages[TAB_CONFIG], IDCVMODE), n);
- EnableWindow(GetDlgItem(pages[TAB_CONFIG], IDCINPUTMOUSE), n);
- EnableWindow(GetDlgItem(pages[TAB_CONFIG], IDCINPUTJOY), n);
+ //EnableWindow(GetDlgItem(startupdlg, WIN_STARTWIN_CANCEL), n);
+ EnableWindow(GetDlgItem(startupdlg, WIN_STARTWIN_START), n);
+ EnableWindow(GetDlgItem(pages[TAB_CONFIG], IDCFULLSCREEN), n);
+ EnableWindow(GetDlgItem(pages[TAB_CONFIG], IDCVMODE), n);
+ EnableWindow(GetDlgItem(pages[TAB_CONFIG], IDCINPUTMOUSE), n);
+ EnableWindow(GetDlgItem(pages[TAB_CONFIG], IDCINPUTJOY), n);
- EnableWindow(GetDlgItem(pages[TAB_GAME], IDGDATA), n);
+ EnableWindow(GetDlgItem(pages[TAB_GAME], IDGDATA), n);
}
static INT_PTR CALLBACK startup_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
- static HBITMAP hbmp = NULL;
- HDC hdc;
-
- switch (uMsg) {
- case WM_INITDIALOG: {
- HWND hwnd;
- RECT r, rdlg, chrome, rtab, rcancel, rstart;
- int xoffset = 0, yoffset = 0;
+ static HBITMAP hbmp = NULL;
+ HDC hdc;
- // Fetch the positions (in screen coordinates) of all the windows we need to tweak
- ZeroMemory(&chrome, sizeof(chrome));
- AdjustWindowRect(&chrome, GetWindowLong(hwndDlg, GWL_STYLE), FALSE);
- GetWindowRect(hwndDlg, &rdlg);
- GetWindowRect(GetDlgItem(hwndDlg, WIN_STARTWIN_TABCTL), &rtab);
- GetWindowRect(GetDlgItem(hwndDlg, WIN_STARTWIN_CANCEL), &rcancel);
- GetWindowRect(GetDlgItem(hwndDlg, WIN_STARTWIN_START), &rstart);
+ switch (uMsg) {
+ case WM_INITDIALOG: {
+ HWND hwnd;
+ RECT r, rdlg, chrome, rtab, rcancel, rstart;
+ int xoffset = 0, yoffset = 0;
- // Knock off the non-client area of the main dialogue to give just the client area
- rdlg.left -= chrome.left; rdlg.top -= chrome.top;
- rdlg.right -= chrome.right; rdlg.bottom -= chrome.bottom;
+ // Fetch the positions (in screen coordinates) of all the windows we need to tweak
+ ZeroMemory(&chrome, sizeof(chrome));
+ AdjustWindowRect(&chrome, GetWindowLong(hwndDlg, GWL_STYLE), FALSE);
+ GetWindowRect(hwndDlg, &rdlg);
+ GetWindowRect(GetDlgItem(hwndDlg, WIN_STARTWIN_TABCTL), &rtab);
+ GetWindowRect(GetDlgItem(hwndDlg, WIN_STARTWIN_CANCEL), &rcancel);
+ GetWindowRect(GetDlgItem(hwndDlg, WIN_STARTWIN_START), &rstart);
- // Translate them to client-relative coordinates wrt the main dialogue window
- rtab.right -= rtab.left - 1; rtab.bottom -= rtab.top - 1;
- rtab.left -= rdlg.left; rtab.top -= rdlg.top;
+ // Knock off the non-client area of the main dialogue to give just the client area
+ rdlg.left -= chrome.left; rdlg.top -= chrome.top;
+ rdlg.right -= chrome.right; rdlg.bottom -= chrome.bottom;
- rcancel.right -= rcancel.left - 1; rcancel.bottom -= rcancel.top - 1;
- rcancel.left -= rdlg.left; rcancel.top -= rdlg.top;
+ // Translate them to client-relative coordinates wrt the main dialogue window
+ rtab.right -= rtab.left - 1; rtab.bottom -= rtab.top - 1;
+ rtab.left -= rdlg.left; rtab.top -= rdlg.top;
- rstart.right -= rstart.left - 1; rstart.bottom -= rstart.top - 1;
- rstart.left -= rdlg.left; rstart.top -= rdlg.top;
+ rcancel.right -= rcancel.left - 1; rcancel.bottom -= rcancel.top - 1;
+ rcancel.left -= rdlg.left; rcancel.top -= rdlg.top;
- // And then convert the main dialogue coordinates to just width/length
- rdlg.right -= rdlg.left - 1; rdlg.bottom -= rdlg.top - 1;
- rdlg.left = 0; rdlg.top = 0;
+ rstart.right -= rstart.left - 1; rstart.bottom -= rstart.top - 1;
+ rstart.left -= rdlg.left; rstart.top -= rdlg.top;
- // Load the bitmap into the bitmap control and fetch its dimensions
- hbmp = LoadBitmap((HINSTANCE)win_gethinstance(), MAKEINTRESOURCE(RSRC_BMP));
- hwnd = GetDlgItem(hwndDlg,WIN_STARTWIN_BITMAP);
- SendMessage(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)hbmp);
- GetClientRect(hwnd, &r);
- xoffset = r.right;
- yoffset = r.bottom - rdlg.bottom;
+ // And then convert the main dialogue coordinates to just width/length
+ rdlg.right -= rdlg.left - 1; rdlg.bottom -= rdlg.top - 1;
+ rdlg.left = 0; rdlg.top = 0;
- // Shift and resize the controls that require it
- rtab.left += xoffset; rtab.bottom += yoffset;
- rcancel.left += xoffset; rcancel.top += yoffset;
- rstart.left += xoffset; rstart.top += yoffset;
- rdlg.right += xoffset;
- rdlg.bottom += yoffset;
+ // Load the bitmap into the bitmap control and fetch its dimensions
+ hbmp = LoadBitmap((HINSTANCE)win_gethinstance(), MAKEINTRESOURCE(RSRC_BMP));
+ hwnd = GetDlgItem(hwndDlg,WIN_STARTWIN_BITMAP);
+ SendMessage(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)hbmp);
+ GetClientRect(hwnd, &r);
+ xoffset = r.right;
+ yoffset = r.bottom - rdlg.bottom;
- // Move the controls to their new positions
- MoveWindow(GetDlgItem(hwndDlg, WIN_STARTWIN_TABCTL), rtab.left, rtab.top, rtab.right, rtab.bottom, FALSE);
- MoveWindow(GetDlgItem(hwndDlg, WIN_STARTWIN_CANCEL), rcancel.left, rcancel.top, rcancel.right, rcancel.bottom, FALSE);
- MoveWindow(GetDlgItem(hwndDlg, WIN_STARTWIN_START), rstart.left, rstart.top, rstart.right, rstart.bottom, FALSE);
+ // Shift and resize the controls that require it
+ rtab.left += xoffset; rtab.bottom += yoffset;
+ rcancel.left += xoffset; rcancel.top += yoffset;
+ rstart.left += xoffset; rstart.top += yoffset;
+ rdlg.right += xoffset;
+ rdlg.bottom += yoffset;
- // Move the main dialogue to the centre of the screen
- hdc = GetDC(NULL);
- rdlg.left = (GetDeviceCaps(hdc, HORZRES) - rdlg.right) / 2;
- rdlg.top = (GetDeviceCaps(hdc, VERTRES) - rdlg.bottom) / 2;
- ReleaseDC(NULL, hdc);
- MoveWindow(hwndDlg, rdlg.left + chrome.left, rdlg.top + chrome.left,
- rdlg.right + (-chrome.left+chrome.right), rdlg.bottom + (-chrome.top+chrome.bottom), TRUE);
+ // Move the controls to their new positions
+ MoveWindow(GetDlgItem(hwndDlg, WIN_STARTWIN_TABCTL), rtab.left, rtab.top, rtab.right, rtab.bottom, FALSE);
+ MoveWindow(GetDlgItem(hwndDlg, WIN_STARTWIN_CANCEL), rcancel.left, rcancel.top, rcancel.right, rcancel.bottom, FALSE);
+ MoveWindow(GetDlgItem(hwndDlg, WIN_STARTWIN_START), rstart.left, rstart.top, rstart.right, rstart.bottom, FALSE);
- // Add tabs to the tab control
- {
- TCITEM tab;
-
- hwnd = GetDlgItem(hwndDlg, WIN_STARTWIN_TABCTL);
+ // Move the main dialogue to the centre of the screen
+ hdc = GetDC(NULL);
+ rdlg.left = (GetDeviceCaps(hdc, HORZRES) - rdlg.right) / 2;
+ rdlg.top = (GetDeviceCaps(hdc, VERTRES) - rdlg.bottom) / 2;
+ ReleaseDC(NULL, hdc);
+ MoveWindow(hwndDlg, rdlg.left + chrome.left, rdlg.top + chrome.left,
+ rdlg.right + (-chrome.left+chrome.right), rdlg.bottom + (-chrome.top+chrome.bottom), TRUE);
- ZeroMemory(&tab, sizeof(tab));
- tab.mask = TCIF_TEXT;
- tab.pszText = TEXT("Configuration");
- SendMessage(hwnd, TCM_INSERTITEM, (WPARAM)TAB_CONFIG, (LPARAM)&tab);
- tab.mask = TCIF_TEXT;
- tab.pszText = TEXT("Game");
- SendMessage(hwnd, TCM_INSERTITEM, (WPARAM)TAB_GAME, (LPARAM)&tab);
- tab.mask = TCIF_TEXT;
- tab.pszText = TEXT("Messages");
- SendMessage(hwnd, TCM_INSERTITEM, (WPARAM)TAB_MESSAGES, (LPARAM)&tab);
+ // Add tabs to the tab control
+ {
+ TCITEM tab;
- // Work out the position and size of the area inside the tab control for the pages
- ZeroMemory(&r, sizeof(r));
- GetClientRect(hwnd, &r);
- SendMessage(hwnd, TCM_ADJUSTRECT, FALSE, (LPARAM)&r);
- r.right -= r.left-1;
- r.bottom -= r.top-1;
- r.top += rtab.top;
- r.left += rtab.left;
+ hwnd = GetDlgItem(hwndDlg, WIN_STARTWIN_TABCTL);
- // Create the pages and position them in the tab control, but hide them
- pages[TAB_CONFIG] = CreateDialog((HINSTANCE)win_gethinstance(),
- MAKEINTRESOURCE(WIN_STARTWINPAGE_CONFIG), hwndDlg, ConfigPageProc);
- pages[TAB_GAME] = CreateDialog((HINSTANCE)win_gethinstance(),
- MAKEINTRESOURCE(WIN_STARTWINPAGE_GAME), hwndDlg, GamePageProc);
- pages[TAB_MESSAGES] = GetDlgItem(hwndDlg, WIN_STARTWIN_MESSAGES);
- SetWindowPos(pages[TAB_CONFIG], hwnd,r.left,r.top,r.right,r.bottom,SWP_HIDEWINDOW);
- SetWindowPos(pages[TAB_GAME], hwnd,r.left,r.top,r.right,r.bottom,SWP_HIDEWINDOW);
- SetWindowPos(pages[TAB_MESSAGES], hwnd,r.left,r.top,r.right,r.bottom,SWP_HIDEWINDOW);
+ ZeroMemory(&tab, sizeof(tab));
+ tab.mask = TCIF_TEXT;
+ tab.pszText = TEXT("Configuration");
+ SendMessage(hwnd, TCM_INSERTITEM, (WPARAM)TAB_CONFIG, (LPARAM)&tab);
+ tab.mask = TCIF_TEXT;
+ tab.pszText = TEXT("Game");
+ SendMessage(hwnd, TCM_INSERTITEM, (WPARAM)TAB_GAME, (LPARAM)&tab);
+ tab.mask = TCIF_TEXT;
+ tab.pszText = TEXT("Messages");
+ SendMessage(hwnd, TCM_INSERTITEM, (WPARAM)TAB_MESSAGES, (LPARAM)&tab);
- // Tell the editfield acting as the console to exclude the width of the scrollbar
- GetClientRect(pages[TAB_MESSAGES],&r);
- r.right -= GetSystemMetrics(SM_CXVSCROLL)+4;
- r.left = r.top = 0;
- SendMessage(pages[TAB_MESSAGES], EM_SETRECTNP,0,(LPARAM)&r);
+ // Work out the position and size of the area inside the tab control for the pages
+ ZeroMemory(&r, sizeof(r));
+ GetClientRect(hwnd, &r);
+ SendMessage(hwnd, TCM_ADJUSTRECT, FALSE, (LPARAM)&r);
+ r.right -= r.left-1;
+ r.bottom -= r.top-1;
+ r.top += rtab.top;
+ r.left += rtab.left;
- // Set a tab stop in the game data listbox
- {
- DWORD tabs[1] = { 150 };
- ListBox_SetTabStops(GetDlgItem(pages[TAB_GAME], IDGDATA), 1, tabs);
- }
+ // Create the pages and position them in the tab control, but hide them
+ pages[TAB_CONFIG] = CreateDialog((HINSTANCE)win_gethinstance(),
+ MAKEINTRESOURCE(WIN_STARTWINPAGE_CONFIG), hwndDlg, ConfigPageProc);
+ pages[TAB_GAME] = CreateDialog((HINSTANCE)win_gethinstance(),
+ MAKEINTRESOURCE(WIN_STARTWINPAGE_GAME), hwndDlg, GamePageProc);
+ pages[TAB_MESSAGES] = GetDlgItem(hwndDlg, WIN_STARTWIN_MESSAGES);
+ SetWindowPos(pages[TAB_CONFIG], hwnd,r.left,r.top,r.right,r.bottom,SWP_HIDEWINDOW);
+ SetWindowPos(pages[TAB_GAME], hwnd,r.left,r.top,r.right,r.bottom,SWP_HIDEWINDOW);
+ SetWindowPos(pages[TAB_MESSAGES], hwnd,r.left,r.top,r.right,r.bottom,SWP_HIDEWINDOW);
- SetFocus(GetDlgItem(hwndDlg, WIN_STARTWIN_START));
- SetWindowText(hwndDlg, apptitle);
- }
- return FALSE;
- }
+ // Tell the editfield acting as the console to exclude the width of the scrollbar
+ GetClientRect(pages[TAB_MESSAGES],&r);
+ r.right -= GetSystemMetrics(SM_CXVSCROLL)+4;
+ r.left = r.top = 0;
+ SendMessage(pages[TAB_MESSAGES], EM_SETRECTNP,0,(LPARAM)&r);
- case WM_NOTIFY: {
- LPNMHDR nmhdr = (LPNMHDR)lParam;
- int cur;
- if (nmhdr->idFrom != WIN_STARTWIN_TABCTL) break;
- cur = (int)SendMessage(nmhdr->hwndFrom, TCM_GETCURSEL,0,0);
- switch (nmhdr->code) {
- case TCN_SELCHANGING: {
- if (cur < 0 || !pages[cur]) break;
- ShowWindow(pages[cur],SW_HIDE);
- return TRUE;
- }
- case TCN_SELCHANGE: {
- if (cur < 0 || !pages[cur]) break;
- ShowWindow(pages[cur],SW_SHOW);
- return TRUE;
- }
- }
- break;
- }
+ // Set a tab stop in the game data listbox
+ {
+ DWORD tabs[1] = { 150 };
+ ListBox_SetTabStops(GetDlgItem(pages[TAB_GAME], IDGDATA), 1, tabs);
+ }
- case WM_CLOSE:
- if (mode == TAB_CONFIG) done = 0;
- else quitevent++;
- return TRUE;
+ SetFocus(GetDlgItem(hwndDlg, WIN_STARTWIN_START));
+ SetWindowText(hwndDlg, apptitle);
+ }
+ return FALSE;
+ }
- case WM_DESTROY:
- if (hbmp) {
- DeleteObject(hbmp);
- hbmp = NULL;
- }
+ case WM_NOTIFY: {
+ LPNMHDR nmhdr = (LPNMHDR)lParam;
+ int cur;
+ if (nmhdr->idFrom != WIN_STARTWIN_TABCTL) break;
+ cur = (int)SendMessage(nmhdr->hwndFrom, TCM_GETCURSEL,0,0);
+ switch (nmhdr->code) {
+ case TCN_SELCHANGING: {
+ if (cur < 0 || !pages[cur]) break;
+ ShowWindow(pages[cur],SW_HIDE);
+ return TRUE;
+ }
+ case TCN_SELCHANGE: {
+ if (cur < 0 || !pages[cur]) break;
+ ShowWindow(pages[cur],SW_SHOW);
+ return TRUE;
+ }
+ }
+ break;
+ }
- if (pages[TAB_GAME]) {
- DestroyWindow(pages[TAB_GAME]);
- pages[TAB_GAME] = NULL;
- }
+ case WM_CLOSE:
+ if (mode == TAB_CONFIG) done = 0;
+ else quitevent++;
+ return TRUE;
- if (pages[TAB_CONFIG]) {
- DestroyWindow(pages[TAB_CONFIG]);
- pages[TAB_CONFIG] = NULL;
- }
+ case WM_DESTROY:
+ if (hbmp) {
+ DeleteObject(hbmp);
+ hbmp = NULL;
+ }
- startupdlg = NULL;
- return TRUE;
+ if (pages[TAB_GAME]) {
+ DestroyWindow(pages[TAB_GAME]);
+ pages[TAB_GAME] = NULL;
+ }
- case WM_COMMAND:
- switch (LOWORD(wParam)) {
- case WIN_STARTWIN_CANCEL:
- if (mode == TAB_CONFIG) done = 0;
- else quitevent++;
- return TRUE;
- case WIN_STARTWIN_START: done = 1; return TRUE;
- }
- return FALSE;
+ if (pages[TAB_CONFIG]) {
+ DestroyWindow(pages[TAB_CONFIG]);
+ pages[TAB_CONFIG] = NULL;
+ }
- case WM_CTLCOLORSTATIC:
- if ((HWND)lParam == pages[TAB_MESSAGES])
- return (BOOL)GetSysColorBrush(COLOR_WINDOW);
- break;
+ startupdlg = NULL;
+ return TRUE;
- default: break;
- }
+ case WM_COMMAND:
+ switch (LOWORD(wParam)) {
+ case WIN_STARTWIN_CANCEL:
+ if (mode == TAB_CONFIG) done = 0;
+ else quitevent++;
+ return TRUE;
+ case WIN_STARTWIN_START: done = 1; return TRUE;
+ }
+ return FALSE;
- return FALSE;
+ case WM_CTLCOLORSTATIC:
+ if ((HWND)lParam == pages[TAB_MESSAGES])
+ return (BOOL)GetSysColorBrush(COLOR_WINDOW);
+ break;
+
+ default: break;
+ }
+
+ return FALSE;
}
int startwin_open(void)
{
- INITCOMMONCONTROLSEX icc;
- if (startupdlg) return 1;
- icc.dwSize = sizeof(icc);
- icc.dwICC = ICC_TAB_CLASSES;
- InitCommonControlsEx(&icc);
- startupdlg = CreateDialog((HINSTANCE)win_gethinstance(), MAKEINTRESOURCE(WIN_STARTWIN), NULL, startup_dlgproc);
- if (startupdlg) {
- SetPage(TAB_MESSAGES);
- EnableConfig(0);
- return 0;
- }
- return -1;
+ INITCOMMONCONTROLSEX icc;
+ if (startupdlg) return 1;
+ icc.dwSize = sizeof(icc);
+ icc.dwICC = ICC_TAB_CLASSES;
+ InitCommonControlsEx(&icc);
+ startupdlg = CreateDialog((HINSTANCE)win_gethinstance(), MAKEINTRESOURCE(WIN_STARTWIN), NULL, startup_dlgproc);
+ if (startupdlg) {
+ SetPage(TAB_MESSAGES);
+ EnableConfig(0);
+ return 0;
+ }
+ return -1;
}
int startwin_close(void)
{
- if (!startupdlg) return 1;
- DestroyWindow(startupdlg);
- startupdlg = NULL;
- return 0;
+ if (!startupdlg) return 1;
+ DestroyWindow(startupdlg);
+ startupdlg = NULL;
+ return 0;
}
int startwin_puts(const char *buf)
{
- const char *p = NULL, *q = NULL;
- char workbuf[1024];
- static int newline = 0;
- int curlen, linesbefore, linesafter;
- HWND edctl;
- int vis;
+ const char *p = NULL, *q = NULL;
+ char workbuf[1024];
+ static int newline = 0;
+ int curlen, linesbefore, linesafter;
+ HWND edctl;
+ int vis;
- if (!startupdlg) return 1;
-
- edctl = pages[TAB_MESSAGES];
- if (!edctl) return -1;
+ if (!startupdlg) return 1;
- vis = ((int)SendMessage(GetDlgItem(startupdlg, WIN_STARTWIN_TABCTL), TCM_GETCURSEL,0,0) == TAB_MESSAGES);
+ edctl = pages[TAB_MESSAGES];
+ if (!edctl) return -1;
- if (vis) SendMessage(edctl, WM_SETREDRAW, FALSE,0);
- curlen = SendMessage(edctl, WM_GETTEXTLENGTH, 0,0);
- SendMessage(edctl, EM_SETSEL, (WPARAM)curlen, (LPARAM)curlen);
- linesbefore = SendMessage(edctl, EM_GETLINECOUNT, 0,0);
- p = buf;
- while (*p) {
- if (newline) {
- SendMessage(edctl, EM_REPLACESEL, 0, (LPARAM)"\r\n");
- newline = 0;
- }
- q = p;
- while (*q && *q != '\n') q++;
- memcpy(workbuf, p, q-p);
- if (*q == '\n') {
- if (!q[1]) {
- newline = 1;
- workbuf[q-p] = 0;
- } else {
- workbuf[q-p] = '\r';
- workbuf[q-p+1] = '\n';
- workbuf[q-p+2] = 0;
- }
- p = q+1;
- } else {
- workbuf[q-p] = 0;
- p = q;
- }
- SendMessage(edctl, EM_REPLACESEL, 0, (LPARAM)workbuf);
- }
- linesafter = SendMessage(edctl, EM_GETLINECOUNT, 0,0);
- SendMessage(edctl, EM_LINESCROLL, 0, linesafter-linesbefore);
- if (vis) SendMessage(edctl, WM_SETREDRAW, TRUE,0);
- return 0;
+ vis = ((int)SendMessage(GetDlgItem(startupdlg, WIN_STARTWIN_TABCTL), TCM_GETCURSEL,0,0) == TAB_MESSAGES);
+
+ if (vis) SendMessage(edctl, WM_SETREDRAW, FALSE,0);
+ curlen = SendMessage(edctl, WM_GETTEXTLENGTH, 0,0);
+ SendMessage(edctl, EM_SETSEL, (WPARAM)curlen, (LPARAM)curlen);
+ linesbefore = SendMessage(edctl, EM_GETLINECOUNT, 0,0);
+ p = buf;
+ while (*p) {
+ if (newline) {
+ SendMessage(edctl, EM_REPLACESEL, 0, (LPARAM)"\r\n");
+ newline = 0;
+ }
+ q = p;
+ while (*q && *q != '\n') q++;
+ memcpy(workbuf, p, q-p);
+ if (*q == '\n') {
+ if (!q[1]) {
+ newline = 1;
+ workbuf[q-p] = 0;
+ } else {
+ workbuf[q-p] = '\r';
+ workbuf[q-p+1] = '\n';
+ workbuf[q-p+2] = 0;
+ }
+ p = q+1;
+ } else {
+ workbuf[q-p] = 0;
+ p = q;
+ }
+ SendMessage(edctl, EM_REPLACESEL, 0, (LPARAM)workbuf);
+ }
+ linesafter = SendMessage(edctl, EM_GETLINECOUNT, 0,0);
+ SendMessage(edctl, EM_LINESCROLL, 0, linesafter-linesbefore);
+ if (vis) SendMessage(edctl, WM_SETREDRAW, TRUE,0);
+ return 0;
}
int startwin_settitle(const char *str)
{
- if (!startupdlg) return 1;
- SetWindowText(startupdlg, str);
- return 0;
+ if (!startupdlg) return 1;
+ SetWindowText(startupdlg, str);
+ return 0;
}
int startwin_idle(void *v)
{
- if (!startupdlg || !IsWindow(startupdlg)) return 0;
- if (IsDialogMessage(startupdlg, (MSG*)v)) return 1;
- return 0;
+ if (!startupdlg || !IsWindow(startupdlg)) return 0;
+ if (IsDialogMessage(startupdlg, (MSG*)v)) return 1;
+ return 0;
}
extern char *duke3dgrp;
int startwin_run(void)
{
- MSG msg;
- if (!startupdlg) return 1;
+ MSG msg;
+ if (!startupdlg) return 1;
- done = -1;
+ done = -1;
- ScanGroups();
+ ScanGroups();
#ifdef JFAUD
- EnumAudioDevs(&wavedevs, NULL, NULL);
+ EnumAudioDevs(&wavedevs, NULL, NULL);
#endif
- SetPage(TAB_CONFIG);
- EnableConfig(1);
+ SetPage(TAB_CONFIG);
+ EnableConfig(1);
- settings.fullscreen = ScreenMode;
- settings.xdim = ScreenWidth;
- settings.ydim = ScreenHeight;
- settings.bpp = ScreenBPP;
- settings.forcesetup = ForceSetup;
- settings.usemouse = UseMouse;
- settings.usejoy = UseJoystick;
- strncpy(settings.selectedgrp, duke3dgrp, BMAX_PATH);
- PopulateForm(-1);
+ settings.fullscreen = ScreenMode;
+ settings.xdim = ScreenWidth;
+ settings.ydim = ScreenHeight;
+ settings.bpp = ScreenBPP;
+ settings.forcesetup = ForceSetup;
+ settings.usemouse = UseMouse;
+ settings.usejoy = UseJoystick;
+ strncpy(settings.selectedgrp, duke3dgrp, BMAX_PATH);
+ PopulateForm(-1);
- while (done < 0) {
- switch (GetMessage(&msg, NULL, 0,0)) {
- case 0: done = 1; break;
- case -1: return -1;
- default:
- if (IsWindow(startupdlg) && IsDialogMessage(startupdlg, &msg)) break;
- TranslateMessage(&msg);
- DispatchMessage(&msg);
- break;
- }
- }
+ while (done < 0) {
+ switch (GetMessage(&msg, NULL, 0,0)) {
+ case 0: done = 1; break;
+ case -1: return -1;
+ default:
+ if (IsWindow(startupdlg) && IsDialogMessage(startupdlg, &msg)) break;
+ TranslateMessage(&msg);
+ DispatchMessage(&msg);
+ break;
+ }
+ }
- SetPage(TAB_MESSAGES);
- EnableConfig(0);
- if (done) {
- ScreenMode = settings.fullscreen;
- ScreenWidth = settings.xdim;
- ScreenHeight = settings.ydim;
- ScreenBPP = settings.bpp;
- ForceSetup = settings.forcesetup;
- UseMouse = settings.usemouse;
- UseJoystick = settings.usejoy;
- duke3dgrp = settings.selectedgrp;
- }
+ SetPage(TAB_MESSAGES);
+ EnableConfig(0);
+ if (done) {
+ ScreenMode = settings.fullscreen;
+ ScreenWidth = settings.xdim;
+ ScreenHeight = settings.ydim;
+ ScreenBPP = settings.bpp;
+ ForceSetup = settings.forcesetup;
+ UseMouse = settings.usemouse;
+ UseJoystick = settings.usejoy;
+ duke3dgrp = settings.selectedgrp;
+ }
- if (wavedevs) {
- struct audioenumdev *d, *e;
- free(wavedevs->drvs);
- for (e=wavedevs->devs; e; e=d) {
- d = e->next;
- if (e->devs) free(e->devs);
- free(e);
- }
- free(wavedevs);
- }
+ if (wavedevs) {
+ struct audioenumdev *d, *e;
+ free(wavedevs->drvs);
+ for (e=wavedevs->devs; e; e=d) {
+ d = e->next;
+ if (e->devs) free(e->devs);
+ free(e);
+ }
+ free(wavedevs);
+ }
- return done;
+ return done;
}