diff options
| author | Mysterious <mysteriousragnarok@hotmail.com> | 2013-02-14 18:56:08 -0800 |
|---|---|---|
| committer | Mysterious <mysteriousragnarok@hotmail.com> | 2013-02-14 18:56:08 -0800 |
| commit | 7fa99e3524cb9cafdc797bcfc779ae5e0f730c8e (patch) | |
| tree | 3a6cb20957b1486d92f7f017e0e6048951112d87 /src/map/script.c | |
| parent | 52e8c428bfc64a2285710256496331bfff19b651 (diff) | |
| parent | 74c31098137aae3e0bfc962e4685a7050409df78 (diff) | |
| download | hercules-7fa99e3524cb9cafdc797bcfc779ae5e0f730c8e.tar.gz hercules-7fa99e3524cb9cafdc797bcfc779ae5e0f730c8e.tar.bz2 hercules-7fa99e3524cb9cafdc797bcfc779ae5e0f730c8e.tar.xz hercules-7fa99e3524cb9cafdc797bcfc779ae5e0f730c8e.zip | |
Merge pull request #4 from HerculesWS/master
Merging Hercules Changes
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/script.c b/src/map/script.c index b89121ee4..fe00599a6 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -7347,7 +7347,7 @@ BUILDIN_FUNC(strnpcinfo) // aegis->athena slot position conversion table -static unsigned int equip[] = {EQP_HEAD_TOP,EQP_ARMOR,EQP_HAND_L,EQP_HAND_R,EQP_GARMENT,EQP_SHOES,EQP_ACC_L,EQP_ACC_R,EQP_HEAD_MID,EQP_HEAD_LOW}; +static unsigned int equip[] = {EQP_HEAD_TOP,EQP_ARMOR,EQP_HAND_L,EQP_HAND_R,EQP_GARMENT,EQP_SHOES,EQP_ACC_L,EQP_ACC_R,EQP_HEAD_MID,EQP_HEAD_LOW,EQP_COSTUME_HEAD_LOW,EQP_COSTUME_HEAD_MID,EQP_COSTUME_HEAD_TOP}; /*========================================== * GetEquipID(Pos); Pos: 1-10 @@ -16992,10 +16992,10 @@ BUILDIN_FUNC(is_function) { * get_revision() -> retrieves the current svn revision (if available) **/ BUILDIN_FUNC(get_revision) { - const char * revision; + const char *svn = get_svn_revision(); - if ( (revision = get_svn_revision()) != 0 ) - script_pushint(st,atoi(revision)); + if ( svn[0] != HERC_UNKNOWN_VER ) + script_pushint(st,atoi(svn)); else script_pushint(st,-1);//unknown |