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@861 1a8010ca-5511-0410-912e-c29ae57300e0

Browse source
This commit is contained in:
terminx 2008-07-17 23:14:32 +00:00
parent f430f20201
commit b909597593
3 changed files with 20 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -800,7 +800,7 @@ enum events {
EVENT_DISPLAYMENU, EVENT_DISPLAYMENU,
EVENT_DISPLAYMENUREST, EVENT_DISPLAYMENUREST,
EVENT_DISPLAYLOADINGSCREEN, EVENT_DISPLAYLOADINGSCREEN,
EVENT_ANIMATESPRITES EVENT_ANIMATESPRITES,
}; };
enum sysstrs { enum sysstrs {

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

@ -138,39 +138,33 @@ static void tracers(int x1,int y1,int z1,int x2,int y2,int z2,int n)
static void hitscantrail(int x1, int y1, int z1, int x2, int y2, int z2, int ang, int atwith) static void hitscantrail(int x1, int y1, int z1, int x2, int y2, int z2, int ang, int atwith)
{ {
int xv, yv, zv, n, j, i; int n, j, i;
short sect = -1; short sect = -1;
x1 += (sintable[(348+ang+512)&2047]/projectile[atwith].offset); x1 += (sintable[(348+ang+512)&2047]/projectile[atwith].offset);
y1 += (sintable[(ang+348)&2047]/projectile[atwith].offset); y1 += (sintable[(ang+348)&2047]/projectile[atwith].offset);
z1 += 1024+(projectile[atwith].toffset<<8);
n = ((FindDistance2D(x1-x2,y1-y2))>>8)+1; n = ((FindDistance2D(x1-x2,y1-y2))>>8)+1;
if (projectile[atwith].toffset != 0) x2 = ((x2-x1)/n);
z1 += (projectile[atwith].toffset<<8); y2 = ((y2-y1)/n);
z2 = ((z2-z1)/n);
z1 += 1024; x1 += x2>>2;
y1 += y2>>2;
z1 += (z2>>2);
xv = (x2-x1)/n; for (i=projectile[atwith].tnum;i>0;i--)
yv = (y2-y1)/n;
zv = (z2-z1)/n;
x1 += xv>>2;
y1 += yv>>2;
z1 += zv>>2;
for (i=0;i<projectile[atwith].tnum;i++)
{ {
x1 += xv; x1 += x2;
y1 += yv; y1 += y2;
z1 += zv; z1 += z2;
updatesector(x1,y1,&sect); updatesector(x1,y1,&sect);
if (sect >= 0) if (sect < 0 || z1 > getflorzofslope(sect,x1,y1) || z1 < getceilzofslope(sect,x1,y1))
{ break;
j = EGS(sect,x1,y1,z1,projectile[atwith].trail,-32,projectile[atwith].txrepeat,projectile[atwith].tyrepeat,ang,0,0,g_player[0].ps->i,0); j = EGS(sect,x1,y1,z1,projectile[atwith].trail,-32,projectile[atwith].txrepeat,projectile[atwith].tyrepeat,ang,0,0,g_player[0].ps->i,0);
changespritestat(j,1); changespritestat(j,1);
}
else continue;
} }
} }
@ -178,10 +172,9 @@ int hits(int i)
{ {
int sx,sy,sz; int sx,sy,sz;
short sect,hw,hs; short sect,hw,hs;
int zoff; int zoff = 0;
if (PN == APLAYER) zoff = (40<<8); if (PN == APLAYER) zoff = (40<<8);
else zoff = 0;
hitscan(SX,SY,SZ-zoff,SECT, hitscan(SX,SY,SZ-zoff,SECT,
sintable[(SA+512)&2047], sintable[(SA+512)&2047],

3
polymer/eduke32/tiles.cfg
View file

@ -31,6 +31,7 @@ tilegroup "Actors"
COMMANDER COMMANDERSTAYPUT COMMANDER COMMANDERSTAYPUT
OCTABRAIN OCTABRAINSTAYPUT OCTABRAIN OCTABRAINSTAYPUT
ORGANTIC ORGANTIC
DRONE
NEWBEAST NEWBEASTSTAYPUT NEWBEASTHANG NEWBEASTJUMP NEWBEAST NEWBEASTSTAYPUT NEWBEASTHANG NEWBEASTJUMP
EGG GREENSLIME ROTATEGUN RECON TANK BOUNCEMINE EGG GREENSLIME ROTATEGUN RECON TANK BOUNCEMINE
FLOORFLAME FLOORFLAME
@ -110,7 +111,7 @@ tilegroup "Items"
// Items (healthetc) // Items (healthetc)
COLA SIXPAK FIRSTAID SHIELD STEROIDS AIRTANK JETPACK HEATSENSOR ACCESSCARD COLA SIXPAK FIRSTAID SHIELD STEROIDS AIRTANK JETPACK HEATSENSOR ACCESSCARD
BOOTS ATOMICHEALTH BOOTS ATOMICHEALTH HOLODUKE
// Weapons // Weapons
FIRSTGUNSPRITE CHAINGUNSPRITE RPGSPRITE FREEZESPRITE SHRINKERSPRITE FIRSTGUNSPRITE CHAINGUNSPRITE RPGSPRITE FREEZESPRITE SHRINKERSPRITE