zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Misc

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1502 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2009-09-28 00:01:06 +00:00
parent 1d6058ecef
commit 577e3bd124
12 changed files with 68 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/build/src/build.c
View file

@ -1394,7 +1394,7 @@ void overheadeditor(void)
if (graphicsmode == 2) if (graphicsmode == 2)
totalclocklock = totalclock; 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; yxaspect = i;
xyaspect = ii; xyaspect = ii;
} }

12
polymer/eduke32/build/src/kplib.c
View file

@ -302,9 +302,9 @@ static inline int32_t bitrev(int32_t b, int32_t c)
return(j); 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 #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; int32_t lzcols, dat, blocklen, bitcnt, xoff, transcol, backcol, *lptr;
intptr_t yoff; intptr_t yoff;
char numbits, startnumbits, chunkind, ilacefirst; char numbits, startnumbits, chunkind, ilacefirst;
const uint8_t *ptr, *cptr; const uint8_t *ptr, *cptr = NULL;
UNREFERENCED_PARAMETER(kfilelength); 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, intptr_t daframeplace, int32_t dabytesperline, int32_t daxres, int32_t dayres,
int32_t daglobxoffs, int32_t daglobyoffs) 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; intptr_t p;
const uint8_t *fptr, *cptr, *nptr; const uint8_t *fptr, *cptr = NULL, *nptr;
//Ugly and unreliable identification for .TGA! //Ugly and unreliable identification for .TGA!
if ((fleng < 19) || (header[1]&0xfe)) return(-1); 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, 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) 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; intptr_t j;
uint32_t lut[256], r[4], g[4], b[4], a[8], rr, gg, bb; uint32_t lut[256], r[4], g[4], b[4], a[8], rr, gg, bb;
uint8_t *uptr, *wptr; uint8_t *uptr, *wptr;

2
polymer/eduke32/build/src/winlayer.c
View file

@ -3388,6 +3388,8 @@ static int32_t SetupOpenGL(int32_t width, int32_t height, int32_t bitspp)
err = 0; err = 0;
else if (!Bstrcmp(glinfo.renderer,"Intel 965/963 Graphics Media Accelerator")) else if (!Bstrcmp(glinfo.renderer,"Intel 965/963 Graphics Media Accelerator"))
err = 0; err = 0;
else if (!Bstrcmp(glinfo.renderer,"Intel Cantiga"))
err = 0;
else err = 1; else err = 1;
} }
#ifdef POLYMER #ifdef POLYMER

7
polymer/eduke32/source/astub.c
View file

@ -512,10 +512,12 @@ void ExtLoadMap(const char *mapname)
} }
*/ */
// Presize Sprites // Presize Sprites
/*
for (j=numsprites; j>=0; j--) for (j=numsprites; j>=0; j--)
{ {
/* if (tilesizx[sprite[j].picnum]==0 || tilesizy[sprite[j].picnum]==0) / * if (tilesizx[sprite[j].picnum]==0 || tilesizy[sprite[j].picnum]==0)
sprite[j].picnum=0; */ sprite[j].picnum=0; * /
if (sprite[j].picnum>=20 && sprite[j].picnum<=59) if (sprite[j].picnum>=20 && sprite[j].picnum<=59)
{ {
@ -532,6 +534,7 @@ void ExtLoadMap(const char *mapname)
} }
} }
*/
Bstrcpy(levelname,mapname); Bstrcpy(levelname,mapname);
pskyoff[0]=0; pskyoff[0]=0;

2
polymer/eduke32/source/duke3d.h
View file

