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

Mapster32 crash fix and a couple of small projectile system changes

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@252 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-07-30 01:48:52 +00:00
parent 564b220add
commit 665a322312
4 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2391,11 +2391,10 @@ void moveweapons(void)
j = spawn(i,thisprojectile[i].trail); j = spawn(i,thisprojectile[i].trail);
if (thisprojectile[i].toffset != 0) if (thisprojectile[i].toffset != 0)
sprite[j].z += (thisprojectile[i].toffset<<8); sprite[j].z += (thisprojectile[i].toffset<<8);
else if (thisprojectile[i].txrepeat >= 0)
sprite[j].z += (1<<8); sprite[j].xrepeat=thisprojectile[i].txrepeat;
if (thisprojectile[i].txrepeat >= 0) sprite[j].xrepeat=thisprojectile[i].txrepeat; if (thisprojectile[i].tyrepeat >= 0)
if (thisprojectile[i].tyrepeat >= 0) sprite[j].yrepeat=thisprojectile[i].tyrepeat; sprite[j].yrepeat=thisprojectile[i].tyrepeat;
} }
} }

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

@ -2824,8 +2824,19 @@ void Keys3d(void)
Bsprintf(tempbuf,"LOCK"); Bsprintf(tempbuf,"LOCK");
if(tempbuf[0] != 0) if(tempbuf[0] != 0)
{ {
printext256(searchx+4+2,searchy+4+2,0,-1,tempbuf,!(xdimgame > 640)); i = (Bstrlen(tempbuf)<<3)+6;
printext256(searchx+4,searchy+4,whitecol,-1,tempbuf,!(xdimgame > 640)); if((searchx+i) < (xdim-1))
i = 0;
else i = (searchx+i)-(xdim-1);
if((searchy+16) < (ydim-1))
j = 0;
else j = (searchy+16)-(ydim-1);
// printext16(searchx+6-i,searchy+6-j,11,-1,tempbuf,0);
printext256(searchx+4+2-i,searchy+4+2-j,0,-1,tempbuf,!(xdimgame > 640));
printext256(searchx+4-i,searchy+4-j,whitecol,-1,tempbuf,!(xdimgame > 640));
// printext256(searchx+4+2,searchy+4+2,0,-1,tempbuf,!(xdimgame > 640));
// printext256(searchx+4,searchy+4,whitecol,-1,tempbuf,!(xdimgame > 640));
} }
if(helpon==1) if(helpon==1)
{ {

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

@ -5581,7 +5581,8 @@ void InitProjectiles(void)
projectile[i].extra = 100; projectile[i].extra = 100;
projectile[i].decal = BULLETHOLE; projectile[i].decal = BULLETHOLE;
projectile[i].trail = -1; projectile[i].trail = -1;
projectile[i].tnum = projectile[i].toffset = 0; projectile[i].tnum = 0;
projectile[i].toffset = 1;
projectile[i].txrepeat = projectile[i].tyrepeat = -1; projectile[i].txrepeat = projectile[i].tyrepeat = -1;
projectile[i].drop = projectile[i].range = 0; projectile[i].drop = projectile[i].range = 0;
projectile[i].cstat = -1; projectile[i].cstat = -1;

5
polymer/eduke32/source/player.c
View file

@ -160,7 +160,10 @@ void hitscantrail(long x1, long y1, long z1, long x2, long y2, long z2, short an
n = ((FindDistance2D(x1-x2,y1-y2))>>8)+1; n = ((FindDistance2D(x1-x2,y1-y2))>>8)+1;
z1 += (projectile[atwith].toffset<<8)+1024; if(projectile[atwith].toffset != 0)
z1 += (projectile[atwith].toffset<<8);
z1 += 1024;
xv = (x2-x1)/n; xv = (x2-x1)/n;
yv = (y2-y1)/n; yv = (y2-y1)/n;