DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Revert "Morph static variables"

Browse Source 
This reverts commit 0322f2d98c.
This commit is contained in:
jl777
2019-03-20 06:30:28 -11:00
parent f8c3d42f9b
commit 94adc14066
10 changed files with 104 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/cc/rogue/command.c
View File

@@ -24,7 +24,7 @@ command(struct rogue_state *rs)
register int ntimes = 1; /* Number of player moves */
char *fp;
THING *mp;
//static char countch, direction, newcount = FALSE;
static char countch, direction, newcount = FALSE;
if (on(player, ISHASTE))
ntimes++;
/*
@@ -74,7 +74,7 @@ command(struct rogue_state *rs)
if (running || to_death)
ch = runch;
else if (count)
ch = rs->countch;
ch = countch;
else
{
ch = readchar(rs);
@@ -98,11 +98,11 @@ command(struct rogue_state *rs)
/*
* check for prefixes
*/
rs->newcount = FALSE;
newcount = FALSE;
if (isdigit(ch))
{
count = 0;
rs->newcount = TRUE;
newcount = TRUE;
while (isdigit(ch))
{
count = count * 10 + (ch - '0');
@@ -110,7 +110,7 @@ command(struct rogue_state *rs)
count = 255;
ch = readchar(rs);
}
rs->countch = ch;
countch = ch;
/*
* turn off count for commands which don't make sense
* to repeat
@@ -205,12 +205,12 @@ over:
door_stop = TRUE;
firstmove = TRUE;
}
if (count && !rs->newcount)
ch = rs->direction;
if (count && !newcount)
ch = direction;
else
{
ch += ('A' - CTRL('A'));
rs->direction = ch;
direction = ch;
}
goto over;
}
@@ -372,7 +372,7 @@ over:
else
{
ch = dir_ch;
rs->countch = dir_ch;
countch = dir_ch;
goto over;
}
when ')': current(rs,cur_weapon, "wielding", NULL);