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

FUZZY_BASE36 fuer ein paar Parteien. 

Falsche Meldung fuer curse-removal
This commit is contained in:
Enno Rehling 2006-12-03 13:24:11 +00:00
parent 807df53a4b
commit 51fb741bce
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/kernel/save.c
View File

@ -536,9 +536,18 @@ factionorders(void)
char b[16]; char b[16];
char * fid = strnzcpy(b, getstrtoken(), 15); char * fid = strnzcpy(b, getstrtoken(), 15);
const char * pass = getstrtoken(); const char * pass = getstrtoken();
faction *f; faction *f = NULL;
#ifdef FUZZY_BASE36
int id = atoi36(fid);
if (id!=0) f = findfaction(id);
if (f==NULL) {
id = atoi(fid);
if (id!=0) f = findfaction(id);
}
#else
f = findfaction(atoi36(fid)); f = findfaction(atoi36(fid));
#endif
if (f!=NULL) { if (f!=NULL) {
/* Kontrolliere, ob das Passwort richtig eingegeben wurde. Es /* Kontrolliere, ob das Passwort richtig eingegeben wurde. Es

1
src/common/settings-eressea.h
View File

@ -45,3 +45,4 @@
#define WORMHOLE_MODULE #define WORMHOLE_MODULE
#define XECMD_MODULE #define XECMD_MODULE
#define FUZZY_BASE36

4
src/common/spells/spells.c
View File

@ -7018,12 +7018,12 @@ sp_break_curse(castorder *co)
remove_curse(ap, c); remove_curse(ap, c);
ADDMSG(&mage->faction->msgs, msg_message( ADDMSG(&mage->faction->msgs, msg_message(
"destroy_magic_effect", "unit region command id target", "destroy_curse_effect", "unit region command id target",
mage, mage->region, co->order, strdup(pa->param[1]->data.s), mage, mage->region, co->order, strdup(pa->param[1]->data.s),
strdup(ts))); strdup(ts)));
} else { } else {
ADDMSG(&mage->faction->msgs, msg_message( ADDMSG(&mage->faction->msgs, msg_message(
"destroy_magic_noeffect", "unit region command", "destroy_curse_noeffect", "unit region command",
mage, mage->region, co->order)); mage, mage->region, co->order));
} }
} }

4
src/scripts/eressea.lua
View File

@ -74,8 +74,8 @@ function process(orders)
plan_monsters() plan_monsters()
local nmrs = get_nmrs(1) local nmrs = get_nmrs(1)
if nmrs >= 70 then if nmrs >= 80 then
print("Shit. More than 70 factions with 1 NMR (" .. nmrs .. ")") print("Shit. More than 80 factions with 1 NMR (" .. nmrs .. ")")
write_summary() write_summary()
return -1 return -1
end end