diff options
| author | Hercules.ws <Hercules@efficiently.awesome> | 2014-03-23 00:34:07 +0100 |
|---|---|---|
| committer | HerculesWSAPI <Hercules@efficiently.awesome> | 2014-03-23 00:34:07 +0100 |
| commit | 4f4e846b91a5b69f4a03339cc8991310ed9fe04e (patch) | |
| tree | 1e00a0f2253ad0aad00c91fbfdb277fe296e7f4b /src | |
| parent | a830f934d0e60a63f6491a0ccc6e98341d12af36 (diff) | |
| download | hercules-4f4e846b91a5b69f4a03339cc8991310ed9fe04e.tar.gz hercules-4f4e846b91a5b69f4a03339cc8991310ed9fe04e.tar.bz2 hercules-4f4e846b91a5b69f4a03339cc8991310ed9fe04e.tar.xz hercules-4f4e846b91a5b69f4a03339cc8991310ed9fe04e.zip | |
HPM Hooks Update
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/path.c | 22 | ||||
| -rw-r--r-- | src/map/skill.c | 4 | ||||
| -rw-r--r-- | src/map/status.c | 20 |
3 files changed, 23 insertions, 23 deletions
diff --git a/src/map/path.c b/src/map/path.c index 3b33fce65..ae9fc389d 100644 --- a/src/map/path.c +++ b/src/map/path.c @@ -82,17 +82,17 @@ int path_blownpos(int16 m,int16 x0,int16 y0,int16 dx,int16 dy,int count) dy=(dy>0)?1:((dy<0)?-1:0); } - while( count > 0 && (dx != 0 || dy != 0) ) {
- if( !md->getcellp(md,x0+dx,y0+dy,CELL_CHKPASS) ) {
- break;
- }
-
- x0 += dx;
- y0 += dy;
- count--;
- }
-
- return (x0<<16)|y0; //TODO: use 'struct point' here instead?
+ while( count > 0 && (dx != 0 || dy != 0) ) { + if( !md->getcellp(md,x0+dx,y0+dy,CELL_CHKPASS) ) { + break; + } + + x0 += dx; + y0 += dy; + count--; + } + + return (x0<<16)|y0; //TODO: use 'struct point' here instead? } /*========================================== diff --git a/src/map/skill.c b/src/map/skill.c index 8e2e44883..0ed6f7780 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2629,8 +2629,8 @@ int skill_attack(int attack_type, struct block_list* src, struct block_list *dsr case WL_CRIMSONROCK: dir = map->calc_dir(bl,skill->area_temp[4],skill->area_temp[5]); break; - case MC_CARTREVOLUTION:
- dir = 6; // Official servers push target to the West
+ case MC_CARTREVOLUTION: + dir = 6; // Official servers push target to the West break; } diff --git a/src/map/status.c b/src/map/status.c index 56b0531cb..fdbafd6b0 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -9206,11 +9206,11 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t case SC_ITEMSCRIPT: if( sd ) { switch( val1 ) { - case ITEMID_PHREEONI_CARD:
- clif->status_change(bl, SI_FOOD_BASICHIT, 1, tick, 0, 0, 0);
- break;
- case ITEMID_GHOSTRING_CARD:
- clif->status_change(bl,SI_ARMOR_PROPERTY,1,tick,0,0,0);
+ case ITEMID_PHREEONI_CARD: + clif->status_change(bl, SI_FOOD_BASICHIT, 1, tick, 0, 0, 0); + break; + case ITEMID_GHOSTRING_CARD: + clif->status_change(bl,SI_ARMOR_PROPERTY,1,tick,0,0,0); break; case ITEMID_TAO_GUNKA_CARD: clif->status_change(bl,SI_MVPCARD_TAOGUNKA,1,tick,0,0,0); @@ -10088,11 +10088,11 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const case SC_ITEMSCRIPT: if( sd ) { switch( sce->val1 ) { - case ITEMID_PHREEONI_CARD:
- clif->sc_end(&sd->bl, sd->bl.id, SELF, SI_FOOD_BASICHIT);
- break;
- case ITEMID_GHOSTRING_CARD:
- clif->sc_end(&sd->bl, sd->bl.id, SELF, SI_ARMOR_PROPERTY);
+ case ITEMID_PHREEONI_CARD: + clif->sc_end(&sd->bl, sd->bl.id, SELF, SI_FOOD_BASICHIT); + break; + case ITEMID_GHOSTRING_CARD: + clif->sc_end(&sd->bl, sd->bl.id, SELF, SI_ARMOR_PROPERTY); break; case ITEMID_TAO_GUNKA_CARD: clif->sc_end(&sd->bl, sd->bl.id, SELF, SI_MVPCARD_TAOGUNKA); |