kyonshi/grenzland-mud
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added admlevel script var and a couple bug fixes

Browse Source
This commit is contained in:
JamDog
2010-12-02 23:54:40 +00:00
parent 20bfcde9c9
commit 358d18b7fd
5 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/magic.c
View File

@@ -658,7 +658,8 @@ void mag_areas(int level, struct char_data *ch, int spellnum, int savetype)
* 2: immortals
* 3: if no pk on this mud, skips over all players
* 4: pets (charmed NPCs)
* 5: other players in the same group (if the spell is 'violent') */
* 5: other players in the same group (if the spell is 'violent')
* 6: Flying people if earthquake is the spell */
if (tch == ch)
continue;
if (IS_ADMIN(tch, ADMLVL_IMMORT))
@@ -672,6 +673,8 @@ void mag_areas(int level, struct char_data *ch, int spellnum, int savetype)
if (!IS_NPC(tch) && spell_info[spellnum].violent && AFF_FLAGGED(tch, AFF_GROUP) && AFF_FLAGGED(ch, AFF_GROUP) &&
( ((ch->master == NULL) ? ch : ch->master) == ((tch->master == NULL) ? tch : tch->master) ) )
continue;
if ((spellnum == SPELL_EARTHQUAKE) && AFF_FLAGGED(tch, AFF_FLYING))
continue;
/* Doesn't matter if they die here so we don't check. -gg 6/24/98 */
mag_damage(level, ch, tch, spellnum, 1);