aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/staticres.cpp
diff options
context:
space:
mode:
authorFlorian Kagerer2009-02-23 20:17:53 +0000
committerFlorian Kagerer2009-02-23 20:17:53 +0000
commit837ca0683e758f7a822452c53b2bff69fa554099 (patch)
treefaba5e246310c377e669b8a2c30a03c556754208 /engines/kyra/staticres.cpp
parente3afa772e2ad494175b91e011304558150b8901a (diff)
downloadscummvm-rg350-837ca0683e758f7a822452c53b2bff69fa554099.tar.gz
scummvm-rg350-837ca0683e758f7a822452c53b2bff69fa554099.tar.bz2
scummvm-rg350-837ca0683e758f7a822452c53b2bff69fa554099.zip
LOL: - some more work on the interface (you can now click on the banners and windows) and some bug fixes
svn-id: r38818
Diffstat (limited to 'engines/kyra/staticres.cpp')
-rw-r--r--engines/kyra/staticres.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index df5d4ee08b..17f473568b 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -984,11 +984,11 @@ bool StaticResource::loadCharData(const char *filename, void *&ptr, int &size) {
t->field_41 = file->readByte();
t->damageSuffered = file->readUint16LE();
t->weaponHit = file->readUint16LE();
- t->might3 = file->readUint16LE();
- t->protection3 = file->readUint16LE();
- t->might2 = file->readUint16LE();
- t->protection2 = file->readUint16LE();
- t->rand = file->readUint16LE();
+ t->totalMightModifier = file->readUint16LE();
+ t->totalProtectionModifier = file->readUint16LE();
+ t->might = file->readUint16LE();
+ t->protection = file->readUint16LE();
+ t->nextAnimUpdateCountdown = file->readSint16LE();
for (int ii = 0; ii < 11; ii++)
t->items[ii] = file->readUint16LE();
for (int ii = 0; ii < 3; ii++)
@@ -1834,7 +1834,7 @@ void LoLEngine::assignButtonCallback(Button *button, int index) {
cb(clickedUnk16),
cb(clickedUnk16),
cb(clickedUnk16),
- cb(clickedScene1),
+ cb(clickedScenePickupItem),
cb(clickedInventorySlot),
cb(clickedInventorySlot),
cb(clickedInventorySlot),
@@ -1847,8 +1847,8 @@ void LoLEngine::assignButtonCallback(Button *button, int index) {
cb(clickedInventorySlot),
cb(clickedInventoryScroll),
cb(clickedInventoryScroll),
- cb(clickedUnk20),
- cb(clickedUnk20),
+ cb(clickedScenePressSwitch),
+ cb(clickedScenePressSwitch),
cb(clickedScene),
cb(clickedUpArrow),
cb(clickedDownArrow),
@@ -1871,8 +1871,8 @@ void LoLEngine::assignButtonCallback(Button *button, int index) {
cb(clickedUnk23),
cb(clickedUnk23),
cb(clickedUnk24),
- cb(clickedUnk25),
- cb(clickedUnk25),
+ cb(clickedSceneDropItem),
+ cb(clickedSceneDropItem),
cb(clickedOptions),
cb(clickedRestParty),
cb(clickedMoneyBox),