zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed GCC and Clang compilation errors.

Browse source
This commit is contained in:
Edoardo Prezioso 2016-04-02 23:01:32 +02:00
parent 6ffb5fa164
commit 28ac65b25b
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/c_cmds.cpp
View file

@ -1086,7 +1086,7 @@ CCMD(currentpos)
if(mo) if(mo)
{ {
Printf("Current player position: (%1.3f,%1.3f,%1.3f), angle: %1.3f, floorheight: %1.3f, sector:%d, lightlevel: %d\n", Printf("Current player position: (%1.3f,%1.3f,%1.3f), angle: %1.3f, floorheight: %1.3f, sector:%d, lightlevel: %d\n",
mo->X(), mo->Y(), mo->Z(), mo->Angles.Yaw, mo->floorz, mo->Sector->sectornum, mo->Sector->lightlevel); mo->X(), mo->Y(), mo->Z(), mo->Angles.Yaw.Normalized360().Degrees, mo->floorz, mo->Sector->sectornum, mo->Sector->lightlevel);
} }
else else
{ {

6
src/p_map.cpp
View file

@ -2122,8 +2122,10 @@ bool P_TryMove(AActor *thing, const DVector2 &pos,
// it slopes or the player's eyes are bobbing in and out. // it slopes or the player's eyes are bobbing in and out.
bool oldAboveFakeFloor, oldAboveFakeCeiling; bool oldAboveFakeFloor, oldAboveFakeCeiling;
double viewheight = thing->player ? thing->player->viewheight : thing->Height / 2; double viewheight;
oldAboveFakeFloor = oldAboveFakeCeiling = false; // pacify GCC // pacify GCC
viewheight = thing->player ? thing->player->viewheight : thing->Height / 2;
oldAboveFakeFloor = oldAboveFakeCeiling = false;
if (oldsec->heightsec) if (oldsec->heightsec)
{ {

3
src/r_segs.cpp
View file

@ -3169,7 +3169,8 @@ static void R_RenderDecal (side_t *wall, DBaseDecal *decal, drawseg_t *clipper,
break; break;
} }
fixed_t fzpos = FLOAT2FIXED(zpos); fixed_t fzpos;
fzpos = FLOAT2FIXED(zpos); // pacify GCC
topoff = WallSpriteTile->TopOffset << FRACBITS; topoff = WallSpriteTile->TopOffset << FRACBITS;
dc_texturemid = topoff + FixedDiv (fzpos - viewz, yscale); dc_texturemid = topoff + FixedDiv (fzpos - viewz, yscale);