zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-11 07:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
terminx 2008-07-27 01:22:17 +00:00
parent 8b9116d1a4
commit 9ebad22ac8
9 changed files with 62 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
polymer/build/include/osd.h
View file

@ -123,6 +123,7 @@ int OSD_RegisterFunction(const char *name, const char *help, int (*func)(const o
#define OSDTEXT_YELLOW "^23" #define OSDTEXT_YELLOW "^23"
#define OSDTEXT_BRIGHT "^S0" #define OSDTEXT_BRIGHT "^S0"
#define OSD_ERROR OSDTEXT_DARKRED OSDTEXT_BRIGHT
#define TEXTSIZE 32768 #define TEXTSIZE 32768
#endif // __osd_h__ #endif // __osd_h__

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

@ -231,7 +231,7 @@ static int _internal_osdfunc_exec(const osdfuncparm_t *parm)
if (OSD_Exec(fn)) if (OSD_Exec(fn))
{ {
OSD_Printf("exec: file \"%s\" not found.\n", fn); OSD_Printf(OSD_ERROR "exec: file \"%s\" not found.\n", fn);
return OSDCMD_OK; return OSDCMD_OK;
} }
return OSDCMD_OK; return OSDCMD_OK;

39
polymer/eduke32/source/actors.c
View file

@ -1030,7 +1030,8 @@ static void moveplayers(void) //Players
otherx = 0; otherx = 0;
} }
execute(i,s->yvel,otherx); if (actorscrptr[sprite[i].picnum])
execute(i,s->yvel,otherx);
if (ud.multimode > 1) if (ud.multimode > 1)
if (sprite[g_player[otherp].ps->i].extra > 0) if (sprite[g_player[otherp].ps->i].extra > 0)
@ -2261,11 +2262,13 @@ CLEAR_THE_BOLT:
case STEAM__STATIC: case STEAM__STATIC:
case CEILINGSTEAM__STATIC: case CEILINGSTEAM__STATIC:
p = findplayer(s, &x); p = findplayer(s, &x);
execute(i,p,x); if (actorscrptr[sprite[i].picnum])
execute(i,p,x);
goto BOLT; goto BOLT;
case WATERBUBBLEMAKER__STATIC: case WATERBUBBLEMAKER__STATIC:
p = findplayer(s, &x); p = findplayer(s, &x);
execute(i,p,x); if (actorscrptr[sprite[i].picnum])
execute(i,p,x);
goto BOLT; goto BOLT;
} }
@ -2730,8 +2733,11 @@ static void moveweapons(void)
if (hittype[i].projectile.workslike & PROJECTILE_FLAG_HITSCAN) if (hittype[i].projectile.workslike & PROJECTILE_FLAG_HITSCAN)
{ {
p = findplayer(s,&x); if (actorscrptr[sprite[i].picnum])
execute(i,p,x); {
p = findplayer(s,&x);
execute(i,p,x);
}
goto BOLT; goto BOLT;
} }
@ -3091,8 +3097,11 @@ static void moveweapons(void)
goto BOLT; goto BOLT;
case SHOTSPARK1__STATIC: case SHOTSPARK1__STATIC:
p = findplayer(s,&x); if (actorscrptr[sprite[i].picnum])
execute(i,p,x); {
p = findplayer(s,&x);
execute(i,p,x);
}
goto BOLT; goto BOLT;
} }
} }
@ -4760,10 +4769,11 @@ DETONATEB:
} }
} }
// #endif // #endif
if (actorscrptr[sprite[i].picnum])
p = findplayer(s,&x); {
p = findplayer(s,&x);
execute(i,p,x); execute(i,p,x);
}
BOLT: BOLT:
@ -5204,8 +5214,11 @@ static void moveexplosions(void) // STATNUM 5
case FORCERIPPLE__STATIC: case FORCERIPPLE__STATIC:
case TRANSPORTERSTAR__STATIC: case TRANSPORTERSTAR__STATIC:
case TRANSPORTERBEAM__STATIC: case TRANSPORTERBEAM__STATIC:
p = findplayer(s,&x); if (actorscrptr[sprite[i].picnum])
execute(i,p,x); {
p = findplayer(s,&x);
execute(i,p,x);
}
goto BOLT; goto BOLT;
case SHELL__STATIC: case SHELL__STATIC:

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

