Merge pull request #2513 from Emistry/itemdb_read_combos

Fix missing file path in console.

6 files changed, 9 insertions, 9 deletions

diff --git a/src/map/homunculus.c b/src/map/homunculus.c
index d3e815872..31744f479 100644
--- a/src/map/homunculus.c
+++ b/src/map/homunculus.c
@@ -1375,7 +1375,7 @@ static void homunculus_exp_db_read(void)
 			homun->dbs->exptable[MAX_LEVEL - 1] = 0;
 		}
 		fclose(fp);
-		ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' levels in '"CL_WHITE"%s"CL_RESET"'.\n", j, filename[i]);
+		ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' levels in '"CL_WHITE"%s/%s"CL_RESET"'.\n", j, map->db_path, filename[i]);
 	}
 }
 
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index 8caf88a4e..5c56794d8 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -1655,7 +1655,7 @@ static void itemdb_read_combos(void)
 		count++;
 	}
 	fclose(fp);
-	ShowStatus("Done reading '"CL_WHITE"%"PRIu32""CL_RESET"' entries in '"CL_WHITE"item_combo_db"CL_RESET"'.\n", count);
+	ShowStatus("Done reading '"CL_WHITE"%"PRIu32""CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, DBPATH"item_combo_db.txt");
 
 	return;
 }
@@ -2407,7 +2407,7 @@ static int itemdb_readdb_libconfig(const char *filename)
 	}
 	db_destroy(duplicate_db);
 	libconfig->destroy(&item_db_conf);
-	ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, filename);
+	ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, filepath);
 	return count;
 }
 
diff --git a/src/map/mob.c b/src/map/mob.c
index 283bec25a..bad3f7eb8 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -4959,7 +4959,7 @@ static int mob_read_libconfig(const char *filename, bool ignore_missing)
 		}
 	}
 	libconfig->destroy(&mob_db_conf);
-	ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, filename);
+	ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, filepath);
 
 	return count;
 }
@@ -5082,7 +5082,7 @@ static int mob_read_randommonster(void)
 			summon[i].qty = 1;
 		}
 		fclose(fp);
-		ShowStatus("Done reading '"CL_WHITE"%u"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",count,mobfile[i]);
+		ShowStatus("Done reading '"CL_WHITE"%u"CL_RESET"' entries in '"CL_WHITE"%s/%s"CL_RESET"'.\n",count, map->db_path, mobfile[i]);
 	}
 	return 0;
 }
@@ -5199,7 +5199,7 @@ static void mob_readchatdb(void)
 		count++;
 	}
 	fclose(fp);
-	ShowStatus("Done reading '"CL_WHITE"%"PRIu32""CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, arc);
+	ShowStatus("Done reading '"CL_WHITE"%"PRIu32""CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, filepath);
 }
 
 /*==========================================
diff --git a/src/map/pet.c b/src/map/pet.c
index ce26b6cb1..b2b6d96f8 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -1321,7 +1321,7 @@ static int pet_read_db_libconfig(const char *filename, bool ignore_missing)
 		count++;
 	}
 	libconfig->destroy(&pet_db_conf);
-	ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, filename);
+	ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, filepath);
 
 	return count;
 }
diff --git a/src/map/quest.c b/src/map/quest.c
index 9540b411d..38ac88eea 100644
--- a/src/map/quest.c
+++ b/src/map/quest.c
@@ -585,7 +585,7 @@ static int quest_read_db(void)
 		count++;
 	}
 	libconfig->destroy(&quest_db_conf);
-	ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, filename);
+	ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, filepath);
 	return count;
 }
 
diff --git a/src/map/refine.c b/src/map/refine.c
index 4fe6e73c4..29d81c9b8 100644
--- a/src/map/refine.c
+++ b/src/map/refine.c
@@ -624,7 +624,7 @@ static int refine_readdb_refine_libconfig(const char *filename)
 		}
 	}
 	libconfig->destroy(&refine_db_conf);
-	ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, filename);
+	ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, filepath);
 
 	return count;
 }