projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved state_change to misc.c to start using it in main.c, too
[open-adventure.git]
/
misc.c
diff --git
a/misc.c
b/misc.c
index 5b1068e379084b872f90ebcd6da91876b855ee2a..b4869d8568d4f2ac5b46b4b25caac491eccde1af 100644
(file)
--- a/
misc.c
+++ b/
misc.c
@@
-118,11
+118,11
@@
void tokenize(char* raw, struct command_t *cmd)
* possible an emulation of the original UI.
*/
if (settings.oldstyle) {
* possible an emulation of the original UI.
*/
if (settings.oldstyle) {
-
cmd->raw1[TOKLEN+TOKLEN] = cmd->raw1[TOKLEN+
TOKLEN] = '\0';
-
for (in
t i = 0; i < strlen(cmd->raw1); i++)
- cmd->raw1[i] = toupper(cmd->raw1[i]);
-
for (in
t i = 0; i < strlen(cmd->raw2); i++)
- cmd->raw2[i] = toupper(cmd->raw2[i]);
+
cmd->raw1[TOKLEN + TOKLEN] = cmd->raw2[TOKLEN +
TOKLEN] = '\0';
+
for (size_
t i = 0; i < strlen(cmd->raw1); i++)
+
cmd->raw1[i] = toupper(cmd->raw1[i]);
+
for (size_
t i = 0; i < strlen(cmd->raw2); i++)
+
cmd->raw2[i] = toupper(cmd->raw2[i]);
}
}
}
}
@@
-351,11
+351,10
@@
char* get_input()
bool silent_yes()
{
bool silent_yes()
{
- char* reply;
bool outcome;
for (;;) {
bool outcome;
for (;;) {
- reply = get_input();
+
char*
reply = get_input();
if (reply == NULL) {
// LCOV_EXCL_START
// Should be unreachable. Reply should never be NULL
if (reply == NULL) {
// LCOV_EXCL_START
// Should be unreachable. Reply should never be NULL
@@
-398,13
+397,12
@@
bool yes(const char* question, const char* yes_response, const char* no_response
/* Print message X, wait for yes/no answer. If yes, print Y and return true;
* if no, print Z and return false. */
{
/* Print message X, wait for yes/no answer. If yes, print Y and return true;
* if no, print Z and return false. */
{
- char* reply;
bool outcome;
for (;;) {
speak(question);
bool outcome;
for (;;) {
speak(question);
- reply = get_input();
+
char*
reply = get_input();
if (reply == NULL) {
// LCOV_EXCL_START
// Should be unreachable. Reply should never be NULL
if (reply == NULL) {
// LCOV_EXCL_START
// Should be unreachable. Reply should never be NULL
@@
-691,3
+689,10
@@
void bug(enum bugtype num, const char *error_string)
// LCOV_EXCL_STOP
/* end */
// LCOV_EXCL_STOP
/* end */
+
+void state_change(long obj, long state)
+/* Object must have a change-message list for this to be useful; only some do */
+{
+ game.prop[obj] = state;
+ pspeak(obj, change, state, true);
+}
\ No newline at end of file