diff options
| -rw-r--r-- | Changelog.txt | 2 | ||||
| -rw-r--r-- | Dev/bugs.txt | 6 | ||||
| -rw-r--r-- | src/common/showmsg.c | 21 | ||||
| -rw-r--r-- | src/map/map.c | 10 |
4 files changed, 21 insertions, 18 deletions
diff --git a/Changelog.txt b/Changelog.txt index 8ea2d9b9a..69d0e7548 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,5 +1,7 @@ Date Added 11/28 + * Changed MSG_INFO color to bright white, since bright blue want so bright... [MC Cameri] + * Made Map Removed: %d string be displayed only if there were maps removed. [MC Cameri] * Fixed online system for char not sending players left "online" to login when restarting [Wizputer] * Fixed damage formula of Cart revolution: 150% +1% per 80ea [Lupus] * Removed 2x Chance of Equipment Breaking during CRITICAL attacks [Lupus] diff --git a/Dev/bugs.txt b/Dev/bugs.txt index 81e707d07..9597f8f08 100644 --- a/Dev/bugs.txt +++ b/Dev/bugs.txt @@ -39,10 +39,6 @@ Problem: With 1025 client, some NPC sprites look different (i.e. Black Jack's NP Assigned: N/A Progess: 0% -Problem: Thiefs can steal ZENY / items from TREASURE chests!!baaaah!! and Guardians! -Assigned: N/A -Progess: 0% - Problem: Joker card 4139 lets anyone to steal money / zeny. Just like he's a thief. It shoul;d be revised - success rates lowered and "steal item" disabled Assigned: N/A Progess: 0% @@ -65,7 +61,7 @@ Progess: ~100% (Notes: Maybe there's a less messy way? xP) Problem: Char server and Map server crash when you recall some one. Assigned: N/A -Progess: 0% +Progess: 0% Problem: Monk's Skill ROOT instantly reboots server Assigned: Celest diff --git a/src/common/showmsg.c b/src/common/showmsg.c index b65181f3a..f60fb88b4 100644 --- a/src/common/showmsg.c +++ b/src/common/showmsg.c @@ -19,38 +19,39 @@ int _ShowMessage(const char *string, enum msg_type flag){ // by MC Cameri } switch (flag) { case MSG_STATUS: //Bright Green (To inform about good things) - strcpy(prefix,"\033[1;32m[Status]\033[0;0m: "); + strcpy(prefix,"\033[1;32m[Status]\033[0;0m:"); break; /* //Do we really need this now? [MC Cameri] case MSG_SQL: //Bright Violet (For dumping out anything related with SQL) - strcpy(prefix,"\033[1;35m[SQL]\033[0;0m: "); + strcpy(prefix,"\033[1;35m[SQL]\033[0;0m:"); break; */ - case MSG_INFORMATION: //Bright Blue (Variable information) - strcpy(prefix,"\033[1;34m[Info]\033[0;0m: "); + case MSG_INFORMATION: //Bright White (Variable information) + strcpy(prefix,"\033[1;29m[Info]\033[0;0m:"); break; case MSG_NOTICE: //Bright White (Less than a warning) - strcpy(prefix,"\033[1;29m[Notice]\033[0;0m: "); + strcpy(prefix,"\033[1;29m[Notice]\033[0;0m:"); break; case MSG_WARNING: //Bright Yellow - strcpy(prefix,"\033[1;33m[Warning]\033[0;0m: "); + strcpy(prefix,"\033[1;33m[Warning]\033[0;0m:"); break; case MSG_ERROR: //Bright Red (Regular errors) - strcpy(prefix,"\033[1;31m[Error]\033[0;0m: "); + strcpy(prefix,"\033[1;31m[Error]\033[0;0m:"); break; case MSG_FATALERROR: //Bright Red (Fatal errors, abort(); if possible) - strcpy(prefix,"\033[1;31m[Fatal Error]\033[0;0m: "); + strcpy(prefix,"\033[1;31m[Fatal Error]\033[0;0m:"); break; default: ShowError("In function _ShowMessage() -> Invalid flag passed.\n"); return 1; } - output = (char*)malloc(sizeof(char)*(strlen(prefix)+strlen(string))+1); + output = (char*)malloc(sizeof(char)*(strlen(prefix)+strlen(string)+2)); // +2: space and a \0 if (output == NULL) { return 1; -// abort(); // Kill server? +// abort(); // Kill server? Deadly } strcpy(output,prefix); + strcpy(output," "); strcat(output,string); printf(output); fflush(stdout); diff --git a/src/map/map.c b/src/map/map.c index 56e489639..4addd1a26 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -1656,9 +1656,13 @@ int map_readallmap(void) { } free(waterlist); - printf("\rMaps Loaded: %d %60s\n",map_num,""); - printf("\rMaps Removed: %d \n",maps_removed); - + printf("\r"); + snprintf(tmp_output,sizeof(tmp_output),"Maps Loaded: \033[1;29m%d\033[0;0m %50s\n",map_num,""); + ShowInfo(tmp_output); + if (maps_removed) { + snprintf(tmp_output,sizeof(tmp_output),"Maps Removed: %d\n",maps_removed); + ShowNotice(tmp_output); + } return 0; } |