git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@643 54d463be-8e91-2dee-dedb-b68131a5f0ec

8 files changed, 46 insertions, 44 deletions

diff --git a/src/map/guild.c b/src/map/guild.c
index ec2a636b9..83da2a809 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -128,7 +128,7 @@ static int guild_read_castledb(void)
 		ln++;
 	}
 	fclose(fp);
-	sprintf(tmp_output,"Done reading '\033[1;29m%d\033[0;0m' entries in '\033[1;29m%s\033[0;0m'.\n",ln,"db/castle_db.txt");
+	sprintf(tmp_output,"Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",ln,"db/castle_db.txt");
 	ShowStatus(tmp_output);
 	return 0;
 }
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index 38795547e..a68afd61f 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -384,7 +384,7 @@ static int itemdb_readdb(void)
 			id->equip_script = parse_script(p,lines);
 		}
 		fclose(fp);
-		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]);
+		sprintf(tmp_output,"Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",ln,filename[i]);
 		ShowStatus(tmp_output);
 	}
 	return 0;
@@ -460,7 +460,7 @@ static int itemdb_read_randomitem()
 			ln++;
 		}
 		fclose(fp);
-		sprintf(tmp_output,"Done reading '\033[1;29m%d\033[0;0m' entries in '\033[1;29m%s\033[0;0m'.\n",*pc,fn);
+		sprintf(tmp_output,"Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",*pc,fn);
 		ShowStatus(tmp_output);
 	}
 
@@ -510,7 +510,7 @@ static int itemdb_read_itemavail(void)
 		ln++;
 	}
 	fclose(fp);
-	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");
+	sprintf(tmp_output,"Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",ln,"db/item_avail.txt");
 	ShowStatus(tmp_output);
 	return 0;
 }
@@ -552,7 +552,7 @@ static int itemdb_read_itemnametable(void)
 		p++;
 	}
 	free(buf);
-	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","data\\idnum2itemdisplaynametable.txt");
+	sprintf(tmp_output,"Done reading '"CL_WHITE"%s"CL_RESET"'.\n","data\\idnum2itemdisplaynametable.txt");
 	ShowStatus(tmp_output);
 
 	return 0;
@@ -588,7 +588,7 @@ static int itemdb_read_cardillustnametable(void)
 		p++;
 	}
 	free(buf);
-	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","data\\num2cardillustnametable.txt");
+	sprintf(tmp_output,"Done reading '"CL_WHITE"%s"CL_RESET"'.\n","data\\num2cardillustnametable.txt");
 	ShowStatus(tmp_output);
 
 	return 0;
@@ -633,7 +633,7 @@ static int itemdb_read_noequip(void)
 
 	}
 	fclose(fp);
-	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_noequip.txt");
+	sprintf(tmp_output,"Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",ln,"db/item_noequip.txt");
 	ShowStatus(tmp_output);
 	return 0;
 }
@@ -781,7 +781,7 @@ static int itemdb_read_sqldb(void)
 			{
 				printf("Database server error (retrieving rows from %s): %s\n", item_db_db, mysql_error(&mmysql_handle));
 			}
-			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);
+			sprintf(tmp_output,"Done reading '"CL_WHITE"%lu"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",(unsigned long) mysql_num_rows(sql_res),item_db_db);
 			ShowStatus(tmp_output);
 		}
 		else
diff --git a/src/map/map.c b/src/map/map.c
index a59f45818..777818ec4 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1209,7 +1209,7 @@ void map_removenpc(void) {
         }
     }
 
-    sprintf(tmp_output,"Successfully removed and freed from memory '\033[1;29m%d\033[0;0m' NPCs.\n",n);
+    sprintf(tmp_output,"Successfully removed and freed from memory '"CL_WHITE"%d"CL_RESET"' NPCs.\n",n);
 	ShowStatus(tmp_output);
 }
 
