aboutsummaryrefslogtreecommitdiff
path: root/engines/lure/surface.cpp
diff options
context:
space:
mode:
authorChristoph Mallon2012-03-13 14:53:40 +0100
committerAlyssa Milburn2012-03-13 15:43:59 +0100
commite40ba4c1354fabc0d1bd81a6ab80cd5f349d88fa (patch)
tree6569d2e7059c4e951aed077d7519f46575d56224 /engines/lure/surface.cpp
parent612bfe40924c1d266476385d24a1b889bcf81209 (diff)
downloadscummvm-rg350-e40ba4c1354fabc0d1bd81a6ab80cd5f349d88fa.tar.gz
scummvm-rg350-e40ba4c1354fabc0d1bd81a6ab80cd5f349d88fa.tar.bz2
scummvm-rg350-e40ba4c1354fabc0d1bd81a6ab80cd5f349d88fa.zip
JANITORIAL: Simply use *x instead of *x.get() on smart pointers.
Diffstat (limited to 'engines/lure/surface.cpp')
-rw-r--r--engines/lure/surface.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/engines/lure/surface.cpp b/engines/lure/surface.cpp
index bfada8fde6..4d63647af5 100644
--- a/engines/lure/surface.cpp
+++ b/engines/lure/surface.cpp
@@ -1329,8 +1329,8 @@ bool CopyProtectionDialog::show() {
++hotspot6;
// Add wording header and display screen
- (hotspot2->get())->setFrameNumber(1);
- (hotspot2->get())->copyTo(&screen.screen());
+ (*hotspot2)->setFrameNumber(1);
+ (*hotspot2)->copyTo(&screen.screen());
screen.update();
screen.setPalette(&p);
@@ -1340,8 +1340,8 @@ bool CopyProtectionDialog::show() {
} while (!events.interruptableDelay(100));
// Change title text to selection
- (hotspot2->get())->setFrameNumber(0);
- (hotspot2->get())->copyTo(&screen.screen());
+ (*hotspot2)->setFrameNumber(0);
+ (*hotspot2)->copyTo(&screen.screen());
screen.update();
// Clear any prior try
@@ -1356,8 +1356,8 @@ bool CopyProtectionDialog::show() {
HotspotsList::iterator tmpHotspot = _hotspots.begin();
for (int i = 0; i < _charIndex + 3; i++)
++tmpHotspot;
- (tmpHotspot->get())->setFrameNumber(10); // Blank space
- (tmpHotspot->get())->copyTo(&screen.screen());
+ (*tmpHotspot)->setFrameNumber(10); // Blank space
+ (*tmpHotspot)->copyTo(&screen.screen());
screen.update();
} else if ((events.event().kbd.keycode >= Common::KEYCODE_0) &&
@@ -1366,8 +1366,8 @@ bool CopyProtectionDialog::show() {
for (int i = 0; i < _charIndex + 3; i++)
++tmpHotspot;
// Number pressed
- (tmpHotspot->get())->setFrameNumber(events.event().kbd.ascii - '0');
- (tmpHotspot->get())->copyTo(&screen.screen());
+ (*tmpHotspot)->setFrameNumber(events.event().kbd.ascii - '0');
+ (*tmpHotspot)->copyTo(&screen.screen());
++_charIndex;
}
@@ -1385,11 +1385,11 @@ bool CopyProtectionDialog::show() {
return false;
// At this point, two page numbers have been entered - validate them
- int page1 = ((hotspot3->get())->frameNumber() * 10) + (hotspot4->get())->frameNumber();
- int page2 = ((hotspot5->get())->frameNumber() * 10) + (hotspot6->get())->frameNumber();
+ int page1 = ((*hotspot3)->frameNumber() * 10) + (*hotspot4)->frameNumber();
+ int page2 = ((*hotspot5)->frameNumber() * 10) + (*hotspot6)->frameNumber();
- if ((page1 == pageNumbers[(hotspot0->get())->frameNumber()]) &&
- (page2 == pageNumbers[(hotspot1->get())->frameNumber()]))
+ if ((page1 == pageNumbers[(*hotspot0)->frameNumber()]) &&
+ (page2 == pageNumbers[(*hotspot1)->frameNumber()]))
return true;
}
@@ -1404,11 +1404,11 @@ void CopyProtectionDialog::chooseCharacters() {
int char2 = rnd.getRandomNumber(19);
HotspotsList::iterator curHotspot = _hotspots.begin();
- (curHotspot->get())->setFrameNumber(char1);
- (curHotspot->get())->copyTo(&screen.screen());
+ (*curHotspot)->setFrameNumber(char1);
+ (*curHotspot)->copyTo(&screen.screen());
++curHotspot;
- (curHotspot->get())->setFrameNumber(char2);
- (curHotspot->get())->copyTo(&screen.screen());
+ (*curHotspot)->setFrameNumber(char2);
+ (*curHotspot)->copyTo(&screen.screen());
screen.update();
}