aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorSven Hesse2008-04-30 20:07:33 +0000
committerSven Hesse2008-04-30 20:07:33 +0000
commitea5482e6b128ddb89e25a554468062d81744be1e (patch)
tree024aa2b4ed812eb3d36b683186595a38d0345fd3 /engines
parent4d67fb84e59eb0515c3c8af004effe58fd20ff93 (diff)
downloadscummvm-rg350-ea5482e6b128ddb89e25a554468062d81744be1e.tar.gz
scummvm-rg350-ea5482e6b128ddb89e25a554468062d81744be1e.tar.bz2
scummvm-rg350-ea5482e6b128ddb89e25a554468062d81744be1e.zip
Changed signess of some drawing order related vars, fixing a drawing glitch in Gob3
svn-id: r31792
Diffstat (limited to 'engines')
-rw-r--r--engines/gob/inter_v2.cpp2
-rw-r--r--engines/gob/mult.h16
-rw-r--r--engines/gob/mult_v2.cpp8
3 files changed, 13 insertions, 13 deletions
diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp
index 9b474a08d6..c1efc42bb8 100644
--- a/engines/gob/inter_v2.cpp
+++ b/engines/gob/inter_v2.cpp
@@ -896,7 +896,7 @@ void Inter_v2::o2_initMult() {
if (_terminate)
return;
- _vm->_mult->_orderArray = new int8[_vm->_mult->_objCount];
+ _vm->_mult->_orderArray = new uint8[_vm->_mult->_objCount];
memset(_vm->_mult->_orderArray, 0, _vm->_mult->_objCount * sizeof(int8));
_vm->_mult->_objects = new Mult::Mult_Object[_vm->_mult->_objCount];
memset(_vm->_mult->_objects, 0,
diff --git a/engines/gob/mult.h b/engines/gob/mult.h
index 9d43435184..ccc87849df 100644
--- a/engines/gob/mult.h
+++ b/engines/gob/mult.h
@@ -40,12 +40,12 @@ public:
uint8 layer;
uint8 frame;
int8 animType;
- int8 order;
+ uint8 order;
int8 isPaused;
int8 isStatic;
int8 maxTick;
int8 maxFrame;
- int8 newLayer;
+ uint8 newLayer;
int8 newAnimation;
byte intersected;
uint8 newCycle;
@@ -61,7 +61,7 @@ public:
int8 stateType;
int8 animTypeBak;
int8 redrawAnimation;
- int8 redrawLayer;
+ uint8 redrawLayer;
uint8 redrawFrame;
} PACKED_STRUCT;
@@ -86,10 +86,10 @@ public:
int16 lastTop;
int16 lastBottom;
Mult_GobState **goblinStates;
- int8 goblinX;
- int8 goblinY;
- int8 destX;
- int8 destY;
+ uint8 goblinX;
+ uint8 goblinY;
+ uint8 destX;
+ uint8 destY;
int8 gobDestX;
int8 gobDestY;
uint8 nearestWayPoint;
@@ -229,7 +229,7 @@ public:
int16 *_renderData;
Mult_Object **_renderObjs;
- int8 *_orderArray;
+ uint8 *_orderArray;
SurfaceDesc::Ptr _animSurf;
int16 _animLeft;
diff --git a/engines/gob/mult_v2.cpp b/engines/gob/mult_v2.cpp
index 95617a704a..5acbf9e652 100644
--- a/engines/gob/mult_v2.cpp
+++ b/engines/gob/mult_v2.cpp
@@ -526,7 +526,7 @@ void Mult_v2::playMultInit() {
delete[] _animArrayData;
_objects = new Mult_Object[_objCount];
- _orderArray = new int8[_objCount];
+ _orderArray = new uint8[_objCount];
_renderObjs = new Mult_Object*[_objCount];
_animArrayX = new int32[_objCount];
_animArrayY = new int32[_objCount];
@@ -768,9 +768,9 @@ void Mult_v2::newCycleAnim(Mult_Object &animObj) {
}
void Mult_v2::animate() {
- int8 minOrder = 100;
- int8 maxOrder = 0;
- int8 *orderArray;
+ uint8 minOrder = 100;
+ uint8 maxOrder = 0;
+ uint8 *orderArray;
int orderArrayPos = 0;
int8 animIndices[150];
int numAnims = 0;