projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Major cleanups. Pre-process loop back in main loop, pre-processing abstracted into...
[open-adventure.git]
/
actions.c
diff --git
a/actions.c
b/actions.c
index e41c7bf5913b3918c84787af649e55ae6103e8fc..9c3eb77a45039c5ca63a5663157c403c21655c5f 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-1,8
+1,17
@@
+/*
+ * Actions for the duneon-running code.
+ *
+ * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
+ * Copyright (c) 2017 by Eric S. Raymond
+ * SPDX-License-Identifier: BSD-2-clause
+ */
+
#include <stdlib.h>
#include <stdbool.h>
#include <string.h>
#include "advent.h"
#include "dungeon.h"
#include <stdlib.h>
#include <stdbool.h>
#include <string.h>
#include "advent.h"
#include "dungeon.h"
+#include <inttypes.h>
static int fill(verb_t, obj_t);
static int fill(verb_t, obj_t);
@@
-202,11
+211,11
@@
static int bigwords(vocab_t id)
if (game.place[EGGS] == LOC_NOWHERE && game.place[TROLL] == LOC_NOWHERE && game.prop[TROLL] == TROLL_UNPAID)
game.prop[TROLL] = TROLL_PAIDONCE;
if (HERE(EGGS))
if (game.place[EGGS] == LOC_NOWHERE && game.place[TROLL] == LOC_NOWHERE && game.prop[TROLL] == TROLL_UNPAID)
game.prop[TROLL] = TROLL_PAIDONCE;
if (HERE(EGGS))
- pspeak(EGGS, look,
EGGS_VANISHED, true
);
+ pspeak(EGGS, look,
true, EGGS_VANISHED
);
else if (game.loc == objects[EGGS].plac)
else if (game.loc == objects[EGGS].plac)
- pspeak(EGGS, look,
EGGS_HERE, true
);
+ pspeak(EGGS, look,
true, EGGS_HERE
);
else
else
- pspeak(EGGS, look,
EGGS_DONE, true
);
+ pspeak(EGGS, look,
true, EGGS_DONE
);
move(EGGS, objects[EGGS].plac);
return GO_CLEAROBJ;
move(EGGS, objects[EGGS].plac);
return GO_CLEAROBJ;
@@
-491,7
+500,7
@@
static int discard(verb_t verb, obj_t obj)
if (obj == COINS && HERE(VEND)) {
DESTROY(COINS);
drop(BATTERY, game.loc);
if (obj == COINS && HERE(VEND)) {
DESTROY(COINS);
drop(BATTERY, game.loc);
- pspeak(BATTERY, look,
FRESH_BATTERIES, true
);
+ pspeak(BATTERY, look,
true, FRESH_BATTERIES
);
return GO_CLEAROBJ;
}
return GO_CLEAROBJ;
}
@@
-631,7
+640,7
@@
static int extinguish(verb_t verb, obj_t obj)
if (game.prop[URN] != URN_EMPTY) {
state_change(URN, URN_DARK);
} else {
if (game.prop[URN] != URN_EMPTY) {
state_change(URN, URN_DARK);
} else {
- pspeak(URN, change,
URN_DARK, true
);
+ pspeak(URN, change,
true, URN_DARK
);
}
break;
case LAMP:
}
break;
case LAMP:
@@
-860,7
+869,7
@@
static int inven(void)
rspeak(NOW_HOLDING);
empty = false;
}
rspeak(NOW_HOLDING);
empty = false;
}
- pspeak(i, touch,
-1, false
);
+ pspeak(i, touch,
false, -1
);
}
if (TOTING(BEAR))
rspeak(TAME_BEAR);
}
if (TOTING(BEAR))
rspeak(TAME_BEAR);
@@
-930,7
+939,7
@@
static int listen(void)
* depending on whether player has drunk dragon's blood. */
if (i == BIRD)
mi += 3 * game.blooded;
* depending on whether player has drunk dragon's blood. */
if (i == BIRD)
mi += 3 * game.blooded;
- pspeak(i, hear,
mi, true
, game.zzword);
+ pspeak(i, hear,
true, mi
, game.zzword);
rspeak(NO_MESSAGE);
if (i == BIRD && mi == BIRD_ENDSTATE)
DESTROY(BIRD);
rspeak(NO_MESSAGE);
if (i == BIRD && mi == BIRD_ENDSTATE)
DESTROY(BIRD);
@@
-1099,7
+1108,7
@@
static int read(command_t command)
game.prop[command.obj] == STATE_NOTFOUND) {
speak(actions[command.verb].message);
} else
game.prop[command.obj] == STATE_NOTFOUND) {
speak(actions[command.verb].message);
} else
- pspeak(command.obj, study,
game.prop[command.obj], true
);
+ pspeak(command.obj, study,
true, game.prop[command.obj]
);
return GO_CLEAROBJ;
}
return GO_CLEAROBJ;
}
@@
-1575,7
+1584,7
@@
int action(command_t command)
case unknown:
/* Unknown verb, couldn't deduce object - might need hint */
sspeak(WHAT_DO, command.word[0].raw);
case unknown:
/* Unknown verb, couldn't deduce object - might need hint */
sspeak(WHAT_DO, command.word[0].raw);
- return GO_C
LEAROBJ
;
+ return GO_C
HECKHINT
;
default: // LCOV_EXCL_LINE
BUG(SPEECHPART_NOT_TRANSITIVE_OR_INTRANSITIVE_OR_UNKNOWN); // LCOV_EXCL_LINE
}
default: // LCOV_EXCL_LINE
BUG(SPEECHPART_NOT_TRANSITIVE_OR_INTRANSITIVE_OR_UNKNOWN); // LCOV_EXCL_LINE
}