diff options
| author | shennetsind <ind@henn.et> | 2013-11-06 21:23:31 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-06 21:23:31 -0200 |
| commit | d56017e3d1bf783cfdc67a702d2b70a0a27c8863 (patch) | |
| tree | a47bd0ef6340ce1d011d198f430c7d96d620afe0 /src/map/script.h | |
| parent | 5c94e76753c0cdb4ffb7dabbd6e135f1f7d42ef2 (diff) | |
| parent | 3a3d2297068809d25ca43e19fd2977f97b2728f5 (diff) | |
| download | hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.gz hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.bz2 hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.xz hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.zip | |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/pc.c
Diffstat (limited to 'src/map/script.h')
| -rw-r--r-- | src/map/script.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/script.h b/src/map/script.h index c6cb6070b..6aebc8a30 100644 --- a/src/map/script.h +++ b/src/map/script.h @@ -35,7 +35,7 @@ struct eri; //#define SCRIPT_HASH_SDBM #define SCRIPT_HASH_ELF -#define SCRIPT_EQUIP_TABLE_SIZE 14 +#define SCRIPT_EQUIP_TABLE_SIZE 20 //#define SCRIPT_DEBUG_DISP //#define SCRIPT_DEBUG_DISASM @@ -507,7 +507,7 @@ struct script_interface { int potion_hp, potion_per_hp, potion_sp, potion_per_sp; int potion_target; /* */ - void (*init) (void); + void (*init) (bool minimal); void (*final) (void); int (*reload) (void); /* parse */ |