git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@552 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog.txt

@@ -1,10 +1,11 @@
 Date	Added
 12/13
+	* Replaced many printf's in map-server with _ShowMessage().
 	* Skill timers for skills with id's higher then 450 were
 	  corrupting memory [MouseJstr]
 	* Increased max skills to 650 from 450 fixing MANY crashes [MouseJstr]
 	* Creating Guild events were reading beyond supplied guild names ,
-	  causing crashes [MouseJstr
+	  causing crashes [MouseJstr]
 	* trades were derefing -2 into the inventory table sometimes [MouseJstr]
 	* Not having a arrow in your inventory but having a bow
 	  could cause it to set sd->status.inventory[-1].equip=32768

npc/Changelog.txt

@@ -32,6 +32,8 @@ Other Ppl
 
 Date		Added
 ======
+12/12	* Added Town Inn's counting in my npc/other/mc_cameri/warper.txt [MC Cameri]
+
 12/11	* Fixed memory consumption in npc/other/mc_cameri/warper.txt [MC Cameri]
 
 12/10

npc/other/mc_cameri/warper.txt

@@ -24,7 +24,22 @@
 	set @reset$,"^000000";
 
 //	towns
-	set @towns, getmapusers("alberta.gat") + getmapusers("aldebaran.gat") + getmapusers("amatsu.gat") + getmapusers("comodo.gat") + getmapusers("gonryun.gat") + getmapusers("geffen.gat") + getmapusers("izlude.gat") + getmapusers("xmas.gat") + getmapusers("morocc.gat") + getmapusers("niflheim.gat") + getmapusers("payon.gat") + getmapusers("prontera.gat") + getmapusers("yuno.gat") + getmapusers("umbala.gat") + getmapusers("valkyrie.gat") + getmapusers("louyang.gat");
+	set @towns, getmapusers("alberta.gat") + getmapusers("aldebaran.gat")
+	+ getmapusers("amatsu.gat") + getmapusers("comodo.gat") + getmapusers("gonryun.gat")
+	+ getmapusers("geffen.gat") + getmapusers("izlude.gat") + getmapusers("xmas.gat")
+	+ getmapusers("morocc.gat") + getmapusers("niflheim.gat") + getmapusers("payon.gat")
+	+ getmapusers("prontera.gat") + getmapusers("yuno.gat") + getmapusers("umbala.gat")
+	+ getmapusers("valkyrie.gat") + getmapusers("louyang.gat");
+//	town inns
+	set @towns, @towns + getmapusers("alberta_in.gat") + getmapusers("aldeba_in.gat")
+	+ getmapusers("geffen_in.gat") + getmapusers("izlude_in.gat") + getmapusers("morocc_in.gat")
+	+ getmapusers("prt_in.gat") + getmapusers("xmas_in.gat") + getmapusers("cmd_in01.gat")
+	+ getmapusers("cmd_in02.gat") + getmapusers("yuno_in01.gat") + getmapusers("yuno_in02.gat")
+	+ getmapusers("yuno_in03.gat") + getmapusers("yuno_in04.gat") + getmapusers("yuno_in05.gat")
+	+ getmapusers("ama_in01.gat") + getmapusers("ama_in02.gat") + getmapusers("gon_in.gat")
+	+ getmapusers("um_in.gat") + getmapusers("nif_in.gat") + getmapusers("lou_in01.gat")
+	+ getmapusers("lou_in02.gat") + getmapusers("payon_in01.gat") + getmapusers("payon_in02.gat")
+	+ getmapusers("payon_in03.gat");
 //	dungeons
 	set @anthell, getmapusers("anthell01.gat") + getmapusers("anthell02.gat");
 	set @beach, getmapusers("beach_dun.gat") + getmapusers("beach_dun2.gat") + getmapusers("beach_dun3.gat");
@@ -56,22 +71,28 @@
 	next;
 	menu "Towns [" + @red$ + @towns + @reset$ + "]",town,"Dungeons [" + @red$ + @dungeons + @reset$ +"]",dungeon;
 town:
-	menu	"Alberta [" + @red$ + getmapusers("alberta.gat") + @reset$ + "]",walberta,
-		"Aldebaran [" + @red$ + getmapusers("aldebaran.gat") + @reset$ + "]",waldebaran,
-		"Amatsu [" + @red$ + getmapusers("amatsu.gat") + @reset$ + "]",wamatsu,
-		"Comodo [" + @red$ + getmapusers("comodo.gat") + @reset$ + "]",wcomodo,
-		"Gonryun [" + @red$ + getmapusers("gonryun.gat") + @reset$ + "]",wgonryun,
-		"Geffen [" + @red$ + getmapusers("geffen.gat") + @reset$ + "]",wgeffen,
-		"Izlude [" + @red$ + getmapusers("izlude.gat") + @reset$ + "]",wizlude,
-		"Lutie [" + @red$ + getmapusers("xmas.gat") + @reset$ + "]",wxmas,
-		"Morroc [" + @red$ + getmapusers("morocc.gat") + @reset$ + "]",wmorroc,
-		"Niflheim [" + @red$ + getmapusers("niflheim.gat") + @reset$ + "]",wniflheim,
-		"Payon [" + @red$ + getmapusers("payon.gat") + @reset$ + "]",wpayon,
-		"Prontera [" + @red$ + getmapusers("prontera.gat") + @reset$ + "]",wprontera,
-		"Yuno [" + @red$ + getmapusers("yuno.gat") + @reset$ + "]",wyuno,
-		"Umbala [" + @red$ + getmapusers("umbala.gat") + @reset$ + "]",wumbala,
+//	+ getmapusers("prt_in.gat") + getmapusers("xmas_in.gat") + getmapusers("cmd_in01.gat")
+//	+ getmapusers("cmd_in02.gat") + getmapusers("yuno_in01.gat") + getmapusers("yuno_in02.gat")
+//	+ getmapusers("yuno_in03.gat") + getmapusers("yuno_in04.gat") + getmapusers("yuno_in05.gat")
+//	+ getmapusers("ama_in01.gat") + getmapusers("ama_in02.gat") + getmapusers("gon_in.gat")
+//	+ getmapusers("um_in.gat") + getmapusers("nif_in.gat") + getmapusers("lou_in01.gat")
+//	+ getmapusers("lou_in02.gat");
+	menu	"Alberta [" + @red$ + (getmapusers("alberta.gat")+getmapusers("alberta_in.gat")) + @reset$ + "]",walberta,
+		"Aldebaran [" + @red$ + (getmapusers("aldebaran.gat")+ getmapusers("aldeba_in.gat")) + @reset$ + "]",waldebaran,
+		"Amatsu [" + @red$ + (getmapusers("amatsu.gat")+getmapusers("ama_in02.gat")) + @reset$ + "]",wamatsu,
+		"Comodo [" + @red$ + (getmapusers("comodo.gat")+getmapusers("cmd_in01.gat")+getmapusers("cmd_in02.gat")) + @reset$ + "]",wcomodo,
+		"Gonryun [" + @red$ + (getmapusers("gonryun.gat")+getmapusers("gon_in.gat")) + @reset$ + "]",wgonryun,
+		"Geffen [" + @red$ + (getmapusers("geffen.gat")+getmapusers("geffen_in.gat")) + @reset$ + "]",wgeffen,
+		"Izlude [" + @red$ + (getmapusers("izlude.gat")+getmapusers("izlude_in.gat")) + @reset$ + "]",wizlude,
+		"Lutie [" + @red$ + (getmapusers("xmas.gat")+getmapusers("xmas_in.gat")) + @reset$ + "]",wxmas,
+		"Morroc [" + @red$ + (getmapusers("morocc.gat")+getmapusers("morocc_in.gat")) + @reset$ + "]",wmorroc,
+		"Niflheim [" + @red$ + (getmapusers("niflheim.gat")+getmapusers("nif_in.gat")) + @reset$ + "]",wniflheim,
+		"Payon [" + @red$ + (getmapusers("payon.gat")+getmapusers("payon_in01.gat")+getmapusers("payon_in02.gat")+getmapusers("payon_in03.gat")) + @reset$ + "]",wpayon,
+		"Prontera [" + @red$ + (getmapusers("prontera.gat")+getmapusers("prt_in.gat")) + @reset$ + "]",wprontera,
+		"Yuno [" + @red$ + (getmapusers("yuno.gat")+getmapusers("yuno_in01.gat")+getmapusers("yuno_in02.gat")+getmapusers("yuno_in03.gat")+getmapusers("yuno_in04.gat")+getmapusers("yuno_in05.gat")) + @reset$ + "]",wyuno,
+		"Umbala [" + @red$ + (getmapusers("umbala.gat")+getmapusers("um_in.gat")) + @reset$ + "]",wumbala,
 		"Valkyrie [" + @red$ + getmapusers("valkyrie.gat") + @reset$ + "]",wvalk,
-		"Louyang [" + @red$ + getmapusers("louyang.gat") + @reset$ + "]",wlouyang;
+		"Louyang [" + @red$ + (getmapusers("louyang.gat")+getmapusers("lou_in01.gat")+getmapusers("lou_in02.gat")) + @reset$ + "]",wlouyang;
 dungeon:
 	menu	"Amatsu Dungeon [" + @red$ + @ama + @reset$ + "]",ama,
 		"Gonryun Dungeon [" + @red$ + @gon + @reset$ + "]",gon,

src/common/grfio.c

@@ -30,6 +30,7 @@
 #include "utils.h"
 #include "grfio.h"
 #include "mmo.h"
+#include "showmsg.h"
 
 #ifdef MEMWATCH
 #include "memwatch.h"
@@ -923,7 +924,8 @@ void grfio_init(char *fname)
 		}
 
 		fclose(data_conf);
