diff options
| author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-08-15 04:30:29 +0000 |
|---|---|---|
| committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-08-15 04:30:29 +0000 |
| commit | 527f90ae1d50ff02bf7784c5b25550f2a9373456 (patch) | |
| tree | a8fc08495470a36c3c8f4dd2b67237e10d8eace2 | |
| parent | f50ce9e6be15ed32eee03ea919641ca2692c52ec (diff) | |
| download | hercules-527f90ae1d50ff02bf7784c5b25550f2a9373456.tar.gz hercules-527f90ae1d50ff02bf7784c5b25550f2a9373456.tar.bz2 hercules-527f90ae1d50ff02bf7784c5b25550f2a9373456.tar.xz hercules-527f90ae1d50ff02bf7784c5b25550f2a9373456.zip | |
- Removed useless mapname compares (since r570) and fixed the strncmp for malangdo/malaya (r15388). [thanks lighta]
- Follow up to r16322 so the comment "only modifier is halved but still benefit with the damage bonus" is actually true. Thanks lighta!
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16637 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/atcommand.c | 10 | ||||
| -rw-r--r-- | src/map/battle.c | 9 |
2 files changed, 8 insertions, 11 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 1577dfc99..e9c31495f 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -2085,11 +2085,9 @@ ACMD_FUNC(go) strncmp(map_name, "prison", 3) == 0 || strncmp(map_name, "jails", 3) == 0) { town = 16; - } else if (strncmp(map_name, "jawaii", 3) == 0 || - strncmp(map_name, "jawai", 3) == 0) { + } else if (strncmp(map_name, "jawaii", 3) == 0) { town = 17; - } else if (strncmp(map_name, "ayothaya", 3) == 0 || - strncmp(map_name, "ayotaya", 3) == 0) { + } else if (strncmp(map_name, "ayothaya", 3) == 0) { town = 18; } else if (strncmp(map_name, "einbroch", 5) == 0 || strncmp(map_name, "ainbroch", 5) == 0) { @@ -2120,9 +2118,9 @@ ACMD_FUNC(go) town = 31; } else if (strncmp(map_name, "dewata", 3) == 0) { town = 32; - } else if (strncmp(map_name, "malangdo", 3) == 0) { + } else if (strncmp(map_name, "malangdo", 5) == 0) { town = 33; - } else if (strncmp(map_name, "malaya", 3) == 0) { + } else if (strncmp(map_name, "malaya", 5) == 0) { town = 34; } else if (strncmp(map_name, "eclage", 3) == 0) { town = 35; diff --git a/src/map/battle.c b/src/map/battle.c index e36befad7..bde3bfb65 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2630,7 +2630,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo // FIX ME: Should Rolling Cutter be affected by EDP? switch(skill_num){ case AS_SPLASHER: case AS_VENOMKNIFE: - case AS_GRIMTOOTH: case GC_ROLLINGCUTTER: + case AS_GRIMTOOTH: case GC_ROLLINGCUTTER: break; #ifndef RENEWAL_EDP case ASC_BREAKER: case ASC_METEORASSAULT: break; @@ -2640,10 +2640,9 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo case GC_COUNTERSLASH: case GC_CROSSIMPACT: ATK_RATE(50); // only modifier is halved but still benefit with the damage bonus - break; #endif default: - ATK_ADDRATE(sc->data[SC_EDP]->val3); + ATK_ADDRATE(sc->data[SC_EDP]->val3); } } } @@ -5060,7 +5059,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f state |= BCT_ENEMY; strip_enemy = 0; break; - default: + default: if(su->group->skill_id == WM_REVERBERATION || su->group->skill_id == WM_POEMOFNETHERWORLD){ state |= BCT_ENEMY; strip_enemy = 0; @@ -5078,7 +5077,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f //Valid targets with no special checks here. case BL_MER: case BL_HOM: - case BL_ELEM: + case BL_ELEM: break; //All else not specified is an invalid target. default: |