@@ -2014,14 +2014,14 @@ int log_sql_init(void){
     mysql_init(&mmysql_handle);
 
 	//DB connection start
-	printf("\033[1;29m[SQL]\033[0;0m: Connecting to Log Database \033[1;29m%s\033[0;0m At \033[1;29m%s\033[0;0m...\n",log_db,log_db_ip);
+	printf(""CL_WHITE"[SQL]"CL_RESET": Connecting to Log Database "CL_WHITE"%s"CL_RESET" At "CL_WHITE"%s"CL_RESET"...\n",log_db,log_db_ip);
 	if(!mysql_real_connect(&mmysql_handle, log_db_ip, log_db_id, log_db_pw,
 		log_db ,log_db_port, (char *)NULL, 0)) {
 			//pointer check
-			printf("\033[1;29m[SQL Error]\033[0;0m: %s\n",mysql_error(&mmysql_handle));
+			printf(""CL_WHITE"[SQL Error]"CL_RESET": %s\n",mysql_error(&mmysql_handle));
 			exit(1);
 	} else {
-		printf("\033[1;29m[SQL]\033[0;0m: Successfully \033[1;32mconnected\033[0;0m to Database \033[1;29m%s\033[0;0m.\n", log_db);
+		printf(""CL_WHITE"[SQL]"CL_RESET": Successfully '"CL_GREEN"connected"CL_RESET"' to Database '"CL_WHITE"%s"CL_RESET"'.\n", log_db);
 	}
 
 	return 0;
@@ -2261,6 +2261,8 @@ void do_final(void) {
 void map_helpscreen(int flag) {
 	puts("Usage: map-server [options]");
 	puts("Options:");
+	puts(CL_WHITE"  Commands\t\t\tDescription"CL_RESET);
+	puts("---------------------------------------------");
 	puts("  --help, --h, --?, /?		Displays this help screen");
 	puts("  --map-config <file>		Load map-server configuration from <file>");
 	puts("  --battle-config <file>	Load battle configuration from <file>");
@@ -2279,13 +2281,13 @@ void map_helpscreen(int flag) {
 }
 
 void map_versionscreen(int flag) {
-	printf("\033[1;29m" "eAthena version %d.%02d.%02d, Athena Mod version %d" "\033[0;0m\n",
+	printf("CL_WHITE" "eAthena version %d.%02d.%02d, Athena Mod version %d" CL_RESET"\n",
 		ATHENA_MAJOR_VERSION, ATHENA_MINOR_VERSION, ATHENA_REVISION,
 		ATHENA_MOD_VERSION);
-	puts("\033[1;32m" "Website/Forum:" "\033[0;0m" "\thttp://eathena.deltaanime.net/");
-	puts("\033[1;32m" "Download URL:" "\033[0;0m" "\thttp://eathena.systeminplace.net/");
-	puts("\033[1;32m" "IRC Channel:" "\033[0;0m" "\tirc://irc.deltaanime.net/#athena");
-	puts("\nOpen \033[1;29mreadme.html\033[0;0m for more information.");
+	puts(CL_GREEN "Website/Forum:" "CL_RESET" "\thttp://eathena.deltaanime.net/");
+	puts(CL_GREEN "Download URL:" "CL_RESET" "\thttp://eathena.systeminplace.net/");
+	puts(CL_GREEN "IRC Channel:" "CL_RESET" "\tirc://irc.deltaanime.net/#athena");
+	puts("\nOpen "CL_WHITE"readme.html"CL_RESET" for more information.");
 	if (ATHENA_RELEASE_FLAG) ShowNotice("This version is not for release.\n");
 	if (flag) exit(1);
 }
@@ -2457,7 +2459,7 @@ int do_init(int argc, char *argv[]) {
 	if (imalive_on)
 		add_timer_interval(gettick()+10, imalive_timer,0,0,imalive_time*1000);
 
-	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);
+	sprintf(tmp_output,"Server is '"CL_GREEN"ready"CL_RESET"' and listening on port '"CL_WHITE"%d"CL_RESET"'.\n\n", map_port);
 	ShowStatus(tmp_output);
 
 	ticks = gettick();
diff --git a/src/map/mob.c b/src/map/mob.c
index a2ddc9e99..27b2741c6 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -3907,7 +3907,7 @@ static int mob_readdb(void)
 			mob_db[class].clothes_color=0; //Add for player monster dye - Valaris
 		}
 		fclose(fp);
-		sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n",filename[i]);
+		sprintf(tmp_output,"Done reading '"CL_WHITE"%s"CL_RESET"'.\n",filename[i]);
 		ShowStatus(tmp_output);
 	}
 	return 0;
@@ -3973,7 +3973,7 @@ static int mob_readdb_mobavail(void)
 		ln++;
 	}
 	fclose(fp);
-	sprintf(tmp_output,"Done reading '\033[1;29m%d\033[0;0m' entries in '\033[1;29m%s\033[0;0m'.\n",ln,"db/mob_avail.txt");
+	sprintf(tmp_output,"Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",ln,"db/mob_avail.txt");
 	ShowStatus(tmp_output);
 	return 0;
 }
@@ -4021,7 +4021,7 @@ static int mob_read_randommonster(void)
 				mob_db[class].summonper[i]=per;
 		}
 		fclose(fp);
-		sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n",mobfile[i]);
+		sprintf(tmp_output,"Done reading '"CL_WHITE"%s"CL_RESET"'.\n",mobfile[i]);
 		ShowStatus(tmp_output);
 	}
 	return 0;
@@ -4174,7 +4174,7 @@ static int mob_readskilldb(void)
 			mob_db[mob_id].maxskill=i+1;
 		}
 		fclose(fp);
