projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Address GitLab issue #45: OSX Compile issue
[open-adventure.git]
/
main.c
diff --git
a/main.c
b/main.c
index adb0c9974c8cf15e78981aabfbb5d0c67579e4aa..1865483964d109c9a4aa7c5b7dd69d0d373d0d6a 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-710,7
+710,7
@@
static void playermove( int motion)
* game.prop[TROLL]=TROLL_UNPAID.) Special stuff
* for bear. */
if (game.prop[TROLL] == TROLL_PAIDONCE) {
* game.prop[TROLL]=TROLL_UNPAID.) Special stuff
* for bear. */
if (game.prop[TROLL] == TROLL_PAIDONCE) {
- pspeak(TROLL, look,
TROLL_PAIDONCE, true
);
+ pspeak(TROLL, look,
true, TROLL_PAIDONCE
);
game.prop[TROLL] = TROLL_UNPAID;
move(TROLL2, LOC_NOWHERE);
move(TROLL2 + NOBJECTS, IS_FREE);
game.prop[TROLL] = TROLL_UNPAID;
move(TROLL2, LOC_NOWHERE);
move(TROLL2 + NOBJECTS, IS_FREE);
@@
-956,7
+956,7
@@
static void listobjects(void)
kk = (game.loc == game.fixed[STEPS])
? STEPS_UP
: STEPS_DOWN;
kk = (game.loc == game.fixed[STEPS])
? STEPS_UP
: STEPS_DOWN;
- pspeak(obj, look,
kk, true
);
+ pspeak(obj, look,
true, kk
);
}
}
}
}
}
}
@@
-992,7
+992,7
@@
bool get_preprocessed_command_input(command_t *command)
* separate from their respective piles. */
if (game.closed) {
if (game.prop[OYSTER] < 0 && TOTING(OYSTER))
* separate from their respective piles. */
if (game.closed) {
if (game.prop[OYSTER] < 0 && TOTING(OYSTER))
- pspeak(OYSTER, look,
1, true
);
+ pspeak(OYSTER, look,
true, 1
);
for (size_t i = 1; i <= NOBJECTS; i++) {
if (TOTING(i) && game.prop[i] < 0)
game.prop[i] = STASHED(i);
for (size_t i = 1; i <= NOBJECTS; i++) {
if (TOTING(i) && game.prop[i] < 0)
game.prop[i] = STASHED(i);