diff --git a/polymer/eduke32/build/src/build.c b/polymer/eduke32/build/src/build.c index 592ae54d3..b243f83a5 100644 --- a/polymer/eduke32/build/src/build.c +++ b/polymer/eduke32/build/src/build.c @@ -1394,7 +1394,7 @@ void overheadeditor(void) if (graphicsmode == 2) totalclocklock = totalclock; - drawmapview(pos.x, pos.y + scale((65536/zoom), ydim, 200), zoom, 1536); + drawmapview(pos.x, pos.y + scale((65536/zoom), ydim, 240), zoom, 1536); yxaspect = i; xyaspect = ii; } diff --git a/polymer/eduke32/build/src/kplib.c b/polymer/eduke32/build/src/kplib.c index 81b2896a5..3bb86e8c6 100644 --- a/polymer/eduke32/build/src/kplib.c +++ b/polymer/eduke32/build/src/kplib.c @@ -302,9 +302,9 @@ static inline int32_t bitrev(int32_t b, int32_t c) return(j); } -static inline int32_t testflag(int32_t c) { return(0); } +static inline int32_t testflag(int32_t c) { UNREFERENCED_PARAMETER(c); return(0); } -static inline void cpuid(int32_t a, int32_t *s) {} +static inline void cpuid(int32_t a, int32_t *s) { UNREFERENCED_PARAMETER(a); UNREFERENCED_PARAMETER(s);} #endif @@ -1812,7 +1812,7 @@ static int32_t kgifrend(const char *kfilebuf, int32_t kfilelength, int32_t lzcols, dat, blocklen, bitcnt, xoff, transcol, backcol, *lptr; intptr_t yoff; char numbits, startnumbits, chunkind, ilacefirst; - const uint8_t *ptr, *cptr; + const uint8_t *ptr, *cptr = NULL; UNREFERENCED_PARAMETER(kfilelength); @@ -1993,10 +1993,10 @@ static int32_t ktgarend(const char *header, int32_t fleng, intptr_t daframeplace, int32_t dabytesperline, int32_t daxres, int32_t dayres, int32_t daglobxoffs, int32_t daglobyoffs) { - int32_t i, x, y, pi, xi, yi, x0, x1, y0, y1, xsiz, ysiz, rlestat, colbyte, pixbyte; + int32_t i = 0, x, y, pi, xi, yi, x0, x1, y0, y1, xsiz, ysiz, rlestat, colbyte, pixbyte; intptr_t p; - const uint8_t *fptr, *cptr, *nptr; + const uint8_t *fptr, *cptr = NULL, *nptr; //Ugly and unreliable identification for .TGA! if ((fleng < 19) || (header[1]&0xfe)) return(-1); @@ -2289,7 +2289,7 @@ static int32_t kpcxrend(const char *buf, int32_t fleng, static int32_t kddsrend(const char *buf, int32_t leng, intptr_t frameptr, int32_t bpl, int32_t xdim, int32_t ydim, int32_t xoff, int32_t yoff) { - int32_t x, y, z, xx, yy, xsiz, ysiz, dxt, al[2], ai, k, v, c0, c1, stride; + int32_t x, y, z = 0, xx, yy, xsiz, ysiz, dxt, al[2], ai, k, v, c0, c1, stride; intptr_t j; uint32_t lut[256], r[4], g[4], b[4], a[8], rr, gg, bb; uint8_t *uptr, *wptr; diff --git a/polymer/eduke32/build/src/winlayer.c b/polymer/eduke32/build/src/winlayer.c index 285b0be60..b84448a4a 100644 --- a/polymer/eduke32/build/src/winlayer.c +++ b/polymer/eduke32/build/src/winlayer.c @@ -3388,6 +3388,8 @@ static int32_t SetupOpenGL(int32_t width, int32_t height, int32_t bitspp) err = 0; else if (!Bstrcmp(glinfo.renderer,"Intel 965/963 Graphics Media Accelerator")) err = 0; + else if (!Bstrcmp(glinfo.renderer,"Intel Cantiga")) + err = 0; else err = 1; } #ifdef POLYMER diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c index 1f593d3cb..25d7982fe 100644 --- a/polymer/eduke32/source/astub.c +++ b/polymer/eduke32/source/astub.c @@ -512,10 +512,12 @@ void ExtLoadMap(const char *mapname) } */ // Presize Sprites + +/* for (j=numsprites; j>=0; j--) { - /* if (tilesizx[sprite[j].picnum]==0 || tilesizy[sprite[j].picnum]==0) - sprite[j].picnum=0; */ + / * if (tilesizx[sprite[j].picnum]==0 || tilesizy[sprite[j].picnum]==0) + sprite[j].picnum=0; * / if (sprite[j].picnum>=20 && sprite[j].picnum<=59) { @@ -532,6 +534,7 @@ void ExtLoadMap(const char *mapname) } } +*/ Bstrcpy(levelname,mapname); pskyoff[0]=0; diff --git a/polymer/eduke32/source/duke3d.h b/polymer/eduke32/source/duke3d.h index 82d7bc039..0fa9080d2 100644 --- a/polymer/eduke32/source/duke3d.h +++ b/polymer/eduke32/source/duke3d.h @@ -52,7 +52,7 @@ extern "C" { #include "macros.h" #define APPNAME "EDuke32" -#define VERSION " 1.5.0unstable" +#define VERSION " 2.0.0devel" // this is checked against http://eduke32.com/VERSION extern const char *s_buildDate; #define HEAD2 APPNAME VERSION diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 680a57d15..30bc62136 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -10962,11 +10962,11 @@ CLEAN_DIRECTORY: { // ud.last_level is used as a flag here to reset the string to DUKE.RTS after load if (WW2GI) - ud.last_level = (int32_t)Bstrcpy(ud.rtsname, "WW2GI.RTS"); + ud.last_level = (Bstrcpy(ud.rtsname, "WW2GI.RTS") == ud.rtsname); else if (NAM) - ud.last_level = (int32_t)Bstrcpy(ud.rtsname, "NAM.RTS"); + ud.last_level = (Bstrcpy(ud.rtsname, "NAM.RTS") == ud.rtsname); else - ud.last_level = (int32_t)Bstrcpy(ud.rtsname, "DUKE.RTS"); + ud.last_level = (Bstrcpy(ud.rtsname, "DUKE.RTS") == ud.rtsname); } RTS_Init(ud.rtsname); diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c index 945f50cd1..682313057 100644 --- a/polymer/eduke32/source/gamedef.c +++ b/polymer/eduke32/source/gamedef.c @@ -6017,11 +6017,14 @@ void C_Compile(const char *filenam) { #ifdef WIN32 Bsprintf(tempbuf,"Duke Nukem 3D game data was not found. A valid copy of '%s' or other compatible data is needed to run EDuke32.\n\n" - "You can find '%s' in the \"DN3DINST\" or \"ATOMINST\" directory on your Duke Nukem 3D installation CD.\n\n" - "If you don't already own a copy of Duke, you can get Duke Nukem 3D: Atomic Edition for only $5.99 through our partnership with GOG.com.\n\nGet Duke now?", + "You can find '%s' in the 'DN3DINST' or 'ATOMINST' directory on your Duke Nukem 3D installation CD.\n\n" + "If you don't already own a copy of Duke or haven't seen your disc in years, don't worry -- you can download the full, registered " + "version of Duke Nukem 3D: Atomic Edition immediately for only $5.99 through our partnership with GOG.com.\n\n" + "Not a typo; it's less than 6 bucks. Get Duke now?\n\n" + "(Clicking yes will bring you to our web store)", duke3dgrp,duke3dgrp); - if (wm_ynbox("EDuke32",tempbuf)) + if (wm_ynbox("Important - Duke Nukem 3D not found - EDuke32",tempbuf)) { SHELLEXECUTEINFOA sinfo; char *p = "http://www.gog.com/en/gamecard/duke_nukem_3d_atomic_edition/pp/6c1e671f9af5b46d9c1a52067bdf0e53685674f7"; @@ -6035,12 +6038,12 @@ void C_Compile(const char *filenam) sinfo.lpClass = "http"; if (!ShellExecuteExA(&sinfo)) - initprintf("gog: error launching browser!\n"); + G_GameExit("Error launching default system browser!"); } G_GameExit(""); #else Bsprintf(tempbuf,"Duke Nukem 3D game data was not found. A valid copy of '%s' or other compatible data is needed to run EDuke32.\n" - "You can find '%s' in the \"DN3DINST\" or \"ATOMINST\" directory on your Duke Nukem 3D installation CD-ROM.\n\n" + "You can find '%s' in the 'DN3DINST' or 'ATOMINST' directory on your Duke Nukem 3D installation CD-ROM.\n\n" "EDuke32 will now close.", duke3dgrp,duke3dgrp); G_GameExit(tempbuf); diff --git a/polymer/eduke32/source/gamevars.c b/polymer/eduke32/source/gamevars.c index 70df9a1a0..3503565e3 100644 --- a/polymer/eduke32/source/gamevars.c +++ b/polymer/eduke32/source/gamevars.c @@ -700,13 +700,13 @@ int32_t __fastcall Gv_GetVarX(register int32_t id) if (id&(MAXGAMEVARS<<3)) // struct shortcut vars { - register int32_t index=Gv_GetVarX(*insptr++); + int32_t index=Gv_GetVarX(*insptr++); switch ((id&(MAXGAMEVARS-1)) - g_iSpriteVarID) { case 0: //if (id == g_iSpriteVarID) { - int32_t parm2 = 0, label = *insptr++; + register int32_t parm2 = 0, label = *insptr++; /*OSD_Printf("%d %d %d\n",__LINE__,index,label);*/ if (ActorLabels[label].flags & LABEL_HASPARM2) @@ -716,7 +716,7 @@ int32_t __fastcall Gv_GetVarX(register int32_t id) } case 3: //else if (id == g_iPlayerVarID) { - int32_t parm2 = 0, label = *insptr++; + register int32_t parm2 = 0, label = *insptr++; if (PlayerLabels[label].flags & LABEL_HASPARM2) parm2 = Gv_GetVarX(*insptr++); diff --git a/polymer/eduke32/source/global.c b/polymer/eduke32/source/global.c index 354b28c28..1cf629d23 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" -const char *s_buildDate = "20090807"; +const char *s_buildDate = "20090927"; char *MusicPtr = NULL; int32_t g_musicSize; diff --git a/polymer/eduke32/source/jaudiolib/src/driver_directsound.c b/polymer/eduke32/source/jaudiolib/src/driver_directsound.c index ae02367f5..4f4c01df3 100644 --- a/polymer/eduke32/source/jaudiolib/src/driver_directsound.c +++ b/polymer/eduke32/source/jaudiolib/src/driver_directsound.c @@ -342,8 +342,7 @@ int32_t DirectSoundDrv_PCM_Init(int32_t *mixrate, int32_t *numchannels, int32_t return DSErr_Error; } - bufdesc.dwFlags = DSBCAPS_LOCSOFTWARE | - DSBCAPS_CTRLPOSITIONNOTIFY | + bufdesc.dwFlags = DSBCAPS_CTRLPOSITIONNOTIFY | DSBCAPS_GETCURRENTPOSITION2; bufdesc.dwBufferBytes = wfex.nBlockAlign * 2048 * 2; bufdesc.lpwfxFormat = &wfex; diff --git a/polymer/eduke32/source/misc/buildres.rc b/polymer/eduke32/source/misc/buildres.rc index d8dc016f9..eb416a15b 100644 --- a/polymer/eduke32/source/misc/buildres.rc +++ b/polymer/eduke32/source/misc/buildres.rc @@ -31,42 +31,42 @@ BEGIN CONTROL "&Always show this window at startup", IDCALWAYSSHOW, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 118, 116, 140, 8 END -#define FILEVER 1,1,9,9 -#define PRODUCTVER 1,1,9,9 -#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 +#define FILEVER 1,2,9,9 +#define PRODUCTVER 1,2,9,9 +#define STRFILEVER "1.3.0devel\0" +#define STRPRODUCTVER "1.3.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, 2009 EDuke32 Developers" + 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" diff --git a/polymer/eduke32/source/misc/gameres.rc b/polymer/eduke32/source/misc/gameres.rc index 4f5b11ee1..5c6ac9b56 100644 --- a/polymer/eduke32/source/misc/gameres.rc +++ b/polymer/eduke32/source/misc/gameres.rc @@ -64,7 +64,7 @@ BEGIN VALUE "FileDescription", "EDuke32" VALUE "FileVersion", STRFILEVER VALUE "InternalName", "EDuke32" - VALUE "LegalCopyright", "Copyright © 1996, 2003 3D Realms Entertainment, 2004-2008 EDuke32 Team" + VALUE "LegalCopyright", "Copyright © 1996, 2003 3D Realms Entertainment, 2009 EDuke32 Developers" VALUE "LegalTrademarks", "Duke Nukem® is a Registered Trademark of Apogee Software, Ltd." VALUE "OriginalFilename", "eduke32.exe" VALUE "ProductName", "EDuke32"