-		printf("read %s done\n",fname);
+		sprintf(tmp_output,"Done reading GRF File: '\033[1;29m%s\033[0;0m'.\n",fname);
+		ShowStatus(tmp_output);
 	} // end of reading grf-files.txt
 
 	hashinit();	// hash table initialization

src/map/itemdb.c

@@ -12,6 +12,7 @@
 #include "itemdb.h"
 #include "script.h"
 #include "pc.h"
+#include "showmsg.h"
 
 #ifdef MEMWATCH
 #include "memwatch.h"
@@ -383,7 +384,8 @@ static int itemdb_readdb(void)
 			id->equip_script = parse_script(p,lines);
 		}
 		fclose(fp);
-		printf("read %s done (count=%d)\n",filename[i],ln);
+		sprintf(tmp_output,"Done reading '\033[1;29m%d\033[0;0m' entries in '\033[1;29m%s\033[0;0m'.\n",ln,filename[i]);
+		ShowStatus(tmp_output);
 	}
 	return 0;
 }
@@ -458,7 +460,8 @@ static int itemdb_read_randomitem()
 			ln++;
 		}
 		fclose(fp);
-		printf("read %s done (count=%d)\n",fn,*pc);
+		sprintf(tmp_output,"Done reading '\033[1;29m%d\033[0;0m' entries in '\033[1;29m%s\033[0;0m'.\n",*pc,fn);
+		ShowStatus(tmp_output);
 	}
 
 	return 0;
