thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ACCESS: Add a button to allow skipping the river scene

Browse source
This commit is contained in:
Paul Gilbert 2014-12-09 20:11:44 -05:00
parent beba0b40d5
commit cdc27778c0
3 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
engines/access/amazon/amazon_logic.cpp
View file

@ -1471,6 +1471,12 @@ void River::initRiver() {
_maxHits = 2 - _vm->_riverFlag; _maxHits = 2 - _vm->_riverFlag;
_saveRiver = false; _saveRiver = false;
Font &font2 = _vm->_fonts._font2;
font2._fontColors[0] = 0;
font2._fontColors[1] = 33;
font2._fontColors[2] = 34;
font2._fontColors[3] = 35;
} }
void River::resetPositions() { void River::resetPositions() {
@ -1561,6 +1567,7 @@ void River::riverSound() {
void River::moveCanoe() { void River::moveCanoe() {
EventsManager &events = *_vm->_events; EventsManager &events = *_vm->_events;
Common::Point pt = events.calcRawMouse(); Common::Point pt = events.calcRawMouse();
Common::Point mousePos = events.getMousePos();
// Do an event polling // Do an event polling
_vm->_canSaveLoad = true; _vm->_canSaveLoad = true;
@ -1586,8 +1593,10 @@ void River::moveCanoe() {
_vm->copyBF2Vid(); _vm->copyBF2Vid();
} }
} }
} } else if (events._leftButton && mousePos.x < 35 && mousePos.y < 12) {
else if ((events._leftButton && pt.y <= _canoeYPos) || // Clicked on the Skip button. So chicken out
_CHICKENOUTFLG = true;
} else if ((events._leftButton && pt.y <= _canoeYPos) ||
(!events._leftButton && _vm->_player->_move == UP)) { (!events._leftButton && _vm->_player->_move == UP)) {
// Move canoe up // Move canoe up
if (_canoeLane > 0) { if (_canoeLane > 0) {
@ -1596,8 +1605,7 @@ void River::moveCanoe() {
moveCanoe2(); moveCanoe2();
} }
} } else if (events._leftButton || _vm->_player->_move == DOWN) {
else if (events._leftButton || _vm->_player->_move == DOWN) {
// Move canoe down // Move canoe down
if (_canoeLane < 7) { if (_canoeLane < 7) {
_canoeDir = 1; _canoeDir = 1;
@ -1711,6 +1719,10 @@ void River::plotRiver() {
_vm->_images.addToList(ie); _vm->_images.addToList(ie);
} }
} }
// Draw the text for skipping the river
Font &font2 = _vm->_fonts._font2;
font2.drawString(_vm->_screen, "SKIP", Common::Point(5, 5));
} }
void River::mWhileDownRiver() { void River::mWhileDownRiver() {
@ -1809,7 +1821,7 @@ void River::scrollRiver1() {
_vm->copyBF2Vid(); _vm->copyBF2Vid();
} }
void River::river() { void River::doRiver() {
static const int RIVERDEATH[5] = { 22, 23, 24, 25, 26 }; static const int RIVERDEATH[5] = { 22, 23, 24, 25, 26 };
initRiver(); initRiver();

2
engines/access/amazon/amazon_logic.h
View file

@ -203,7 +203,7 @@ private:
public: public:
River(AmazonEngine *vm); River(AmazonEngine *vm);
void river(); void doRiver();
void mWhileDownRiver(); void mWhileDownRiver();
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s);

2
engines/access/amazon/amazon_scripts.cpp
View file

@ -362,7 +362,7 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
plotInactive(); plotInactive();
break; break;
case 13: case 13:
_game->_river.river(); _game->_river.doRiver();
break; break;
case 14: case 14:
_game->_ant.doAnt(); _game->_ant.doAnt();