diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-06-14 21:51:07 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-06-14 21:51:07 +0300 |
| commit | 70c2ecd3b0abcc968b8fefff580d0b8530873965 (patch) | |
| tree | 256e4a7f2fc2965f4e0c0a5c8fae4df06cc78ec9 | |
| parent | cbd196f3d0f747827af6c571ffb92a1d1606c0d5 (diff) | |
| download | evol-hercules-70c2ecd3b0abcc968b8fefff580d0b8530873965.tar.gz evol-hercules-70c2ecd3b0abcc968b8fefff580d0b8530873965.tar.bz2 evol-hercules-70c2ecd3b0abcc968b8fefff580d0b8530873965.tar.xz evol-hercules-70c2ecd3b0abcc968b8fefff580d0b8530873965.zip | |
Update from hercules. Fix compilation errors.
| -rw-r--r-- | src/emap/pc.c | 6 | ||||
| -rw-r--r-- | 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 |