forked from github/server
Merge branch 'feature/refactor-rcspell' of https://github.com/ennorehling/eressea.git
This commit is contained in:
commit
86974df332
|
@ -75,15 +75,16 @@ static building_type *bt_find_i(const char *name)
|
||||||
if (match) {
|
if (match) {
|
||||||
cb_get_kv(match, &btype, sizeof(btype));
|
cb_get_kv(match, &btype, sizeof(btype));
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
log_warning("st_find: could not find ship '%s'\n", name);
|
|
||||||
}
|
|
||||||
return btype;
|
return btype;
|
||||||
}
|
}
|
||||||
|
|
||||||
const building_type *bt_find(const char *name)
|
const building_type *bt_find(const char *name)
|
||||||
{
|
{
|
||||||
return bt_find_i(name);
|
building_type *btype = bt_find_i(name);
|
||||||
|
if (!btype) {
|
||||||
|
log_warning("bt_find: could not find building '%s'\n", name);
|
||||||
|
}
|
||||||
|
return btype;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int bt_changes = 1;
|
static int bt_changes = 1;
|
||||||
|
|
|
@ -97,14 +97,15 @@ static ship_type *st_find_i(const char *name)
|
||||||
if (match) {
|
if (match) {
|
||||||
cb_get_kv(match, &st, sizeof(st));
|
cb_get_kv(match, &st, sizeof(st));
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
log_warning("st_find: could not find ship '%s'\n", name);
|
|
||||||
}
|
|
||||||
return st;
|
return st;
|
||||||
}
|
}
|
||||||
|
|
||||||
const ship_type *st_find(const char *name) {
|
const ship_type *st_find(const char *name) {
|
||||||
return st_find_i(name);
|
ship_type *st = st_find_i(name);
|
||||||
|
if (!st) {
|
||||||
|
log_warning("st_find: could not find ship '%s'\n", name);
|
||||||
|
}
|
||||||
|
return st;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void st_register(ship_type *stype) {
|
static void st_register(ship_type *stype) {
|
||||||
|
|
|
@ -6848,6 +6848,7 @@ void register_spells(void)
|
||||||
#ifdef COMPAT_DEATHCLOUD
|
#ifdef COMPAT_DEATHCLOUD
|
||||||
at_deprecate("zauber_todeswolke", dc_read_compat);
|
at_deprecate("zauber_todeswolke", dc_read_compat);
|
||||||
#endif
|
#endif
|
||||||
|
at_register(&at_observer);
|
||||||
|
|
||||||
/* init_firewall(); */
|
/* init_firewall(); */
|
||||||
ct_register(&ct_firewall);
|
ct_register(&ct_firewall);
|
||||||
|
|
Loading…
Reference in New Issue