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

Eliminate the printf_nowarn stuff that has long since been supplanted by TrackerCast. DONT_BUILD.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4763 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2014-11-25 21:08:58 +00:00
parent f22e202d88
commit 4e034e1331
9 changed files with 65 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
polymer/eduke32/Makefile.common
View file

@ -194,7 +194,6 @@ endif
# 1 = Include debug symbols even when generating release code. # 1 = Include debug symbols even when generating release code.
# 2 = Also enable sanitizers with Clang. On the C side, make 'sprite' etc. be real arrays. # 2 = Also enable sanitizers with Clang. On the C side, make 'sprite' etc. be real arrays.
# DISABLEINLINING - 1 = compile inline functions as extern __fastcall instead of static inline # DISABLEINLINING - 1 = compile inline functions as extern __fastcall instead of static inline
# FORCEWARNINGS - 1 = do not disable any compiler warnings within the source
# KRANDDEBUG - 1 = include logging of krand() calls for debugging the demo system # KRANDDEBUG - 1 = include logging of krand() calls for debugging the demo system
# MEMMAP - 1 = produce .memmap file when linking # MEMMAP - 1 = produce .memmap file when linking
# EFENCE - 1 = compile with Electric Fence for malloc() debugging # EFENCE - 1 = compile with Electric Fence for malloc() debugging
@ -207,7 +206,6 @@ DEBUGANYWAY?=0
KRANDDEBUG?=0 KRANDDEBUG?=0
MEMMAP?=0 MEMMAP?=0
DISABLEINLINING?=0 DISABLEINLINING?=0
FORCEWARNINGS?=0
EFENCE?=0 EFENCE?=0
DMALLOC?=0 DMALLOC?=0
PROFILER?=0 PROFILER?=0
@ -591,9 +589,6 @@ endif
ifneq (0,$(DISABLEINLINING)) ifneq (0,$(DISABLEINLINING))
COMPILERFLAGS+= -DDISABLE_INLINING COMPILERFLAGS+= -DDISABLE_INLINING
endif endif
ifneq (0,$(FORCEWARNINGS))
COMPILERFLAGS+= -DFORCE_WARNINGS
endif
# This should come from the environment: # This should come from the environment:
ifdef EDUKE32_MY_DEVELOPER_ID ifdef EDUKE32_MY_DEVELOPER_ID

38
polymer/eduke32/build/include/compat.h
View file

@ -877,44 +877,6 @@ FORCE_INLINE void *xaligned_malloc(const bsize_t alignment, const bsize_t size)
if (fileptr) { Bfclose(fileptr); fileptr=NULL; } \ if (fileptr) { Bfclose(fileptr); fileptr=NULL; } \
} while (0) } while (0)
#define NOWARN(print_func, fmt, ...) do { \
print_func(fmt, ## __VA_ARGS__); \
} while (0)
#define NOWARN_RETURN(print_func, var, fmt, ...) do { \
var = print_func(fmt, ## __VA_ARGS__); \
} while (0)
#ifdef __cplusplus
#ifndef FORCE_WARNINGS
#ifdef _MSC_VER
// TODO: add MSVC pragmas to disable equivalent warning, if necessary later
#else
#ifdef _WIN32
// MinGW's _Pragma is completely broken so our GCC NOWARN macro is useless there
#pragma GCC diagnostic ignored "-Wformat"
#else
#undef NOWARN
#undef NOWARN_RETURN
#define NOWARN(print_func, fmt, ...) do { _Pragma("GCC diagnostic ignored \"-Wformat\"") \
print_func(fmt, ## __VA_ARGS__); \
_Pragma("GCC diagnostic warning \"-Wformat\"") } while (0)
#define NOWARN_RETURN(print_func, var, fmt, ...) do { _Pragma("GCC diagnostic ignored \"-Wformat\"") \
var = print_func(fmt, ## __VA_ARGS__); \
_Pragma("GCC diagnostic warning \"-Wformat\"") } while (0)
#endif // _WIN32
#endif // _MSC_VER
#endif // FORCE_WARNINGS
#endif // __cplusplus
#define OSD_Printf_nowarn(fmt, ...) NOWARN(OSD_Printf, fmt, ## __VA_ARGS__)
#define Bsprintf_nowarn(fmt, ...) NOWARN(Bsprintf, fmt, ## __VA_ARGS__)
#define Bsprintf_nowarn_return(x, fmt, ...) NOWARN_RETURN(Bsprintf, x, fmt, ## __VA_ARGS__)
#define initprintf_nowarn(fmt, ...) NOWARN(initprintf, fmt, ## __VA_ARGS__)
#define message_nowarn(fmt, ...) NOWARN(message, fmt, ## __VA_ARGS__)
/* Static assertions, based on source found in LuaJIT's src/lj_def.h. */ /* Static assertions, based on source found in LuaJIT's src/lj_def.h. */
#define EDUKE32_ASSERT_NAME2(name, line) name ## line #define EDUKE32_ASSERT_NAME2(name, line) name ## line
#define EDUKE32_ASSERT_NAME(line) EDUKE32_ASSERT_NAME2(eduke32_assert_, line) #define EDUKE32_ASSERT_NAME(line) EDUKE32_ASSERT_NAME2(eduke32_assert_, line)

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

