[Scummvm-cvs-logs] scummvm master -> ac6cf328a91c393969593ff5cc6d89dcc6188eab
Strangerke
Strangerke at scummvm.org
Wed Jun 1 01:07:35 CEST 2016
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
db17866bea MOHAWK: Initialize some variables
f01978c675 MOHAWK: Remove a useless structure
7aa4c32dd4 MOHAWK: Change several variables to boolean
ac6cf328a9 MOHAWK: Remove yet another useless variable
Commit: db17866bea3b1f095af754085082eb1ee22edf63
https://github.com/scummvm/scummvm/commit/db17866bea3b1f095af754085082eb1ee22edf63
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-06-01T00:49:47+02:00
Commit Message:
MOHAWK: Initialize some variables
Changed paths:
engines/mohawk/view.cpp
diff --git a/engines/mohawk/view.cpp b/engines/mohawk/view.cpp
index e001e89..a854796 100644
--- a/engines/mohawk/view.cpp
+++ b/engines/mohawk/view.cpp
@@ -337,6 +337,18 @@ View::View(MohawkEngine *vm) : _vm(vm) {
_compoundSHAPGroups[i] = 0;
}
_numSCRBGroups = 0;
+
+ _lastIdleTime = 0;
+ _needsUpdate = false;
+ _gfx = nullptr;
+ _rootNode = nullptr;
+ _cursorNode = nullptr;
+
+ for (int i = 0; i < 17; i++) {
+ _syncChannels[i].masterId = 0;
+ _syncChannels[i].state = 0;
+ _syncChannels[i].alternate = false;
+ }
}
View::~View() {
Commit: f01978c6750ce45d43d7a788a6ef29dc76385711
https://github.com/scummvm/scummvm/commit/f01978c6750ce45d43d7a788a6ef29dc76385711
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-06-01T00:51:51+02:00
Commit Message:
MOHAWK: Remove a useless structure
Changed paths:
engines/mohawk/view.cpp
engines/mohawk/view.h
diff --git a/engines/mohawk/view.cpp b/engines/mohawk/view.cpp
index a854796..63e4f84 100644
--- a/engines/mohawk/view.cpp
+++ b/engines/mohawk/view.cpp
@@ -343,12 +343,6 @@ View::View(MohawkEngine *vm) : _vm(vm) {
_gfx = nullptr;
_rootNode = nullptr;
_cursorNode = nullptr;
-
- for (int i = 0; i < 17; i++) {
- _syncChannels[i].masterId = 0;
- _syncChannels[i].state = 0;
- _syncChannels[i].alternate = false;
- }
}
View::~View() {
diff --git a/engines/mohawk/view.h b/engines/mohawk/view.h
index 47853f0..8bf4701 100644
--- a/engines/mohawk/view.h
+++ b/engines/mohawk/view.h
@@ -192,13 +192,6 @@ protected:
void finishResetFeatureScript();
};
-#define NUM_SYNC_CHANNELS 17
-struct SyncChannel {
- uint16 masterId;
- byte state;
- bool alternate;
-};
-
class View {
public:
View(MohawkEngine *vm);
@@ -234,7 +227,6 @@ public:
void sortView();
uint32 _lastIdleTime;
- SyncChannel _syncChannels[NUM_SYNC_CHANNELS];
virtual uint32 getTime() = 0;
Commit: 7aa4c32dd450d7fe83098bbac626ad2fbfb06828
https://github.com/scummvm/scummvm/commit/7aa4c32dd450d7fe83098bbac626ad2fbfb06828
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-06-01T00:56:54+02:00
Commit Message:
MOHAWK: Change several variables to boolean
Changed paths:
engines/mohawk/cstime_view.cpp
engines/mohawk/view.cpp
engines/mohawk/view.h
diff --git a/engines/mohawk/cstime_view.cpp b/engines/mohawk/cstime_view.cpp
index 7879175..8727560 100644
--- a/engines/mohawk/cstime_view.cpp
+++ b/engines/mohawk/cstime_view.cpp
@@ -243,7 +243,7 @@ void CSTimeModule::defaultMoveProc(Feature *feature) {
if ((feature->_flags & kFeatureNewDisable) || (feature->_flags & kFeatureNewDisableOnReset)) {
feature->_data.enabled = 0;
}
- feature->_dirty = 1;
+ feature->_dirty = true;
if (feature->_flags & kFeatureInternalRegion) {
// TODO: create region [+140] (if not already done)
}
@@ -257,7 +257,7 @@ void CSTimeModule::defaultMoveProc(Feature *feature) {
// TODO: or clip with bounds
}
}
- feature->_dirty = 1;
+ feature->_dirty = true;
if (feature->_flags & kFeatureNewInternalTiming) {
feature->_nextTime += feature->_delayTime;
} else {
@@ -277,7 +277,7 @@ void CSTimeModule::defaultMoveProc(Feature *feature) {
}
feature->_data.currOffset = 26;
- feature->_done = 0;
+ feature->_done = false;
}
if (feature->_flags & kFeatureNewDisable)
feature->_data.enabled = 0;
@@ -307,7 +307,7 @@ void CSTimeModule::defaultMoveProc(Feature *feature) {
}
case 0:
// TODO: set ptr +176 to 1
- feature->_done = 1;
+ feature->_done = true;
if (feature->_doneProc) {
(this->*(feature->_doneProc))(feature); // TODO: with -1
}
diff --git a/engines/mohawk/view.cpp b/engines/mohawk/view.cpp
index 63e4f84..e22556a 100644
--- a/engines/mohawk/view.cpp
+++ b/engines/mohawk/view.cpp
@@ -50,11 +50,11 @@ Feature::Feature(View *view) : _view(view) {
_flags = 0;
_nextTime = 0;
_delayTime = 0;
- _dirty = 0;
- _needsReset = 0;
- _justReset = 0;
+ _dirty = false;
+ _needsReset = false;
+ _justReset = false;
_notifyDone = 0;
- _done = 0;
+ _done = false;
}
Feature::~Feature() {
@@ -93,11 +93,11 @@ void Feature::setNodeDefaults(Feature *prev, Feature *next) {
_flags = 0;
- _dirty = 1;
- _needsReset = 1;
- _justReset = 0; // old
+ _dirty = true;
+ _needsReset = true;
+ _justReset = false; // old
_notifyDone = 0;
- _done = 0; // new
+ _done = false; // new
_nextTime = 0;
_delayTime = 0;
@@ -125,11 +125,11 @@ void Feature::resetFeatureScript(uint16 enabled, uint16 scrbId) {
resetFrame();
_nextTime = 0; // New feature code uses _view->_lastIdleTime, but should be equivalent.
_data.enabled = enabled;
- _dirty = 1;
+ _dirty = true;
finishResetFeatureScript();
- _needsReset = 0;
+ _needsReset = false;
if (_region) {
// TODO: mark _region as dirty
@@ -177,7 +177,7 @@ void Feature::moveAndUpdate(Common::Point newPos) {
return;
_nextTime = 0;
- _dirty = 1;
+ _dirty = true;
// TODO: mark _data.bounds as dirty
if (_data.bitmapIds[0])
@@ -246,7 +246,7 @@ void OldFeature::resetScript() {
}
void OldFeature::finishResetFeatureScript() {
- _justReset = 1;
+ _justReset = true;
if (_flags & kFeatureOldAdjustByPos) {
Common::SeekableReadStream *ourSCRB = _view->getSCRB(_data.scrbIndex, _scrbId);
@@ -325,7 +325,7 @@ void NewFeature::resetScript() {
}
void NewFeature::finishResetFeatureScript() {
- _done = 0;
+ _done = false;
}
View::View(MohawkEngine *vm) : _vm(vm) {
@@ -371,7 +371,7 @@ void View::idleView() {
}
if (node->_drawProc)
(_currentModule->*(node->_drawProc))(node);
- node->_dirty = 0;
+ node->_dirty = false;
}
if (_needsUpdate) {
diff --git a/engines/mohawk/view.h b/engines/mohawk/view.h
index 8bf4701..d68ebae 100644
--- a/engines/mohawk/view.h
+++ b/engines/mohawk/view.h
@@ -138,11 +138,11 @@ public:
uint32 _flags;
uint32 _nextTime;
uint32 _delayTime;
- uint16 _dirty; // byte in old
- byte _needsReset;
- byte _justReset; // old
+ bool _dirty; // byte in old
+ bool _needsReset;
+ bool _justReset; // old
byte _notifyDone; // old
- byte _done; // new
+ bool _done; // new
FeatureData _data;
Commit: ac6cf328a91c393969593ff5cc6d89dcc6188eab
https://github.com/scummvm/scummvm/commit/ac6cf328a91c393969593ff5cc6d89dcc6188eab
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-06-01T00:59:01+02:00
Commit Message:
MOHAWK: Remove yet another useless variable
Changed paths:
engines/mohawk/view.cpp
engines/mohawk/view.h
diff --git a/engines/mohawk/view.cpp b/engines/mohawk/view.cpp
index e22556a..5b061ae 100644
--- a/engines/mohawk/view.cpp
+++ b/engines/mohawk/view.cpp
@@ -53,7 +53,6 @@ Feature::Feature(View *view) : _view(view) {
_dirty = false;
_needsReset = false;
_justReset = false;
- _notifyDone = 0;
_done = false;
}
@@ -96,7 +95,6 @@ void Feature::setNodeDefaults(Feature *prev, Feature *next) {
_dirty = true;
_needsReset = true;
_justReset = false; // old
- _notifyDone = 0;
_done = false; // new
_nextTime = 0;
@@ -141,7 +139,6 @@ void Feature::resetFeatureScript(uint16 enabled, uint16 scrbId) {
void Feature::resetFeature(bool notifyDone, Module::FeatureProc doneProc, uint16 scrbId) {
resetFeatureScript(1, scrbId);
_doneProc = doneProc;
- _notifyDone = notifyDone;
}
void Feature::hide(bool clip) {
diff --git a/engines/mohawk/view.h b/engines/mohawk/view.h
index d68ebae..463715b 100644
--- a/engines/mohawk/view.h
+++ b/engines/mohawk/view.h
@@ -141,7 +141,6 @@ public:
bool _dirty; // byte in old
bool _needsReset;
bool _justReset; // old
- byte _notifyDone; // old
bool _done; // new
FeatureData _data;
More information about the Scummvm-git-logs
mailing list