q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-22 10:20:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove FIXMEs/silence Fish.es warnings

Browse Source 
Thanks to @SLAwww's explanations it's clear now :)
This commit is contained in:
Daniel Gibson 2016-04-25 00:17:08 +02:00
parent 8106aedd9f
commit de4f96d208
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Engine/Brushes/BrushPolygon.cpp
View File

@ -509,7 +509,7 @@ CBrushPolygon &CBrushPolygon::CopyPolygon(CBrushPolygon &bp)
bpo_boxBoundingBox=bp.bpo_boxBoundingBox; bpo_boxBoundingBox=bp.bpo_boxBoundingBox;
bpo_pbscSector=bp.bpo_pbscSector; bpo_pbscSector=bp.bpo_pbscSector;
bpo_rsOtherSideSectors.Clear(); 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; bpo_iInWorld=bp.bpo_iInWorld;
return *this; return *this;
} }

2
Sources/Entities/Fish.es
View File

@ -268,7 +268,7 @@ procedures:
// declare yourself as a model // declare yourself as a model
InitAsModel(); InitAsModel();
// fish must not go upstairs, or it will get out of water // 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); SetCollisionFlags(ECF_MODEL);
SetFlags(GetFlags()|ENF_ALIVE); SetFlags(GetFlags()|ENF_ALIVE);
SetHealth(30.0f); SetHealth(30.0f);

5
Sources/EntitiesMP/Fish.es
View File

@ -283,10 +283,7 @@ procedures:
// declare yourself as a model // declare yourself as a model
InitAsModel(); InitAsModel();
// fish must not go upstairs, or it will get out of water // fish must not go upstairs, or it will get out of water
// FIXME: DG: should it really be SetPhysicsFlags(((EPF_MODEL_WALKING|EPF_HASGILLS)&~EPF_ONBLOCK_CLIMBORSLIDE)|EPF_ONBLOCK_SLIDE);
// (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);
SetCollisionFlags(ECF_MODEL); SetCollisionFlags(ECF_MODEL);
SetFlags(GetFlags()|ENF_ALIVE); SetFlags(GetFlags()|ENF_ALIVE);
SetHealth(30.0f); SetHealth(30.0f);