aboutsummaryrefslogtreecommitdiff
path: root/engines/lure/hotspots.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2007-02-22 08:17:41 +0000
committerPaul Gilbert2007-02-22 08:17:41 +0000
commit0c899f82ab32c4d9da3700bbf54201db620c2ec4 (patch)
treead2f883cad43ba58b3dc6647697219cd260c2d66 /engines/lure/hotspots.cpp
parent7ac767a2bae0bcc97bd46a7a29ced6b21dbc12a3 (diff)
downloadscummvm-rg350-0c899f82ab32c4d9da3700bbf54201db620c2ec4.tar.gz
scummvm-rg350-0c899f82ab32c4d9da3700bbf54201db620c2ec4.tar.bz2
scummvm-rg350-0c899f82ab32c4d9da3700bbf54201db620c2ec4.zip
Syntax fixes to conform to ScummVM coding standards
svn-id: r25781
Diffstat (limited to 'engines/lure/hotspots.cpp')
-rw-r--r--engines/lure/hotspots.cpp19
1 files changed, 6 insertions, 13 deletions
diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp
index 25684e2e4a..da8b9bc5cd 100644
--- a/engines/lure/hotspots.cpp
+++ b/engines/lure/hotspots.cpp
@@ -2621,8 +2621,7 @@ void HotspotTickHandlers::followerAnimHandler(Hotspot &h) {
}
// Handle any pause countdown
- if (countdownCtr > 0)
- {
+ if (countdownCtr > 0) {
--countdownCtr;
standardCharacterAnimHandler(h);
return;
@@ -2637,18 +2636,15 @@ void HotspotTickHandlers::followerAnimHandler(Hotspot &h) {
int actionIndex = rnd.getRandomNumber(set->numActions() - 1);
set->getEntry(actionIndex, actionType, scheduleId);
- if (actionType == REPEAT_ONCE_DONE)
- {
+ if (actionType == REPEAT_ONCE_DONE) {
// Repeat once random action that's already done, so don't repeat it
standardCharacterAnimHandler(h);
return;
}
// For repeat once actions, make sure the character is in the same room as the player
- if (actionType == REPEAT_ONCE)
- {
- if (player->roomNumber() != h.roomNumber())
- {
+ if (actionType == REPEAT_ONCE) {
+ if (player->roomNumber() != h.roomNumber()) {
// Not in the same room, so don't do the action
standardCharacterAnimHandler(h);
return;
@@ -2658,13 +2654,10 @@ void HotspotTickHandlers::followerAnimHandler(Hotspot &h) {
set->setDone(actionIndex);
}
- if (scheduleId == 0)
- {
+ if (scheduleId == 0) {
// No special schedule to perform, so simply set a random action
h.setRandomDest();
- }
- else
- {
+ } else {
// Prepare the follower to standard the specified schedule
CharacterScheduleEntry *newEntry = res.charSchedules().getEntry(scheduleId);
assert(newEntry);