stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-18 07:22:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Compilation fixes. (Silly .o files sticking around...)

Browse source
This commit is contained in:
toasterbabe 2016-06-04 23:06:26 +01:00
parent 36da2e198d
commit bdbfa178e6
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/p_floor.c
View file

@ -2890,7 +2890,7 @@ void EV_CrumbleChain(sector_t *sec, ffloor_t *rover)
if (controlsec->tag != 0) if (controlsec->tag != 0)
{ {
size_t tagline = P_FindSpecialLineFromTag(14, controlsec->tag, -1); INT32 tagline = P_FindSpecialLineFromTag(14, controlsec->tag, -1);
if (tagline != -1) if (tagline != -1)
{ {
if (sides[lines[tagline].sidenum[0]].toptexture) if (sides[lines[tagline].sidenum[0]].toptexture)
@ -2898,7 +2898,12 @@ void EV_CrumbleChain(sector_t *sec, ffloor_t *rover)
if (sides[lines[tagline].sidenum[0]].textureoffset) if (sides[lines[tagline].sidenum[0]].textureoffset)
spacing = sides[lines[tagline].sidenum[0]].textureoffset; spacing = sides[lines[tagline].sidenum[0]].textureoffset;
if (sides[lines[tagline].sidenum[0]].rowoffset) if (sides[lines[tagline].sidenum[0]].rowoffset)
lifetime = (sides[lines[tagline].sidenum[0]].rowoffset>>FRACBITS); {
if (sides[lines[tagline].sidenum[0]].rowoffset>>FRACBITS == -1)
lifetime = (sides[lines[tagline].sidenum[0]].rowoffset>>FRACBITS);
else
lifetime = 0;
}
flags = lines[tagline].flags; flags = lines[tagline].flags;
} }
} }
@ -2956,8 +2961,8 @@ void EV_CrumbleChain(sector_t *sec, ffloor_t *rover)
P_InstaThrust(spawned, R_PointToAngle2(sec->soundorg.x, sec->soundorg.y, a, b), FixedDiv(P_AproxDistance(a - sec->soundorg.x, b - sec->soundorg.y), widthfactor)); P_InstaThrust(spawned, R_PointToAngle2(sec->soundorg.x, sec->soundorg.y, a, b), FixedDiv(P_AproxDistance(a - sec->soundorg.x, b - sec->soundorg.y), widthfactor));
P_SetObjectMomZ(spawned, FixedDiv((c - *rover->bottomheight), heightfactor), false); P_SetObjectMomZ(spawned, FixedDiv((c - *rover->bottomheight), heightfactor), false);
} }
if (lifetime != -1)
spawned->fuse = lifetime; spawned->fuse = lifetime;
} }
} }
} }

2
src/p_saveg.c
View file

@ -1434,7 +1434,6 @@ static inline void SaveFrictionThinker(const thinker_t *th, const UINT8 type)
const friction_t *ht = (const void *)th; const friction_t *ht = (const void *)th;
WRITEUINT8(save_p, type); WRITEUINT8(save_p, type);
WRITEINT32(save_p, ht->friction); WRITEINT32(save_p, ht->friction);
WRITEINT32(save_p, ht->movefactor);
WRITEINT32(save_p, ht->affectee); WRITEINT32(save_p, ht->affectee);
WRITEINT32(save_p, ht->referrer); WRITEINT32(save_p, ht->referrer);
WRITEUINT8(save_p, ht->roverfriction); WRITEUINT8(save_p, ht->roverfriction);
@ -2369,7 +2368,6 @@ static inline void LoadFrictionThinker(actionf_p1 thinker)
friction_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL); friction_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker; ht->thinker.function.acp1 = thinker;
ht->friction = READINT32(save_p); ht->friction = READINT32(save_p);
ht->movefactor = READINT32(save_p);
ht->affectee = READINT32(save_p); ht->affectee = READINT32(save_p);
ht->referrer = READINT32(save_p); ht->referrer = READINT32(save_p);
ht->roverfriction = READUINT8(save_p); ht->roverfriction = READUINT8(save_p);