@@ -507,7 +510,8 @@ static int itemdb_read_itemavail(void)
 		ln++;
 	}
 	fclose(fp);
-	printf("read db/item_avail.txt done (count=%d)\n",ln);
+	sprintf(tmp_output,"Done reading '\033[1;29m%d\033[0;0m' entries in '\033[1;29m%s\033[0;0m'.\n",ln,"db/item_avail.txt");
+	ShowStatus(tmp_output);
 	return 0;
 }
 
@@ -774,8 +778,8 @@ static int itemdb_read_sqldb(void)
 			{
 				printf("Database server error (retrieving rows from %s): %s\n", item_db_db, mysql_error(&mmysql_handle));
 			}
-
-			printf("read %s done (count = %lu)\n", item_db_db, (unsigned long) mysql_num_rows(sql_res));
+			sprintf(tmp_output,"Done reading '\033[1;29m%lu\033[0;0m' entries in '\033[1;29m%s\033[0;0m'.\n",(unsigned long) mysql_num_rows(sql_res),item_db_db);
+			ShowStatus(tmp_output);
 		}
 		else
 		{

src/map/map.c

@@ -1208,7 +1208,9 @@ void map_removenpc(void) {
             }
         }
     }
-    printf("%d NPCs removed.\n",n);
+	
+    sprintf(tmp_output,"Successfully removed and freed from memory '\033[1;29m%d\033[0;0m' NPCs.\n",n);
+	ShowStatus(tmp_output);
 }
 
 /*==========================================
@@ -2181,16 +2183,14 @@ static int cleanup_sub(struct block_list *bl, va_list ap) {
  */
 void do_final(void) {
     int map_id, i;
-
+	ShowStatus("Terminating.\n");
     for (map_id = 0; map_id < map_num;map_id++) {
 	if(map[map_id].m)
 		map_foreachinarea(cleanup_sub, map_id, 0, 0, map[map_id].xs, map[map_id].ys, 0, 0);
     }
-
 #ifndef TXT_ONLY
     chrif_char_reset_offline();
 #endif
-
     for (i = 0; i < fd_max; i++) 
         delete_session(i);
 
@@ -2209,14 +2209,16 @@ void do_final(void) {
 		if(map[i].block_count) free(map[i].block_count);
 		if(map[i].block_mob_count) free(map[i].block_mob_count);
 	}
+
 	do_final_script();
 	do_final_itemdb();
 	do_final_storage();
-        do_final_guild();
+	do_final_guild();
 
 #ifndef TXT_ONLY
     map_sql_close();
 #endif /* not TXT_ONLY */
+	ShowStatus("Successfully terminated.");
 }
 
 void map_helpscreen(int flag) {
@@ -2418,7 +2420,9 @@ int do_init(int argc, char *argv[]) {
 	if (imalive_on)
 		add_timer_interval(gettick()+10, imalive_timer,0,0,imalive_time*1000);
 
-	printf("The map-server is \033[1;32mready\033[0m (Server is listening on the port %d).\n\n", map_port);
+	sprintf(tmp_output,"Server is '\033[1;32mready\033[0m' and listening on port '\033[1;29m%d\033[0;0m'.\n\n", map_port);
+	ShowStatus(tmp_output);
+
 	ticks = gettick();
 	
 

src/map/mob.c

@@ -21,6 +21,7 @@
 #include "party.h"
 #include "npc.h"
 #include "log.h"
+#include "showmsg.h"
 
 #ifdef MEMWATCH
 #include "memwatch.h"
@@ -3889,7 +3890,8 @@ static int mob_readdb(void)
 			mob_db[class].clothes_color=0; //Add for player monster dye - Valaris
 		}
 		fclose(fp);
-		printf("read %s done\n",filename[i]);
+		sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n",filename[i]);
+		ShowStatus(tmp_output);
 	}
 	return 0;
 }
