diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-03 14:38:13 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-03 14:38:13 +0000 |
| commit | d214e16b4875f2be40c817f609d940a6ff5ef088 (patch) | |
| tree | 52cd02c0d0d6c90dd74d26db0755223f3dc818c9 /src/map/skill.c | |
| parent | ecfd2c2ae5e714347dd86eba90d2ad051d84e447 (diff) | |
| download | hercules-d214e16b4875f2be40c817f609d940a6ff5ef088.tar.gz hercules-d214e16b4875f2be40c817f609d940a6ff5ef088.tar.bz2 hercules-d214e16b4875f2be40c817f609d940a6ff5ef088.tar.xz hercules-d214e16b4875f2be40c817f609d940a6ff5ef088.zip | |
- Trick dead now ends on logout
- Added mapflag nocommand which blocks @/# commands unless your gm level is above gm_skill_unconditional's level.
- Fixed weapon scripts not being executed unless the weapon was forged.
- gm_skill_unconditional is now a no/gm-level setting instead of yes/no
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5446 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 6d74de30b..e552eb657 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -725,7 +725,7 @@ int skillnotok(int skillid, struct map_session_data *sd) return 1;
}
- if (pc_isGM(sd) >= 20 && battle_config.gm_skilluncond)
+ if (battle_config.gm_skilluncond && pc_isGM(sd) >= battle_config.gm_skilluncond)
return 0; // gm's can do anything damn thing they want
// Check skill restrictions [Celest]
@@ -7574,7 +7574,7 @@ int skill_check_condition(struct map_session_data *sd,int type) nullpo_retr(0, sd);
- if( battle_config.gm_skilluncond>0 &&
+ if( battle_config.gm_skilluncond &&
pc_isGM(sd)>= battle_config.gm_skilluncond &&
sd->skillitem != sd->skillid)
{ //GMs don't override the skillItem check, otherwise they can use items without them being consumed! [Skotlex]
|