From 3aeb4fb80bc46f46bb7091e9dab4750775bbfced Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sat, 8 Jul 2017 11:28:34 +0200 Subject: [PATCH] KINGDOM: Function renaming --- engines/kingdom/GPLogic1.cpp | 442 ++++++++++++++++---------------- engines/kingdom/GPLogic2.cpp | 336 ++++++++++++------------- engines/kingdom/GPLogic3.cpp | 474 +++++++++++++++++------------------ engines/kingdom/GPLogic4.cpp | 72 +++--- engines/kingdom/kingdom.cpp | 182 +++++++------- engines/kingdom/kingdom.h | 38 +-- 6 files changed, 772 insertions(+), 772 deletions(-) diff --git a/engines/kingdom/GPLogic1.cpp b/engines/kingdom/GPLogic1.cpp index 13a5280e338..645ad4987a0 100644 --- a/engines/kingdom/GPLogic1.cpp +++ b/engines/kingdom/GPLogic1.cpp @@ -47,17 +47,17 @@ void KingdomGame::GPLogic1() { case 0x192: _aTimer = 0; fadeToBlack2(); - PlayMovie(1); + playMovie(1); GPLogic1_SubSP10(); break; case 0x193: _aTimer = 0; _keyActive = false; _noIFScreen = true; - PlaySound(0); + playSound(0); while(!_keyActive) { fadeToBlack2(); - PlayMovie(54); + playMovie(54); } GPLogic1_SubSP10(); break; @@ -67,7 +67,7 @@ void KingdomGame::GPLogic1() { break; case 0x24A: fadeToBlack2(); - SetMouse(); + setMouse(); EraseCursor(); restoreGame(); break; @@ -75,8 +75,8 @@ void KingdomGame::GPLogic1() { EraseCursorAsm(); _cursorDrawn = false; fadeToBlack2(); - PlaySound(0); - PlayMovie(54); + playSound(0); + playMovie(54); GPLogic1_SubSP10(); break; default: @@ -91,7 +91,7 @@ void KingdomGame::GPLogic1() { EraseCursorAsm(); _cursorDrawn = false; fadeToBlack2(); - ShowPic(106); + showPic(106); _statPlay = 30; _userInput = 0; _loopFlag = true; @@ -100,7 +100,7 @@ void KingdomGame::GPLogic1() { _nodeNum = 3; _userInput = 0; if (_nodes[3] == 0) { - PlayMovie(177); + playMovie(177); _nodes[3] = 9; if (!_wizard) { _statPlay = 50; @@ -114,10 +114,10 @@ void KingdomGame::GPLogic1() { else _sound = false; - PlayMovie(7); + playMovie(7); _statPlay = 31; _currMap = 10; - PlaySound(24); + playSound(24); _userInput = 0; break; case 31: @@ -130,7 +130,7 @@ void KingdomGame::GPLogic1() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; default: if (_userInput) @@ -146,20 +146,20 @@ void KingdomGame::GPLogic1() { DrawLocation(); _userInput = 0; if (_nodes[4] == 0) - PlayMovie(62); + playMovie(62); if (_nodes[4] == 9) { - PlayMovie(8); + playMovie(8); _tsIconOnly = true; } _currMap = 10; - PlaySound(14); + playSound(14); _statPlay = 41; break; case 41: switch(_userInput) { case 0x429: - PlayMovie(178); - PlayMovie(63); + playMovie(178); + playMovie(63); InventoryDel(1); _currMap = 10; _nodes[4] = 9; @@ -174,7 +174,7 @@ void KingdomGame::GPLogic1() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; default: if (_userInput) @@ -190,23 +190,23 @@ void KingdomGame::GPLogic1() { DrawLocation(); if (_nodes[5] != 0 && !_resurrect) { _frameStop = 38; - PlayMovie(5); + playMovie(5); } if (_nodes[5] == 0) - PlayMovie(5); + playMovie(5); _resurrect = false; - PlaySound(1); + playSound(1); if (_spell1 && _spell2 && _spell3) { _sound = true; - PlayMovie(2); + playMovie(2); _currMap = 10; _statPlay = 51; _loopFlag = true; } else if (_daelonCntr) { - PlayMovie(2); + playMovie(2); _currMap = 10; _statPlay = 51; } else { @@ -215,31 +215,31 @@ void KingdomGame::GPLogic1() { InventoryAdd(1); break; case 1: - PlayMovie(60); + playMovie(60); InventoryAdd(0); _spell1 = true; break; case 2: - PlayMovie(59); + playMovie(59); InventoryAdd(2); _spell2 = true; break; case 3: _sound = true; - PlayMovie(59); + playMovie(59); InventoryAdd(3); _spell3 = true; break; } if (_spell1 && _spell2 && _spell3) { - PlayMovie(6); + playMovie(6); _currMap = 7; _statPlay = 51; _loopFlag = true; } else { _eye = false; - PlayMovie(61); - PlaySound(1); + playMovie(61); + playSound(1); if (!_spell1) DrawPic(116); @@ -278,7 +278,7 @@ void KingdomGame::GPLogic1() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; default: if (_userInput) @@ -294,7 +294,7 @@ void KingdomGame::GPLogic1() { case 0x428: _nodes[5] = 1; _daelonCntr = 5; - PlayMovie(6); + playMovie(6); _currMap = 7; _statPlay = 51; _eye = true; @@ -302,7 +302,7 @@ void KingdomGame::GPLogic1() { case 0x42A: _nodes[5] = 2; _daelonCntr = 5; - PlayMovie(6); + playMovie(6); _currMap = 7; _statPlay = 51; _eye = true; @@ -310,21 +310,21 @@ void KingdomGame::GPLogic1() { case 0x42B: _nodes[5] = 3; _daelonCntr = 5; - PlayMovie(6); + playMovie(6); _currMap = 7; _statPlay = 51; _eye = true; break; case 0x43E: if (!_spell1 && !_spell2 && !_spell3 && !_wizard) { - PlayMovie(177); + playMovie(177); DrawLocation(); - PlayMovie(5); + playMovie(5); } - PlaySound(1); + playSound(1); _eye = false; - PlayMovie(61); + playMovie(61); if (!_spell1) DrawPic(116); @@ -346,11 +346,11 @@ void KingdomGame::GPLogic1() { DrawLocation(); _userInput = 0; if (_nodes[4] == 0) { - DsAll(); - PlayMovie(9); + dsAll(); + playMovie(9); _statPlay = 991; } else { - PlayMovie(64); + playMovie(64); _statPlay = 200; } _currMap = 10; @@ -361,13 +361,13 @@ void KingdomGame::GPLogic1() { DrawLocation(); _userInput = 0; if (_nodes[7] == 0) { - PlayMovie(11); - PlaySound(2); + playMovie(11); + playSound(2); _currMap = 9; } else { _sound = true; - PlayMovie(13); - PlaySound(43); + playMovie(13); + playSound(43); _currMap = 10; _tsIconOnly = true; } @@ -379,8 +379,8 @@ void KingdomGame::GPLogic1() { if (_nodes[7] == 9) { DisplayIcon(137); } else { - PlayMovie(12); - PlaySound(30); + playMovie(12); + playSound(30); InventoryAdd(7); _nodes[7] = 9; _currMap = 10; @@ -395,7 +395,7 @@ void KingdomGame::GPLogic1() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; default: if (_userInput) @@ -411,14 +411,14 @@ void KingdomGame::GPLogic1() { DrawLocation(); _userInput = 0; if (_nodes[8] == 9) { - PlayMovie(24); - PlaySound(3); + playMovie(24); + playSound(3); _currMap = 13; _tsIconOnly = true; } else { _nodes[8] = 0; - DsAll(); - PlayMovie(14); + dsAll(); + playMovie(14); _currMap = 10; SetATimer(); } @@ -427,17 +427,17 @@ void KingdomGame::GPLogic1() { case 81: switch(_userInput) { case 0x2F1: - DsAll(); - PlayMovie(15); + dsAll(); + playMovie(15); _statPlay = 991; _loopFlag = true; break; case 0x429: if (!_nodes[8]) { _aTimer = 0; - EnAll(); - PlayMovie(18); - PlaySound(3); + enAll(); + playMovie(18); + playSound(3); InventoryDel(1); _userInput = 0; _currMap = 13; @@ -447,9 +447,9 @@ void KingdomGame::GPLogic1() { case 0x42A: if (!_nodes[8]) { _aTimer = 0; - EnAll(); - PlayMovie(18); - PlaySound(3); + enAll(); + playMovie(18); + playSound(3); InventoryDel(2); _userInput = 0; _currMap = 13; @@ -459,9 +459,9 @@ void KingdomGame::GPLogic1() { case 0x42C: if (!_nodes[8]) { _aTimer = 0; - EnAll(); - PlayMovie(16); - PlaySound(3); + enAll(); + playMovie(16); + playSound(3); _nodes[8] = 9; _tsIconOnly = true; _currMap = 13; @@ -469,10 +469,10 @@ void KingdomGame::GPLogic1() { break; case 0x42D: if (!_nodes[8]) { - EnAll(); - PlayMovie(17); + enAll(); + playMovie(17); InventoryDel(5); - PlaySound(3); + playSound(3); _aTimer = 0; _userInput = 0; _currMap = 13; @@ -487,7 +487,7 @@ void KingdomGame::GPLogic1() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); _aTimer = 0; break; case 0x453: @@ -527,12 +527,12 @@ void KingdomGame::GPLogic1() { if (!_wizard) _frameStop = 90; - PlayMovie(19); - PlaySound(15); + playMovie(19); + playSound(15); if (!_wizard) - ShowPic(109); + showPic(109); else - ShowPic(319); + showPic(319); _currMap = 10; _statPlay = 91; @@ -551,11 +551,11 @@ void KingdomGame::GPLogic1() { _frameStop = 90; _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); if (!_wizard) - ShowPic(109); + showPic(109); else - ShowPic(319); + showPic(319); break; default: if (_userInput) @@ -584,8 +584,8 @@ void KingdomGame::GPLogic1() { } else if (_wizard) _sound = true; - PlayMovie(20); - PlaySound(41); + playMovie(20); + playSound(41); _currMap = 10; _statPlay = 101; } @@ -600,7 +600,7 @@ void KingdomGame::GPLogic1() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; } break; @@ -615,8 +615,8 @@ void KingdomGame::GPLogic1() { _sound = false; else _sound = true; - PlayMovie(21); - PlaySound(42); + playMovie(21); + playSound(42); _currMap = 10; _statPlay = 111; break; @@ -629,7 +629,7 @@ void KingdomGame::GPLogic1() { _userInput = 0; break; case 0x43E: - PlayMovie(21); + playMovie(21); break; default: if (_userInput) @@ -645,14 +645,14 @@ void KingdomGame::GPLogic1() { DrawLocation(); _userInput = 0; if (_nodes[12] == 0) { - PlayMovie(22); + playMovie(22); _currMap = 14; } else { - PlayMovie(25); + playMovie(25); _currMap = 15; } _eye = false; - PlaySound(3); + playSound(3); _statPlay = 121; break; case 121: @@ -681,8 +681,8 @@ void KingdomGame::GPLogic1() { GPLogic1_SubSP121(); else { _sound = _lastSound; - PlayMovie(_pMovie); - PlaySound(3); + playMovie(_pMovie); + playSound(3); } break; default: @@ -695,8 +695,8 @@ void KingdomGame::GPLogic1() { _nodeNum = 13; DrawLocation(); _userInput = 0; - DsAll(); - PlayMovie(4); + dsAll(); + playMovie(4); _statPlay = 991; _loopFlag = true; break; @@ -705,13 +705,13 @@ void KingdomGame::GPLogic1() { DrawLocation(); _userInput = 0; if (Wound()) { - PlayMovie(26); - PlaySound(35); + playMovie(26); + playSound(35); _currMap = 10; _statPlay = 141; } else { - DsAll(); - PlayMovie(27); + dsAll(); + playMovie(27); _statPlay = 991; _loopFlag = true; _userInput = 0; @@ -727,7 +727,7 @@ void KingdomGame::GPLogic1() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; default: if (_userInput) @@ -741,8 +741,8 @@ void KingdomGame::GPLogic1() { case 150: _nodeNum = 15; DrawLocation(); - PlayMovie(28); - PlaySound(3); + playMovie(28); + playSound(3); _currMap = 16; _statPlay = 151; _eye = false; @@ -751,12 +751,12 @@ void KingdomGame::GPLogic1() { switch(_userInput) { case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); _aTimer = 0; break; case 0x445: _statPlay = 80; - EnAll(); + enAll(); _loopFlag = true; _userInput = 0; break; @@ -770,8 +770,8 @@ void KingdomGame::GPLogic1() { _nodeNum = 16; DrawLocation(); _userInput = 0; - PlayMovie(29); - PlaySound(3); + playMovie(29); + playSound(3); _currMap = 85; _statPlay = 161; break; @@ -779,13 +779,13 @@ void KingdomGame::GPLogic1() { switch(_userInput) { case 0x198: { fadeToBlack1(); - DrawRect(4, 17, 228, 161, 0); + drawRect(4, 17, 228, 161, 0); _replay = true; int oldPMovie = _pMovie; - PlayMovie(208); + playMovie(208); _pMovie = oldPMovie; _asMode = false; - RestoreAS(); + restoreAS(); _help = true; _eye = true; _pouch = true; @@ -794,13 +794,13 @@ void KingdomGame::GPLogic1() { break; case 0x199: { fadeToBlack1(); - DrawRect(4, 17, 228, 161, 0); + drawRect(4, 17, 228, 161, 0); _replay = true; int oldPMovie = _pMovie; - PlayMovie(207); + playMovie(207); _pMovie = oldPMovie; _asMode = false; - RestoreAS(); + restoreAS(); _help = true; _eye = true; _pouch = true; @@ -808,15 +808,15 @@ void KingdomGame::GPLogic1() { } break; case 0x19A: - FShowPic(110); + fShowPic(110); _bTimer = 190; - ReadMouse(); + readMouse(); while(_bTimer != 0 && _mouseButton == 0) { checkTimers(); RefreshSound(); - ReadMouse(); + readMouse(); } - FShowPic(105); + fShowPic(105); break; case 0x42E: _nodes[15] = 1; @@ -832,19 +832,19 @@ void KingdomGame::GPLogic1() { break; case 0x43E: if (_pMovie > 206) - SaveAS(); + saveAS(); _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); if (_pMovie > 206) - RestoreAS(); + restoreAS(); break; case 0x444: - SaveAS(); + saveAS(); _help = false; _eye = false; _pouch = false; _replay = false; - FShowPic(105); + fShowPic(105); _currMap = 86; break; case 0x445: @@ -859,20 +859,20 @@ void KingdomGame::GPLogic1() { _userInput = 0; break; case 0x450: - SaveAS(); - FShowPic(123); + saveAS(); + fShowPic(123); _bTimer = 76; - ReadMouse(); + readMouse(); while(_bTimer != 0 && _mouseButton == 0) { checkTimers(); RefreshSound(); - ReadMouse(); + readMouse(); } fadeToBlack1(); - DrawRect(4, 17, 228, 161, 0); - RestoreAS(); + drawRect(4, 17, 228, 161, 0); + restoreAS(); break; default: if (_userInput) @@ -890,8 +890,8 @@ void KingdomGame::GPLogic1() { } else { _nodeNum = 17; DrawLocation(); - DsAll(); - PlayMovie(30); + dsAll(); + playMovie(30); _currMap = 10; _statPlay = 171; SetATimer(); @@ -901,16 +901,16 @@ void KingdomGame::GPLogic1() { case 171: switch(_userInput) { case 0x2F1: - EnAll(); + enAll(); if (Wound()) { _aTimer = 0; _replay = false; - PlayMovie(31); + playMovie(31); _statPlay = _nextNode; _loopFlag = true; } else { - DsAll(); - PlayMovie(32); + dsAll(); + playMovie(32); _statPlay = 991; _loopFlag = true; } @@ -918,8 +918,8 @@ void KingdomGame::GPLogic1() { case 0x42C: _aTimer = 0; _replay = false; - EnAll(); - PlayMovie(34); + enAll(); + playMovie(34); _userInput = 0; _nodes[17] = 9; _statPlay = _nextNode; @@ -946,15 +946,15 @@ void KingdomGame::GPLogic1() { _userInput = 0; if (_nodes[18] == 0 || _nodes[18] == 1) { _nodes[18] = 0; - PlayMovie(33); + playMovie(33); _currMap = 10; } if (_nodes[18] == 9) { - PlayMovie(37); + playMovie(37); _currMap = 19; _tsIconOnly = true; } - PlaySound(16); + playSound(16); _statPlay = 181; } else { _statPlay = 170; @@ -970,9 +970,9 @@ void KingdomGame::GPLogic1() { _userInput = 0; break; case 0x428: - SaveAS(); - PlayMovie(178); - RestoreAS(); + saveAS(); + playMovie(178); + restoreAS(); InventoryDel(0); _userInput = 0; break; @@ -981,24 +981,24 @@ void KingdomGame::GPLogic1() { InventoryDel(1); _nodes[18] = true; } - PlayMovie(35); + playMovie(35); _userInput = 0; break; case 0x42A: - SaveAS(); - PlayMovie(178); - RestoreAS(); + saveAS(); + playMovie(178); + restoreAS(); InventoryDel(2); _userInput = 0; break; case 0x42C: - SaveAS(); - PlayMovie(34); - RestoreAS(); + saveAS(); + playMovie(34); + restoreAS(); break; case 0x42F: if (_nodes[18] == 1) { - PlayMovie(36); + playMovie(36); InventoryDel(7); _nodes[18] = 9; _currMap = 19; @@ -1006,7 +1006,7 @@ void KingdomGame::GPLogic1() { } else { _frameStop = 27; _fstFwd = false; - PlayMovie(36); + playMovie(36); _fstFwd = true; } _userInput = 0; @@ -1026,10 +1026,10 @@ void KingdomGame::GPLogic1() { if (_pMovie == 36 && _nodes[18] != 9) { _frameStop = 27; _fstFwd = false; - PlayMovie(36); + playMovie(36); _fstFwd = true; } else - PlayMovie(_pMovie); + playMovie(_pMovie); break; default: if (_userInput) @@ -1044,8 +1044,8 @@ void KingdomGame::GPLogic1() { _nodeNum = 19; DrawLocation(); _userInput = 0; - DsAll(); - PlayMovie(38); + dsAll(); + playMovie(38); _statPlay = 991; _loopFlag = true; break; @@ -1054,14 +1054,14 @@ void KingdomGame::GPLogic1() { DrawLocation(); _userInput = 0; if (!_nodes[20]) { - PlayMovie(39); + playMovie(39); IncreaseHealth(); } else { - PlayMovie(40); + playMovie(40); _tideCntl = true; DrawPic(178); } - PlaySound(42); + playSound(42); _currMap = 10; _statPlay = 201; break; @@ -1075,7 +1075,7 @@ void KingdomGame::GPLogic1() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; } break; @@ -1091,12 +1091,12 @@ void KingdomGame::GPLogic1() { if (_nodes[21] == 9) { _nodes[21] = 9; - PlayMovie(209); - PlaySound(38); + playMovie(209); + playSound(38); _currMap = 81; } else { - DsAll(); - PlayMovie(45); + dsAll(); + playMovie(45); _nodes[21] = 0; _currMap = 10; SetATimer(); @@ -1106,22 +1106,22 @@ void KingdomGame::GPLogic1() { case 211: switch(_userInput) { case 0x2F1: - DsAll(); - PlayMovie(46); + dsAll(); + playMovie(46); _statPlay = 991; _loopFlag = true; break; case 0x428: InventoryDel(0); if (_nodes[21] == 9) { - SaveAS(); - PlayMovie(65); - RestoreAS(); + saveAS(); + playMovie(65); + restoreAS(); _userInput = 0; } else { - PlayMovie(178); - DsAll(); - PlayMovie(46); + playMovie(178); + dsAll(); + playMovie(46); _statPlay = 991; _loopFlag = true; } @@ -1129,21 +1129,21 @@ void KingdomGame::GPLogic1() { case 0x42A: if (!_nodes[21]) { _aTimer = 0; - EnAll(); - PlayMovie(48); + enAll(); + playMovie(48); InventoryDel(2); _nodes[21] = 1; _tsIconOnly = true; - PlaySound(38); + playSound(38); _userInput = 0; } break; case 0x42D: if (!_nodes[21]) { _aTimer = 0; - EnAll(); - PlayMovie(47); - PlaySound(38); + enAll(); + playMovie(47); + playSound(38); InventoryDel(5); _nodes[21] = 9; _userInput = 0; @@ -1159,13 +1159,13 @@ void KingdomGame::GPLogic1() { break; case 0x43E: if (_pMovie == 65) { - SaveAS(); - PlayMovie(65); - RestoreAS(); + saveAS(); + playMovie(65); + restoreAS(); _userInput = 0; } else { _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); } break; case 0x441: @@ -1176,10 +1176,10 @@ void KingdomGame::GPLogic1() { case 0x442: if (_tsIconOnly) { _aTimer = 0; - EnAll(); - PlayMovie(49); + enAll(); + playMovie(49); _tsIconOnly = false; - PlaySound(38); + playSound(38); _userInput = 0; } break; @@ -1209,35 +1209,35 @@ void KingdomGame::GPLogic1() { DrawLocation(); _userInput = 0; if (!_nodes[22]) { - PlayMovie(41); + playMovie(41); _currMap = 82; } else { _tsIconOnly = true; - PlayMovie(44); + playMovie(44); _currMap = 10; } - PlaySound(38); + playSound(38); _statPlay = 221; break; case 221: switch(_userInput) { case 0x428: - SaveAS(); - PlayMovie(178); - RestoreAS(); + saveAS(); + playMovie(178); + restoreAS(); InventoryDel(0); _userInput = 0; break; case 0x429: - SaveAS(); - PlayMovie(178); - RestoreAS(); + saveAS(); + playMovie(178); + restoreAS(); InventoryDel(1); _userInput = 0; break; case 0x42A: - PlayMovie(42); - PlaySound(30); + playMovie(42); + playSound(30); if (!_nodes[22]) { InventoryDel(2); InventoryAdd(4); @@ -1248,14 +1248,14 @@ void KingdomGame::GPLogic1() { break; case 0x42C: if (!_nodes[22]) { - DsAll(); - PlayMovie(43); - PlaySound(34); + dsAll(); + playMovie(43); + playSound(34); _statPlay = 991; _loopFlag = true; } else { - PlayMovie(42); - PlaySound(30); + playMovie(42); + playSound(30); } break; case 0x43A: @@ -1266,7 +1266,7 @@ void KingdomGame::GPLogic1() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; default: if (_userInput) @@ -1281,8 +1281,8 @@ void KingdomGame::GPLogic1() { _nodeNum = 23; DrawLocation(); _userInput = 0; - DsAll(); - PlayMovie(50); + dsAll(); + playMovie(50); _statPlay = 991; _loopFlag = true; break; @@ -1291,48 +1291,48 @@ void KingdomGame::GPLogic1() { DrawLocation(); _userInput = 0; if (!_nodes[24]) { - PlayMovie(51); + playMovie(51); _currMap = 83; } else { - PlayMovie(53); - ShowPic(119); + playMovie(53); + showPic(119); _currMap = 84; _tsIconOnly = true; } - PlaySound(4); + playSound(4); _statPlay = 241; break; case 241: switch(_userInput) { case 0x428: - SaveAS(); - PlayMovie(178); - RestoreAS(); + saveAS(); + playMovie(178); + restoreAS(); InventoryDel(0); break; case 0x429: if (_nodes[24] != 9) { _tsIconOnly = true; - PlayMovie(66); + playMovie(66); InventoryDel(1); _currMap = 84; _nodes[24] = 9; } break; case 0x42A: - SaveAS(); - PlayMovie(178); - RestoreAS(); + saveAS(); + playMovie(178); + restoreAS(); InventoryDel(2); break; case 0x42D: if (_inventory[5] >= 1) DisplayIcon(135); else { - SaveAS(); - PlayMovie(52); - PlaySound(30); - RestoreAS(); + saveAS(); + playMovie(52); + playSound(30); + restoreAS(); InventoryAdd(5); _userInput = 0; } @@ -1346,11 +1346,11 @@ void KingdomGame::GPLogic1() { case 0x43E: _sound = _lastSound; if (_pMovie == 53) { - PlayMovie(53); - ShowPic(119); + playMovie(53); + showPic(119); _currMap = 84; } else - PlayMovie(_pMovie); + playMovie(_pMovie); break; case 0x441: _currMap = 10; @@ -1371,11 +1371,11 @@ void KingdomGame::GPLogic1() { } void KingdomGame::GPLogic1_SubSP10() { - PlaySound(0); - PlaySound(18); + playSound(0); + playSound(18); fadeToBlack2(); - ShowPic(115); - ShowPic(114); + showPic(115); + showPic(114); _currMap = 4; _userInput = 0; @@ -1384,24 +1384,24 @@ void KingdomGame::GPLogic1_SubSP10() { } void KingdomGame::GPLogic1_SubSP121() { - PlayMovie(23); - PlaySound(30); + playMovie(23); + playSound(30); _bTimer = 190; - ReadMouse(); + readMouse(); while (_bTimer != 0 && _mouseButton == 0) { checkTimers(); RefreshSound(); CheckMainScreen(); - ReadMouse(); + readMouse(); } - PlaySound(23); + playSound(23); InventoryAdd(15); _currMap = 10; - FShowPic(150); + fShowPic(150); _nodes[12] = 9; - PlaySound(3); + playSound(3); _currMap = 15; } diff --git a/engines/kingdom/GPLogic2.cpp b/engines/kingdom/GPLogic2.cpp index 39310c337eb..3072a94d74b 100644 --- a/engines/kingdom/GPLogic2.cpp +++ b/engines/kingdom/GPLogic2.cpp @@ -31,22 +31,22 @@ void KingdomGame::GPLogic2() { _nodeNum = 25; DrawLocation(); - DsAll(); + dsAll(); if (_nodes[24] != 0 || highNode) { _eye = true; - PlayMovie(72); + playMovie(72); _aTimerFlag = false; _aTimer = 114; - PlaySound(34); + playSound(34); _userInput = 0; _currMap = 10; _statPlay = 251; } else { _frameStop = 67; - PlayMovie(72); - DsAll(); - PlayMovie(73); - DsAll(); + playMovie(72); + dsAll(); + playMovie(73); + dsAll(); _statPlay = 991; _loopFlag = true; } @@ -56,8 +56,8 @@ void KingdomGame::GPLogic2() { switch(_userInput) { case 0x2F1: _aTimer = 0; - PlayMovie(73); - DsAll(); + playMovie(73); + dsAll(); _statPlay = 992; _loopFlag = true; break; @@ -76,8 +76,8 @@ void KingdomGame::GPLogic2() { case 260: _nodeNum = 26; DrawLocation(); - DsAll(); - PlayMovie(74); + dsAll(); + playMovie(74); _currMap = 10; SetATimer(); _statPlay = 261; @@ -87,33 +87,33 @@ void KingdomGame::GPLogic2() { switch(_userInput) { case 0x2F1: _aTimer = 0; - DsAll(); - PlayMovie(75); + dsAll(); + playMovie(75); _statPlay = 992; _loopFlag = true; break; case 0x428: InventoryDel(0); _aTimer = 0; - SaveAS(); - PlayMovie(178); - RestoreAS(); + saveAS(); + playMovie(178); + restoreAS(); SetATimer(); _userInput = 0; break; case 0x42A: InventoryDel(2); _aTimer = 0; - SaveAS(); - PlayMovie(178); - RestoreAS(); + saveAS(); + playMovie(178); + restoreAS(); SetATimer(); _userInput = 0; break; case 0x42C: _aTimer = 0; - EnAll(); - PlayMovie(76); + enAll(); + playMovie(76); _nodes[26] = 1; _userInput = 0; _statPlay = 290; @@ -124,15 +124,15 @@ void KingdomGame::GPLogic2() { case 0x42D: if (Wound()) { _aTimer = 0; - EnAll(); - PlayMovie(77); - PlaySound(34); + enAll(); + playMovie(77); + playSound(34); InventoryDel(5); _statPlay = 300; _loopFlag = true; } else { - DsAll(); - PlayMovie(78); + dsAll(); + playMovie(78); _statPlay = 992; _loopFlag = true; } @@ -151,8 +151,8 @@ void KingdomGame::GPLogic2() { _sound = false; _nodes[28] = 1; } - PlayMovie(80); - PlaySound(18); + playMovie(80); + playSound(18); _currMap = 10; _statPlay = 271; _nodes[28] = 1; @@ -168,7 +168,7 @@ void KingdomGame::GPLogic2() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; } break; @@ -179,13 +179,13 @@ void KingdomGame::GPLogic2() { _nodeNum = 28; DrawLocation(); _userInput = 0; - DsAll(); + dsAll(); _fstFwd = false; - PlayMovie(81); + playMovie(81); _currMap = 10; _nodes[29] = _nodes[39] = 1; _statPlay = _robberyNode * 10; - EnAll(); + enAll(); _loopFlag = true; break; case 290: @@ -200,7 +200,7 @@ void KingdomGame::GPLogic2() { _nextNode = 29; } else { if (_nodes[26] == 2) - PlayMovie(79); + playMovie(79); _nodeNum = 29; if (_nodes[26] <= 2 || !ChkDesertObstacles()) { DrawLocation(); @@ -209,31 +209,31 @@ void KingdomGame::GPLogic2() { switch (_nodes[30]) { case 0: _sound = false; - PlayMovie(82); + playMovie(82); _currMap = 89; _nodes[30] = 1; break; case 1: _sound = true; - PlayMovie(82); + playMovie(82); _currMap = 89; _nodes[30] = 0; break; case 8: _sound = false; - PlayMovie(85); + playMovie(85); _currMap = 10; _nodes[30] = 9; _tsIconOnly = true; break; default: _sound = true; - PlayMovie(85); + playMovie(85); _currMap = 10; _tsIconOnly = true; break; } - PlaySound(17); + playSound(17); _statPlay = 291; } } @@ -243,8 +243,8 @@ void KingdomGame::GPLogic2() { switch(_userInput) { case 0x431: _tsIconOnly = true; - PlayMovie(83); - PlaySound(30); + playMovie(83); + playSound(30); InventoryAdd(10); _nodes[30] = 8; _userInput = 0; @@ -254,8 +254,8 @@ void KingdomGame::GPLogic2() { if (_nodes[30] >= 8) DisplayIcon(140); else { - DsAll(); - PlayMovie(84); + dsAll(); + playMovie(84); _statPlay = 992; _loopFlag = true; } @@ -268,7 +268,7 @@ void KingdomGame::GPLogic2() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; } break; @@ -283,8 +283,8 @@ void KingdomGame::GPLogic2() { _nodeNum = 30; if (!ChkDesertObstacles()) { DrawLocation(); - PlayMovie(86); - PlaySound(18); + playMovie(86); + playSound(18); _currMap = 10; _statPlay = 301; } @@ -300,7 +300,7 @@ void KingdomGame::GPLogic2() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; } break; @@ -312,8 +312,8 @@ void KingdomGame::GPLogic2() { _nodeNum = 31; if (!ChkDesertObstacles()) { DrawLocation(); - PlayMovie(67); - PlaySound(18); + playMovie(67); + playSound(18); _currMap = 90; _statPlay = 311; _nodes[32] = 1; @@ -331,12 +331,12 @@ void KingdomGame::GPLogic2() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; case 0x449: _aTimer = 0; - DsAll(); - PlayMovie(68); + dsAll(); + playMovie(68); _statPlay = 992; _loopFlag = true; break; @@ -358,8 +358,8 @@ void KingdomGame::GPLogic2() { _sound = true; _nodes[33] = 1; } - PlayMovie(87); - PlaySound(18); + playMovie(87); + playSound(18); _currMap = 10; _statPlay = 321; break; @@ -373,7 +373,7 @@ void KingdomGame::GPLogic2() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; } break; @@ -390,8 +390,8 @@ void KingdomGame::GPLogic2() { _sound = false; else _sound = true; - PlayMovie(88); - PlaySound(18); + playMovie(88); + playSound(18); _currMap = 10; _statPlay = 331; } @@ -406,7 +406,7 @@ void KingdomGame::GPLogic2() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; } break; @@ -425,16 +425,16 @@ void KingdomGame::GPLogic2() { DrawLocation(); _userInput = 0; if (_nodes[35] == 9 || _nodes[41] == 0 || !_wizard) { - PlayMovie(91); + playMovie(91); _currMap = 92; } else { - PlayMovie(89); - ShowPic(389); + playMovie(89); + showPic(389); _currMap = 91; } if (_nodes[35] == 9) _tsIconOnly = true; - PlaySound(26); + playSound(26); _statPlay = 341; } } @@ -445,7 +445,7 @@ void KingdomGame::GPLogic2() { if (_nodes[35] == 9) DisplayIcon(139); else { - PlayMovie(90); + playMovie(90); InventoryAdd(9); _nodes[35] = 9; _currMap = 93; @@ -459,9 +459,9 @@ void KingdomGame::GPLogic2() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); if (_pMovie == 89) - ShowPic(389); + showPic(389); break; case 0x445: _statPlay = 410; @@ -489,8 +489,8 @@ void KingdomGame::GPLogic2() { } else { _nodeNum = 35; DrawLocation(); - DsAll(); - PlayMovie(92); + dsAll(); + playMovie(92); _currMap = 94; SetATimer(); _userInput = 0; @@ -503,21 +503,21 @@ void KingdomGame::GPLogic2() { case 0x429: InventoryDel(_userInput - 0x428); _aTimer = 0; - PlayMovie(178); + playMovie(178); _userInput = 0x2F1; _loopFlag = true; // No break on purpose case 0x2F1: _aTimer = 0; - DsAll(); - PlayMovie(93); + dsAll(); + playMovie(93); _statPlay = 992; _loopFlag = true; break; case 0x42A: _aTimer = 0; - EnAll(); - PlayMovie(179); + enAll(); + playMovie(179); InventoryDel(2); _nodes[36] = 1; _userInput = 0; @@ -536,8 +536,8 @@ void KingdomGame::GPLogic2() { else _sound = true; _frameStop = 185; - DsAll(); - PlayMovie(94); + dsAll(); + playMovie(94); _currMap = 95; SetATimer(); _userInput = 0; @@ -547,17 +547,17 @@ void KingdomGame::GPLogic2() { switch(_userInput) { case 0x2F1: _aTimer = 0; - DsAll(); - PlayMovie(95); + dsAll(); + playMovie(95); _statPlay = 992; _loopFlag = true; break; case 0x428: _aTimer = 0; - EnAll(); - PlayMovie(97); + enAll(); + playMovie(97); InventoryDel(0); - PlaySound(5); + playSound(5); _nodes[37] = 1; _userInput = 0; _currMap = 10; @@ -572,10 +572,10 @@ void KingdomGame::GPLogic2() { break; case 0x42A: _aTimer = 0; - EnAll(); - PlayMovie(98); + enAll(); + playMovie(98); InventoryDel(2); - PlaySound(5); + playSound(5); _nodes[37] = 1; _userInput = 0; _currMap = 10; @@ -583,10 +583,10 @@ void KingdomGame::GPLogic2() { break; case 0x42E: _aTimer = 0; - EnAll(); - PlayMovie(100); + enAll(); + playMovie(100); InventoryDel(6); - PlaySound(5); + playSound(5); _nodes[37] = 1; _userInput = 0; _currMap = 10; @@ -594,9 +594,9 @@ void KingdomGame::GPLogic2() { break; case 0x431: _aTimer = 0; - EnAll(); - PlayMovie(96); - PlaySound(5); + enAll(); + playMovie(96); + playSound(5); _nodes[37] = 9; _userInput = 0; _currMap = 10; @@ -607,8 +607,8 @@ void KingdomGame::GPLogic2() { break; case 0x437: _aTimer = 0; - DsAll(); - PlayMovie(99); + dsAll(); + playMovie(99); _statPlay = 992; _loopFlag = true; break; @@ -620,7 +620,7 @@ void KingdomGame::GPLogic2() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; } break; @@ -632,8 +632,8 @@ void KingdomGame::GPLogic2() { DrawLocation(); _userInput = 0; _nodes[38] = 0; - PlayMovie(102); - PlaySound(20); + playMovie(102); + playSound(20); _currMap = 109; _statPlay = 371; break; @@ -652,7 +652,7 @@ void KingdomGame::GPLogic2() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; } break; @@ -665,9 +665,9 @@ void KingdomGame::GPLogic2() { if (!ChkDesertObstacles()) { DrawLocation(); _userInput = 0; - PlayMovie(159); + playMovie(159); _currMap = 10; - PlaySound(7); + playSound(7); _nodes[39] = 1; _statPlay = 381; } @@ -679,23 +679,23 @@ void KingdomGame::GPLogic2() { case 0x42A: if (_wizard && _nodes[39] != 9) { InventoryDel(_userInput - 0x428); - SaveAS(); - PlayMovie(178); - RestoreAS(); + saveAS(); + playMovie(178); + restoreAS(); } _userInput = 0; break; case 0x430: if (_wizard && _nodes[39] != 9) { - DsAll(); - PlayMovie(162); + dsAll(); + playMovie(162); _statPlay = 992; _loopFlag = true; } break; case 0x433: if (_wizard && _nodes[39] != 9) { - PlayMovie(161); + playMovie(161); InventoryDel(11); _nodes[51] = 0; _userInput = 0; @@ -704,7 +704,7 @@ void KingdomGame::GPLogic2() { break; case 0x435: if (_wizard && _nodes[39] != 9) { - PlayMovie(160); + playMovie(160); InventoryDel(13); _nodes[39] = 9; _nodes[59] = 0; @@ -715,7 +715,7 @@ void KingdomGame::GPLogic2() { break; case 0x437: if (_wizard && _nodes[39] != 9) { - PlayMovie(163); + playMovie(163); InventoryDel(15); _nodes[12] = 0; } @@ -729,7 +729,7 @@ void KingdomGame::GPLogic2() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; case 0x456: _statPlay = 370; @@ -748,9 +748,9 @@ void KingdomGame::GPLogic2() { _nodeNum = 39; DrawLocation(); _aTimer = 0; - DsAll(); - PlayMovie(104); - PlaySound(34); + dsAll(); + playMovie(104); + playSound(34); _statPlay = 992; _loopFlag = true; break; @@ -766,8 +766,8 @@ void KingdomGame::GPLogic2() { _sound = true; } } else { - DsAll(); - PlayMovie(105); + dsAll(); + playMovie(105); _currMap = 10; SetATimer(); } @@ -779,8 +779,8 @@ void KingdomGame::GPLogic2() { switch(_userInput) { case 0x2F1: _aTimer = 0; - DsAll(); - PlayMovie(106); + dsAll(); + playMovie(106); _statPlay = 992; _loopFlag = true; break; @@ -790,7 +790,7 @@ void KingdomGame::GPLogic2() { if (!_nodes[41]) { InventoryDel(_userInput - 0x428); _aTimer = 0; - PlayMovie(178); + playMovie(178); _userInput = 753; _loopFlag = true; _currMap = 10; @@ -799,8 +799,8 @@ void KingdomGame::GPLogic2() { case 0x42C: if (!_nodes[41]) { _aTimer = 0; - DsAll(); - PlayMovie(108); + dsAll(); + playMovie(108); _userInput = 0; _statPlay = 992; _loopFlag = true; @@ -809,7 +809,7 @@ void KingdomGame::GPLogic2() { case 0x42E: if (!_nodes[41]) { _aTimer = 0; - PlayMovie(109); + playMovie(109); InventoryDel(6); _nodes[43] = 0; _userInput = 0; @@ -823,8 +823,8 @@ void KingdomGame::GPLogic2() { _replay = true; _pouch = true; _fstFwd = true; - PlayMovie(107); - PlaySound(26); + playMovie(107); + playSound(26); _nodes[41] = 1; _userInput = 0; _currMap = 96; @@ -835,7 +835,7 @@ void KingdomGame::GPLogic2() { case 0x43E: _aTimer = 0; _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; case 0x441: _statPlay = 460; @@ -857,8 +857,8 @@ void KingdomGame::GPLogic2() { _sound = true; _eye = false; - PlayMovie(111); - PlaySound(26); + playMovie(111); + playSound(26); _currMap = 97; _statPlay = 411; break; @@ -867,18 +867,18 @@ void KingdomGame::GPLogic2() { case 0x43E: _sound = _lastSound; if (_pMovie == 120) { - SaveAS(); + saveAS(); _frameStop = 50; - PlayMovie(120); + playMovie(120); _bTimer = 34; while(_bTimer != 0) { checkTimers(); RefreshSound(); CheckMainScreen(); } - RestoreAS(); + restoreAS(); } - PlayMovie(_pMovie); + playMovie(_pMovie); break; case 0x445: _userInput = 0; @@ -913,9 +913,9 @@ void KingdomGame::GPLogic2() { case 0x429: case 0x42A: InventoryDel(_userInput - 0x428); - SaveAS(); - PlayMovie(178); - RestoreAS(); + saveAS(); + playMovie(178); + restoreAS(); _userInput = 0; break; case 0x42E: @@ -927,7 +927,7 @@ void KingdomGame::GPLogic2() { } else { _sound = true; } - PlayMovie(113); + playMovie(113); InventoryAdd(6); _nodes[43] = 9; _currMap = 10; @@ -942,7 +942,7 @@ void KingdomGame::GPLogic2() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; } @@ -957,18 +957,18 @@ void KingdomGame::GPLogic2() { _userInput = 0; if (_nodes[44] == 9) { _tsIconOnly = true; - PlayMovie(118); + playMovie(118); _currMap = 80; } else if (_inventory[12] <= 0) { - PlayMovie(115); - ShowPic(415); + playMovie(115); + showPic(415); _currMap = 78; if (!_skylarTimer) _skylarTimer = 5400; } else { _skylarTimer = 0; - PlayMovie(116); - PlaySound(25); + playMovie(116); + playSound(25); InventoryDel(12); InventoryAdd(16); _nodes[44] = 9; @@ -976,13 +976,13 @@ void KingdomGame::GPLogic2() { _tsIconOnly = true; } _statPlay = 431; - PlaySound(20); + playSound(20); _eye = false; break; case 431: switch(_userInput) { case 0x40A: - PlayMovie(10); + playMovie(10); _statPlay = 200; if (_nodes[44] != 9) _nodes[20] = 1; @@ -990,19 +990,19 @@ void KingdomGame::GPLogic2() { _loopFlag = true; break; case 0x414: - PlayMovie(10); + playMovie(10); _statPlay = 390; _currMap = 10; _loopFlag = true; break; case 0x41D: - PlayMovie(10); + playMovie(10); _statPlay = 500; _currMap = 10; _loopFlag = true; break; case 0x422: - PlayMovie(10); + playMovie(10); _statPlay = 380; _currMap = 10; _loopFlag = true; @@ -1012,17 +1012,17 @@ void KingdomGame::GPLogic2() { case 0x42A: if (_nodes[44] != 9) { InventoryDel(_userInput - 0x428); - SaveAS(); - PlayMovie(178); - RestoreAS(); + saveAS(); + playMovie(178); + restoreAS(); } break; case 0x438: if (_nodes[44] == 9) { DisplayIcon(146); } else { - DsAll(); - PlayMovie(117); + dsAll(); + playMovie(117); _statPlay = 992; _loopFlag = true; } @@ -1038,8 +1038,8 @@ void KingdomGame::GPLogic2() { if (_inventory[12] > 0 || _nodes[44] == 9) _sound = true; - PlayMovie(119); - PlaySound(20); + playMovie(119); + playSound(20); _currMap = 100; _statPlay = 441; break; @@ -1053,7 +1053,7 @@ void KingdomGame::GPLogic2() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; case 0x452: _statPlay = 430; @@ -1069,15 +1069,15 @@ void KingdomGame::GPLogic2() { _nodeNum = 45; _userInput = 0; if (!_nodes[41]) { - DsAll(); - PlayMovie(120); + dsAll(); + playMovie(120); _statPlay = 992; _currMap = 10; _loopFlag = true; } else { _fstFwd = false; _frameStop = 50; - PlayMovie(120); + playMovie(120); _currMap = 17; _statPlay = 451; } @@ -1088,9 +1088,9 @@ void KingdomGame::GPLogic2() { _sound = _lastSound; _fstFwd = false; _frameStop = 50; - PlayMovie(_pMovie); + playMovie(_pMovie); _currMap = 17; - PlaySound(26); + playSound(26); break; case 0x441: _statPlay = 410; @@ -1110,8 +1110,8 @@ void KingdomGame::GPLogic2() { _nodes[47] = 0; _sound = true; } - PlayMovie(121); - PlaySound(26); + playMovie(121); + playSound(26); _currMap = 107; _statPlay = 461; break; @@ -1119,7 +1119,7 @@ void KingdomGame::GPLogic2() { switch(_userInput) { case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; case 0x445: _statPlay = 340; @@ -1142,7 +1142,7 @@ void KingdomGame::GPLogic2() { case 480: _nodeNum = 48; _userInput = 0; - PlayMovie(114); + playMovie(114); _currMap = 10; _statPlay = 481; _nodes[49] = 1; @@ -1157,7 +1157,7 @@ void KingdomGame::GPLogic2() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; } break; @@ -1167,9 +1167,9 @@ void KingdomGame::GPLogic2() { case 490: _nodeNum = 49; DrawLocation(); - DsAll(); - PlayMovie(180); - PlaySound(18); + dsAll(); + playMovie(180); + playSound(18); _currMap = 101; _statPlay = 491; _aTimer = 0; @@ -1182,13 +1182,13 @@ void KingdomGame::GPLogic2() { case 0x42B: InventoryDel(_userInput - 0x428); _aTimer = 0; - PlayMovie(178); + playMovie(178); _userInput = 753; _loopFlag = true; _currMap = 10; break; case 0x442: - PlayMovie(182); + playMovie(182); _statPlay = 992; _loopFlag = true; break; @@ -1196,8 +1196,8 @@ void KingdomGame::GPLogic2() { _currMap = 10; _userInput = 0; _aTimer = 0; - EnAll(); - PlayMovie(181); + enAll(); + playMovie(181); _nodes[29] = 9; _nodes[49] = 0; _statPlay = _nextNode * 10; @@ -1209,9 +1209,9 @@ void KingdomGame::GPLogic2() { } void KingdomGame::GPLogic2_SubSP361() { - EnAll(); + enAll(); _userInput = 0; - PlaySound(19); + playSound(19); if (_nodes[29] == 1) { _statPlay = 480; _loopFlag = true; @@ -1224,12 +1224,12 @@ void KingdomGame::GPLogic2_SubSP361() { _sound = true; _nodes[43] = 2; } - PlayMovie(122); + playMovie(122); _currMap = 10; _tsIconOnly = true; _statPlay = 421; } else { - PlayMovie(112); + playMovie(112); _currMap = 98; _statPlay = 421; } diff --git a/engines/kingdom/GPLogic3.cpp b/engines/kingdom/GPLogic3.cpp index 19b76ebffb1..356fb7a43ee 100644 --- a/engines/kingdom/GPLogic3.cpp +++ b/engines/kingdom/GPLogic3.cpp @@ -35,24 +35,24 @@ void KingdomGame::GPLogic3() { _nodes[51] = 1; switch(_nodes[51]) { case 0: - PlayMovie(123); + playMovie(123); _currMap = 102; break; case 1: _nodes[51] = 2; - PlayMovie(126); + playMovie(126); _currMap = 10; _tsIconOnly = true; break; default: _nodes[51] = 1; _sound = true; - PlayMovie(126); + playMovie(126); _currMap = 10; _tsIconOnly = true; break; } - PlaySound(29); + playSound(29); _statPlay = 501; break; case 501: @@ -62,16 +62,16 @@ void KingdomGame::GPLogic3() { case 0x42A: if (!_nodes[51]) { InventoryDel(_userInput - 0x428); - SaveAS(); - PlayMovie(178); - RestoreAS(); + saveAS(); + playMovie(178); + restoreAS(); _userInput = 0; } break; case 0x433: if (!_nodes[51]) { - DsAll(); - PlayMovie(125); + dsAll(); + playMovie(125); _statPlay = 993; _loopFlag = true; } else @@ -80,7 +80,7 @@ void KingdomGame::GPLogic3() { break; case 0x439: if (!_nodes[51]) { - PlayMovie(124); + playMovie(124); _nodes[51] = 1; InventoryAdd(11); _userInput = 0; @@ -95,7 +95,7 @@ void KingdomGame::GPLogic3() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; default: if (_userInput) @@ -110,9 +110,9 @@ void KingdomGame::GPLogic3() { _nodeNum = 51; DrawLocation(); _userInput = 0; - PlayMovie(129); + playMovie(129); _currMap = 10; - PlaySound(6); + playSound(6); _statPlay = 511; break; case 511: @@ -121,12 +121,12 @@ void KingdomGame::GPLogic3() { if (_inventory[6] >= 1) DisplayIcon(142); else { - PlayMovie(128); + playMovie(128); _nodes[52] = 9; InventoryAdd(12); _userInput = 0; _currMap = 10; - PlaySound(30); + playSound(30); } break; case 0x43A: @@ -136,16 +136,16 @@ void KingdomGame::GPLogic3() { _userInput = 0; break; case 0x43E: - PlayMovie(_pMovie); + playMovie(_pMovie); break; case 0x457: _tideCntl = false; DrawPic(179); - PlayMovie(127); + playMovie(127); _currMap = 103; _userInput = 0; - PlaySound(0); - PlaySound(6); + playSound(0); + playSound(6); break; default: if (_userInput) @@ -166,10 +166,10 @@ void KingdomGame::GPLogic3() { _sound = true; _nodes[53] = false; } - PlayMovie(130); + playMovie(130); _currMap = 111; _statPlay = 521; - PlaySound(31); + playSound(31); break; case 521: switch(_userInput) { @@ -185,7 +185,7 @@ void KingdomGame::GPLogic3() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; default: if (_userInput) @@ -208,29 +208,29 @@ void KingdomGame::GPLogic3() { _tsIconOnly = true; } _eye = false; - PlayMovie(70); + playMovie(70); _currMap = 99; - PlaySound(8); + playSound(8); _statPlay = 531; break; case 531: switch(_userInput) { case 0x428: if (_nodes[54] == 0) { - PlayMovie(71); + playMovie(71); InventoryAdd(14); InventoryDel(0); _tsIconOnly = true; - PlaySound(25); + playSound(25); } _userInput = 0; break; case 0x429: case 0x42A: InventoryDel(_userInput - 0x428); - SaveAS(); - PlayMovie(178); - RestoreAS(); + saveAS(); + playMovie(178); + restoreAS(); _userInput = 0; break; case 0x43E: @@ -239,17 +239,17 @@ void KingdomGame::GPLogic3() { _frameStop = 24; if (!_wizard && _pMovie == 70) _frameStop = 24; - PlayMovie(_pMovie); + playMovie(_pMovie); break; case 0x445: _nodeNum = 56; _userInput = 0; _frameStop = 50; - EnAll(); - PlayMovie(135); + enAll(); + playMovie(135); _currMap = 106; _nodes[57] = 1; - PlaySound(8); + playSound(8); _tsIconOnly = true; _statPlay = 561; break; @@ -281,10 +281,10 @@ void KingdomGame::GPLogic3() { _currMap = 112; } - PlayMovie(132); - ShowPic(432); + playMovie(132); + showPic(432); _statPlay = 541; - PlaySound(22); + playSound(22); break; case 541: switch(_userInput) { @@ -301,14 +301,14 @@ void KingdomGame::GPLogic3() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); - ShowPic(432); + playMovie(_pMovie); + showPic(432); break; case 0x453: _sound = _lastSound; - PlayMovie(131); - PlaySound(32); - FShowPic(432); + playMovie(131); + playSound(32); + fShowPic(432); // Useless, but present in the original // _CurrMap = 10; _currMap = 55; @@ -326,38 +326,38 @@ void KingdomGame::GPLogic3() { _nodeNum = 55; DrawLocation(); _userInput = 0; - PlayMovie(133); + playMovie(133); if (_nodes[56] != 9) _nodes[56] = 0; _tsIconOnly = true; _currMap = 104; _statPlay = 551; - PlaySound(8); + playSound(8); break; case 551: switch(_userInput) { case 0x2F1: _aTimer = 0; - DsAll(); - PlayMovie(134); + dsAll(); + playMovie(134); _statPlay = 993; _loopFlag = true; break; case 0x42C: _aTimer = 0; if (_nodes[56] == 1) { - EnAll(); - PlayMovie(183); - FShowPic(433); - PlaySound(8); + enAll(); + playMovie(183); + fShowPic(433); + playSound(8); _nodes[56] = 9; _tsIconOnly = true; } break; case 0x43A: if (_nodes[56] == 1) { - DsAll(); - PlayMovie(134); + dsAll(); + playMovie(134); _statPlay = 993; _loopFlag = true; } else { @@ -369,23 +369,23 @@ void KingdomGame::GPLogic3() { break; case 0x43E: _aTimer = 0; - PlayMovie(_pMovie); + playMovie(_pMovie); if (_pMovie == 183) - FShowPic(433); + fShowPic(433); break; case 0x452: _aTimer = 0; switch(_nodes[56]) { case 0: - DsAll(); - PlayMovie(69); + dsAll(); + playMovie(69); _tsIconOnly = false; _nodes[56] = 1; SetATimer(); break; case 1: - DsAll(); - PlayMovie(134); + dsAll(); + playMovie(134); _statPlay = 993; _loopFlag = true; break; @@ -415,17 +415,17 @@ void KingdomGame::GPLogic3() { _userInput = 0; if (_wizard) { _frameStop = 50; - EnAll(); - PlayMovie(135); - ShowPic(435); + enAll(); + playMovie(135); + showPic(435); _nodes[57] = 1; - PlaySound(8); + playSound(8); _statPlay = 561; _currMap = 106; _tsIconOnly = true; } else { - DsAll(); - PlayMovie(135); + dsAll(); + playMovie(135); _currMap = 10; SetATimer(); _nodes[57] = 0; @@ -436,8 +436,8 @@ void KingdomGame::GPLogic3() { switch(_userInput) { case 0x2F1: _aTimer = 0; - DsAll(); - PlayMovie(136); + dsAll(); + playMovie(136); _statPlay = 993; _loopFlag = true; break; @@ -447,9 +447,9 @@ void KingdomGame::GPLogic3() { _aTimer = 0; if (!_nodes[57]) { InventoryDel(_userInput - 0x428); - SaveAS(); - PlayMovie(178); - RestoreAS(); + saveAS(); + playMovie(178); + restoreAS(); _userInput = 753; _loopFlag = true; } @@ -459,9 +459,9 @@ void KingdomGame::GPLogic3() { if (!_nodes[57]) { _fstFwd = false; _replay = true; - PlayMovie(138); - EnAll(); - PlaySound(8); + playMovie(138); + enAll(); + playSound(8); _nodes[57] = 1; InventoryDel(4); _nodes[22] = 0; @@ -472,12 +472,12 @@ void KingdomGame::GPLogic3() { case 0x438: _aTimer = 0; if (!_nodes[57]) { - EnAll(); + enAll(); _fstFwd = false; _replay = true; - PlayMovie(137); - EnAll(); - PlaySound(8); + playMovie(137); + enAll(); + playSound(8); _nodes[57] = 1; _currMap = 106; _tsIconOnly = true; @@ -493,9 +493,9 @@ void KingdomGame::GPLogic3() { _fstFwd = false; if (_pMovie == 135 && _nodes[57]) { _frameStop = 50; - PlayMovie(135); + playMovie(135); } else if (_nodes[57]) - PlayMovie(_pMovie); + playMovie(_pMovie); else { _userInput = 753; _aTimer = 0; @@ -534,8 +534,8 @@ void KingdomGame::GPLogic3() { DrawLocation(); _nodes[58] = 0; _userInput = 0; - PlayMovie(139); - PlaySound(27); + playMovie(139); + playSound(27); _currMap = 10; _statPlay = 571; } else { @@ -553,7 +553,7 @@ void KingdomGame::GPLogic3() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; default: if (_userInput) @@ -572,49 +572,49 @@ void KingdomGame::GPLogic3() { switch(_nodes[59]) { case 0: _sound = true; - PlayMovie(140); + playMovie(140); _currMap = 113; _nodes[59] = 1; break; case 1: - PlayMovie(140); + playMovie(140); _currMap = 113; _nodes[59] = 0; break; case 8: _tsIconOnly = true; - PlayMovie(143); + playMovie(143); _currMap = 10; _nodes[59] = 9; break; case 9: _tsIconOnly = true; _sound = true; - PlayMovie(143); + playMovie(143); _currMap = 10; break; } - PlaySound(27); + playSound(27); _statPlay = 581; break; case 581: switch(_userInput) { case 0x430: - PlayMovie(141); + playMovie(141); _nodes[59] = 8; InventoryAdd(13); _tsIconOnly = true; _currMap = 10; - PlaySound(30); + playSound(30); // No break on purpose case 0x428: case 0x429: case 0x42A: if (_nodes[59] < 8) { InventoryDel(_userInput - 0x428); - SaveAS(); - PlayMovie(178); - RestoreAS(); + saveAS(); + playMovie(178); + restoreAS(); } _userInput = 0; break; @@ -622,8 +622,8 @@ void KingdomGame::GPLogic3() { if (_nodes[59] >= 8) DisplayIcon(143); else { - DsAll(); - PlayMovie(142); + dsAll(); + playMovie(142); _statPlay = 993; _loopFlag = true; } @@ -635,7 +635,7 @@ void KingdomGame::GPLogic3() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; default: if (_userInput) @@ -656,10 +656,10 @@ void KingdomGame::GPLogic3() { _sound = true; _nodes[60] = 0; } - PlayMovie(144); - ShowPic(144); + playMovie(144); + showPic(144); _currMap = 114; - PlaySound(21); + playSound(21); _statPlay = 591; break; case 591: @@ -672,8 +672,8 @@ void KingdomGame::GPLogic3() { break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); - ShowPic(444); + playMovie(_pMovie); + showPic(444); break; case 0x445: _statPlay = 660; @@ -689,17 +689,17 @@ void KingdomGame::GPLogic3() { ProcessMapInput(59); break; case 600: - SetMouse(); + setMouse(); EraseCursor(); fadeToBlack2(); - ShowPic(106); + showPic(106); DrawIcon(4, 0, 12 - _healthOld); _asMode = false; _nodeNum = 60; DrawLocation(); _userInput = 0; - DsAll(); - PlayMovie(145); + dsAll(); + playMovie(145); _statPlay = 992; _loopFlag = true; break; @@ -714,14 +714,14 @@ void KingdomGame::GPLogic3() { else _sound = true; - PlayMovie(146); + playMovie(146); if (_nodes[70] == 9) { _itemInhibit = true; _tsIconOnly = true; } _currMap = 115; - PlaySound(36); + playSound(36); _statPlay = 611; _eye = false; break; @@ -731,20 +731,20 @@ void KingdomGame::GPLogic3() { case 0x429: case 0x42A: InventoryDel(_userInput - 0x428); - DsAll(); - PlayMovie(148); + dsAll(); + playMovie(148); _statPlay = 993; _loopFlag = true; break; case 0x432: - PlayMovie(147); + playMovie(147); _inventory[5] = -1; _nodes[30] = 0; _currMap = 116; break; case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; case 0x441: // Cascade on purpose @@ -776,16 +776,16 @@ void KingdomGame::GPLogic3() { _userInput = 0; _eye = false; if (_nodes[63] == 0) { - PlayMovie(149); + playMovie(149); _currMap = 122; } else { _frameStop = 24; - PlayMovie(202); + playMovie(202); _currMap = 121; _nodes[63] = 9; } _tsIconOnly = true; - PlaySound(8); + playSound(8); _statPlay = 621; break; case 621: @@ -794,30 +794,30 @@ void KingdomGame::GPLogic3() { case 0x429: case 0x42A: InventoryDel(_userInput - 0x428); - SaveAS(); - PlayMovie(178); - RestoreAS(); + saveAS(); + playMovie(178); + restoreAS(); _userInput = 0; break; case 0x430: - PlayMovie(150); + playMovie(150); InventoryAdd(8); _nodes[63] = 1; - PlaySound(25); + playSound(25); _currMap = 121; _userInput = 0; break; case 0x43E: switch (_nodes[63]) { case 0: - PlayMovie(149); + playMovie(149); break; case 1: - PlayMovie(150); + playMovie(150); break; case 9: _frameStop = 24; - PlayMovie(202); + playMovie(202); _currMap = 121; break; } @@ -826,10 +826,10 @@ void KingdomGame::GPLogic3() { _nodeNum = 56; _userInput = 0; _frameStop = 50; - EnAll(); - PlayMovie(135); + enAll(); + playMovie(135); _nodes[57] = 1; - PlaySound(8); + playSound(8); _statPlay = 561; _currMap = 106; if (_inventory[16] < 1 && _wizard) @@ -857,19 +857,19 @@ void KingdomGame::GPLogic3() { } else _nodes[64] = true; - PlayMovie(151); + playMovie(151); _currMap = 72; - PlaySound(40); + playSound(40); _statPlay = 631; break; case 631: switch(_userInput) { case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; case 0x445: - PlayMovie(10); + playMovie(10); _statPlay = 50; _loopFlag = true; break; @@ -889,10 +889,10 @@ void KingdomGame::GPLogic3() { } else _nodes[65] = 1; - PlayMovie(152); + playMovie(152); _currMap = 10; _statPlay = 641; - PlaySound(28); + playSound(28); break; case 641: switch(_userInput) { @@ -904,7 +904,7 @@ void KingdomGame::GPLogic3() { break; case 0x43E: _sound= _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; default: if (_userInput) @@ -925,18 +925,18 @@ void KingdomGame::GPLogic3() { _sound = true; _nodes[66] = 0; } - PlayMovie(153); - ShowPic(453); + playMovie(153); + showPic(453); _currMap = 73; - PlaySound(37); + playSound(37); _statPlay = 651; break; case 651: switch(_userInput) { case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); - ShowPic(453); + playMovie(_pMovie); + showPic(453); break; case 0x445: _statPlay = 700; @@ -971,16 +971,16 @@ void KingdomGame::GPLogic3() { _sound = true; _nodes[67] = 0; } - PlayMovie(154); + playMovie(154); _currMap = 70; - PlaySound(40); + playSound(40); _statPlay = 661; break; case 661: switch(_userInput) { case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; case 0x445: _statPlay = 700; @@ -1010,7 +1010,7 @@ void KingdomGame::GPLogic3() { _eye = false; _nodes[68] = 1; _fstFwd = false; - PlayMovie(155); + playMovie(155); _currMap = 127; _statPlay = 671; break; @@ -1019,7 +1019,7 @@ void KingdomGame::GPLogic3() { case 0x43E: _sound = _lastSound; _fstFwd = false; - PlayMovie(_pMovie); + playMovie(_pMovie); break; case 0x445: _statPlay = 650; @@ -1038,14 +1038,14 @@ void KingdomGame::GPLogic3() { case 680: _nodeNum = 68; _userInput = 0; - DsAll(); - PlayMovie(156); + dsAll(); + playMovie(156); _statPlay = 993; _loopFlag = true; break; case 690: _itemInhibit = false; - EnAll(); + enAll(); if (_nodes[70] == 9) { _statPlay = 640; _nodes[73] = 0; @@ -1057,8 +1057,8 @@ void KingdomGame::GPLogic3() { _userInput = 0; _currMap = 119; _frameStop = 40; - PlayMovie(157); - PlaySound(12); + playMovie(157); + playSound(12); _statPlay = 691; } break; @@ -1068,9 +1068,9 @@ void KingdomGame::GPLogic3() { case 0x429: case 0x42A: InventoryDel(_userInput - 0x428); - SaveAS(); - PlayMovie(178); - RestoreAS(); + saveAS(); + playMovie(178); + restoreAS(); _userInput = 0; break; case 0x439: @@ -1078,11 +1078,11 @@ void KingdomGame::GPLogic3() { DisplayIcon(147); else { _frameStop = 108; - PlayMovie(158); + playMovie(158); _itemInhibit = false; InventoryAdd(17); _nodes[70] = 9; - PlaySound(23); + playSound(23); _userInput = 0; _currMap = 120; } @@ -1094,11 +1094,11 @@ void KingdomGame::GPLogic3() { _frameStop = 108; if (_pMovie == 178) { - SaveAS(); - PlayMovie(178); - RestoreAS(); + saveAS(); + playMovie(178); + restoreAS(); } else - PlayMovie(_pMovie); + playMovie(_pMovie); break; case 0x441: @@ -1127,16 +1127,16 @@ void KingdomGame::GPLogic3() { } else _nodes[71] = 1; - PlayMovie(164); + playMovie(164); _currMap = 74; - PlaySound(10); + playSound(10); _statPlay = 701; break; case 701: switch(_userInput) { case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; case 0x445: _statPlay = 650; @@ -1162,8 +1162,8 @@ void KingdomGame::GPLogic3() { _eye = false; if (_inventory[8] && _inventory[14]) _sound = true; - DsAll(); - PlayMovie(165); + dsAll(); + playMovie(165); _currMap = 10; SetATimer(); _statPlay = _wizard ? 712 : 711; @@ -1172,7 +1172,7 @@ void KingdomGame::GPLogic3() { switch(_userInput) { case 0x2F1: _replay = false; - PlayMovie(166); + playMovie(166); _statPlay = 993; _loopFlag = true; break; @@ -1182,8 +1182,8 @@ void KingdomGame::GPLogic3() { InventoryDel(_userInput - 0x428); _replay = false; _aTimer = 0; - PlayMovie(178); - PlayMovie(166); + playMovie(178); + playMovie(166); _statPlay = 993; _loopFlag = true; break; @@ -1192,10 +1192,10 @@ void KingdomGame::GPLogic3() { _nodeNum = 0; _iconsClosed = true; _fstFwd = false; - PlayMovie(167); + playMovie(167); _fstFwd = false; - PlayMovie(170); - PlaySound(25); + playMovie(170); + playSound(25); EndCredits(); _loopFlag = true; break; @@ -1209,7 +1209,7 @@ void KingdomGame::GPLogic3() { switch(_userInput) { case 0x2F1: _replay = false; - PlayMovie(166); + playMovie(166); _statPlay = 993; _loopFlag = true; break; @@ -1219,24 +1219,24 @@ void KingdomGame::GPLogic3() { InventoryDel(_userInput - 0x428); _replay = false; _aTimer = 0; - PlayMovie(178); - PlayMovie(166); + playMovie(178); + playMovie(166); _statPlay = 993; _loopFlag = true; break; case 0x430: _aTimer = 0; if (_nodes[72] != 2) { - PlayMovie(57); + playMovie(57); _statPlay = 993; } else { _nodeNum = 0; _iconsClosed = true; _fstFwd = false; - PlayMovie(55); + playMovie(55); _fstFwd = false; - PlayMovie(184); - PlaySound(25); + playMovie(184); + playSound(25); EndCredits(); } _loopFlag = true; @@ -1244,19 +1244,19 @@ void KingdomGame::GPLogic3() { case 0x432: _aTimer = 0; _replay = false; - PlayMovie(168); + playMovie(168); _statPlay = 993; _loopFlag = true; break; case 0x433: if ((_inventory[8] > 0 && _inventory[14] > 0) || _nodes[72] == 2) { _replay = false; - PlayMovie(166); + playMovie(166); _statPlay = 993; } else { _aTimer = 0; - EnAll(); - PlayMovie(169); + enAll(); + playMovie(169); _statPlay = 580; InventoryDel(11); _nodes[51] = 0; @@ -1265,9 +1265,9 @@ void KingdomGame::GPLogic3() { break; case 0x436: _aTimer = 0; - PlaySound(0); - PlayMovie(193); - ShowPic(128); + playSound(0); + playMovie(193); + showPic(128); InventoryDel(14); _nodes[72] = 2; SetATimer(); @@ -1279,15 +1279,15 @@ void KingdomGame::GPLogic3() { _nodeNum = 0; _iconsClosed = true; _fstFwd = false; - PlayMovie(56); + playMovie(56); _fstFwd = false; - PlayMovie(184); - PlaySound(25); + playMovie(184); + playSound(25); EndCredits(); _quit = true; //-- _QuitFlag = true; } else { - PlayMovie(58); + playMovie(58); _statPlay = 993; } _loopFlag = true; @@ -1315,9 +1315,9 @@ void KingdomGame::GPLogic3() { _nodes[73] = 3; break; } - PlayMovie(175); + playMovie(175); _currMap = 118; - PlaySound(12); + playSound(12); _statPlay = 721; break; case 721: @@ -1325,7 +1325,7 @@ void KingdomGame::GPLogic3() { case 0x43E: if (_nodes[73] > 1) _frameStop = 24; - PlayMovie(_pMovie); + playMovie(_pMovie); break; case 0x441: if (_nodes[73] == 1) { @@ -1384,9 +1384,9 @@ void KingdomGame::GPLogic3() { _nodes[74] = 4; break; } - PlayMovie(176); + playMovie(176); _currMap = 117; - PlaySound(36); + playSound(36); _statPlay = 731; break; case 731: @@ -1395,7 +1395,7 @@ void KingdomGame::GPLogic3() { if (_nodes[74] > 2) _frameStop = 23; _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; case 0x441: switch (_nodes[74]) { @@ -1471,8 +1471,8 @@ void KingdomGame::GPLogic3() { _rtnNode = _nodeNum; _nodeNum = 74; DrawLocation(); - DsAll(); - PlayMovie(185); + dsAll(); + playMovie(185); _currMap = 10; SetATimer(); _statPlay = 741; @@ -1481,8 +1481,8 @@ void KingdomGame::GPLogic3() { case 741: switch(_userInput) { case 0x2F1: - DsAll(); - PlayMovie(188); + dsAll(); + playMovie(188); _statPlay = 993; _loopFlag = true; break; @@ -1491,7 +1491,7 @@ void KingdomGame::GPLogic3() { case 0x42A: InventoryDel(_userInput - 0x428); _aTimer = 0; - PlayMovie(178); + playMovie(178); _loopFlag = true; _userInput = 753; break; @@ -1506,12 +1506,12 @@ void KingdomGame::GPLogic3() { _loopFlag = true; if (Wound()) { _frameStop = 88; - PlayMovie(187); + playMovie(187); _statPlay = 570; _nodes[58] = 1; } else { _frameStop = 78; - PlayMovie(187); + playMovie(187); _statPlay = 993; } break; @@ -1525,34 +1525,34 @@ void KingdomGame::GPLogic3() { _nodeNum = 76; _eye = false; _userInput = 0; - PlayMovie(189); + playMovie(189); _currMap = 126; - PlaySound(21); + playSound(21); _statPlay = 761; break; case 761: switch(_userInput) { case 0x43E: _sound = _lastSound; - PlayMovie(_pMovie); + playMovie(_pMovie); break; case 0x445: _statPlay = 660; _loopFlag = true; break; case 0x44D: - PlayMovie(191); + playMovie(191); _nodes[68] = 2; _statPlay = 660; _loopFlag = true; break; case 0x44E: - PlayMovie(192); + playMovie(192); _statPlay = 660; _loopFlag = true; break; case 0x458: - PlayMovie(190); + playMovie(190); _statPlay = 660; _loopFlag = true; break; @@ -1567,9 +1567,9 @@ void KingdomGame::GPLogic3() { DrawLocation(); _userInput = 0; _eye = false; - PlayMovie(171); + playMovie(171); _currMap = 124; - PlaySound(40); + playSound(40); _statPlay = 781; break; case 781: @@ -1578,33 +1578,33 @@ void KingdomGame::GPLogic3() { case 0x42A: InventoryDel(_userInput - 0x428); _frameStop = 64; - PlayMovie(173); - ShowPic(471); + playMovie(173); + showPic(471); _currMap = 124; break; case 0x429: if (_wizard) { _frameStop = 64; - PlayMovie(173); + playMovie(173); InventoryDel(1); } else { _frameStop = 66; _fstFwd = false; - PlayMovie(172); + playMovie(172); _fstFwd = true; - PlayMovie(201); + playMovie(201); } - FShowPic(471); + fShowPic(471); _currMap = 124; break; case 0x439: _frameStop = 59; _fstFwd = false; - PlayMovie(174); + playMovie(174); _fstFwd = true; - PlayMovie(201); - FShowPic(471); + playMovie(201); + fShowPic(471); _currMap = 124; break; case 0x43E: @@ -1614,14 +1614,14 @@ void KingdomGame::GPLogic3() { if (_pMovie == 201) { _frameStop = 59; _fstFwd = false; - PlayMovie(174); + playMovie(174); _fstFwd = true; - PlayMovie(201); + playMovie(201); } else { - PlayMovie(_pMovie); + playMovie(_pMovie); } if (_pMovie != 171) { - FShowPic(471); + fShowPic(471); _currMap = 124; } break; @@ -1642,8 +1642,8 @@ void KingdomGame::GPLogic3() { case 790: _nodeNum = 79; DrawLocation(); - DsAll(); - PlayMovie(4); + dsAll(); + playMovie(4); _currMap = 8; _statPlay = 791; SetATimer(); @@ -1652,20 +1652,20 @@ void KingdomGame::GPLogic3() { case 791: switch(_userInput) { case 0x2F1: - DsAll(); - PlayMovie(204); + dsAll(); + playMovie(204); _statPlay = 993; _loopFlag = true; break; case 0x445: - EnAll(); - PlayMovie(10); + enAll(); + playMovie(10); _statPlay = 50; _loopFlag = true; break; case 0x446: - EnAll(); - PlayMovie(10); + enAll(); + playMovie(10); _statPlay = 520; _loopFlag = true; break; @@ -1681,30 +1681,30 @@ void KingdomGame::GPLogic3() { void KingdomGame::EndCredits() { _nodeNum = 0; _bTimer = 190; - ReadMouse(); + readMouse(); while(_bTimer != 0 && _mouseButton == 0) { checkTimers(); RefreshSound(); CheckMainScreen(); - ReadMouse(); + readMouse(); } fadeToBlack1(); - DrawRect(4, 17, 228, 161, 0); - PlaySound(0); - DsAll(); + drawRect(4, 17, 228, 161, 0); + playSound(0); + dsAll(); _iconsClosed = true; - PlayMovie(199); - DsAll(); - PlayMovie(205); - DsAll(); + playMovie(199); + dsAll(); + playMovie(205); + dsAll(); fadeToBlack1(); - DrawRect(4, 17, 228, 161, 0); - PlayMovie(201); - FShowPic(125); + drawRect(4, 17, 228, 161, 0); + playMovie(201); + fShowPic(125); _currMap = 3; - DsAll(); + dsAll(); _pouch = false; memset(_inventory, 0xFF, 19); _statPlay = 994; diff --git a/engines/kingdom/GPLogic4.cpp b/engines/kingdom/GPLogic4.cpp index 37bb3f3b501..c61d3937aa5 100644 --- a/engines/kingdom/GPLogic4.cpp +++ b/engines/kingdom/GPLogic4.cpp @@ -28,7 +28,7 @@ void KingdomGame::GPLogic4() { switch(_statPlay) { case 900: if (_aTimer > 0) { - PlaySound(0); + playSound(0); _aTimer = 133; } if (_asMode) { @@ -37,17 +37,17 @@ void KingdomGame::GPLogic4() { _oldStatPlay--; _asMode = false; } - SaveAS(); + saveAS(); fadeToBlack2(); if (_health == 10 || _health == 6 || _health == 2) { - ShowPic(121); + showPic(121); _bTimer = 38; - ReadMouse(); + readMouse(); while (_bTimer && !_mouseButton) { checkTimers(); RefreshSound(); - ReadMouse(); + readMouse(); } if (_aTimer > 0) @@ -60,7 +60,7 @@ void KingdomGame::GPLogic4() { SetATimer(); _aTimer = 133; } - ShowPic(120); + showPic(120); _statPlay = 901; } break; @@ -70,20 +70,20 @@ void KingdomGame::GPLogic4() { case 991: _currMap = 10; _userInput = 0; - PlaySound(0); + playSound(0); if (_health == 10 || _health == 6 || _health == 2) _health -= 2; else _health -= 4; if (_health == 0) { - PlayMovie(194); + playMovie(194); _noIFScreen = true; - FShowPic(107); + fShowPic(107); _currMap = 3; - DsAll(); + dsAll(); _pouch = false; - PlaySound(1); + playSound(1); memset(_inventory, -1, 19); _statPlay = 994; } else { @@ -104,13 +104,13 @@ void KingdomGame::GPLogic4() { DrawPic(179); _skylarTimer = 0; _skylarTimerFlag = false; - EnAll(); + enAll(); _mapEx = true; _nodeNum = 5; DrawLocation(); - PlaySound(0); + playSound(0); if (_nodes[5] > 0) { - PlayMovie(197); + playMovie(197); _resurrect = true; } InventoryDel(12); @@ -120,20 +120,20 @@ void KingdomGame::GPLogic4() { case 992: _currMap = 10; _userInput = 0; - PlaySound(0); + playSound(0); if (_health == 10 || _health == 6 || _health == 2) _health -= 2; else _health -= 4; if (_health == 0) { - PlayMovie(194); + playMovie(194); _noIFScreen = true; - FShowPic(107); + fShowPic(107); _currMap = 3; - DsAll(); + dsAll(); _pouch = false; - PlaySound(1); + playSound(1); memset(_inventory, -1, 19); _statPlay = 994; } else { @@ -154,13 +154,13 @@ void KingdomGame::GPLogic4() { DrawPic(179); _skylarTimer = 0; _skylarTimerFlag = false; - EnAll(); + enAll(); _mapEx = true; _nodeNum = 27; DrawLocation(); _resurrect = true; - PlaySound(0); - PlayMovie(195); + playSound(0); + playMovie(195); InventoryDel(12); _statPlay = 270; } @@ -168,20 +168,20 @@ void KingdomGame::GPLogic4() { case 993: _currMap = 10; _userInput = 0; - PlaySound(0); + playSound(0); if (_health == 10 || _health == 6 || _health == 2) _health -= 2; else _health -= 4; if (_health == 0) { - PlayMovie(194); + playMovie(194); _noIFScreen = true; - FShowPic(107); + fShowPic(107); _currMap = 3; - DsAll(); + dsAll(); _pouch = false; - PlaySound(1); + playSound(1); memset(_inventory, -1, 19); _statPlay = 994; } else { @@ -204,13 +204,13 @@ void KingdomGame::GPLogic4() { DrawPic(179); _skylarTimer = 0; _skylarTimerFlag = false; - EnAll(); + enAll(); _mapEx = true; _nodeNum = 52; DrawLocation(); _resurrect = true; - PlaySound(0); - PlayMovie(196); + playSound(0); + playMovie(196); InventoryDel(12); _statPlay = 520; } @@ -232,10 +232,10 @@ void KingdomGame::GPLogic4() { } void KingdomGame::GPLogic4_SP901() { - SetMouse(); + setMouse(); EraseCursor(); fadeToBlack2(); - ShowPic(106); + showPic(106); DrawIcon(4, 0, 12 - _healthOld); if (_tideCntl) DrawPic(178); @@ -245,22 +245,22 @@ void KingdomGame::GPLogic4_SP901() { _iconRedraw = true; if (_userInput == 0x2F1) { _asMode = false; - RestoreAS(); + restoreAS(); _statPlay = _oldStatPlay; _loopFlag = true; } else { if (_health == 10 || _health == 6 || _health == 2 || _userInput < 0x400 || _userInput > 0x427) { _asMode = false; - RestoreAS(); + restoreAS(); _statPlay = _oldStatPlay; } else { _statPlay = _mapExit[_userInput - 0x400]; _userInput = 0; Wound(); - PlayMovie(10); + playMovie(10); InventoryDel(3); _tsIconOnly = false; - EnAll(); + enAll(); SwitchAS(); _mapStat = 0; } diff --git a/engines/kingdom/kingdom.cpp b/engines/kingdom/kingdom.cpp index 4294413b8d8..9f84747e9fd 100644 --- a/engines/kingdom/kingdom.cpp +++ b/engines/kingdom/kingdom.cpp @@ -273,13 +273,13 @@ void KingdomGame::setupPics() { } void KingdomGame::initTools() { - InitMouse(); + initMouse(); //CHECKME: InitTimers? - ShowPic(124); - InitCursor(); - SetMouse(); + showPic(124); + initCursor(); + setMouse(); fadeToBlack2(); - InitMPlayer(); + initMPlayer(); } void KingdomGame::titlePage() { @@ -291,11 +291,11 @@ void KingdomGame::titlePage() { _noIFScreen = true; _sound = false; fadeToBlack2(); - PlayMovie(200); + playMovie(200); fadeToBlack2(); - PlayMovie(206); + playMovie(206); fadeToBlack2(); - PlayMovie(198); + playMovie(198); fadeToBlack2(); } @@ -338,7 +338,7 @@ void KingdomGame::initPlay() { _treeRightSta = 1; _tsIconOnly = false; _lastObs = false; - EnAll(); + enAll(); _pouch = true; _noIFScreen = true; _noMusic = false; @@ -360,11 +360,11 @@ void KingdomGame::fadeToBlack2() { debug("STUB: FadeToBlack2"); } -void KingdomGame::GameHelp_Sub43C() { +void KingdomGame::gameHelp_Sub43C() { fadeToBlack1(); _currMap = _asMap; - DrawRect(4, 17, 228, 161, 0); - RestoreAS(); + drawRect(4, 17, 228, 161, 0); + restoreAS(); _userInput = 0; _gameMode = 0; _iconsClosed = false; @@ -377,12 +377,12 @@ void KingdomGame::GameHelp_Sub43C() { void KingdomGame::gameHelp() { if (!_gameMode) { if (_userInput == 0x43C) { - SaveAS(); + saveAS(); _asMap = _currMap; _currMap = 0; fadeToBlack1(); - DrawRect(4, 17, 228, 161, 0); - DrawHelpScreen(); + drawRect(4, 17, 228, 161, 0); + drawHelpScreen(); _gameMode = 1; _oldTLS = _treeLeftSta; _treeLeftSta = 0; @@ -395,7 +395,7 @@ void KingdomGame::gameHelp() { _userInput = 0; } if (_userInput == 0x44F) { - SaveAS(); + saveAS(); _asMap = _currMap; _gameMode = 2; _oldTLS = _treeLeftSta; @@ -407,8 +407,8 @@ void KingdomGame::gameHelp() { _help = false; _oldPouch = _pouch; fadeToBlack1(); - DrawRect(4, 17, 228, 161, 0); - DrawInventory(); + drawRect(4, 17, 228, 161, 0); + drawInventory(); if (_nodes[68] == 1 || _nodes[29] == 1 || _itemInhibit) _currMap = 10; @@ -427,35 +427,35 @@ void KingdomGame::gameHelp() { //TODO: Set _quitFlag to 1 break; case 0x241: - GameHelp_Sub43C(); + gameHelp_Sub43C(); return; break; case 0x242: if (_noMusic) { _noMusic = false; - PlaySound(1); + playSound(1); } else { _noMusic = true; - PlaySound(0); + playSound(0); } - DrawHelpScreen(); + drawHelpScreen(); break; case 0x243: { fadeToBlack2(); _keyActive = false; _noIFScreen = true; - PlaySound(0); + playSound(0); int var = _pMovie; while(!_keyActive) { - PlayMovie(54); + playMovie(54); fadeToBlack2(); } _pMovie = var; _noIFScreen = false; - ShowPic(106); - DrawHelpScreen(); + showPic(106); + drawHelpScreen(); _iconRedraw = true; - PlaySound(1); + playSound(1); } break; case 0x244: @@ -465,14 +465,14 @@ void KingdomGame::gameHelp() { case 0x245: { fadeToBlack1(); int var = _pMovie; - DrawRect(4, 17, 228, 161, 0); - PlayMovie(205); + drawRect(4, 17, 228, 161, 0); + playMovie(205); fadeToBlack1(); - DrawRect(4, 17, 228, 161, 0); - PlayMovie(199); + drawRect(4, 17, 228, 161, 0); + playMovie(199); fadeToBlack1(); - DrawRect(4, 17, 228, 161, 0); - DrawHelpScreen(); + drawRect(4, 17, 228, 161, 0); + drawHelpScreen(); _pMovie = var; } break; @@ -482,15 +482,15 @@ void KingdomGame::gameHelp() { case 0x43B: case 0x43C: case 0x44F: - GameHelp_Sub43C(); + gameHelp_Sub43C(); return; } if (_userInput > 0x427 && _userInput < 0x43A) - FShowPic(130 + _userInput - 0x428); + fShowPic(130 + _userInput - 0x428); if (_userInput == 0x260) { - DrawInventory(); + drawInventory(); if (_nodes[68] == 1 || _nodes[29] == 1) _currMap = 10; else @@ -501,7 +501,7 @@ void KingdomGame::gameHelp() { } void KingdomGame::LoadKingArt() { - LoadAResource(0x97); + loadAResource(0x97); Common::SeekableReadStream *kingartStream = _rezPointers[0x97]; int val = kingartStream->readUint32LE(); int size = val / 4; @@ -526,7 +526,7 @@ void KingdomGame::LoadKingArt() { delete[] kingartIdx; } -void KingdomGame::LoadAResource(int reznum) { +void KingdomGame::loadAResource(int reznum) { Common::String path = Common::String(_rezNames[reznum]); path.toUppercase(); @@ -545,17 +545,17 @@ void KingdomGame::LoadAResource(int reznum) { } } -void KingdomGame::ReleaseAResource(int reznum) { +void KingdomGame::releaseAResource(int reznum) { if (_rezSize[reznum]) { delete _rezPointers[reznum]; _rezSize[reznum] = 0; } } -void KingdomGame::ShowPic(int reznum) { +void KingdomGame::showPic(int reznum) { EraseCursor(); - LoadAResource(reznum); + loadAResource(reznum); Image::IFFDecoder decoder; if (!decoder.loadStream(*_rezPointers[reznum])) return; @@ -579,38 +579,38 @@ void KingdomGame::ShowPic(int reznum) { g_system->unlockScreen(); g_system->updateScreen(); - ReleaseAResource(reznum); + releaseAResource(reznum); } -void KingdomGame::FShowPic(int reznum) { +void KingdomGame::fShowPic(int reznum) { EraseCursor(); fadeToBlack1(); - DrawRect(4, 17, 228, 161, 0); - ShowPic(reznum); + drawRect(4, 17, 228, 161, 0); + showPic(reznum); } -void KingdomGame::InitCursor() { - InitMouse(); +void KingdomGame::initCursor() { + initMouse(); SetCursor(0x19C / 4); _cursorDrawn = false; DrawCursor(); } -void KingdomGame::InitMouse() { +void KingdomGame::initMouse() { // No implementation required } -void KingdomGame::SetMouse() { +void KingdomGame::setMouse() { g_system->warpMouse(272, 157); _cursorX = 272; _cursorY = 157; } -void KingdomGame::InitMPlayer() { +void KingdomGame::initMPlayer() { debug("STUB: InitMPlayer"); } -void KingdomGame::PlayMovie(int movieNum) { +void KingdomGame::playMovie(int movieNum) { debug("STUB: PlayMovie"); if (movieNum == 1 || movieNum == 3 || movieNum == 54 || movieNum == 198 || movieNum == 200 || movieNum == 206) @@ -631,13 +631,13 @@ void KingdomGame::PlayMovie(int movieNum) { _iconSel = _iconSelect; _iconsClosed = true; CheckMainScreen(); - SetMouse(); + setMouse(); _oldCursorX = _cursorX; _oldCursorY = _cursorY; } _pMovie = movieNum; - ReadMouse(); + readMouse(); _mouseButton = 0; _keyActive = false; const char *path = _movieNames[movieNum]; @@ -671,7 +671,7 @@ void KingdomGame::PlayMovie(int movieNum) { } } -void KingdomGame::EnAll() { +void KingdomGame::enAll() { _help = true; _eye = true; _replay = true; @@ -679,7 +679,7 @@ void KingdomGame::EnAll() { _fstFwd = true; } -void KingdomGame::DsAll() { +void KingdomGame::dsAll() { _help = false; _eye = false; _replay = false; @@ -687,7 +687,7 @@ void KingdomGame::DsAll() { _fstFwd = false; } -void KingdomGame::SaveAS() { +void KingdomGame::saveAS() { byte palette[256 * 3]; delete[] _asPtr; _asPtr = new byte[224 * 146 + 768]; @@ -708,7 +708,7 @@ void KingdomGame::SaveAS() { g_system->updateScreen(); } -void KingdomGame::RestoreAS() { +void KingdomGame::restoreAS() { byte palette[256 * 3]; for (uint i = 0; i < 768; i++) palette[i] = _asPtr[224 * 146 + i]; @@ -739,7 +739,7 @@ void KingdomGame::SwitchAS() { _iconsClosed = _oldIconsClosed; } -void KingdomGame::DrawHelpScreen() { +void KingdomGame::drawHelpScreen() { int picNum; switch(_health) { @@ -767,10 +767,10 @@ void KingdomGame::DrawHelpScreen() { if (_noMusic) picNum += 6; - ShowPic(picNum); + showPic(picNum); } -void KingdomGame::DrawRect(uint minX, uint minY, uint maxX, uint maxY, int color) { +void KingdomGame::drawRect(uint minX, uint minY, uint maxX, uint maxY, int color) { ::Graphics::Surface *screen = g_system->lockScreen(); for (uint curX = minX; curX < maxX; curX++) { for (uint curY = minY; curY < maxY; curY++) { @@ -782,8 +782,8 @@ void KingdomGame::DrawRect(uint minX, uint minY, uint maxX, uint maxY, int color g_system->updateScreen(); } -void KingdomGame::DrawInventory() { - FShowPic(108); +void KingdomGame::drawInventory() { + fShowPic(108); if (_nodes[29] == 1 || _nodes[68] == 1 || _itemInhibit) return; @@ -925,7 +925,7 @@ Common::Error KingdomGame::loadGameState(int slot) { delete[] _asPtr; _asPtr = nullptr; - PlaySound(_soundNumber); + playSound(_soundNumber); for (int i = 0; i < 7; i++) _iconPic[i] = 89 + i; @@ -944,10 +944,10 @@ Common::Error KingdomGame::loadGameState(int slot) { _treeEyePic = 0; _treeHGUPic = 0; _cursorDrawn = false; - ShowPic(106); + showPic(106); _gameMode = 0; _iconsClosed = false; - DrawRect(4, 17, 228, 161, 0); + drawRect(4, 17, 228, 161, 0); _userInput = 0x43E; _loopFlag = true; @@ -1067,14 +1067,14 @@ bool KingdomGame::readSavegameHeader(Common::InSaveFile *in, KingdomSavegameHead return true; } -void KingdomGame::PlaySound(int idx) { +void KingdomGame::playSound(int idx) { if (idx > 43 || _soundNumber == idx) return; // Stop Sound if (_mixer->isSoundHandleActive(_soundHandle)) { _mixer->stopHandle(_soundHandle); - ReleaseAResource(idx); + releaseAResource(idx); } _soundNumber = idx; @@ -1083,7 +1083,7 @@ void KingdomGame::PlaySound(int idx) { int realIdx = _soundNumber + 200; // Or +250, depending in the original on the sound card debug("PlaySound %d : %s", idx, _rezNames[realIdx]); - LoadAResource(realIdx); + loadAResource(realIdx); Common::SeekableReadStream *soundStream = _rezPointers[realIdx]; Audio::RewindableAudioStream *rewindableStream = Audio::makeRawStream(soundStream, 22050, Audio::FLAG_UNSIGNED | Audio::FLAG_LITTLE_ENDIAN, DisposeAfterUse::NO); @@ -1100,7 +1100,7 @@ void KingdomGame::EraseCursor() { CursorMan.showMouse(false); } -void KingdomGame::ReadMouse() { +void KingdomGame::readMouse() { _mouseButton = 0; Common::Event event; @@ -1157,7 +1157,7 @@ void KingdomGame::DrawLocation() { if (_daelonCntr > 0) _daelonCntr--; - PlaySound(0); + playSound(0); _iconsClosed = true; _tsIconOnly = false; _aTimer = 0; @@ -1165,7 +1165,7 @@ void KingdomGame::DrawLocation() { int emlValue = _emlTable[_nodeNum]; if (emlValue > 0) - EnAll(); + enAll(); if (!_mapEx || !emlValue || _resurrect) { if (_statPlay != 50) @@ -1173,8 +1173,8 @@ void KingdomGame::DrawLocation() { _iconsClosed = false; } else { _mapEx = false; - SaveAS(); - FShowPic(emlValue); + saveAS(); + fShowPic(emlValue); _bTimer = 16; while(_bTimer) { checkTimers(); @@ -1182,7 +1182,7 @@ void KingdomGame::DrawLocation() { CheckMainScreen(); } fadeToBlack1(); - DrawRect(4, 17, 228, 161, 0); + drawRect(4, 17, 228, 161, 0); _iconsClosed = false; _tsIconOnly = false; } @@ -1192,7 +1192,7 @@ void KingdomGame::ProcessMap(int mapNum, int zoom) { int var6 = _zoomTable[mapNum][zoom][0]; if (!_asMode) SwitchAtoM(); - FShowPic(var6); + fShowPic(var6); _currMap = _zoomTable[mapNum][zoom][1]; if (zoom > 0) @@ -1260,7 +1260,7 @@ void KingdomGame::InventoryAdd(int item) { void KingdomGame::DrawPic(int reznum) { EraseCursor(); - LoadAResource(reznum); + loadAResource(reznum); Image::IFFDecoder decoder; if (!decoder.loadStream(*_rezPointers[reznum])) @@ -1281,26 +1281,26 @@ void KingdomGame::DrawPic(int reznum) { g_system->unlockScreen(); g_system->updateScreen(); - ReleaseAResource(reznum); + releaseAResource(reznum); } void KingdomGame::DisplayIcon(int reznum) { - PlaySound(0); - PlaySound(30); - SaveAS(); - FShowPic(reznum); + playSound(0); + playSound(30); + saveAS(); + fShowPic(reznum); _bTimer = 76; - ReadMouse(); + readMouse(); while(_bTimer != 0 && _mouseButton == 0) { checkTimers(); RefreshSound(); - ReadMouse(); + readMouse(); } fadeToBlack1(); - DrawRect(4, 17, 228, 161, 0); - RestoreAS(); + drawRect(4, 17, 228, 161, 0); + restoreAS(); } void KingdomGame::SetATimer() { @@ -1321,8 +1321,8 @@ void KingdomGame::SetATimer() { if (_inventory[idx] > 0) { _aTimerFlag = false; _aTimer = _wizard ? 114 : 133; - PlaySound(0); - PlaySound(34); + playSound(0); + playSound(34); break; } } @@ -1610,7 +1610,7 @@ bool KingdomGame::ChkDesertObstacles() { void KingdomGame::SwitchAtoM() { _asMode = true; _asMap = _currMap; - SaveAS(); + saveAS(); _iconSel = 9; _oldTLS = _treeLeftSta; _oldTRS = _treeRightSta; @@ -1627,8 +1627,8 @@ void KingdomGame::SwitchAtoM() { void KingdomGame::SwitchMtoA() { SwitchAS(); fadeToBlack1(); - DrawRect(4, 17, 228, 161, 0); - RestoreAS(); + drawRect(4, 17, 228, 161, 0); + restoreAS(); } void KingdomGame::DrawIcon(int x, int y, int index) { @@ -1717,7 +1717,7 @@ int KingdomGame::WaitKey() { } void KingdomGame::DrawCursor() { - ReadMouse(); + readMouse(); CursorType(); SetCursor(_cursorDef); diff --git a/engines/kingdom/kingdom.h b/engines/kingdom/kingdom.h index d28c3035303..11915ae39a8 100644 --- a/engines/kingdom/kingdom.h +++ b/engines/kingdom/kingdom.h @@ -225,25 +225,25 @@ namespace Kingdom { void GPLogic3(); void GPLogic4(); void GPLogic4_SP901(); - void LoadAResource(int reznum); - void ReleaseAResource(int reznum); - void ShowPic(int reznum); - void FShowPic(int reznum); - void InitCursor(); - void InitMouse(); - void SetMouse(); - void ReadMouse(); - void InitMPlayer(); - void PlayMovie(int movieNum); - void EnAll(); - void DsAll(); - void SaveAS(); - void RestoreAS(); - void DrawHelpScreen(); - void DrawRect(uint v1, uint v2, uint v3, uint v4, int v5); - void DrawInventory(); - void GameHelp_Sub43C(); - void PlaySound(int v1); + void loadAResource(int reznum); + void releaseAResource(int reznum); + void showPic(int reznum); + void fShowPic(int reznum); + void initCursor(); + void initMouse(); + void setMouse(); + void readMouse(); + void initMPlayer(); + void playMovie(int movieNum); + void enAll(); // TODO: Rename later as enableAll + void dsAll(); // TODO: Rename later as disableAll + void saveAS(); // TODO: Rename later as saveVideoBackground + void restoreAS(); // TODO: Rename later as restoreVideoBackground + void drawHelpScreen(); + void drawRect(uint minX, uint minY, uint maxX, uint maxY, int color); + void drawInventory(); + void gameHelp_Sub43C(); + void playSound(int idx); void EraseCursor(); void GetUserInput(); void EraseCursorAsm();