[Scummvm-git-logs] scummvm master -> 4fc151caf1329e0a43b7f92d041a563160234164
Strangerke
Strangerke at scummvm.org
Wed Jun 10 22:25:05 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
4fc151caf1 KINGDOM: Add finalFrameTable to better match the original, rename enAll and dsAll, add some comment in the Help screen
Commit: 4fc151caf1329e0a43b7f92d041a563160234164
https://github.com/scummvm/scummvm/commit/4fc151caf1329e0a43b7f92d041a563160234164
Author: Strangerke (Strangerke at scummvm.org)
Date: 2020-06-10T23:24:00+01:00
Commit Message:
KINGDOM: Add finalFrameTable to better match the original, rename enAll and dsAll, add some comment in the Help screen
Changed paths:
engines/kingdom/constants.cpp
engines/kingdom/kingdom.cpp
engines/kingdom/kingdom.h
engines/kingdom/logic.cpp
engines/kingdom/logic.h
engines/kingdom/logic1.cpp
engines/kingdom/logic2.cpp
engines/kingdom/logic3.cpp
engines/kingdom/logic4.cpp
diff --git a/engines/kingdom/constants.cpp b/engines/kingdom/constants.cpp
index d93fe7b5ab..cba9410f53 100644
--- a/engines/kingdom/constants.cpp
+++ b/engines/kingdom/constants.cpp
@@ -24,6 +24,30 @@
namespace Kingdom {
+bool _finalFrameTable[] = {
+ false, false, true, false, true, false, true, true, true, false,
+ false, true, true, true, false, true, true, true, true, false,
+ true, true, true, true, true, true, true, false, true, true,
+ false, false, false, true, true, true, true, true, true, true,
+ true, true, true, false, true, false, false, true, true, true,
+ false, true, true, true, false, true, true, true, true, false,
+ false, true, true, true, true, true, true, true, false, false,
+ false, true, false, false, false, false, true, true, false, true,
+ true, true, true, true, true, true, true, true, true, false,
+ true, true, false, false, false, false, true, true, true, false,
+ true, true, true, true, false, false, false, true, false, false,
+ true, true, true, true, true, true, true, false, true, true,
+ false, true, true, true, true, false, true, true, true, true,
+ true, true, true, true, false, true, false, false, false, true,
+ true, true, false, true, true, false, true, true, false, true,
+ true, true, true, false, true, false, false, true, true, true,
+ true, true, false, true, true, true, false, false, false, true,
+ false, true, true, true, true, true, true, false, false, true,
+ true, true, false, false, false, false, true, true, false, true,
+ true, true, true, true, false, false, false, false, false, false,
+ false, false, true, false, false, false, false, false, false, true
+};
+
const char *_rezNames[] = {
"",
"KMAP001.lbm",
diff --git a/engines/kingdom/kingdom.cpp b/engines/kingdom/kingdom.cpp
index e97c78afd4..68d80bfbeb 100644
--- a/engines/kingdom/kingdom.cpp
+++ b/engines/kingdom/kingdom.cpp
@@ -542,7 +542,8 @@ void KingdomGame::playMovie(int movieNum) {
delete decoder;
// This is hidden somewhere in RunMovieCtl callback...
- showPic(300 + _pMovie);
+ if (_finalFrameTable[_pMovie])
+ showPic(300 + _pMovie);
if (!_fullScreen) {
_treeRightSta = 1;
@@ -1015,7 +1016,7 @@ void KingdomGame::drawLocation() {
int emlValue = _emlTable[_logic->_nodeNum];
if (emlValue > 0)
- _logic->enAll();
+ _logic->enableUIButtons();
if (!_mapEx || !emlValue || _logic->_resurrect) {
if (_logic->_statPlay != 50)
diff --git a/engines/kingdom/kingdom.h b/engines/kingdom/kingdom.h
index 8c06db64b3..4da68b0ebe 100644
--- a/engines/kingdom/kingdom.h
+++ b/engines/kingdom/kingdom.h
@@ -56,6 +56,7 @@ namespace Kingdom {
int16 _mouseValue;
};
+ extern bool _finalFrameTable[];
extern const char *_rezNames[];
extern const char *_movieNames[];
extern int _mapExit[];
diff --git a/engines/kingdom/logic.cpp b/engines/kingdom/logic.cpp
index 61d9c392df..c667a88b67 100644
--- a/engines/kingdom/logic.cpp
+++ b/engines/kingdom/logic.cpp
@@ -74,7 +74,7 @@ void Logic::initPlay() {
_health = 12;
_healthOld = 1;
_lastObs = false;
- enAll();
+ enableUIButtons();
_pouch = true;
initOpcodes();
@@ -294,7 +294,7 @@ void Logic::initOpcodesFull() {
_opCodes[993] = &Logic::GPL4_993;
}
-void Logic::enAll() {
+void Logic::enableUIButtons() {
_help = true;
_eye = true;
_replay = true;
@@ -302,7 +302,7 @@ void Logic::enAll() {
_fstFwd = true;
}
-void Logic::dsAll() {
+void Logic::disableUIButtons() {
_help = false;
_eye = false;
_replay = false;
@@ -395,12 +395,12 @@ void Logic::endCredits() {
_vm->fadeToBlack1();
_vm->drawRect(4, 17, 228, 161, 0);
_vm->playSound(0);
- dsAll();
+ disableUIButtons();
_vm->_iconsClosed = true;
_vm->playMovie(199);
- dsAll();
+ disableUIButtons();
_vm->playMovie(205);
- dsAll();
+ disableUIButtons();
_vm->fadeToBlack1();
_vm->drawRect(4, 17, 228, 161, 0);
_vm->playMovie(201);
@@ -472,14 +472,17 @@ void Logic::gameHelp() {
switch(_vm->_userInput) {
case 0x240:
+ // New game
_vm->fadeToBlack2();
//TODO: Set _quitFlag to 1
break;
case 0x241:
+ // Resume game
gameHelp_Sub43C();
return;
break;
case 0x242:
+ // Music On/Off
if (_vm->_noMusic) {
_vm->_noMusic = false;
_vm->playSound(1);
@@ -490,6 +493,7 @@ void Logic::gameHelp() {
_vm->drawHelpScreen();
break;
case 0x243: {
+ // Show Demo
_vm->fadeToBlack2();
_vm->_keyActive = false;
_vm->_noIFScreen = true;
@@ -510,10 +514,13 @@ void Logic::gameHelp() {
}
break;
case 0x244:
+ // Quit
//TODO: Set _quitFlag to 2
_vm->_quit = true;
break;
case 0x245: {
+ // Show Credits
+
_vm->fadeToBlack1();
// The demo isn't saving pMovie.
// It's obviously a bug and this behavior wasn't kept in ScummVM
@@ -565,7 +572,7 @@ void Logic::switchAS() {
void Logic::characterDeath() {
_currMap = 3;
- dsAll();
+ disableUIButtons();
_pouch = false;
for (int i = 0; i != 19; ++i) {
_inventory[i] = -1;
diff --git a/engines/kingdom/logic.h b/engines/kingdom/logic.h
index 35a15cab9d..1a1ca6e6e0 100644
--- a/engines/kingdom/logic.h
+++ b/engines/kingdom/logic.h
@@ -270,8 +270,8 @@ public:
int _mapStat; // CHECKME: Useless? If so, to be removed
- void enAll(); // TODO: Rename later as enableAll
- void dsAll(); // TODO: Rename later as disableAll
+ void enableUIButtons();
+ void disableUIButtons();
bool wound();
void GPLogic1_SubSP10();
void GPLogic1_SubSP121();
diff --git a/engines/kingdom/logic1.cpp b/engines/kingdom/logic1.cpp
index 517f3cac39..dc6139204a 100644
--- a/engines/kingdom/logic1.cpp
+++ b/engines/kingdom/logic1.cpp
@@ -360,7 +360,7 @@ void Logic::GPL1_60() {
_vm->drawLocation();
_vm->_userInput = 0;
if (_nodes[4] == 0) {
- dsAll();
+ disableUIButtons();
_vm->playMovie(9);
_statPlay = 991;
} else {
@@ -435,7 +435,7 @@ void Logic::GPL1_80() {
_vm->_tsIconOnly = true;
} else {
_nodes[8] = 0;
- dsAll();
+ disableUIButtons();
_vm->playMovie(14);
_currMap = 10;
_vm->setATimer();
@@ -446,7 +446,7 @@ void Logic::GPL1_80() {
void Logic::GPL1_81() {
switch(_vm->_userInput) {
case 0x2F1:
- dsAll();
+ disableUIButtons();
_vm->playMovie(15);
_statPlay = 991;
_vm->_loopFlag = true;
@@ -454,7 +454,7 @@ void Logic::GPL1_81() {
case 0x429:
if (!_nodes[8]) {
_vm->_aTimer = 0;
- enAll();
+ enableUIButtons();
_vm->playMovie(18);
_vm->playSound(3);
inventoryDel(1);
@@ -466,7 +466,7 @@ void Logic::GPL1_81() {
case 0x42A:
if (!_nodes[8]) {
_vm->_aTimer = 0;
- enAll();
+ enableUIButtons();
_vm->playMovie(18);
_vm->playSound(3);
inventoryDel(2);
@@ -478,7 +478,7 @@ void Logic::GPL1_81() {
case 0x42C:
if (!_nodes[8]) {
_vm->_aTimer = 0;
- enAll();
+ enableUIButtons();
_vm->playMovie(16);
_vm->playSound(3);
_nodes[8] = 9;
@@ -488,7 +488,7 @@ void Logic::GPL1_81() {
break;
case 0x42D:
if (!_nodes[8]) {
- enAll();
+ enableUIButtons();
_vm->playMovie(17);
inventoryDel(5);
_vm->playSound(3);
@@ -731,7 +731,7 @@ void Logic::GPL1_130() {
_nodeNum = 13;
_vm->drawLocation();
_vm->_userInput = 0;
- dsAll();
+ disableUIButtons();
_vm->playMovie(4);
_statPlay = 991;
_vm->_loopFlag = true;
@@ -747,7 +747,7 @@ void Logic::GPL1_140() {
_currMap = 10;
_statPlay = 141;
} else {
- dsAll();
+ disableUIButtons();
_vm->playMovie(27);
_statPlay = 991;
_vm->_loopFlag = true;
@@ -797,7 +797,7 @@ void Logic::GPL1_151() {
break;
case 0x445:
_statPlay = 80;
- enAll();
+ enableUIButtons();
_vm->_loopFlag = true;
_vm->_userInput = 0;
break;
@@ -937,7 +937,7 @@ void Logic::GPL1_170() {
} else {
_nodeNum = 17;
_vm->drawLocation();
- dsAll();
+ disableUIButtons();
_vm->playMovie(30);
_currMap = 10;
_statPlay = 171;
@@ -949,7 +949,7 @@ void Logic::GPL1_170() {
void Logic::GPL1_171() {
switch(_vm->_userInput) {
case 0x2F1:
- enAll();
+ enableUIButtons();
if (wound()) {
_vm->_aTimer = 0;
_replay = false;
@@ -957,7 +957,7 @@ void Logic::GPL1_171() {
_statPlay = _nextNode;
_vm->_loopFlag = true;
} else {
- dsAll();
+ disableUIButtons();
_vm->playMovie(32);
_statPlay = 991;
_vm->_loopFlag = true;
@@ -966,7 +966,7 @@ void Logic::GPL1_171() {
case 0x42C:
_vm->_aTimer = 0;
_replay = false;
- enAll();
+ enableUIButtons();
_vm->playMovie(34);
_vm->_userInput = 0;
_nodes[17] = 9;
@@ -1097,7 +1097,7 @@ void Logic::GPL1_190() {
_nodeNum = 19;
_vm->drawLocation();
_vm->_userInput = 0;
- dsAll();
+ disableUIButtons();
_vm->playMovie(38);
_statPlay = 991;
_vm->_loopFlag = true;
@@ -1158,7 +1158,7 @@ void Logic::GPL1_210() {
_vm->playSound(38);
_currMap = 81;
} else {
- dsAll();
+ disableUIButtons();
_vm->playMovie(45);
_nodes[21] = 0;
_currMap = 10;
@@ -1170,7 +1170,7 @@ void Logic::GPL1_210() {
void Logic::GPL1_211() {
switch(_vm->_userInput) {
case 0x2F1:
- dsAll();
+ disableUIButtons();
_vm->playMovie(46);
_statPlay = 991;
_vm->_loopFlag = true;
@@ -1184,7 +1184,7 @@ void Logic::GPL1_211() {
_vm->_userInput = 0;
} else {
_vm->playMovie(178);
- dsAll();
+ disableUIButtons();
_vm->playMovie(46);
_statPlay = 991;
_vm->_loopFlag = true;
@@ -1193,7 +1193,7 @@ void Logic::GPL1_211() {
case 0x42A:
if (!_nodes[21]) {
_vm->_aTimer = 0;
- enAll();
+ enableUIButtons();
_vm->playMovie(48);
inventoryDel(2);
_nodes[21] = 1;
@@ -1205,7 +1205,7 @@ void Logic::GPL1_211() {
case 0x42D:
if (!_nodes[21]) {
_vm->_aTimer = 0;
- enAll();
+ enableUIButtons();
_vm->playMovie(47);
_vm->playSound(38);
inventoryDel(5);
@@ -1240,7 +1240,7 @@ void Logic::GPL1_211() {
case 0x442:
if (_vm->_tsIconOnly) {
_vm->_aTimer = 0;
- enAll();
+ enableUIButtons();
_vm->playMovie(49);
_vm->_tsIconOnly = false;
_vm->playSound(38);
@@ -1316,7 +1316,7 @@ void Logic::GPL1_221() {
break;
case 0x42C:
if (!_nodes[22]) {
- dsAll();
+ disableUIButtons();
_vm->playMovie(43);
_vm->playSound(34);
_statPlay = 991;
@@ -1351,7 +1351,7 @@ void Logic::GPL1_230() {
_nodeNum = 23;
_vm->drawLocation();
_vm->_userInput = 0;
- dsAll();
+ disableUIButtons();
_vm->playMovie(50);
_statPlay = 991;
_vm->_loopFlag = true;
diff --git a/engines/kingdom/logic2.cpp b/engines/kingdom/logic2.cpp
index e0e53a797c..9f40763018 100644
--- a/engines/kingdom/logic2.cpp
+++ b/engines/kingdom/logic2.cpp
@@ -30,7 +30,7 @@ void Logic::GPL2_250() {
_nodeNum = 25;
_vm->drawLocation();
- dsAll();
+ disableUIButtons();
if (_nodes[24] != 0 || highNode) {
if (!_vm->isDemo())
_eye = true;
@@ -45,9 +45,9 @@ void Logic::GPL2_250() {
_vm->_frameStop = 67;
_vm->playMovie(72);
if (!_vm->isDemo())
- dsAll();
+ disableUIButtons();
_vm->playMovie(73);
- dsAll();
+ disableUIButtons();
_statPlay = 991;
_vm->_loopFlag = true;
}
@@ -58,7 +58,7 @@ void Logic::GPL2_251() {
case 0x2F1:
_vm->_aTimer = 0;
_vm->playMovie(73);
- dsAll();
+ disableUIButtons();
_statPlay = 992;
_vm->_loopFlag = true;
break;
@@ -83,7 +83,7 @@ void Logic::GPL2_252() {
void Logic::GPL2_260() {
_nodeNum = 26;
_vm->drawLocation();
- dsAll();
+ disableUIButtons();
_vm->playMovie(74);
_currMap = 10;
_vm->setATimer();
@@ -95,7 +95,7 @@ void Logic::GPL2_261() {
switch(_vm->_userInput) {
case 0x2F1:
_vm->_aTimer = 0;
- dsAll();
+ disableUIButtons();
_vm->playMovie(75);
_statPlay = 992;
_vm->_loopFlag = true;
@@ -120,7 +120,7 @@ void Logic::GPL2_261() {
break;
case 0x42C:
_vm->_aTimer = 0;
- enAll();
+ enableUIButtons();
_vm->playMovie(76);
_nodes[26] = 1;
_vm->_userInput = 0;
@@ -132,14 +132,14 @@ void Logic::GPL2_261() {
case 0x42D:
if (wound()) {
_vm->_aTimer = 0;
- enAll();
+ enableUIButtons();
_vm->playMovie(77);
_vm->playSound(34);
inventoryDel(5);
_statPlay = 300;
_vm->_loopFlag = true;
} else {
- dsAll();
+ disableUIButtons();
_vm->playMovie(78);
_statPlay = 992;
_vm->_loopFlag = true;
@@ -199,13 +199,13 @@ void Logic::GPL2_280() {
_nodeNum = 28;
_vm->drawLocation();
_vm->_userInput = 0;
- dsAll();
+ disableUIButtons();
_vm->_fstFwd = false;
_vm->playMovie(81);
_currMap = 10;
_nodes[28] = _nodes[38] = 1;
_statPlay = _robberyNode * 10;
- enAll();
+ enableUIButtons();
_vm->_loopFlag = true;
}
@@ -276,7 +276,7 @@ void Logic::GPL2_291() {
if (_nodes[29] >= 8)
_vm->displayIcon(140);
else {
- dsAll();
+ disableUIButtons();
_vm->playMovie(84);
_statPlay = 992;
_vm->_loopFlag = true;
@@ -371,7 +371,7 @@ void Logic::GPL2_311() {
break;
case 0x449:
_vm->_aTimer = 0;
- dsAll();
+ disableUIButtons();
_vm->playMovie(68);
_statPlay = 992;
_vm->_loopFlag = true;
@@ -552,7 +552,7 @@ void Logic::GPL2_350() {
} else {
_nodeNum = 35;
_vm->drawLocation();
- dsAll();
+ disableUIButtons();
_vm->playMovie(92);
_currMap = 94;
_vm->setATimer();
@@ -573,14 +573,14 @@ void Logic::GPL2_351() {
// fallthrough
case 0x2F1:
_vm->_aTimer = 0;
- dsAll();
+ disableUIButtons();
_vm->playMovie(93);
_statPlay = 992;
_vm->_loopFlag = true;
break;
case 0x42A:
_vm->_aTimer = 0;
- enAll();
+ enableUIButtons();
_vm->playMovie(179);
inventoryDel(2);
_nodes[35] = 1;
@@ -605,7 +605,7 @@ void Logic::GPL2_360() {
else
_vm->_sound = true;
_vm->_frameStop = 185;
- dsAll();
+ disableUIButtons();
_vm->playMovie(94);
_currMap = 95;
_vm->setATimer();
@@ -617,14 +617,14 @@ void Logic::GPL2_361() {
switch(_vm->_userInput) {
case 0x2F1:
_vm->_aTimer = 0;
- dsAll();
+ disableUIButtons();
_vm->playMovie(95);
_statPlay = 992;
_vm->_loopFlag = true;
break;
case 0x428:
_vm->_aTimer = 0;
- enAll();
+ enableUIButtons();
_vm->playMovie(97);
inventoryDel(0);
_vm->playSound(5);
@@ -642,7 +642,7 @@ void Logic::GPL2_361() {
break;
case 0x42A:
_vm->_aTimer = 0;
- enAll();
+ enableUIButtons();
_vm->playMovie(98);
inventoryDel(2);
_vm->playSound(5);
@@ -653,7 +653,7 @@ void Logic::GPL2_361() {
break;
case 0x42E:
_vm->_aTimer = 0;
- enAll();
+ enableUIButtons();
_vm->playMovie(100);
inventoryDel(6);
_vm->playSound(5);
@@ -664,7 +664,7 @@ void Logic::GPL2_361() {
break;
case 0x431:
_vm->_aTimer = 0;
- enAll();
+ enableUIButtons();
_vm->playMovie(96);
_vm->playSound(5);
_nodes[36] = 9;
@@ -677,7 +677,7 @@ void Logic::GPL2_361() {
break;
case 0x437:
_vm->_aTimer = 0;
- dsAll();
+ disableUIButtons();
_vm->playMovie(99);
_statPlay = 992;
_vm->_loopFlag = true;
@@ -771,7 +771,7 @@ void Logic::GPL2_381() {
break;
case 0x430:
if (_vm->_wizard && _nodes[38] != 9) {
- dsAll();
+ disableUIButtons();
_vm->playMovie(162);
_statPlay = 992;
_vm->_loopFlag = true;
@@ -838,7 +838,7 @@ void Logic::GPL2_390() {
_nodeNum = 39;
_vm->drawLocation();
_vm->_aTimer = 0;
- dsAll();
+ disableUIButtons();
_vm->playMovie(104);
_vm->playSound(34);
_statPlay = 992;
@@ -857,7 +857,7 @@ void Logic::GPL2_400() {
_vm->_sound = true;
}
} else {
- dsAll();
+ disableUIButtons();
_vm->playMovie(105);
_currMap = 10;
_vm->setATimer();
@@ -871,7 +871,7 @@ void Logic::GPL2_401() {
switch(_vm->_userInput) {
case 0x2F1:
_vm->_aTimer = 0;
- dsAll();
+ disableUIButtons();
_vm->playMovie(106);
_statPlay = 992;
_vm->_loopFlag = true;
@@ -891,7 +891,7 @@ void Logic::GPL2_401() {
case 0x42C:
if (!_nodes[40]) {
_vm->_aTimer = 0;
- dsAll();
+ disableUIButtons();
_vm->playMovie(108);
_vm->_userInput = 0;
_statPlay = 992;
@@ -1132,7 +1132,7 @@ void Logic::GPL2_431() {
if (_nodes[43] == 9) {
_vm->displayIcon(146);
} else {
- dsAll();
+ disableUIButtons();
_vm->playMovie(117);
_statPlay = 992;
_vm->_loopFlag = true;
@@ -1193,7 +1193,7 @@ void Logic::GPL2_450() {
_nodeNum = 45;
_vm->_userInput = 0;
if (!_nodes[40]) {
- dsAll();
+ disableUIButtons();
_vm->playMovie(120);
_statPlay = 992;
_currMap = 10;
@@ -1311,7 +1311,7 @@ void Logic::GPL2_482() {
void Logic::GPL2_490() {
_nodeNum = 49;
_vm->drawLocation();
- dsAll();
+ disableUIButtons();
_vm->playMovie(180);
_vm->playSound(18);
_currMap = 101;
@@ -1341,7 +1341,7 @@ void Logic::GPL2_491() {
_currMap = 10;
_vm->_userInput = 0;
_vm->_aTimer = 0;
- enAll();
+ enableUIButtons();
_vm->playMovie(181);
_nodes[28] = 9;
_nodes[48] = 0;
@@ -1356,7 +1356,7 @@ void Logic::GPL2_491() {
}
void Logic::GPLogic2_SubSP361() {
- enAll();
+ enableUIButtons();
_vm->_userInput = 0;
_vm->playSound(19);
if (_nodes[28] == 1) {
diff --git a/engines/kingdom/logic3.cpp b/engines/kingdom/logic3.cpp
index 9ab559e50f..af80637dc4 100644
--- a/engines/kingdom/logic3.cpp
+++ b/engines/kingdom/logic3.cpp
@@ -70,7 +70,7 @@ void Logic::GPL3_501() {
break;
case 0x433:
if (!_nodes[50]) {
- dsAll();
+ disableUIButtons();
_vm->playMovie(125);
_statPlay = 993;
_vm->_loopFlag = true;
@@ -254,7 +254,7 @@ void Logic::GPL3_531() {
_nodeNum = 56;
_vm->_userInput = 0;
_vm->_frameStop = 50;
- enAll();
+ enableUIButtons();
_vm->playMovie(135);
_currMap = 106;
_nodes[56] = 1;
@@ -352,7 +352,7 @@ void Logic::GPL3_551() {
switch(_vm->_userInput) {
case 0x2F1:
_vm->_aTimer = 0;
- dsAll();
+ disableUIButtons();
_vm->playMovie(134);
_statPlay = 993;
_vm->_loopFlag = true;
@@ -360,7 +360,7 @@ void Logic::GPL3_551() {
case 0x42C:
_vm->_aTimer = 0;
if (_nodes[55] == 1) {
- enAll();
+ enableUIButtons();
_vm->playMovie(183);
_vm->fShowPic(433);
_vm->playSound(8);
@@ -370,7 +370,7 @@ void Logic::GPL3_551() {
break;
case 0x43A:
if (_nodes[55] == 1) {
- dsAll();
+ disableUIButtons();
_vm->playMovie(134);
_statPlay = 993;
_vm->_loopFlag = true;
@@ -391,14 +391,14 @@ void Logic::GPL3_551() {
_vm->_aTimer = 0;
switch(_nodes[55]) {
case 0:
- dsAll();
+ disableUIButtons();
_vm->playMovie(69);
_vm->_tsIconOnly = false;
_nodes[55] = 1;
_vm->setATimer();
break;
case 1:
- dsAll();
+ disableUIButtons();
_vm->playMovie(134);
_statPlay = 993;
_vm->_loopFlag = true;
@@ -433,7 +433,7 @@ void Logic::GPL3_560() {
_vm->_userInput = 0;
if (!_vm->_wizard) {
_vm->_frameStop = 50;
- enAll();
+ enableUIButtons();
_vm->playMovie(135);
_vm->showPic(435);
_nodes[56] = 1;
@@ -442,7 +442,7 @@ void Logic::GPL3_560() {
_currMap = 106;
_vm->_tsIconOnly = true;
} else {
- dsAll();
+ disableUIButtons();
_vm->playMovie(135);
_currMap = 10;
_vm->setATimer();
@@ -455,7 +455,7 @@ void Logic::GPL3_561() {
switch(_vm->_userInput) {
case 0x2F1:
_vm->_aTimer = 0;
- dsAll();
+ disableUIButtons();
_vm->playMovie(136);
_statPlay = 993;
_vm->_loopFlag = true;
@@ -479,7 +479,7 @@ void Logic::GPL3_561() {
_vm->_fstFwd = false;
_replay = true;
_vm->playMovie(138);
- enAll();
+ enableUIButtons();
_vm->playSound(8);
_nodes[56] = 1;
inventoryDel(4);
@@ -491,11 +491,11 @@ void Logic::GPL3_561() {
case 0x438:
_vm->_aTimer = 0;
if (!_nodes[56]) {
- enAll();
+ enableUIButtons();
_vm->_fstFwd = false;
_replay = true;
_vm->playMovie(137);
- enAll();
+ enableUIButtons();
_vm->playSound(8);
_nodes[56] = 1;
_currMap = 106;
@@ -649,7 +649,7 @@ void Logic::GPL3_581() {
if (_nodes[58] >= 8)
_vm->displayIcon(143);
else {
- dsAll();
+ disableUIButtons();
_vm->playMovie(142);
_statPlay = 993;
_vm->_loopFlag = true;
@@ -730,7 +730,7 @@ void Logic::GPL3_600() {
_nodeNum = 60;
_vm->drawLocation();
_vm->_userInput = 0;
- dsAll();
+ disableUIButtons();
_vm->playMovie(145);
_statPlay = 992;
_vm->_loopFlag = true;
@@ -765,7 +765,7 @@ void Logic::GPL3_611() {
case 0x429:
case 0x42A:
inventoryDel(_vm->_userInput - 0x428);
- dsAll();
+ disableUIButtons();
_vm->playMovie(148);
_statPlay = 993;
_vm->_loopFlag = true;
@@ -864,7 +864,7 @@ void Logic::GPL3_621() {
_nodeNum = 56;
_vm->_userInput = 0;
_vm->_frameStop = 50;
- enAll();
+ enableUIButtons();
_vm->playMovie(135);
_nodes[56] = 1;
_vm->playSound(8);
@@ -1088,7 +1088,7 @@ void Logic::GPL3_671() {
void Logic::GPL3_680() {
_nodeNum = 68;
_vm->_userInput = 0;
- dsAll();
+ disableUIButtons();
_vm->playMovie(156);
_statPlay = 993;
_vm->_loopFlag = true;
@@ -1096,7 +1096,7 @@ void Logic::GPL3_680() {
void Logic::GPL3_690() {
_vm->_itemInhibit = false;
- enAll();
+ enableUIButtons();
if (_nodes[69] == 9) {
_statPlay = 640;
_nodes[72] = 0;
@@ -1218,7 +1218,7 @@ void Logic::GPL3_710() {
_eye = false;
if (_inventory[8] && _inventory[14])
_vm->_sound = true;
- dsAll();
+ disableUIButtons();
_vm->playMovie(165);
_currMap = 10;
_vm->setATimer();
@@ -1313,7 +1313,7 @@ void Logic::GPL3_712() {
_statPlay = 993;
} else {
_vm->_aTimer = 0;
- enAll();
+ enableUIButtons();
_vm->playMovie(169);
_statPlay = 580;
inventoryDel(11);
@@ -1534,7 +1534,7 @@ void Logic::GPL3_740() {
_rtnNode = _nodeNum;
_nodeNum = 74;
_vm->drawLocation();
- dsAll();
+ disableUIButtons();
_vm->playMovie(185);
_currMap = 10;
_vm->setATimer();
@@ -1545,7 +1545,7 @@ void Logic::GPL3_740() {
void Logic::GPL3_741() {
switch(_vm->_userInput) {
case 0x2F1:
- dsAll();
+ disableUIButtons();
_vm->playMovie(188);
_statPlay = 993;
_vm->_loopFlag = true;
@@ -1711,7 +1711,7 @@ void Logic::GPL3_781() {
void Logic::GPL3_790() {
_nodeNum = 79;
_vm->drawLocation();
- dsAll();
+ disableUIButtons();
_vm->playMovie(4);
_currMap = 8;
_statPlay = 791;
@@ -1722,19 +1722,19 @@ void Logic::GPL3_790() {
void Logic::GPL3_791() {
switch(_vm->_userInput) {
case 0x2F1:
- dsAll();
+ disableUIButtons();
_vm->playMovie(204);
_statPlay = 993;
_vm->_loopFlag = true;
break;
case 0x445:
- enAll();
+ enableUIButtons();
_vm->playMovie(10);
_statPlay = 50;
_vm->_loopFlag = true;
break;
case 0x446:
- enAll();
+ enableUIButtons();
_vm->playMovie(10);
_statPlay = 520;
_vm->_loopFlag = true;
diff --git a/engines/kingdom/logic4.cpp b/engines/kingdom/logic4.cpp
index 5caa5e152f..c11d8e9bea 100644
--- a/engines/kingdom/logic4.cpp
+++ b/engines/kingdom/logic4.cpp
@@ -93,7 +93,7 @@ void Logic::GPL4_901() {
_vm->playMovie(10);
inventoryDel(3);
_vm->_tsIconOnly = false;
- enAll();
+ enableUIButtons();
switchAS();
_mapStat = 0;
}
@@ -136,7 +136,7 @@ void Logic::GPL4_991() {
_vm->drawPic(179);
_vm->_skylarTimer = 0;
_vm->_skylarTimerFlag = false;
- enAll();
+ enableUIButtons();
_vm->_mapEx = true;
_nodeNum = 5;
_vm->drawLocation();
@@ -183,7 +183,7 @@ void Logic::GPL4_992() {
_vm->drawPic(179);
_vm->_skylarTimer = 0;
_vm->_skylarTimerFlag = false;
- enAll();
+ enableUIButtons();
_vm->_mapEx = true;
_nodeNum = 27;
_vm->drawLocation();
@@ -228,7 +228,7 @@ void Logic::GPL4_992_demo() {
_vm->drawPic(179);
_vm->_skylarTimer = 0;
_vm->_skylarTimerFlag = false;
- enAll();
+ enableUIButtons();
_nodeNum = 27;
_vm->drawLocation();
_resurrect = true;
@@ -276,7 +276,7 @@ void Logic::GPL4_993() {
_vm->drawPic(179);
_vm->_skylarTimer = 0;
_vm->_skylarTimerFlag = false;
- enAll();
+ enableUIButtons();
_vm->_mapEx = true;
_nodeNum = 52;
_vm->drawLocation();
@@ -324,7 +324,7 @@ void Logic::GPL4_993_demo() {
_vm->drawPic(179);
_vm->_skylarTimer = 0;
_vm->_skylarTimerFlag = false;
- enAll();
+ enableUIButtons();
_nodeNum = 52;
_vm->drawLocation();
_resurrect = true;
More information about the Scummvm-git-logs
mailing list