marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't draw action face for mesh objects (#144) 

Action.Facet has no meaning for meshes anyway.
stable-5.1
Armin Burgmeier 2010-03-09 20:14:47 +01:00
parent d5a5c23070
commit 7b536f619e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/object/C4Object.cpp
View File

@ -552,6 +552,10 @@ void C4Object::DrawFace(C4TargetFacet &cgo, float offX, float offY, int32_t iPha
void C4Object::DrawActionFace(C4TargetFacet &cgo, float offX, float offY)
{
// This should not be called for meshes since Facet has no meaning
// for them. Only use DrawFace() with meshes!
assert(GetGraphics()->Type == C4DefGraphics::TYPE_Bitmap);
// Regular action facet
const float swdt = float(Action.Facet.Wdt);
const float shgt = float(Action.Facet.Hgt);
@ -2382,7 +2386,7 @@ void C4Object::Draw(C4TargetFacet &cgo, int32_t iByPlayer, DrawMode eDrawMode)
else
{
// FacetBase
if (Action.pActionDef->GetPropertyInt(P_FacetBase))
if (Action.pActionDef->GetPropertyInt(P_FacetBase) || GetGraphics()->Type != C4DefGraphics::TYPE_Bitmap)
DrawFace(cgo, offX, offY, 0, Action.DrawDir);
// Special: stretched action facet
@ -2396,7 +2400,7 @@ void C4Object::Draw(C4TargetFacet &cgo, int32_t iByPlayer, DrawMode eDrawMode)
(fixtof(Action.Target->fix_y) + Action.Target->Shape.GetY()) - (fixtof(fix_y) + Shape.GetY() + Action.FacetY),
true);
}
else if (Action.Facet.Surface || GetGraphics()->Type != C4DefGraphics::TYPE_Bitmap)
else if (Action.Facet.Surface)
DrawActionFace(cgo, offX, offY);
}