From 70c2ecd3b0abcc968b8fefff580d0b8530873965 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 14 Jun 2018 21:51:07 +0300 Subject: Update from hercules. Fix compilation errors. --- src/emap/pc.c | 6 +++--- src/emap/unit.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/emap/pc.c b/src/emap/pc.c index 5eca163..07dd75d 100644 --- a/src/emap/pc.c +++ b/src/emap/pc.c @@ -264,12 +264,12 @@ void epc_validate_levels_pre(void) int i; for (i = 0; i < 7; i++) { if (!pc->db_checkid(i)) continue; - if (i == JOB_WEDDING || i == JOB_XMAS || i == JOB_SUMMER) + if (pc->job_is_dummy(i)) continue; //Classes that do not need exp tables. int j = pc->class2idx(i); - if (!pc->max_level[j][0]) + if (pc->max_level[j][0] == 0) ShowWarning("Class %d does not has a base exp table.\n", i); - if (!pc->max_level[j][1]) + if (pc->max_level[j][1] == 0) ShowWarning("Class %d does not has a job exp table.\n", i); } hookStop(); diff --git a/src/emap/unit.c b/src/emap/unit.c index 873064e..4797d0d 100644 --- a/src/emap/unit.c +++ b/src/emap/unit.c @@ -65,7 +65,7 @@ int eunit_can_move_pre(struct block_list **blPtr) if (sd && ( sd->state.vending || sd->state.buyingstore || - sd->state.blockedmove)) + sd->block_action.move)) { hookStop(); return 0; //Can't move -- cgit v1.2.3-60-g2f50