projects
/
open-adventure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
18ec2f7
)
Eliminated another label
author
Aaron Traas
<aaron@traas.org>
Mon, 10 Jul 2017 21:35:24 +0000
(17:35 -0400)
committer
Aaron Traas
<aaron@traas.org>
Mon, 10 Jul 2017 21:35:24 +0000
(17:35 -0400)
main.c
patch
|
blob
|
history
diff --git
a/main.c
b/main.c
index bff59fbb21ba7e03e32ed43672a2987b8c4fb5af..c53939cb5ed673a0ac6a79b206b28ca1f0969da1 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-1075,7
+1075,6
@@
static bool do_command()
Lclearobj:
game.oldobj = command.obj;
Lclearobj:
game.oldobj = command.obj;
-L2600:
checkhints();
/* If closing time, check for any objects being toted with
checkhints();
/* If closing time, check for any objects being toted with
@@
-1098,7
+1097,7
@@
L2600:
if(!get_command_input(&command))
return false;
if(!get_command_input(&command))
return false;
-L
2607
:
+L
threshold
:
++game.turns;
/* If a turn threshold has been met, apply penalties and tell
++game.turns;
/* If a turn threshold has been met, apply penalties and tell
@@
-1154,7
+1153,7
@@
Lookup:
continue;
/* Gee, I don't understand. */
sspeak(DONT_KNOW, command.raw1);
continue;
/* Gee, I don't understand. */
sspeak(DONT_KNOW, command.raw1);
- goto L
2600
;
+ goto L
clearobj
;
}
/* FIXME: magic numbers related to vocabulary */
kmod = MOD(defn, 1000);
}
/* FIXME: magic numbers related to vocabulary */
kmod = MOD(defn, 1000);
@@
-1185,12
+1184,8
@@
Lookup:
return true;
case GO_TOP:
continue; /* back to top of main interpreter loop */
return true;
case GO_TOP:
continue; /* back to top of main interpreter loop */
- case GO_CLEAROBJ:
- goto Lclearobj;
- case GO_CHECKHINT:
- goto L2600;
case GO_CHECKFOO:
case GO_CHECKFOO:
- goto L
2607
;
+ goto L
threshold
;
case GO_LOOKUP:
goto Lookup;
case GO_WORD2:
case GO_LOOKUP:
goto Lookup;
case GO_WORD2:
@@
-1206,7
+1201,10
@@
Lookup:
command.raw1[0] = toupper(command.raw1[0]);
sspeak(DO_WHAT, command.raw1);
command.obj = 0;
command.raw1[0] = toupper(command.raw1[0]);
sspeak(DO_WHAT, command.raw1);
command.obj = 0;
- goto L2600;
+ // Fallthrough
+ case GO_CHECKHINT: // Fallthrough
+ case GO_CLEAROBJ:
+ goto Lclearobj;
case GO_DWARFWAKE:
/* Oh dear, he's disturbed the dwarves. */
rspeak(DWARVES_AWAKEN);
case GO_DWARFWAKE:
/* Oh dear, he's disturbed the dwarves. */
rspeak(DWARVES_AWAKEN);