[Scummvm-git-logs] scummvm master -> e143d5ef4855864f9ef606ccffc1e280226bf5e5
dreammaster
dreammaster at scummvm.org
Tue Aug 30 02:55:14 CEST 2016
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:
e143d5ef48 TITANIC: Further code cleanup, identified game mode 5
Commit: e143d5ef4855864f9ef606ccffc1e280226bf5e5
https://github.com/scummvm/scummvm/commit/e143d5ef4855864f9ef606ccffc1e280226bf5e5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-08-29T20:55:04-04:00
Commit Message:
TITANIC: Further code cleanup, identified game mode 5
Changed paths:
engines/titanic/game/wheel_button.cpp
engines/titanic/game/wheel_button.h
engines/titanic/game_state.h
engines/titanic/main_game_window.cpp
engines/titanic/support/files_manager.cpp
engines/titanic/support/files_manager.h
engines/titanic/true_talk/title_engine.cpp
engines/titanic/true_talk/title_engine.h
diff --git a/engines/titanic/game/wheel_button.cpp b/engines/titanic/game/wheel_button.cpp
index d4a9f44..730a5d9 100644
--- a/engines/titanic/game/wheel_button.cpp
+++ b/engines/titanic/game/wheel_button.cpp
@@ -31,7 +31,7 @@ BEGIN_MESSAGE_MAP(CWheelButton, CBackground)
END_MESSAGE_MAP()
CWheelButton::CWheelButton() : CBackground(),
- _fieldE0(0), _timerId(0), _fieldE8(0) {
+ _fieldE0(false), _timerId(0), _fieldE8(0) {
}
void CWheelButton::save(SimpleFile *file, int indent) {
diff --git a/engines/titanic/game/wheel_button.h b/engines/titanic/game/wheel_button.h
index 097b686..2725e60 100644
--- a/engines/titanic/game/wheel_button.h
+++ b/engines/titanic/game/wheel_button.h
@@ -33,7 +33,7 @@ class CWheelButton : public CBackground {
bool TimerMsg(CTimerMsg *msg);
bool LeaveViewMsg(CLeaveViewMsg *msg);
public:
- int _fieldE0;
+ bool _fieldE0;
int _timerId;
int _fieldE8;
public:
diff --git a/engines/titanic/game_state.h b/engines/titanic/game_state.h
index 0fe47ab..70d47b5 100644
--- a/engines/titanic/game_state.h
+++ b/engines/titanic/game_state.h
@@ -35,7 +35,7 @@ class CGameManager;
enum GameStateMode {
GSMODE_NONE = 0, GSMODE_INTERACTIVE = 1, GSMODE_CUTSCENE = 2,
- GSMODE_3 = 3, GSMODE_4 = 4, GSMODE_5 = 5, GSMODE_PENDING_LOAD = 6
+ GSMODE_3 = 3, GSMODE_4 = 4, GSMODE_INSERT_CD = 5, GSMODE_PENDING_LOAD = 6
};
enum Season {
diff --git a/engines/titanic/main_game_window.cpp b/engines/titanic/main_game_window.cpp
index 9a6437e..690acdc 100644
--- a/engines/titanic/main_game_window.cpp
+++ b/engines/titanic/main_game_window.cpp
@@ -82,8 +82,6 @@ void CMainGameWindow::applicationStarting() {
_inputAllowed = true;
_gameManager->_gameState.setMode(GSMODE_INTERACTIVE);
- // TODO: Cursor/image
-
// Generate starting messages for entering the view, node, and room.
// Note the old fields are nullptr, since there's no previous view/node/room
CViewItem *view = _gameManager->_gameState._gameLocation.getView();
@@ -162,8 +160,9 @@ void CMainGameWindow::draw() {
scrManager->drawCursors();
break;
- case GSMODE_5:
- g_vm->_filesManager->debug(scrManager);
+ case GSMODE_INSERT_CD:
+ scrManager->drawCursors();
+ _vm->_filesManager->insertCD(scrManager);
break;
case GSMODE_PENDING_LOAD:
@@ -221,7 +220,7 @@ void CMainGameWindow::drawViewContents(CScreenManager *screenManager) {
}
void CMainGameWindow::mouseChanged() {
- if (_gameManager->_gameState._mode != GSMODE_5)
+ if (_gameManager->_gameState._mode != GSMODE_INSERT_CD)
_gameManager->update();
}
diff --git a/engines/titanic/support/files_manager.cpp b/engines/titanic/support/files_manager.cpp
index 89e0a1d..2d16c8f 100644
--- a/engines/titanic/support/files_manager.cpp
+++ b/engines/titanic/support/files_manager.cpp
@@ -104,8 +104,9 @@ void CFilesManager::loadDrive() {
resetView();
}
-void CFilesManager::debug(CScreenManager *screenManager) {
- warning("TODO: CFilesManager::debug");
+void CFilesManager::insertCD(CScreenManager *screenManager) {
+ // We not support running game directly from the original CDs,
+ // so this method can remain stubbed
}
void CFilesManager::resetView() {
diff --git a/engines/titanic/support/files_manager.h b/engines/titanic/support/files_manager.h
index ec0c7fc..454a72d 100644
--- a/engines/titanic/support/files_manager.h
+++ b/engines/titanic/support/files_manager.h
@@ -84,7 +84,10 @@ public:
*/
void loadDrive();
- void debug(CScreenManager *screenManager);
+ /**
+ * Shows a dialog for inserting a new CD
+ */
+ void insertCD(CScreenManager *screenManager);
/**
* Resets the view being displayed
diff --git a/engines/titanic/true_talk/title_engine.cpp b/engines/titanic/true_talk/title_engine.cpp
index 4dd45ba..363cc34 100644
--- a/engines/titanic/true_talk/title_engine.cpp
+++ b/engines/titanic/true_talk/title_engine.cpp
@@ -66,10 +66,6 @@ int STtitleEngine::setResponse(TTscriptBase *script, TTresponse *response) {
return 0;
}
-void STtitleEngine::dump(int val1, int val2) {
- // TODO
-}
-
SimpleFile *STtitleEngine::open(const CString &name) {
Common::SeekableReadStream *stream = g_vm->_filesManager->getResource(
CString::format("TEXT/%s", name.c_str()));
diff --git a/engines/titanic/true_talk/title_engine.h b/engines/titanic/true_talk/title_engine.h
index afd2d3b..a980e52 100644
--- a/engines/titanic/true_talk/title_engine.h
+++ b/engines/titanic/true_talk/title_engine.h
@@ -57,12 +57,6 @@ public:
* Sets a conversation reponse
*/
virtual int setResponse(TTscriptBase *script, TTresponse *response) { return SS_4; }
-
- virtual int proc4(int unused) const = 0;
- virtual int proc5(int64 unused) const = 0;
- virtual int proc6(int64 unused) const = 0;
- virtual int proc7(int64 unused) const = 0;
- virtual int proc8() const = 0;
/**
* Open a designated file
@@ -94,14 +88,6 @@ public:
*/
virtual int setResponse(TTscriptBase *script, TTresponse *response);
- virtual void dump(int val1, int val2);
-
- virtual int proc4(int unused) const { return 0; }
- virtual int proc5(int64 unused) const { return 0; }
- virtual int proc6(int64 unused) const { return 0; }
- virtual int proc7(int64 unused) const { return 0; }
- virtual int proc8() const { return 0; }
-
/**
* Open a designated file
*/
More information about the Scummvm-git-logs
mailing list