aboutsummaryrefslogtreecommitdiff
path: root/saga/actor.h
diff options
context:
space:
mode:
authorLars Persson2005-07-05 20:22:56 +0000
committerLars Persson2005-07-05 20:22:56 +0000
commitd4716a1fb525540f3395262d236df51ef70874f1 (patch)
tree7e5ddbbd1b7cfb28df2c25f041bf07d487bed662 /saga/actor.h
parent57858a8757a5b3d96958ec856862886184082652 (diff)
downloadscummvm-rg350-d4716a1fb525540f3395262d236df51ef70874f1.tar.gz
scummvm-rg350-d4716a1fb525540f3395262d236df51ef70874f1.tar.bz2
scummvm-rg350-d4716a1fb525540f3395262d236df51ef70874f1.zip
* Start of generic key configuration support for ScummVM
* Moved KeyConfigDialog, key from WinCE to gui * Updated wince code to inherit and use new GUI::Keys and launch new dialog * New definition SMALL_SCREEN_DEVICE when keysdialog should be inittialized from options.cpp * Added new function to SDL\Events that handles key remapping. LINUPY & QTOPIA remapping moved to that function. SymbianOs.cpp overrides this function to enable key remapping to events * Compiled VC6++ project. This with warnings and errors, but NOT in the changed code. (SAGA,KYRA) * Compiled using WCE tools 3 for X86 target and running Scummvm in emulator to test * Compiled with UIQ target. The rest Symbian platforms might require further configuration to operate properly * Actor.h in Saga now compiles for default VC6 setting. * Aspect.cpp does not compile in VC6/WCE due to template problems with the kFastAndNiceAspectMode setting. * Changed order of creation of gamedetector and mainsystem in Main.cpp * If anything does not compile, or is totally out of order, please revert changes. svn-id: r18498
Diffstat (limited to 'saga/actor.h')
-rw-r--r--saga/actor.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/saga/actor.h b/saga/actor.h
index bbc6965501..39b14ff10d 100644
--- a/saga/actor.h
+++ b/saga/actor.h
@@ -336,6 +336,7 @@ public:
int32 walkFrameSequence;
void saveState(Common::OutSaveFile *out) {
+ int i = 0;
CommonObjectData::saveState(out);
out->writeUint16LE(actorFlags);
out->writeSint32LE(currentAction);
@@ -357,12 +358,12 @@ public:
out->writeSint32LE(frameNumber);
out->writeSint32LE(tileDirectionsAlloced);
- for (int i = 0; i < tileDirectionsAlloced; i++) {
+ for (i = 0; i < tileDirectionsAlloced; i++) {
out->writeByte(tileDirections[i]);
}
out->writeSint32LE(walkStepsAlloced);
- for (int i = 0; i < walkStepsAlloced; i++) {
+ for (i = 0; i < walkStepsAlloced; i++) {
out->writeSint16LE(walkStepsPoints[i].x);
out->writeSint16LE(walkStepsPoints[i].y);
}
@@ -375,6 +376,7 @@ public:
}
void loadState(Common::InSaveFile *in) {
+ int i = 0;
CommonObjectData::loadState(in);
actorFlags = in->readUint16LE();
currentAction = in->readSint32LE();
@@ -407,12 +409,12 @@ public:
setTileDirectionsSize(in->readSint32LE(), true);
- for (int i = 0; i < tileDirectionsAlloced; i++) {
+ for (i = 0; i < tileDirectionsAlloced; i++) {
tileDirections[i] = in->readByte();
}
setWalkStepsPointsSize(in->readSint32LE(), true);
- for (int i = 0; i < walkStepsAlloced; i++) {
+ for (i = 0; i < walkStepsAlloced; i++) {
walkStepsPoints[i].x = in->readSint16LE();
walkStepsPoints[i].y = in->readSint16LE();
}