|
@@ -927,7 +927,7 @@ void instance_reload(void) {
|
|
void do_reload_instance(void)
|
|
void do_reload_instance(void)
|
|
{
|
|
{
|
|
struct instance_data *im;
|
|
struct instance_data *im;
|
|
- struct instance_db *db;
|
|
|
|
|
|
+ struct instance_db *db = NULL;
|
|
struct s_mapiterator* iter;
|
|
struct s_mapiterator* iter;
|
|
struct map_session_data *sd;
|
|
struct map_session_data *sd;
|
|
unsigned short i;
|
|
unsigned short i;
|
|
@@ -974,7 +974,7 @@ void do_reload_instance(void)
|
|
instance_id = g->instance_id;
|
|
instance_id = g->instance_id;
|
|
break;
|
|
break;
|
|
default:
|
|
default:
|
|
- ShowError("do_reload_instance: Unexpected instance mode for instance %s(id=%u, mode=%u).\n", StringBuf_Value(db->name), map[sd->bl.m].instance_id, (unsigned short)im->mode);
|
|
|
|
|
|
+ ShowError("do_reload_instance: Unexpected instance mode for instance %s (id=%u, mode=%u).\n", (db) ? StringBuf_Value(db->name) : "Unknown", map[sd->bl.m].instance_id, (unsigned short)im->mode);
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
if((db = instance_searchtype_db(im->type)) != NULL && !instance_enter(sd, instance_id, StringBuf_Value(db->name))) { // All good
|
|
if((db = instance_searchtype_db(im->type)) != NULL && !instance_enter(sd, instance_id, StringBuf_Value(db->name))) { // All good
|