Updated World files for release and merged conflicts

changelog

@@ -6,7 +6,6 @@ Development moved to Github:
 https://github.com/tbamud/tbamud
 Changelog also available on Github:
 https://github.com/tbamud/tbamud/commits/master
-
 Changes prior to Github transition:
 [Jun 21 2013] - Vatiken
   Added 'toupper' as a dg_script command to capitalize the first letter

configure

@@ -896,7 +896,7 @@ echo "$ac_t""$ac_cv_gcc_fnb" 1>&6
     MYFLAGS="-Wall"
   else
     if test ${ac_cv_gcc_ncs:-ERROR} = yes; then
-      MYFLAGS="-Wall -Wno-char-subscripts"
+      MYFLAGS="-Wall -Wno-char-subscripts -Wno-unused-but-set-variable"
     else
       MYFLAGS=""
     fi

lib/house/00

@@ -0,0 +1 @@
+This is a placeholder file so the directory will be created

lib/plrvars/A-E/00

@@ -0,0 +1 @@
+This is a placeholder file so the directory will be created

lib/plrvars/F-J/00

@@ -0,0 +1 @@
+This is a placeholder file so the directory will be created

lib/plrvars/K-O/00

@@ -0,0 +1 @@
+This is a placeholder file so the directory will be created

lib/plrvars/P-T/00

@@ -0,0 +1 @@
+This is a placeholder file so the directory will be created

lib/plrvars/U-Z/00

@@ -0,0 +1 @@
+This is a placeholder file so the directory will be created

lib/plrvars/ZZZ/00

@@ -0,0 +1 @@
+This is a placeholder file so the directory will be created

lib/text/immlist

@@ -4,4 +4,5 @@
 
                                    Immortals
                                    ~~~~~~~~~
+   Wylder          
 

lib/text/wizlist

@@ -4,6 +4,7 @@
 
                                  Implementors
                                  ~~~~~~~~~~~~
+                                     Wyld   
 
                                  Greater Gods
                                  ~~~~~~~~~~~~

lib/world/wld/0.wld

@@ -559,53 +559,18 @@ from you. It's a beautiful reciprocal arrangement.
 ~
 0 8 0 0 0 0
 E
-july4~
+Catcher Rye~
-   On July 4, 1776, we claimed our independence from England and Democracy was
+   The mark of the immature man is that he wants to die nobly for a cause, 
-born.  Every day thousands leave their homeland to come to the "land of the
+while the mark of the mature man is that he wants to live humbly for one.  
-free and the home of the brave" so they can begin their American Dream.  The
+--Wilhelm Stekel
-United States is truly a diverse nation made up of dynamic people.  Each year
+   ...you'll find that you're not the first person who was ever confused and 
-on July 4, Americans celebrate that freedom and indepen-dence with barbecues,
+frighteneed and even sickened by human behavior. You're by no means alone on 
-picnics, and family ga-therings.  Through the Internet we are learning about
+that score, you'll be excited and stimulated to know. Many, many men have been 
-and communicat-ing with people of different nations, with different languages
+just as troubled morally and spiritually as you are right now. Happily, some 
-and different races throughout the world.  Bringing the world closer with
+of them kept records of their troubles. You'll learn from them-if you want to. 
-understanding and knowledge can only benefit all nations.  We invite all
+Just as someday, if you have something to offer, someone will learn something 
-nations to celebrate with Americans online this Fourth of July.  Happy
+from you. It's a beautiful reciprocal arrangement.
-Birthday, America!    
+--The Catcher in the Rye   
-~
-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
 ~
 E
 old glory flag~
@@ -638,18 +603,53 @@ or daughter-I am proud.  My name is Old Glory-long may I wave.  Dear God, long
 may I wave.    
 ~
 E
-Catcher Rye~
+war~
-   The mark of the immature man is that he wants to die nobly for a cause, 
+   War is an ugly thing, but not the ugliest of things.  The decayed and
-while the mark of the mature man is that he wants to live humbly for one.  
+degraded state of moral and patriotic feeling which thinks that nothing is
---Wilhelm Stekel
+worth war is much worse.  The person who has nothing for which he is willing to
-   ...you'll find that you're not the first person who was ever confused and 
+fight, nothing which is more important than his own personal safety, is a
-frighteneed and even sickened by human behavior. You're by no means alone on 
+miserable creature and has no chance of being free unless made and kept so by
-that score, you'll be excited and stimulated to know. Many, many men have been 
+the exertions of better men than himself.
-just as troubled morally and spiritually as you are right now. Happily, some 
+John Stuart Mill
-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 
+E
-from you. It's a beautiful reciprocal arrangement.
+builder~
---The Catcher in the Rye   
+  
+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
@@ -857,14 +857,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
 $~

lib/world/wld/343.wld

@@ -773,7 +773,7 @@ Upper Immortal Hall, East~
    This is the midway down the hallway east, this hallway is lined with wood
 paneling and thick maroon, shag carpeting.  The hallway is lit by bronze
 lanterns that burn brightly here.  It continues on to the east and west.  
-Office doors line the walls.
+Office doors line the walls.  Wyld's Office is to the south.
 ~
 343 24 0 0 0 0
 D0
@@ -1211,7 +1211,7 @@ D3
 0 0 34386
 S
 #34365
-Fizbin's Office~
+Fizban's Office~
 You are in an unfinished room.
 ~
 343 28 0 0 0 0

lib/world/zon/343.zon

@@ -112,6 +112,10 @@ O 0 34346 7 34390 	(a short teak bench)
 R 0 34382 34346 -1 	(a short teak bench)
 O 0 34346 7 34382 	(a short teak bench)
 O 0 34347 2 34382 	(a gurgling spring)
+D 0 34386 0 1 	(Inside a Garden)
+R 0 34386 34346 -1 	(a short teak bench)
+O 0 34346 7 34386 	(a short teak bench)
+M 0 34305 2 34386 	(a gardener)
 D 0 34385 0 1 	(In a Garden)
 R 0 34385 34346 -1 	(a short teak bench)
 O 0 34346 7 34385 	(a short teak bench)
@@ -239,7 +243,10 @@ D 0 34315 2 1 	(God Hall, North)
 D 0 34365 2 1 	(Fizbin's Office)
 D 0 34367 3 1 	(Rhade's Office)
 D 0 34366 0 1 	(Shama's Office)
+D 0 34364 0 1 	(Wyld's Office)
 D 0 34363 2 1 	(Empty Office)
+D 0 34330 0 1 	(Upper Immortal Hall, East)
+D 0 34330 2 1 	(Upper Immortal Hall, East)
 D 0 34361 2 1 	(Rumbles Office)
 D 0 34360 0 1 	(Empty Office)
 D 0 34359 2 1 	(Elona's Office)

src/act.informative.c

@@ -71,7 +71,7 @@ static void show_obj_to_char(struct obj_data *obj, struct char_data *ch, int mod
   }
 
   if ((mode == 0) && obj->description) {
-    if (!GET_OBJ_VAL(obj, 1) == 0 || OBJ_SAT_IN_BY(obj)) {
+    if (GET_OBJ_VAL(obj, 1) != 0 || OBJ_SAT_IN_BY(obj)) {
       temp = OBJ_SAT_IN_BY(obj);
       for (temp = OBJ_SAT_IN_BY(obj); temp; temp = NEXT_SITTING(temp)) {
         if (temp == ch)

src/act.item.c

@@ -288,9 +288,14 @@ static void get_from_room(struct char_data *ch, char *arg, int howmany)
   dotmode = find_all_dots(arg);
 
   if (dotmode == FIND_INDIV) {
-    if (!(obj = get_obj_in_list_vis(ch, arg, NULL, world[IN_ROOM(ch)].contents)))
+    if (!(obj = get_obj_in_list_vis(ch, arg, NULL, world[IN_ROOM(ch)].contents))) {
+        /* Are they trying to take something in a room extra description? */
+        if (find_exdesc(arg, world[IN_ROOM(ch)].ex_description) != NULL) {
+            send_to_char(ch, "You can't take %s %s.\r\n", AN(arg), arg);
+            return;
+        }
       send_to_char(ch, "You don't see %s %s here.\r\n", AN(arg), arg);
-    else {
+    } else {
       struct obj_data *obj_next;
       while(obj && howmany--) {
 	obj_next = obj->next_content;
@@ -880,7 +885,7 @@ ACMD(do_drink)
     send_to_char(ch, "Your stomach can't contain anymore!\r\n");
     return;
   }
-  if ((GET_OBJ_VAL(temp, 1) == 0) || (!GET_OBJ_VAL(temp, 0) == 1)) {
+  if ((GET_OBJ_VAL(temp, 1) == 0) || (GET_OBJ_VAL(temp, 0) != 1)) {
     send_to_char(ch, "It is empty.\r\n");
     return;
   }

src/act.wizard.c

@@ -3228,7 +3228,6 @@ static int perform_set(struct char_data *ch, struct char_data *vict, int mode, c
       break;
     case 53: /* variable */
       return perform_set_dg_var(ch, vict, val_arg);
-      break;
     case 54: /* weight */
       GET_WEIGHT(vict) = value;
       affect_total(vict);
@@ -3484,11 +3483,6 @@ struct zcheck_armor {
   {ITEM_WEAR_HOLD,   10, "Held item"}
 };
 
-/*These are strictly boolean*/
-#define CAN_WEAR_WEAPONS         0     /* toggle - can a weapon also be a piece of armor? */
-#define MAX_APPLIES_LIMIT        1     /* toggle - is there a limit at all?               */
-#define CHECK_ITEM_RENT          0     /* do we check for rent cost == 0 ?                */
-#define CHECK_ITEM_COST          0     /* do we check for item cost == 0 ?                */
 /* Applies limits !! Very Important:  Keep these in the same order as in Structs.h.
  * To ignore an apply, set max_aff to -99. These will be ignored if MAX_APPLIES_LIMIT = 0 */
 struct zcheck_affs {

src/asciimap.c

@@ -585,9 +585,9 @@ MapArea(target_room, ch, centre, centre, min, max, ns_size/2, ew_size/2, worldma
     char_size = 3*(size+1) + (size) + 4;
 
   if(worldmap)
-    send_to_char(ch, "%s", strpaste(strfrmt(str, GET_SCREEN_WIDTH(ch) - char_size, size*2 + 1, FALSE, TRUE, TRUE), WorldMap(centre, size, MAP_CIRCLE, MAP_COMPACT), " \tn"));
+    send_to_char(ch, "%s", strpaste(WorldMap(centre, size, MAP_CIRCLE, MAP_COMPACT), strfrmt(str, GET_SCREEN_WIDTH(ch) - char_size, size*2 + 1, FALSE, TRUE, TRUE), " \tn"));
   else
-    send_to_char(ch, "%s", strpaste(strfrmt(str, GET_SCREEN_WIDTH(ch) - char_size, size*2 + 1, FALSE, TRUE, TRUE), CompactStringMap(centre, size), " \tn"));
+    send_to_char(ch, "%s", strpaste(CompactStringMap(centre, size), strfrmt(str, GET_SCREEN_WIDTH(ch) - char_size, size*2 + 1, FALSE, TRUE, TRUE), " \tn"));
 
 }
 

src/bsd-snprintf.c

@@ -93,7 +93,6 @@
 
 # include "conf.h"
 # include "sysdep.h"
-# define MAX(a, b)	((a) < (b) ? (b) : (a))
 
 #if defined(BROKEN_SNPRINTF)		/* For those with broken snprintf() */
 # undef HAVE_SNPRINTF

src/cedit.c

@@ -368,7 +368,7 @@ int save_config( IDXTYPE nowhere )
               "load_into_inventory = %d\n\n", CONFIG_LOAD_INVENTORY);
   fprintf(fl, "* Should PC's be able to track through hidden or closed doors?\n"
               "track_through_doors = %d\n\n", CONFIG_TRACK_T_DOORS);
-  fprintf(fl, "* Should players who reach enough exp automatically level to immortal?\n"
+  fprintf(fl, "* Should players who reach enough exp be prevented from automatically levelling to immortal?\n"
               "no_mort_to_immort = %d\n\n", CONFIG_NO_MORT_TO_IMMORT);
   fprintf(fl, "* Should closed doors be shown on autoexit / exit?\n"
               "disp_closed_doors = %d\n\n", CONFIG_DISP_CLOSED_DOORS);
@@ -633,7 +633,7 @@ static void cedit_disp_game_play_options(struct descriptor_data *d)
         "%sO%s) Track Through Doors         : %s%s\r\n"
         "%sP%s) Display Closed Doors        : %s%s\r\n"
         "%sR%s) Diagonal Directions         : %s%s\r\n"
-        "%sS%s) Mortals Level To Immortal   : %s%s\r\n"
+        "%sS%s) Prevent Mortal Level To Immortal : %s%s\r\n"
 	"%s1%s) OK Message Text         : %s%s"
 	"%s2%s) HUH Message Text        : %s%s"
         "%s3%s) NOPERSON Message Text   : %s%s"

src/class.c

@@ -8,9 +8,6 @@
 *  CircleMUD is based on DikuMUD, Copyright (C) 1990, 1991.               *
 **************************************************************************/
 
-/** Help buffer the global variable definitions */
-#define __CLASS_C__
-
 /* This file attempts to concentrate most of the code which must be changed
  * in order for new classes to be added.  If you're adding a new class, you
  * should go through this entire file from beginning to end and add the
@@ -1866,7 +1863,6 @@ const char *title_male(int chclass, int level)
       case LVL_GRGOD: return "the God of Magic";
       default: return "the Mage";
     }
-    break;
 
     case CLASS_CLERIC:
     switch (level) {
@@ -1896,7 +1892,6 @@ const char *title_male(int chclass, int level)
       case LVL_GRGOD: return "the God of Good and Evil";
       default: return "the Cleric";
     }
-    break;
 
     case CLASS_THIEF:
     switch (level) {
@@ -1926,7 +1921,6 @@ const char *title_male(int chclass, int level)
       case LVL_GRGOD: return "the God of Thieves and Tradesmen";
       default: return "the Thief";
     }
-    break;
 
     case CLASS_WARRIOR:
     switch(level) {
@@ -1956,7 +1950,6 @@ const char *title_male(int chclass, int level)
       case LVL_GRGOD: return "the God of War";
       default: return "the Warrior";
     }
-    break;
   }
 
   /* Default title for classes which do not have titles defined */
@@ -2010,7 +2003,6 @@ const char *title_female(int chclass, int level)
       case LVL_GRGOD: return "the Goddess of Magic";
       default: return "the Witch";
     }
-    break;
 
     case CLASS_CLERIC:
     switch (level) {
@@ -2040,7 +2032,6 @@ const char *title_female(int chclass, int level)
       case LVL_GRGOD: return "the Goddess of Good and Evil";
       default: return "the Cleric";
     }
-    break;
 
     case CLASS_THIEF:
     switch (level) {
@@ -2070,7 +2061,6 @@ const char *title_female(int chclass, int level)
       case LVL_GRGOD: return "the Goddess of Thieves and Tradesmen";
       default: return "the Thief";
     }
-    break;
 
     case CLASS_WARRIOR:
     switch(level) {
@@ -2100,7 +2090,6 @@ const char *title_female(int chclass, int level)
       case LVL_GRGOD: return "the Goddess of War";
       default: return "the Warrior";
     }
-    break;
   }
 
   /* Default title for classes which do not have titles defined */

src/db.c

@@ -1553,12 +1553,9 @@ static void parse_simple_mob(FILE *mob_f, int i, int nr)
  * assigns the correct value to the mob as appropriate.  Adding new e-specs is
  * absurdly easy -- just add a new CASE statement to this function! No other
  * changes need to be made anywhere in the code.
- * CASE		: Requires a parameter through 'value'.
+ * CASE		: Requires a parameter through 'value'. */
- * BOOL_CASE	: Being specified at all is its value. */
 #define CASE(test)	\
 	if (value && !matched && !str_cmp(keyword, test) && (matched = TRUE))
-#define BOOL_CASE(test)	\
-	if (!value && !matched && !str_cmp(keyword, test) && (matched = TRUE))
 #define RANGE(low, high)	\
 	(num_arg = MAX((low), MIN((high), (num_arg))))
 

src/dg_misc.c

@@ -305,7 +305,7 @@ void script_damage(struct char_data *vict, int dam)
   if (GET_POS(vict) == POS_DEAD) {
     if (!IS_NPC(vict))
       mudlog( BRF, 0, TRUE, "%s killed by script at %s",
-          GET_NAME(vict), world[vict->in_room].name);
+          GET_NAME(vict), vict->in_room == NOWHERE ? "NOWHERE" : world[vict->in_room].name);
     die(vict, NULL);
   }
 }

src/dg_mobcmd.c

@@ -45,7 +45,6 @@ static void mob_log(char_data *mob, const char *format, ...)
 /* Macro to determine if a mob is permitted to use these commands. */
 #define MOB_OR_IMPL(ch) \
  ((IS_NPC(ch) && (!(ch)->desc || GET_LEVEL((ch)->desc->original) >= LVL_IMPL)) || (SCRIPT(ch) && TRIGGERS(SCRIPT(ch))))
-#define MOB_OR_PLAYER(ch) (GET_LEVEL(ch) > 0)
 
 /* mob commands */
 /* prints the argument to all the rooms aroud the mobile */

src/dg_olc.c

@@ -455,12 +455,12 @@ void script_syntax_highlighting(struct descriptor_data *d, char *string)
         // Highlight lines
         if (!comment) {
             // Syntax replacement
-            for (i=0;i <= SYNTAX_TERMS;i++) {
+            for (i=0;i < SYNTAX_TERMS;i++) {
                 line = str_replace(line, syntax_color_replacement[i][0], syntax_color_replacement[i][1]);
             }
 
             // Commands replacement
-            for (i=0;i <= COMMAND_TERMS;i++) {
+            for (i=0;i < COMMAND_TERMS;i++) {
                 line = str_replace(line, command_color_replacement[i][0], command_color_replacement[i][1]);
             }
         

src/dg_triggers.c

@@ -285,7 +285,6 @@ int entry_mtrigger(char_data *ch)
   for (t = TRIGGERS(SCRIPT(ch)); t; t = t->next) {
     if (TRIGGER_CHECK(t, MTRIG_ENTRY) && (rand_number(1, 100) <= GET_TRIG_NARG(t))){
       return script_driver(&ch, t, MOB_TRIGGER, TRIG_NEW);
-      break;
     }
   }
 
@@ -1134,7 +1133,6 @@ int drop_wtrigger(obj_data *obj, char_data *actor)
         return 0;
       else
         return ret_val;
-      break;
     }
 
   return 1;

src/genolc.c

@@ -5,8 +5,6 @@
 *  Copyright 1996 by Harvey Gilpin, 1997-2001 by George Greer.            *
 **************************************************************************/
 
-#define __GENOLC_C__
-
 #include "conf.h"
 #include "sysdep.h"
 #include "structs.h"

src/ibt.c

@@ -1018,7 +1018,6 @@ void ibtedit_parse(struct descriptor_data *d, char *arg)
         write_to_output(d, "Do you wish to save your changes? : ");
         return;
       }
-      break;
 
     case IBTEDIT_MAIN_MENU:
       switch (*arg) {
@@ -1080,7 +1079,6 @@ void ibtedit_parse(struct descriptor_data *d, char *arg)
           ibtedit_disp_main_menu(d);
           return;
       }
-      break;
 
     case IBTEDIT_NAME:
       smash_tilde(arg);

src/interpreter.c

@@ -1354,7 +1354,6 @@ void nanny(struct descriptor_data *d, char *arg)
   case CON_GET_PROTOCOL:
     write_to_output(d, "Collecting Protocol Information... Please Wait.\r\n"); 
     return;
-  break;
   case CON_GET_NAME:		/* wait for input of name */
     if (d->character == NULL) {
       CREATE(d->character, struct char_data, 1);

src/lists.c

@@ -205,7 +205,6 @@ void * next_in_list(struct iterator_data * pIterator)
 
 struct item_data * find_in_list(void * pContent, struct list_data * pList)
 {
-  struct iterator_data Iterator;
   void * pFoundItem;
   struct item_data *pItem = NULL;
   bool found;
@@ -281,7 +280,6 @@ void * simple_list(struct list_data * pList)
 
 void * random_from_list(struct list_data * pList)
 {
-  struct iterator_data Iterator;
   void * pFoundItem;
   bool found;
   int number;

src/magic.c

@@ -586,8 +586,11 @@ void mag_groups(int level, struct char_data *ch, int spellnum, int savetype)
   while ((tch = (struct char_data *) simple_list(GROUP(ch)->members)) != NULL) {
     if (IN_ROOM(tch) != IN_ROOM(ch))
       continue;
+    if (tch == ch)
+      continue;
     perform_mag_groups(level, ch, tch, spellnum, savetype);
   }
+  perform_mag_groups(level, ch, ch, spellnum, savetype);
 }
 
 
@@ -969,7 +972,7 @@ void mag_creations(int level, struct char_data *ch, int spellnum)
 void mag_rooms(int level, struct char_data *ch, int spellnum)
 {
   room_rnum rnum;
-  int duration;
+  int duration = 0;
   bool failure = FALSE;
   event_id IdNum = eNULL;
   const char *msg = NULL;

src/medit.c

@@ -571,7 +571,6 @@ void medit_parse(struct descriptor_data *d, char *arg)
       write_to_output(d, "Do you wish to save your changes? : ");
       return;
     }
-    break;
 
   case MEDIT_MAIN_MENU:
     i = 0;

src/mud_event.c

@@ -77,6 +77,12 @@ EVENTFUNC(event_countdown)
       REMOVE_BIT_AR(ROOM_FLAGS(rnum), ROOM_DARK);
       send_to_room(rnum, "The dark shroud disappates.\r\n");
       break;
+    case ePROTOCOLS:
+      break;
+    case eWHIRLWIND:
+      break;
+    case eNULL:
+      break;
     default:
       break;
   }
@@ -234,7 +240,7 @@ void clear_char_event_list(struct char_data * ch)
 void change_event_duration(struct char_data * ch, event_id iId, long time)
 {
   struct event * pEvent;
-  struct mud_event_data * pMudEvent;
+  struct mud_event_data * pMudEvent = 0;
   bool found = FALSE;
 
   if (ch->events == NULL)

src/oasis_list.c

@@ -408,8 +408,6 @@ ACMD(do_oasis_list)
         return;
       }
       else if (is_abbrev(arg, "level") || is_abbrev(arg, "flags")) {
-        int i;
-
         if (!*arg2) {
           send_to_char(ch, "Which mobile flag or level do you want to list?\r\n");
           for (i = 0; i < NUM_MOB_FLAGS; i++) {

src/objsave.c

@@ -1185,7 +1185,7 @@ static int Crash_load_objs(struct char_data *ch) {
   unsigned long cost;
   struct obj_data *cont_row[MAX_BAG_ROWS];
   int rentcode = RENT_UNDEF;
-  int timed,netcost,gold,account,nitems;
+  int timed=0,netcost=0,gold,account,nitems;
 	obj_save_data *loaded, *current;
 
   if (!get_filename(filename, sizeof(filename), CRASH_FILE, GET_NAME(ch)))

src/protocol.c

@@ -113,7 +113,6 @@ static const char s_Gauge5[]  = "\005\002Opponent\002darkred\002OPPONENT_HEALTH\
 #define NUMBER_READ_ONLY           false, false, false, false, -1, -1,  0, NULL
 #define NUMBER_READ_ONLY_SET_TO(x) false, false, false, false, -1, -1,  x, NULL
 #define STRING_READ_ONLY           true,  false, false, false, -1, -1,  0, NULL
-#define NUMBER_IN_THE_RANGE(x,y)   false, true,  false, false,  x,  y,  0, NULL
 #define BOOLEAN_SET_TO(x)          false, true,  false, false,  0,  1,  x, NULL
 #define STRING_WITH_LENGTH_OF(x,y) true,  true,  false, false,  x,  y,  0, NULL
 #define STRING_WRITE_ONCE(x,y)     true,  true,  true,  false, -1, -1,  0, NULL

src/qedit.c

@@ -407,7 +407,6 @@ void qedit_parse(struct descriptor_data *d, char *arg)
             "Invalid choice!\r\nDo you wish to save the quest? : ");
           return;
       }
-      break;
     /*-------------------------------------------------------------------*/
     case QEDIT_CONFIRM_DELETE:
       switch (*arg) {
@@ -433,7 +432,6 @@ void qedit_parse(struct descriptor_data *d, char *arg)
             "Invalid choice!\r\nDo you wish to delete the quest? : ");
           return;
       }
-      break;
 
     /*-------------------------------------------------------------------*/
     case QEDIT_MAIN_MENU:
@@ -747,3 +745,4 @@ void qedit_string_cleanup(struct descriptor_data *d, int terminator)
     break;
   }
 }
+

src/quest.c

@@ -206,7 +206,6 @@ void parse_quest(FILE *quest_f, int nr)
     case 'S':
       total_quests = ++i;
       return;
-      break;
     }
   }
 } /* parse_quest */

src/sedit.c

@@ -467,7 +467,6 @@ void sedit_parse(struct descriptor_data *d, char *arg)
      write_to_output(d, "Invalid choice!\r\nDo you wish to save your changes? : ");
       return;
     }
-    break;
 
   case SEDIT_MAIN_MENU:
     i = 0;

src/zmalloc.c

@@ -11,9 +11,6 @@
  *  Makefile: # Any special flags you want to pass to the compiler
  *  Makefile: MYFLAGS = -Wall -DMEMORY_DEBUG */
 
-/* protect our calloc() and free() calls from recursive redefinition: */
-#define ZMALLOC_H
-
 #include "conf.h"
 #include <stdio.h>
 #include <stdlib.h>