From de4f96d2089a9ca5242ed301b7745bf3ccf2ff75 Mon Sep 17 00:00:00 2001 From: Daniel Gibson Date: Mon, 25 Apr 2016 00:17:08 +0200 Subject: [PATCH] Remove FIXMEs/silence Fish.es warnings Thanks to @SLAwww's explanations it's clear now :) --- Sources/Engine/Brushes/BrushPolygon.cpp | 2 +- Sources/Entities/Fish.es | 2 +- Sources/EntitiesMP/Fish.es | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Sources/Engine/Brushes/BrushPolygon.cpp b/Sources/Engine/Brushes/BrushPolygon.cpp index b5a4342..e5b971b 100644 --- a/Sources/Engine/Brushes/BrushPolygon.cpp +++ b/Sources/Engine/Brushes/BrushPolygon.cpp @@ -509,7 +509,7 @@ CBrushPolygon &CBrushPolygon::CopyPolygon(CBrushPolygon &bp) bpo_boxBoundingBox=bp.bpo_boxBoundingBox; bpo_pbscSector=bp.bpo_pbscSector; bpo_rsOtherSideSectors.Clear(); - //bpo_lhShadingInfos; // FIXME: DG: was this missing "= bp.bpo_lhShadingInfos" or something like that? + //bpo_lhShadingInfos; // don't copy or anything, it's a CListHead which must not be copied bpo_iInWorld=bp.bpo_iInWorld; return *this; } diff --git a/Sources/Entities/Fish.es b/Sources/Entities/Fish.es index 93d3eb5..4a969a5 100644 --- a/Sources/Entities/Fish.es +++ b/Sources/Entities/Fish.es @@ -268,7 +268,7 @@ procedures: // declare yourself as a model InitAsModel(); // fish must not go upstairs, or it will get out of water - SetPhysicsFlags((EPF_MODEL_WALKING|EPF_HASGILLS)&~EPF_ONBLOCK_CLIMBORSLIDE|EPF_ONBLOCK_SLIDE); + SetPhysicsFlags(((EPF_MODEL_WALKING|EPF_HASGILLS)&~EPF_ONBLOCK_CLIMBORSLIDE)|EPF_ONBLOCK_SLIDE); SetCollisionFlags(ECF_MODEL); SetFlags(GetFlags()|ENF_ALIVE); SetHealth(30.0f); diff --git a/Sources/EntitiesMP/Fish.es b/Sources/EntitiesMP/Fish.es index 9d3e60a..52a8abe 100755 --- a/Sources/EntitiesMP/Fish.es +++ b/Sources/EntitiesMP/Fish.es @@ -283,10 +283,7 @@ procedures: // declare yourself as a model InitAsModel(); // fish must not go upstairs, or it will get out of water - // FIXME: DG: should it really be - // (EPF_MODEL_WALKING|EPF_HASGILLS) & ~EPF_ONBLOCK_CLIMBORSLIDE ) | EPF_ONBLOCK_SLIDE - // or rather (EPF_MODEL_WALKING|EPF_HASGILLS) & ~(EPF_ONBLOCK_CLIMBORSLIDE|EPF_ONBLOCK_SLIDE) ?? - SetPhysicsFlags((EPF_MODEL_WALKING|EPF_HASGILLS)&~EPF_ONBLOCK_CLIMBORSLIDE|EPF_ONBLOCK_SLIDE); + SetPhysicsFlags(((EPF_MODEL_WALKING|EPF_HASGILLS)&~EPF_ONBLOCK_CLIMBORSLIDE)|EPF_ONBLOCK_SLIDE); SetCollisionFlags(ECF_MODEL); SetFlags(GetFlags()|ENF_ALIVE); SetHealth(30.0f);