aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/avalanche/animation.h3
-rw-r--r--engines/avalanche/avalanche.h7
-rw-r--r--engines/avalanche/menu.cpp36
-rw-r--r--engines/avalanche/menu.h1
4 files changed, 23 insertions, 24 deletions
diff --git a/engines/avalanche/animation.h b/engines/avalanche/animation.h
index d5d85106d8..e880fbf9e7 100644
--- a/engines/avalanche/animation.h
+++ b/engines/avalanche/animation.h
@@ -61,7 +61,6 @@ public:
Direction _facingDir;
byte _stepNum;
int16 _x, _y; // Current xy coords.
- int16 _oldX[2], _oldY[2]; // Last xy coords.
int8 _moveX, _moveY; // Amount to move sprite by, each step.
byte _id;
bool _quick, _visible, _homing, _doCheck;
@@ -91,6 +90,8 @@ public:
private:
Animation *_anim;
+ int16 _oldX[2], _oldY[2]; // Last xy coords.
+
bool checkCollision();
int8 getSign(int16 val);
};
diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
index 845aa09f08..6f03132e58 100644
--- a/engines/avalanche/avalanche.h
+++ b/engines/avalanche/avalanche.h
@@ -261,16 +261,12 @@ public:
bool _letMeOut;
byte _thinks;
bool _thinkThing;
-
-
-
int16 _talkX, _talkY;
bool _seeScroll; // TODO: maybe this means we're interacting with the toolbar / a scroll?
char _objectList[10];
// Called .free() for them in ~Gyro().
- int8 _scoreToDisplay[3];
+
byte _currentMouse; // current mouse-void
- Common::String _verbStr; // what you can do with your object. :-)
Common::String *_also[31][2];
PedType _peds[15];
MagicType _magics[15];
@@ -361,6 +357,7 @@ private:
bool _passedCwytalotInHerts; // Have you passed Cwytalot in Herts?
byte _roomCount[100]; // Add one to each every time you enter a room
Common::String _mouseText;
+ int8 _scoreToDisplay[3];
Common::File file;
Common::String readAlsoStringFromFile();
diff --git a/engines/avalanche/menu.cpp b/engines/avalanche/menu.cpp
index f1c638913e..a2670ed801 100644
--- a/engines/avalanche/menu.cpp
+++ b/engines/avalanche/menu.cpp
@@ -265,26 +265,26 @@ void Menu::findWhatYouCanDoWithIt() {
case kObjectWine:
case kObjectPotion:
case kObjectInk:
- _vm->_verbStr = Common::String(kVerbCodeExam) + kVerbCodeDrink;
+ _verbStr = Common::String(kVerbCodeExam) + kVerbCodeDrink;
break;
case kObjectBell:
- _vm->_verbStr = Common::String(kVerbCodeExam) + kVerbCodeRing;
+ _verbStr = Common::String(kVerbCodeExam) + kVerbCodeRing;
break;
case kObjectChastity:
- _vm->_verbStr = Common::String(kVerbCodeExam) + kVerbCodeWear;
+ _verbStr = Common::String(kVerbCodeExam) + kVerbCodeWear;
break;
case kObjectLute:
- _vm->_verbStr = Common::String(kVerbCodeExam) + kVerbCodePlay;
+ _verbStr = Common::String(kVerbCodeExam) + kVerbCodePlay;
break;
case kObjectMushroom:
case kObjectOnion:
- _vm->_verbStr = Common::String(kVerbCodeExam) + kVerbCodeEat;
+ _verbStr = Common::String(kVerbCodeExam) + kVerbCodeEat;
break;
case kObjectClothes:
- _vm->_verbStr = Common::String(kVerbCodeExam) + kVerbCodeWear;
+ _verbStr = Common::String(kVerbCodeExam) + kVerbCodeWear;
break;
default:
- _vm->_verbStr = kVerbCodeExam; // Anything else.
+ _verbStr = kVerbCodeExam; // Anything else.
}
}
@@ -469,11 +469,11 @@ void Menu::setupMenuWith() {
if (_vm->_thinkThing) {
findWhatYouCanDoWithIt();
- for (uint i = 0; i < _vm->_verbStr.size(); i++) {
+ for (uint i = 0; i < _verbStr.size(); i++) {
char vbchar;
Common::String verb;
- _vm->_parser->verbOpt(_vm->_verbStr[i], verb, vbchar);
+ _vm->_parser->verbOpt(_verbStr[i], verb, vbchar);
_activeMenuItem.setupOption(verb, vbchar, "", true);
}
@@ -485,21 +485,21 @@ void Menu::setupMenuWith() {
_activeMenuItem.setupOption("Give to...", 'G', "", false); // Not here.
else {
_activeMenuItem.setupOption(Common::String("Give to ") + _vm->getName(_vm->_lastPerson), 'G', "", true);
- _vm->_verbStr = _vm->_verbStr + kVerbCodeGive;
+ _verbStr = _verbStr + kVerbCodeGive;
}
} else {
_activeMenuItem.setupOption("Examine", 'x', "", true);
_activeMenuItem.setupOption(Common::String("Talk to h") + selectGender(_vm->_thinks), 'T', "", true);
- _vm->_verbStr = Common::String(kVerbCodeExam) + kVerbCodeTalk;
+ _verbStr = Common::String(kVerbCodeExam) + kVerbCodeTalk;
switch (_vm->_thinks) {
case kPeopleGeida:
case kPeopleArkata:
_activeMenuItem.setupOption("Kiss her", 'K', "", true);
- _vm->_verbStr = _vm->_verbStr + kVerbCodeKiss;
+ _verbStr = _verbStr + kVerbCodeKiss;
break;
case kPeopleDogfood:
_activeMenuItem.setupOption("Play his game", 'P', "", !_vm->_wonNim); // True if you HAVEN'T won.
- _vm->_verbStr = _vm->_verbStr + kVerbCodePlay;
+ _verbStr = _verbStr + kVerbCodePlay;
break;
case kPeopleMalagauche: {
bool isSober = !_vm->_teetotal;
@@ -508,12 +508,12 @@ void Menu::setupMenuWith() {
_activeMenuItem.setupOption("Buy some whisky", 'h', "", isSober);
_activeMenuItem.setupOption("Buy some cider", 'c', "", isSober);
_activeMenuItem.setupOption("Buy some mead", 'm', "", isSober);
- _vm->_verbStr = _vm->_verbStr + 101 + 100 + 102 + 103 + 104;
+ _verbStr = _verbStr + 101 + 100 + 102 + 103 + 104;
}
break;
case kPeopleTrader:
_activeMenuItem.setupOption("Buy an onion", 'o', "", !_vm->_objects[kObjectOnion - 1]);
- _vm->_verbStr = _vm->_verbStr + 105;
+ _verbStr = _verbStr + 105;
break;
}
}
@@ -622,12 +622,12 @@ void Menu::runMenuWith() {
if (_vm->_thinkThing) {
_vm->_parser->_thing += 49;
- if (_vm->_verbStr[_activeMenuItem._choiceNum] == kVerbCodeGive)
+ if (_verbStr[_activeMenuItem._choiceNum] == kVerbCodeGive)
_vm->_parser->_person = _vm->_lastPerson;
else
_vm->_parser->_person = kPeoplePardon;
} else {
- switch (_vm->_verbStr[_activeMenuItem._choiceNum]) {
+ switch (_verbStr[_activeMenuItem._choiceNum]) {
case 100: // Beer
_vm->_parser->_thing = 100;
_vm->callVerb(kVerbCodeBuy);
@@ -658,7 +658,7 @@ void Menu::runMenuWith() {
_vm->_subjectNum = 0;
}
}
- _vm->callVerb((VerbCode)_vm->_verbStr[_activeMenuItem._choiceNum]);
+ _vm->callVerb((VerbCode)_verbStr[_activeMenuItem._choiceNum]);
}
void Menu::setup() {
diff --git a/engines/avalanche/menu.h b/engines/avalanche/menu.h
index eb357f597d..ef74e73d1d 100644
--- a/engines/avalanche/menu.h
+++ b/engines/avalanche/menu.h
@@ -139,6 +139,7 @@ private:
// static const Color kHighlightFontColor = kColorWhite;
// static const Color kDisabledColor = kColorDarkgray;
+ Common::String _verbStr; // what you can do with your object. :-)
bool _menuActive; // Kludge so we don't have to keep referring to the menu.
AvalancheEngine *_vm;
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-02 05:21:41 +0000