@@ -4001,7 +4003,8 @@ static int mob_read_randommonster(void)
 				mob_db[class].summonper[i]=per;
 		}
 		fclose(fp);
-		printf("read %s done\n",mobfile[i]);
+		sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n",mobfile[i]);
+		ShowStatus(tmp_output);
 	}
 	return 0;
 }
@@ -4153,7 +4156,8 @@ static int mob_readskilldb(void)
 			mob_db[mob_id].maxskill=i+1;
 		}
 		fclose(fp);
-		printf("read %s done\n",filename[x]);
+		sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n",filename[x]);
+		ShowStatus(tmp_output);
 	}
 	return 0;
 }
@@ -4308,7 +4312,8 @@ static int mob_read_sqldb(void)
 			mob_db[class].head_buttom=0;
 		}
 		mysql_free_result(sql_res);
-		printf("read %s done (count=%d)\n",mob_db_db,ln);
+		sprintf(tmp_output,"Done reading '\033[1;29m%lu\033[0;0m' entries in '\033[1;29m%s\033[0;0m'.\n",ln,mob_db_db);
+		ShowStatus(tmp_output);
 	}
 	return 0;
 }

src/map/npc.c

@@ -21,6 +21,7 @@
 #include "pet.h"
 #include "battle.h"
 #include "skill.h"
