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

Browse source
This commit is contained in:
terminx 2009-01-14 00:49:26 +00:00
parent 18896fd0cd
commit 3fa676fde8
2 changed files with 2583 additions and 2581 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2450,7 +2450,7 @@ static void G_MoveWeapons(void)
ll = s->zvel>>1; ll = s->zvel>>1;
} }
Bmemcpy(&davect,s,sizeof(int32_t) * 3); Bmemcpy(&davect,s,sizeof(vec3_t));
/* /*
dax = s->x; dax = s->x;
day = s->y; day = s->y;
@ -2482,7 +2482,7 @@ static void G_MoveWeapons(void)
day = s->y; day = s->y;
daz = s->z; daz = s->z;
*/ */
Bmemcpy(&davect,s,sizeof(int32_t) * 3); Bmemcpy(&davect,s,sizeof(vec3_t));
tmpvect.x = (k*(sintable[(s->ang+512)&2047]))>>14; tmpvect.x = (k*(sintable[(s->ang+512)&2047]))>>14;
tmpvect.y = (k*(sintable[s->ang&2047]))>>14; tmpvect.y = (k*(sintable[s->ang&2047]))>>14;
@ -2520,7 +2520,7 @@ static void G_MoveWeapons(void)
{ {
k = A_Spawn(i,ActorExtra[i].projectile.spawns); k = A_Spawn(i,ActorExtra[i].projectile.spawns);
Bmemcpy(&sprite[k],&davect,sizeof(int32_t) * 3); Bmemcpy(&sprite[k],&davect,sizeof(vec3_t));
/* /*
sprite[k].x = dax; sprite[k].x = dax;
sprite[k].y = day; sprite[k].y = day;
@ -2558,7 +2558,7 @@ static void G_MoveWeapons(void)
{ {
k = A_Spawn(i,ActorExtra[i].projectile.spawns); k = A_Spawn(i,ActorExtra[i].projectile.spawns);
Bmemcpy(&sprite[k],&davect,sizeof(int32_t) * 3); Bmemcpy(&sprite[k],&davect,sizeof(vec3_t));
/* /*
sprite[k].x = dax; sprite[k].x = dax;
sprite[k].y = day; sprite[k].y = day;
@ -2677,7 +2677,7 @@ static void G_MoveWeapons(void)
if (ActorExtra[i].projectile.spawns >= 0) if (ActorExtra[i].projectile.spawns >= 0)
{ {
k = A_Spawn(i,ActorExtra[i].projectile.spawns); k = A_Spawn(i,ActorExtra[i].projectile.spawns);
Bmemcpy(&sprite[k],&davect,sizeof(int32_t) * 3); Bmemcpy(&sprite[k],&davect,sizeof(vec3_t));
/* /*
sprite[k].x = dax; sprite[k].x = dax;
sprite[k].y = day; sprite[k].y = day;
@ -2778,7 +2778,7 @@ static void G_MoveWeapons(void)
if (ActorExtra[i].projectile.workslike & PROJECTILE_RPG && ActorExtra[i].projectile.spawns > 0) if (ActorExtra[i].projectile.workslike & PROJECTILE_RPG && ActorExtra[i].projectile.spawns > 0)
{ {
k = A_Spawn(i,ActorExtra[i].projectile.spawns); k = A_Spawn(i,ActorExtra[i].projectile.spawns);
Bmemcpy(&sprite[k],&davect,sizeof(int32_t) * 3); Bmemcpy(&sprite[k],&davect,sizeof(vec3_t));
/* /*
sprite[k].x = dax; sprite[k].x = dax;
sprite[k].y = day; sprite[k].y = day;
@ -2892,7 +2892,7 @@ static void G_MoveWeapons(void)
ll = s->zvel>>1; ll = s->zvel>>1;
} }
Bmemcpy(&davect,s,sizeof(int32_t) * 3); Bmemcpy(&davect,s,sizeof(vec3_t));
/* /*
dax = s->x; dax = s->x;
day = s->y; day = s->y;
@ -3039,7 +3039,7 @@ static void G_MoveWeapons(void)
{ {
vec3_t tmpvect; vec3_t tmpvect;
setsprite(i,&davect); setsprite(i,&davect);
Bmemcpy(&tmpvect, s, sizeof(int32_t) * 3); Bmemcpy(&tmpvect, s, sizeof(vec3_t));
A_DamageWall(i,j,&tmpvect,s->picnum); A_DamageWall(i,j,&tmpvect,s->picnum);
if (s->picnum == FREEZEBLAST) if (s->picnum == FREEZEBLAST)
@ -3090,7 +3090,7 @@ static void G_MoveWeapons(void)
if (s->picnum == RPG) if (s->picnum == RPG)
{ {
k = A_Spawn(i,EXPLOSION2); k = A_Spawn(i,EXPLOSION2);
Bmemcpy(&sprite[k],&davect,sizeof(int32_t) * 3); Bmemcpy(&sprite[k],&davect,sizeof(vec3_t));
/* /*
sprite[k].x = dax; sprite[k].x = dax;
sprite[k].y = day; sprite[k].y = day;
@ -4502,7 +4502,7 @@ static void G_MoveActors(void)
j &= (MAXWALLS-1); j &= (MAXWALLS-1);
Bmemcpy(&davect, s, sizeof(int32_t) * 3); Bmemcpy(&davect, s, sizeof(vec3_t));
A_DamageWall(i,j,&davect,s->picnum); A_DamageWall(i,j,&davect,s->picnum);
k = getangle( k = getangle(

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

@ -317,9 +317,8 @@ int32_t A_Shoot(int32_t i,int32_t atwith)
{ {
p = s->yvel; p = s->yvel;
srcvect.x = g_player[p].ps->posx; Bmemcpy(&srcvect,g_player[p].ps,sizeof(vec3_t));
srcvect.y = g_player[p].ps->posy; srcvect.z += g_player[p].ps->pyoff+(4<<8);
srcvect.z = g_player[p].ps->posz+g_player[p].ps->pyoff+(4<<8);
sa = g_player[p].ps->ang; sa = g_player[p].ps->ang;
g_player[p].ps->crack_time = 777; g_player[p].ps->crack_time = 777;
@ -328,7 +327,7 @@ int32_t A_Shoot(int32_t i,int32_t atwith)
{ {
p = -1; p = -1;
sa = s->ang; sa = s->ang;
Bmemcpy(&srcvect,s,sizeof(int32_t) * 3); Bmemcpy(&srcvect,s,sizeof(vec3_t));
srcvect.z -= ((s->yrepeat*tilesizy[s->picnum])<<1)+(4<<8); srcvect.z -= ((s->yrepeat*tilesizy[s->picnum])<<1)+(4<<8);
if (s->picnum != ROTATEGUN) if (s->picnum != ROTATEGUN)
@ -440,9 +439,12 @@ int32_t A_Shoot(int32_t i,int32_t atwith)
sprite[k].xvel = -1; sprite[k].xvel = -1;
sprite[k].ang = getangle(wall[hitinfo.hitwall].x-wall[wall[hitinfo.hitwall].point2].x, sprite[k].ang = getangle(wall[hitinfo.hitwall].x-wall[wall[hitinfo.hitwall].point2].x,
wall[hitinfo.hitwall].y-wall[wall[hitinfo.hitwall].point2].y)+512; wall[hitinfo.hitwall].y-wall[wall[hitinfo.hitwall].point2].y)+512;
Bmemcpy(&sprite[k],hitinfo.pos,sizeof(vec3_t));
/*
sprite[k].x = hitinfo.pos.x; sprite[k].x = hitinfo.pos.x;
sprite[k].y = hitinfo.pos.y; sprite[k].y = hitinfo.pos.y;
sprite[k].z = hitinfo.pos.z; sprite[k].z = hitinfo.pos.z;
*/
if (ProjectileData[atwith].workslike & PROJECTILE_RANDDECALSIZE) if (ProjectileData[atwith].workslike & PROJECTILE_RANDDECALSIZE)
{ {
wh = (krand()&ProjectileData[atwith].xrepeat); wh = (krand()&ProjectileData[atwith].xrepeat);