aboutsummaryrefslogtreecommitdiff
path: root/engines/glk/alan3/actor.cpp
diff options
context:
space:
mode:
authordreammaster2019-06-27 04:02:48 +0100
committerPaul Gilbert2019-07-06 15:27:08 -0700
commitdc40211ec5e54d01f7cb822940714ed6e6da36d5 (patch)
treededda7f6ce1ab7f581941d9f002ad1926fa3e367 /engines/glk/alan3/actor.cpp
parentaebf25661076eaa382b3025f0123f6ceb7cf920b (diff)
downloadscummvm-rg350-dc40211ec5e54d01f7cb822940714ed6e6da36d5.tar.gz
scummvm-rg350-dc40211ec5e54d01f7cb822940714ed6e6da36d5.tar.bz2
scummvm-rg350-dc40211ec5e54d01f7cb822940714ed6e6da36d5.zip
GLK: ALAN3: Proper indentation & formatting
Diffstat (limited to 'engines/glk/alan3/actor.cpp')
-rw-r--r--engines/glk/alan3/actor.cpp57
1 files changed, 28 insertions, 29 deletions
diff --git a/engines/glk/alan3/actor.cpp b/engines/glk/alan3/actor.cpp
index 5152305033..ff4d89f9a1 100644
--- a/engines/glk/alan3/actor.cpp
+++ b/engines/glk/alan3/actor.cpp
@@ -33,49 +33,48 @@ namespace Alan3 {
/*======================================================================*/
ScriptEntry *scriptOf(int actor) {
- ScriptEntry *scr;
+ ScriptEntry *scr;
- if (admin[actor].script != 0) {
- for (scr = (ScriptEntry *) pointerTo(header->scriptTableAddress); !isEndOfArray(scr); scr++)
- if (scr->code == admin[actor].script)
- break;
- if (!isEndOfArray(scr))
- return scr;
- }
- return NULL;
+ if (admin[actor].script != 0) {
+ for (scr = (ScriptEntry *) pointerTo(header->scriptTableAddress); !isEndOfArray(scr); scr++)
+ if (scr->code == admin[actor].script)
+ break;
+ if (!isEndOfArray(scr))
+ return scr;
+ }
+ return NULL;
}
/*======================================================================*/
StepEntry *stepOf(int actor) {
- StepEntry *step;
- ScriptEntry *scr = scriptOf(actor);
+ StepEntry *step;
+ ScriptEntry *scr = scriptOf(actor);
- if (scr == NULL) return NULL;
+ if (scr == NULL) return NULL;
- step = (StepEntry*)pointerTo(scr->steps);
- step = &step[admin[actor].step];
+ step = (StepEntry *)pointerTo(scr->steps);
+ step = &step[admin[actor].step];
- return step;
+ return step;
}
/*======================================================================*/
-void describeActor(int actor)
-{
- ScriptEntry *script = scriptOf(actor);
+void describeActor(int actor) {
+ ScriptEntry *script = scriptOf(actor);
- if (script != NULL && script->description != 0)
- interpret(script->description);
- else if (hasDescription(actor))
- describeAnything(actor);
- else {
- printMessageWithInstanceParameter(M_SEE_START, actor);
- printMessage(M_SEE_END);
- if (instances[actor].container != 0)
- describeContainer(actor);
- }
- admin[actor].alreadyDescribed = TRUE;
+ if (script != NULL && script->description != 0)
+ interpret(script->description);
+ else if (hasDescription(actor))
+ describeAnything(actor);
+ else {
+ printMessageWithInstanceParameter(M_SEE_START, actor);
+ printMessage(M_SEE_END);
+ if (instances[actor].container != 0)
+ describeContainer(actor);
+ }
+ admin[actor].alreadyDescribed = TRUE;
}
} // End of namespace Alan3