summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-07-09 07:00:53 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-07-09 07:00:53 +0000
commit912dfc3af719b251d8a5036e76fb2733dddad46c (patch)
tree27d0f57bdb92b7e39c5a1a384f65d53a89b5754d
parent88be51e8cb18a704152b76b98d49a2bda6fff0a9 (diff)
downloadhercules-912dfc3af719b251d8a5036e76fb2733dddad46c.tar.gz
hercules-912dfc3af719b251d8a5036e76fb2733dddad46c.tar.bz2
hercules-912dfc3af719b251d8a5036e76fb2733dddad46c.tar.xz
hercules-912dfc3af719b251d8a5036e76fb2733dddad46c.zip
* Removed duplicate entries for Gunslinger and Ninja in msg_athena.conf (since r5506).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14892 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--conf/Changelog.txt2
-rw-r--r--conf/msg_athena.conf4
-rw-r--r--src/map/pc.c8
4 files changed, 8 insertions, 8 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index c9ba2b510..e5e1b81cc 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,5 +1,7 @@
Date Added
+2011/07/09
+ * Removed duplicate entries for Gunslinger and Ninja in msg_athena.conf (since r5506). [Ai4rei]
2011/07/07
* Replaced compress/uncompress inline code (encode_zip/decode_zip) with the respective zlib library calls while keeping 3rdparty calls inside common code (follow up to r14888, related r14808). [Ai4rei]
2011/07/06
diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index 71e3b75ca..1b4b45f05 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,5 +1,7 @@
Date Added
+2011/07/09
+ * Rev. 14892 Removed 'msg_athena.conf' messages 619 and 620 (duplicates to 572 and 573) (since r5506). [Ai4rei]
2011/05/13
* Rev. 14812 Added settings 'cashshop_show_points' and 'mail_show_status', both disabled by default, as the messages they control are custom (follow up to r11548 and r12264). [Ai4rei]
- Moved custom cash point update messages to 'msg_athena.conf' (IDs 504~506).
diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf
index 98c20c361..ce02dfb30 100644
--- a/conf/msg_athena.conf
+++ b/conf/msg_athena.conf
@@ -529,8 +529,8 @@
616: Taekwon
617: Star Gladiator
618: Soul Linker
-619: Gunslinger
-620: Ninja
+//619: FREE
+//620: FREE
621: Summer
//...
650: Unknown Job
diff --git a/src/map/pc.c b/src/map/pc.c
index ded499f2d..65b89f8b4 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4691,7 +4691,8 @@ const char* job_name(int class_)
case JOB_WEDDING:
case JOB_SUPER_NOVICE:
-
+ case JOB_GUNSLINGER:
+ case JOB_NINJA:
case JOB_XMAS:
return msg_txt(570 - JOB_WEDDING+class_);
@@ -4772,11 +4773,6 @@ const char* job_name(int class_)
return msg_txt(617);
case JOB_SOUL_LINKER:
return msg_txt(618);
-
- case JOB_GUNSLINGER:
- return msg_txt(619);
- case JOB_NINJA:
- return msg_txt(620);
default:
return msg_txt(650);