-		sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n",filename[x]);
+		sprintf(tmp_output,"Done reading '"CL_WHITE"%s"CL_RESET"'.\n",filename[x]);
 		ShowStatus(tmp_output);
 	}
 	return 0;
@@ -4331,7 +4331,7 @@ static int mob_read_sqldb(void)
 			mob_db[class].head_buttom=0;
 		}
 		mysql_free_result(sql_res);
-		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);
+		sprintf(tmp_output,"Done reading '"CL_WHITE"%lu"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",ln,mob_db_db);
 		ShowStatus(tmp_output);
 	}
 	return 0;
diff --git a/src/map/npc.c b/src/map/npc.c
index 70bb4aa12..d9f515cfd 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -435,8 +435,8 @@ 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");
-	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"));
+	sprintf(tmp_output,"Event '"CL_WHITE"OnInit"CL_RESET"' executed with '"
+	CL_WHITE"%d"CL_RESET"' NPCs.\n",npc_event_doall("OnInit"));
 	ShowStatus(tmp_output);
 
 	add_timer_interval(gettick()+100,
diff --git a/src/map/pc.c b/src/map/pc.c
index 40d0cad79..4e90aebd2 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -834,7 +834,7 @@ int pc_authok(int id, int login_id2, time_t connect_until_time, struct mmo_chars
 	//printf("pc: OnPCLogin event done. (%d events)\n", npc_event_doall("OnPCLogin") );
 	if (npc_name2id("PCLoginEvent")) {
 		run_script(npc_name2id("PCLoginEvent")->u.scr.script,0,sd->bl.id,npc_name2id("PCLoginEvent")->bl.id); // PCLoginNPC
-		ShowStatus("Event '\033[1;29mPCLoginEvent\033[0;0m' executed.\n");
+		ShowStatus("Event '"CL_WHITE"PCLoginEvent"CL_RESET"' executed.\n");
 	}
 	// Send friends list
 	clif_friends_list_send(sd);
@@ -7755,7 +7755,7 @@ int pc_readdb(void)
 			break;
 	}
 	fclose(fp);
-	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/exp.txt");
+	sprintf(tmp_output,"Done reading '"CL_WHITE"%s"CL_RESET"'.\n","db/exp.txt");
 	ShowStatus(tmp_output);
 
 	// JOB補正?値１
@@ -7790,7 +7790,7 @@ int pc_readdb(void)
 			break;
 	}
 	fclose(fp);
-	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/job_db1.txt");
+	sprintf(tmp_output,"Done reading '"CL_WHITE"%s"CL_RESET"'.\n","db/job_db1.txt");
 	ShowStatus(tmp_output);
 
 	// JOBボ?ナス
@@ -7819,7 +7819,7 @@ int pc_readdb(void)
 			break;
 	}
 	fclose(fp);
-	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/job_db2.txt");
+	sprintf(tmp_output,"Done reading '"CL_WHITE"%s"CL_RESET"'.\n","db/job_db2.txt");
 	ShowStatus(tmp_output);
 
 	// JOBボ?ナス2 ?生職用
@@ -7844,7 +7844,7 @@ int pc_readdb(void)
 			break;
 	}
 	fclose(fp);
-	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/job_db2-2.txt");
+	sprintf(tmp_output,"Done reading '"CL_WHITE"%s"CL_RESET"'.\n","db/job_db2-2.txt");
 	ShowStatus(tmp_output);
 
 	// スキルツリ?
@@ -7886,7 +7886,7 @@ int pc_readdb(void)
 		}
 	}
 	fclose(fp);
-	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/skill_tree.txt");
+	sprintf(tmp_output,"Done reading '"CL_WHITE"%s"CL_RESET"'.\n","db/skill_tree.txt");
 	ShowStatus(tmp_output);
 
 	// ?性修正テ?ブル
@@ -7933,7 +7933,7 @@ int pc_readdb(void)
 		}
 	}
 	fclose(fp);
-	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/attr_fix.txt");
+	sprintf(tmp_output,"Done reading '"CL_WHITE"%s"CL_RESET"'.\n","db/attr_fix.txt");
 	ShowStatus(tmp_output);
 
 	// サイズ補正テ?ブル
@@ -7963,7 +7963,7 @@ int pc_readdb(void)
 		i++;
 	}
 	fclose(fp);
-	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/size_fix.txt");
+	sprintf(tmp_output,"Done reading '"CL_WHITE"%s"CL_RESET"'.\n","db/size_fix.txt");
 	ShowStatus(tmp_output);
 
 	// 精?デ?タテ?ブル
@@ -8000,7 +8000,7 @@ int pc_readdb(void)
 		i++;
 	}
 	fclose(fp); //Lupus. close this file!!!
