[Scummvm-cvs-logs] SF.net SVN: scummvm:[35523] scummvm/trunk/engines/saga
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Wed Dec 24 10:59:19 CET 2008
Revision: 35523
http://scummvm.svn.sourceforge.net/scummvm/?rev=35523&view=rev
Author: thebluegr
Date: 2008-12-24 09:59:18 +0000 (Wed, 24 Dec 2008)
Log Message:
-----------
Slight cleanup
Modified Paths:
--------------
scummvm/trunk/engines/saga/interface.cpp
scummvm/trunk/engines/saga/render.cpp
scummvm/trunk/engines/saga/scene.h
Modified: scummvm/trunk/engines/saga/interface.cpp
===================================================================
--- scummvm/trunk/engines/saga/interface.cpp 2008-12-24 09:53:00 UTC (rev 35522)
+++ scummvm/trunk/engines/saga/interface.cpp 2008-12-24 09:59:18 UTC (rev 35523)
@@ -654,7 +654,7 @@
switch (ascii) {
case 'x':
setMode(kPanelMain);
- if (_vm->getGameId() == GID_ITE && _vm->_puzzle->isActive())
+ if (_vm->_scene->isITEPuzzleScene())
_vm->_puzzle->exitPuzzle();
break;
@@ -670,15 +670,12 @@
case '2':
case '3':
case '4':
- converseSetPos(ascii);
- break;
case '5':
case '6':
case '7':
case '8':
case '9':
- if (_vm->getGameId() == GID_IHNM)
- converseSetPos(ascii);
+ converseSetPos(ascii);
break;
}
break;
@@ -736,15 +733,13 @@
}
void Interface::setStatusText(const char *text, int statusColor) {
+ if (_vm->getGameId() == GID_IHNM) {
+ // Don't show the status text for the IHNM chapter selection screens (chapter 8), or
+ // scene 0 (IHNM demo introduction)
+ if (_vm->_scene->currentChapterNumber() == 8 || _vm->_scene->currentSceneNumber() == 0)
+ return;
+ }
- // Disable the status text in IHNM when the chapter is 8
- if (_vm->getGameId() == GID_IHNM && !(_vm->getFeatures() & GF_IHNM_DEMO) && _vm->_scene->currentChapterNumber() == 8)
- return;
-
- // Disable the status text in the introduction of the IHNM demo
- if (_vm->getFeatures() & GF_IHNM_DEMO && _vm->_scene->currentSceneNumber() == 0)
- return;
-
assert(text != NULL);
assert(strlen(text) < STATUS_TEXT_LEN);
@@ -1743,7 +1738,7 @@
converseChangePos(1);
}
- if (_vm->getGameId() == GID_ITE && _vm->_puzzle->isActive()) {
+ if (_vm->_scene->isITEPuzzleScene()) {
_vm->_puzzle->handleClick(mousePoint);
}
}
@@ -2624,7 +2619,7 @@
_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);
_conversePos = -1;
Modified: scummvm/trunk/engines/saga/render.cpp
===================================================================
--- scummvm/trunk/engines/saga/render.cpp 2008-12-24 09:53:00 UTC (rev 35522)
+++ scummvm/trunk/engines/saga/render.cpp 2008-12-24 09:59:18 UTC (rev 35523)
@@ -104,7 +104,7 @@
if (!(_flags & RF_DISABLE_ACTORS) || _vm->getGameId() == GID_ITE)
_vm->_scene->draw();
- if (_vm->getGameId() == GID_ITE && _vm->_puzzle->isActive()) {
+ if (_vm->_scene->isITEPuzzleScene()) {
_vm->_puzzle->movePiece(mousePoint);
_vm->_actor->drawSpeech();
} else {
Modified: scummvm/trunk/engines/saga/scene.h
===================================================================
--- scummvm/trunk/engines/saga/scene.h 2008-12-24 09:53:00 UTC (rev 35522)
+++ scummvm/trunk/engines/saga/scene.h 2008-12-24 09:59:18 UTC (rev 35523)
@@ -32,6 +32,7 @@
#include "saga/list.h"
#include "saga/actor.h"
#include "saga/interface.h"
+#include "saga/puzzle.h"
namespace Saga {
@@ -348,10 +349,7 @@
void setChapterPointsChanged(bool cp) { _chapterPointsChanged = cp; }
void cutawaySkip() {
- if (_vm->_scene->isInIntro())
- _vm->_framesEsc = 2;
- else
- _vm->_framesEsc = 1;
+ _vm->_framesEsc = _vm->_scene->isInIntro() ? 2 : 1;
}
void drawTextList();
@@ -372,6 +370,10 @@
return _vm->getFeatures() & GF_IHNM_DEMO && (_sceneNumber >= 144 && _sceneNumber <= 149);
}
+ bool isITEPuzzleScene() {
+ return _vm->getGameId() == GID_ITE && _vm->_puzzle->isActive();
+ }
+
private:
void loadScene(LoadSceneParams *loadSceneParams);
void loadSceneDescriptor(uint32 resourceId);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list