+#include "showmsg.h"
 
 #ifdef MEMWATCH
 #include "memwatch.h"
@@ -433,8 +434,10 @@ int npc_event_do_clock(int tid,unsigned int tick,int id,int data)
  */
 int npc_event_do_oninit(void)
 {
-	int c = npc_event_doall("OnInit");
-	printf("npc: OnInit Event done. (%d npc)\n",c);
+//	int c = npc_event_doall("OnInit");
+	sprintf(tmp_output,"Event '\033[1;29mOnInit\033[0;0m' executed with '\033[1"
+		";29m%d\033[0;0m' NPCs.\n",npc_event_doall("OnInit"));
+	ShowStatus(tmp_output);
 
 	add_timer_interval(gettick()+100,
 		npc_event_do_clock,0,0,1000);

src/map/pc.c

@@ -7706,7 +7706,8 @@ int pc_readdb(void)
 			break;
 	}
 	fclose(fp);
-	printf("read db/exp.txt done\n");
+	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/exp.txt");
+	ShowStatus(tmp_output);
 
 	// JOB補正?値１
 	fp=fopen("db/job_db1.txt","r");
@@ -7740,7 +7741,8 @@ int pc_readdb(void)
 			break;
 	}
 	fclose(fp);
-	printf("read db/job_db1.txt done\n");
+	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/job_db1.txt");
+	ShowStatus(tmp_output);
 
 	// JOBボ?ナス
 	fp=fopen("db/job_db2.txt","r");
@@ -7768,7 +7770,8 @@ int pc_readdb(void)
 			break;
 	}
 	fclose(fp);
-	printf("read db/job_db2.txt done\n");
+	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/job_db2.txt");
+	ShowStatus(tmp_output);
 
 	// JOBボ?ナス2 ?生職用
 	fp=fopen("db/job_db2-2.txt","r");
@@ -7833,7 +7836,8 @@ int pc_readdb(void)
 		}
 	}
 	fclose(fp);
-	printf("read db/skill_tree.txt done\n");
+	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/skill_tree.txt");
+	ShowStatus(tmp_output);
 
 	// ?性修正テ?ブル
 	for(i=0;i<4;i++)
@@ -7879,7 +7883,8 @@ int pc_readdb(void)
 		}
 	}
 	fclose(fp);
-	printf("read db/attr_fix.txt done\n");
+	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/attr_fix.txt");
+	ShowStatus(tmp_output);
 
 	// サイズ補正テ?ブル
 	for(i=0;i<3;i++)
@@ -7908,7 +7913,8 @@ int pc_readdb(void)
 		i++;
 	}
 	fclose(fp);
-	printf("read db/size_fix.txt done\n");
+	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/size_fix.txt");
+	ShowStatus(tmp_output);
 
 	// 精?デ?タテ?ブル
 	for(i=0;i<5;i++){
@@ -7944,7 +7950,8 @@ int pc_readdb(void)
 		i++;
 	}
 	fclose(fp); //Lupus. close this file!!!
-	printf("read db/refine_db.txt done\n");
+	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/refine_db.txt");
+	ShowStatus(tmp_output);
 
 	return 0;
 }
@@ -7985,7 +7992,9 @@ static void pc_statpointdb(void)
 	buf_stat = (char *) malloc (end + 1);
 	l = fread(buf_stat,1,end,stp);
 	fclose(stp);
