2 files changed, 4 insertions, 2 deletions
diff --git a/src/map/map.c b/src/map/map.c
index d8663fb70..a5ec6d83b 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -5228,8 +5228,7 @@ int cleanup_db_sub(DBKey key, DBData *data, va_list va) {
 /*==========================================
  * map destructor
  *------------------------------------------*/
-void do_final(void)
-{
+int do_final(void) {
 	int i;
 	struct map_session_data* sd;
 	struct s_mapiterator* iter;
@@ -5324,6 +5323,7 @@ void do_final(void)
 	HPM->event(HPET_POST_FINAL);
 	
 	ShowStatus("Finished.\n");
+	return map->retval;
 }
 
 int map_abort_sub(struct map_session_data* sd, va_list ap) {
@@ -5865,6 +5865,7 @@ void map_defaults(void) {
 	/* */
 	map->minimal = false;
 	map->count = 0;
+	map->retval = EXIT_SUCCESS;
 	
 	sprintf(map->db_path ,"db");
 	sprintf(map->help_txt ,"conf/help.txt");
diff --git a/src/map/map.h b/src/map/map.h
index 7373b516d..6b2e9d909 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -805,6 +805,7 @@ struct map_interface {
 
 	/* vars */
 	bool minimal;
+	int retval;
 	int count;
 
 	int autosave_interval;