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

polymer/eduke32/source/misc/buildres.rc

@@ -31,4 +31,42 @@ BEGIN
 	CONTROL "&Always show configuration on start", IDCALWAYSSHOW, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 118, 116, 140, 8
 END
 
+#define FILEVER        1,2,0,0
+#define PRODUCTVER     1,2,0,0
+#define STRFILEVER     "1.2.0devel\0"
+#define STRPRODUCTVER  "1.2.0devel\0"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION FILEVER
+ PRODUCTVERSION PRODUCTVER
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x3L
+#else
+ FILEFLAGS 0x2L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "FileDescription", "Mapster32"
+            VALUE "FileVersion", STRFILEVER
+            VALUE "InternalName", "Mapster32"
+            VALUE "LegalCopyright", "Copyright © 1996, 2003 3D Realms Entertainment, 2004-2008 EDuke32 Team"
+            VALUE "LegalTrademarks", "Duke Nukem® is a Registered Trademark of Apogee Software, Ltd."
+            VALUE "OriginalFilename", "mapster32.exe"
+            VALUE "ProductName", "Mapster32"
+            VALUE "ProductVersion", STRPRODUCTVER
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
 1 24 "rsrc/manifest.build.xml"

polymer/eduke32/source/misc/gameres.rc

@@ -52,4 +52,42 @@ BEGIN
 	CONTROL "",                IDGDATA, "LISTBOX", LBS_NOINTEGRALHEIGHT | LBS_USETABSTOPS | LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 15, 226, 70
 END
 
+#define FILEVER        1,5,0,0
+#define PRODUCTVER     1,5,0,0
+#define STRFILEVER     "1.5.0devel\0"
+#define STRPRODUCTVER  "1.5.0devel\0"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION FILEVER
+ PRODUCTVERSION PRODUCTVER
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x3L
+#else
+ FILEFLAGS 0x2L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "FileDescription", "EDuke32"
+            VALUE "FileVersion", STRFILEVER
+            VALUE "InternalName", "EDuke32"
+            VALUE "LegalCopyright", "Copyright © 1996, 2003 3D Realms Entertainment, 2004-2008 EDuke32 Team"
+            VALUE "LegalTrademarks", "Duke Nukem® is a Registered Trademark of Apogee Software, Ltd."
+            VALUE "OriginalFilename", "eduke32.exe"
+            VALUE "ProductName", "EDuke32"
+            VALUE "ProductVersion", STRPRODUCTVER
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
 1 24 "rsrc/manifest.game.xml"

polymer/eduke32/source/player.c

@@ -189,7 +189,7 @@ static int aim(spritetype *s,int aang,int atwith)
 {
     int gotshrinker,gotfreezer;
     int i, j, a, k, cans;
-    int aimstats[] = {10,13,1,2};
+    static int aimstats[] = {10,13,1,2};
     int dx1, dy1, dx2, dy2, dx3, dy3, smax, sdist;
     int xv, yv;
 
@@ -4063,7 +4063,7 @@ void processinput(int snum)
                 }
 
                 if ((p->posz+p->poszv) >= (fz-(i<<8)) && p->cursectnum >= 0)   // hit the ground
-                    if (sector[p->cursectnum].lotag != 1)
+                    if (psectlotag != 1)
                     {
                         if (p->falling_counter > 62) quickkill(p);