- fixed some GCC warnings.

SVN r1738 (trunk)
This commit is contained in:
Christoph Oelckers 2009-07-25 15:00:45 +00:00
parent d26aeb8939
commit 1c8d442c32
3 changed files with 7 additions and 5 deletions

View file

@ -2354,6 +2354,8 @@ static bool LoadDehSupp ()
{ {
sc.MustGetString(); sc.MustGetString();
DEHSprName s; DEHSprName s;
// initialize with zeroes
memset(&s, 0, sizeof(s));
if (strlen(sc.String) ==4) if (strlen(sc.String) ==4)
{ {
s.c[0] = sc.String[0]; s.c[0] = sc.String[0];

View file

@ -180,10 +180,10 @@ bool SightCheck::PTR_SightTraverse (intercept_t *in)
fixed_t ffb_bottom=rover2->bottom.plane->ZatPoint(trX, trY); fixed_t ffb_bottom=rover2->bottom.plane->ZatPoint(trX, trY);
fixed_t ffb_top=rover2->top.plane->ZatPoint(trX, trY); fixed_t ffb_top=rover2->top.plane->ZatPoint(trX, trY);
if (ffb_bottom >= ff_bottom && ffb_bottom<=ff_top || if ( (ffb_bottom >= ff_bottom && ffb_bottom<=ff_top) ||
ffb_top <= ff_top && ffb_top >= ff_bottom || (ffb_top <= ff_top && ffb_top >= ff_bottom) ||
ffb_top >= ff_top && ffb_bottom <= ff_bottom || (ffb_top >= ff_top && ffb_bottom <= ff_bottom) ||
ffb_top <= ff_top && ffb_bottom >= ff_bottom) (ffb_top <= ff_top && ffb_bottom >= ff_bottom) )
{ {
return false; return false;
} }

View file

@ -2593,7 +2593,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_RaiseChildren)
TThinkerIterator<AActor> it; TThinkerIterator<AActor> it;
AActor * mo; AActor * mo;
while (mo = it.Next()) while ((mo = it.Next()))
{ {
if ( mo->master == self ) if ( mo->master == self )
{ {