diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-05 11:06:48 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-05 11:06:48 +0000 |
| commit | ecbe6aa5b86c57909ee1a7369ceda6b9348fdb1a (patch) | |
| tree | b3a459940f3ccb52de4b0e11189756f49ae603e2 /src/map/battle.c | |
| parent | 887a23e815dc20731a423c726b22d0d0a3974d93 (diff) | |
| download | hercules-ecbe6aa5b86c57909ee1a7369ceda6b9348fdb1a.tar.gz hercules-ecbe6aa5b86c57909ee1a7369ceda6b9348fdb1a.tar.bz2 hercules-ecbe6aa5b86c57909ee1a7369ceda6b9348fdb1a.tar.xz hercules-ecbe6aa5b86c57909ee1a7369ceda6b9348fdb1a.zip | |
* Added allow_atcommand_when_mute
* Temporarily leaving the changing guild emblems requiring Glory of Guild feature only for TXT until the SQL char-server supports guild skills fully
* Modified battle_range again to check if src's type is a player first
* Modified skill_nocast_db
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@459 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 6b1d68625..df8b583cf 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -4962,14 +4962,13 @@ int battle_check_range(struct block_list *src,struct block_list *bl,int range) if( range>0 && range < arange ) {// 遠すぎる // be lenient if the skill was cast before we have moved to the correct position [Celest] - if (src->type != BL_PC) - return 0; - else if (src->type == BL_PC) { + if (src->type == BL_PC) { struct map_session_data *sd; nullpo_retr(0, (sd=(struct map_session_data *)bl)); if (sd->walktimer != -1 && !((arange-=battle_config.skill_range_leniency)<=range)) return 0; } + else return 0; } if( arange<2 ) // 同じマスか隣接 @@ -5224,6 +5223,7 @@ static const struct { { "night_darkness_level", &battle_config.night_darkness_level}, // [celest] { "skill_range_leniency", &battle_config.skill_range_leniency}, // [celest] { "motd_type", &battle_config.motd_type}, // [celest] + { "allow_atcommand_when_mute", &battle_config.allow_atcommand_when_mute}, // [celest] //SQL-only options start #ifndef TXT_ONLY @@ -5455,6 +5455,8 @@ void battle_set_defaults() { battle_config.night_darkness_level = 9; battle_config.skill_range_leniency = 1; battle_config.motd_type = 0; + battle_config.allow_atcommand_when_mute = 0; + battle_config.castrate_dex_scale = 150; |