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

Minor Fixes --Rumble

Browse Source
This commit is contained in:
Rumble
2010-09-27 23:24:24 +00:00
parent 505d8f1236
commit 847ac6b500
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog
View File

@@ -35,6 +35,9 @@ export (QQ's a zone into a tarball)
Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist) Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist)
(lots of major bugfixes too) (lots of major bugfixes too)
@ @
[Sep 28 2010] - Rumble
Fixed a couple NPC accessing player data errors.
Fixed oedit extra desc's from always showing "Set" even if they weren't. (thanks Mirad)
[Sep 19 2010] - Rumble [Sep 19 2010] - Rumble
Updated World and files for 3.62 release. Updated World and files for 3.62 release.
[Sep 11 2010] - Rumble [Sep 11 2010] - Rumble

2
src/act.movement.c
View File

@@ -197,7 +197,7 @@ int do_simple_move(struct char_data *ch, int dir, int need_specials_check)
/* Underwater Room: Does lack of underwater breathing prevent movement? */ /* Underwater Room: Does lack of underwater breathing prevent movement? */
if ((SECT(was_in) == SECT_UNDERWATER) || (SECT(going_to) == SECT_UNDERWATER)) if ((SECT(was_in) == SECT_UNDERWATER) || (SECT(going_to) == SECT_UNDERWATER))
{ {
if (!has_scuba(ch) && !PRF_FLAGGED(ch, PRF_NOHASSLE)) { if (!has_scuba(ch) && !IS_NPC(ch) && !PRF_FLAGGED(ch, PRF_NOHASSLE)) {
send_to_char(ch, "You need to be able to breathe water to go there!\r\n"); send_to_char(ch, "You need to be able to breathe water to go there!\r\n");
return (0); return (0);
} }

2
src/fight.c
View File

@@ -1002,7 +1002,7 @@ void perform_violence(void)
/* should master auto-assist followers? */ /* should master auto-assist followers? */
if (ch->master && PRF_FLAGGED(ch->master, PRF_AUTOASSIST) && if (ch->master && PRF_FLAGGED(ch->master, PRF_AUTOASSIST) &&
FIGHTING(ch) && !FIGHTING(ch->master) && FIGHTING(ch) && !FIGHTING(ch->master) && !IS_NPC(ch) &&
(IN_ROOM(ch->master) == IN_ROOM(ch)) && !IS_NPC(ch->master)) (IN_ROOM(ch->master) == IN_ROOM(ch)) && !IS_NPC(ch->master))
do_assist(ch->master, GET_NAME(ch), 0, 0); do_assist(ch->master, GET_NAME(ch), 0, 0);

2
src/oedit.c
View File

@@ -670,7 +670,7 @@ static void oedit_disp_menu(struct descriptor_data *d)
GET_OBJ_VAL(obj, 1), GET_OBJ_VAL(obj, 1),
GET_OBJ_VAL(obj, 2), GET_OBJ_VAL(obj, 2),
GET_OBJ_VAL(obj, 3), GET_OBJ_VAL(obj, 3),
grn, nrm, grn, nrm, cyn, GET_OBJ_EXTRA(obj) ? "Set." : "Not Set.", grn, grn, nrm, grn, nrm, cyn, obj->ex_description ? "Set." : "Not Set.", grn,
grn, nrm, cyn, GET_OBJ_LEVEL(obj), grn, nrm, cyn, GET_OBJ_LEVEL(obj),
grn, nrm, cyn, buf2, grn, nrm, cyn, buf2,
grn, nrm, cyn, OLC_SCRIPT(d) ? "Set." : "Not Set.", grn, nrm, cyn, OLC_SCRIPT(d) ? "Set." : "Not Set.",