home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace TT_CONSUMABLE with more general TT_TOOL (type) and TT_TOOLPOWER.
[plomrogue]
/
src
/
client
/
command_db.c
diff --git
a/src/client/command_db.c
b/src/client/command_db.c
index b9d10a6234c92560bbeb1994d4ec0de5ccb52f10..68d4ce2dfd7f8908dd188d85b39195e7337fef59 100644
(file)
--- a/
src/client/command_db.c
+++ b/
src/client/command_db.c
@@
-1,4
+1,9
@@
-/* src/client/command_db.c */
+/* src/client/command_db.c
+ *
+ * This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3
+ * or any later version. For details on its copyright, license, and warranties,
+ * see the file NOTICE in the root directory of the PlomRogue source package.
+ */
#define _POSIX_C_SOURCE 200809L /* strdup() */
#include "command_db.h"
#define _POSIX_C_SOURCE 200809L /* strdup() */
#include "command_db.h"
@@
-6,13
+11,12
@@
#include <stdint.h> /* uint8_t */
#include <stdlib.h> /* free() */
#include <string.h> /* strcmp(), strdup() */
#include <stdint.h> /* uint8_t */
#include <stdlib.h> /* free() */
#include <string.h> /* strcmp(), strdup() */
-#include "../common/parse_file.h" /* EDIT_STARTED,parse_init_entry(),
- * parse_id_uniq(), parse_unknown_arg(),
- * parsetest_too_many_values(), parse_file(),
- * parse_and_reduce_to_readyflag(),
- * parse_flagval()
- */
#include "array_append.h" /* array_append() */
#include "array_append.h" /* array_append() */
+#include "parse.h" /* EDIT_STARTED, parse_init_entry(), parse_id_uniq(),
+ * parse_unknown_arg(), parsetest_too_many_values(),
+ * parse_file(), parse_and_reduce_to_readyflag(),
+ * parse_flagval()
+ */
#include "world.h" /* global world */
#include "cleanup.h" /* set_cleanup_flag() */
#include "world.h" /* global world */
#include "cleanup.h" /* set_cleanup_flag() */
@@
-65,7
+69,7
@@
static void tokens_into_entries(char * token0, char * token1)
cmd = (struct Command *) parse_init_entry(&cmd_flags,
sizeof(struct Command));
cmd->dsc_short = strdup(token1);
cmd = (struct Command *) parse_init_entry(&cmd_flags,
sizeof(struct Command));
cmd->dsc_short = strdup(token1);
- parse_id_uniq(
NULL != get_command(cmd->dsc_short
));
+ parse_id_uniq(
!(!get_command(cmd->dsc_short)
));
}
else if (!( parse_flagval(token0, token1, "DESCRIPTION", &cmd_flags,
DESC_SET, 's', (char *) &cmd->dsc_long)
}
else if (!( parse_flagval(token0, token1, "DESCRIPTION", &cmd_flags,
DESC_SET, 's', (char *) &cmd->dsc_long)