summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-14 16:37:41 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-14 16:37:41 +0000
commit9d556fb84543034b88c646ffdf3817a9ec5d46fc (patch)
tree00a72bb47f01613fab86b27264659dae33ccb225 /src/map
parent12bf6f1349e0e001aaf179322f73ec158b5b4044 (diff)
downloadhercules-9d556fb84543034b88c646ffdf3817a9ec5d46fc.tar.gz
hercules-9d556fb84543034b88c646ffdf3817a9ec5d46fc.tar.bz2
hercules-9d556fb84543034b88c646ffdf3817a9ec5d46fc.tar.xz
hercules-9d556fb84543034b88c646ffdf3817a9ec5d46fc.zip
- Some cleaning of skillnotok
- Corrected emergency_call setting to not use map_flag_gvg define, since the setting already has woe on/off restriction bits. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8276 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/skill.c36
1 files changed, 17 insertions, 19 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index cd9e3af8d..7b87845bc 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -849,13 +849,10 @@ int can_copy (struct map_session_data *sd, int skillid)
// [MouseJstr] - skill ok to cast? and when?
int skillnotok (int skillid, struct map_session_data *sd)
{
- int i = skillid;
+ int i = skillid,m;
nullpo_retr (1, sd);
- //if (sd == 0)
- //return 0;
- //return 1;
- // I think it was meant to be "no skills allowed when not a valid sd"
-
+ m = sd->bl.m;
+
if (skillid >= GD_SKILLRANGEMIN && skillid <= GD_SKILLRANGEMAX)
return 1;
@@ -874,33 +871,33 @@ int skillnotok (int skillid, struct map_session_data *sd)
return 0; // gm's can do anything damn thing they want
// Check skill restrictions [Celest]
- if(!map_flag_vs(sd->bl.m) && skill_get_nocast (skillid) & 1)
+ if(!map_flag_vs(m) && skill_get_nocast (skillid) & 1)
return 1;
- if(map[sd->bl.m].flag.pvp && skill_get_nocast (skillid) & 2)
+ if(map[m].flag.pvp && skill_get_nocast (skillid) & 2)
return 1;
- if(map_flag_gvg(sd->bl.m) && skill_get_nocast (skillid) & 4)
+ if(map_flag_gvg(m) && skill_get_nocast (skillid) & 4)
return 1;
if(agit_flag && skill_get_nocast (skillid) & 8)
return 1;
- if(map[sd->bl.m].flag.restricted && map[sd->bl.m].zone && skill_get_nocast (skillid) & (8*map[sd->bl.m].zone))
+ if(map[m].flag.restricted && map[m].zone && skill_get_nocast (skillid) & (8*map[m].zone))
return 1;
switch (skillid) {
case AL_WARP:
- if(map[sd->bl.m].flag.nowarp) {
+ if(map[m].flag.nowarp) {
clif_skill_teleportmessage(sd,0);
return 1;
}
return 0;
break;
case AL_TELEPORT:
- if(map[sd->bl.m].flag.noteleport) {
+ if(map[m].flag.noteleport) {
clif_skill_teleportmessage(sd,0);
return 1;
}
return 0;
case TK_HIGHJUMP:
- if(map[sd->bl.m].flag.noteleport && !map_flag_vs(sd->bl.m))
+ if(map[m].flag.noteleport && !map_flag_vs(m))
{ //Can't be used on noteleport maps, except for vs maps [Skotlex]
clif_skill_fail(sd,skillid,0,0);
return 1;
@@ -909,7 +906,7 @@ int skillnotok (int skillid, struct map_session_data *sd)
case WE_CALLPARTNER:
case WE_CALLPARENT:
case WE_CALLBABY:
- if (map[sd->bl.m].flag.nomemo) {
+ if (map[m].flag.nomemo) {
clif_skill_teleportmessage(sd,1);
return 1;
}
@@ -919,23 +916,24 @@ int skillnotok (int skillid, struct map_session_data *sd)
return 0; // always allowed
case WZ_ICEWALL:
// noicewall flag [Valaris]
- if (map[sd->bl.m].flag.noicewall) {
+ if (map[m].flag.noicewall) {
clif_skill_fail(sd,skillid,0,0);
return 1;
}
break;
case GD_EMERGENCYCALL:
- if (
+ if ( //No use map_flag_gvg since config already takes that into account
!(battle_config.emergency_call&(agit_flag?2:1)) ||
- !(battle_config.emergency_call&(map_flag_gvg(sd->bl.m)?8:4)) ||
- (battle_config.emergency_call&16 && map[sd->bl.m].flag.nowarpto)
+ !(battle_config.emergency_call&
+ (map[m].flag.gvg || map[m].flag.gvg_castle?8:4)) ||
+ (battle_config.emergency_call&16 && map[m].flag.nowarpto)
) {
clif_skill_fail(sd,skillid,0,0);
return 1;
}
break;
}
- return (map[sd->bl.m].flag.noskill);
+ return (map[m].flag.noskill);
}
// [orn] - skill ok to cast? and when? //homunculus