Forráskód Böngészése

Resolved a compile warning
* Resolves a possible attempt of outputting an uninitialized instance name during reload.

aleos89 9 éve
szülő
commit
dfd9bdef63
1 módosított fájl, 2 hozzáadás és 2 törlés
  1. 2 2
      src/map/instance.c

+ 2 - 2
src/map/instance.c

@@ -927,7 +927,7 @@ void instance_reload(void) {
 void do_reload_instance(void)
 {
 	struct instance_data *im;
-	struct instance_db *db;
+	struct instance_db *db = NULL;
 	struct s_mapiterator* iter;
 	struct map_session_data *sd;
 	unsigned short i;
@@ -974,7 +974,7 @@ void do_reload_instance(void)
 					instance_id = g->instance_id;
 					break;
 				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;
 			}
 			if((db = instance_searchtype_db(im->type)) != NULL && !instance_enter(sd, instance_id, StringBuf_Value(db->name))) { // All good