aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actor.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/actor.cpp b/actor.cpp
index 99b01a823f..896104acfb 100644
--- a/actor.cpp
+++ b/actor.cpp
@@ -919,17 +919,16 @@ void Scumm::drawActorCostume(Actor * a)
else if (g_scumm->getClass(a->number, 21))
a->forceClip = 1;
-
-
if (_gameId==GID_SAMNMAX && getState(995)) // FIXME: ugly fix for samnmax inventory
-
return;
-
a->needRedraw = false;
setupActorScale(a);
+ /* First, zero initialize all fields */
+ memset(&cr, 0, sizeof(cr));
+
cr._actorX = a->x - virtscr->xstart;
cr._actorY = a->y - a->elevation;
cr._scaleX = a->scalex;
@@ -969,6 +968,9 @@ void Scumm::drawActorCostume(Actor * a)
setupActorScale(a);
+ /* First, zero initialize all fields */
+ memset(&ar, 0, sizeof(ar));
+
ar.x = a->x - virtscr->xstart;
ar.y = a->y - a->elevation;
ar.scale_x = a->scalex;