[Scummvm-cvs-logs] scummvm master -> 75b5753b618c379f97132c43f73cee8c0be85e81
Strangerke
Strangerke at scummvm.org
Sun Mar 24 15:38:07 CET 2013
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
1952a47787 HOPKINS: Add clearAll() to EventsManager
75b5753b61 HOPKINS: Remove an unused Catalog mode
Commit: 1952a47787d868d4091d8a26f3aad6c000625a27
https://github.com/scummvm/scummvm/commit/1952a47787d868d4091d8a26f3aad6c000625a27
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-03-24T07:31:59-07:00
Commit Message:
HOPKINS: Add clearAll() to EventsManager
Changed paths:
engines/hopkins/events.cpp
engines/hopkins/events.h
engines/hopkins/globals.cpp
diff --git a/engines/hopkins/events.cpp b/engines/hopkins/events.cpp
index 50b2850..66692da 100644
--- a/engines/hopkins/events.cpp
+++ b/engines/hopkins/events.cpp
@@ -51,7 +51,7 @@ EventsManager::EventsManager(HopkinsEngine *vm) {
_gameKey = KEY_NONE;
_mouseCursorId = 0;
_oldIconId = 0;
- _objectBuf = NULL;
+ _objectBuf = g_PTRNUL;
Common::fill(&_keyState[0], &_keyState[256], false);
_priorCounterTime = 0;
@@ -63,6 +63,11 @@ EventsManager::~EventsManager() {
_vm->_globals->freeMemory(_mouseCursor);
}
+void EventsManager::clearAll() {
+ _objectBuf = _vm->_globals->freeMemory(_objectBuf);
+ _objectBuf = _vm->_globals->allocMemory(2500);
+}
+
void EventsManager::initMouseData() {
if (_vm->getPlatform() == Common::kPlatformLinux)
_mouseLinuxFl = true;
diff --git a/engines/hopkins/events.h b/engines/hopkins/events.h
index da07817..265cf53 100644
--- a/engines/hopkins/events.h
+++ b/engines/hopkins/events.h
@@ -71,6 +71,7 @@ public:
EventsManager(HopkinsEngine *vm);
~EventsManager();
+ void clearAll();
void initMouseData();
void delay(int totalMilli);
@@ -85,7 +86,6 @@ public:
void mouseOn();
void mouseOff();
void setMouseOn();
-
void refreshScreenAndEvents();
};
diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp
index 6d48599..940e18a 100644
--- a/engines/hopkins/globals.cpp
+++ b/engines/hopkins/globals.cpp
@@ -238,7 +238,6 @@ void Globals::clearAll() {
initVBob();
_objectDataBuf = g_PTRNUL;
_curObjectFileNum = 0;
- _vm->_eventsManager->_objectBuf = g_PTRNUL;
_vm->_dialogsManager->clearAll();
_answerBuffer = g_PTRNUL;
SPRITE_ECRAN = g_PTRNUL;
@@ -253,7 +252,7 @@ void Globals::clearAll() {
_boxWidth = 240;
- _vm->_eventsManager->_objectBuf = allocMemory(2500);
+ _vm->_eventsManager->clearAll();
_objectDataBuf = g_PTRNUL;
}
Commit: 75b5753b618c379f97132c43f73cee8c0be85e81
https://github.com/scummvm/scummvm/commit/75b5753b618c379f97132c43f73cee8c0be85e81
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-03-24T07:36:32-07:00
Commit Message:
HOPKINS: Remove an unused Catalog mode
Changed paths:
engines/hopkins/events.cpp
engines/hopkins/files.cpp
engines/hopkins/files.h
diff --git a/engines/hopkins/events.cpp b/engines/hopkins/events.cpp
index 66692da..8e25539 100644
--- a/engines/hopkins/events.cpp
+++ b/engines/hopkins/events.cpp
@@ -64,7 +64,7 @@ EventsManager::~EventsManager() {
}
void EventsManager::clearAll() {
- _objectBuf = _vm->_globals->freeMemory(_objectBuf);
+ _vm->_globals->freeMemory(_objectBuf);
_objectBuf = _vm->_globals->allocMemory(2500);
}
diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 42521bd..78ff7b2 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -126,14 +126,6 @@ byte *FileManager::searchCat(const Common::String &file, CatMode mode) {
secondaryFilename = "RES_LIN.RES";
break;
- case RES_ANI:
- if (!f.exists("RES_ANI.CAT"))
- return g_PTRNUL;
-
- ptr = loadFile("RES_ANI.CAT");
- secondaryFilename = "RES_ANI.RES";
- break;
-
case RES_PER:
if (!f.exists("RES_PER.CAT"))
return g_PTRNUL;
diff --git a/engines/hopkins/files.h b/engines/hopkins/files.h
index f669106..145c267 100644
--- a/engines/hopkins/files.h
+++ b/engines/hopkins/files.h
@@ -32,10 +32,9 @@ namespace Hopkins {
class HopkinsEngine;
-// CHECKME: RES_ANI looks unused
-enum CatMode { RES_INI = 1, RES_REP = 2, RES_LIN = 3, RES_ANI = 4,
- RES_PER = 5, RES_PIC = 6, RES_SAN = 7, RES_SLI = 8,
- RES_VOI = 9 };
+// RES_ANI = 4 has been removed because it's not used
+enum CatMode { RES_INI = 1, RES_REP = 2, RES_LIN = 3, RES_PER = 5,
+ RES_PIC = 6, RES_SAN = 7, RES_SLI = 8, RES_VOI = 9 };
class FileManager {
public:
More information about the Scummvm-git-logs
mailing list