aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/lure/room.cpp12
-rw-r--r--engines/mohawk/myst_areas.cpp2
-rw-r--r--engines/mohawk/myst_scripts.cpp4
-rw-r--r--engines/parallaction/objects.h4
-rw-r--r--engines/tsage/graphics.cpp2
5 files changed, 12 insertions, 12 deletions
diff --git a/engines/lure/room.cpp b/engines/lure/room.cpp
index 219ed0263d..4cb0cecd45 100644
--- a/engines/lure/room.cpp
+++ b/engines/lure/room.cpp
@@ -138,7 +138,7 @@ void Room::leaveRoom() {
HotspotList &list = r.activeHotspots();
HotspotList::iterator i = list.begin();
while (i != list.end()) {
- Hotspot *h = (i.operator*()).get();
+ Hotspot *h = i->get();
if (!h->persistant()) {
i = list.erase(i);
} else {
@@ -437,7 +437,7 @@ void Room::update() {
// Handle first layer (layer 3)
for (i = hotspots.begin(); i != hotspots.end(); ++i) {
- Hotspot &h = *i.operator*();
+ Hotspot &h = **i;
if ((h.roomNumber() == _roomNumber) && h.isActiveAnimation() && (h.layer() == 3)) {
addAnimation(h);
@@ -449,28 +449,28 @@ void Room::update() {
Common::List<Hotspot *> tempList;
Common::List<Hotspot *>::iterator iTemp;
for (i = hotspots.begin(); i != hotspots.end(); ++i) {
- Hotspot *h = (i.operator*()).get();
+ Hotspot *h = i->get();
if ((h->layer() != 1) || (h->roomNumber() != _roomNumber) ||
h->skipFlag() || !h->isActiveAnimation())
continue;
int16 endY = h->y() + h->heightCopy();
for (iTemp = tempList.begin(); iTemp != tempList.end(); ++iTemp) {
- Hotspot *hTemp = iTemp.operator*();
+ Hotspot *hTemp = *iTemp;
int16 tempY = hTemp->y() + hTemp->heightCopy();
if (endY < tempY) break;
}
tempList.insert(iTemp, h);
}
for (iTemp = tempList.begin(); iTemp != tempList.end(); ++iTemp) {
- Hotspot &h = *iTemp.operator*();
+ Hotspot &h = **iTemp;
addAnimation(h);
addLayers(h);
}
// Handle third layer (layer 2)
for (i = hotspots.begin(); i != hotspots.end(); ++i) {
- Hotspot &h = *i.operator*();
+ Hotspot &h = **i;
if ((h.roomNumber() == _roomNumber) && h.isActiveAnimation() && (h.layer() == 2)) {
addAnimation(h);
diff --git a/engines/mohawk/myst_areas.cpp b/engines/mohawk/myst_areas.cpp
index fe33ceaa9b..a54b67bef4 100644
--- a/engines/mohawk/myst_areas.cpp
+++ b/engines/mohawk/myst_areas.cpp
@@ -134,7 +134,7 @@ const Common::String MystResourceType5::describe() {
desc += " ops:";
for (uint i = 0; i < _script->size(); i++)
- desc += " " + _vm->_scriptParser->getOpcodeDesc(_script->operator[](i).opcode);
+ desc += " " + _vm->_scriptParser->getOpcodeDesc((*_script)[i].opcode);
}
return desc;
diff --git a/engines/mohawk/myst_scripts.cpp b/engines/mohawk/myst_scripts.cpp
index b9353312c7..107a8b03e9 100644
--- a/engines/mohawk/myst_scripts.cpp
+++ b/engines/mohawk/myst_scripts.cpp
@@ -161,7 +161,7 @@ void MystScriptParser::runScript(MystScript script, MystResource *invokingResour
_vm->_gfx->enableDrawingTimeSimulation(true);
for (uint16 i = 0; i < script->size(); i++) {
- MystScriptEntry &entry = script->operator[](i);
+ MystScriptEntry &entry = (*script)[i];
debugC(kDebugScript, "\tOpcode %d: %d", i, entry.opcode);
if (entry.type == kMystScriptNormal)
@@ -207,7 +207,7 @@ MystScript MystScriptParser::readScript(Common::SeekableReadStream *stream, Myst
script->resize(opcodeCount);
for (uint16 i = 0; i < opcodeCount; i++) {
- MystScriptEntry &entry = script->operator[](i);
+ MystScriptEntry &entry = (*script)[i];
entry.type = type;
// Resource ID only exists in INIT and EXIT scripts
diff --git a/engines/parallaction/objects.h b/engines/parallaction/objects.h
index 387e7af088..81761b2c6b 100644
--- a/engines/parallaction/objects.h
+++ b/engines/parallaction/objects.h
@@ -377,12 +377,12 @@ public:
int16 getValue() const {
assert(_accessor);
- return _accessor->operator()();
+ return (*_accessor)();
}
void setValue(int16 value) {
assert(_mutator);
- _mutator->operator()(value);
+ (*_mutator)(value);
}
};
diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index b3dceba292..0781ae4544 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -230,7 +230,7 @@ GfxSurface::GfxSurface(const GfxSurface &s) {
_lockSurfaceCtr = 0;
_customSurface = NULL;
_trackDirtyRects = false;
- this->operator =(s);
+ *this = s;
}
GfxSurface::~GfxSurface() {