zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 09:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
terminx 2008-05-22 10:08:17 +00:00
parent 8a0a8c8a36
commit 3cf48e1f1a
5 changed files with 2679 additions and 957 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/build/Makefile.msvc
View file

@ -71,9 +71,7 @@ ENGINEOBJS= \
$(OBJ)\pragmas.$o \ $(OBJ)\pragmas.$o \
$(OBJ)\scriptfile.$o \ $(OBJ)\scriptfile.$o \
$(OBJ)\winlayer.$o \ $(OBJ)\winlayer.$o \
!ifdef POLYMER
$(OBJ)\polymer.$o $(OBJ)\polymer.$o
!endif
EDITOROBJS=$(OBJ)\build.$o \ EDITOROBJS=$(OBJ)\build.$o \
$(OBJ)\startwin.editor.$o \ $(OBJ)\startwin.editor.$o \

3616
polymer/build/include/glext.h
View file

File diff suppressed because it is too large Load diff

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

@ -5738,6 +5738,7 @@ void overheadeditor(void)
ExtPreLoadMap(); ExtPreLoadMap();
i = loadboard(boardfilename,(!pathsearchmode&&grponlymode?2:0),&posx,&posy,&posz,&ang,&cursectnum); i = loadboard(boardfilename,(!pathsearchmode&&grponlymode?2:0),&posx,&posy,&posz,&ang,&cursectnum);
if (i == -2) i = loadoldboard(boardfilename,(!pathsearchmode&&grponlymode?2:0),&posx,&posy,&posz,&ang,&cursectnum); if (i == -2) i = loadoldboard(boardfilename,(!pathsearchmode&&grponlymode?2:0),&posx,&posy,&posz,&ang,&cursectnum);
oposz = posz;
if (i < 0) if (i < 0)
{ {
printmessage16("Invalid map format."); printmessage16("Invalid map format.");
@ -5939,6 +5940,7 @@ CANCEL:
i = loadboard(boardfilename,(!pathsearchmode&&grponlymode?2:0),&posx,&posy,&posz,&ang,&cursectnum); i = loadboard(boardfilename,(!pathsearchmode&&grponlymode?2:0),&posx,&posy,&posz,&ang,&cursectnum);
loadmhk(); loadmhk();
if (i == -2) i = loadoldboard(boardfilename,(!pathsearchmode&&grponlymode?2:0),&posx,&posy,&posz,&ang,&cursectnum); if (i == -2) i = loadoldboard(boardfilename,(!pathsearchmode&&grponlymode?2:0),&posx,&posy,&posz,&ang,&cursectnum);
oposz = posz;
if (i < 0) if (i < 0)
{ {
printmessage16("Invalid map format."); printmessage16("Invalid map format.");

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

@ -136,7 +136,6 @@ static char *Help3d[]=
"", "",
" ' A = TOGGLE AUTOSAVE", " ' A = TOGGLE AUTOSAVE",
" ' D = CYCLE SPRITE SKILL DISPLAY", " ' D = CYCLE SPRITE SKILL DISPLAY",
" ' G = TOGGLE CLIPBOARD GRAPHIC DISPLAY",
" ' R = TOGGLE FRAMERATE DISPLAY", " ' R = TOGGLE FRAMERATE DISPLAY",
" ' W = TOGGLE SPRITE DISPLAY", " ' W = TOGGLE SPRITE DISPLAY",
" ' X = SPRITE SHADE PREVIEW", " ' X = SPRITE SHADE PREVIEW",
@ -4159,18 +4158,15 @@ static void Keys3d(void)
Bsprintf(tempbuf,"%s",SKILLMODE[skill]); Bsprintf(tempbuf,"%s",SKILLMODE[skill]);
break; break;
case 10: case 10:
Bsprintf(tempbuf,"%d",tabgraphic);
break;
case 11:
Bsprintf(tempbuf,"%d",framerateon); Bsprintf(tempbuf,"%d",framerateon);
break; break;
case 12: case 11:
Bsprintf(tempbuf,"%s",SPRDSPMODE[nosprites]); Bsprintf(tempbuf,"%s",SPRDSPMODE[nosprites]);
break; break;
case 13: case 12:
Bsprintf(tempbuf,"%d",shadepreview); Bsprintf(tempbuf,"%d",shadepreview);
break; break;
case 14: case 13:
Bsprintf(tempbuf,"%d",purpleon); Bsprintf(tempbuf,"%d",purpleon);
break; break;
default : default :
@ -4185,8 +4181,8 @@ static void Keys3d(void)
else if (!strcmp(tempbuf,"2")) else if (!strcmp(tempbuf,"2"))
Bsprintf(tempbuf,"ON (2)"); Bsprintf(tempbuf,"ON (2)");
printext256((20+((xdimgame > 640) * 20))*8+2,8+(i*8+(xdimgame > 640))+2,0,-1,tempbuf,!(xdimgame > 640)); printext256((20+((xdimgame > 640) * 20))*8+2,8+(i*(8+(xdimgame > 640)))+2,0,-1,tempbuf,!(xdimgame > 640));
printext256((20+((xdimgame > 640) * 20))*8,8+(i*8+(xdimgame > 640)),whitecol,-1,tempbuf,!(xdimgame > 640)); printext256((20+((xdimgame > 640) * 20))*8,8+(i*(8+(xdimgame > 640))),whitecol,-1,tempbuf,!(xdimgame > 640));
enddrawing(); enddrawing();
} }
} }

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

@ -93,7 +93,7 @@ short cursprite;
int mousxplc, mousyplc, ppointhighlight; int mousxplc, mousyplc, ppointhighlight;
int counter=0; int counter=0;
unsigned char nosprites=0,purpleon=0,skill=4; unsigned char nosprites=0,purpleon=0,skill=4;
unsigned char framerateon=1,tabgraphic=2,shadepreview=0,autosave=1,sidemode=0; unsigned char framerateon=1,shadepreview=0,autosave=1,sidemode=0;
extern int vel, svel, hvel, angvel; extern int vel, svel, hvel, angvel;
int xvel, yvel, timoff; int xvel, yvel, timoff;