aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorTorbjörn Andersson2008-01-10 19:06:38 +0000
committerTorbjörn Andersson2008-01-10 19:06:38 +0000
commit89f15fe482503e69742e5c32847de565c2248944 (patch)
treef6a45a1e2698c0c3f90b58e90448669aaf8d712b /engines
parentd804bad5512577b2a268f8985422038eb5d3927d (diff)
downloadscummvm-rg350-89f15fe482503e69742e5c32847de565c2248944.tar.gz
scummvm-rg350-89f15fe482503e69742e5c32847de565c2248944.tar.bz2
scummvm-rg350-89f15fe482503e69742e5c32847de565c2248944.zip
Fixed warnings.
svn-id: r30379
Diffstat (limited to 'engines')
-rw-r--r--engines/lure/hotspots.cpp8
-rw-r--r--engines/lure/hotspots.h4
-rw-r--r--engines/lure/res_struct.cpp1
3 files changed, 6 insertions, 7 deletions
diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp
index b585f2a968..c2b99c1b7a 100644
--- a/engines/lure/hotspots.cpp
+++ b/engines/lure/hotspots.cpp
@@ -4839,13 +4839,13 @@ void HotspotList::loadFromStream(ReadStream *stream) {
}
}
-HotspotScheduleRecord::HotspotScheduleRecord(uint16 hotspotId, CurrentActionStack &stack) {
- this->hotspotId = hotspotId;
+HotspotScheduleRecord::HotspotScheduleRecord(uint16 hId, CurrentActionStack &stack) {
+ hotspotId = hId;
copyFrom(stack);
}
-HotspotScheduleRecord::HotspotScheduleRecord(uint16 hotspotId) {
- this->hotspotId = hotspotId;
+HotspotScheduleRecord::HotspotScheduleRecord(uint16 hId) {
+ hotspotId = hId;
}
void HotspotSchedules::saveToStream(WriteStream *stream) {
diff --git a/engines/lure/hotspots.h b/engines/lure/hotspots.h
index 789776167e..e47d15b238 100644
--- a/engines/lure/hotspots.h
+++ b/engines/lure/hotspots.h
@@ -255,8 +255,8 @@ class HotspotScheduleRecord: public CurrentActionStack {
public:
uint16 hotspotId;
- HotspotScheduleRecord(uint16 hotspotId, CurrentActionStack &stack);
- HotspotScheduleRecord(uint16 hotspotId);
+ HotspotScheduleRecord(uint16 hId, CurrentActionStack &stack);
+ HotspotScheduleRecord(uint16 hId);
};
class HotspotSchedules: public ManagedList<HotspotScheduleRecord *> {
diff --git a/engines/lure/res_struct.cpp b/engines/lure/res_struct.cpp
index 2d4e3a9d8c..af13135f61 100644
--- a/engines/lure/res_struct.cpp
+++ b/engines/lure/res_struct.cpp
@@ -748,7 +748,6 @@ void SequenceDelayList::add(uint16 delay, uint16 seqOffset, bool canClear) {
}
void SequenceDelayList::tick() {
- Resources &res = Resources::getReference();
uint32 currTime = g_system->getMillis();
SequenceDelayList::iterator i;