@ -5923,9 +5923,9 @@ end_point_dragging:
if (!delayerr) if (!delayerr)
message("Outer wall coordinates must coincide for both components"); message("Outer wall coordinates must coincide for both components");
OSD_Printf_nowarn("wal0:%d (%d,%d)--(%d,%d)\n",(int)(wal0-wall), OSD_Printf("wal0:%d (%d,%d)--(%d,%d)\n",(int)(wal0-wall),
TrackerCast(wal0->x),TrackerCast(wal0->y), TrackerCast(wal0p2->x),TrackerCast(wal0p2->y)); TrackerCast(wal0->x),TrackerCast(wal0->y), TrackerCast(wal0p2->x),TrackerCast(wal0p2->y));
OSD_Printf_nowarn("wal1:%d (%d,%d)--(%d,%d)\n",(int)(wal1-wall), OSD_Printf("wal1:%d (%d,%d)--(%d,%d)\n",(int)(wal1-wall),
TrackerCast(wal1->x),TrackerCast(wal1->y), TrackerCast(wal1p2->x),TrackerCast(wal1p2->y)); TrackerCast(wal1->x),TrackerCast(wal1->y), TrackerCast(wal1p2->x),TrackerCast(wal1p2->y));
goto end_join_sectors; goto end_join_sectors;
@ -8703,7 +8703,7 @@ int32_t fixspritesectors(void)
initprintf("--------------------\n"); initprintf("--------------------\n");
printfirsttime = 1; printfirsttime = 1;
} }
initprintf_nowarn("Changed sectnum of sprite #%d from %d to %d\n", initprintf("Changed sectnum of sprite #%d from %d to %d\n",
i, TrackerCast(sprite[i].sectnum), j); i, TrackerCast(sprite[i].sectnum), j);
changespritesect(i, j); changespritesect(i, j);
@ -10160,7 +10160,7 @@ void printcoords16(int32_t posxe, int32_t posye, int16_t ange)
} }
#define DOPRINT(Yofs, fmt, ...) do { \ #define DOPRINT(Yofs, fmt, ...) do { \
Bsprintf_nowarn(snotbuf, fmt, ## __VA_ARGS__); \ Bsprintf(snotbuf, fmt, ## __VA_ARGS__); \
printext16(8+col*200, ydim/*-(row*96)*/-STATUS2DSIZ+Yofs, color, -1, snotbuf, 0); \ printext16(8+col*200, ydim/*-(row*96)*/-STATUS2DSIZ+Yofs, color, -1, snotbuf, 0); \
} while (0) } while (0)

14
polymer/eduke32/build/src/engine.c
View file

