summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormc_cameri <mc_cameri@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-29 22:32:36 +0000
committermc_cameri <mc_cameri@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-29 22:32:36 +0000
commite038fbc943a6b2ae4f6890c02b497b51329962e3 (patch)
tree7f55af65aaaa9e824ace5a62d60533421b7d6f09
parent241ebe1c9cac17f0b583b10d7227f7d3c87638bd (diff)
downloadhercules-e038fbc943a6b2ae4f6890c02b497b51329962e3.tar.gz
hercules-e038fbc943a6b2ae4f6890c02b497b51329962e3.tar.bz2
hercules-e038fbc943a6b2ae4f6890c02b497b51329962e3.tar.xz
hercules-e038fbc943a6b2ae4f6890c02b497b51329962e3.zip
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@417 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog.txt9
-rw-r--r--mapbug.txt1
-rw-r--r--src/common/showmsg.c2
-rw-r--r--src/map/map.c35
4 files changed, 34 insertions, 13 deletions
diff --git a/Changelog.txt b/Changelog.txt
index 3c7d28b8d..d9d927469 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,14 @@
Date Added
11/29
+ * Added mapbug.txt which is displayed in map-server, displays
+ the last bug or w/e fixed for the map-server [MC Cameri]
+ -You may change it whenever you want
+ -It will only show if mapbug.txt exists
+ -This file must not be included in releases
+ * Made some changes in map_versionscreen() to make it easier to
+ read/change in the source [MC Cameri]
+ * Fixed a typo in _ShowMessage() removing the message caption. [MC Cameri]
+ * Fixed typo in map_helpscreen() showing -h instead of --?. [MC Cameri]
* Added more sc_data checks in skill.c and pc.c [celest]
* Updated Quagmire, Enchant Deadly Poison, Fog Wall [celest]
diff --git a/mapbug.txt b/mapbug.txt
new file mode 100644
index 000000000..462bfc3f4
--- /dev/null
+++ b/mapbug.txt
@@ -0,0 +1 @@
+Last Fix: Added more sc_data checks in skill.c and pc.c [celest]
diff --git a/src/common/showmsg.c b/src/common/showmsg.c
index f60fb88b4..e96f97e22 100644
--- a/src/common/showmsg.c
+++ b/src/common/showmsg.c
@@ -51,7 +51,7 @@ int _ShowMessage(const char *string, enum msg_type flag){ // by MC Cameri
// abort(); // Kill server? Deadly
}
strcpy(output,prefix);
- strcpy(output," ");
+ strcat(output," ");
strcat(output,string);
printf(output);
fflush(stdout);
diff --git a/src/map/map.c b/src/map/map.c
index 0674cd65b..274c9559e 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -2191,10 +2191,10 @@ void do_final(void) {
#endif /* not TXT_ONLY */
}
-void map_helpscreen() {
+void map_helpscreen(int flag) {
puts("Usage: map-server [options]");
puts("Options:");
- puts(" --help, --h, -h, /? Displays this help screen");
+ 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>");
puts(" --atcommand-config <file> Load atcommand configuration from <file>");
@@ -2208,19 +2208,30 @@ void map_helpscreen() {
puts(" (SQL Only)");
puts(" --version, --v, -v, /v Displays the server's version");
puts("\n");
- exit(1);
+ if (flag) exit(1);
}
-void map_versionscreen() {
- printf("\033[1;29meAthena version %d.%02d.%02d, Athena Mod version %d\033[0;0m\n",
+void map_versionscreen(int flag) {
+ printf("\033[1;29m" "eAthena version %d.%02d.%02d, Athena Mod version %d" "\033[0;0m\n",
ATHENA_MAJOR_VERSION, ATHENA_MINOR_VERSION, ATHENA_REVISION,
ATHENA_MOD_VERSION);
- puts("\033[1;32mWebsite/Forum:\033[0;0m http://eathena.deltaanime.net/");
- puts("\033[1;32mDownload URL:\033[0;0m http://eathena.systeminplace.net/");
- puts("\033[1;32mIRC Channel:\033[0;0m irc://irc.deltaanime.net/#athena");
+ 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.");
if (ATHENA_RELEASE_FLAG) ShowNotice("This version is not for release.\n");
- exit(1);
+ if (flag) exit(1);
+}
+
+void map_displaybug(int flag) {
+ FILE *fp;
+ char line[1024];
+ if ((fp=fopen("mapbug.txt","r"))!=NULL) {
+ while(fgets(line,1023,fp)) printf(line);
+ fclose(fp);
+ } //don't show anything if file doesnt exist
+ // this is only here when develing
+ if (flag) exit(1);
}
/*======================================================
@@ -2243,15 +2254,15 @@ int do_init(int argc, char *argv[]) {
unsigned char *SCRIPT_CONF_NAME = "conf/script_athena.conf";
unsigned char *MSG_CONF_NAME = "conf/msg_athena.conf";
unsigned char *GRF_PATH_FILENAME = "conf/grf-files.txt";
-
+ map_displaybug(0);
srand(gettick());
for (i = 1; i < argc ; i++) {
if (strcmp(argv[i], "--help") == 0 || strcmp(argv[i], "--h") == 0 || strcmp(argv[i], "--?") == 0 || strcmp(argv[i], "/?") == 0)
- map_helpscreen();
+ map_helpscreen(1);
if (strcmp(argv[i], "--version") == 0 || strcmp(argv[i], "--v") == 0 || strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "/v") == 0)
- map_versionscreen();
+ map_versionscreen(1);
else if (strcmp(argv[i], "--map_config") == 0 || strcmp(argv[i], "--map-config") == 0)
MAP_CONF_NAME=argv[i+1];
else if (strcmp(argv[i],"--battle_config") == 0 || strcmp(argv[i],"--battle-config") == 0)