From ece23acfc629960898100ab3310dc39e69413895 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Wed, 19 Jul 2006 17:35:11 +0000
Subject: [PATCH] I hate this game

git-svn-id: https://svn.eduke32.com/eduke32@223 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/build/src/polymost.c           |  2 +-
 polymer/eduke32/source/game.c          | 16 +++++++++-------
 polymer/eduke32/source/misc/gameres.rc |  2 --
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/polymer/build/src/polymost.c b/polymer/build/src/polymost.c
index be6f3a9a9..175ce5f27 100644
--- a/polymer/build/src/polymost.c
+++ b/polymer/build/src/polymost.c
@@ -76,7 +76,7 @@ long usemodels=1, usehightile=1;
 float fogtable[] = { 0.275, 0.325, 0.375, 0.425, 0.475, 0.525, 0.575, 0.625, 0.675, 0.725, 0.775, 0.825, 0.875, 0.925, 0.975, 1.025, 1.075, 1.125, 1.175, 1.225, 1.275, 1.325, 1.375, 1.425, 1.475, 1.525, 1.575, 1.625, 1.675, 1.725, 1.775, 1.825 };
 
 float glnegfogsub = 0.075;
-float glnegshadescale = 6.670;
+float glnegshadescale = 8.300;
 float glshadescale = 1.900;
 
 float glsprshadescale = 1.700;
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index cafb8c8a3..05c48561c 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -3814,7 +3814,6 @@ short spawn( short j, short pn )
     else
     {
         i = pn;
-        ResetActorGameVars(i);
         hittype[i].picnum = PN;
         hittype[i].timetosleep = 0;
         hittype[i].extra = -1;
@@ -8503,7 +8502,10 @@ void Startup(void)
 {
     int i;
 
-    //     readnames();
+    // why the fuck aren't these part of CONFIG_ReadSetup()?
+
+    CONFIG_SetupMouse();
+    CONFIG_SetupJoystick();
 
     CONFIG_WriteSetup();
 
@@ -8876,16 +8878,18 @@ void app_main(int argc,char **argv)
         }
     }
 
+    checkcommandline(argc,argv);
+
+    i = CONFIG_ReadSetup();
+
     if (preinitengine()) {
         wm_msgbox("Build Engine Initialisation Error",
                   "There was a problem initialising the Build engine: %s", engineerrstr);
         exit(1);
     }
 
-    i = CONFIG_ReadSetup();
-
 #if defined RENDERTYPEWIN || (defined RENDERTYPESDL && !defined __APPLE__ && defined HAVE_GTK2)
-    if (i < 0 || ForceSetup || CommandSetup) {
+    if (i < 0 || (netparam == NULL && ForceSetup) || CommandSetup) {
         if (quitevent || !startwin_run()) {
             uninitengine();
             exit(0);
@@ -8910,8 +8914,6 @@ void app_main(int argc,char **argv)
 
     ud.multimode = 1;
 
-    checkcommandline(argc,argv);
-
     if (VOLUMEALL)
         loadgroupfiles(duke3ddef);
 
diff --git a/polymer/eduke32/source/misc/gameres.rc b/polymer/eduke32/source/misc/gameres.rc
index dcced4033..ae69b2f1d 100644
--- a/polymer/eduke32/source/misc/gameres.rc
+++ b/polymer/eduke32/source/misc/gameres.rc
@@ -3,8 +3,6 @@
 #include "startwin.game.h"
 
 RSRC_ICON ICON "rsrc/game_icon.ico"
-RSRC_ICON+1 ICON "rsrc/game_icon.ico"
-RSRC_ICON+2 ICON "rsrc/game_icon.ico"
 RSRC_BMP BITMAP "rsrc/game.bmp"
 
 WIN_STARTWIN DIALOGEX DISCARDABLE  20, 40, 260, 200