projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Localization moves for K.
[open-adventure.git]
/
actions.c
diff --git
a/actions.c
b/actions.c
index 01a373bad99e36ad0b35fa1745fd2afaf97c575c..0c79f3a917bd2a06f2f4759ac681b8d739b5504d 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-4,7
+4,9
@@
#include "database.h"
/* Limit visibility of ugly globals. Eventually these should go away. */
#include "database.h"
/* Limit visibility of ugly globals. Eventually these should go away. */
-extern long K, SPK, WD1, WD1X, WD2, WD2X;
+extern long K, WD1, WD1X, WD2, WD2X;
+
+static long SPK; /* This should go away too */
/*
* Action handlers. Eventually we'll do lookup through a method table
/*
* Action handlers. Eventually we'll do lookup through a method table
@@
-337,10
+339,10
@@
static int discard(long obj, bool just_do_it)
if (obj == RUBY)SPK=221;
RSPEAK(SPK);
if (SPK != 220) {
if (obj == RUBY)SPK=221;
RSPEAK(SPK);
if (SPK != 220) {
-
K=
2-game.prop[RUG];
- game.prop[RUG]
=K
;
- if (
K == 2)K=
PLAC[SAPPH];
- MOVE(RUG+NOBJECTS,
K
);
+
int k =
2-game.prop[RUG];
+ game.prop[RUG]
= k
;
+ if (
k == 2) k =
PLAC[SAPPH];
+ MOVE(RUG+NOBJECTS,
k
);
}
}
} else if (obj == COINS && HERE(VEND)) {
}
}
} else if (obj == COINS && HERE(VEND)) {
@@
-370,9
+372,10
@@
static int discard(long obj, bool just_do_it)
if (game.prop[VASE] != 0)game.fixed[VASE]= -1;
}
}
if (game.prop[VASE] != 0)game.fixed[VASE]= -1;
}
}
- K=LIQUID();
- if (K == obj)obj=BOTTLE;
- if (obj == BOTTLE && K != 0)game.place[K]=0;
+ int k = LIQUID();
+ if (k == obj)obj=BOTTLE;
+ if (obj == BOTTLE && k != 0)
+ game.place[k]=0;
if (obj == CAGE && game.prop[BIRD] == 1)DROP(BIRD,game.loc);
DROP(obj,game.loc);
if (obj != BIRD) return(2012);
if (obj == CAGE && game.prop[BIRD] == 1)DROP(BIRD,game.loc);
DROP(obj,game.loc);
if (obj != BIRD) return(2012);