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

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

Browse source
This commit is contained in:
terminx 2008-08-28 23:15:11 +00:00
parent ffca366c8d
commit 882fbd6851
6 changed files with 35 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
polymer/build/src/build.c
View file

@ -4903,10 +4903,11 @@ void overheadeditor(void)
} }
dax = mulscale14(dax-posx,zoom); dax = mulscale14(dax-posx,zoom);
day = mulscale14(day-posy,zoom); day = mulscale14(day-posy,zoom);
drawline16(halfxdim16+dax-2,midydim16+day-2,halfxdim16+dax+2,midydim16+day-2,14); /* drawline16(halfxdim16+dax-2,midydim16+day-2,halfxdim16+dax+2,midydim16+day-2,14);
drawline16(halfxdim16+dax+2,midydim16+day-2,halfxdim16+dax+2,midydim16+day+2,14); drawline16(halfxdim16+dax+2,midydim16+day-2,halfxdim16+dax+2,midydim16+day+2,14);
drawline16(halfxdim16+dax+2,midydim16+day+2,halfxdim16+dax-2,midydim16+day+2,14); drawline16(halfxdim16+dax+2,midydim16+day+2,halfxdim16+dax-2,midydim16+day+2,14);
drawline16(halfxdim16+dax-2,midydim16+day+2,halfxdim16+dax-2,midydim16+day-2,14); drawline16(halfxdim16+dax-2,midydim16+day+2,halfxdim16+dax-2,midydim16+day-2,14); */
drawcircle16(halfxdim16+dax, midydim16+day, 3, 14);
} }
if (bad > 0) if (bad > 0)
{ {
@ -5596,7 +5597,7 @@ void overheadeditor(void)
keystatus[0xd3] = 0; keystatus[0xd3] = 0;
} }
if (keystatus[0xd2]) //InsertPoint if (keystatus[0xd2] || keystatus[0x17]) //InsertPoint
{ {
if (highlightsectorcnt >= 0) if (highlightsectorcnt >= 0)
{ {
@ -5690,7 +5691,7 @@ void overheadeditor(void)
asksave = 1; asksave = 1;
} }
keystatus[0xd2] = 0; keystatus[0xd2] = keystatus[0x17] = 0;
} }
/*j = 0; /*j = 0;
@ -7603,7 +7604,7 @@ void showsectordata(short sectnum)
Bsprintf(snotbuf,"Pixel height: %d",(sector[sectnum].floorz-sector[sectnum].ceilingz)>>8); Bsprintf(snotbuf,"Pixel height: %d",(sector[sectnum].floorz-sector[sectnum].ceilingz)>>8);
printext16(8,ydim-STATUS2DSIZ+104,11,-1,snotbuf,0); printext16(8,ydim-STATUS2DSIZ+104,11,-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+32,11,-1,"CEILINGS:",0); printext16(200,ydim-STATUS2DSIZ+32,11,-1,"^10CEILINGS:^O",0);
Bsprintf(snotbuf,"Flags (hex): %x",sector[sectnum].ceilingstat); Bsprintf(snotbuf,"Flags (hex): %x",sector[sectnum].ceilingstat);
printext16(200,ydim-STATUS2DSIZ+48,11,-1,snotbuf,0); printext16(200,ydim-STATUS2DSIZ+48,11,-1,snotbuf,0);
Bsprintf(snotbuf,"(X,Y)pan: %d, %d",sector[sectnum].ceilingxpanning,sector[sectnum].ceilingypanning); Bsprintf(snotbuf,"(X,Y)pan: %d, %d",sector[sectnum].ceilingxpanning,sector[sectnum].ceilingypanning);
@ -7619,7 +7620,7 @@ void showsectordata(short sectnum)
Bsprintf(snotbuf,"Palookup number: %d",sector[sectnum].ceilingpal); Bsprintf(snotbuf,"Palookup number: %d",sector[sectnum].ceilingpal);
printext16(200,ydim-STATUS2DSIZ+96,11,-1,snotbuf,0); printext16(200,ydim-STATUS2DSIZ+96,11,-1,snotbuf,0);
printext16(400,ydim-STATUS2DSIZ+32,11,-1,"FLOORS:",0); printext16(400,ydim-STATUS2DSIZ+32,11,-1,"^10FLOORS:^O",0);
Bsprintf(snotbuf,"Flags (hex): %x",sector[sectnum].floorstat); Bsprintf(snotbuf,"Flags (hex): %x",sector[sectnum].floorstat);
printext16(400,ydim-STATUS2DSIZ+48,11,-1,snotbuf,0); printext16(400,ydim-STATUS2DSIZ+48,11,-1,snotbuf,0);
Bsprintf(snotbuf,"(X,Y)pan: %d, %d",sector[sectnum].floorxpanning,sector[sectnum].floorypanning); Bsprintf(snotbuf,"(X,Y)pan: %d, %d",sector[sectnum].floorxpanning,sector[sectnum].floorypanning);
@ -7718,7 +7719,8 @@ void showspritedata(short spritenum)
Bsprintf(snotbuf," (0x%x), (0x%x)",sprite[spritenum].hitag,sprite[spritenum].lotag); Bsprintf(snotbuf," (0x%x), (0x%x)",sprite[spritenum].hitag,sprite[spritenum].lotag);
printext16(8,ydim-STATUS2DSIZ+104,11,-1,snotbuf,0); printext16(8,ydim-STATUS2DSIZ+104,11,-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+32,11,-1,names[sprite[spritenum].picnum],0); Bsprintf(snotbuf,"^10%s^O",names[sprite[spritenum].picnum]);
printext16(200,ydim-STATUS2DSIZ+32,11,-1,snotbuf,0);
Bsprintf(snotbuf,"Flags (hex): %x",sprite[spritenum].cstat); Bsprintf(snotbuf,"Flags (hex): %x",sprite[spritenum].cstat);
printext16(200,ydim-STATUS2DSIZ+48,11,-1,snotbuf,0); printext16(200,ydim-STATUS2DSIZ+48,11,-1,snotbuf,0);
Bsprintf(snotbuf,"Shade: %d",sprite[spritenum].shade); Bsprintf(snotbuf,"Shade: %d",sprite[spritenum].shade);

26
polymer/build/src/engine.c
View file

@ -11182,29 +11182,29 @@ void draw2dscreen(int posxe, int posye, short ange, int zoome, short gride)
if (jj == ii) if (jj == ii)
{ {
/* int dax3 = mulscale11(sintable[(k+1024)&2047],zoome) / 2048; int dax3 = mulscale11(sintable[(k+1024)&2047],zoome) / 4096;
int day3 = mulscale11(sintable[(k+512)&2047],zoome) / 2048; int day3 = mulscale11(sintable[(k+512)&2047],zoome) / 4096;
int dax2 = mulscale11(sintable[(k+2048)&2047],zoome) / 1536; int dax2 = mulscale11(sintable[(k+2048)&2047],zoome) / 4096;
int day2 = mulscale11(sintable[(k+1536)&2047],zoome) / 1536; int day2 = mulscale11(sintable[(k+1536)&2047],zoome) / 4096;
drawline16(halfxdim16+dax+dax3,midydim16+day+day3,halfxdim16+dax+dax2,midydim16+day+day2,col); */ drawline16(halfxdim16+dax+dax3,midydim16+day+day3,halfxdim16+dax+dax2,midydim16+day+day2,col);
} }
else if (jj > ii) else if (jj > ii)
{ {
int dax2 = mulscale11(sintable[(k+1024)&2047],zoome) / 2048; int dax2 = mulscale11(sintable[(k+1024)&2047],zoome) / 3072;
int day2 = mulscale11(sintable[(k+512)&2047],zoome) / 2048; int day2 = mulscale11(sintable[(k+512)&2047],zoome) / 3072;
drawline16(halfxdim16+dax,midydim16+day,halfxdim16+dax+dax2,midydim16+day+day2,col); drawline16(halfxdim16+dax,midydim16+day,halfxdim16+dax+dax2,midydim16+day+day2,col);
} }
else else
{ {
int dax2 = mulscale11(sintable[(k+2048)&2047],zoome) / 1536; int dax2 = mulscale11(sintable[(k+2048)&2047],zoome) / 3072;
int day2 = mulscale11(sintable[(k+1536)&2047],zoome) / 1536; int day2 = mulscale11(sintable[(k+1536)&2047],zoome) / 3072;
drawline16(halfxdim16+dax,midydim16+day,halfxdim16+dax+dax2,midydim16+day+day2,col); drawline16(halfxdim16+dax,midydim16+day,halfxdim16+dax+dax2,midydim16+day+day2,col);
} }
} }
else else
{ {
int dax2 = mulscale11(sintable[(k+2048)&2047],zoome) / 1536; int dax2 = mulscale11(sintable[(k+2048)&2047],zoome) / 3072;
int day2 = mulscale11(sintable[(k+1536)&2047],zoome) / 1536; int day2 = mulscale11(sintable[(k+1536)&2047],zoome) / 3072;
drawline16(halfxdim16+dax,midydim16+day,halfxdim16+dax+dax2,midydim16+day+day2,col); drawline16(halfxdim16+dax,midydim16+day,halfxdim16+dax+dax2,midydim16+day+day2,col);
} }
} }
@ -11212,7 +11212,7 @@ void draw2dscreen(int posxe, int posye, short ange, int zoome, short gride)
if (((halfxdim16+xp1) >= 2) && ((halfxdim16+xp1) <= xdim-3)) if (((halfxdim16+xp1) >= 2) && ((halfxdim16+xp1) <= xdim-3))
if (((midydim16+yp1) >= 2) && ((midydim16+yp1) <= ydim16-3)) if (((midydim16+yp1) >= 2) && ((midydim16+yp1) <= ydim16-3))
{ {
int pointsize = 2; int pointsize = 3;
col = 6; col = 6;
if (i == pointhighlight || ((pointhighlight < MAXWALLS) && (pointhighlight >= 0) && (wall[i].x == wall[pointhighlight].x) && (wall[i].y == wall[pointhighlight].y))) if (i == pointhighlight || ((pointhighlight < MAXWALLS) && (pointhighlight >= 0) && (wall[i].x == wall[pointhighlight].x) && (wall[i].y == wall[pointhighlight].y)))
{ {
@ -11279,7 +11279,7 @@ void draw2dscreen(int posxe, int posye, short ange, int zoome, short gride)
{ {
tempint = ((midydim16+yp1)*bytesperline)+(halfxdim16+xp1)+frameplace; tempint = ((midydim16+yp1)*bytesperline)+(halfxdim16+xp1)+frameplace;
drawcircle16(halfxdim16+xp1, midydim16+yp1, 3, col); drawcircle16(halfxdim16+xp1, midydim16+yp1, 4, col);
xp2 = mulscale11(sintable[(sprite[j].ang+2560)&2047],zoome) / 768; xp2 = mulscale11(sintable[(sprite[j].ang+2560)&2047],zoome) / 768;
yp2 = mulscale11(sintable[(sprite[j].ang+2048)&2047],zoome) / 768; yp2 = mulscale11(sintable[(sprite[j].ang+2048)&2047],zoome) / 768;

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

@ -43,6 +43,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <windows.h> #include <windows.h>
#endif #endif
#define BUILDDATE " 20080828"
#define VERSION " 1.2.0devel" #define VERSION " 1.2.0devel"
static int floor_over_floor; static int floor_over_floor;
@ -311,7 +312,7 @@ void ExtLoadMap(const char *mapname)
pskybits=3; pskybits=3;
parallaxtype=0; parallaxtype=0;
Bsprintf(tempbuf, "Mapster32"VERSION" - %s",mapname); Bsprintf(tempbuf, "Mapster32 - %s",mapname);
wm_setapptitle(tempbuf); wm_setapptitle(tempbuf);
} }
@ -1886,7 +1887,7 @@ static void ReadGamePalette()
if ((fp=kopen4load("palette.dat",1)) == -1) if ((fp=kopen4load("palette.dat",1)) == -1)
{ {
initprintf("!!! PALETTE.DAT NOT FOUND !!!\n"); initprintf("!!! PALETTE.DAT NOT FOUND !!!\n");
Bstrcpy(tempbuf, "Mapster32"VERSION""); Bstrcpy(tempbuf, "Mapster32"VERSION BUILDDATE);
wm_msgbox(tempbuf,"palette.dat not found"); wm_msgbox(tempbuf,"palette.dat not found");
exit(0); exit(0);
} }
@ -5917,7 +5918,7 @@ static void Keys2d(void)
}} }}
*/ */
Bsprintf(tempbuf, "Mapster32"VERSION""); Bsprintf(tempbuf, "Mapster32" VERSION);
printext16(9L,ydim2d-STATUS2DSIZ+9L,4,-1,tempbuf,0); printext16(9L,ydim2d-STATUS2DSIZ+9L,4,-1,tempbuf,0);
printext16(8L,ydim2d-STATUS2DSIZ+8L,12,-1,tempbuf,0); printext16(8L,ydim2d-STATUS2DSIZ+8L,12,-1,tempbuf,0);
@ -6577,7 +6578,7 @@ static void comlinehelp(void)
#endif #endif
"\n-?, -help, --help\tDisplay this help message and exit" "\n-?, -help, --help\tDisplay this help message and exit"
; ;
wm_msgbox("Mapster32"VERSION,s); wm_msgbox("Mapster32"VERSION BUILDDATE,s);
} }
static void addgamepath(const char *buffer) static void addgamepath(const char *buffer)
@ -6762,7 +6763,7 @@ static void checkcommandline(int argc, const char **argv)
int ExtPreInit(int argc,const char **argv) int ExtPreInit(int argc,const char **argv)
{ {
wm_setapptitle("Mapster32"VERSION); wm_setapptitle("Mapster32"VERSION BUILDDATE);
#ifdef _WIN32 #ifdef _WIN32
tempbuf[GetModuleFileName(NULL,tempbuf,BMAX_PATH)] = 0; tempbuf[GetModuleFileName(NULL,tempbuf,BMAX_PATH)] = 0;
@ -6772,7 +6773,7 @@ int ExtPreInit(int argc,const char **argv)
OSD_SetLogFile("mapster32.log"); OSD_SetLogFile("mapster32.log");
OSD_SetVersionString("Mapster32"VERSION,0,2); OSD_SetVersionString("Mapster32"VERSION,0,2);
initprintf("Mapster32"VERSION" ("__DATE__" "__TIME__")\n"); initprintf("Mapster32"VERSION BUILDDATE"\n");
initprintf("Copyright (c) 2008 EDuke32 team\n"); initprintf("Copyright (c) 2008 EDuke32 team\n");
checkcommandline(argc,argv); checkcommandline(argc,argv);
@ -7624,7 +7625,7 @@ int ExtInit(void)
getmessageleng = 0; getmessageleng = 0;
getmessagetimeoff = 0; getmessagetimeoff = 0;
Bstrcpy(apptitle, "Mapster32"VERSION""); Bstrcpy(apptitle, "Mapster32"VERSION BUILDDATE);
autosavetimer = totalclock+120*autosave; autosavetimer = totalclock+120*autosave;
#if defined(_WIN32) && defined(DUKEOSD) #if defined(_WIN32) && defined(DUKEOSD)

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

@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// this is checked against http://eduke32.com/VERSION // this is checked against http://eduke32.com/VERSION
#define BUILDDATE " 20080827" #define BUILDDATE " 20080828"
#define APPNAME "EDuke32" #define APPNAME "EDuke32"
#define VERSION " 1.5.0devel" #define VERSION " 1.5.0devel"
#define HEAD2 APPNAME VERSION BUILDDATE #define HEAD2 APPNAME VERSION BUILDDATE

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

@ -5652,7 +5652,7 @@ void loadefs(const char *filenam)
total_lines += line_number; total_lines += line_number;
increasescriptsize(scriptptr-script+1); increasescriptsize(scriptptr-script+8);
initprintf("Compile completed in %dms\n",getticks()-startcompiletime); initprintf("Compile completed in %dms\n",getticks()-startcompiletime);

3
polymer/eduke32/source/savegame.c
View file

@ -303,6 +303,8 @@ int loadplayer(int spot)
actorLoadEventScrptr[i] = (intptr_t *)j; actorLoadEventScrptr[i] = (intptr_t *)j;
} }
scriptptrs = Brealloc(scriptptrs, MAXSPRITES * sizeof(scriptptrs));
if (kdfread(&scriptptrs[0],sizeof(scriptptrs),MAXSPRITES,fil) != MAXSPRITES) goto corrupt; if (kdfread(&scriptptrs[0],sizeof(scriptptrs),MAXSPRITES,fil) != MAXSPRITES) goto corrupt;
if (kdfread(&hittype[0],sizeof(actordata_t),MAXSPRITES,fil) != MAXSPRITES) goto corrupt; if (kdfread(&hittype[0],sizeof(actordata_t),MAXSPRITES,fil) != MAXSPRITES) goto corrupt;
@ -697,6 +699,7 @@ int saveplayer(int spot)
actorLoadEventScrptr[i] = (intptr_t *)j; actorLoadEventScrptr[i] = (intptr_t *)j;
} }
scriptptrs = Brealloc(scriptptrs, MAXSPRITES * sizeof(scriptptrs));
for (i=0;i<MAXSPRITES;i++) for (i=0;i<MAXSPRITES;i++)
{ {