aboutsummaryrefslogtreecommitdiff
path: root/engines/avalanche
diff options
context:
space:
mode:
authoruruk2014-02-21 15:50:37 +0100
committeruruk2014-02-21 15:50:37 +0100
commit5580c0b95e11d4035626ddd6efef600385044f76 (patch)
treeb3c40f087fcd55b5295c4280b852a04c6186e0cb /engines/avalanche
parent55719452830808fd24a3274734212df22405fd61 (diff)
downloadscummvm-rg350-5580c0b95e11d4035626ddd6efef600385044f76.tar.gz
scummvm-rg350-5580c0b95e11d4035626ddd6efef600385044f76.tar.bz2
scummvm-rg350-5580c0b95e11d4035626ddd6efef600385044f76.zip
AVALANCHE: Repair define() and defineCameo() in ShootEmUp.
Diffstat (limited to 'engines/avalanche')
-rw-r--r--engines/avalanche/shootemup.cpp6
-rw-r--r--engines/avalanche/shootemup.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/avalanche/shootemup.cpp b/engines/avalanche/shootemup.cpp
index a2d5289e63..783c1f9e20 100644
--- a/engines/avalanche/shootemup.cpp
+++ b/engines/avalanche/shootemup.cpp
@@ -206,12 +206,12 @@ void ShootEmUp::plotThem() {
}
}
-void ShootEmUp::define(int16 x, int16 y, byte p, int8 ix, int8 iy, int16 time, bool isAMissile, bool doWeWipe) {
+void ShootEmUp::define(int16 x, int16 y, int8 p, int8 ix, int8 iy, int16 time, bool isAMissile, bool doWeWipe) {
for (int i = 0; i < 99; i++) {
if (_sprites[i]._x == kFlag) {
_sprites[i]._x = x;
_sprites[i]._y = y;
- _sprites[i]._p = p;
+ _sprites[i]._p = p - 1;
_sprites[i]._ix = ix;
_sprites[i]._iy = iy;
_sprites[i]._timeout = time;
@@ -223,7 +223,7 @@ void ShootEmUp::define(int16 x, int16 y, byte p, int8 ix, int8 iy, int16 time, b
}
}
-void ShootEmUp::defineCameo(int16 x, int16 y, byte p, int16 time) {
+void ShootEmUp::defineCameo(int16 x, int16 y, int8 p, int16 time) {
for (int i = 0; i < 99; i++) {
if (_sprites[i]._x == kFlag) {
_sprites[i]._x = x;
diff --git a/engines/avalanche/shootemup.h b/engines/avalanche/shootemup.h
index d0df763715..ada39066fd 100644
--- a/engines/avalanche/shootemup.h
+++ b/engines/avalanche/shootemup.h
@@ -41,7 +41,7 @@ private:
struct Sprite {
int8 _ix, _iy;
int16 _x, _y;
- byte _p;
+ int8 _p;
int16 _timeout;
bool _cameo;
byte _cameoFrame;
@@ -102,8 +102,8 @@ private:
void moveThem();
void blank(Common::Rect rect);
void plotThem();
- void define(int16 x, int16 y, byte p, int8 ix, int8 iy, int16 time, bool isAMissile, bool doWeWipe);
- void defineCameo(int16 x, int16 y, byte p, int16 time);
+ void define(int16 x, int16 y, int8 p, int8 ix, int8 iy, int16 time, bool isAMissile, bool doWeWipe);
+ void defineCameo(int16 x, int16 y, int8 p, int16 time);
void showStock(byte index);
void drawNumber(int number, int size, int x);
void showScore();