-	printf("read db/statpoint.txt done (size=%d)\n",l);
+	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/statpoint.txt");
+	ShowStatus(tmp_output);
+//	printf("read db/statpoint.txt done (size=%d)\n",l);
 
 	for(i=0;i<255;i++) {
             j=0;

src/map/pet.c

@@ -20,6 +20,7 @@
 #include "npc.h"
 #include "script.h"
 #include "skill.h"
+#include "showmsg.h"
 
 #ifdef MEMWATCH
 #include "memwatch.h"
@@ -1622,7 +1623,8 @@ int read_petdb()
 			j++;
 		}
 		fclose(fp);
-		printf("read %s done (count=%d)\n",filename[i],j);
+		sprintf(tmp_output,"Done reading '\033[1;29m%d\033[0;0m' pets in '\033[1;29m%s\033[0;0m'.\n",j,filename[i]);
+		ShowStatus(tmp_output);
 	}
 	return 0;
 }

src/map/skill.c

@@ -11668,7 +11668,8 @@ int skill_readdb(void)
 			skill_db[i].upkeep_time2[k]=(split2[k])? atoi(split2[k]):atoi(split2[0]);
 	}
 	fclose(fp);
-	printf("read db/skill_cast_db.txt done\n");
+	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/skill_cast_db.txt");
+	ShowStatus(tmp_output);
 
 	/* �»‘¢ŒnƒXƒLƒ‹ƒf?ƒ^ƒx?ƒX */
 	memset(skill_produce_db,0,sizeof(skill_produce_db));
@@ -11711,7 +11712,8 @@ int skill_readdb(void)
 				break;
 		}
 		fclose(fp);
-		printf("read %s done (count=%d)\n",filename[m],k);
+		sprintf(tmp_output,"Done reading '\033[1;29m%d\033[0;0m' entries in '\033[1;29m%s\033[0;0m'.\n",k,filename[m]);
+		ShowStatus(tmp_output);
 	}
 
 	memset(skill_arrow_db,0,sizeof(skill_arrow_db));
@@ -11749,7 +11751,8 @@ int skill_readdb(void)
 			break;
 	}
 	fclose(fp);
-	printf("read db/create_arrow_db.txt done (count=%d)\n",k);
+	sprintf(tmp_output,"Done reading '\033[1;29m%d\033[0;0m' entries in '\033[1;29m%s\033[0;0m'.\n",k,"db/create_arrow_db.txt");
+	ShowStatus(tmp_output);
 
 	memset(skill_abra_db,0,sizeof(skill_abra_db));
 	fp=fopen("db/abra_db.txt","r");
@@ -11782,7 +11785,8 @@ int skill_readdb(void)
 			break;
 	}
 	fclose(fp);
-	printf("read db/abra_db.txt done (count=%d)\n",k);
+	sprintf(tmp_output,"Done reading '\033[1;29m%d\033[0;0m' entries in '\033[1;29m%s\033[0;0m'.\n",k,"db/abra_db.txt");
+	ShowStatus(tmp_output);
 
 	fp=fopen("db/skill_castnodex_db.txt","r");
 	if(fp==NULL){
@@ -11816,7 +11820,8 @@ int skill_readdb(void)
 			skill_db[i].castnodex[k]=(split2[k])? atoi(split2[k]):atoi(split2[0]);
 	}
 	fclose(fp);
-	printf("read db/skill_castnodex_db.txt done\n");
+	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/skill_castnodex_db.txt");
+	ShowStatus(tmp_output);
 
 	fp=fopen("db/skill_nocast_db.txt","r");
 	if(fp==NULL){
@@ -11845,7 +11850,8 @@ int skill_readdb(void)
 		k++;
 	}
 	fclose(fp);
-	printf("read db/skill_nocast_db done\n");
+	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/skill_nocast_db");
+	ShowStatus(tmp_output);
 
 	return 0;
 }