diff options
author | Max Horn | 2002-11-06 15:29:49 +0000 |
---|---|---|
committer | Max Horn | 2002-11-06 15:29:49 +0000 |
commit | 63e1069ec1b64686f3d1d1a80a6b440a6adb1e2d (patch) | |
tree | f7a52e2b27c6a3057c7cceac2a1a3727058a223b /scumm/object.cpp | |
parent | 2c6e69dcaf9020ebbd42233bd5cd41f2f5da2f94 (diff) | |
download | scummvm-rg350-63e1069ec1b64686f3d1d1a80a6b440a6adb1e2d.tar.gz scummvm-rg350-63e1069ec1b64686f3d1d1a80a6b440a6adb1e2d.tar.bz2 scummvm-rg350-63e1069ec1b64686f3d1d1a80a6b440a6adb1e2d.zip |
removed more unused variables; cleaned up some spaces
svn-id: r5442
Diffstat (limited to 'scumm/object.cpp')
-rw-r--r-- | scumm/object.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index 104fa30783..cf67337bd7 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -1153,7 +1153,7 @@ void Scumm::nukeFlObjects(int min, int max) } void Scumm::enqueueObject(int objectNumber, int objectX, int objectY, int objectWidth, - int objectHeight, int f, int g, int image, int mode) + int objectHeight, int scaleX, int scaleY, int image, int mode) { BlastObject *eo; ObjectData *od; @@ -1165,10 +1165,6 @@ void Scumm::enqueueObject(int objectNumber, int objectX, int objectY, int object eo = &_enqueuedObjects[_enqueuePos++]; eo->number = objectNumber; - eo->areaX = _enqueue_b; - eo->areaY = _enqueue_c; - eo->areaWidth = _enqueue_d; - eo->areaHeight = _enqueue_e; eo->posX = objectX + (camera._cur.x & 7); eo->posY = objectY + (camera._cur.y - (_realHeight / 2)); if (objectWidth == 0) { @@ -1184,8 +1180,8 @@ void Scumm::enqueueObject(int objectNumber, int objectX, int objectY, int object eo->height = objectHeight; } - eo->scaleX = f; - eo->scaleY = g; + eo->scaleX = scaleX; + eo->scaleY = scaleY; eo->image = image; eo->mode = mode; @@ -1253,20 +1249,18 @@ void Scumm::drawBlastObject(BlastObject *eo) byte bomp_scalling_x[64], bomp_scalling_y[64]; - _bompShadowMode = 0; - if ((bdd.scale_x != 255) || (bdd.scale_y != 255)) { _bompScallingXPtr = bomp_scalling_x; _bompScallingYPtr = bomp_scalling_y; _bompScaleRight = setupBompScale(_bompScallingXPtr, bdd.srcwidth, bdd.scale_x); _bompScaleBottom = setupBompScale(_bompScallingYPtr, bdd.srcheight, bdd.scale_y); + bdd.shadowMode = 0; drawBomp(&bdd, 1, 3); } else { - _bompShadowMode = eo->mode; + bdd.shadowMode = eo->mode; drawBomp(&bdd, 1, 0); } - _bompShadowMode = 0; _bompScallingXPtr = NULL; _bompScallingYPtr = NULL; _bompScaleRight = 0; |