diff --git a/polymer/eduke32/Makefile.msvc b/polymer/eduke32/Makefile.msvc
index 0bc3fed41..08c3b959c 100644
--- a/polymer/eduke32/Makefile.msvc
+++ b/polymer/eduke32/Makefile.msvc
@@ -42,8 +42,7 @@ LIBS=user32.lib gdi32.lib shell32.lib dxguid.lib winmm.lib wsock32.lib comctl32.
LIBS=vorbisfile_static.lib vorbis_static.lib ogg_static.lib $(LIBS)
-ASFLAGS=/nologo /coff
-ASFLAGS=/nologo /coff
+ASFLAGS=/nologo /coff /c
EXESUFFIX=.exe
JMACTOBJ=$(OBJ)\util_lib.$o \
diff --git a/polymer/eduke32/build/Makefile.msvc b/polymer/eduke32/build/Makefile.msvc
index 120a15a4c..a6626352b 100644
--- a/polymer/eduke32/build/Makefile.msvc
+++ b/polymer/eduke32/build/Makefile.msvc
@@ -45,7 +45,7 @@ AS=ml
RC=rc
LINK=link /opt:nowin98 /opt:ref /nologo
CFLAGS=$(CFLAGS) /nologo /MD /J $(flags_cl) $(TARGETOPTS) /I$(INC) /I$(DXROOT)\include /I$(MSSDKROOT)\include" /I$(PLATFORMSDK)\include"
-ASFLAGS=/nologo /coff
+ASFLAGS=/nologo /coff /c
EXESUFFIX=.exe
ENGINEOBJS= \
diff --git a/polymer/eduke32/build/src/polymost.c b/polymer/eduke32/build/src/polymost.c
index b60de4d8e..2660f2cec 100644
--- a/polymer/eduke32/build/src/polymost.c
+++ b/polymer/eduke32/build/src/polymost.c
@@ -896,7 +896,7 @@ void resizeglcheck()
if ((glox1 != windowx1) || (gloy1 != windowy1) || (glox2 != windowx2) || (gloy2 != windowy2))
{
- double ratio = 1.025;
+ double ratio = 1.05;
if (glwidescreen == 1)
ratio = 1.2f;
@@ -4171,7 +4171,7 @@ void polymost_drawrooms()
short hitsect, hitwall, hitsprite;
int vx, vy, vz, hitx, hity, hitz;
int cz, fz;
- double ratio = 1.025;
+ double ratio = 1.05;
if (glwidescreen == 1)
ratio = 1.2f;
diff --git a/polymer/eduke32/eduke32.sln b/polymer/eduke32/eduke32.sln
index d14894d24..677e3b6b3 100644
--- a/polymer/eduke32/eduke32.sln
+++ b/polymer/eduke32/eduke32.sln
@@ -5,20 +5,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eduke32", "eduke32.vcproj",
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Classic Debug|Win32 = Classic Debug|Win32
- Classic Release|Win32 = Classic Release|Win32
- HRP SD Debug|Win32 = HRP SD Debug|Win32
- HRP SD Release|Win32 = HRP SD Release|Win32
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Classic Debug|Win32.ActiveCfg = Classic|Win32
- {8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Classic Debug|Win32.Build.0 = Classic|Win32
- {8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Classic Release|Win32.ActiveCfg = Classic Release|Win32
- {8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Classic Release|Win32.Build.0 = Classic Release|Win32
- {8E7A6179-0B72-4073-8A4C-E8682D481DAE}.HRP SD Debug|Win32.ActiveCfg = HRP SD|Win32
- {8E7A6179-0B72-4073-8A4C-E8682D481DAE}.HRP SD Debug|Win32.Build.0 = HRP SD|Win32
- {8E7A6179-0B72-4073-8A4C-E8682D481DAE}.HRP SD Release|Win32.ActiveCfg = HRP SD Release|Win32
- {8E7A6179-0B72-4073-8A4C-E8682D481DAE}.HRP SD Release|Win32.Build.0 = HRP SD Release|Win32
+ {8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Debug|Win32.Build.0 = Debug|Win32
+ {8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Release|Win32.ActiveCfg = Release|Win32
+ {8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/polymer/eduke32/eduke32.vcproj b/polymer/eduke32/eduke32.vcproj
index 10a3192ae..d6eb650b3 100644
--- a/polymer/eduke32/eduke32.vcproj
+++ b/polymer/eduke32/eduke32.vcproj
@@ -17,27 +17,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -302,6 +180,18 @@
RelativePath=".\build\include\winlayer.h"
>
+
+
+
+
+
+
#endif
-#define BUILDDATE " 20081031"
+#define BUILDDATE " 20081107"
#define VERSION " 1.2.0devel"
static int floor_over_floor;
diff --git a/polymer/eduke32/source/duke3d.h b/polymer/eduke32/source/duke3d.h
index 63f0a0e1f..fe10ab3e9 100644
--- a/polymer/eduke32/source/duke3d.h
+++ b/polymer/eduke32/source/duke3d.h
@@ -288,7 +288,7 @@ enum USRHOOKS_Errors {
};
typedef struct {
- unsigned int bits;
+ uint32 bits;
short fvel, svel;
signed char avel, horz;
unsigned char extbits;
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 70b3bba7f..80864765f 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -2722,9 +2722,9 @@ static void operatefta(void)
k = user_quote_time[i];
if (hud_glowingquotes)
{
- if (k > 4) { mpgametext(j,user_quote[i],(sintable[(totalclock<<5)&2047]>>11),2+8+16); j += textsc(8); }
- else if (k > 2) { mpgametext(j,user_quote[i],(sintable[(totalclock<<5)&2047]>>11),2+8+16+1); j += textsc(k<<1); }
- else { mpgametext(j,user_quote[i],(sintable[(totalclock<<5)&2047]>>11),2+8+16+1+32); j += textsc(k<<1); }
+ if (k > 4) { mpgametext(j,user_quote[i],(sintable[((totalclock+(i<<2))<<5)&2047]>>11),2+8+16); j += textsc(8); }
+ else if (k > 2) { mpgametext(j,user_quote[i],(sintable[((totalclock+(i<<2))<<5)&2047]>>11),2+8+16+1); j += textsc(k<<1); }
+ else { mpgametext(j,user_quote[i],(sintable[((totalclock+(i<<2))<<5)&2047]>>11),2+8+16+1+32); j += textsc(k<<1); }
}
else
{
diff --git a/polymer/eduke32/source/global.c b/polymer/eduke32/source/global.c
index d2e4d92fb..35914b9fd 100644
--- a/polymer/eduke32/source/global.c
+++ b/polymer/eduke32/source/global.c
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//-------------------------------------------------------------------------
#include "duke3d.h"
-char *s_builddate = "20081031";
+char *s_builddate = "20081107";
char *MusicPtr = NULL;
int Musicsize;
diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c
index 6be154235..5a1344095 100644
--- a/polymer/eduke32/source/player.c
+++ b/polymer/eduke32/source/player.c
@@ -568,7 +568,7 @@ int shoot(int i,int atwith)
if (((sprite[j].picnum >= GREENSLIME)&&(sprite[j].picnum <= GREENSLIME+7))||(sprite[j].picnum ==ROTATEGUN))
{
dal -= (8<<8);
- return -1;
+// return -1;
}
hitx = ldist(&sprite[g_player[p].ps->i], &sprite[j]);
if (hitx == 0) hitx++;