Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

replace RCF_CANSTEAL with RCF_NOSTEAL for less confusing default behavior.

This commit is contained in:
Enno Rehling 2014-07-05 19:29:12 -07:00
parent 5b437c5833
commit 072f927d5b
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/economy.c
View File

@ -2760,7 +2760,7 @@ static void steal_cmd(unit * u, struct order *ord, request ** stealorders)
assert(skill_enabled(SK_PERCEPTION) && skill_enabled(SK_STEALTH)); assert(skill_enabled(SK_PERCEPTION) && skill_enabled(SK_STEALTH));
if (!fval(u_race(u), RCF_CANSTEAL)) { if (fval(u_race(u), RCF_NOSTEAL)) {
ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "race_nosteal", "race", ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "race_nosteal", "race",
u_race(u))); u_race(u)));
return; return;

4
src/kernel/jsonconf.c
View File

@ -326,8 +326,8 @@ static void json_ship(cJSON *json, ship_type *st) {
static void json_race(cJSON *json, race *rc) { static void json_race(cJSON *json, race *rc) {
cJSON *child; cJSON *child;
const char *flags[] = { const char *flags[] = {
"playerrace", "killpeasants", "scarepeasants", "npc", "killpeasants", "scarepeasants",
"cansteal", "moverandom", "cannotmove", "nosteal", "moverandom", "cannotmove",
"learn", "fly", "swim", "walk", "nolearn", "learn", "fly", "swim", "walk", "nolearn",
"noteach", "horse", "desert", "noteach", "horse", "desert",
"illusionary", "absorbpeasants", "noheal", "illusionary", "absorbpeasants", "noheal",

2
src/kernel/jsonconf.test.c
View File

@ -34,7 +34,7 @@ static void check_flag(CuTest *tc, const char *name, int flag) {
static void test_flags(CuTest *tc) { static void test_flags(CuTest *tc) {
check_flag(tc, "npc", RCF_NPC); check_flag(tc, "npc", RCF_NPC);
check_flag(tc, "scarepeasants", RCF_SCAREPEASANTS); check_flag(tc, "scarepeasants", RCF_SCAREPEASANTS);
check_flag(tc, "cansteal", RCF_CANSTEAL); check_flag(tc, "nosteal", RCF_NOSTEAL);
check_flag(tc, "noheal", RCF_NOHEAL); check_flag(tc, "noheal", RCF_NOHEAL);
check_flag(tc, "undead", RCF_UNDEAD); check_flag(tc, "undead", RCF_UNDEAD);
check_flag(tc, "dragon", RCF_DRAGON); check_flag(tc, "dragon", RCF_DRAGON);

10
src/kernel/race.h
View File

@ -183,11 +183,11 @@ extern "C" {
const struct weapon_type *); const struct weapon_type *);
void free_races(void); void free_races(void);
/* Flags */ /* Flags. Do not reorder these without changing json_race() in jsonconf.c */
#define RCF_NPC (1<<0) /* can be played by a player. */ #define RCF_NPC (1<<0) /* cannot be the race for a player faction (and other limits?) */
#define RCF_KILLPEASANTS (1<<1) /* Töten Bauern. Dämonen werden nicht über dieses Flag, sondern in randenc() behandelt. */ #define RCF_KILLPEASANTS (1<<1) /* a monster that eats peasants */
#define RCF_SCAREPEASANTS (1<<2) #define RCF_SCAREPEASANTS (1<<2) /* a monster that scares peasants out of the hex */
#define RCF_CANSTEAL (1<<3) #define RCF_NOSTEAL (1<<3) /* this race has high stealth, but is not allowed to steal */
#define RCF_MOVERANDOM (1<<4) #define RCF_MOVERANDOM (1<<4)
#define RCF_CANNOTMOVE (1<<5) #define RCF_CANNOTMOVE (1<<5)
#define RCF_LEARN (1<<6) /* Lernt automatisch wenn struct faction == 0 */ #define RCF_LEARN (1<<6) /* Lernt automatisch wenn struct faction == 0 */

4
src/kernel/xmlreader.c
View File

@ -1672,8 +1672,8 @@ static int parse_races(xmlDocPtr doc)
rc->flags |= RCF_NPC; rc->flags |= RCF_NPC;
if (xml_bvalue(node, "scarepeasants", false)) if (xml_bvalue(node, "scarepeasants", false))
rc->flags |= RCF_SCAREPEASANTS; rc->flags |= RCF_SCAREPEASANTS;
if (xml_bvalue(node, "cansteal", true)) if (!xml_bvalue(node, "cansteal", true))
rc->flags |= RCF_CANSTEAL; rc->flags |= RCF_NOSTEAL;
if (xml_bvalue(node, "cansail", true)) if (xml_bvalue(node, "cansail", true))
rc->flags |= RCF_CANSAIL; rc->flags |= RCF_CANSAIL;
if (xml_bvalue(node, "cannotmove", false)) if (xml_bvalue(node, "cannotmove", false))