diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-10 16:43:57 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-10 16:43:57 +0000 |
| commit | 0ca6b9825045140b6bec47c7289c6513f95cc02f (patch) | |
| tree | 6b145f9a32e3b5c50bb67fbefdcf69b5a7c50b9a /src/map/pc.c | |
| parent | 6355be1e921b0a7e94b5e37eabbeebe1edbd0c25 (diff) | |
| download | hercules-0ca6b9825045140b6bec47c7289c6513f95cc02f.tar.gz hercules-0ca6b9825045140b6bec47c7289c6513f95cc02f.tar.bz2 hercules-0ca6b9825045140b6bec47c7289c6513f95cc02f.tar.xz hercules-0ca6b9825045140b6bec47c7289c6513f95cc02f.zip | |
* Moved AFM map check to map_mapname2mapid
* Added USE_AFM and USE_AF2 to be used later
* Modified sc_data check in pc_damage
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@537 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index b425ead03..537aa91b8 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -3775,13 +3775,8 @@ int pc_setpos(struct map_session_data *sd,char *mapname_org,int x,int y,int clrt strcat(mapname,".gat"); } - // If we can't find the .gat map try .afm instead [celest] - if ((m=map_mapname2mapid(mapname))<0) { - char afm_name[16] = ""; - strncpy(afm_name, mapname, strlen(mapname) - 4); - strcat(afm_name, ".afm"); - m=map_mapname2mapid(afm_name); - } + m=map_mapname2mapid(mapname); + if(m<0){ if(sd->mapname[0]){ int ip,port; @@ -5382,7 +5377,9 @@ int pc_damage(struct block_list *src,struct map_session_data *sd,int damage) pc_stop_walking(sd,3); else if(sd->sc_data[SC_ENDURE].timer != -1 && src->type==BL_MOB && (--sd->sc_data[SC_ENDURE].val2) <= 0) skill_status_change_end(&sd->bl, SC_ENDURE, -1); - } + } else + pc_stop_walking(sd,3); + // 演奏/ダンスの中? if(damage > sd->status.max_hp>>2) skill_stop_dancing(&sd->bl,0); |