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

In exprs like "Bmemcpy(&p->pos.x, &sprite[i].x, sizeof(vec3_t))", drop the ".x".

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4132 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-11-04 18:21:07 +00:00
parent 9286456dd1
commit 4cb24de24e
4 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -320,7 +320,7 @@ static int32_t Proj_MaybeDoTransport(int32_t spritenum, int32_t i, int32_t fromu
else // below->above else // below->above
spr->z = sector[otherse->sectnum].floorz - daz + sector[sprite[i].sectnum].ceilingz; spr->z = sector[otherse->sectnum].floorz - daz + sector[sprite[i].sectnum].ceilingz;
Bmemcpy(&actor[spritenum].bpos.x, &sprite[spritenum], sizeof(vec3_t)); Bmemcpy(&actor[spritenum].bpos, &sprite[spritenum], sizeof(vec3_t));
changespritesect(spritenum, otherse->sectnum); changespritesect(spritenum, otherse->sectnum);
return 1; return 1;
@ -1261,7 +1261,7 @@ ACTOR_STATIC void G_MovePlayers(void)
if (p->holoduke_on == -1) if (p->holoduke_on == -1)
KILLIT(i); KILLIT(i);
Bmemcpy(&actor[i].bpos.x, s, sizeof(vec3_t)); Bmemcpy(&actor[i].bpos, s, sizeof(vec3_t));
s->cstat = 0; s->cstat = 0;
if (s->xrepeat < 42) if (s->xrepeat < 42)
@ -1557,7 +1557,7 @@ ACTOR_STATIC void G_MoveStandables(void)
// Rotation-fixed sprites in rotating sectors already have bpos* updated. // Rotation-fixed sprites in rotating sectors already have bpos* updated.
if ((t[7]&(0xffff0000))!=ROTFIXSPR_MAGIC) if ((t[7]&(0xffff0000))!=ROTFIXSPR_MAGIC)
Bmemcpy(&actor[i].bpos.x, s, sizeof(vec3_t)); Bmemcpy(&actor[i].bpos, s, sizeof(vec3_t));
if (PN >= CRANE && PN <= CRANE+3) if (PN >= CRANE && PN <= CRANE+3)
{ {
@ -1727,7 +1727,7 @@ ACTOR_STATIC void G_MoveStandables(void)
{ {
setsprite(s->owner,(vec3_t *)s); setsprite(s->owner,(vec3_t *)s);
Bmemcpy(&actor[s->owner].bpos.x, s, sizeof(vec3_t)); Bmemcpy(&actor[s->owner].bpos, s, sizeof(vec3_t));
s->zvel = 0; s->zvel = 0;
} }
@ -2923,7 +2923,7 @@ ACTOR_STATIC void G_MoveWeapons(void)
if (s->sectnum < 0) if (s->sectnum < 0)
KILLIT(i); KILLIT(i);
Bmemcpy(&actor[i].bpos.x, s, sizeof(vec3_t)); Bmemcpy(&actor[i].bpos, s, sizeof(vec3_t));
/* Custom projectiles */ /* Custom projectiles */
if (A_CheckSpriteFlags(i, SPRITE_PROJECTILE)) if (A_CheckSpriteFlags(i, SPRITE_PROJECTILE))
@ -3569,7 +3569,7 @@ ACTOR_STATIC void G_MoveTransports(void)
sprite[j].z = sectlotag==ST_1_ABOVE_WATER ? sprite[j].z = sectlotag==ST_1_ABOVE_WATER ?
sector[osect].ceilingz : sector[osect].floorz; sector[osect].ceilingz : sector[osect].floorz;
Bmemcpy(&actor[j].bpos.x, &sprite[j], sizeof(vec3_t)); Bmemcpy(&actor[j].bpos, &sprite[j], sizeof(vec3_t));
changespritesect(j, sprite[OW].sectnum); changespritesect(j, sprite[OW].sectnum);
} }
@ -3587,7 +3587,7 @@ ACTOR_STATIC void G_MoveTransports(void)
sprite[j].z -= SZ - sector[sprite[OW].sectnum].floorz; sprite[j].z -= SZ - sector[sprite[OW].sectnum].floorz;
sprite[j].ang = sprite[OW].ang; sprite[j].ang = sprite[OW].ang;
Bmemcpy(&actor[j].bpos.x, &sprite[j], sizeof(vec3_t)); Bmemcpy(&actor[j].bpos, &sprite[j], sizeof(vec3_t));
if (sprite[i].pal == 0) if (sprite[i].pal == 0)
{ {
@ -3613,7 +3613,7 @@ ACTOR_STATIC void G_MoveTransports(void)
sprite[j].y += (sprite[OW].y-SY); sprite[j].y += (sprite[OW].y-SY);
sprite[j].z = sprite[OW].z+4096; sprite[j].z = sprite[OW].z+4096;
Bmemcpy(&actor[j].bpos.x, &sprite[j], sizeof(vec3_t)); Bmemcpy(&actor[j].bpos, &sprite[j], sizeof(vec3_t));
changespritesect(j,sprite[OW].sectnum); changespritesect(j,sprite[OW].sectnum);
} }
@ -3669,7 +3669,7 @@ ACTOR_STATIC void G_MoveActors(void)
if (s->xrepeat == 0 || sect < 0 || sect >= MAXSECTORS) if (s->xrepeat == 0 || sect < 0 || sect >= MAXSECTORS)
KILLIT(i); KILLIT(i);
Bmemcpy(&actor[i].bpos.x, s, sizeof(vec3_t)); Bmemcpy(&actor[i].bpos, s, sizeof(vec3_t));
switchpicnum = s->picnum; switchpicnum = s->picnum;
@ -4991,7 +4991,7 @@ ACTOR_STATIC void G_MoveMisc(void) // STATNUM 5
if (sect < 0 || s->xrepeat == 0) if (sect < 0 || s->xrepeat == 0)
KILLIT(i); KILLIT(i);
Bmemcpy(&actor[i].bpos.x, s, sizeof(vec3_t)); Bmemcpy(&actor[i].bpos, s, sizeof(vec3_t));
switchpicnum = s->picnum; switchpicnum = s->picnum;
if (s->picnum > NUKEBUTTON && s->picnum <= NUKEBUTTON+3) if (s->picnum > NUKEBUTTON && s->picnum <= NUKEBUTTON+3)
@ -6934,7 +6934,7 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
sprite[k].z = sector[sprite[j].sectnum].floorz- sprite[k].z = sector[sprite[j].sectnum].floorz-
(sc->floorz-sprite[k].z); (sc->floorz-sprite[k].z);
Bmemcpy(&actor[k].bpos.x, &sprite[k], sizeof(vec3_t)); Bmemcpy(&actor[k].bpos, &sprite[k], sizeof(vec3_t));
changespritesect(k,sprite[j].sectnum); changespritesect(k,sprite[j].sectnum);
setsprite(k,(vec3_t *)&sprite[k]); setsprite(k,(vec3_t *)&sprite[k]);

4
polymer/eduke32/source/game.c
View file

@ -4894,7 +4894,7 @@ int32_t A_InsertSprite(int32_t whatsect,int32_t s_x,int32_t s_y,int32_t s_z,int3
Bmemcpy(s, &spr_temp, sizeof(spritetype)); Bmemcpy(s, &spr_temp, sizeof(spritetype));
Bmemset(&actor[i], 0, sizeof(actor_t)); Bmemset(&actor[i], 0, sizeof(actor_t));
Bmemcpy(&actor[i].bpos.x, s, sizeof(vec3_t)); // update bposx/y/z Bmemcpy(&actor[i].bpos, s, sizeof(vec3_t)); // update bposx/y/z
if ((unsigned)s_ow < MAXSPRITES) if ((unsigned)s_ow < MAXSPRITES)
{ {
@ -4985,7 +4985,7 @@ int32_t A_Spawn(int32_t j, int32_t pn)
i = pn; i = pn;
Bmemset(&actor[i], 0, sizeof(actor_t)); Bmemset(&actor[i], 0, sizeof(actor_t));
Bmemcpy(&actor[i].bpos.x, &sprite[i], sizeof(vec3_t)); Bmemcpy(&actor[i].bpos, &sprite[i], sizeof(vec3_t));
actor[i].picnum = PN; actor[i].picnum = PN;

4
polymer/eduke32/source/gameexec.c
View file

@ -5509,7 +5509,7 @@ void G_SaveMapState(void)
Bmemcpy(&save->actor[0],&actor[0],sizeof(actor_t)*MAXSPRITES); Bmemcpy(&save->actor[0],&actor[0],sizeof(actor_t)*MAXSPRITES);
Bmemcpy(&save->g_numCyclers,&g_numCyclers,sizeof(g_numCyclers)); Bmemcpy(&save->g_numCyclers,&g_numCyclers,sizeof(g_numCyclers));
Bmemcpy(&save->cyclers[0][0],&cyclers[0][0],sizeof(cyclers)); Bmemcpy(&save->cyclers[0],&cyclers[0],sizeof(cyclers));
Bmemcpy(&save->g_playerSpawnPoints[0],&g_playerSpawnPoints[0],sizeof(g_playerSpawnPoints)); Bmemcpy(&save->g_playerSpawnPoints[0],&g_playerSpawnPoints[0],sizeof(g_playerSpawnPoints));
Bmemcpy(&save->g_numAnimWalls,&g_numAnimWalls,sizeof(g_numAnimWalls)); Bmemcpy(&save->g_numAnimWalls,&g_numAnimWalls,sizeof(g_numAnimWalls));
Bmemcpy(&save->SpriteDeletionQueue[0],&SpriteDeletionQueue[0],sizeof(SpriteDeletionQueue)); Bmemcpy(&save->SpriteDeletionQueue[0],&SpriteDeletionQueue[0],sizeof(SpriteDeletionQueue));
@ -5637,7 +5637,7 @@ void G_RestoreMapState(void)
Bmemcpy(&actor[0],&save->actor[0],sizeof(actor_t)*MAXSPRITES); Bmemcpy(&actor[0],&save->actor[0],sizeof(actor_t)*MAXSPRITES);
Bmemcpy(&g_numCyclers,&save->g_numCyclers,sizeof(g_numCyclers)); Bmemcpy(&g_numCyclers,&save->g_numCyclers,sizeof(g_numCyclers));
Bmemcpy(&cyclers[0][0],&save->cyclers[0][0],sizeof(cyclers)); Bmemcpy(&cyclers[0],&save->cyclers[0],sizeof(cyclers));
Bmemcpy(&g_playerSpawnPoints[0],&save->g_playerSpawnPoints[0],sizeof(g_playerSpawnPoints)); Bmemcpy(&g_playerSpawnPoints[0],&save->g_playerSpawnPoints[0],sizeof(g_playerSpawnPoints));
Bmemcpy(&g_numAnimWalls,&save->g_numAnimWalls,sizeof(g_numAnimWalls)); Bmemcpy(&g_numAnimWalls,&save->g_numAnimWalls,sizeof(g_numAnimWalls));
Bmemcpy(&SpriteDeletionQueue[0],&save->SpriteDeletionQueue[0],sizeof(SpriteDeletionQueue)); Bmemcpy(&SpriteDeletionQueue[0],&save->SpriteDeletionQueue[0],sizeof(SpriteDeletionQueue));

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

@ -4187,7 +4187,7 @@ void P_UpdatePosWhenViewingCam(DukePlayer_t *p)
{ {
int32_t i = p->newowner; int32_t i = p->newowner;
Bmemcpy(&p->pos.x, &sprite[i].x, sizeof(vec3_t)); Bmemcpy(&p->pos, &sprite[i], sizeof(vec3_t));
p->ang = SA; p->ang = SA;
p->vel.x = p->vel.y = sprite[p->i].xvel = 0; p->vel.x = p->vel.y = sprite[p->i].xvel = 0;
p->look_ang = 0; p->look_ang = 0;
@ -4407,7 +4407,7 @@ void P_ProcessInput(int32_t snum)
// p->bobcounter += 32; // p->bobcounter += 32;
} }
Bmemcpy(&p->opos.x, &p->pos.x, sizeof(vec3_t)); Bmemcpy(&p->opos, &p->pos, sizeof(vec3_t));
p->oang = p->ang; p->oang = p->ang;
p->opyoff = p->pyoff; p->opyoff = p->pyoff;