diff options
| author | Max Horn | 2002-09-19 11:06:10 +0000 |
|---|---|---|
| committer | Max Horn | 2002-09-19 11:06:10 +0000 |
| commit | b46b35b54470180a882d2732b75d64243857cb54 (patch) | |
| tree | c75680fbe907b481a29a8103a35cd53dd1beadae /scumm | |
| parent | e80d5a866b3a327eaa4e36a9baac3f8d09f82620 (diff) | |
| download | scummvm-rg350-b46b35b54470180a882d2732b75d64243857cb54.tar.gz scummvm-rg350-b46b35b54470180a882d2732b75d64243857cb54.tar.bz2 scummvm-rg350-b46b35b54470180a882d2732b75d64243857cb54.zip | |
renamed unk3/unk4 to scaleX/scaleY
svn-id: r4970
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/gfx.h | 3 | ||||
| -rw-r--r-- | scumm/object.cpp | 8 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/scumm/gfx.h b/scumm/gfx.h index 41cbad7d37..93eec1e64c 100644 --- a/scumm/gfx.h +++ b/scumm/gfx.h @@ -84,7 +84,8 @@ struct BlastObject { /* BlastObjects to draw */ uint16 number, areaX, areaY, areaWidth, areaHeight; int16 posX, posY; uint16 width, height; - uint16 unk3, unk4, image; + uint16 scaleX, scaleY; + uint16 image; uint16 mode; }; diff --git a/scumm/object.cpp b/scumm/object.cpp index 52a0afca6f..641793acd3 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -1180,8 +1180,8 @@ void Scumm::enqueueObject(int objectNumber, int objectX, int objectY, int object eo->height = objectHeight; } - eo->unk3 = f; - eo->unk4 = g; + eo->scaleX = f; + eo->scaleY = g; eo->image = image; eo->mode = mode; @@ -1244,8 +1244,8 @@ void Scumm::drawBlastObject(BlastObject *eo) bdd.dataptr = bomp + 10; bdd.x = eo->posX; bdd.y = eo->posY; - bdd.scale_x = (unsigned char)eo->unk3; - bdd.scale_y = (unsigned char)eo->unk4; + bdd.scale_x = (unsigned char)eo->scaleX; + bdd.scale_y = (unsigned char)eo->scaleY; drawBomp(&bdd, 0, bdd.dataptr, 1, 0); updateDirtyRect(vs->number, bdd.x, bdd.x + bdd.srcwidth, bdd.y, bdd.y + bdd.srcheight, 0); diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index a3d801c47b..8e6d7a895e 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -161,7 +161,8 @@ Scumm::~Scumm () delete _bundle; delete _sound; delete _imuse; - if (_existLanguageFile) delete _languageBuffer; + if (_existLanguageFile) + delete _languageBuffer; } void Scumm::scummInit() |