aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/zvision/lever_control.cpp4
-rw-r--r--engines/zvision/puzzle.h2
-rw-r--r--engines/zvision/render_manager.cpp20
-rw-r--r--engines/zvision/script_manager.cpp16
-rw-r--r--engines/zvision/string_manager.cpp2
5 files changed, 22 insertions, 22 deletions
diff --git a/engines/zvision/lever_control.cpp b/engines/zvision/lever_control.cpp
index f3d369fbfb..62d147c8cd 100644
--- a/engines/zvision/lever_control.cpp
+++ b/engines/zvision/lever_control.cpp
@@ -230,8 +230,8 @@ bool LeverControl::onMouseMove(const Common::Point &screenSpacePos, const Common
_lastMousePos = backgroundImageSpacePos;
for (Common::List<Direction>::iterator iter = _frameInfo[_currentFrame].directions.begin(); iter != _frameInfo[_currentFrame].directions.end(); iter++) {
- if (angle >= (int)(*iter).angle - ANGLE_DELTA && angle <= (int)(*iter).angle + ANGLE_DELTA) {
- _currentFrame = (*iter).toFrame;
+ if (angle >= (int)iter->angle - ANGLE_DELTA && angle <= (int)iter->angle + ANGLE_DELTA) {
+ _currentFrame = iter->toFrame;
renderFrame(_currentFrame);
break;
}
diff --git a/engines/zvision/puzzle.h b/engines/zvision/puzzle.h
index 512a9636b9..679a017262 100644
--- a/engines/zvision/puzzle.h
+++ b/engines/zvision/puzzle.h
@@ -36,7 +36,7 @@ struct Puzzle {
~Puzzle() {
for (Common::List<ResultAction *>::iterator iter = resultActions.begin(); iter != resultActions.end(); iter++) {
- delete (*iter);
+ delete *iter;
}
}
diff --git a/engines/zvision/render_manager.cpp b/engines/zvision/render_manager.cpp
index 55a24c9c86..7c4fe43353 100644
--- a/engines/zvision/render_manager.cpp
+++ b/engines/zvision/render_manager.cpp
@@ -59,8 +59,8 @@ RenderManager::~RenderManager() {
_backBuffer.free();
for (Common::HashMap<uint32, AlphaDataEntry>::iterator iter = _alphaDataEntries.begin(); iter != _alphaDataEntries.end(); iter++) {
- (*iter)._value.data->free();
- delete (*iter)._value.data;
+ iter->_value.data->free();
+ delete iter->_value.data;
}
}
@@ -121,25 +121,25 @@ void RenderManager::processAlphaEntries() {
for (Common::HashMap<uint32, AlphaDataEntry>::iterator iter = _alphaDataEntries.begin(); iter != _alphaDataEntries.end(); iter++) {
uint32 destOffset = 0;
uint32 sourceOffset = 0;
- uint16 *backbufferPtr = (uint16 *)_backBuffer.getBasePtr((*iter)._value.destX + _workingWindow.left, (*iter)._value.destY + _workingWindow.top);
- uint16 *entryPtr = (uint16 *)(*iter)._value.data->getPixels();
+ uint16 *backbufferPtr = (uint16 *)_backBuffer.getBasePtr(iter->_value.destX + _workingWindow.left, iter->_value.destY + _workingWindow.top);
+ uint16 *entryPtr = (uint16 *)iter->_value.data->getPixels();
- for (int32 y = 0; y < (*iter)._value.height; y++) {
- for (int32 x = 0; x < (*iter)._value.width; x++) {
+ for (int32 y = 0; y < iter->_value.height; y++) {
+ for (int32 x = 0; x < iter->_value.width; x++) {
uint16 color = entryPtr[sourceOffset + x];
- if (color != (*iter)._value.alphaColor) {
+ if (color != iter->_value.alphaColor) {
backbufferPtr[destOffset + x] = color;
}
}
destOffset += _backBuffer.w;
- sourceOffset += (*iter)._value.width;
+ sourceOffset += iter->_value.width;
}
if (_backBufferDirtyRect.isEmpty()) {
- _backBufferDirtyRect = Common::Rect((*iter)._value.destX + _workingWindow.left, (*iter)._value.destY + _workingWindow.top, (*iter)._value.destX + _workingWindow.left + (*iter)._value.width, (*iter)._value.destY + _workingWindow.top + (*iter)._value.height);
+ _backBufferDirtyRect = Common::Rect(iter->_value.destX + _workingWindow.left, iter->_value.destY + _workingWindow.top, iter->_value.destX + _workingWindow.left + iter->_value.width, iter->_value.destY + _workingWindow.top + iter->_value.height);
} else {
- _backBufferDirtyRect.extend(Common::Rect((*iter)._value.destX + _workingWindow.left, (*iter)._value.destY + _workingWindow.top, (*iter)._value.destX + _workingWindow.left + (*iter)._value.width, (*iter)._value.destY + _workingWindow.top + (*iter)._value.height));
+ _backBufferDirtyRect.extend(Common::Rect(iter->_value.destX + _workingWindow.left, iter->_value.destY + _workingWindow.top, iter->_value.destX + _workingWindow.left + iter->_value.width, iter->_value.destY + _workingWindow.top + iter->_value.height));
}
}
}
diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index e23a08f92e..5cc7846b3a 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -71,7 +71,7 @@ void ScriptManager::createReferenceTable() {
// Iterate through each CriteriaEntry and add a reference from the criteria key to the Puzzle
for (Common::List<Common::List<Puzzle::CriteriaEntry> >::iterator criteriaIter = (*activePuzzleIter)->criteriaList.begin(); criteriaIter != (*activePuzzleIter)->criteriaList.end(); criteriaIter++) {
- for (Common::List<Puzzle::CriteriaEntry>::iterator entryIter = (*criteriaIter).begin(); entryIter != (*criteriaIter).end(); entryIter++) {
+ for (Common::List<Puzzle::CriteriaEntry>::iterator entryIter = criteriaIter->begin(); entryIter != criteriaIter->end(); entryIter++) {
_referenceTable[entryIter->key].push_back(puzzlePtr);
// If the argument is a key, add a reference to it as well
@@ -88,7 +88,7 @@ void ScriptManager::createReferenceTable() {
// Iterate through each CriteriaEntry and add a reference from the criteria key to the Puzzle
for (Common::List<Common::List<Puzzle::CriteriaEntry> >::iterator criteriaIter = (*globalPuzzleIter)->criteriaList.begin(); criteriaIter != (*globalPuzzleIter)->criteriaList.end(); criteriaIter++) {
- for (Common::List<Puzzle::CriteriaEntry>::iterator entryIter = (*criteriaIter).begin(); entryIter != (*criteriaIter).end(); entryIter++) {
+ for (Common::List<Puzzle::CriteriaEntry>::iterator entryIter = criteriaIter->begin(); entryIter != criteriaIter->end(); entryIter++) {
_referenceTable[entryIter->key].push_back(puzzlePtr);
// If the argument is a key, add a reference to it as well
@@ -135,16 +135,16 @@ void ScriptManager::checkPuzzleCriteria() {
for (Common::List<Common::List<Puzzle::CriteriaEntry> >::iterator criteriaIter = puzzle->criteriaList.begin(); criteriaIter != puzzle->criteriaList.end(); criteriaIter++) {
criteriaMet = false;
- for (Common::List<Puzzle::CriteriaEntry>::iterator entryIter = (*criteriaIter).begin(); entryIter != (*criteriaIter).end(); entryIter++) {
+ for (Common::List<Puzzle::CriteriaEntry>::iterator entryIter = criteriaIter->begin(); entryIter != criteriaIter->end(); entryIter++) {
// Get the value to compare against
uint argumentValue;
- if ((*entryIter).argumentIsAKey)
+ if (entryIter->argumentIsAKey)
argumentValue = getStateValue(entryIter->argument);
else
argumentValue = entryIter->argument;
// Do the comparison
- switch ((*entryIter).criteriaOperator) {
+ switch (entryIter->criteriaOperator) {
case Puzzle::EQUAL_TO:
criteriaMet = getStateValue(entryIter->key) == argumentValue;
break;
@@ -197,7 +197,7 @@ void ScriptManager::cleanStateTable() {
for (Common::HashMap<uint32, uint32>::iterator iter = _globalState.begin(); iter != _globalState.end(); iter++) {
// If the value is equal to zero, we can purge it since getStateValue()
// will return zero if _globalState doesn't contain a key
- if ((*iter)._value == 0) {
+ if (iter->_value == 0) {
// Remove the node
_globalState.erase(iter);
}
@@ -384,8 +384,8 @@ void ScriptManager::serializeStateTable(Common::WriteStream *stream) {
for (Common::HashMap<uint32, uint32>::iterator iter = _globalState.begin(); iter != _globalState.end(); iter++) {
// Write out the key/value pair
- stream->writeUint32LE((*iter)._key);
- stream->writeUint32LE((*iter)._value);
+ stream->writeUint32LE(iter->_key);
+ stream->writeUint32LE(iter->_value);
}
}
diff --git a/engines/zvision/string_manager.cpp b/engines/zvision/string_manager.cpp
index b2d19d904e..9ae479b47d 100644
--- a/engines/zvision/string_manager.cpp
+++ b/engines/zvision/string_manager.cpp
@@ -42,7 +42,7 @@ StringManager::StringManager(ZVision *engine)
StringManager::~StringManager() {
for (Common::HashMap<Common::String, TruetypeFont *>::iterator iter = _fonts.begin(); iter != _fonts.end(); iter++) {
- delete (*iter)._value;
+ delete iter->_value;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-10 04:25:03 +0000