@ -511,7 +511,7 @@ void getpackets(void)
{ {
if (setgamemode(!ud.config.ScreenMode,ud.config.ScreenWidth,ud.config.ScreenHeight,ud.config.ScreenBPP)) if (setgamemode(!ud.config.ScreenMode,ud.config.ScreenWidth,ud.config.ScreenHeight,ud.config.ScreenBPP))
{ {
OSD_Printf(OSDTEXT_DARKRED OSDTEXT_BRIGHT "Failed setting fullscreen video mode.\n"); OSD_Printf(OSD_ERROR "Failed setting fullscreen video mode.\n");
if (setgamemode(ud.config.ScreenMode, ud.config.ScreenWidth, ud.config.ScreenHeight, ud.config.ScreenBPP)) if (setgamemode(ud.config.ScreenMode, ud.config.ScreenWidth, ud.config.ScreenHeight, ud.config.ScreenBPP))
gameexit("Failed to recover from failure to set fullscreen video mode.\n"); gameexit("Failed to recover from failure to set fullscreen video mode.\n");
} }
@ -2446,7 +2446,7 @@ static void operatefta(void)
if (fta_quotes[g_player[screenpeek].ps->ftq] == NULL) if (fta_quotes[g_player[screenpeek].ps->ftq] == NULL)
{ {
OSD_Printf(OSDTEXT_DARKRED OSDTEXT_BRIGHT "%s %d null quote %d\n",__FILE__,__LINE__,g_player[screenpeek].ps->ftq); OSD_Printf(OSD_ERROR "%s %d null quote %d\n",__FILE__,__LINE__,g_player[screenpeek].ps->ftq);
return; return;
} }
@ -2489,7 +2489,7 @@ void FTA(int q, player_struct *p)
if (fta_quotes[q] == NULL) if (fta_quotes[q] == NULL)
{ {
OSD_Printf(OSDTEXT_DARKRED OSDTEXT_BRIGHT "%s %d null quote %d\n",__FILE__,__LINE__,q); OSD_Printf(OSD_ERROR "%s %d null quote %d\n",__FILE__,__LINE__,q);
return; return;
} }
@ -5338,7 +5338,7 @@ int spawn(int j, int pn)
if (sp->hitag && sp->picnum == WATERBUBBLEMAKER) if (sp->hitag && sp->picnum == WATERBUBBLEMAKER)
{ {
// JBF 20030913: Pisses off move(), eg. in bobsp2 // JBF 20030913: Pisses off move(), eg. in bobsp2
OSD_Printf(OSDTEXT_DARKRED OSDTEXT_BRIGHT "WARNING: WATERBUBBLEMAKER %d @ %d,%d with hitag!=0. Applying fixup.\n", OSD_Printf(OSD_ERROR "WARNING: WATERBUBBLEMAKER %d @ %d,%d with hitag!=0. Applying fixup.\n",
i,sp->x,sp->y); i,sp->x,sp->y);
sp->hitag = 0; sp->hitag = 0;
} }
@ -9672,12 +9672,14 @@ void Shutdown(void)
static void compilecons(void) static void compilecons(void)
{ {
int i; int i, psm = pathsearchmode;
label = (char *)&sprite[0]; // V8: 16384*44/64 = 11264 V7: 4096*44/64 = 2816 label = (char *)&sprite[0]; // V8: 16384*44/64 = 11264 V7: 4096*44/64 = 2816
labelcode = (intptr_t *)&sector[0]; // V8: 4096*40/4 = 40960 V7: 1024*40/4 = 10240 labelcode = (intptr_t *)&sector[0]; // V8: 4096*40/4 = 40960 V7: 1024*40/4 = 10240
labeltype = (intptr_t *)&wall[0]; // V8: 16384*32/4 = 131072 V7: 8192*32/4 = 65536 labeltype = (intptr_t *)&wall[0]; // V8: 16384*32/4 = 131072 V7: 8192*32/4 = 65536
// if we compile for a V7 engine wall[] should be used for label names since it's bigger
Bcorrectfilename(confilename,0);
// if we compile for a V7 engine wall[] should be used for label names since it's bigger
pathsearchmode = 1;
if (userconfiles == 0) if (userconfiles == 0)
{ {
i = kopen4load(confilename,0); i = kopen4load(confilename,0);
@ -9728,6 +9730,7 @@ static void compilecons(void)
clearbufbyte(&wall[0], sizeof(walltype) * MAXWALLS, 0); clearbufbyte(&wall[0], sizeof(walltype) * MAXWALLS, 0);
OnEvent(EVENT_INIT, -1, -1, -1); OnEvent(EVENT_INIT, -1, -1, -1);
pathsearchmode = psm;
} }
static void sanitizegametype() static void sanitizegametype()
@ -10169,6 +10172,12 @@ void app_main(int argc,const char **argv)
backgroundidle = 0; backgroundidle = 0;
#endif #endif
#ifdef _WIN32
tempbuf[GetModuleFileName(NULL,tempbuf,BMAX_PATH)] = 0;
Bcorrectfilename(tempbuf,1);
chdir(tempbuf);
#endif
OSD_SetLogFile("eduke32.log"); OSD_SetLogFile("eduke32.log");
OSD_SetParameters(6,0, 0,12, 2,12); OSD_SetParameters(6,0, 0,12, 2,12);
OSD_SetFunctions( OSD_SetFunctions(
@ -10890,7 +10899,7 @@ static int opendemoread(int which_demo) // 0 = mine
newgame(ud.volume_number,ud.level_number,ud.player_skill); newgame(ud.volume_number,ud.level_number,ud.player_skill);
return(1); return(1);
corrupt: corrupt:
OSD_Printf(OSDTEXT_DARKRED OSDTEXT_BRIGHT "Demo %d header is corrupt.\n",which_demo); OSD_Printf(OSD_ERROR "Demo %d header is corrupt.\n",which_demo);
ud.reccnt = 0; ud.reccnt = 0;
kclose(recfilep); kclose(recfilep);
return 0; return 0;
@ -11043,7 +11052,7 @@ RECHECK:
l = min(ud.reccnt,RECSYNCBUFSIZ); l = min(ud.reccnt,RECSYNCBUFSIZ);
if (kdfread(recsync,sizeof(input)*ud.multimode,l/ud.multimode,recfilep) != l/ud.multimode) if (kdfread(recsync,sizeof(input)*ud.multimode,l/ud.multimode,recfilep) != l/ud.multimode)
{ {
OSD_Printf(OSDTEXT_DARKRED OSDTEXT_BRIGHT "Demo %d is corrupt.\n", which_demo-1); OSD_Printf(OSD_ERROR "Demo %d is corrupt.\n", which_demo-1);
foundemo = 0; foundemo = 0;
ud.reccnt = 0; ud.reccnt = 0;
kclose(recfilep); kclose(recfilep);

10
polymer/eduke32/source/gameexec.c
View file

@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
void restoremapstate(mapstate_t *save); void restoremapstate(mapstate_t *save);
void savemapstate(mapstate_t *save); void savemapstate(mapstate_t *save);
#define CON_ERROR OSDTEXT_DARKRED OSDTEXT_BRIGHT "Line %d, " #define CON_ERROR OSD_ERROR "Line %d, "
int g_i,g_p; int g_i,g_p;
static int g_x; static int g_x;
@ -7719,7 +7719,9 @@ void LoadActor(int iActor)
void execute(int iActor,int iPlayer,int lDist) void execute(int iActor,int iPlayer,int lDist)
{ {
short temp, temp2; int temp, temp2;
// if (actorscrptr[sprite[iActor].picnum] == 0) return;
g_i = iActor; // Sprite ID g_i = iActor; // Sprite ID
g_p = iPlayer; // Player ID g_p = iPlayer; // Player ID
@ -7727,8 +7729,6 @@ void execute(int iActor,int iPlayer,int lDist)
g_sp = &sprite[g_i]; // Pointer to sprite structure g_sp = &sprite[g_i]; // Pointer to sprite structure
g_t = &hittype[g_i].temp_data[0]; // Sprite's 'extra' data g_t = &hittype[g_i].temp_data[0]; // Sprite's 'extra' data
if (actorscrptr[g_sp->picnum] == 0) return;
insptr = 4 + (actorscrptr[g_sp->picnum]); insptr = 4 + (actorscrptr[g_sp->picnum]);
killit_flag = 0; killit_flag = 0;
@ -7946,8 +7946,8 @@ void restoremapstate(mapstate_t *save)
if (save != NULL) if (save != NULL)
{ {
int i, k, x; int i, k, x;
char phealth[ud.multimode];
intptr_t j; intptr_t j;
char phealth[MAXPLAYERS];
for (i=0;i<ud.multimode;i++) for (i=0;i<ud.multimode;i++)
phealth[i] = sprite[g_player[i].ps->i].extra; phealth[i] = sprite[g_player[i].ps->i].extra;

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

@ -621,13 +621,13 @@ int GetGameVarID(int id, int iActor, int iPlayer)
// OSD_Printf("GetGameVarID(): reading from array\n"); // OSD_Printf("GetGameVarID(): reading from array\n");
if ((index < aGameArrays[id].size)&&(index>=0)) if ((index < aGameArrays[id].size)&&(index>=0))
return(m * aGameArrays[id].plValues[index]); return(m * aGameArrays[id].plValues[index]);
OSD_Printf(OSDTEXT_DARKRED OSDTEXT_BRIGHT "GetGameVarID(): invalid array index (%s[%d])\n",aGameArrays[id].szLabel,index); OSD_Printf(OSD_ERROR "GetGameVarID(): invalid array index (%s[%d])\n",aGameArrays[id].szLabel,index);
return -1; return -1;
} }
if (!(id&(MAXGAMEVARS<<1))) if (!(id&(MAXGAMEVARS<<1)))
{ {
OSD_Printf(OSDTEXT_DARKRED OSDTEXT_BRIGHT "GetGameVarID(): invalid gamevar ID (%d)\n",id); OSD_Printf(OSD_ERROR "GetGameVarID(): invalid gamevar ID (%d)\n",id);
return -1; return -1;
} }
@ -681,7 +681,7 @@ void SetGameArrayID(int id,int index, int lValue)
{ {
if (id<0 || id >= iGameArrayCount || !((index < aGameArrays[id].size)&&(index>=0))) if (id<0 || id >= iGameArrayCount || !((index < aGameArrays[id].size)&&(index>=0)))
{ {
OSD_Printf(OSDTEXT_DARKRED OSDTEXT_BRIGHT "SetGameVarID(): tried to set invalid array ID (%d) or index out of bounds from sprite %d (%d), player %d\n",id,g_i,sprite[g_i].picnum,g_p); OSD_Printf(OSD_ERROR "SetGameVarID(): tried to set invalid array ID (%d) or index out of bounds from sprite %d (%d), player %d\n",id,g_i,sprite[g_i].picnum,g_p);
return; return;
} }
aGameArrays[id].plValues[index]=lValue; aGameArrays[id].plValues[index]=lValue;
@ -691,7 +691,7 @@ void SetGameVarID(int id, int lValue, int iActor, int iPlayer)
{ {
if (id<0 || id >= iGameVarCount) if (id<0 || id >= iGameVarCount)
{ {
OSD_Printf(OSDTEXT_DARKRED OSDTEXT_BRIGHT "SetGameVarID(): tried to set invalid gamevar ID (%d) from sprite %d (%d), player %d\n",id,g_i,sprite[g_i].picnum,g_p); OSD_Printf(OSD_ERROR "SetGameVarID(): tried to set invalid gamevar ID (%d) from sprite %d (%d), player %d\n",id,g_i,sprite[g_i].picnum,g_p);
return; return;
} }
//Bsprintf(g_szBuf,"SGVI: %d ('%s') to %d for %d %d",id,aGameVars[id].szLabel,lValue,iActor,iPlayer); //Bsprintf(g_szBuf,"SGVI: %d ('%s') to %d for %d %d",id,aGameVars[id].szLabel,lValue,iActor,iPlayer);
@ -700,7 +700,7 @@ void SetGameVarID(int id, int lValue, int iActor, int iPlayer)
{ {
if (iPlayer < 0 || iPlayer > MAXPLAYERS-1) if (iPlayer < 0 || iPlayer > MAXPLAYERS-1)
{ {
OSD_Printf(OSDTEXT_DARKRED OSDTEXT_BRIGHT "SetGameVarID(): invalid player (%d) for per-player gamevar %s from sprite %d (%d), player %d\n",iPlayer,aGameVars[id].szLabel,g_i,sprite[g_i].picnum,g_p); OSD_Printf(OSD_ERROR "SetGameVarID(): invalid player (%d) for per-player gamevar %s from sprite %d (%d), player %d\n",iPlayer,aGameVars[id].szLabel,g_i,sprite[g_i].picnum,g_p);
return; return;
} }
// for the current player // for the current player
@ -712,7 +712,7 @@ void SetGameVarID(int id, int lValue, int iActor, int iPlayer)
{ {
if (iActor < 0 || iActor > MAXSPRITES-1) if (iActor < 0 || iActor > MAXSPRITES-1)
{ {
OSD_Printf(OSDTEXT_DARKRED OSDTEXT_BRIGHT "SetGameVarID(): invalid sprite (%d) for per-actor gamevar %s from sprite %d (%d), player %d\n",iActor,aGameVars[id].szLabel,g_i,sprite[g_i].picnum,g_p); OSD_Printf(OSD_ERROR "SetGameVarID(): invalid sprite (%d) for per-actor gamevar %s from sprite %d (%d), player %d\n",iActor,aGameVars[id].szLabel,g_i,sprite[g_i].picnum,g_p);
return; return;
} }
// for the current actor // for the current actor
@ -774,7 +774,7 @@ static intptr_t *GetGameValuePtr(const char *szGameLabel)
{ {
if (!aGameVars[i].plValues) if (!aGameVars[i].plValues)
{ {
OSD_Printf(OSDTEXT_DARKRED OSDTEXT_BRIGHT "GetGameValuePtr(): INTERNAL ERROR: NULL array !!!\n"); OSD_Printf(OSD_ERROR "GetGameValuePtr(): INTERNAL ERROR: NULL array !!!\n");
} }
return aGameVars[i].plValues; return aGameVars[i].plValues;
} }

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

@ -188,7 +188,7 @@ static int osdcmd_map(const osdfuncparm_t *parm)
if ((i = kopen4load(filename,0)) < 0) if ((i = kopen4load(filename,0)) < 0)
{ {
OSD_Printf("map: file \"%s\" not found.\n", filename); OSD_Printf(OSD_ERROR "map: file \"%s\" not found.\n", filename);
return OSDCMD_OK; return OSDCMD_OK;
} }
kclose(i); kclose(i);

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

@ -1686,7 +1686,7 @@ int enterlevel(int g)
{ {
if (loadboard(boardfilename,0,&g_player[0].ps->posx, &g_player[0].ps->posy, &g_player[0].ps->posz, &g_player[0].ps->ang,&g_player[0].ps->cursectnum) == -1) if (loadboard(boardfilename,0,&g_player[0].ps->posx, &g_player[0].ps->posy, &g_player[0].ps->posz, &g_player[0].ps->ang,&g_player[0].ps->cursectnum) == -1)
{ {
initprintf("Map '%s' not found!\n",boardfilename); OSD_Printf(OSD_ERROR "Map '%s' not found!\n",boardfilename);
//gameexit(tempbuf); //gameexit(tempbuf);
return 1; return 1;
} }
@ -1708,7 +1708,7 @@ int enterlevel(int g)
} }
else if (loadboard(map[(ud.volume_number*MAXLEVELS)+ud.level_number].filename,0,&g_player[0].ps->posx, &g_player[0].ps->posy, &g_player[0].ps->posz, &g_player[0].ps->ang,&g_player[0].ps->cursectnum) == -1) else if (loadboard(map[(ud.volume_number*MAXLEVELS)+ud.level_number].filename,0,&g_player[0].ps->posx, &g_player[0].ps->posy, &g_player[0].ps->posz, &g_player[0].ps->ang,&g_player[0].ps->cursectnum) == -1)
{ {
initprintf("Map %s not found!\n",map[(ud.volume_number*MAXLEVELS)+ud.level_number].filename); OSD_Printf(OSD_ERROR "Map %s not found!\n",map[(ud.volume_number*MAXLEVELS)+ud.level_number].filename);
//gameexit(tempbuf); //gameexit(tempbuf);
return 1; return 1;
} }
@ -1739,7 +1739,7 @@ int enterlevel(int g)
if (loadboard(levname,1,&g_player[0].ps->posx, &g_player[0].ps->posy, &g_player[0].ps->posz, &g_player[0].ps->ang,&g_player[0].ps->cursectnum) == -1) if (loadboard(levname,1,&g_player[0].ps->posx, &g_player[0].ps->posy, &g_player[0].ps->posz, &g_player[0].ps->ang,&g_player[0].ps->cursectnum) == -1)
{ {
initprintf("Map '%s' not found!\n",map[(ud.volume_number*MAXLEVELS)+ud.level_number].filename); OSD_Printf(OSD_ERROR "Map '%s' not found!\n",map[(ud.volume_number*MAXLEVELS)+ud.level_number].filename);
//gameexit(tempbuf); //gameexit(tempbuf);
return 1; return 1;
} }

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

@ -250,7 +250,7 @@ int loadsound(unsigned int num)
if (g_sounds[num].filename == NULL) if (g_sounds[num].filename == NULL)
{ {
OSD_Printf(OSDTEXT_DARKRED OSDTEXT_BRIGHT "Sound (#%d) not defined!\n",num); OSD_Printf(OSD_ERROR "Sound (#%d) not defined!\n",num);
return 0; return 0;
} }