@ -10401,13 +10401,13 @@ static void check_sprite(int32_t i)
{ {
if ((unsigned)sprite[i].statnum >= MAXSTATUS) if ((unsigned)sprite[i].statnum >= MAXSTATUS)
{ {
initprintf_nowarn(OSD_ERROR "Map error: sprite #%d (%d,%d) with illegal statnum (%d) REMOVED.\n", initprintf(OSD_ERROR "Map error: sprite #%d (%d,%d) with illegal statnum (%d) REMOVED.\n",
i, TrackerCast(sprite[i].x), TrackerCast(sprite[i].y), TrackerCast(sprite[i].statnum)); i, TrackerCast(sprite[i].x), TrackerCast(sprite[i].y), TrackerCast(sprite[i].statnum));
remove_sprite(i); remove_sprite(i);
} }
else if ((unsigned)sprite[i].picnum >= MAXTILES) else if ((unsigned)sprite[i].picnum >= MAXTILES)
{ {
initprintf_nowarn(OSD_ERROR "Map error: sprite #%d (%d,%d) with illegal picnum (%d) REMOVED.\n", initprintf(OSD_ERROR "Map error: sprite #%d (%d,%d) with illegal picnum (%d) REMOVED.\n",
i, TrackerCast(sprite[i].x), TrackerCast(sprite[i].y), TrackerCast(sprite[i].sectnum)); i, TrackerCast(sprite[i].x), TrackerCast(sprite[i].y), TrackerCast(sprite[i].sectnum));
remove_sprite(i); remove_sprite(i);
} }
@ -10421,13 +10421,13 @@ static void check_sprite(int32_t i)
if (sprite[i].sectnum < 0) if (sprite[i].sectnum < 0)
remove_sprite(i); remove_sprite(i);
initprintf_nowarn(OSD_ERROR "Map error: sprite #%d (%d,%d) with illegal sector (%d) ", initprintf(OSD_ERROR "Map error: sprite #%d (%d,%d) with illegal sector (%d) ",
i, TrackerCast(sprite[i].x), TrackerCast(sprite[i].y), osectnum); i, TrackerCast(sprite[i].x), TrackerCast(sprite[i].y), osectnum);
if (sprite[i].statnum != MAXSTATUS) if (sprite[i].statnum != MAXSTATUS)
initprintf_nowarn("changed to sector %d.\n", TrackerCast(sprite[i].sectnum)); initprintf("changed to sector %d.\n", TrackerCast(sprite[i].sectnum));
else else
initprintf_nowarn("REMOVED.\n"); initprintf("REMOVED.\n");
} }
} }
@ -11188,14 +11188,14 @@ int32_t saveboard(const char *filename, const vec3_t *dapos, int16_t daang, int1
{ {
if ((unsigned)sprite[j].statnum > MAXSTATUS) if ((unsigned)sprite[j].statnum > MAXSTATUS)
{ {
initprintf_nowarn("Map error: sprite #%d(%d,%d) with an illegal statnum(%d)\n", initprintf("Map error: sprite #%d(%d,%d) with an illegal statnum(%d)\n",
j,TrackerCast(sprite[j].x),TrackerCast(sprite[j].y),TrackerCast(sprite[j].statnum)); j,TrackerCast(sprite[j].x),TrackerCast(sprite[j].y),TrackerCast(sprite[j].statnum));
changespritestat(j,0); changespritestat(j,0);
} }
if ((unsigned)sprite[j].sectnum > MAXSECTORS) if ((unsigned)sprite[j].sectnum > MAXSECTORS)
{ {
initprintf_nowarn("Map error: sprite #%d(%d,%d) with an illegal sectnum(%d)\n", initprintf("Map error: sprite #%d(%d,%d) with an illegal sectnum(%d)\n",
j,TrackerCast(sprite[j].x),TrackerCast(sprite[j].y),TrackerCast(sprite[j].sectnum)); j,TrackerCast(sprite[j].x),TrackerCast(sprite[j].y),TrackerCast(sprite[j].sectnum));
changespritesect(j,0); changespritesect(j,0);
} }

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

@ -713,9 +713,9 @@ const char *ExtGetSectorCaption(int16_t sectnum)
{ {
Bstrcpy(lo, ExtGetSectorType(sector[sectnum].lotag)); Bstrcpy(lo, ExtGetSectorType(sector[sectnum].lotag));
if (!in3dmode()) if (!in3dmode())
Bsprintf_nowarn(tempbuf,"%hu,%hu %s", TrackerCast(sector[sectnum].hitag), TrackerCast(sector[sectnum].lotag), lo); Bsprintf(tempbuf,"%hu,%hu %s", TrackerCast(sector[sectnum].hitag), TrackerCast(sector[sectnum].lotag), lo);
else else
Bsprintf_nowarn(tempbuf,"%hu %s", TrackerCast(sector[sectnum].lotag), lo); Bsprintf(tempbuf,"%hu %s", TrackerCast(sector[sectnum].lotag), lo);
} }
return(tempbuf); return(tempbuf);
} }
@ -925,7 +925,7 @@ const char *ExtGetSpriteCaption(int16_t spritenum)
SpriteName(spritenum,lo); SpriteName(spritenum,lo);
if (sprite[spritenum].extra != -1) if (sprite[spritenum].extra != -1)
Bsprintf_nowarn(tempbuf,"%s,%s,%d %s", histr, lostr, TrackerCast(sprite[spritenum].extra), lo); Bsprintf(tempbuf,"%s,%s,%d %s", histr, lostr, TrackerCast(sprite[spritenum].extra), lo);
else else
Bsprintf(tempbuf,"%s,%s %s", histr, lostr, lo); Bsprintf(tempbuf,"%s,%s %s", histr, lostr, lo);
} }
@ -3953,7 +3953,7 @@ ENDFOR1:
ExtCheckKeys(); ExtCheckKeys();
printmessage256(0,0,"^251Text entry mode.^31 Navigation keys change vars."); printmessage256(0,0,"^251Text entry mode.^31 Navigation keys change vars.");
Bsprintf_nowarn(buffer, "Hgap=%d, Vgap=%d, SPCgap=%d, Shd=%d, Pal=%d", Bsprintf(buffer, "Hgap=%d, Vgap=%d, SPCgap=%d, Shd=%d, Pal=%d",
hgap, vgap, spcgap[alphidx], TrackerCast(sprite[linebegspr].shade), TrackerCast(sprite[linebegspr].pal)); hgap, vgap, spcgap[alphidx], TrackerCast(sprite[linebegspr].shade), TrackerCast(sprite[linebegspr].pal));
printmessage256(0, 9, buffer); printmessage256(0, 9, buffer);
showframe(1); showframe(1);
@ -4330,10 +4330,10 @@ static void Keys3d(void)
height3 = sector[nextsect].ceilingz - sector[searchsector].ceilingz; height3 = sector[nextsect].ceilingz - sector[searchsector].ceilingz;
} }
Bsprintf_nowarn(lines[num++],"Panning:%s %d, %d", swappedbot?"^242":"", Bsprintf(lines[num++],"Panning:%s %d, %d", swappedbot?"^242":"",
TrackerCast(wall[w].xpanning), TrackerCast(wall[w].ypanning)); TrackerCast(wall[w].xpanning), TrackerCast(wall[w].ypanning));
Bsprintf_nowarn(lines[num++],"Repeat: %d, %d", TrackerCast(wall[searchwall].xrepeat), TrackerCast(wall[searchwall].yrepeat)); Bsprintf(lines[num++],"Repeat: %d, %d", TrackerCast(wall[searchwall].xrepeat), TrackerCast(wall[searchwall].yrepeat));
Bsprintf_nowarn(lines[num++],"Overpic: %d", TrackerCast(wall[searchwall].overpicnum)); Bsprintf(lines[num++],"Overpic: %d", TrackerCast(wall[searchwall].overpicnum));
lines[num++][0]=0; lines[num++][0]=0;
if (getmessageleng) if (getmessageleng)
@ -4376,7 +4376,7 @@ static void Keys3d(void)
break; break;
Bsprintf(lines[num++],"^251Sector %d^31 %s, Lotag:%s", searchsector, typestr[searchstat], ExtGetSectorCaption(searchsector)); Bsprintf(lines[num++],"^251Sector %d^31 %s, Lotag:%s", searchsector, typestr[searchstat], ExtGetSectorCaption(searchsector));
Bsprintf_nowarn(lines[num++],"Height: %d, Visibility:%d", height2, TrackerCast(sector[searchsector].visibility)); Bsprintf(lines[num++],"Height: %d, Visibility:%d", height2, TrackerCast(sector[searchsector].visibility));
break; break;
case SEARCH_SPRITE: case SEARCH_SPRITE:
@ -4384,12 +4384,12 @@ static void Keys3d(void)
sprite[searchwall].pal, sprite[searchwall].cstat, sprite[searchwall].lotag, sprite[searchwall].pal, sprite[searchwall].cstat, sprite[searchwall].lotag,
sprite[searchwall].hitag, sprite[searchwall].extra,0); sprite[searchwall].hitag, sprite[searchwall].extra,0);
Bsprintf_nowarn(lines[num++], "Repeat: %d,%d", Bsprintf(lines[num++], "Repeat: %d,%d",
TrackerCast(sprite[searchwall].xrepeat), TrackerCast(sprite[searchwall].yrepeat)); TrackerCast(sprite[searchwall].xrepeat), TrackerCast(sprite[searchwall].yrepeat));
Bsprintf_nowarn(lines[num++], "PosXY: %d,%d%s", Bsprintf(lines[num++], "PosXY: %d,%d%s",
TrackerCast(sprite[searchwall].x), TrackerCast(sprite[searchwall].y), TrackerCast(sprite[searchwall].x), TrackerCast(sprite[searchwall].y),
sprite[searchwall].xoffset|sprite[searchwall].yoffset ? " ^251*":""); sprite[searchwall].xoffset|sprite[searchwall].yoffset ? " ^251*":"");
Bsprintf_nowarn(lines[num++], "PosZ: "" %d", TrackerCast(sprite[searchwall].z));// prevents tab character Bsprintf(lines[num++], "PosZ: "" %d", TrackerCast(sprite[searchwall].z));// prevents tab character
lines[num++][0]=0; lines[num++][0]=0;
if (getmessageleng) if (getmessageleng)
@ -4403,9 +4403,9 @@ static void Keys3d(void)
if (sprite[searchwall].picnum==SECTOREFFECTOR) if (sprite[searchwall].picnum==SECTOREFFECTOR)
Bsprintf(lines[num++],"^251Sprite %d^31 %s", searchwall, SectorEffectorText(searchwall)); Bsprintf(lines[num++],"^251Sprite %d^31 %s", searchwall, SectorEffectorText(searchwall));
else else
Bsprintf_nowarn(lines[num++],"^251Sprite %d^31 %s", searchwall, names[sprite[searchwall].picnum]); Bsprintf(lines[num++],"^251Sprite %d^31 %s", searchwall, names[sprite[searchwall].picnum]);
} }
else Bsprintf_nowarn(lines[num++],"^251Sprite %d^31, picnum %d", searchwall, TrackerCast(sprite[searchwall].picnum)); else Bsprintf(lines[num++],"^251Sprite %d^31, picnum %d", searchwall, TrackerCast(sprite[searchwall].picnum));
Bsprintf(lines[num++], "Elevation:%d", Bsprintf(lines[num++], "Elevation:%d",
getflorzofslope(searchsector, sprite[searchwall].x, sprite[searchwall].y) - sprite[searchwall].z); getflorzofslope(searchsector, sprite[searchwall].x, sprite[searchwall].y) - sprite[searchwall].z);
@ -4527,7 +4527,7 @@ static void Keys3d(void)
#else #else
wall[searchwall].cstat &= YAX_NEXTWALLBITS; wall[searchwall].cstat &= YAX_NEXTWALLBITS;
#endif #endif
message_nowarn("Wall %d cstat = %d", searchwall, TrackerCast(wall[searchwall].cstat)); message("Wall %d cstat = %d", searchwall, TrackerCast(wall[searchwall].cstat));
} }
else if (AIMING_AT_SPRITE) else if (AIMING_AT_SPRITE)
{ {
@ -4699,7 +4699,7 @@ static void Keys3d(void)
{ {
sprite[searchwall].ang += tsign<<(!eitherSHIFT*7); sprite[searchwall].ang += tsign<<(!eitherSHIFT*7);
sprite[searchwall].ang &= 2047; sprite[searchwall].ang &= 2047;
message_nowarn("Sprite %d angle: %d", searchwall, TrackerCast(sprite[searchwall].ang)); message("Sprite %d angle: %d", searchwall, TrackerCast(sprite[searchwall].ang));
} }
} }
@ -7898,7 +7898,7 @@ int32_t ExtPreSaveMap(void)
if (wall[j].point2 < startwall) if (wall[j].point2 < startwall)
startwall = wall[j].point2; startwall = wall[j].point2;
if (sector[i].wallptr != startwall) if (sector[i].wallptr != startwall)
initprintf_nowarn("Warning: set sector %d's wallptr to %d (was %d)\n", i, initprintf("Warning: set sector %d's wallptr to %d (was %d)\n", i,
TrackerCast(sector[i].wallptr), startwall); TrackerCast(sector[i].wallptr), startwall);
sector[i].wallptr = startwall; sector[i].wallptr = startwall;
} }
@ -10892,18 +10892,10 @@ static void EditSectorData(int16_t sectnum)
#endif #endif
break; break;
case 1: case 1:
Bsprintf_nowarn_return(i, med_disptext,"(X,Y)pan: %d, %d", handlemed(0, "X Pan", "Ceiling X Pan", &sector[sectnum].ceilingxpanning,
TrackerCast(sector[sectnum].ceilingxpanning),TrackerCast(sector[sectnum].ceilingypanning)); sizeof(sector[sectnum].ceilingxpanning), 255, 0);
for (; i < med_dispwidth; i++) med_disptext[i] = ' '; handlemed(0, "Y Pan", "Ceiling Y Pan", &sector[sectnum].ceilingypanning,
if (med_editval) sizeof(sector[sectnum].ceilingypanning), 255, 0);
{
Bsprintf(med_edittext,"Sector %d Ceiling X Pan: ",sectnum);
printmessage16("%s", med_edittext);
sector[sectnum].ceilingxpanning = (char)getnumber16(med_edittext,(int32_t)sector[sectnum].ceilingxpanning,255,0);
Bsprintf(med_edittext,"Sector %d Ceiling Y Pan: ",sectnum);
printmessage16("%s", med_edittext);
sector[sectnum].ceilingypanning = (char)getnumber16(med_edittext,(int32_t)sector[sectnum].ceilingypanning,255,0);
}
break; break;
case 2: case 2:
handlemed(0, "Shade byte", "Ceiling Shade", &sector[sectnum].ceilingshade,sizeof(sector[sectnum].ceilingshade), 128, 1); handlemed(0, "Shade byte", "Ceiling Shade", &sector[sectnum].ceilingshade,sizeof(sector[sectnum].ceilingshade), 128, 1);
@ -10944,18 +10936,10 @@ static void EditSectorData(int16_t sectnum)
break; break;
case 1: case 1:
Bsprintf_nowarn_return(i, med_disptext,"(X,Y)pan: %d, %d", handlemed(0, "X Pan", "Floor X Pan", &sector[sectnum].floorxpanning,
TrackerCast(sector[sectnum].floorxpanning),TrackerCast(sector[sectnum].floorypanning)); sizeof(sector[sectnum].floorxpanning), 255, 0);
for (; i < med_dispwidth; i++) med_disptext[i] = ' '; handlemed(0, "Y Pan", "Floor Y Pan", &sector[sectnum].floorypanning,
if (med_editval) sizeof(sector[sectnum].floorypanning), 255, 0);
{
Bsprintf(med_edittext,"Sector %d Floor X Pan: ",sectnum);
printmessage16("%s", med_edittext);
sector[sectnum].floorxpanning = (char)getnumber16(med_edittext,(int32_t)sector[sectnum].floorxpanning,255,0);
Bsprintf(med_edittext,"Sector %d Floor Y Pan: ",sectnum);
printmessage16("%s", med_edittext);
sector[sectnum].floorypanning = (char)getnumber16(med_edittext,(int32_t)sector[sectnum].floorypanning,255,0);
}
break; break;
case 2: case 2:
@ -11039,32 +11023,16 @@ static void EditWallData(int16_t wallnum)
sizeof(wall[wallnum].pal), M32_MAXPALOOKUPS, 0); sizeof(wall[wallnum].pal), M32_MAXPALOOKUPS, 0);
break; break;
case 3: case 3:
Bsprintf_nowarn_return(i, med_disptext,"(X,Y)repeat: %d, %d", handlemed(0, "X Repeat", "X Repeat", &wall[wallnum].xrepeat,
TrackerCast(wall[wallnum].xrepeat),TrackerCast(wall[wallnum].yrepeat)); sizeof(wall[wallnum].xrepeat), 255, 0);
for (; i < med_dispwidth; i++) med_disptext[i] = ' '; handlemed(0, "Y Repeat", "Y Repeat", &wall[wallnum].yrepeat,
if (med_editval) sizeof(wall[wallnum].yrepeat), 255, 0);
{
Bsprintf(med_edittext,"Wall %d X Repeat: ",wallnum);
printmessage16("%s", med_edittext);
wall[wallnum].xrepeat = (char)getnumber16(med_edittext,(int32_t)wall[wallnum].xrepeat,255,0);
Bsprintf(med_edittext,"Wall %d Y Repeat: ",wallnum);
printmessage16("%s", med_edittext);
wall[wallnum].yrepeat = (char)getnumber16(med_edittext,(int32_t)wall[wallnum].yrepeat,255,0);
}
break; break;
case 4: case 4:
Bsprintf_nowarn_return(i, med_disptext,"(X,Y)pan: %d, %d", handlemed(0, "X Pan", "X Pan", &wall[wallnum].xpanning,
TrackerCast(wall[wallnum].xpanning),TrackerCast(wall[wallnum].ypanning)); sizeof(wall[wallnum].xpanning), 255, 0);
for (; i < med_dispwidth; i++) med_disptext[i] = ' '; handlemed(0, "Y Pan", "Y Pan", &wall[wallnum].ypanning,
if (med_editval) sizeof(wall[wallnum].ypanning), 255, 0);
{
Bsprintf(med_edittext,"Wall %d X Pan: ",wallnum);
printmessage16("%s", med_edittext);
wall[wallnum].xpanning = (char)getnumber16(med_edittext,(int32_t)wall[wallnum].xpanning,255,0);
Bsprintf(med_edittext,"Wall %d Y Pan: ",wallnum);
printmessage16("%s", med_edittext);
wall[wallnum].ypanning = (char)getnumber16(med_edittext,(int32_t)wall[wallnum].ypanning,255,0);
}
break; break;
case 5: case 5:
handlemed(0, "Tile number", "Tile number", &wall[wallnum].picnum, handlemed(0, "Tile number", "Tile number", &wall[wallnum].picnum,
@ -11237,36 +11205,16 @@ static void EditSpriteData(int16_t spritenum)
sizeof(sprite[spritenum].blend), MAXBLENDTABS, 0); sizeof(sprite[spritenum].blend), MAXBLENDTABS, 0);
break; break;
case 4: case 4:
{ handlemed(0, "X Repeat", "X Repeat", &sprite[spritenum].xrepeat,
Bsprintf_nowarn_return(i, med_disptext,"(X,Y)repeat: %d, %d", sizeof(sprite[spritenum].xrepeat), 255, 0);
TrackerCast(sprite[spritenum].xrepeat),TrackerCast(sprite[spritenum].yrepeat)); handlemed(0, "Y Repeat", "Y Repeat", &sprite[spritenum].yrepeat,
for (; i < med_dispwidth; i++) med_disptext[i] = ' '; sizeof(sprite[spritenum].yrepeat), 255, 0);
if (med_editval)
{
Bsprintf(med_edittext,"Sprite %d X Repeat: ",spritenum);
printmessage16("%s", med_edittext);
sprite[spritenum].xrepeat = (char)getnumber16(med_edittext,(int32_t)sprite[spritenum].xrepeat,255,0);
Bsprintf(med_edittext,"Sprite %d Y Repeat: ",spritenum);
printmessage16("%s", med_edittext);
sprite[spritenum].yrepeat = (char)getnumber16(med_edittext,(int32_t)sprite[spritenum].yrepeat,255,0);
}
}
break; break;
case 5: case 5:
{ handlemed(0, "X Offset", "X Offset", &sprite[spritenum].xoffset,
Bsprintf_nowarn_return(i, med_disptext,"(X,Y)offset: %d, %d", sizeof(sprite[spritenum].xoffset), 128, 1);
TrackerCast(sprite[spritenum].xoffset),TrackerCast(sprite[spritenum].yoffset)); handlemed(0, "Y Offset", "Y Offset", &sprite[spritenum].yoffset,
for (; i < med_dispwidth; i++) med_disptext[i] = ' '; sizeof(sprite[spritenum].yoffset), 128, 1);
if (med_editval)
{
Bsprintf(med_edittext,"Sprite %d X Offset: ",spritenum);
printmessage16("%s", med_edittext);
sprite[spritenum].xoffset = (char)getnumber16(med_edittext,(int32_t)sprite[spritenum].xoffset,128,1);
Bsprintf(med_edittext,"Sprite %d Y Offset: ",spritenum);
printmessage16("%s", med_edittext);
sprite[spritenum].yoffset = (char)getnumber16(med_edittext,(int32_t)sprite[spritenum].yoffset,128,1);
}
}
break; break;
case 6: case 6:
handlemed(0, "Tile number", "Tile number", &sprite[spritenum].picnum, handlemed(0, "Tile number", "Tile number", &sprite[spritenum].picnum,

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

@ -2512,7 +2512,7 @@ static void G_PrintCoords(int32_t snum)
Bsprintf(tempbuf,"OG= %d SBRIDGE=%d SBS=%d",ps->on_ground, ps->spritebridge, ps->sbs); Bsprintf(tempbuf,"OG= %d SBRIDGE=%d SBS=%d",ps->on_ground, ps->spritebridge, ps->sbs);
printext256(x,y+27,31,-1,tempbuf,0); printext256(x,y+27,31,-1,tempbuf,0);
if (sectnum >= 0) if (sectnum >= 0)
Bsprintf_nowarn(tempbuf,"SECT= %d (LO=%d EX=%d)",sectnum,TrackerCast(sector[sectnum].lotag),TrackerCast(sector[sectnum].extra)); Bsprintf(tempbuf,"SECT= %d (LO=%d EX=%d)",sectnum,TrackerCast(sector[sectnum].lotag),TrackerCast(sector[sectnum].extra));
else else
Bsprintf(tempbuf,"SECT= %d", sectnum); Bsprintf(tempbuf,"SECT= %d", sectnum);
printext256(x,y+36,31,-1,tempbuf,0); printext256(x,y+36,31,-1,tempbuf,0);
@ -4867,7 +4867,7 @@ static void G_DumpDebugInfo(void)
j = headspritestat[x]; j = headspritestat[x];
while (j >= 0) while (j >= 0)
{ {
OSD_Printf_nowarn("Sprite %d (%d,%d,%d) (picnum: %d)\n",j, OSD_Printf("Sprite %d (%d,%d,%d) (picnum: %d)\n",j,
TrackerCast(sprite[j].x),TrackerCast(sprite[j].y),TrackerCast(sprite[j].z),TrackerCast(sprite[j].picnum)); TrackerCast(sprite[j].x),TrackerCast(sprite[j].y),TrackerCast(sprite[j].z),TrackerCast(sprite[j].picnum));
for (i=0; i<g_gameVarCount; i++) for (i=0; i<g_gameVarCount; i++)
{ {
@ -4976,7 +4976,7 @@ int32_t A_InsertSprite(int32_t whatsect,int32_t s_x,int32_t s_y,int32_t s_z,int3
if (i < 0) if (i < 0)
{ {
G_DumpDebugInfo(); G_DumpDebugInfo();
OSD_Printf_nowarn("Failed spawning pic %d spr from pic %d spr %d at x:%d,y:%d,z:%d,sect:%d\n", OSD_Printf("Failed spawning pic %d spr from pic %d spr %d at x:%d,y:%d,z:%d,sect:%d\n",
s_pn,s_ow < 0 ? -1 : TrackerCast(sprite[s_ow].picnum),s_ow,s_x,s_y,s_z,whatsect); s_pn,s_ow < 0 ? -1 : TrackerCast(sprite[s_ow].picnum),s_ow,s_x,s_y,s_z,whatsect);
G_GameExit("Too many sprites spawned."); G_GameExit("Too many sprites spawned.");
} }
@ -5987,7 +5987,7 @@ int32_t A_Spawn(int32_t j, int32_t pn)
if (EDUKE32_PREDICT_FALSE(sp->hitag && sp->picnum == WATERBUBBLEMAKER)) if (EDUKE32_PREDICT_FALSE(sp->hitag && sp->picnum == WATERBUBBLEMAKER))
{ {
// JBF 20030913: Pisses off X_Move(), eg. in bobsp2 // JBF 20030913: Pisses off X_Move(), eg. in bobsp2
OSD_Printf_nowarn(OSD_ERROR "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,TrackerCast(sp->x),TrackerCast(sp->y)); i,TrackerCast(sp->x),TrackerCast(sp->y));
sp->hitag = 0; sp->hitag = 0;
} }
@ -6584,7 +6584,7 @@ int32_t A_Spawn(int32_t j, int32_t pn)
else else
{ {
// XXX: we should return to the menu for this and similar failures // XXX: we should return to the menu for this and similar failures
Bsprintf_nowarn(tempbuf, "SE 17 (warp elevator) setup failed: sprite %d at (%d, %d)", Bsprintf(tempbuf, "SE 17 (warp elevator) setup failed: sprite %d at (%d, %d)",
i, TrackerCast(sprite[i].x), TrackerCast(sprite[i].y)); i, TrackerCast(sprite[i].x), TrackerCast(sprite[i].y));
G_GameExit(tempbuf); G_GameExit(tempbuf);
} }
@ -6787,7 +6787,7 @@ int32_t A_Spawn(int32_t j, int32_t pn)
} }
if (EDUKE32_PREDICT_FALSE(j == -1)) if (EDUKE32_PREDICT_FALSE(j == -1))
{ {
OSD_Printf_nowarn(OSD_ERROR "Found lonely Sector Effector (lotag 0) at (%d,%d)\n", OSD_Printf(OSD_ERROR "Found lonely Sector Effector (lotag 0) at (%d,%d)\n",
TrackerCast(sp->x),TrackerCast(sp->y)); TrackerCast(sp->x),TrackerCast(sp->y));
changespritestat(i, STAT_ACTOR); changespritestat(i, STAT_ACTOR);
goto SPAWN_END; goto SPAWN_END;
@ -6806,7 +6806,7 @@ int32_t A_Spawn(int32_t j, int32_t pn)
tempwallptr++; tempwallptr++;
if (EDUKE32_PREDICT_FALSE(tempwallptr > 2047)) if (EDUKE32_PREDICT_FALSE(tempwallptr > 2047))
{ {
Bsprintf_nowarn(tempbuf, "Too many moving sectors at (%d,%d).\n", Bsprintf(tempbuf, "Too many moving sectors at (%d,%d).\n",
TrackerCast(wall[s].x),TrackerCast(wall[s].y)); TrackerCast(wall[s].x),TrackerCast(wall[s].y));
G_GameExit(tempbuf); G_GameExit(tempbuf);
} }
@ -6865,7 +6865,7 @@ int32_t A_Spawn(int32_t j, int32_t pn)
#endif #endif
if (j == 0) if (j == 0)
{ {
Bsprintf_nowarn(tempbuf,"Subway found no zero'd sectors with locators\nat (%d,%d).\n", Bsprintf(tempbuf,"Subway found no zero'd sectors with locators\nat (%d,%d).\n",
TrackerCast(sp->x),TrackerCast(sp->y)); TrackerCast(sp->x),TrackerCast(sp->y));
G_GameExit(tempbuf); G_GameExit(tempbuf);
} }

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

@ -104,7 +104,7 @@ void VM_ScriptInfo(void)
} }
if (vm.g_i) if (vm.g_i)
initprintf_nowarn("current actor: %d (%d)\n",vm.g_i,TrackerCast(vm.g_sp->picnum)); initprintf("current actor: %d (%d)\n",vm.g_i,TrackerCast(vm.g_sp->picnum));
initprintf("g_errorLineNum: %d, g_tw: %d\n",g_errorLineNum,g_tw); initprintf("g_errorLineNum: %d, g_tw: %d\n",g_errorLineNum,g_tw);
#endif #endif
@ -501,7 +501,7 @@ GAMEEXEC_STATIC void VM_AlterAng(int32_t movflags)
{ {
AC_MOVE_ID(vm.g_t) = 0; AC_MOVE_ID(vm.g_t) = 0;
OSD_Printf_nowarn(OSD_ERROR "bad moveptr for actor %d (%d)!\n", vm.g_i, TrackerCast(vm.g_sp->picnum)); OSD_Printf(OSD_ERROR "bad moveptr for actor %d (%d)!\n", vm.g_i, TrackerCast(vm.g_sp->picnum));
return; return;
} }
@ -689,7 +689,7 @@ dead:
if (EDUKE32_PREDICT_FALSE((unsigned)AC_MOVE_ID(vm.g_t) >= (unsigned)g_scriptSize-1)) if (EDUKE32_PREDICT_FALSE((unsigned)AC_MOVE_ID(vm.g_t) >= (unsigned)g_scriptSize-1))
{ {
AC_MOVE_ID(vm.g_t) = 0; AC_MOVE_ID(vm.g_t) = 0;
OSD_Printf_nowarn(OSD_ERROR "clearing bad moveptr for actor %d (%d)\n", vm.g_i, TrackerCast(vm.g_sp->picnum)); OSD_Printf(OSD_ERROR "clearing bad moveptr for actor %d (%d)\n", vm.g_i, TrackerCast(vm.g_sp->picnum));
return; return;
} }
@ -4445,7 +4445,7 @@ finish_qsprintf:
if (EDUKE32_PREDICT_FALSE((unsigned)j >= (unsigned)g_gameArrayCount || (unsigned)index >= (unsigned)aGameArrays[j].size)) if (EDUKE32_PREDICT_FALSE((unsigned)j >= (unsigned)g_gameArrayCount || (unsigned)index >= (unsigned)aGameArrays[j].size))
{ {
OSD_Printf_nowarn(OSD_ERROR "Gv_SetVar(): tried to set invalid array ID (%d) or index out of bounds from sprite %d (%d), player %d\n", OSD_Printf(OSD_ERROR "Gv_SetVar(): tried to set invalid array ID (%d) or index out of bounds from sprite %d (%d), player %d\n",
j,vm.g_i,TrackerCast(sprite[vm.g_i].picnum),vm.g_p); j,vm.g_i,TrackerCast(sprite[vm.g_i].picnum),vm.g_p);
continue; continue;
} }

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

@ -89,7 +89,7 @@ static inline int32_t VM_OnEvent(int32_t iEventID, int32_t iActor, int32_t iPlay
void VM_ScriptInfo(void); void VM_ScriptInfo(void);
#define CON_ERRPRINTF(Text, ...) do { \ #define CON_ERRPRINTF(Text, ...) do { \
OSD_Printf_nowarn("Line %d, %s: " Text, g_errorLineNum, keyw[g_tw], ## __VA_ARGS__); \ OSD_Printf("Line %d, %s: " Text, g_errorLineNum, keyw[g_tw], ## __VA_ARGS__); \
} while (0) } while (0)
#endif #endif

8
polymer/eduke32/source/m32common.c
View file

@ -580,12 +580,6 @@ int32_t map_undoredo(int32_t dir)
//#define CCHKPREF OSDTEXT_RED "^O" //#define CCHKPREF OSDTEXT_RED "^O"
#define CCHK_CORRECTED OSDTEXT_GREEN " -> " #define CCHK_CORRECTED OSDTEXT_GREEN " -> "
#ifdef _MSC_VER
# define OSD_Printf_CChk OSD_Printf
#else
# define OSD_Printf_CChk OSD_Printf_nowarn
#endif
#define CORRUPTCHK_PRINT(errlev, what, fmt, ...) do \ #define CORRUPTCHK_PRINT(errlev, what, fmt, ...) do \
{ \ { \
bad = max(bad, errlev); \ bad = max(bad, errlev); \
@ -593,7 +587,7 @@ int32_t map_undoredo(int32_t dir)
goto too_many_errors; \ goto too_many_errors; \
corruptthings[numcorruptthings++] = (what); \ corruptthings[numcorruptthings++] = (what); \
if (errlev >= printfromlev) \ if (errlev >= printfromlev) \
OSD_Printf_CChk("#%d: " fmt "\n", numcorruptthings, ## __VA_ARGS__); \ OSD_Printf("#%d: " fmt "\n", numcorruptthings, ## __VA_ARGS__); \
} while (0) } while (0)
#ifdef YAX_ENABLE #ifdef YAX_ENABLE