summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-23 00:49:12 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-23 00:49:12 +0000
commit89974727211311dc13f3c823ab6f565f8942455b (patch)
tree3386265c9eead9e9cc486141ab76eb8240fcdaf8
parentb0ede9719edd4bed12a20c5d105388a51ecc8724 (diff)
downloadhercules-89974727211311dc13f3c823ab6f565f8942455b.tar.gz
hercules-89974727211311dc13f3c823ab6f565f8942455b.tar.bz2
hercules-89974727211311dc13f3c823ab6f565f8942455b.tar.xz
hercules-89974727211311dc13f3c823ab6f565f8942455b.zip
* Fixed map-server displaying 'PK Mode' notice only for pk_mode 1 (since r8402).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14491 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/map.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 403b62c7e..e7361b53c 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -11,6 +11,7 @@ Date Added
- Fixed guild member position, hair, hair color, gender, class and level could potentially become corrupted due to shorts being read as ints (partially since r2986).
* Fixed disguising as player clone causing the client to crash while looking for non-existing NPC sprites (bugreport:4428, since r14387, related r14383). [Ai4rei]
* Fixed Rogue skill Steal Coin working on boss monsters (bugreport:2442). [Ai4rei]
+ * Fixed map-server displaying 'PK Mode' notice only for pk_mode 1 (since r8402). [Ai4rei]
2010/11/21
* Added msinttypes (rev. 26, http://msinttypes.googlecode.com/svn/trunk/) portability framework for Visual C++ compilers (related bugreport:4059). [Ai4rei]
* Added 64-bit variants of the socket and buffer I/O macros. [Ai4rei]
diff --git a/src/map/map.c b/src/map/map.c
index e696b874d..309095ff0 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -3676,7 +3676,7 @@ int do_init(int argc, char *argv[])
//##TODO invoke a CONSOLE_START plugin event
}
- if (battle_config.pk_mode == 1)
+ if (battle_config.pk_mode)
ShowNotice("Server is running on '"CL_WHITE"PK Mode"CL_RESET"'.\n");
ShowStatus("Server is '"CL_GREEN"ready"CL_RESET"' and listening on port '"CL_WHITE"%d"CL_RESET"'.\n\n", map_port);