diff options
| author | Paul Gilbert | 2014-04-20 21:32:29 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-04-20 21:32:29 -0400 |
| commit | f0ce06f0e9e0ebcf21368fdf01856a026dd4d2fb (patch) | |
| tree | 54cb948eebde8e866dcad5686a11068b4a970e45 /engines/mads/nebular | |
| parent | 254519296e87e8a6b29305b91c045446b1421d19 (diff) | |
| download | scummvm-rg350-f0ce06f0e9e0ebcf21368fdf01856a026dd4d2fb.tar.gz scummvm-rg350-f0ce06f0e9e0ebcf21368fdf01856a026dd4d2fb.tar.bz2 scummvm-rg350-f0ce06f0e9e0ebcf21368fdf01856a026dd4d2fb.zip | |
MADS: Implemented display of conversation topics
Diffstat (limited to 'engines/mads/nebular')
| -rw-r--r-- | engines/mads/nebular/nebular_scenes2.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp index 22c7062446..37e7aaab20 100644 --- a/engines/mads/nebular/nebular_scenes2.cpp +++ b/engines/mads/nebular/nebular_scenes2.cpp @@ -3835,22 +3835,22 @@ void Scene210::enter() { 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, 0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0); - userInterface.initConversation(&_conv1, 0x2E, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0); + _conv1.setup(0x2E, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0); if (!_game._visitedScenes._sceneRevisited) { - warning("TODO: sub71B18(0x2E, 0xB4, 0xB5, 0xB6, 0xB8, 0);"); + _conv1.set(0x2E, 0xB4, 0xB5, 0xB6, 0xB8, 0); - warning("TODO: if (Debugger_widepipe_ctr >= 2)"); - warning("TODO: \tsub71B9E(&dialog1, 0xB7, -1);"); + if (_game._widepipeCtr >= 2) + _conv1.write(0xB7, -1); } bool sceneRevisited = _game._visitedScenes._sceneRevisited; - userInterface.initConversation(&_conv2, 0x2F, 0xBC, 0xBB, 0xBD, (int)!sceneRevisited); - userInterface.initConversation(&_conv3, 0x30, 0xC3, 0xC2, 0xC1, 0xC4, (int)!sceneRevisited); - userInterface.initConversation(&_conv5, 0x31, 0xCD, 0xCC, 0xCE, 0xCF, (int)!sceneRevisited); - userInterface.initConversation(&_conv6, 0x32, 0xD3, 0xD4, 0xD5, (int)!sceneRevisited); - userInterface.initConversation(&_conv7, 0x33, 0xD8, 0xDA, 0xD9, 0xDB, 0xDC, (int)!sceneRevisited); - userInterface.initConversation(&_conv8, 0x34, 0xDF, 0xE0, 0xE1, 0xE2, 0xE3, (int)!sceneRevisited); + _conv2.setup(0x2F, 0xBC, 0xBB, 0xBD, (int)!sceneRevisited); + _conv3.setup(0x30, 0xC3, 0xC2, 0xC1, 0xC4, (int)!sceneRevisited); + _conv5.setup(0x31, 0xCD, 0xCC, 0xCE, 0xCF, (int)!sceneRevisited); + _conv6.setup(0x32, 0xD3, 0xD4, 0xD5, (int)!sceneRevisited); + _conv7.setup(0x33, 0xD8, 0xDA, 0xD9, 0xDB, 0xDC, (int)!sceneRevisited); + _conv8.setup(0x34, 0xDF, 0xE0, 0xE1, 0xE2, 0xE3, (int)!sceneRevisited); _twinkleAnimationType = 0; _twinklesCurrentFrame = 0; @@ -4144,7 +4144,7 @@ void Scene210::actions() { if (_globals[kTwinklesApproached] < 2) _globals[kTwinklesApproached]++; - userInterface.startConversation(&_conv1); + _conv1.start(); _curDialogNode = 1; break; } |