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

Slight cleanup

Browse source 
svn-id: r35523
This commit is contained in:
Filippos Karapetis 2008-12-24 09:59:18 +00:00
parent 41ebd732f5
commit c2c439b53d
3 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

21
engines/saga/interface.cpp
View file

@ -654,7 +654,7 @@ bool Interface::processAscii(Common::KeyState keystate) {
switch (ascii) { switch (ascii) {
case 'x': case 'x':
setMode(kPanelMain); setMode(kPanelMain);
if (_vm->getGameId() == GID_ITE && _vm->_puzzle->isActive()) if (_vm->_scene->isITEPuzzleScene())
_vm->_puzzle->exitPuzzle(); _vm->_puzzle->exitPuzzle();
break; break;
@ -670,14 +670,11 @@ bool Interface::processAscii(Common::KeyState keystate) {
case '2': case '2':
case '3': case '3':
case '4': case '4':
converseSetPos(ascii);
break;
case '5': case '5':
case '6': case '6':
case '7': case '7':
case '8': case '8':
case '9': case '9':
if (_vm->getGameId() == GID_IHNM)
converseSetPos(ascii); converseSetPos(ascii);
break; break;
} }
@ -736,14 +733,12 @@ bool Interface::processAscii(Common::KeyState keystate) {
} }
void Interface::setStatusText(const char *text, int statusColor) { void Interface::setStatusText(const char *text, int statusColor) {
if (_vm->getGameId() == GID_IHNM) {
// Disable the status text in IHNM when the chapter is 8 // Don't show the status text for the IHNM chapter selection screens (chapter 8), or
if (_vm->getGameId() == GID_IHNM && !(_vm->getFeatures() & GF_IHNM_DEMO) && _vm->_scene->currentChapterNumber() == 8) // scene 0 (IHNM demo introduction)
return; if (_vm->_scene->currentChapterNumber() == 8 || _vm->_scene->currentSceneNumber() == 0)
// Disable the status text in the introduction of the IHNM demo
if (_vm->getFeatures() & GF_IHNM_DEMO && _vm->_scene->currentSceneNumber() == 0)
return; return;
}
assert(text != NULL); assert(text != NULL);
assert(strlen(text) < STATUS_TEXT_LEN); assert(strlen(text) < STATUS_TEXT_LEN);
@ -1743,7 +1738,7 @@ void Interface::update(const Point& mousePoint, int updateFlag) {
converseChangePos(1); converseChangePos(1);
} }
if (_vm->getGameId() == GID_ITE && _vm->_puzzle->isActive()) { if (_vm->_scene->isITEPuzzleScene()) {
_vm->_puzzle->handleClick(mousePoint); _vm->_puzzle->handleClick(mousePoint);
} }
} }
@ -2624,7 +2619,7 @@ void Interface::converseSetPos(int key) {
_vm->_script->finishDialog(ct->strId, ct->replyId, ct->replyFlags, ct->replyBit); _vm->_script->finishDialog(ct->strId, ct->replyId, ct->replyFlags, ct->replyBit);
if (_vm->getGameId() == GID_ITE && _vm->_puzzle->isActive()) if (_vm->_scene->isITEPuzzleScene())
_vm->_puzzle->handleReply(ct->replyId); _vm->_puzzle->handleReply(ct->replyId);
_conversePos = -1; _conversePos = -1;

2
engines/saga/render.cpp
View file

@ -104,7 +104,7 @@ void Render::drawScene() {
if (!(_flags & RF_DISABLE_ACTORS) || _vm->getGameId() == GID_ITE) if (!(_flags & RF_DISABLE_ACTORS) || _vm->getGameId() == GID_ITE)
_vm->_scene->draw(); _vm->_scene->draw();
if (_vm->getGameId() == GID_ITE && _vm->_puzzle->isActive()) { if (_vm->_scene->isITEPuzzleScene()) {
_vm->_puzzle->movePiece(mousePoint); _vm->_puzzle->movePiece(mousePoint);
_vm->_actor->drawSpeech(); _vm->_actor->drawSpeech();
} else { } else {

10
engines/saga/scene.h
View file

@ -32,6 +32,7 @@
#include "saga/list.h" #include "saga/list.h"
#include "saga/actor.h" #include "saga/actor.h"
#include "saga/interface.h" #include "saga/interface.h"
#include "saga/puzzle.h"
namespace Saga { namespace Saga {
@ -348,10 +349,7 @@ class Scene {
void setChapterPointsChanged(bool cp) { _chapterPointsChanged = cp; } void setChapterPointsChanged(bool cp) { _chapterPointsChanged = cp; }
void cutawaySkip() { void cutawaySkip() {
if (_vm->_scene->isInIntro()) _vm->_framesEsc = _vm->_scene->isInIntro() ? 2 : 1;
_vm->_framesEsc = 2;
else
_vm->_framesEsc = 1;
} }
void drawTextList(); void drawTextList();
@ -372,6 +370,10 @@ class Scene {
return _vm->getFeatures() & GF_IHNM_DEMO && (_sceneNumber >= 144 && _sceneNumber <= 149); return _vm->getFeatures() & GF_IHNM_DEMO && (_sceneNumber >= 144 && _sceneNumber <= 149);
} }
bool isITEPuzzleScene() {
return _vm->getGameId() == GID_ITE && _vm->_puzzle->isActive();
}
private: private:
void loadScene(LoadSceneParams *loadSceneParams); void loadScene(LoadSceneParams *loadSceneParams);
void loadSceneDescriptor(uint32 resourceId); void loadSceneDescriptor(uint32 resourceId);