diff options
| -rw-r--r-- | npc/pre-re/jobs/1-1e/taekwon.txt | 4 | ||||
| -rw-r--r-- | npc/pre-re/scripts_jobs.conf | 2 | ||||
| -rw-r--r-- | src/common/HPM.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/npc/pre-re/jobs/1-1e/taekwon.txt b/npc/pre-re/jobs/1-1e/taekwon.txt index 3e9814dee..e97cb204d 100644 --- a/npc/pre-re/jobs/1-1e/taekwon.txt +++ b/npc/pre-re/jobs/1-1e/taekwon.txt @@ -28,7 +28,7 @@ //================= Description =========================================== //= Official TaeKwon Job Change Quest //================= Current Version ======================================= -//= 1.0 +//= 1.0.1 //========================================================================= -payon,157,141,5 duplicate(Pheonix) Phoenix#TKJobChangePRE 4_M_MONK +payon,157,141,5 duplicate(TKJobChange) Phoenix#TKJobChangePRE 4_M_MONK diff --git a/npc/pre-re/scripts_jobs.conf b/npc/pre-re/scripts_jobs.conf index 139f9de48..14dc97eee 100644 --- a/npc/pre-re/scripts_jobs.conf +++ b/npc/pre-re/scripts_jobs.conf @@ -36,6 +36,8 @@ "npc/pre-re/jobs/1-1/merchant.txt", "npc/pre-re/jobs/1-1/swordman.txt", "npc/pre-re/jobs/1-1/thief.txt", +// - 1-1 Expanded +"npc/pre-re/jobs/1-1e/taekwon.txt", // - Novice "npc/pre-re/jobs/novice/novice.txt", diff --git a/src/common/HPM.c b/src/common/HPM.c index 1fad7102f..c84b447e8 100644 --- a/src/common/HPM.c +++ b/src/common/HPM.c @@ -867,7 +867,7 @@ bool hplugins_get_battle_conf(const char *w1, int *value) { int i; - nullpo_retr(w1, value); + nullpo_retr(false, w1); nullpo_retr(false, value); ARR_FIND(0, VECTOR_LENGTH(HPM->config_listeners[HPCT_BATTLE]), i, strcmpi(w1, VECTOR_INDEX(HPM->config_listeners[HPCT_BATTLE], i).key) == 0); |