archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Eliminated another label

Browse source
This commit is contained in:
Aaron Traas 2017-07-10 17:35:24 -04:00
parent 18ec2f79b0
commit 9056fa7a2c
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
main.c
View file

@ -1075,7 +1075,6 @@ static bool do_command()
Lclearobj: Lclearobj:
game.oldobj = command.obj; game.oldobj = command.obj;
L2600:
checkhints(); checkhints();
/* If closing time, check for any objects being toted with /* If closing time, check for any objects being toted with
@ -1098,7 +1097,7 @@ L2600:
if(!get_command_input(&command)) if(!get_command_input(&command))
return false; return false;
L2607: Lthreshold:
++game.turns; ++game.turns;
/* If a turn threshold has been met, apply penalties and tell /* If a turn threshold has been met, apply penalties and tell
@ -1154,7 +1153,7 @@ Lookup:
continue; continue;
/* Gee, I don't understand. */ /* Gee, I don't understand. */
sspeak(DONT_KNOW, command.raw1); sspeak(DONT_KNOW, command.raw1);
goto L2600; goto Lclearobj;
} }
/* FIXME: magic numbers related to vocabulary */ /* FIXME: magic numbers related to vocabulary */
kmod = MOD(defn, 1000); kmod = MOD(defn, 1000);
@ -1185,12 +1184,8 @@ Lookup:
return true; return true;
case GO_TOP: case GO_TOP:
continue; /* back to top of main interpreter loop */ 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 L2607; goto Lthreshold;
case GO_LOOKUP: case GO_LOOKUP:
goto Lookup; goto Lookup;
case GO_WORD2: case GO_WORD2:
@ -1206,7 +1201,10 @@ Lookup:
command.raw1[0] = toupper(command.raw1[0]); command.raw1[0] = toupper(command.raw1[0]);
sspeak(DO_WHAT, command.raw1); sspeak(DO_WHAT, command.raw1);
command.obj = 0; command.obj = 0;
goto L2600; // Fallthrough
case GO_CHECKHINT: // Fallthrough
case GO_CLEAROBJ:
goto Lclearobj;
case GO_DWARFWAKE: case GO_DWARFWAKE:
/* Oh dear, he's disturbed the dwarves. */ /* Oh dear, he's disturbed the dwarves. */
rspeak(DWARVES_AWAKEN); rspeak(DWARVES_AWAKEN);