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:
3079ebd
)
Yet more OBJ localization.
author
Eric S. Raymond
<esr@thyrsus.com>
Wed, 7 Jun 2017 12:39:12 +0000
(08:39 -0400)
committer
Eric S. Raymond
<esr@thyrsus.com>
Wed, 7 Jun 2017 12:39:12 +0000
(08:39 -0400)
actions2.c
patch
|
blob
|
history
diff --git
a/actions2.c
b/actions2.c
index 64695e07c74c01bc27fb0c7ab8f6acec1356c89a..bd1de2c2af1900cfb2bcaa10613427731f0031f7 100644
(file)
--- a/
actions2.c
+++ b/
actions2.c
@@
-24,7
+24,7
@@
L9011: if(game.fixed[OBJ] != 0) return(2011);
K=OBJ;
OBJ=BOTTLE;
if(HERE(BOTTLE) && LIQ(0) == K) goto L9017;
K=OBJ;
OBJ=BOTTLE;
if(HERE(BOTTLE) && LIQ(0) == K) goto L9017;
- if(TOTING(BOTTLE) && game.prop[BOTTLE] == 1) return(fill());
+ if(TOTING(BOTTLE) && game.prop[BOTTLE] == 1) return(fill(
OBJ
));
if(game.prop[BOTTLE] != 1)SPK=105;
if(!TOTING(BOTTLE))SPK=104;
return(2011);
if(game.prop[BOTTLE] != 1)SPK=105;
if(!TOTING(BOTTLE))SPK=104;
return(2011);
@@
-311,11
+311,11
@@
L9216: SPK=14;
/* Fill. Bottle or urn must be empty, and liquid available. (Vase is nasty.) */
/* Fill. Bottle or urn must be empty, and liquid available. (Vase is nasty.) */
-int fill() {
- if(
OBJ
== VASE) goto L9222;
- if(
OBJ
== URN) goto L9224;
- if(
OBJ != 0 && OBJ
!= BOTTLE) return(2011);
- if(
OBJ
== 0 && !HERE(BOTTLE)) return(8000);
+int fill(
long obj
) {
+ if(
obj
== VASE) goto L9222;
+ if(
obj
== URN) goto L9224;
+ if(
obj != 0 && obj
!= BOTTLE) return(2011);
+ if(
obj
== 0 && !HERE(BOTTLE)) return(8000);
SPK=107;
if(LIQLOC(game.loc) == 0)SPK=106;
if(HERE(URN) && game.prop[URN] != 0)SPK=214;
SPK=107;
if(LIQLOC(game.loc) == 0)SPK=106;
if(HERE(URN) && game.prop[URN] != 0)SPK=214;