mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-28 06:53:58 +00:00
- fixed some GCC warnings.
SVN r1738 (trunk)
This commit is contained in:
parent
d26aeb8939
commit
1c8d442c32
3 changed files with 7 additions and 5 deletions
|
@ -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];
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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 )
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue