From 113d06b6f75a5f96c34ca1288d83db95d209416d Mon Sep 17 00:00:00 2001
From: Rumble <rumble@tbamud.com>
Date: Wed, 20 Oct 2010 02:11:47 +0000
Subject: [PATCH] Fixed freeing of nulls in ibt.c --Rumble

---
 changelog             |   2 +
 lib/misc/bugs         |  17 ++++++
 lib/world/mob/266.mob |   6 +-
 lib/world/obj/309.obj |  82 +++++++++++++--------------
 lib/world/obj/314.obj |   2 +-
 lib/world/trg/2.trg   |  10 ++++
 lib/world/wld/0.wld   | 126 +++++++++++++++++++++---------------------
 lib/world/wld/266.wld |  12 ++--
 lib/world/zon/264.zon |  20 +++----
 lib/world/zon/266.zon | 102 +++++++++++++++++-----------------
 lib/world/zon/302.zon |  63 ++++++++++-----------
 lib/world/zon/309.zon |  10 ++--
 lib/world/zon/314.zon |   4 +-
 src/ibt.c             |   4 +-
 14 files changed, 245 insertions(+), 215 deletions(-)

diff --git a/changelog b/changelog
index 0102c77..47c533c 100644
--- a/changelog
+++ b/changelog
@@ -35,6 +35,8 @@ export (QQ's a zone into a tarball)
 Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist)
 (lots of major bugfixes too)
 @
+[Oct 20 2010] - Rumble
+  Fixed freeing of null pointers in ibt.c (thanks Stoneheart)
 [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)
diff --git a/lib/misc/bugs b/lib/misc/bugs
index e69de29..ab34f7d 100644
--- a/lib/misc/bugs
+++ b/lib/misc/bugs
@@ -0,0 +1,17 @@
+Text       couldnt find 2nd floor's moongate in ultima~
+Body      couldn't find 2nd floor's moongate in ultima
+~
+Name      Neptune~
+Level     30
+Room      55524
+Flags     0 0 0 0
+End
+Text       still about the 2nd moongate in ultima~
+Body      I found that there's a trigger in some room that handles the command
+"open shelf" --  there should be a hint somewhere in the descriptions.
+~
+Name      Neptune~
+Level     30
+Room      55571
+Flags     0 0 0 0
+End
diff --git a/lib/world/mob/266.mob b/lib/world/mob/266.mob
index 05ae401..640700a 100644
--- a/lib/world/mob/266.mob
+++ b/lib/world/mob/266.mob
@@ -26,10 +26,10 @@ E
 #26602
 cucubeth thing pale~
 the cucubeth~
-A strange, pale manlike thing ambles into view, slowly turning it's head your way.
+A strange, pale manlike thing ambles into view, slowly turning its head your way.
 ~
-   This thing, half blood sucker and half were-man looks as if it has not fed in
-some time.  
+   This thing, half blood-sucker and half were-man, looks as if it has not fed
+in some time.
 ~
 172616 0 0 0 0 0 0 0 -900 E
 30 10 -8 6d6+300 5d5+5
diff --git a/lib/world/obj/309.obj b/lib/world/obj/309.obj
index 70bb42c..2f75e9f 100644
--- a/lib/world/obj/309.obj
+++ b/lib/world/obj/309.obj
@@ -5,7 +5,7 @@ A red steel breastplate lies discarded on the ground.~
 ~
 9 0 0 0 0 ad 0 0 0 0 0 0 0
 0 0 0 0
-11 100 0 20
+11 100 0 20 0
 A
 13 25
 A
@@ -17,9 +17,9 @@ plate face red steel~
 a red steel face plate~
 A red steel face plate lies on the ground.~
 ~
-9 0 0 0 0 ae 0 0 0 0 0 0 0
+9 0 0 0 0 ace 0 0 0 0 0 0 0
 5 0 0 0
-5 100 0 20
+5 100 0 20 0
 A
 1 3
 A
@@ -31,7 +31,7 @@ A guardsman's sword has been dropped here.~
 ~
 5 0 0 0 0 an 0 0 0 0 0 0 0
 0 4 5 3
-8 100 0 20
+8 100 0 20 0
 A
 19 4
 A
@@ -45,7 +45,7 @@ A barrel of beer lies on the ground.~
 ~
 17 0 0 0 0 ao 0 0 0 0 0 0 0
 75 75 1 0
-80 20 0 1
+80 20 0 1 0
 #30904
 wheel barrow~
 a wheel barrow~
@@ -53,7 +53,7 @@ A wheel barrow lies at the side of the road.~
 ~
 15 0 0 0 0 ao 0 0 0 0 0 0 0
 400 0 -1 0
-18 10 0 1
+18 10 0 1 0
 #30905
 shovel~
 a shovel~
@@ -61,7 +61,7 @@ A shovel has been left on the ground.~
 ~
 12 0 0 0 0 ao 0 0 0 0 0 0 0
 0 0 0 0
-4 250 0 1
+4 250 0 1 0
 #30906
 beads string~
 a string of beads~
@@ -69,7 +69,7 @@ A string of beads have been dropped here.~
 ~
 12 0 0 0 0 ac 0 0 0 0 0 0 0
 0 0 0 0
-4 100 0 20
+4 100 0 20 0
 A
 3 1
 A
@@ -81,7 +81,7 @@ A pint of container has been left on the ground.~
 ~
 17 0 0 0 0 ao 0 0 0 0 0 0 0
 4 4 3 0
-9 8 0 1
+9 8 0 1 0
 #30908
 water jar water~
 a jar of water~
@@ -89,7 +89,7 @@ A clear jar has been left here.~
 ~
 17 0 0 0 0 ao 0 0 0 0 0 0 0
 4 4 0 0
-9 3 0 1
+9 3 0 1 0
 #30909
 steak platter~
 a steak platter~
@@ -97,7 +97,7 @@ A steak platter lies on the ground.~
 ~
 19 0 0 0 0 ao 0 0 0 0 0 0 0
 6 0 0 0
-3 11 0 1
+3 11 0 1 0
 #30910
 paper wadded piece~
 a wadded up piece of paper~
@@ -105,7 +105,7 @@ A wadded up piece of paper lies on the ground.~
 ~
 12 b 0 0 0 ao 0 0 0 0 0 0 0
 0 0 0 0
-1 10 0 25
+1 10 0 25 0
 E
 paper~
    To you my love, my dear Landestine -
@@ -140,7 +140,7 @@ A jet-black cloak lies in a ball on the ground.~
 ~
 9 a 0 0 0 ak 0 0 0 0 0 0 0
 9 0 0 0
-7 1000 0 26
+7 1000 0 26 0
 A
 12 40
 A
@@ -154,7 +154,7 @@ An etched staff has been left on the ground.~
 ~
 4 a 0 0 0 ao 0 0 0 0 0 0 0
 30 3 3 3
-6 100 0 0
+6 100 0 0 0
 A
 19 3
 A
@@ -168,7 +168,7 @@ A glowing thumb rune lies on the ground.~
 ~
 11 a 0 0 0 ab 0 0 0 0 0 0 0
 0 0 0 0
-3 103 0 25
+3 103 0 25 0
 A
 19 2
 A
@@ -182,7 +182,7 @@ A leather harness lies coiled on the ground.~
 ~
 9 0 0 0 0 aco 0 0 0 0 0 0 0
 6 0 0 0
-6 50 0 23
+6 50 0 23 0
 A
 13 30
 #30915
@@ -192,7 +192,7 @@ A fishing pole lies tossed aside.~
 ~
 12 0 0 0 0 ao 0 0 0 0 0 0 0
 0 0 0 0
-3 10 0 1
+3 10 0 1 0
 #30916
 shiney lure~
 a shiny lure~
@@ -200,7 +200,7 @@ A small shiny lure lies glinting on the ground.~
 ~
 12 0 0 0 0 ao 0 0 0 0 0 0 0
 0 0 0 0
-1 10 0 1
+1 10 0 1 0
 #30917
 basket wicker~
 a wicker basket~
@@ -208,7 +208,7 @@ A wicker basket has been left here.~
 ~
 15 0 0 0 0 ao 0 0 0 0 0 0 0
 300 5 -1 0
-5 10 0 1
+5 10 0 1 0
 #30918
 belt might~
 the Belt of Supreme Might~
@@ -216,7 +216,7 @@ A glowing belt lies thrown to the ground.~
 ~
 9 0 0 0 0 al 0 0 0 0 0 0 0
 7 0 0 0
-6 100 0 21
+6 100 0 21 0
 A
 1 3
 A
@@ -230,7 +230,7 @@ A small, glowing purple shield lies on the ground.~
 ~
 9 0 0 0 0 aj 0 0 0 0 0 0 0
 10 0 0 0
-6 1000 0 22
+6 1000 0 22 0
 A
 13 35
 A
@@ -244,7 +244,7 @@ A keg of beer of beer lies on its side.~
 ~
 17 0 0 0 0 ao 0 0 0 0 0 0 0
 100 100 1 0
-105 56 0 1
+105 56 0 1 0
 #30921
 eyepiece glass~
 a glass eyepiece~
@@ -252,7 +252,7 @@ An odd-shaped glass eyepiece has been dropped.~
 ~
 11 a 0 0 0 ae 0 0 0 0 0 0 0
 0 0 0 0
-3 100 0 20
+3 100 0 20 0
 A
 13 30
 #30922
@@ -262,7 +262,7 @@ An elite charm hangs from a red steel chain, dropped upon the floor.~
 ~
 11 a 0 0 0 ac 0 0 0 0 0 0 0
 0 0 0 0
-4 10 0 21
+4 10 0 21 0
 A
 17 -3
 A
@@ -276,7 +276,7 @@ A red steel short sword has been left here.~
 ~
 5 b 0 0 0 an 0 0 0 0 0 0 0
 0 4 7 14
-8 400 0 23
+8 400 0 23 0
 A
 18 4
 A
@@ -290,7 +290,7 @@ A pair of bladed boots have been left on the floor.~
 ~
 9 0 0 0 0 ag 0 0 0 0 0 0 0
 8 0 0 0
-9 300 0 25
+9 300 0 25 0
 A
 19 4
 A
@@ -304,7 +304,7 @@ A beautiful titanium blade has been somehow left behind.~
 ~
 5 a 0 0 0 an 0 0 0 0 0 0 0
 0 6 6 3
-10 500 0 25
+10 500 0 25 0
 A
 18 5
 A
@@ -318,7 +318,7 @@ A red mantle lies on the ground, waiting to be worn.~
 ~
 11 a 0 0 0 ak 0 0 0 0 0 0 0
 0 0 0 0
-7 154 0 25
+7 154 0 25 0
 A
 18 3
 A
@@ -332,7 +332,7 @@ A red clasp has been dropped to the ground.~
 ~
 11 a 0 0 0 am 0 0 0 0 0 0 0
 0 0 0 0
-3 300 0 25
+3 300 0 25 0
 A
 17 -4
 A
@@ -346,7 +346,7 @@ A clipboard has been left here.~
 ~
 16 0 0 0 0 ao 0 0 0 0 0 0 0
 0 0 0 0
-4 10 0 1
+4 10 0 1 0
 #30929
 hammer forgeman's~
 a forgeman's hammer~
@@ -354,7 +354,7 @@ A huge forgeman's hammer lies on the ground.~
 ~
 5 0 0 0 0 an 0 0 0 0 0 0 0
 0 6 8 7
-14 100 0 21
+14 100 0 21 0
 A
 19 4
 A
@@ -368,7 +368,7 @@ A brass eye guard has been dropped on the ground.~
 ~
 9 a 0 0 0 ae 0 0 0 0 0 0 0
 4 0 0 0
-4 100 0 23
+4 100 0 23 0
 A
 13 35
 A
@@ -380,7 +380,7 @@ An iron anvil sits squarely in the center of the floor.~
 ~
 12 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0
-0 0 0 0
+0 0 0 0 0
 #30932
 guards forearm arm~
 a set of leather forearm guards~
@@ -388,7 +388,7 @@ A set of leather forearm guards lie on the ground.~
 ~
 9 mn 0 0 0 ai 0 0 0 0 0 0 0
 7 0 0 0
-6 100 0 25
+6 100 0 25 0
 A
 19 3
 A
@@ -402,7 +402,7 @@ A red steel ring had been dropped on the ground.~
 ~
 11 ak 0 0 0 ab 0 0 0 0 0 0 0
 0 0 0 0
-2 300 0 25
+2 300 0 25 0
 A
 19 5
 A
@@ -416,7 +416,7 @@ A plain red steel ring lies on the ground.~
 ~
 11 k 0 0 0 ab 0 0 0 0 0 0 0
 0 0 0 0
-3 400 0 25
+3 400 0 25 0
 A
 17 -3
 A
@@ -430,7 +430,7 @@ A pair of red chainmail leggings lie on the ground.~
 ~
 9 ak 0 0 0 af 0 0 0 0 0 0 0
 9 0 0 0
-9 1000 0 25
+9 1000 0 25 0
 A
 19 5
 A
@@ -444,7 +444,7 @@ A large wooden spoon has been left on the ground.~
 ~
 12 0 0 0 0 ao 0 0 0 0 0 0 0
 0 0 0 0
-3 1 0 1
+3 1 0 1 0
 #30937
 straw piece~
 a piece of straw~
@@ -452,7 +452,7 @@ A piece of straw lies thrown to the ground.~
 ~
 12 0 0 0 0 ao 0 0 0 0 0 0 0
 0 0 0 0
-1 1 0 1
+1 1 0 1 0
 #30938
 boots thick leather~
 a pair of thick leather boots~
@@ -460,7 +460,7 @@ A pair of thick leather boots lie on the ground.~
 ~
 9 a 0 0 0 ag 0 0 0 0 0 0 0
 6 0 0 0
-8 100 0 27
+8 100 0 27 0
 A
 5 2
 A
@@ -474,7 +474,7 @@ A tall, wide-brimmed hat lies thrown to the ground.~
 ~
 9 0 0 0 0 ae 0 0 0 0 0 0 0
 4 0 0 0
-5 300 0 28
+5 300 0 28 0
 A
 19 4
 A
diff --git a/lib/world/obj/314.obj b/lib/world/obj/314.obj
index 365c83d..20c6276 100644
--- a/lib/world/obj/314.obj
+++ b/lib/world/obj/314.obj
@@ -151,7 +151,7 @@ blood innocent~
 the blood of an innocent~
 A smear of blood is on the ground.~
 ~
-11 0 0 0 0 ad 0 0 0 0 0 0 0
+11 0 0 0 0 ai 0 0 0 0 0 0 0
 0 0 0 0
 1 1 0 24 0
 A
diff --git a/lib/world/trg/2.trg b/lib/world/trg/2.trg
index 20bc751..fe82c9e 100644
--- a/lib/world/trg/2.trg
+++ b/lib/world/trg/2.trg
@@ -431,4 +431,14 @@ eval inv %actor.inventory%
 %echo% As the wrapping falls apart, it reveals... %inv.shortdesc%.
 %purge% %self%
 ~
+#221
+Open Sesame~
+2 c 100
+s~
+if %cmd.mudcommand% == say && avaa ovi /= %arg%
+  %echo% open door.
+else
+  %echo% don't open door.
+end
+~
 $~
diff --git a/lib/world/wld/0.wld b/lib/world/wld/0.wld
index 929ee81..2d2536a 100644
--- a/lib/world/wld/0.wld
+++ b/lib/world/wld/0.wld
@@ -551,53 +551,22 @@ Our lives begin to end the day we become silent about things that matter.
 ~
 0 8 0 0 0 0
 E
-july4~
-   On July 4, 1776, we claimed our independence from England and Democracy was
-born.  Every day thousands leave their homeland to come to the "land of the
-free and the home of the brave" so they can begin their American Dream.  The
-United States is truly a diverse nation made up of dynamic people.  Each year
-on July 4, Americans celebrate that freedom and indepen-dence with barbecues,
-picnics, and family ga-therings.  Through the Internet we are learning about
-and communicat-ing with people of different nations, with different languages
-and different races throughout the world.  Bringing the world closer with
-understanding and knowledge can only benefit all nations.  We invite all
-nations to celebrate with Americans online this Fourth of July.  Happy
-Birthday, America!    
+undefined~
+test
 ~
 E
-oath~
-   I do solemnly swear that I will support and defend the Constitution of the
-United States against all enemies, foreign and domestic, and to bear true faith
-and allegiance to the same that I take this obligation freely, without any
-mental reservation or purpose of evasion, and that I will well and faithfully
-discharge the duties of the office upon which I am about to enter.
-~
-E
-builder~
-  
-There is one timeless way of building.
-  
-It is thousands of years old, and the same today as it has always been.
-  
-   The great traditional buildings of the past, the villages and tents and
-temples in which man feels at home, have always been made by people who were
-very close to the center of this way.  It is not possible to make great
-buildings, or great towns, beautiful places, places where you feel yourself,
-places where you feel alive, except by following this way.  And, as you will
-see, this way will lead anyone who looks for it to buildings which are
-themselves as ancient in their form, as the trees and hills, and as our faces
-are.    
-                                        --The Timeless Way of Building
-~
-E
-war~
-   War is an ugly thing, but not the ugliest of things.  The decayed and
-degraded state of moral and patriotic feeling which thinks that nothing is
-worth war is much worse.  The person who has nothing for which he is willing to
-fight, nothing which is more important than his own personal safety, is a
-miserable creature and has no chance of being free unless made and kept so by
-the exertions of better men than himself.
-John Stuart Mill
+Catcher Rye~
+   The mark of the immature man is that he wants to die nobly for a cause, 
+while the mark of the mature man is that he wants to live humbly for one.  
+--Wilhelm Stekel
+   ...you'll find that you're not the first person who was ever confused and 
+frighteneed and even sickened by human behavior. You're by no means alone on 
+that score, you'll be excited and stimulated to know. Many, many men have been 
+just as troubled morally and spiritually as you are right now. Happily, some 
+of them kept records of their troubles. You'll learn from them-if you want to. 
+Just as someday, if you have something to offer, someone will learn something 
+from you. It's a beautiful reciprocal arrangement.
+--The Catcher in the Rye   
 ~
 E
 old glory flag~
@@ -630,22 +599,53 @@ or daughter-I am proud.  My name is Old Glory-long may I wave.  Dear God, long
 may I wave.    
 ~
 E
-Catcher Rye~
-   The mark of the immature man is that he wants to die nobly for a cause, 
-while the mark of the mature man is that he wants to live humbly for one.  
---Wilhelm Stekel
-   ...you'll find that you're not the first person who was ever confused and 
-frighteneed and even sickened by human behavior. You're by no means alone on 
-that score, you'll be excited and stimulated to know. Many, many men have been 
-just as troubled morally and spiritually as you are right now. Happily, some 
-of them kept records of their troubles. You'll learn from them-if you want to. 
-Just as someday, if you have something to offer, someone will learn something 
-from you. It's a beautiful reciprocal arrangement.
---The Catcher in the Rye   
+war~
+   War is an ugly thing, but not the ugliest of things.  The decayed and
+degraded state of moral and patriotic feeling which thinks that nothing is
+worth war is much worse.  The person who has nothing for which he is willing to
+fight, nothing which is more important than his own personal safety, is a
+miserable creature and has no chance of being free unless made and kept so by
+the exertions of better men than himself.
+John Stuart Mill
 ~
 E
-undefined~
-test
+builder~
+  
+There is one timeless way of building.
+  
+It is thousands of years old, and the same today as it has always been.
+  
+   The great traditional buildings of the past, the villages and tents and
+temples in which man feels at home, have always been made by people who were
+very close to the center of this way.  It is not possible to make great
+buildings, or great towns, beautiful places, places where you feel yourself,
+places where you feel alive, except by following this way.  And, as you will
+see, this way will lead anyone who looks for it to buildings which are
+themselves as ancient in their form, as the trees and hills, and as our faces
+are.    
+                                        --The Timeless Way of Building
+~
+E
+oath~
+   I do solemnly swear that I will support and defend the Constitution of the
+United States against all enemies, foreign and domestic, and to bear true faith
+and allegiance to the same that I take this obligation freely, without any
+mental reservation or purpose of evasion, and that I will well and faithfully
+discharge the duties of the office upon which I am about to enter.
+~
+E
+july4~
+   On July 4, 1776, we claimed our independence from England and Democracy was
+born.  Every day thousands leave their homeland to come to the "land of the
+free and the home of the brave" so they can begin their American Dream.  The
+United States is truly a diverse nation made up of dynamic people.  Each year
+on July 4, Americans celebrate that freedom and indepen-dence with barbecues,
+picnics, and family ga-therings.  Through the Internet we are learning about
+and communicat-ing with people of different nations, with different languages
+and different races throughout the world.  Bringing the world closer with
+understanding and knowledge can only benefit all nations.  We invite all
+nations to celebrate with Americans online this Fourth of July.  Happy
+Birthday, America!    
 ~
 S
 #34
@@ -835,14 +835,14 @@ D2
 ~
 0 0 98
 E
+sky winds~
+   Cold winds plunge ceaselessly at you from the dark, cloudless sky.
+~
+E
 floor~
    The stone floor is the same shade of grey as the sky and is completely plain
 and unscratched. It is probably too hard for anything to leave as much as a
 scratch on it.
 ~
-E
-sky winds~
-   Cold winds plunge ceaselessly at you from the dark, cloudless sky.
-~
 S
 $~
diff --git a/lib/world/wld/266.wld b/lib/world/wld/266.wld
index be87c16..f0d5c4d 100644
--- a/lib/world/wld/266.wld
+++ b/lib/world/wld/266.wld
@@ -46,6 +46,10 @@ Zone 266 is linked to the following zones:
 259 Haunted Mansion                at 26657 (east ) ---> 25904
 264 Banshide                       at 26664 (south) ---> 26428
 264 Banshide                       at 26665 (north) ---> 26419
+
+   * In room 26659, the reset has moved object 26604 to neck, since there is no
+face slot here.  If you have a face slot, this should be moved back to face.
+
 ~
 S
 #26601
@@ -2227,15 +2231,15 @@ D5
 pentagram~
 1 0 26695
 E
+slab~
+   It is encrypted with strange runes.  
+~
+E
 runes~
    The runes depict what appears to be the very same stone slab that they are
 inscribed upon.  The runes show a manlike being standing before the runes, the
 runes glowing fiercely, and then the man gone.  
 ~
-E
-slab~
-   It is encrypted with strange runes.  
-~
 S
 #26695
 Entrance to another Dimension~
diff --git a/lib/world/zon/264.zon b/lib/world/zon/264.zon
index f455124..9dc692b 100644
--- a/lib/world/zon/264.zon
+++ b/lib/world/zon/264.zon
@@ -2,6 +2,16 @@
 Kaan~
 Banshide~
 26400 26499 30 2 d 0 0 0 30 34
+M 0 26402 1 26466 	(the Goddess Cathari)
+E 1 26407 1 16 	(the Fist of Supreme Justice)
+E 1 26406 1 6 	(the Gentle Crown of Cathari)
+E 1 26405 1 3 	(the Mask of Enlightenment)
+M 0 26403 4 26466 	(a Howler Banshee)
+E 1 26409 8 3 	(the Voce Amulet)
+E 1 26408 4 17 	(the Song of the Banshee)
+M 0 26405 4 26466 	(the Firshee Banshee)
+E 1 26409 8 3 	(the Voce Amulet)
+E 1 26412 4 9 	(some leather hand wraps)
 M 0 26400 1 26465 	(the Father, Padrick)
 E 1 26402 1 0 	(the Father's Lament)
 E 1 26401 1 12 	(the Robe of the Father)
@@ -11,16 +21,6 @@ E 1 26403 1 12 	(the Gown of the Mother)
 M 0 26406 1 26465 	(a visiting Toreador Cousin)
 E 1 26414 1 12 	(a stately jacket)
 E 1 26415 1 8 	(the boots of travelling)
-M 0 26402 1 26466 	(the Goddess Cathari)
-E 1 26407 1 16 	(the Fist of Supreme Justice)
-E 1 26406 1 6 	(the Gentle Crown of Cathari)
-E 1 26405 1 6 	(the Mask of Enlightenment)
-M 0 26403 4 26466 	(a Howler Banshee)
-E 1 26409 8 3 	(the Voce Amulet)
-E 1 26408 4 17 	(the Song of the Banshee)
-M 0 26405 4 26466 	(the Firshee Banshee)
-E 1 26409 8 3 	(the Voce Amulet)
-E 1 26412 4 9 	(some leather hand wraps)
 M 0 26404 4 26442 	(a Wailer Banshee)
 E 1 26410 4 10 	(the Arm Wraps of Embracing)
 E 1 26411 4 2 	(the Voce Ring)
diff --git a/lib/world/zon/266.zon b/lib/world/zon/266.zon
index ccca428..20b804d 100644
--- a/lib/world/zon/266.zon
+++ b/lib/world/zon/266.zon
@@ -2,59 +2,59 @@
 Kaan~
 Realm of Lord Ankou~
 26600 26699 30 2 d 0 0 0 25 34
-M 0 26603 1 26659 	(Lord Ankou)
-E 1 26601 1 12 	(the Night Cape)
-E 1 26602 1 9 	(the Gloves of Soul Stealing)
-M 0 26604 3 26659 	(a ghostly spectre)
-E 1 26605 3 5 	(a spectral breast plate)
-E 1 26604 3 6 	(some glowing red eyelets)
-E 1 26603 3 6 	(a shimmering helm)
-M 0 26604 3 26659 	(a ghostly spectre)
-E 1 26605 3 5 	(a spectral breast plate)
-E 1 26604 3 6 	(some glowing red eyelets)
-E 1 26603 3 6 	(a shimmering helm)
-M 0 26604 3 26659 	(a ghostly spectre)
-E 1 26605 3 5 	(a spectral breast plate)
-E 1 26604 3 6 	(some glowing red eyelets)
-E 1 26603 3 6 	(a shimmering helm)
-M 0 26605 4 26657 	(the vampyre hunter)
-E 1 26606 4 17 	(a backpack)
-E 1 26607 4 16 	(a wooden stake)
-E 1 26608 4 3 	(a string of garlic)
-M 0 26605 4 26647 	(the vampyre hunter)
-E 1 26606 4 17 	(a backpack)
-E 1 26607 4 16 	(a wooden stake)
-E 1 26608 4 3 	(a string of garlic)
-M 0 26605 4 26667 	(the vampyre hunter)
-E 1 26606 4 17 	(a backpack)
-E 1 26607 4 16 	(a wooden stake)
-E 1 26608 4 3 	(a string of garlic)
 M 0 26605 4 26631 	(the vampyre hunter)
-E 1 26606 4 17 	(a backpack)
-E 1 26607 4 16 	(a wooden stake)
-E 1 26608 4 3 	(a string of garlic)
-M 0 26606 2 26605 	(the buzzard)
-M 0 26606 2 26605 	(the buzzard)
-M 0 26600 10 26639 	(the Barghest)
-E 1 26600 10 3 	(a spiked collar)
-M 0 26600 10 26621 	(the Barghest)
-E 1 26600 10 3 	(a spiked collar)
-M 0 26600 10 26650 	(the Barghest)
-E 1 26600 10 3 	(a spiked collar)
-M 0 26600 10 26623 	(the Barghest)
-E 1 26600 10 3 	(a spiked collar)
-M 0 26600 10 26663 	(the Barghest)
-E 1 26600 10 3 	(a spiked collar)
-M 0 26600 10 26673 	(the Barghest)
-E 1 26600 10 3 	(a spiked collar)
-M 0 26600 10 26611 	(the Barghest)
-E 1 26600 10 3 	(a spiked collar)
-M 0 26600 10 26638 	(the Barghest)
-E 1 26600 10 3 	(a spiked collar)
-M 0 26600 10 26686 	(the Barghest)
-E 1 26600 10 3 	(a spiked collar)
+E 1 26606 99 17 	(a backpack)
+E 1 26607 99 16 	(a wooden stake)
+E 1 26608 99 3 	(a string of garlic)
+M 0 26605 4 26667 	(the vampyre hunter)
+E 1 26606 99 17 	(a backpack)
+E 1 26607 99 16 	(a wooden stake)
+E 1 26608 99 3 	(a string of garlic)
+M 0 26605 4 26647 	(the vampyre hunter)
+E 1 26606 99 17 	(a backpack)
+E 1 26607 99 16 	(a wooden stake)
+E 1 26608 99 3 	(a string of garlic)
+M 0 26605 4 26657 	(the vampyre hunter)
+E 1 26606 99 17 	(a backpack)
+E 1 26607 99 16 	(a wooden stake)
+E 1 26608 99 3 	(a string of garlic)
 M 0 26600 10 26682 	(the Barghest)
-E 1 26600 10 3 	(a spiked collar)
+E 1 26600 99 3 	(a spiked collar)
+M 0 26600 10 26686 	(the Barghest)
+E 1 26600 99 3 	(a spiked collar)
+M 0 26600 10 26638 	(the Barghest)
+E 1 26600 99 3 	(a spiked collar)
+M 0 26600 10 26611 	(the Barghest)
+E 1 26600 99 3 	(a spiked collar)
+M 0 26600 10 26673 	(the Barghest)
+E 1 26600 99 3 	(a spiked collar)
+M 0 26600 10 26663 	(the Barghest)
+E 1 26600 99 3 	(a spiked collar)
+M 0 26600 10 26623 	(the Barghest)
+E 1 26600 99 3 	(a spiked collar)
+M 0 26600 10 26650 	(the Barghest)
+E 1 26600 99 3 	(a spiked collar)
+M 0 26600 10 26621 	(the Barghest)
+E 1 26600 99 3 	(a spiked collar)
+M 0 26600 10 26639 	(the Barghest)
+E 1 26600 99 3 	(a spiked collar)
+M 0 26603 1 26659 	(Lord Ankou)
+E 1 26601 99 12 	(the Night Cape)
+E 1 26602 99 9 	(the Gloves of Soul Stealing)
+M 0 26604 3 26659 	(a ghostly spectre)
+E 1 26605 99 5 	(a spectral breast plate)
+E 1 26604 99 3 	(some glowing red eyelets)
+E 1 26603 99 6 	(a shimmering helm)
+M 0 26604 3 26659 	(a ghostly spectre)
+E 1 26605 99 5 	(a spectral breast plate)
+E 1 26604 99 3 	(some glowing red eyelets)
+E 1 26603 99 6 	(a shimmering helm)
+M 0 26604 3 26659 	(a ghostly spectre)
+E 1 26605 99 5 	(a spectral breast plate)
+E 1 26604 99 3 	(some glowing red eyelets)
+E 1 26603 99 6 	(a shimmering helm)
+M 0 26606 2 26605 	(the buzzard)
+M 0 26606 2 26605 	(the buzzard)
 M 0 26602 5 26675 	(the cucubeth)
 M 0 26602 5 26680 	(the cucubeth)
 M 0 26602 5 26615 	(the cucubeth)
diff --git a/lib/world/zon/302.zon b/lib/world/zon/302.zon
index 5c4dc5e..cd8ff3b 100644
--- a/lib/world/zon/302.zon
+++ b/lib/world/zon/302.zon
@@ -2,6 +2,36 @@
 Matrix of C.A.W.~
 Campus II~
 30200 30299 30 2
+M 0 30105 4 30284 	(Security)
+E 1 30115 99 16 	(a flashlight)
+M 0 30105 4 30284 	(Security)
+E 1 30115 99 16 	(a flashlight)
+M 0 30106 4 30284 	(Security)
+E 1 30115 99 16 	(a flashlight)
+M 0 30106 4 30284 	(Security)
+E 1 30115 99 16 	(a flashlight)
+M 0 30107 4 30284 	(Security)
+E 1 30115 99 16 	(a flashlight)
+M 0 30107 4 30284 	(Security)
+E 1 30115 99 16 	(a flashlight)
+M 0 30111 15 30284 	(the student)
+G 1 30118 99 -1 	(a small silver key)
+M 0 30111 15 30284 	(the student)
+G 1 30119 99 -1 	(a small brass key)
+M 0 30112 15 30284 	(the student)
+M 0 30112 15 30284 	(the student)
+M 0 30113 15 30284 	(the student)
+M 0 30113 15 30284 	(the student)
+M 0 30114 15 30284 	(the froshie)
+M 0 30114 15 30284 	(the froshie)
+M 0 30115 15 30284 	(the froshie)
+M 0 30115 15 30284 	(the froshie)
+M 0 30116 15 30284 	(the froshie)
+M 0 30116 15 30284 	(the froshie)
+M 0 30132 1 30284 	(Chris)
+M 0 30137 1 30284 	(Alex)
+M 0 30138 1 30284 	(Steve)
+M 0 30145 10 30284 	(a copy of Golden World)
 R 0 30200 30112 -1 	(a tam)
 O 1 30112 99 30200 	(a tam)
 M 0 30139 1 30245 	(Bob the storekeeper)
@@ -64,8 +94,6 @@ D 0 30267 2 1 	(Hallway)
 D 0 30270 0 1 	(John-Lab)
 D 0 30268 0 1 	(Hallway)
 D 0 30271 2 1 	(Office)
-D 0 30280 1 1 	(A Classroom)
-D 0 30284 3 1 	(Mob Chute A)
 D 0 30294 3 2 	(East Stairwell)
 D 0 30295 1 2 	(West Stairwell)
 M 0 30100 15 30288 	(the FREC)
@@ -124,25 +152,12 @@ M 0 30102 15 30288 	(the Gael)
 E 1 30134 99 16 	(a long sword)
 M 0 30102 15 30288 	(the Gael)
 E 1 30134 99 16 	(a long sword)
-M 0 30103 1 30284 	(the Example Mob)
 M 0 30104 6 30289 	(the Professor)
 M 0 30104 6 30289 	(the Professor)
 M 0 30104 6 30289 	(the Professor)
 M 0 30104 6 30289 	(the Professor)
 M 0 30104 6 30289 	(the Professor)
 M 0 30104 6 30289 	(the Professor)
-M 0 30105 4 30284 	(Security)
-E 1 30115 99 16 	(a flashlight)
-M 0 30105 4 30284 	(Security)
-E 1 30115 99 16 	(a flashlight)
-M 0 30106 4 30284 	(Security)
-E 1 30115 99 16 	(a flashlight)
-M 0 30106 4 30284 	(Security)
-E 1 30115 99 16 	(a flashlight)
-M 0 30107 4 30284 	(Security)
-E 1 30115 99 16 	(a flashlight)
-M 0 30107 4 30284 	(Security)
-E 1 30115 99 16 	(a flashlight)
 M 0 30108 6 30290 	(the Student Constable)
 E 1 30116 99 12 	(a yellow jacket)
 E 1 30134 99 16 	(a long sword)
@@ -170,40 +185,26 @@ E 1 30134 99 16 	(a long sword)
 M 0 30110 6 30290 	(the Student Constable)
 E 1 30116 99 12 	(a yellow jacket)
 E 1 30134 99 16 	(a long sword)
-M 0 30111 15 30284 	(the student)
-G 1 30118 99 -1 	(a small silver key)
-M 0 30111 15 30284 	(the student)
-G 1 30119 99 -1 	(a small brass key)
 M 0 30111 15 30285 	(the student)
 M 0 30111 15 30285 	(the student)
 M 0 30111 15 30285 	(the student)
 M 0 30111 15 30290 	(the student)
-M 0 30112 15 30284 	(the student)
-M 0 30112 15 30284 	(the student)
 M 0 30112 15 30286 	(the student)
 M 0 30112 15 30286 	(the student)
 M 0 30112 15 30286 	(the student)
 M 0 30112 15 30290 	(the student)
-M 0 30113 15 30284 	(the student)
-M 0 30113 15 30284 	(the student)
 M 0 30113 15 30287 	(the student)
 M 0 30113 15 30287 	(the student)
 M 0 30113 15 30287 	(the student)
 M 0 30113 15 30290 	(the student)
-M 0 30114 15 30284 	(the froshie)
-M 0 30114 15 30284 	(the froshie)
 M 0 30114 15 30285 	(the froshie)
 M 0 30114 15 30285 	(the froshie)
 M 0 30114 15 30285 	(the froshie)
 M 0 30114 15 30290 	(the froshie)
-M 0 30115 15 30284 	(the froshie)
-M 0 30115 15 30284 	(the froshie)
 M 0 30115 15 30286 	(the froshie)
 M 0 30115 15 30286 	(the froshie)
 M 0 30115 15 30286 	(the froshie)
 M 0 30115 15 30290 	(the froshie)
-M 0 30116 15 30284 	(the froshie)
-M 0 30116 15 30284 	(the froshie)
 M 0 30116 15 30287 	(the froshie)
 M 0 30116 15 30287 	(the froshie)
 M 0 30116 15 30287 	(the froshie)
@@ -227,10 +228,6 @@ M 0 30130 10 30329 	(the student)
 M 0 30130 10 30330 	(the student)
 M 0 30131 2 30327 	(the student)
 M 0 30131 2 30329 	(the student)
-M 0 30132 1 30284 	(Chris)
-M 0 30137 1 30284 	(Alex)
-M 0 30138 1 30284 	(Steve)
-M 0 30145 10 30284 	(a copy of Golden World)
 M 0 30146 1 30265 	(the ghost of Grant)
 M 0 30147 1 30227 	(a wraith)
 G 1 30154 1 -1 	(a ghostly key)
diff --git a/lib/world/zon/309.zon b/lib/world/zon/309.zon
index 92c609a..1f68103 100644
--- a/lib/world/zon/309.zon
+++ b/lib/world/zon/309.zon
@@ -2,14 +2,14 @@
 Kaan~
 Keep of Baron Westlawn~
 30900 30999 30 2 d 0 0 0 26 30
-M 0 30919 2 30968 	(a watchman)
-E 1 30921 99 6 	(a glass eyepiece)
-E 1 30900 100 5 	(a red steel breastplate)
-E 1 30901 99 6 	(a red steel face plate)
 M 0 30919 2 30961 	(a watchman)
 E 1 30921 99 6 	(a glass eyepiece)
 E 1 30900 100 5 	(a red steel breastplate)
-E 1 30901 99 6 	(a red steel face plate)
+E 1 30901 99 3 	(a red steel face plate)
+M 0 30919 2 30968 	(a watchman)
+E 1 30921 99 6 	(a glass eyepiece)
+E 1 30900 100 5 	(a red steel breastplate)
+E 1 30901 99 3 	(a red steel face plate)
 M 0 30922 1 30933 	(Jerrod)
 E 1 30925 100 16 	(a titanium blade)
 E 1 30926 100 12 	(a red mantle)
diff --git a/lib/world/zon/314.zon b/lib/world/zon/314.zon
index df36795..9f907ff 100644
--- a/lib/world/zon/314.zon
+++ b/lib/world/zon/314.zon
@@ -12,10 +12,10 @@ E 1 31412 100 12 	(a soiled and bloodstained robe)
 E 1 31411 100 16 	(a shining curved blade)
 M 0 31401 2 31451 	(a Believer)
 E 1 31414 100 5 	(a grubby jerkin)
-E 1 31415 99 5 	(the blood of an innocent)
+E 1 31415 99 10 	(the blood of an innocent)
 M 0 31401 2 31451 	(a Believer)
 E 1 31414 100 5 	(a grubby jerkin)
-E 1 31415 99 5 	(the blood of an innocent)
+E 1 31415 99 10 	(the blood of an innocent)
 R 0 31401 31400 -1 	(the old cracked fountain)
 O 0 31400 1 31401 	(the old cracked fountain)
 M 0 31403 1 31401 	(a retching elf)
diff --git a/src/ibt.c b/src/ibt.c
index 3ec226f..7b741d6 100755
--- a/src/ibt.c
+++ b/src/ibt.c
@@ -173,8 +173,8 @@ static IBT_DATA *read_ibt( char *filename, FILE *fp )
             break;
 
           case 'N':
-            if (!str_cmp(word, "Name"))   STRFREE(ibtData->name);
-            if (!str_cmp(word, "Notes"))  STRFREE(ibtData->notes);
+            if (!str_cmp(word, "Name") && ibtData->name)   STRFREE(ibtData->name);
+            if (!str_cmp(word, "Notes") && ibtData->notes)  STRFREE(ibtData->notes);
             TXT_KEY("Name",     ibtData->name,    fread_line( fp ));
             KEY("Notes",        ibtData->notes,   fread_string( fp, buf ));
             break;