From 4cb24de24edb4f0efdef3b246279836ef5a74f93 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Mon, 4 Nov 2013 18:21:07 +0000 Subject: [PATCH] In exprs like "Bmemcpy(&p->pos.x, &sprite[i].x, sizeof(vec3_t))", drop the ".x". git-svn-id: https://svn.eduke32.com/eduke32@4132 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/actors.c | 22 +++++++++++----------- polymer/eduke32/source/game.c | 4 ++-- polymer/eduke32/source/gameexec.c | 4 ++-- polymer/eduke32/source/player.c | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/polymer/eduke32/source/actors.c b/polymer/eduke32/source/actors.c index 8adef03c9..8ebf880bd 100644 --- a/polymer/eduke32/source/actors.c +++ b/polymer/eduke32/source/actors.c @@ -320,7 +320,7 @@ static int32_t Proj_MaybeDoTransport(int32_t spritenum, int32_t i, int32_t fromu else // below->above 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); return 1; @@ -1261,7 +1261,7 @@ ACTOR_STATIC void G_MovePlayers(void) if (p->holoduke_on == -1) KILLIT(i); - Bmemcpy(&actor[i].bpos.x, s, sizeof(vec3_t)); + Bmemcpy(&actor[i].bpos, s, sizeof(vec3_t)); s->cstat = 0; if (s->xrepeat < 42) @@ -1557,7 +1557,7 @@ ACTOR_STATIC void G_MoveStandables(void) // Rotation-fixed sprites in rotating sectors already have bpos* updated. 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) { @@ -1727,7 +1727,7 @@ ACTOR_STATIC void G_MoveStandables(void) { 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; } @@ -2923,7 +2923,7 @@ ACTOR_STATIC void G_MoveWeapons(void) if (s->sectnum < 0) KILLIT(i); - Bmemcpy(&actor[i].bpos.x, s, sizeof(vec3_t)); + Bmemcpy(&actor[i].bpos, s, sizeof(vec3_t)); /* Custom projectiles */ if (A_CheckSpriteFlags(i, SPRITE_PROJECTILE)) @@ -3569,7 +3569,7 @@ ACTOR_STATIC void G_MoveTransports(void) sprite[j].z = sectlotag==ST_1_ABOVE_WATER ? 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); } @@ -3587,7 +3587,7 @@ ACTOR_STATIC void G_MoveTransports(void) sprite[j].z -= SZ - sector[sprite[OW].sectnum].floorz; 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) { @@ -3613,7 +3613,7 @@ ACTOR_STATIC void G_MoveTransports(void) sprite[j].y += (sprite[OW].y-SY); 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); } @@ -3669,7 +3669,7 @@ ACTOR_STATIC void G_MoveActors(void) if (s->xrepeat == 0 || sect < 0 || sect >= MAXSECTORS) KILLIT(i); - Bmemcpy(&actor[i].bpos.x, s, sizeof(vec3_t)); + Bmemcpy(&actor[i].bpos, s, sizeof(vec3_t)); switchpicnum = s->picnum; @@ -4991,7 +4991,7 @@ ACTOR_STATIC void G_MoveMisc(void) // STATNUM 5 if (sect < 0 || s->xrepeat == 0) KILLIT(i); - Bmemcpy(&actor[i].bpos.x, s, sizeof(vec3_t)); + Bmemcpy(&actor[i].bpos, s, sizeof(vec3_t)); switchpicnum = s->picnum; 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- (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); setsprite(k,(vec3_t *)&sprite[k]); diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 2b124162b..adef46e5c 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -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)); 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) { @@ -4985,7 +4985,7 @@ int32_t A_Spawn(int32_t j, int32_t pn) i = pn; 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; diff --git a/polymer/eduke32/source/gameexec.c b/polymer/eduke32/source/gameexec.c index 13ee94a63..ef3e4bfff 100644 --- a/polymer/eduke32/source/gameexec.c +++ b/polymer/eduke32/source/gameexec.c @@ -5509,7 +5509,7 @@ void G_SaveMapState(void) Bmemcpy(&save->actor[0],&actor[0],sizeof(actor_t)*MAXSPRITES); 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_numAnimWalls,&g_numAnimWalls,sizeof(g_numAnimWalls)); 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(&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_numAnimWalls,&save->g_numAnimWalls,sizeof(g_numAnimWalls)); Bmemcpy(&SpriteDeletionQueue[0],&save->SpriteDeletionQueue[0],sizeof(SpriteDeletionQueue)); diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c index 54d6f5d02..c7e6716eb 100644 --- a/polymer/eduke32/source/player.c +++ b/polymer/eduke32/source/player.c @@ -4187,7 +4187,7 @@ void P_UpdatePosWhenViewingCam(DukePlayer_t *p) { 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->vel.x = p->vel.y = sprite[p->i].xvel = 0; p->look_ang = 0; @@ -4407,7 +4407,7 @@ void P_ProcessInput(int32_t snum) // 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->opyoff = p->pyoff;