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

rename _log_error to log_error and get rid of the cumbersome #define

This commit is contained in:
Enno Rehling 2012-05-16 16:52:12 -07:00
parent 2550f7fee3
commit 1f0d5f205e
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main.c
View File

@ -243,9 +243,8 @@ void locale_init(void)
setlocale(LC_CTYPE, ""); setlocale(LC_CTYPE, "");
setlocale(LC_NUMERIC, "C"); setlocale(LC_NUMERIC, "C");
if (towlower(0xC4) != 0xE4) { /* Ä => ä */ if (towlower(0xC4) != 0xE4) { /* Ä => ä */
log_error( log_error("Umlaut conversion is not working properly. Wrong locale? LANG=%s\n",
("Umlaut conversion is not working properly. Wrong locale? LANG=%s\n", getenv("LANG"));
getenv("LANG")));
} }
} }
@ -274,7 +273,7 @@ int main(int argc, char **argv)
err = eressea_init(); err = eressea_init();
if (err) { if (err) {
log_error(("initialization failed with code %d\n", err)); log_error("initialization failed with code %d\n", err);
return err; return err;
} }
register_races(); register_races();
@ -289,7 +288,7 @@ int main(int argc, char **argv)
err = eressea_run(luafile, entry_point); err = eressea_run(luafile, entry_point);
if (err) { if (err) {
log_error(("server execution failed with code %d\n", err)); log_error("server execution failed with code %d\n", err);
return err; return err;
} }
#ifdef MSPACES #ifdef MSPACES

2
src/monsters.c
View File

@ -490,7 +490,7 @@ static order *monster_seeks_target(region * r, unit * u)
/* TODO: prüfen, ob target überhaupt noch existiert... */ /* TODO: prüfen, ob target überhaupt noch existiert... */
if (!target) { if (!target) {
log_error(("Monster '%s' hat kein Ziel!\n", unitname(u))); log_error("Monster '%s' hat kein Ziel!\n", unitname(u));
return NULL; /* this is a bug workaround! remove!! */ return NULL; /* this is a bug workaround! remove!! */
} }

2
src/spells/shipcurse.c
View File

@ -48,7 +48,7 @@ message *cinfo_ship(const void *obj, typ_t typ, const curse * c, int self)
msg = msg_message("curseinfo::ship_unknown", "id", c->no); msg = msg_message("curseinfo::ship_unknown", "id", c->no);
} }
if (msg == NULL) { if (msg == NULL) {
log_error(("There is no curseinfo for %s.\n", c->type->cname)); log_error("There is no curseinfo for %s.\n", c->type->cname);
} }
return msg; return msg;
} }

8
src/spells/spells.c
View File

@ -476,7 +476,7 @@ static const race *select_familiar(const race * magerace, magic_t magiegebiet)
retval = magerace->familiars[0]; retval = magerace->familiars[0];
} }
if (!retval) { if (!retval) {
log_error(("select_familiar: No familiar (not even a default) defined for %s.\n", magerace->_name[0])); log_error("select_familiar: No familiar (not even a default) defined for %s.\n", magerace->_name[0]);
} }
return retval; return retval;
} }
@ -490,8 +490,7 @@ static void make_familiar(unit * familiar, unit * mage)
if (familiar->race->init_familiar != NULL) { if (familiar->race->init_familiar != NULL) {
familiar->race->init_familiar(familiar); familiar->race->init_familiar(familiar);
} else { } else {
log_error(("could not perform initialization for familiar %s.\n", log_error("could not perform initialization for familiar %s.\n", familiar->faction->race->_name[0]);
familiar->faction->race->_name[0]));
} }
/* triggers: */ /* triggers: */
@ -521,8 +520,7 @@ static int sp_summon_familiar(castorder * co)
} }
rc = select_familiar(mage->faction->race, mage->faction->magiegebiet); rc = select_familiar(mage->faction->race, mage->faction->magiegebiet);
if (rc == NULL) { if (rc == NULL) {
log_error(("could not find suitable familiar for %s.\n", log_error("could not find suitable familiar for %s.\n", mage->faction->race->_name[0]);
mage->faction->race->_name[0]));
return 0; return 0;
} }