-	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/refine_db.txt");
+	sprintf(tmp_output,"Done reading '"CL_WHITE"%s"CL_RESET"'.\n","db/refine_db.txt");
 	ShowStatus(tmp_output);
 
 	return 0;
@@ -8042,7 +8042,7 @@ static void pc_statpointdb(void)
 	buf_stat = (char *) malloc (end + 1);
 	l = fread(buf_stat,1,end,stp);
 	fclose(stp);
-	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/statpoint.txt");
+	sprintf(tmp_output,"Done reading '"CL_WHITE"%s"CL_RESET"'.\n","db/statpoint.txt");
 	ShowStatus(tmp_output);
 //	printf("read db/statpoint.txt done (size=%d)\n",l);
 
diff --git a/src/map/pet.c b/src/map/pet.c
index 878c0aea5..c07fbc179 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -1623,7 +1623,7 @@ int read_petdb()
 			j++;
 		}
 		fclose(fp);
-		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]);
+		sprintf(tmp_output,"Done reading '"CL_WHITE"%d"CL_RESET"' pets in '"CL_WHITE"%s"CL_RESET"'.\n",j,filename[i]);
 		ShowStatus(tmp_output);
 	}
 	return 0;
diff --git a/src/map/skill.c b/src/map/skill.c
index 221118628..1f0e689f4 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -11588,7 +11588,7 @@ int skill_readdb(void)
 			skill_db[i].blewcount[k]=(split2[k])? atoi(split2[k]):atoi(split2[0]);
 	}
 	fclose(fp);
-	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/skill_db.txt");
+	sprintf(tmp_output,"Done reading '"CL_WHITE"%s"CL_RESET"'.\n","db/skill_db.txt");
 	ShowStatus(tmp_output);
 
 	fp=fopen("db/skill_require_db.txt","r");
@@ -11728,7 +11728,7 @@ int skill_readdb(void)
 		skill_db[i].amount[9]=atoi(split[29]);
 	}
 	fclose(fp);
-	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/skill_require_db.txt");
+	sprintf(tmp_output,"Done reading '"CL_WHITE"%s"CL_RESET"'.\n","db/skill_require_db.txt");
 	ShowStatus(tmp_output);
 
 	/* キャスティングデ?タベ?ス */
@@ -11793,7 +11793,7 @@ int skill_readdb(void)
 			skill_db[i].upkeep_time2[k]=(split2[k])? atoi(split2[k]):atoi(split2[0]);
 	}
 	fclose(fp);
-	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/skill_cast_db.txt");
+	sprintf(tmp_output,"Done reading '"CL_WHITE"%s"CL_RESET"'.\n","db/skill_cast_db.txt");
 	ShowStatus(tmp_output);
 
 	/* 製造系スキルデ?タベ?ス */
@@ -11837,7 +11837,7 @@ int skill_readdb(void)
 				break;
 		}
 		fclose(fp);
-		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]);
+		sprintf(tmp_output,"Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",k,filename[m]);
 		ShowStatus(tmp_output);
 	}
 
@@ -11876,7 +11876,7 @@ int skill_readdb(void)
 			break;
 	}
 	fclose(fp);
-	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");
+	sprintf(tmp_output,"Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",k,"db/create_arrow_db.txt");
 	ShowStatus(tmp_output);
 
 	memset(skill_abra_db,0,sizeof(skill_abra_db));
@@ -11910,7 +11910,7 @@ int skill_readdb(void)
 			break;
 	}
 	fclose(fp);
-	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");
+	sprintf(tmp_output,"Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",k,"db/abra_db.txt");
 	ShowStatus(tmp_output);
 
 	fp=fopen("db/skill_castnodex_db.txt","r");
@@ -11945,7 +11945,7 @@ int skill_readdb(void)
 			skill_db[i].castnodex[k]=(split2[k])? atoi(split2[k]):atoi(split2[0]);
 	}
 	fclose(fp);
-	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/skill_castnodex_db.txt");
+	sprintf(tmp_output,"Done reading '"CL_WHITE"%s"CL_RESET"'.\n","db/skill_castnodex_db.txt");
 	ShowStatus(tmp_output);
 
 	fp=fopen("db/skill_nocast_db.txt","r");
@@ -11975,7 +11975,7 @@ int skill_readdb(void)
 		k++;
 	}
 	fclose(fp);
-	sprintf(tmp_output,"Done reading '\033[1;29m%s\033[0;0m'.\n","db/skill_nocast_db");
+	sprintf(tmp_output,"Done reading '"CL_WHITE"%s"CL_RESET"'.\n","db/skill_nocast_db");
 	ShowStatus(tmp_output);
 
 	return 0;