@ -52,7 +52,7 @@ extern "C" {
#include "macros.h" #include "macros.h"
#define APPNAME "EDuke32" #define APPNAME "EDuke32"
#define VERSION " 1.5.0unstable" #define VERSION " 2.0.0devel"
// this is checked against http://eduke32.com/VERSION // this is checked against http://eduke32.com/VERSION
extern const char *s_buildDate; extern const char *s_buildDate;
#define HEAD2 APPNAME VERSION #define HEAD2 APPNAME VERSION

6
polymer/eduke32/source/game.c
View file

@ -10962,11 +10962,11 @@ CLEAN_DIRECTORY:
{ {
// ud.last_level is used as a flag here to reset the string to DUKE.RTS after load // ud.last_level is used as a flag here to reset the string to DUKE.RTS after load
if (WW2GI) 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) else if (NAM)
ud.last_level = (int32_t)Bstrcpy(ud.rtsname, "NAM.RTS"); ud.last_level = (Bstrcpy(ud.rtsname, "NAM.RTS") == ud.rtsname);
else 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); RTS_Init(ud.rtsname);

13
polymer/eduke32/source/gamedef.c
View file

@ -6017,11 +6017,14 @@ void C_Compile(const char *filenam)
{ {
#ifdef WIN32 #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" 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" "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?", "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); duke3dgrp,duke3dgrp);
if (wm_ynbox("EDuke32",tempbuf)) if (wm_ynbox("Important - Duke Nukem 3D not found - EDuke32",tempbuf))
{ {
SHELLEXECUTEINFOA sinfo; SHELLEXECUTEINFOA sinfo;
char *p = "http://www.gog.com/en/gamecard/duke_nukem_3d_atomic_edition/pp/6c1e671f9af5b46d9c1a52067bdf0e53685674f7"; 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"; sinfo.lpClass = "http";
if (!ShellExecuteExA(&sinfo)) if (!ShellExecuteExA(&sinfo))
initprintf("gog: error launching browser!\n"); G_GameExit("Error launching default system browser!");
} }
G_GameExit(""); G_GameExit("");
#else #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" 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.", "EDuke32 will now close.",
duke3dgrp,duke3dgrp); duke3dgrp,duke3dgrp);
G_GameExit(tempbuf); G_GameExit(tempbuf);

6
polymer/eduke32/source/gamevars.c
View file

@ -700,13 +700,13 @@ int32_t __fastcall Gv_GetVarX(register int32_t id)
if (id&(MAXGAMEVARS<<3)) // struct shortcut vars 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) switch ((id&(MAXGAMEVARS-1)) - g_iSpriteVarID)
{ {
case 0: //if (id == 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);*/ /*OSD_Printf("%d %d %d\n",__LINE__,index,label);*/
if (ActorLabels[label].flags & LABEL_HASPARM2) 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) 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) if (PlayerLabels[label].flags & LABEL_HASPARM2)
parm2 = Gv_GetVarX(*insptr++); parm2 = Gv_GetVarX(*insptr++);

2
polymer/eduke32/source/global.c
View file

@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
#include "duke3d.h" #include "duke3d.h"
const char *s_buildDate = "20090807"; const char *s_buildDate = "20090927";
char *MusicPtr = NULL; char *MusicPtr = NULL;
int32_t g_musicSize; int32_t g_musicSize;

3
polymer/eduke32/source/jaudiolib/src/driver_directsound.c
View file

@ -342,8 +342,7 @@ int32_t DirectSoundDrv_PCM_Init(int32_t *mixrate, int32_t *numchannels, int32_t
return DSErr_Error; return DSErr_Error;
} }
bufdesc.dwFlags = DSBCAPS_LOCSOFTWARE | bufdesc.dwFlags = DSBCAPS_CTRLPOSITIONNOTIFY |
DSBCAPS_CTRLPOSITIONNOTIFY |
DSBCAPS_GETCURRENTPOSITION2; DSBCAPS_GETCURRENTPOSITION2;
bufdesc.dwBufferBytes = wfex.nBlockAlign * 2048 * 2; bufdesc.dwBufferBytes = wfex.nBlockAlign * 2048 * 2;
bufdesc.lpwfxFormat = &wfex; bufdesc.lpwfxFormat = &wfex;

72
polymer/eduke32/source/misc/buildres.rc
View file

@ -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 CONTROL "&Always show this window at startup", IDCALWAYSSHOW, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 118, 116, 140, 8
END END
#define FILEVER 1,1,9,9 #define FILEVER 1,2,9,9
#define PRODUCTVER 1,1,9,9 #define PRODUCTVER 1,2,9,9
#define STRFILEVER "1.2.0devel\0" #define STRFILEVER "1.3.0devel\0"
#define STRPRODUCTVER "1.2.0devel\0" #define STRPRODUCTVER "1.3.0devel\0"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION FILEVER FILEVERSION FILEVER
PRODUCTVERSION PRODUCTVER PRODUCTVERSION PRODUCTVER
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x3L FILEFLAGS 0x3L
#else #else
FILEFLAGS 0x2L FILEFLAGS 0x2L
#endif #endif
FILEOS 0x40004L FILEOS 0x40004L
FILETYPE 0x1L FILETYPE 0x1L
FILESUBTYPE 0x0L FILESUBTYPE 0x0L
BEGIN BEGIN
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "FileDescription", "Mapster32" VALUE "FileDescription", "Mapster32"
VALUE "FileVersion", STRFILEVER VALUE "FileVersion", STRFILEVER
VALUE "InternalName", "Mapster32" VALUE "InternalName", "Mapster32"
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 "LegalTrademarks", "Duke Nukem® is a Registered Trademark of Apogee Software, Ltd."
VALUE "OriginalFilename", "mapster32.exe" VALUE "OriginalFilename", "mapster32.exe"
VALUE "ProductName", "Mapster32" VALUE "ProductName", "Mapster32"
VALUE "ProductVersion", STRPRODUCTVER VALUE "ProductVersion", STRPRODUCTVER
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
BEGIN BEGIN
VALUE "Translation", 0x409, 1200 VALUE "Translation", 0x409, 1200
END END
END END
1 24 "rsrc/manifest.build.xml" 1 24 "rsrc/manifest.build.xml"

2
polymer/eduke32/source/misc/gameres.rc
View file

@ -64,7 +64,7 @@ BEGIN
VALUE "FileDescription", "EDuke32" VALUE "FileDescription", "EDuke32"
VALUE "FileVersion", STRFILEVER VALUE "FileVersion", STRFILEVER
VALUE "InternalName", "EDuke32" 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 "LegalTrademarks", "Duke Nukem® is a Registered Trademark of Apogee Software, Ltd."
VALUE "OriginalFilename", "eduke32.exe" VALUE "OriginalFilename", "eduke32.exe"
VALUE "ProductName", "EDuke32" VALUE "ProductName", "EDuke32"