Merge branch 'master' into kaizen/reformatting-and-linting

# Conflicts: # src/act.comm.c # src/act.informative.c # src/aedit.c # src/comm.c # src/comm.h # src/dg_olc.h
2025-07-02 22:46:56 +02:00 · 2025-07-02 22:31:44 +02:00 · 2025-04-20 02:22:15 +02:00 · 2024-12-31 00:18:53 +01:00 · 2024-12-30 13:07:05 +01:00 · 2024-10-01 00:09:30 +02:00
139 changed files with 10785 additions and 11003 deletions
@@ -0,0 +1,55 @@
 ---
 Language: Cpp
 BasedOnStyle: LLVM
 AccessModifierOffset: -4
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
 AlignOperands: Align
 AlignTrailingComments: true
 AlwaysBreakTemplateDeclarations: Yes
 BraceWrapping: 
  AfterCaseLabel: true
  AfterClass: true
  AfterControlStatement: false
  AfterEnum: true
  AfterFunction: true
  AfterNamespace: true
  AfterStruct: true
  AfterUnion: true
  AfterExternBlock: false
  BeforeCatch: true
  BeforeElse: false
  BeforeLambdaBody: true
  BeforeWhile: true
  SplitEmptyFunction: true
  SplitEmptyRecord: true
  SplitEmptyNamespace: true
 BreakBeforeBraces: Custom
 BreakBeforeBinaryOperators: All
 BreakConstructorInitializers: AfterColon
 BreakConstructorInitializersBeforeComma: false
 ColumnLimit: 120
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 IncludeCategories: 
  - Regex: '^<.*'
    Priority: 1
  - Regex: '^".*'
    Priority: 2
  - Regex: '.*'
    Priority: 3
 IncludeIsMainRegex: '([-_](test|unittest))?$'
 IndentCaseBlocks: true
 IndentWidth: 2
 InsertNewlineAtEOF: true
 MacroBlockBegin: ''
 MacroBlockEnd: ''
 MaxEmptyLinesToKeep: 2
 NamespaceIndentation: All
 SpaceInEmptyParentheses: false
 SpacesInAngles: false
 SpacesInConditionalStatement: false
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 TabWidth: 2
 ...
@@ -63,10 +63,6 @@ lib/plrobjs/index
 !lib/plrobjs/U-Z/00
 !lib/plrobjs/ZZZ/00
 #don't commit logs
 !log/*
 !syslog.CRASH
 # also not autogenerated config file
 /lib/etc/config
 # or the list of last logins
@@ -1,5 +1,3 @@
 Files for tbaMUD.
 Files for Grenzland-MUD
 Files for grenzland-mud, forked from tbamud
@@ -0,0 +1 @@
 select foo.com 1745106858 Welcor
@@ -1,10 +1,8 @@
 (lib/text/background)
-The mists part and you find yourself in a
+There once was a guy who played MUDs
-world unlike the one you have just left.
+But the MUDs that he played were all duds
-Reality twisted and turned, and the land
+   "I'll write one," said he.
-has found itself in a new configuration.
+   And he brushed off his C.
-Enter the borderland of reality and find 
+And soon played his game with his buds.
 your own way. 
 In the Grenzland. 
@@ -1,13 +1,7 @@
-
+                               T  B  A  M  U  D
-
+                                   2 0 2 5 
                      G R E N Z L A N D  M U D
                               2 0 2 6 
   Based on tbaMUD, by The Builder Academy
   Based on CircleMUD by Jeremy Elson and DikuMUD by Hans-Henrik Staerfeldt,
        Katja Nyboe, Tom Madsen, Michael Seifert, and Sebastian Hammer
-
+By what name do you wish to be known? 
   Oh hero, by what name shall you wish to be known? 
@@ -1,12 +1,8 @@
 (lib/text/policies)
-Right now we are all adults and should be able to interact with
+This file should list, in no uncertain terms, the policies you must abide
-each other without any larger issues.
+by on this MUD.
 But the Grenzland maxim still is in force: 
 We are here to play, don't piss into anyone else's beer. 
-No harassing, no doxxing, no sexism, racism, or other unacceptable 
+Bug the higher-ups to make some policies and write them in this file, lest
-isms towards your fellow players. 
+a political disaster ensue...
 We definitely should add something more worked out in here. 
@@ -11,4 +11,3 @@
                                     Gods
                                     ~~~~
 				    kyonshi
@@ -1,3 +0,0 @@
 Jan 19 20:16:23 2026 :: SYSERR: Received SIGHUP, SIGINT, or SIGTERM.  Shutting down...
 Jan 19 21:00:42 2026 :: SYSERR: Received SIGHUP, SIGINT, or SIGTERM.  Shutting down...
 SYSERR: bind: Address already in use
@@ -1 +0,0 @@
 Jan 19 20:20:26 2026 :: Tobi [localhost] new player.
@@ -1,3 +0,0 @@
 Jan 19 20:15:16 2026 :: Running game on port 4000.
 Jan 19 20:16:30 2026 :: Running game on port 4000.
 Jan 19 23:43:58 2026 :: Running game on port 4000.
@@ -1,284 +0,0 @@
 autorun starting game Mo 19. Jan 20:16:30 CET 2026
 running bin/circle -q 4000
 nohup: Eingabe wird ignoriert
 No etc/config file, using defaults: No such file or directory
 Jan 19 20:16:30 2026 :: Loading configuration.
 Jan 19 20:16:30 2026 :: tbaMUD 2025
 Jan 19 20:16:30 2026 :: Using lib as data directory.
 Jan 19 20:16:30 2026 :: Running game on port 4000.
 Jan 19 20:16:30 2026 :: Finding player limit.
 Jan 19 20:16:30 2026 ::    Setting player limit to 300 using rlimit.
 Jan 19 20:16:30 2026 :: Opening mother connection.
 Jan 19 20:16:30 2026 :: Binding to all IP interfaces on this host.
 Jan 19 20:16:30 2026 :: Boot db -- BEGIN.
 Jan 19 20:16:30 2026 :: Resetting the game time:
 Jan 19 20:16:30 2026 :: No time file 'etc/time' starting from the beginning.
 Jan 19 20:16:30 2026 ::    Current Gametime: 9H 6D 6M 1044Y.
 Jan 19 20:16:30 2026 :: Initialize Global Lists
 Jan 19 20:16:30 2026 :: Initializing Events
 Jan 19 20:16:30 2026 :: Reading news, credits, help, ihelp, bground, info & motds.
 Jan 19 20:16:30 2026 :: Loading spell definitions.
 Jan 19 20:16:30 2026 :: Loading zone table.
 Jan 19 20:16:30 2026 ::    189 zones, 13608 bytes.
 Jan 19 20:16:30 2026 :: Loading triggers and generating index.
 Jan 19 20:16:30 2026 :: Loading rooms.
 Jan 19 20:16:30 2026 ::    12733 rooms, 2342872 bytes.
 Jan 19 20:16:30 2026 :: Renumbering rooms.
 Jan 19 20:16:30 2026 :: Checking start rooms.
 Jan 19 20:16:30 2026 :: Loading mobs and generating index.
 Jan 19 20:16:30 2026 ::    3705 mobs, 118560 bytes in index, 2134080 bytes in prototypes.
 Jan 19 20:16:30 2026 :: Loading objs and generating index.
 Jan 19 20:16:30 2026 ::    4765 objs, 152480 bytes in index, 1143600 bytes in prototypes.
 Jan 19 20:16:30 2026 :: Renumbering zone table.
 Jan 19 20:16:30 2026 :: Loading shops.
 Jan 19 20:16:30 2026 :: Loading quests.
 Jan 19 20:16:30 2026 ::    1 entries, 128 bytes.
 Jan 19 20:16:30 2026 :: Loading help entries.
 Jan 19 20:16:30 2026 ::    2640 entries, 84480 bytes.
 Jan 19 20:16:30 2026 :: Generating player index.
 Jan 19 20:16:30 2026 :: No player index file!  First new char will be IMP!
 Jan 19 20:16:30 2026 :: Loading fight messages.
 Jan 19 20:16:30 2026 :: Loaded 37 Combat Messages...
 Jan 19 20:16:30 2026 :: Loading social messages.
 Jan 19 20:16:30 2026 :: Social table contains 490 socials.
 Jan 19 20:16:30 2026 :: Building command list.
 Jan 19 20:16:30 2026 :: Command info rebuilt, 766 total commands.
 Jan 19 20:16:30 2026 :: Assigning function pointers:
 Jan 19 20:16:30 2026 ::    Mobiles.
 Jan 19 20:16:30 2026 ::    Shopkeepers.
 Jan 19 20:16:30 2026 ::    Objects.
 Jan 19 20:16:30 2026 ::    Rooms.
 Jan 19 20:16:30 2026 ::    Questmasters.
 Jan 19 20:16:30 2026 :: Assigning spell and skill levels.
 Jan 19 20:16:30 2026 :: Sorting command list and spells.
 Jan 19 20:16:30 2026 :: Booting mail system.
 Jan 19 20:16:30 2026 ::    Mail file read -- 0 messages.
 Jan 19 20:16:30 2026 :: Reading banned site and invalid-name list.
 Jan 19 20:16:30 2026 :: Loading Ideas.
 Jan 19 20:16:30 2026 :: Loading Bugs.
 Jan 19 20:16:30 2026 :: Loading Typos.
 Jan 19 20:16:30 2026 :: Booting houses.
 Jan 19 20:16:30 2026 ::    No houses to load. File 'etc/hcontrol' does not exist.
 Jan 19 20:16:30 2026 :: Cleaning up last log.
 Jan 19 20:16:30 2026 :: Resetting #0: The Builder Academy Zone (rooms 0-99).
 Jan 19 20:16:30 2026 :: Resetting #1: Sanctus (rooms 100-199).
 Jan 19 20:16:30 2026 :: Resetting #2: Sanctus II (rooms 200-299).
 Jan 19 20:16:30 2026 :: Resetting #3: Sanctus III (rooms 300-399).
 Jan 19 20:16:30 2026 :: Resetting #4: Rename (rooms 400-499).
 Jan 19 20:16:30 2026 :: Resetting #5: Newbie Farm (rooms 500-599).
 Jan 19 20:16:30 2026 :: Resetting #6: Sea of Souls (rooms 600-699).
 Jan 19 20:16:30 2026 :: Resetting #7: Camelot (rooms 700-799).
 Jan 19 20:16:30 2026 :: Resetting #9: River Island of Minos (rooms 900-999).
 Jan 19 20:16:30 2026 :: Resetting #11: Frozen Castle (rooms 1100-1199).
 Jan 19 20:16:30 2026 :: Resetting #12: God Complex Merged with 343 (rooms 1200-1299).
 Jan 19 20:16:30 2026 :: Resetting #13: TBA Examples (rooms 1300-1399).
 Jan 19 20:16:30 2026 :: Resetting #14: TBA Examples II (rooms 1400-1499).
 Jan 19 20:16:30 2026 :: Resetting #15: Straight Path (rooms 1500-1599).
 Jan 19 20:16:30 2026 :: Resetting #16: Camelot II (rooms 1600-1699).
 Jan 19 20:16:30 2026 :: Resetting #17: Camelot III (rooms 1700-1799).
 Jan 19 20:16:30 2026 :: Resetting #18: Nuclear Wasteland (rooms 1800-1899).
 Jan 19 20:16:30 2026 :: Resetting #19: Spider Swamp (rooms 1900-1999).
 Jan 19 20:16:30 2026 :: Resetting #20: Arena (rooms 2000-2099).
 Jan 19 20:16:30 2026 :: Resetting #22: Tower of the Undead (rooms 2200-2299).
 Jan 19 20:16:30 2026 :: Resetting #25: High Tower of Magic (rooms 2500-2599).
 Jan 19 20:16:30 2026 :: Resetting #26: High Tower of Magic II (rooms 2600-2699).
 Jan 19 20:16:30 2026 :: Resetting #27: Memlin Caverns (rooms 2700-2799).
 Jan 19 20:16:30 2026 :: Resetting #28: Mudschool (rooms 2800-2899).
 Jan 19 20:16:30 2026 :: Resetting #30: Northern Midgaard (rooms 3000-3099).
 Jan 19 20:16:30 2026 :: Resetting #31: Southern Midgaard (rooms 3100-3199).
 Jan 19 20:16:30 2026 :: Resetting #32: Midgaard (rooms 3200-3299).
 Jan 19 20:16:30 2026 :: Resetting #33: Three of Swords (rooms 3300-3399).
 Jan 19 20:16:30 2026 :: Resetting #35: Miden'Nir (rooms 3500-3599).
 Jan 19 20:16:30 2026 :: Resetting #36: Chessboard of Midgaard (rooms 3600-3699).
 Jan 19 20:16:30 2026 :: Resetting #37: Capital Sewer System (rooms 3700-3799).
 Jan 19 20:16:30 2026 :: Resetting #38: Capital Sewer System II (rooms 3800-3899).
 Jan 19 20:16:30 2026 :: Resetting #39: Haven (rooms 3900-3999).
 Jan 19 20:16:30 2026 :: Resetting #40: Mines of Moria (rooms 4000-4099).
 Jan 19 20:16:30 2026 :: Resetting #41: Mines of Moria (rooms 4100-4199).
 Jan 19 20:16:30 2026 :: Resetting #42: Dragon Chasm (rooms 4200-4299).
 Jan 19 20:16:30 2026 :: Resetting #43: Arctic Zone (rooms 4300-4399).
 Jan 19 20:16:30 2026 :: Resetting #44: Orc Camp (rooms 4400-4499).
 Jan 19 20:16:30 2026 :: Resetting #45: Woodland Monastery (rooms 4500-4599).
 Jan 19 20:16:30 2026 :: Resetting #46: Ant Hill (rooms 4600-4699).
 Jan 19 20:16:30 2026 :: Resetting #50: Great Eastern Desert (rooms 5000-5099).
 Jan 19 20:16:30 2026 :: Resetting #51: Drow City (rooms 5100-5199).
 Jan 19 20:16:30 2026 :: Resetting #52: City of Thalos (rooms 5200-5299).
 Jan 19 20:16:30 2026 :: Resetting #53: Great Pyramid (rooms 5300-5399).
 Jan 19 20:16:30 2026 :: Resetting #54: New Thalos (rooms 5400-5499).
 Jan 19 20:16:30 2026 :: Resetting #55: New Thalos II (rooms 5500-5599).
 Jan 19 20:16:30 2026 :: Resetting #56: New Thalos Wilderness (rooms 5600-5699).
 Jan 19 20:16:30 2026 :: Resetting #57: Zodiac (rooms 5700-5799).
 Jan 19 20:16:30 2026 :: Resetting #60: Haon-Dor, Light Forest (rooms 6000-6099).
 Jan 19 20:16:30 2026 :: Resetting #61: Haon-Dor, Light Forest II (rooms 6100-6199).
 Jan 19 20:16:30 2026 :: Resetting #62: Orc Enclave (rooms 6200-6299).
 Jan 19 20:16:30 2026 :: Resetting #63: Arachnos (rooms 6300-6399).
 Jan 19 20:16:30 2026 :: Resetting #64: Rand's Tower (rooms 6400-6499).
 Jan 19 20:16:30 2026 :: Resetting #65: Dwarven Kingdom (rooms 6500-6599).
 Jan 19 20:16:30 2026 :: Resetting #70: Sewer, First Level (rooms 7000-7099).
 Jan 19 20:16:30 2026 :: Resetting #71: Second Sewer (rooms 7100-7199).
 Jan 19 20:16:30 2026 :: Resetting #72: Sewer Maze (rooms 7200-7299).
 Jan 19 20:16:30 2026 :: Resetting #73: Tunnels in the Sewer (rooms 7300-7399).
 Jan 19 20:16:30 2026 :: Resetting #74: Newbie Graveyard (rooms 7400-7499).
 Jan 19 20:16:30 2026 :: Resetting #75: Zamba (rooms 7500-7599).
 Jan 19 20:16:30 2026 :: Resetting #78: Gideon (rooms 7800-7899).
 Jan 19 20:16:30 2026 :: Resetting #79: Redferne's Residence (rooms 7900-7999).
 Jan 19 20:16:30 2026 :: Resetting #83: Glumgold's Sea (rooms 8300-8399).
 Jan 19 20:16:30 2026 :: Resetting #86: Duke Kalithorn's Keep (rooms 8600-8699).
 Jan 19 20:16:30 2026 :: Resetting #90: Oasis (rooms 9000-9099).
 Jan 19 20:16:30 2026 :: Resetting #96: Domiae (rooms 9600-9699).
 Jan 19 20:16:30 2026 :: Resetting #100: Northern Highway (rooms 10000-10099).
 Jan 19 20:16:30 2026 :: Resetting #101: South Road (rooms 10100-10199).
 Jan 19 20:16:30 2026 :: Resetting #103: DBZ World (rooms 10300-10399).
 Jan 19 20:16:30 2026 :: Resetting #104: Land of Orchan (rooms 10400-10499).
 Jan 19 20:16:30 2026 :: Resetting #106: Elcardo (rooms 10600-10699).
 Jan 19 20:16:30 2026 :: Resetting #107: Realms of Iuel (rooms 10700-10799).
 Jan 19 20:16:30 2026 :: Resetting #115: Monestary Omega (rooms 11500-11599).
 Jan 19 20:16:30 2026 :: Resetting #117: Los Torres (rooms 11700-11799).
 Jan 19 20:16:30 2026 :: Resetting #118: The Dollhouse (rooms 11800-11899).
 Jan 19 20:16:30 2026 :: Resetting #120: Rome (rooms 12000-12099).
 Jan 19 20:16:30 2026 :: Resetting #125: Hannah (rooms 12500-12599).
 Jan 19 20:16:30 2026 :: Resetting #130: Mist Maze (rooms 13000-13099).
 Jan 19 20:16:30 2026 :: Resetting #140: Wyvern City (rooms 14000-14099).
 Jan 19 20:16:30 2026 :: Resetting #150: King Welmar's Castle (rooms 15000-15099).
 Jan 19 20:16:30 2026 :: Resetting #169: Gibberling Caves (rooms 16900-16999).
 Jan 19 20:16:30 2026 :: Resetting #175: Cardinal Wizards (rooms 17500-17599).
 Jan 19 20:16:30 2026 :: Resetting #186: Newbie Zone (rooms 18600-18699).
 Jan 19 20:16:30 2026 :: Resetting #187: Circus (rooms 18700-18799).
 Jan 19 20:16:30 2026 :: Resetting #200: Western Highway (rooms 20000-20099).
 Jan 19 20:16:30 2026 :: Resetting #201: Sapphire Islands (rooms 20100-20199).
 Jan 19 20:16:30 2026 :: Resetting #211: Tarot (rooms 21100-21199).
 Jan 19 20:16:30 2026 :: Resetting #220: The Enchanted Kitchen (rooms 22000-22099).
 Jan 19 20:16:30 2026 :: Resetting #232: Terringham (rooms 23200-23299).
 Jan 19 20:16:30 2026 :: Resetting #233: Dragon Plains (rooms 23300-23399).
 Jan 19 20:16:30 2026 :: Resetting #234: Newbie School (rooms 23400-23499).
 Jan 19 20:16:30 2026 :: Resetting #235: Dwarven Mines (rooms 23500-23599).
 Jan 19 20:16:30 2026 :: Resetting #236: Aldin (rooms 23600-23699).
 Jan 19 20:16:30 2026 :: Resetting #237: Dwarven Trade Route (rooms 23700-23799).
 Jan 19 20:16:30 2026 :: Resetting #238: Crystal Castle (rooms 23800-23899).
 Jan 19 20:16:30 2026 :: Resetting #239: South Pass (rooms 23900-23999).
 Jan 19 20:16:30 2026 :: Resetting #240: Dun Maura (rooms 24000-24099).
 Jan 19 20:16:30 2026 :: Resetting #241: Starship Enterprise (rooms 24100-24199).
 Jan 19 20:16:30 2026 :: Resetting #242: New Southern Midgaard (rooms 24200-24299).
 Jan 19 20:16:30 2026 :: Resetting #243: Snowy Valley (rooms 24300-24399).
 Jan 19 20:16:30 2026 :: Resetting #244: Cooland Prison (rooms 24400-24499).
 Jan 19 20:16:30 2026 :: Resetting #245: The Nether (rooms 24500-24599).
 Jan 19 20:16:30 2026 :: Resetting #246: The Nether II (rooms 24600-24699).
 Jan 19 20:16:30 2026 :: Resetting #247: Graveyard (rooms 24700-24799).
 Jan 19 20:16:30 2026 :: Resetting #248: Elven Woods (rooms 24800-24899).
 Jan 19 20:16:30 2026 :: Resetting #249: Jedi Clan House (rooms 24900-24999).
 Jan 19 20:16:30 2026 :: Resetting #250: DragonSpyre (rooms 25000-25099).
 Jan 19 20:16:30 2026 :: Resetting #251: Ape Village (rooms 25100-25199).
 Jan 19 20:16:30 2026 :: Resetting #252: Castle of the Vampyre (rooms 25200-25299).
 Jan 19 20:16:30 2026 :: Resetting #253: Windmill (rooms 25300-25399).
 Jan 19 20:16:30 2026 :: Resetting #254: Mordecai's Village (rooms 25400-25499).
 Jan 19 20:16:30 2026 :: Resetting #255: Shipwreck (rooms 25500-25599).
 Jan 19 20:16:30 2026 :: Resetting #256: Lord's Keep (rooms 25600-25699).
 Jan 19 20:16:30 2026 :: Resetting #257: Jareth Main City (rooms 25700-25799).
 Jan 19 20:16:30 2026 :: Resetting #258: Light Forest (rooms 25800-25899).
 Jan 19 20:16:30 2026 :: Resetting #259: Haunted Mansion (rooms 25900-25999).
 Jan 19 20:16:30 2026 :: Resetting #260: Grasslands (rooms 26000-26099).
 Jan 19 20:16:30 2026 :: Resetting #261: Inna & Igor's Castle (rooms 26100-26199).
 Jan 19 20:16:30 2026 :: Resetting #262: Forest Trails (rooms 26200-26299).
 Jan 19 20:16:30 2026 :: Resetting #263: Farmlands (rooms 26300-26399).
 Jan 19 20:16:30 2026 :: Resetting #264: Banshide (rooms 26400-26499).
 Jan 19 20:16:30 2026 :: Resetting #265: Beach & Lighthouse (rooms 26500-26599).
 Jan 19 20:16:30 2026 :: Resetting #266: Realm of Lord Ankou (rooms 26600-26699).
 Jan 19 20:16:30 2026 :: Resetting #267: Vice Island (rooms 26700-26799).
 Jan 19 20:16:30 2026 :: Resetting #268: Vice Island II (rooms 26800-26899).
 Jan 19 20:16:30 2026 :: Resetting #269: Southern Desert (rooms 26900-26999).
 Jan 19 20:16:30 2026 :: Resetting #270: Wasteland (rooms 27000-27099).
 Jan 19 20:16:30 2026 :: Resetting #271: Sundhaven (rooms 27100-27199).
 Jan 19 20:16:30 2026 :: Resetting #272: Sundhaven II (rooms 27200-27299).
 Jan 19 20:16:30 2026 :: Resetting #273: Space Station Alpha (rooms 27300-27399).
 Jan 19 20:16:30 2026 :: Resetting #274: Adria: Saint Brigid (rooms 27400-27499).
 Jan 19 20:16:30 2026 :: Resetting #275: New Sparta (rooms 27500-27599).
 Jan 19 20:16:30 2026 :: Resetting #276: New Sparta II (rooms 27600-27699).
 Jan 19 20:16:30 2026 :: Resetting #277: Shire (rooms 27700-27799).
 Jan 19 20:16:30 2026 :: Resetting #278: Oceania (rooms 27800-27899).
 Jan 19 20:16:30 2026 :: Resetting #279: Notre Dame (rooms 27900-27999).
 Jan 19 20:16:30 2026 :: Resetting #280: Living Motherboard (rooms 28000-28099).
 Jan 19 20:16:30 2026 :: Resetting #281: Forest of Khanjar (rooms 28100-28199).
 Jan 19 20:16:30 2026 :: Resetting #282: Infernal Pit of Kerjim (rooms 28200-28299).
 Jan 19 20:16:30 2026 :: Resetting #283: Haunted House (rooms 28300-28399).
 Jan 19 20:16:30 2026 :: Resetting #284: Ghenna (rooms 28400-28499).
 Jan 19 20:16:30 2026 :: Resetting #285: Descent to Hell II (rooms 28500-28599).
 Jan 19 20:16:30 2026 :: Resetting #286: Descent to Hell (rooms 28600-28699).
 Jan 19 20:16:30 2026 :: Resetting #287: Ofingia and the Goblin Town (rooms 28700-28799).
 Jan 19 20:16:30 2026 :: Resetting #288: Galaxy (rooms 28800-28899).
 Jan 19 20:16:30 2026 :: Resetting #289: Werith's Wayhouse (rooms 28900-28999).
 Jan 19 20:16:30 2026 :: Resetting #290: Lizard Lair Safari (rooms 29000-29099).
 Jan 19 20:16:30 2026 :: Resetting #291: Black Forest (rooms 29100-29199).
 Jan 19 20:16:30 2026 :: Resetting #292: Kerofk (rooms 29200-29299).
 Jan 19 20:16:30 2026 :: Resetting #293: Kerofk II (rooms 29300-29399).
 Jan 19 20:16:30 2026 :: Resetting #294: Trade Road (rooms 29400-29499).
 Jan 19 20:16:30 2026 :: Resetting #295: Jungle (rooms 29500-29599).
 Jan 19 20:16:30 2026 :: Resetting #296: Froboz Fun Factory (rooms 29600-29699).
 Jan 19 20:16:30 2026 :: Resetting #298: Castle of Desire (rooms 29800-29899).
 Jan 19 20:16:30 2026 :: Resetting #299: Abandoned Cathedral (rooms 29900-29999).
 Jan 19 20:16:30 2026 :: Resetting #300: Ancalador (rooms 30000-30099).
 Jan 19 20:16:30 2026 :: Resetting #301: Campus (rooms 30100-30199).
 Jan 19 20:16:30 2026 :: Resetting #302: Campus II (rooms 30200-30299).
 Jan 19 20:16:30 2026 :: Resetting #303: Campus III (rooms 30300-30399).
 Jan 19 20:16:30 2026 :: Resetting #304: Temple of the Bull (rooms 30400-30499).
 Jan 19 20:16:30 2026 :: Resetting #305: Chessboard (rooms 30500-30599).
 Jan 19 20:16:30 2026 :: Resetting #306: Newbie Tree (rooms 30600-30699).
 Jan 19 20:16:30 2026 :: Resetting #307: Castle (rooms 30700-30799).
 Jan 19 20:16:30 2026 :: Resetting #308: Baron Cailveh (rooms 30800-30899).
 Jan 19 20:16:30 2026 :: Resetting #309: Keep of Baron Westlawn (rooms 30900-30999).
 Jan 19 20:16:30 2026 :: Resetting #310: Graye Area (rooms 31000-31099).
 Jan 19 20:16:30 2026 :: Resetting #311: The Dragon's Teeth (rooms 31100-31199).
 Jan 19 20:16:30 2026 :: Resetting #312: Leper Island (rooms 31200-31299).
 Jan 19 20:16:30 2026 :: Resetting #313: Farmlands of Ofingia (rooms 31300-31399).
 Jan 19 20:16:30 2026 :: Resetting #314: X'Raantra's Altar of Sacrifice (rooms 31400-31499).
 Jan 19 20:16:30 2026 :: Resetting #315: McGintey Business District (rooms 31500-31599).
 Jan 19 20:16:30 2026 :: Resetting #316: McGintey Guild Area (rooms 31600-31699).
 Jan 19 20:16:30 2026 :: Resetting #317: Wharf (rooms 31700-31799).
 Jan 19 20:16:30 2026 :: Resetting #318: Dock Area (rooms 31800-31899).
 Jan 19 20:16:30 2026 :: Resetting #319: Yllythad Sea (rooms 31900-31999).
 Jan 19 20:16:30 2026 :: Resetting #320: Yllythad Sea II (rooms 32000-32099).
 Jan 19 20:16:30 2026 :: Resetting #321: Yllythad Sea III (rooms 32100-32199).
 Jan 19 20:16:30 2026 :: Resetting #322: McGintey Bay (rooms 32200-32299).
 Jan 19 20:16:30 2026 :: Resetting #323: Caverns of the Pale Man (rooms 32300-32399).
 Jan 19 20:16:30 2026 :: Resetting #324: Army Encampment (rooms 32400-32499).
 Jan 19 20:16:30 2026 :: Resetting #325: Revelry (rooms 32500-32599).
 Jan 19 20:16:30 2026 :: Resetting #326: Army Perimeter (rooms 32600-32699).
 Jan 19 20:16:30 2026 :: Resetting #343: God Complex  (rooms 34300-34399).
 Jan 19 20:16:30 2026 :: Resetting #345: Asylum for the Insane (rooms 34500-34599).
 Jan 19 20:16:30 2026 :: Resetting #346: God Hall Ext 346 for God Hall Cmplx (rooms 34600-34699).
 Jan 19 20:16:30 2026 :: Resetting #555: Ultima (rooms 55500-55599).
 Jan 19 20:16:30 2026 :: Resetting #556: Ultima II (rooms 55600-55699).
 Jan 19 20:16:30 2026 :: Resetting #653: Apartment (rooms 65300-65399).
 Jan 19 20:16:30 2026 :: Resetting #654: Subdivision (rooms 65400-65499).
 Jan 19 20:16:30 2026 :: Boot db -- DONE.
 Jan 19 20:16:30 2026 :: Signal trapping.
 Jan 19 20:16:30 2026 :: Entering game loop.
 Jan 19 20:16:30 2026 :: No connections.  Going to sleep.
 Jan 19 20:16:34 2026 :: New connection.  Waking up.
 Jan 19 20:16:48 2026 :: Losing player: <null>.
 Jan 19 20:16:48 2026 :: No connections.  Going to sleep.
 Jan 19 20:17:14 2026 :: New connection.  Waking up.
 Jan 19 20:20:11 2026 :: Multiple logins detected in char creation for Tobi.
 Jan 19 20:20:11 2026 :: Losing descriptor without char.
 Jan 19 20:20:26 2026 :: Tobi [localhost] new player.
 Jan 19 20:20:28 2026 :: Error opening last_file for reading, will create.
 Jan 19 20:20:34 2026 :: Losing player: Tobi.
 Jan 19 20:20:34 2026 :: No connections.  Going to sleep.
 Jan 19 20:21:40 2026 :: New connection.  Waking up.
 Jan 19 20:22:06 2026 :: Losing player: <null>.
 Jan 19 20:22:06 2026 :: No connections.  Going to sleep.
 Jan 19 20:23:08 2026 :: New connection.  Waking up.
 Jan 19 20:23:16 2026 :: Tobi has connected.
 Jan 19 20:23:33 2026 :: Tobi had no variable file
 Jan 19 20:23:33 2026 :: Tobi entering game with no equipment.
 Jan 19 20:23:58 2026 :: Tobi has quit the game.
 Jan 19 20:24:02 2026 :: Losing player: Tobi.
 Jan 19 20:24:02 2026 :: No connections.  Going to sleep.
 Jan 19 20:58:12 2026 :: New connection.  Waking up.
 Jan 19 20:58:18 2026 :: nusage: 1   sockets connected, 0   sockets playing
 Jan 19 20:58:27 2026 :: Tobi has connected.
 Jan 19 20:58:31 2026 :: Losing player: Tobi.
 Jan 19 20:58:31 2026 :: No connections.  Going to sleep.
 Jan 19 21:00:42 2026 :: SYSERR: Received SIGHUP, SIGINT, or SIGTERM.  Shutting down...
 Quick boot mode -- rent check supressed.
 Using file descriptor for logging.
 Improper shutdown of autorun detected, rotating syslogs before startup.
@@ -1,16 +0,0 @@
 autorun starting game Mo 19. Jan 23:43:58 CET 2026
 running bin/circle -q 4000
 nohup: Eingabe wird ignoriert
 No etc/config file, using defaults: No such file or directory
 Jan 19 23:43:58 2026 :: Loading configuration.
 Jan 19 23:43:58 2026 :: tbaMUD 2025
 Jan 19 23:43:58 2026 :: Using lib as data directory.
 Jan 19 23:43:58 2026 :: Running game on port 4000.
 Jan 19 23:43:58 2026 :: Finding player limit.
 Jan 19 23:43:58 2026 ::    Setting player limit to 300 using rlimit.
 Jan 19 23:43:58 2026 :: Opening mother connection.
 Jan 19 23:43:58 2026 :: Binding to all IP interfaces on this host.
 SYSERR: bind: Address already in use
 Quick boot mode -- rent check supressed.
 Using file descriptor for logging.
 autoscript terminated Mo 19. Jan 23:43:58 CET 2026
@@ -1,2 +0,0 @@
 Jan 19 20:15:16 2026 :: Loading triggers and generating index.
 Jan 19 20:16:30 2026 :: Loading triggers and generating index.
@@ -1 +0,0 @@
 Jan 19 20:58:18 2026 :: nusage: 1   sockets connected, 0   sockets playing
@@ -45,7 +45,7 @@ ACMD(do_say)
    send_to_char(ch, "Yes, but WHAT do you want to say?\r\n");
  else {
    char buf[MAX_INPUT_LENGTH + 14], *msg;
-    struct char_data *vict;
+    char_data *vict;
    if (CONFIG_SPECIAL_IN_COMM && legal_communication(argument))
      parse_at(argument);
@@ -86,7 +86,8 @@ ACMD(do_gsay)
    if (CONFIG_SPECIAL_IN_COMM && legal_communication(argument))
      parse_at(argument);
-    send_to_group(ch, ch->group, "%s%s%s says, '%s'%s\r\n", CCGRN(ch, C_NRM), CCGRN(ch, C_NRM), GET_NAME(ch), argument, CCNRM(ch, C_NRM));
+    send_to_group(ch, ch->group, "%s%s%s says, '%s'%s\r\n", CCGRN(ch, C_NRM), CCGRN(ch, C_NRM), GET_NAME(ch),
                  argument, CCNRM(ch, C_NRM));
    if (!IS_NPC(ch) && PRF_FLAGGED(ch, PRF_NOREPEAT))
      send_to_char(ch, "%s", CONFIG_OK);
@@ -95,7 +96,7 @@ ACMD(do_gsay)
  }
 }
-static void perform_tell(struct char_data *ch, struct char_data *vict, char *arg)
+static void perform_tell(char_data *ch, char_data *vict, char *arg)
 {
  char buf[MAX_STRING_LENGTH], *msg;
@@ -115,7 +116,7 @@ static void perform_tell(struct char_data *ch, struct char_data *vict, char *arg
    GET_LAST_TELL(vict) = GET_IDNUM(ch);
 }
-static int is_tell_ok(struct char_data *ch, struct char_data *vict)
+static int is_tell_ok(char_data *ch, char_data *vict)
 {
  if (!ch)
    log("SYSERR: is_tell_ok called with no characters");
@@ -131,7 +132,8 @@ static int is_tell_ok(struct char_data *ch, struct char_data *vict)
    act("$E's linkless at the moment.", FALSE, ch, 0, vict, TO_CHAR | TO_SLEEP);
  else if (PLR_FLAGGED(vict, PLR_WRITING))
    act("$E's writing a message right now; try again later.", FALSE, ch, 0, vict, TO_CHAR | TO_SLEEP);
-  else if ((!IS_NPC(vict) && PRF_FLAGGED(vict, PRF_NOTELL)) || (ROOM_FLAGGED(IN_ROOM(vict), ROOM_SOUNDPROOF) && (GET_LEVEL(ch) < LVL_GOD)))
+  else if ((!IS_NPC(vict) && PRF_FLAGGED(vict, PRF_NOTELL)) || (
             ROOM_FLAGGED(IN_ROOM(vict), ROOM_SOUNDPROOF) && (GET_LEVEL(ch) < LVL_GOD)))
    act("$E can't hear you.", FALSE, ch, 0, vict, TO_CHAR | TO_SLEEP);
  else
    return (TRUE);
@@ -143,7 +145,7 @@ static int is_tell_ok(struct char_data *ch, struct char_data *vict)
 * called frequently, and should IMHO be kept as tight as possible. */
 ACMD(do_tell)
 {
-  struct char_data *vict = NULL;
+  char_data *vict = NULL;
  char buf[MAX_INPUT_LENGTH + 25], buf2[MAX_INPUT_LENGTH]; // +25 to make room for constants
  half_chop(argument, buf, buf2);
@@ -163,7 +165,7 @@ ACMD(do_tell)
 ACMD(do_reply)
 {
-  struct char_data *tch = character_list;
+  char_data *tch = character_list;
  if (IS_NPC(ch))
    return;
@@ -197,7 +199,7 @@ ACMD(do_reply)
 ACMD(do_spec_comm)
 {
  char buf[MAX_INPUT_LENGTH], buf2[MAX_INPUT_LENGTH];
-  struct char_data *vict;
+  char_data *vict;
  const char *action_sing, *action_plur, *action_others;
  switch (subcmd) {
@@ -247,7 +249,7 @@ ACMD(do_spec_comm)
 ACMD(do_write)
 {
-  struct obj_data *paper, *pen = NULL;
+  obj_data *paper, *pen = NULL;
  char *papername, *penname;
  char buf1[MAX_STRING_LENGTH], buf2[MAX_STRING_LENGTH];
@@ -326,8 +328,8 @@ ACMD(do_write)
 ACMD(do_page)
 {
-  struct descriptor_data *d;
+  descriptor_data *d;
-  struct char_data *vict;
+  char_data *vict;
  char buf2[MAX_INPUT_LENGTH], arg[MAX_INPUT_LENGTH];
  half_chop(argument, arg, buf2);
@@ -363,7 +365,7 @@ ACMD(do_page)
 /* Generalized communication function by Fred C. Merkel (Torg). */
 ACMD(do_gen_comm)
 {
-  struct descriptor_data *i;
+  descriptor_data *i;
  char color_on[24];
  char buf1[MAX_INPUT_LENGTH], buf2[MAX_INPUT_LENGTH + 50], *msg; // + 50 to make room for color codes
  bool emoting = FALSE;
@@ -392,35 +394,42 @@ ACMD(do_gen_comm)
   *           [2] message if you're not on the channel
   *           [3] a color string. */
  const char *com_msgs[][4] = {
-    {"You cannot holler!!\r\n",
+      {
          "You cannot holler!!\r\n",
          "holler",
          "",
-      KYEL},
+          KYEL
-
+      },
-    {"You cannot shout!!\r\n",
+      {
          "You cannot shout!!\r\n",
          "shout",
          "Turn off your noshout flag first!\r\n",
-      KYEL},
+          KYEL
-
+      },
-    {"You cannot gossip!!\r\n",
+      {
          "You cannot gossip!!\r\n",
          "gossip",
          "You aren't even on the channel!\r\n",
-      KYEL},
+          KYEL
-
+      },
-    {"You cannot auction!!\r\n",
+      {
          "You cannot auction!!\r\n",
          "auction",
          "You aren't even on the channel!\r\n",
-      KMAG},
+          KMAG
-
+      },
-    {"You cannot congratulate!\r\n",
+      {
          "You cannot congratulate!\r\n",
          "congrat",
          "You aren't even on the channel!\r\n",
-      KGRN},
+          KGRN
-
+      },
-    {"You cannot gossip your emotions!\r\n",
+      {
          "You cannot gossip your emotions!\r\n",
          "gossip",
          "You aren't even on the channel!\r\n",
-      KYEL}
+          KYEL
      }
  };
  if (PLR_FLAGGED(ch, PLR_NOSHOUT)) {
@@ -443,7 +452,8 @@ ACMD(do_gen_comm)
  /* Level_can_shout defined in config.c. */
  if (GET_LEVEL(ch) < CONFIG_LEVEL_CAN_SHOUT) {
-    send_to_char(ch, "You must be at least level %d before you can %s.\r\n", CONFIG_LEVEL_CAN_SHOUT, com_msgs[subcmd][1]);
+    send_to_char(ch, "You must be at least level %d before you can %s.\r\n", CONFIG_LEVEL_CAN_SHOUT,
                 com_msgs[subcmd][1]);
    return;
  }
  /* Make sure the char is on the channel. */
@@ -518,7 +528,7 @@ ACMD(do_qcomm)
    send_to_char(ch, "%c%s?  Yes, fine, %s we must, but WHAT??\r\n", UPPER(*CMD_NAME), CMD_NAME + 1, CMD_NAME);
  else {
    char buf[MAX_STRING_LENGTH];
-    struct descriptor_data *i;
+    descriptor_data *i;
    if (CONFIG_SPECIAL_IN_COMM && legal_communication(argument))
      parse_at(argument);
@@ -57,7 +57,7 @@ char *find_exdesc(char *word, struct extra_descr_data *list);
 void space_to_minus(char *str);
 /** @todo Move to a help module? */
 int search_help(const char *argument, int level);
-void free_history(struct char_data *ch, int type);
+void free_history(char_data *ch, int type);
 void free_recent_players(void);
 /* functions with subcommands */
 /* do_commands */
@@ -109,10 +109,10 @@ ACMD(do_whois);
 ****************************************************************************/
 /* Utility Functions */
 /** @todo Compare with needs of find_eq_pos_script. */
-int find_eq_pos(struct char_data *ch, struct obj_data *obj, char *arg);
+int find_eq_pos(char_data *ch, obj_data *obj, char *arg);
-void name_from_drinkcon(struct obj_data *obj);
+void name_from_drinkcon(obj_data *obj);
-void name_to_drinkcon(struct obj_data *obj, int type);
+void name_to_drinkcon(obj_data *obj, int type);
-void weight_change_object(struct obj_data *obj, int weight);
+void weight_change_object(obj_data *obj, int weight);
 /* functions with subcommands */
 /* do_drop */
 ACMD(do_drop);
@@ -268,7 +268,6 @@ ACMD(do_action);
 ACMD(do_gmote);
 /*****************************************************************************
 * Begin Functions and defines for act.wizard.c
 ****************************************************************************/
@@ -276,11 +275,11 @@ ACMD(do_gmote);
 /** @todo should probably be moved to a more general file handler module */
 void clean_llog_entries(void);
 /** @todo This should be moved to a more general utility file */
-int script_command_interpreter(struct char_data *ch, char *arg);
+int script_command_interpreter(char_data *ch, char *arg);
-room_rnum find_target_room(struct char_data *ch, char *rawroomstr);
+room_rnum find_target_room(char_data *ch, char *rawroomstr);
-void perform_immort_vis(struct char_data *ch);
+void perform_immort_vis(char_data *ch);
-void snoop_check(struct char_data *ch);
+void snoop_check(char_data *ch);
-bool change_player_name(struct char_data *ch, struct char_data *vict, char *new_name);
+bool change_player_name(char_data *ch, char_data *vict, char *new_name);
 bool AddRecentPlayer(char *chname, char *chhost, bool newplr, bool cpyplr);
 /* Functions with subcommands */
 /* do_date */
@@ -327,7 +326,7 @@ ACMD(do_plist);
 ACMD(do_purge);
 ACMD(do_recent);
 ACMD(do_restore);
-void return_to_char(struct char_data * ch);
+void return_to_char(char_data *ch);
 ACMD(do_return);
 ACMD(do_saveall);
 ACMD(do_send);
@@ -31,23 +31,23 @@
 /* prototypes of local functions */
 /* do_diagnose utility functions */
-static void diag_char_to_char(struct char_data *i, struct char_data *ch);
+static void diag_char_to_char(char_data *i, char_data *ch);
 /* do_look and do_examine utility functions */
-static void do_auto_exits(struct char_data *ch);
+static void do_auto_exits(char_data *ch);
-static void list_char_to_char(struct char_data *list, struct char_data *ch);
+static void list_char_to_char(char_data *list, char_data *ch);
-static void list_one_char(struct char_data *i, struct char_data *ch);
+static void list_one_char(char_data *i, char_data *ch);
-static void look_at_char(struct char_data *i, struct char_data *ch);
+static void look_at_char(char_data *i, char_data *ch);
-static void look_at_target(struct char_data *ch, char *arg);
+static void look_at_target(char_data *ch, char *arg);
-static void look_in_direction(struct char_data *ch, int dir);
+static void look_in_direction(char_data *ch, int dir);
-static void look_in_obj(struct char_data *ch, char *arg);
+static void look_in_obj(char_data *ch, char *arg);
 /* do_look, do_inventory utility functions */
-static void list_obj_to_char(struct obj_data *list, struct char_data *ch, int mode, int show);
+static void list_obj_to_char(obj_data *list, char_data *ch, int mode, int show);
 /* do_look, do_equipment, do_examine, do_inventory */
-static void show_obj_to_char(struct obj_data *obj, struct char_data *ch, int mode);
+static void show_obj_to_char(obj_data *obj, char_data *ch, int mode);
-static void show_obj_modifiers(struct obj_data *obj, struct char_data *ch);
+static void show_obj_modifiers(obj_data *obj, char_data *ch);
 /* do_where utility functions */
 static void perform_immort_where(char_data *ch, const char *arg);
-static void perform_mortal_where(struct char_data *ch, char *arg);
+static void perform_mortal_where(char_data *ch, char *arg);
 static size_t print_object_location(int num, const obj_data *obj, const char_data *ch,
  char *buf, size_t len, size_t buf_size, int recur);
 /* Subcommands */
@@ -56,10 +56,10 @@ static size_t print_object_location(int num, const obj_data *obj, const char_dat
 #define SHOW_OBJ_SHORT    1
 #define SHOW_OBJ_ACTION   2
-static void show_obj_to_char(struct obj_data *obj, struct char_data *ch, int mode)
+static void show_obj_to_char(obj_data *obj, char_data *ch, int mode)
 {
  int found = 0;
-  struct char_data *temp;
+  char_data *temp;
  if (!obj || !ch) {
    log("SYSERR: NULL pointer in show_obj_to_char(): obj=%p ch=%p", (void *)obj, (void *)ch);
@@ -77,8 +77,8 @@ static void show_obj_to_char(struct obj_data *obj, struct char_data *ch, int mod
          found++;
      }
      if (found) {
-        send_to_char(ch, "You are %s upon %s.", GET_POS(ch) == POS_SITTING ? "sitting" :
+        send_to_char(ch, "You are %s upon %s.", GET_POS(ch) == POS_SITTING ? "sitting" : "resting",
-        "resting", obj->short_description);
+                     obj->short_description);
        goto end;
      }
    }
@@ -153,7 +153,7 @@ static void show_obj_to_char(struct obj_data *obj, struct char_data *ch, int mod
  send_to_char(ch, "\r\n");
 }
-static void show_obj_modifiers(struct obj_data *obj, struct char_data *ch)
+static void show_obj_modifiers(obj_data *obj, char_data *ch)
 {
  if (OBJ_FLAGGED(obj, ITEM_INVISIBLE))
    send_to_char(ch, " (invisible)");
@@ -171,9 +171,9 @@ static void show_obj_modifiers(struct obj_data *obj, struct char_data *ch)
    send_to_char(ch, " ..It emits a faint humming sound!");
 }
-static void list_obj_to_char(struct obj_data *list, struct char_data *ch, int mode, int show)
+static void list_obj_to_char(obj_data *list, char_data *ch, int mode, int show)
 {
-  struct obj_data *i, *j, *display;
+  obj_data *i, *j, *display;
  bool found;
  int num;
@@ -219,9 +219,10 @@ static void list_obj_to_char(struct obj_data *list, struct char_data *ch, int mo
    send_to_char(ch, "  Nothing.\r\n");
 }
-static void diag_char_to_char(struct char_data *i, struct char_data *ch)
+static void diag_char_to_char(char_data *i, char_data *ch)
 {
  struct
  {
  struct {
    byte percent;
    const char *text;
  } diagnosis[] = {
@@ -249,7 +250,7 @@ static void diag_char_to_char(struct char_data *i, struct char_data *ch)
  send_to_char(ch, "%c%s %s\r\n", UPPER(*pers), pers + 1, diagnosis[ar_index].text);
 }
-static void look_at_char(struct char_data *i, struct char_data *ch)
+static void look_at_char(char_data *i, char_data *ch)
 {
  int j, found;
@@ -283,9 +284,9 @@ static void look_at_char(struct char_data *i, struct char_data *ch)
  }
 }
-static void list_one_char(struct char_data *i, struct char_data *ch)
+static void list_one_char(char_data *i, char_data *ch)
 {
-  struct obj_data *furniture;
+  obj_data *furniture;
  const char *positions[] = {
      " is lying here, dead.",
      " is lying here, mortally wounded.",
@@ -363,8 +364,8 @@ static void list_one_char(struct char_data *i, struct char_data *ch)
      send_to_char(ch, "%s", positions[(int)GET_POS(i)]);
    else {
      furniture = SITTING(i);
-      send_to_char(ch, " is %s upon %s.", (GET_POS(i) == POS_SLEEPING ?
+      send_to_char(ch, " is %s upon %s.",
-        "sleeping" : (GET_POS(i) == POS_RESTING ? "resting" : "sitting")),
+                   (GET_POS(i) == POS_SLEEPING ? "sleeping" : (GET_POS(i) == POS_RESTING ? "resting" : "sitting")),
                   OBJS(furniture, ch));
    }
  } else {
@@ -394,9 +395,9 @@ static void list_one_char(struct char_data *i, struct char_data *ch)
    act("...$e glows with a bright light!", FALSE, i, 0, ch, TO_VICT);
 }
-static void list_char_to_char(struct char_data *list, struct char_data *ch)
+static void list_char_to_char(char_data *list, char_data *ch)
 {
-  struct char_data *i;
+  char_data *i;
  for (i = list; i; i = i->next_in_room)
    if (ch != i) {
@@ -414,7 +415,7 @@ static void list_char_to_char(struct char_data *list, struct char_data *ch)
    }
 }
-static void do_auto_exits(struct char_data *ch)
+static void do_auto_exits(char_data *ch)
 {
  int door, slen = 0;
@@ -428,7 +429,8 @@ static void do_auto_exits(struct char_data *ch)
    if (EXIT_FLAGGED(EXIT(ch, door), EX_HIDDEN) && !PRF_FLAGGED(ch, PRF_HOLYLIGHT))
      continue;
    if (EXIT_FLAGGED(EXIT(ch, door), EX_CLOSED))
-      send_to_char(ch, "%s(%s)%s ", EXIT_FLAGGED(EXIT(ch, door), EX_HIDDEN) ? CCWHT(ch, C_NRM) : CCRED(ch, C_NRM), autoexits[door], CCCYN(ch, C_NRM));
+      send_to_char(ch, "%s(%s)%s ", EXIT_FLAGGED(EXIT(ch, door), EX_HIDDEN) ? CCWHT(ch, C_NRM) : CCRED(ch, C_NRM),
                   autoexits[door], CCCYN(ch, C_NRM));
    else if (EXIT_FLAGGED(EXIT(ch, door), EX_HIDDEN))
      send_to_char(ch, "%s%s%s ", CCWHT(ch, C_NRM), autoexits[door], CCCYN(ch, C_NRM));
    else
@@ -443,16 +445,14 @@ ACMD(do_exits)
 {
  int door, len = 0;
-  if (AFF_FLAGGED(ch, AFF_BLIND) && GET_LEVEL(ch) < LVL_IMMORT)
+  if (AFF_FLAGGED(ch, AFF_BLIND) && GET_LEVEL(ch) < LVL_IMMORT) {
  {
    send_to_char(ch, "You can't see a damned thing, you're blind!\r\n");
    return;
  }
  send_to_char(ch, "Obvious exits:\r\n");
-  for (door = 0; door < DIR_COUNT; door++)
+  for (door = 0; door < DIR_COUNT; door++) {
  {
    if (!EXIT(ch, door) || EXIT(ch, door)->to_room == NOWHERE)
      continue;
    if (EXIT_FLAGGED(EXIT(ch, door), EX_CLOSED) && !CONFIG_DISP_CLOSED_DOORS)
@@ -462,29 +462,26 @@ ACMD(do_exits)
    len++;
-    if (!IS_NPC(ch) && PRF_FLAGGED(ch, PRF_SHOWVNUMS) && !EXIT_FLAGGED(EXIT(ch, door), EX_CLOSED))
+    if (!IS_NPC(ch) && PRF_FLAGGED(ch, PRF_SHOWVNUMS) && !EXIT_FLAGGED(EXIT(ch, door), EX_CLOSED)) {
    {
      send_to_char(ch, "%-5s -[%5d]%s %s\r\n", dirs[door], GET_ROOM_VNUM(EXIT(ch, door)->to_room),
                   EXIT_FLAGGED(EXIT(ch, door), EX_HIDDEN) ? "[HIDDEN]" : "", world[EXIT(ch, door)->to_room].name);
-    }
+    } else if (CONFIG_DISP_CLOSED_DOORS && EXIT_FLAGGED(EXIT(ch, door), EX_CLOSED)) {
    else if (CONFIG_DISP_CLOSED_DOORS && EXIT_FLAGGED(EXIT(ch, door), EX_CLOSED))
    {
      /*But we tell them the door is closed */
      send_to_char(ch, "%-5s - The %s is closed%s\r\n", dirs[door],
                   (EXIT(ch, door)->keyword) ? fname(EXIT(ch, door)->keyword) : "opening",
                   EXIT_FLAGGED(EXIT(ch, door), EX_HIDDEN) ? " and hidden." : ".");
-    }
+    } else {
    else
    {
      send_to_char(ch, "%-5s - %s\r\n", dirs[door], IS_DARK(EXIT(ch, door)->to_room) &&
-        !CAN_SEE_IN_DARK(ch) ? "Too dark to tell." : world[EXIT(ch, door)->to_room].name);
+                                                    !CAN_SEE_IN_DARK(ch)
                                                      ? "Too dark to tell."
                                                      : world[EXIT(ch, door)->to_room].name);
    }
  }
  if (!len)
    send_to_char(ch, " None.\r\n");
 }
-void look_at_room(struct char_data *ch, int ignore_brief)
+void look_at_room(char_data *ch, int ignore_brief)
 {
  trig_data *t;
  struct room_data *rm = &world[IN_ROOM(ch)];
@@ -498,8 +495,7 @@ void look_at_room(struct char_data *ch, int ignore_brief)
  if (IS_DARK(IN_ROOM(ch)) && !CAN_SEE_IN_DARK(ch)) {
    send_to_char(ch, "It is pitch black...\r\n");
    return;
-  }
+  } else if (AFF_FLAGGED(ch, AFF_BLIND) && GET_LEVEL(ch) < LVL_IMMORT) {
  else if (AFF_FLAGGED(ch, AFF_BLIND) && GET_LEVEL(ch) < LVL_IMMORT) {
    send_to_char(ch, "You see nothing but infinite darkness...\r\n");
    return;
  }
@@ -518,8 +514,7 @@ void look_at_room(struct char_data *ch, int ignore_brief)
        send_to_char(ch, " %d", GET_TRIG_VNUM(t));
      send_to_char(ch, "]");
    }
-  }
+  } else
  else
    send_to_char(ch, "%s", world[IN_ROOM(ch)].name);
  send_to_char(ch, "%s\r\n", CCNRM(ch, C_NRM));
@@ -542,7 +537,7 @@ void look_at_room(struct char_data *ch, int ignore_brief)
  list_char_to_char(world[IN_ROOM(ch)].people, ch);
 }
-static void look_in_direction(struct char_data *ch, int dir)
+static void look_in_direction(char_data *ch, int dir)
 {
  if (EXIT(ch, dir)) {
    if (EXIT(ch, dir)->general_description)
@@ -558,10 +553,10 @@ static void look_in_direction(struct char_data *ch, int dir)
    send_to_char(ch, "Nothing special there...\r\n");
 }
-static void look_in_obj(struct char_data *ch, char *arg)
+static void look_in_obj(char_data *ch, char *arg)
 {
-  struct obj_data *obj = NULL;
+  obj_data *obj = NULL;
-  struct char_data *dummy = NULL;
+  char_data *dummy = NULL;
  int amt, bits;
  if (!*arg)
@@ -597,16 +592,13 @@ static void look_in_obj(struct char_data *ch, char *arg)
      if ((GET_OBJ_VAL(obj, 1) == 0) && (GET_OBJ_VAL(obj, 0) != -1))
        send_to_char(ch, "It is empty.\r\n");
      else {
-        if (GET_OBJ_VAL(obj, 0) < 0)
+        if (GET_OBJ_VAL(obj, 0) < 0) {
        {
          char buf2[MAX_STRING_LENGTH];
          sprinttype(GET_OBJ_VAL(obj, 2), color_liquid, buf2, sizeof(buf2));
          send_to_char(ch, "It's full of a %s liquid.\r\n", buf2);
-        }
+        } else if (GET_OBJ_VAL(obj, 1) > GET_OBJ_VAL(obj, 0))
        else if (GET_OBJ_VAL(obj,1)>GET_OBJ_VAL(obj,0))
          send_to_char(ch, "Its contents seem somewhat murky.\r\n"); /* BUG */
-        else
+        else {
        {
          char buf2[MAX_STRING_LENGTH];
          amt = (GET_OBJ_VAL(obj, 1) * 3) / GET_OBJ_VAL(obj, 0);
          sprinttype(GET_OBJ_VAL(obj, 2), color_liquid, buf2, sizeof(buf2));
@@ -632,11 +624,11 @@ char *find_exdesc(char *word, struct extra_descr_data *list)
 * matches the target.  First, see if there is another char in the room with
 * the name.  Then check local objs for exdescs. Thanks to Angus Mezick for
 * the suggested fix to this problem. */
-static void look_at_target(struct char_data *ch, char *arg)
+static void look_at_target(char_data *ch, char *arg)
 {
  int bits, found = FALSE, j, fnum, i = 0;
-  struct char_data *found_char = NULL;
+  char_data *found_char = NULL;
-  struct obj_data *obj, *found_obj = NULL;
+  obj_data *obj, *found_obj = NULL;
  char *desc;
  if (!ch->desc)
@@ -766,8 +758,8 @@ ACMD(do_look)
 ACMD(do_examine)
 {
-  struct char_data *tmp_char;
+  char_data *tmp_char;
-  struct obj_data *tmp_object;
+  obj_data *tmp_object;
  char tempsave[MAX_INPUT_LENGTH], arg[MAX_INPUT_LENGTH];
  one_argument(argument, arg);
@@ -837,8 +829,7 @@ ACMD(do_score)
               GET_NUM_QUESTS(ch) == 1 ? "" : "s");
  if (GET_QUEST(ch) == NOTHING)
    send_to_char(ch, "and you are not on a quest at the moment.\r\n");
-  else
+  else {
  {
    send_to_char(ch, "and your current quest is: %s", QST_NAME(real_quest(GET_QUEST(ch))));
    if (!IS_NPC(ch) && PRF_FLAGGED(ch, PRF_SHOWVNUMS))
@@ -879,7 +870,7 @@ ACMD(do_score)
    if (!SITTING(ch))
      send_to_char(ch, "You are sitting.\r\n");
    else {
-      struct obj_data *furniture = SITTING(ch);
+      obj_data *furniture = SITTING(ch);
      send_to_char(ch, "You are sitting upon %s.\r\n", furniture->short_description);
    }
    break;
@@ -1020,19 +1011,18 @@ ACMD(do_weather)
      "lit by flashes of lightning"
  };
-  if (OUTSIDE(ch))
+  if (OUTSIDE(ch)) {
    {
    send_to_char(ch, "The sky is %s and %s.\r\n", sky_look[weather_info.sky],
-        weather_info.change >= 0 ? "you feel a warm wind from south" :
+                 weather_info.change >= 0
-         "your foot tells you bad weather is due");
+                   ? "you feel a warm wind from south"
                   : "your foot tells you bad weather is due");
    if (GET_LEVEL(ch) >= LVL_GOD)
      send_to_char(ch, "Pressure: %d (change: %d), Sky: %d (%s)\r\n",
                   weather_info.pressure,
                   weather_info.change,
                   weather_info.sky,
                   sky_look[weather_info.sky]);
-    }
+  } else
  else
    send_to_char(ch, "You have no feeling about the weather at all.\r\n");
 }
@@ -1064,8 +1054,7 @@ int search_help(const char *argument, int level)
        break;
      return (mid);
-    }
+    } else if (chk > 0)
    else if (chk > 0)
      bot = mid + 1;
    else
      top = mid - 1;
@@ -1127,8 +1116,8 @@ ACMD(do_help)
 /* Written by Rhade */
 ACMD(do_who)
 {
-  struct descriptor_data *d;
+  descriptor_data *d;
-  struct char_data *tch;
+  char_data *tch;
  int i, num_can_see = 0;
  char name_search[MAX_INPUT_LENGTH], buf[MAX_INPUT_LENGTH];
  char mode;
@@ -1136,15 +1125,19 @@ ACMD(do_who)
  int showclass = 0, short_list = 0, outlaws = 0;
  int who_room = 0, showgroup = 0, showleader = 0;
-  struct {
+  struct
  {
    char *disp;
    int min_level;
    int max_level;
    int count; /* must always start as 0 */
  } rank[] = {
-    { "Immortals\r\n---------\r\n", LVL_IMMORT, LVL_IMPL, 0},
+          {
-    { "Mortals\r\n-------\r\n", 1, LVL_IMMORT - 1, 0 },
+              "Immortals\r\n---------\r\n", LVL_IMMORT, LVL_IMPL, 0},
-    { "\n", 0, 0, 0 }
+          {
              "Mortals\r\n-------\r\n", 1, LVL_IMMORT - 1, 0},
          {
              "\n", 0, 0, 0}
      };
  skip_spaces(&argument);
@@ -1374,8 +1367,8 @@ ACMD(do_users)
  char line[200], line2[220], idletime[10], classname[20];
  char state[30], timestr[9], mode;
  char name_search[MAX_INPUT_LENGTH], host_search[MAX_INPUT_LENGTH];
-  struct char_data *tch;
+  char_data *tch;
-  struct descriptor_data *d;
+  descriptor_data *d;
  int low = 0, high = LVL_IMPL, num_can_see = 0;
  int showclass = 0, outlaws = 0, playing = 0, deadweight = 0;
  char buf[MAX_INPUT_LENGTH], arg[MAX_INPUT_LENGTH];
@@ -1486,9 +1479,11 @@ ACMD(do_users)
      strcpy(idletime, "     ");
    sprintf(line, "%3d %-7s %-12s %-14s %-3s %-8s ", d->desc_num, classname,
-    d->original && d->original->player.name ? d->original->player.name :
+            d->original && d->original->player.name
-    d->character && d->character->player.name ? d->character->player.name :
+              ? d->original->player.name
-    "UNDEFINED",
+              : d->character && d->character->player.name
              ? d->character->player.name
              : "UNDEFINED",
            state, idletime, timestr);
    if (*d->host)
@@ -1568,10 +1563,10 @@ ACMD(do_gen_ps)
  }
 }
-static void perform_mortal_where(struct char_data *ch, char *arg)
+static void perform_mortal_where(char_data *ch, char *arg)
 {
-  struct char_data *i;
+  char_data *i;
-  struct descriptor_data *d;
+  descriptor_data *d;
  int j;
  if (!*arg) {
@@ -1662,7 +1657,7 @@ static void perform_immort_where(char_data *ch, const char *arg)
 {
  char_data *i;
  obj_data *k;
-  struct descriptor_data *d;
+  descriptor_data *d;
  int num = 0, found = FALSE; // "num" here needs to match the lookup in do_stat, so "stat 4.sword" finds the right one
  const char *error_message = "\r\n***OVERFLOW***\r\n";
  char buf[MAX_STRING_LENGTH];
@@ -1780,21 +1775,17 @@ ACMD(do_levels)
        /* No valid args found */
        min_lev = 1;
        max_lev = LVL_IMMORT;
-      }
+      } else if (ret == 1) {
      else if (ret == 1) {
        /* One arg = range is (num) either side of current level */
        val = min_lev;
        max_lev = MIN(GET_LEVEL(ch) + val, LVL_IMMORT);
        min_lev = MAX(GET_LEVEL(ch) - val, 1);
-      }
+      } else if (ret == 2) {
      else if (ret == 2) {
        /* Two args = min-max range limit - just do sanity checks */
        min_lev = MAX(min_lev, 1);
        max_lev = MIN(max_lev + 1, LVL_IMMORT);
      }
-    }
+    } else {
    else
    {
      send_to_char(ch, "Usage: %slevels [<min>-<max> | <range>]%s\r\n\r\n", QYEL, QNRM);
      send_to_char(ch, "Displays exp required for levels.\r\n");
      send_to_char(ch, "%slevels       %s- shows all levels (1-%d)\r\n", QCYN, QNRM, (LVL_IMMORT - 1));
@@ -1837,7 +1828,7 @@ ACMD(do_levels)
 ACMD(do_consider)
 {
  char buf[MAX_INPUT_LENGTH];
-  struct char_data *victim;
+  char_data *victim;
  int diff;
  one_argument(argument, buf);
@@ -1883,7 +1874,7 @@ ACMD(do_consider)
 ACMD(do_diagnose)
 {
  char buf[MAX_INPUT_LENGTH];
-  struct char_data *vict;
+  char_data *vict;
  one_argument(argument, buf);
@@ -1906,109 +1897,180 @@ ACMD(do_toggle)
  int toggle, tp, wimp_lev, result = 0, len = 0, i;
  const char *types[] = {"off", "brief", "normal", "on", "\n"};
-    const struct {
+  const struct
  {
    char *command;
    bitvector_t toggle; /* this needs changing once hashmaps are implemented */
    char min_level;
    char *disable_msg;
    char *enable_msg;
  } tog_messages[] = {
-    {"summonable", PRF_SUMMONABLE, 0,
+          {
              "summonable", PRF_SUMMONABLE, 0,
              "You are now safe from summoning by other players.\r\n",
-    "You may now be summoned by other players.\r\n"},
+              "You may now be summoned by other players.\r\n"
-    {"nohassle", PRF_NOHASSLE, LVL_IMMORT,
+          },
          {
              "nohassle", PRF_NOHASSLE, LVL_IMMORT,
              "Nohassle disabled.\r\n",
-    "Nohassle enabled.\r\n"},
+              "Nohassle enabled.\r\n"
-    {"brief", PRF_BRIEF, 0,
+          },
          {
              "brief", PRF_BRIEF, 0,
              "Brief mode off.\r\n",
-    "Brief mode on.\r\n"},
+              "Brief mode on.\r\n"
-    {"compact", PRF_COMPACT, 0,
+          },
          {
              "compact", PRF_COMPACT, 0,
              "Compact mode off.\r\n",
-    "Compact mode on.\r\n"},
+              "Compact mode on.\r\n"
-    {"notell", PRF_NOTELL, 0,
+          },
          {
              "notell", PRF_NOTELL, 0,
              "You can now hear tells.\r\n",
-    "You are now deaf to tells.\r\n"},
+              "You are now deaf to tells.\r\n"
-    {"noauction", PRF_NOAUCT, 0,
+          },
          {
              "noauction", PRF_NOAUCT, 0,
              "You can now hear auctions.\r\n",
-    "You are now deaf to auctions.\r\n"},
+              "You are now deaf to auctions.\r\n"
-    {"noshout", PRF_NOSHOUT, 0,
+          },
          {
              "noshout", PRF_NOSHOUT, 0,
              "You can now hear shouts.\r\n",
-    "You are now deaf to shouts.\r\n"},
+              "You are now deaf to shouts.\r\n"
-    {"nogossip", PRF_NOGOSS, 0,
+          },
          {
              "nogossip", PRF_NOGOSS, 0,
              "You can now hear gossip.\r\n",
-    "You are now deaf to gossip.\r\n"},
+              "You are now deaf to gossip.\r\n"
-    {"nograts", PRF_NOGRATZ, 0,
+          },
          {
              "nograts", PRF_NOGRATZ, 0,
              "You can now hear gratz.\r\n",
-    "You are now deaf to gratz.\r\n"},
+              "You are now deaf to gratz.\r\n"
-    {"nowiz", PRF_NOWIZ, LVL_IMMORT,
+          },
          {
              "nowiz", PRF_NOWIZ, LVL_IMMORT,
              "You can now hear the Wiz-channel.\r\n",
-    "You are now deaf to the Wiz-channel.\r\n"},
+              "You are now deaf to the Wiz-channel.\r\n"
-    {"quest", PRF_QUEST, 0,
+          },
          {
              "quest", PRF_QUEST, 0,
              "You are no longer part of the Quest.\r\n",
-    "Okay, you are part of the Quest.\r\n"},
+              "Okay, you are part of the Quest.\r\n"
-    {"showvnums", PRF_SHOWVNUMS, LVL_IMMORT,
+          },
          {
              "showvnums", PRF_SHOWVNUMS, LVL_IMMORT,
              "You will no longer see the vnums.\r\n",
-    "You will now see the vnums.\r\n"},
+              "You will now see the vnums.\r\n"
-    {"norepeat", PRF_NOREPEAT, 0,
+          },
          {
              "norepeat", PRF_NOREPEAT, 0,
              "You will now have your communication repeated.\r\n",
-    "You will no longer have your communication repeated.\r\n"},
+              "You will no longer have your communication repeated.\r\n"
-    {"holylight", PRF_HOLYLIGHT, LVL_IMMORT,
+          },
          {
              "holylight", PRF_HOLYLIGHT, LVL_IMMORT,
              "HolyLight mode off.\r\n",
-    "HolyLight mode on.\r\n"},
+              "HolyLight mode on.\r\n"
-    {"slownameserver", 0, LVL_IMPL,
+          },
          {
              "slownameserver", 0, LVL_IMPL,
              "Nameserver_is_slow changed to OFF; IP addresses will now be resolved.\r\n",
-    "Nameserver_is_slow changed to ON; sitenames will no longer be resolved.\r\n"},
+              "Nameserver_is_slow changed to ON; sitenames will no longer be resolved.\r\n"
-    {"autoexits", PRF_AUTOEXIT, 0,
+          },
          {
              "autoexits", PRF_AUTOEXIT, 0,
              "Autoexits disabled.\r\n",
-    "Autoexits enabled.\r\n"},
+              "Autoexits enabled.\r\n"
-    {"trackthru", 0, LVL_IMPL,
+          },
          {
              "trackthru", 0, LVL_IMPL,
              "Players can no longer track through doors.\r\n",
-    "Players can now track through doors.\r\n"},
+              "Players can now track through doors.\r\n"
-    {"clsolc", PRF_CLS, LVL_BUILDER,
+          },
          {
              "clsolc", PRF_CLS, LVL_BUILDER,
              "You will no longer clear screen in OLC.\r\n",
-    "You will now clear screen in OLC.\r\n"},
+              "You will now clear screen in OLC.\r\n"
-    {"buildwalk", PRF_BUILDWALK, LVL_BUILDER,
+          },
          {
              "buildwalk", PRF_BUILDWALK, LVL_BUILDER,
              "Buildwalk is now Off.\r\n",
-    "Buildwalk is now On.\r\n"},
+              "Buildwalk is now On.\r\n"
-    {"afk", PRF_AFK, 0,
+          },
          {
              "afk", PRF_AFK, 0,
              "AFK is now Off.\r\n",
-    "AFK is now On.\r\n"},
+              "AFK is now On.\r\n"
-    {"autoloot", PRF_AUTOLOOT, 0,
+          },
          {
              "autoloot", PRF_AUTOLOOT, 0,
              "Autoloot disabled.\r\n",
-    "Autoloot enabled.\r\n"},
+              "Autoloot enabled.\r\n"
-    {"autogold", PRF_AUTOGOLD, 0,
+          },
          {
              "autogold", PRF_AUTOGOLD, 0,
              "Autogold disabled.\r\n",
-    "Autogold enabled.\r\n"},
+              "Autogold enabled.\r\n"
-    {"autosplit", PRF_AUTOSPLIT, 0,
+          },
          {
              "autosplit", PRF_AUTOSPLIT, 0,
              "Autosplit disabled.\r\n",
-    "Autosplit enabled.\r\n"},
+              "Autosplit enabled.\r\n"
-    {"autosac", PRF_AUTOSAC, 0,
+          },
          {
              "autosac", PRF_AUTOSAC, 0,
              "Autosac disabled.\r\n",
-    "Autosac enabled.\r\n"},
+              "Autosac enabled.\r\n"
-    {"autoassist", PRF_AUTOASSIST, 0,
+          },
          {
              "autoassist", PRF_AUTOASSIST, 0,
              "Autoassist disabled.\r\n",
-    "Autoassist enabled.\r\n"},
+              "Autoassist enabled.\r\n"
-    {"automap", PRF_AUTOMAP, 1,
+          },
          {
              "automap", PRF_AUTOMAP, 1,
              "You will no longer see the mini-map.\r\n",
-    "You will now see a mini-map at the side of room descriptions.\r\n"},
+              "You will now see a mini-map at the side of room descriptions.\r\n"
-    {"autokey", PRF_AUTOKEY, 0,
+          },
          {
              "autokey", PRF_AUTOKEY, 0,
              "You will now have to unlock doors manually before opening.\r\n",
-    "You will now automatically unlock doors when opening them (if you have the key).\r\n"},
+              "You will now automatically unlock doors when opening them (if you have the key).\r\n"
-    {"autodoor", PRF_AUTODOOR, 0,
+          },
          {
              "autodoor", PRF_AUTODOOR, 0,
              "You will now need to specify a door direction when opening, closing and unlocking.\r\n",
-    "You will now find the next available door when opening, closing or unlocking.\r\n"},
+              "You will now find the next available door when opening, closing or unlocking.\r\n"
-    {"zoneresets", PRF_ZONERESETS, LVL_IMPL,
+          },
          {
              "zoneresets", PRF_ZONERESETS, LVL_IMPL,
              "You will no longer see zone resets.\r\n",
-    "You will now see zone resets.\r\n"},
+              "You will now see zone resets.\r\n"
-    {"syslog", 0, LVL_IMMORT, "\n", "\n"},
+          },
-    {"wimpy", 0, 0, "\n", "\n"},
+          {
-    {"pagelength", 0, 0, "\n", "\n"},
+              "syslog", 0, LVL_IMMORT, "\n", "\n"
-    {"screenwidth", 0, 0, "\n", "\n"},
+          },
-    {"color", 0, 0, "\n", "\n"},
+          {
-    {"verbose", PRF_VERBOSE, LVL_IMMORT,
+              "wimpy", 0, 0, "\n", "\n"
          },
          {
              "pagelength", 0, 0, "\n", "\n"
          },
          {
              "screenwidth", 0, 0, "\n", "\n"
          },
          {
              "color", 0, 0, "\n", "\n"
          },
          {
              "verbose", PRF_VERBOSE, LVL_IMMORT,
      "You will no longer see verbose output in listings.\n",
      "You will now see verbose listings.\n"},
-    {"\n", 0, -1, "\n", "\n"} /* must be last */
+    {"\n", 0, -1, "\n", "\n"
          } /* must be last */
      };
  if (IS_NPC(ch))
@@ -2159,8 +2221,10 @@ ACMD(do_toggle)
    }
    REMOVE_BIT_AR(PRF_FLAGS(ch), PRF_COLOR_1);
    REMOVE_BIT_AR(PRF_FLAGS(ch), PRF_COLOR_2);
-    if (tp & 1) SET_BIT_AR(PRF_FLAGS(ch), PRF_COLOR_1);
+    if (tp & 1)
-    if (tp & 2) SET_BIT_AR(PRF_FLAGS(ch), PRF_COLOR_2);
+      SET_BIT_AR(PRF_FLAGS(ch), PRF_COLOR_1);
    if (tp & 2)
      SET_BIT_AR(PRF_FLAGS(ch), PRF_COLOR_2);
    send_to_char(ch, "Your %scolor%s is now %s.\r\n", CCRED(ch, C_SPR), CCNRM(ch, C_OFF), types[tp]);
    return;
@@ -2176,8 +2240,10 @@ ACMD(do_toggle)
    }
    REMOVE_BIT_AR(PRF_FLAGS(ch), PRF_LOG1);
    REMOVE_BIT_AR(PRF_FLAGS(ch), PRF_LOG2);
-    if (tp & 1) SET_BIT_AR(PRF_FLAGS(ch), PRF_LOG1);
+    if (tp & 1)
-    if (tp & 2) SET_BIT_AR(PRF_FLAGS(ch), PRF_LOG2);
+      SET_BIT_AR(PRF_FLAGS(ch), PRF_LOG1);
    if (tp & 2)
      SET_BIT_AR(PRF_FLAGS(ch), PRF_LOG2);
    send_to_char(ch, "Your syslog is now %s.\r\n", types[tp]);
    return;
@@ -2343,7 +2409,7 @@ ACMD(do_commands)
  column_list(ch, 0, commands, no, FALSE);
 }
-void free_history(struct char_data *ch, int type)
+void free_history(char_data *ch, int type)
 {
  struct txt_block *tmp = GET_HISTORY(ch, type), *ftmp;
@@ -2391,7 +2457,8 @@ ACMD(do_history)
 }
 #define HIST_LENGTH 100
-void add_history(struct char_data *ch, char *str, int type)
+
 void add_history(char_data *ch, char *str, int type)
 {
  int i = 0;
  char time_str[MAX_STRING_LENGTH], buf[MAX_STRING_LENGTH];
@@ -2410,8 +2477,7 @@ void add_history(struct char_data *ch, char *str, int type)
  if (!tmp) {
    CREATE(GET_HISTORY(ch, type), struct txt_block, 1);
    GET_HISTORY(ch, type)->text = strdup(buf);
-  }
+  } else {
  else {
    while (tmp->next)
      tmp = tmp->next;
    CREATE(tmp->next, struct txt_block, 1);
@@ -2434,7 +2500,7 @@ void add_history(struct char_data *ch, char *str, int type)
 ACMD(do_whois)
 {
-  struct char_data *victim = 0;
+  char_data *victim = 0;
  int hours;
  int got_from_file = 0;
  char buf[MAX_STRING_LENGTH];
@@ -2446,9 +2512,8 @@ ACMD(do_whois)
    return;
  }
-  if (!(victim=get_player_vis(ch, buf, NULL, FIND_CHAR_WORLD)))
+  if (!(victim = get_player_vis(ch, buf, NULL, FIND_CHAR_WORLD))) {
-  {
+    CREATE(victim, char_data, 1);
     CREATE(victim, struct char_data, 1);
    clear_char(victim);
    new_mobile_data(victim);
@@ -2489,9 +2554,9 @@ ACMD(do_whois)
        send_to_char(ch, "\r\n");
      if (PRF_FLAGGED(victim, PRF_AFK))
-        send_to_char(ch, "%s%s is afk right now, so %s may not respond to communication.%s\r\n", CBGRN(ch, C_NRM), GET_NAME(victim), HSSH(victim), CCNRM(ch, C_NRM));
+        send_to_char(ch, "%s%s is afk right now, so %s may not respond to communication.%s\r\n", CBGRN(ch, C_NRM),
-    }
+                     GET_NAME(victim), HSSH(victim), CCNRM(ch, C_NRM));
-    else if (hours > 0)
+    } else if (hours > 0)
      send_to_char(ch, "Last Logon: %s (%d days & %d hours ago.)\r\n", buf, hours / 24, hours % 24);
    else
      send_to_char(ch, "Last Logon: %s (0 hours & %d minutes ago.)\r\n",
@@ -2508,8 +2573,13 @@ ACMD(do_whois)
  if (!got_from_file && victim->desc != NULL && GET_LEVEL(ch) >= LVL_GOD) {
    protocol_t *prot = victim->desc->pProtocol;
-    send_to_char(ch, "Client:  %s [%s]\r\n", prot->pVariables[eMSDP_CLIENT_ID]->pValueString, prot->pVariables[eMSDP_CLIENT_VERSION]->pValueString ? prot->pVariables[eMSDP_CLIENT_VERSION]->pValueString : "Unknown");
+    send_to_char(ch, "Client:  %s [%s]\r\n", prot->pVariables[eMSDP_CLIENT_ID]->pValueString,
-    send_to_char(ch, "Color:   %s\r\n", prot->pVariables[eMSDP_XTERM_256_COLORS]->ValueInt ? "Xterm" : (prot->pVariables[eMSDP_ANSI_COLORS]->ValueInt ? "Ansi" : "None"));
+                 prot->pVariables[eMSDP_CLIENT_VERSION]->pValueString
                   ? prot->pVariables[eMSDP_CLIENT_VERSION]->pValueString
                   : "Unknown");
    send_to_char(ch, "Color:   %s\r\n", prot->pVariables[eMSDP_XTERM_256_COLORS]->ValueInt
                                          ? "Xterm"
                                          : (prot->pVariables[eMSDP_ANSI_COLORS]->ValueInt ? "Ansi" : "None"));
    send_to_char(ch, "MXP:     %s\r\n", prot->bMXP ? "Yes" : "No");
    send_to_char(ch, "Charset: %s\r\n", prot->bCHARSET ? "Yes" : "No");
    send_to_char(ch, "MSP:     %s\r\n", prot->bMSP ? "Yes" : "No");
@@ -2600,7 +2670,8 @@ ACMD(do_areas)
      } else if ((hilev != -1) && (lolev >= ZONE_MINLVL(i)) && (hilev <= ZONE_MAXLVL(i))) {
        /* Range supplied, it's completely within this zone's range (no overlap) */
        show_zone = TRUE;
-      } else if ((hilev != -1) && ((lolev >= ZONE_MINLVL(i) && lolev <= ZONE_MAXLVL(i)) || (hilev <= ZONE_MAXLVL(i) && hilev >= ZONE_MINLVL(i)))) {
+      } else if ((hilev != -1) && ((lolev >= ZONE_MINLVL(i) && lolev <= ZONE_MAXLVL(i)) || (
                                     hilev <= ZONE_MAXLVL(i) && hilev >= ZONE_MINLVL(i)))) {
        /* Range supplied, it overlaps this zone's range */
        show_zone = TRUE;
        overlap = TRUE;
@@ -2615,19 +2686,23 @@ ACMD(do_areas)
    }
    if (show_zone) {
-      if (overlap) overlap_shown = TRUE;
+      if (overlap)
        overlap_shown = TRUE;
      lev_set = get_zone_levels(i, lev_str);
-      tmp_len = snprintf(buf+len, sizeof(buf)-len, "\tn(%3d) %s%-*s\tn %s%s\tn\r\n", ++zcount, overlap ? QRED : QCYN,
+      tmp_len = snprintf(buf + len, sizeof(buf) - len, "\tn(%3d) %s%-*s\tn %s%s\tn\r\n", ++zcount,
                         overlap ? QRED : QCYN,
                         count_color_chars(zone_table[i].name) + 30, zone_table[i].name,
                         lev_set ? "\tc" : "\tn", lev_set ? lev_str : "All Levels");
      len += tmp_len;
    }
  }
-  tmp_len = snprintf(buf+len, sizeof(buf)-len, "%s%d%s area%s found.\r\n", QYEL, zcount, QNRM, zcount == 1 ? "" : "s");
+  tmp_len = snprintf(buf + len, sizeof(buf) - len, "%s%d%s area%s found.\r\n", QYEL, zcount, QNRM,
                     zcount == 1 ? "" : "s");
  len += tmp_len;
  if (overlap_shown) {
-    snprintf(buf+len, sizeof(buf)-len, "Areas shown in \trred\tn may have some creatures outside the specified range.\r\n");
+    snprintf(buf + len, sizeof(buf) - len,
             "Areas shown in \trred\tn may have some creatures outside the specified range.\r\n");
  }
  if (zcount == 0)
@@ -2636,7 +2711,7 @@ ACMD(do_areas)
    page_string(ch->desc, buf, TRUE);
 }
-static void list_scanned_chars(struct char_data * list, struct char_data * ch, int
+static void list_scanned_chars(char_data *list, char_data *ch, int
                               distance, int door)
 {
  char buf[MAX_STRING_LENGTH], buf2[MAX_STRING_LENGTH - 1];
@@ -2647,7 +2722,7 @@ distance, int door)
      "far off to the"
  };
-  struct char_data *i;
+  char_data *i;
  int count = 0;
  *buf = '\0';
@@ -26,31 +26,29 @@
 /* local function prototypes */
 /* do_get utility functions */
-static int can_take_obj(struct char_data *ch, struct obj_data *obj);
+static int can_take_obj(char_data *ch, obj_data *obj);
-static void get_check_money(struct char_data *ch, struct obj_data *obj);
+static void get_check_money(char_data *ch, obj_data *obj);
-static void get_from_container(struct char_data *ch, struct obj_data *cont, char *arg, int mode, int amount);
+static void get_from_container(char_data *ch, obj_data *cont, char *arg, int mode, int amount);
-static void get_from_room(struct char_data *ch, char *arg, int amount);
+static void get_from_room(char_data *ch, char *arg, int amount);
-static void perform_get_from_container(struct char_data *ch, struct obj_data *obj, struct obj_data *cont, int mode);
+static void perform_get_from_container(char_data *ch, obj_data *obj, obj_data *cont, int mode);
-static int perform_get_from_room(struct char_data *ch, struct obj_data *obj);
+static int perform_get_from_room(char_data *ch, obj_data *obj);
 /* do_give utility functions */
-static struct char_data *give_find_vict(struct char_data *ch, char *arg);
+static char_data *give_find_vict(char_data *ch, char *arg);
-static void perform_give(struct char_data *ch, struct char_data *vict, struct obj_data *obj);
+static void perform_give(char_data *ch, char_data *vict, obj_data *obj);
-static void perform_give_gold(struct char_data *ch, struct char_data *vict, int amount);
+static void perform_give_gold(char_data *ch, char_data *vict, int amount);
 /* do_drop utility functions */
-static int perform_drop(struct char_data *ch, struct obj_data *obj, byte mode, const char *sname, room_rnum RDR);
+static int perform_drop(char_data *ch, obj_data *obj, byte mode, const char *sname, room_rnum RDR);
-static void perform_drop_gold(struct char_data *ch, int amount, byte mode, room_rnum RDR);
+static void perform_drop_gold(char_data *ch, int amount, byte mode, room_rnum RDR);
 /* do_put utility functions */
-static void perform_put(struct char_data *ch, struct obj_data *obj, struct obj_data *cont);
+static void perform_put(char_data *ch, obj_data *obj, obj_data *cont);
 /* do_remove utility functions */
-static void perform_remove(struct char_data *ch, int pos);
+static void perform_remove(char_data *ch, int pos);
 /* do_wear utility functions */
-static void perform_wear(struct char_data *ch, struct obj_data *obj, int where);
+static void perform_wear(char_data *ch, obj_data *obj, int where);
-static void wear_message(struct char_data *ch, struct obj_data *obj, int where);
+static void wear_message(char_data *ch, obj_data *obj, int where);
-
+static void perform_put(char_data *ch, obj_data *obj, obj_data *cont)
 static void perform_put(struct char_data *ch, struct obj_data *obj, struct obj_data *cont)
 {
  long object_id = obj_script_id(obj);
@@ -92,8 +90,8 @@ ACMD(do_put)
  char arg1[MAX_INPUT_LENGTH];
  char arg2[MAX_INPUT_LENGTH];
  char arg3[MAX_INPUT_LENGTH];
-  struct obj_data *obj, *next_obj, *cont;
+  obj_data *obj, *next_obj, *cont;
-  struct char_data *tmp_char;
+  char_data *tmp_char;
  int obj_dotmode, cont_dotmode, found = 0, howmany = 1;
  char *theobj, *thecont;
@@ -126,7 +124,7 @@ ACMD(do_put)
      send_to_char(ch, "You'd better open it first!\r\n");
    else {
      if (obj_dotmode == FIND_INDIV) { /* put <obj> <container> */
-	if (!(obj = get_obj_in_list_vis(ch, theobj, NULL, ch->carrying)))
+        if (!((obj = get_obj_in_list_vis(ch, theobj, NULL, ch->carrying))))
          send_to_char(ch, "You aren't carrying %s %s.\r\n", AN(theobj), theobj);
        else if (obj == cont && howmany == 1)
          send_to_char(ch, "You attempt to fold it into itself, but fail.\r\n");
@@ -160,7 +158,7 @@ ACMD(do_put)
  }
 }
-static int can_take_obj(struct char_data *ch, struct obj_data *obj)
+static int can_take_obj(char_data *ch, obj_data *obj)
 {
  if (!(CAN_WEAR(obj, ITEM_WEAR_TAKE))) {
    act("$p: you can't take that!", FALSE, ch, obj, 0, TO_CHAR);
@@ -185,7 +183,7 @@ if (!IS_NPC(ch) && !PRF_FLAGGED(ch, PRF_NOHASSLE)) {
  return (1);
 }
-static void get_check_money(struct char_data *ch, struct obj_data *obj)
+static void get_check_money(char_data *ch, obj_data *obj)
 {
  int value = GET_OBJ_VAL(obj, 0);
@@ -202,8 +200,8 @@ static void get_check_money(struct char_data *ch, struct obj_data *obj)
    send_to_char(ch, "There were %d coins.\r\n", value);
 }
-static void perform_get_from_container(struct char_data *ch, struct obj_data *obj,
+static void perform_get_from_container(char_data *ch, obj_data *obj,
-				     struct obj_data *cont, int mode)
+                                       obj_data *cont, int mode)
 {
  if (mode == FIND_OBJ_INV || can_take_obj(ch, obj)) {
    if (IS_CARRYING_N(ch) >= CAN_CARRY_N(ch))
@@ -218,10 +216,10 @@ static void perform_get_from_container(struct char_data *ch, struct obj_data *ob
  }
 }
-void get_from_container(struct char_data *ch, struct obj_data *cont,
+void get_from_container(char_data *ch, obj_data *cont,
                        char *arg, int mode, int howmany)
 {
-  struct obj_data *obj, *next_obj;
+  obj_data *obj, *next_obj;
  int obj_dotmode, found = 0;
  obj_dotmode = find_all_dots(arg);
@@ -235,7 +233,7 @@ void get_from_container(struct char_data *ch, struct obj_data *cont,
      snprintf(buf, sizeof(buf), "There doesn't seem to be %s %s in $p.", AN(arg), arg);
      act(buf, FALSE, ch, cont, 0, TO_CHAR);
    } else {
-      struct obj_data *obj_next;
+      obj_data *obj_next;
      while (obj && howmany--) {
        obj_next = obj->next_content;
        perform_get_from_container(ch, obj, cont, mode);
@@ -268,7 +266,7 @@ void get_from_container(struct char_data *ch, struct obj_data *cont,
  }
 }
-static int perform_get_from_room(struct char_data *ch, struct obj_data *obj)
+static int perform_get_from_room(char_data *ch, obj_data *obj)
 {
  if (can_take_obj(ch, obj) && get_otrigger(obj, ch)) {
    obj_from_room(obj);
@@ -281,9 +279,9 @@ static int perform_get_from_room(struct char_data *ch, struct obj_data *obj)
  return (0);
 }
-static void get_from_room(struct char_data *ch, char *arg, int howmany)
+static void get_from_room(char_data *ch, char *arg, int howmany)
 {
-  struct obj_data *obj, *next_obj;
+  obj_data *obj, *next_obj;
  int dotmode, found = 0;
  dotmode = find_all_dots(arg);
@@ -297,7 +295,7 @@ static void get_from_room(struct char_data *ch, char *arg, int howmany)
      }
      send_to_char(ch, "You don't see %s %s here.\r\n", AN(arg), arg);
    } else {
-      struct obj_data *obj_next;
+      obj_data *obj_next;
      while (obj && howmany--) {
        obj_next = obj->next_content;
        perform_get_from_room(ch, obj);
@@ -333,8 +331,8 @@ ACMD(do_get)
  char arg3[MAX_INPUT_LENGTH];
  int cont_dotmode, found = 0, mode;
-  struct obj_data *cont;
+  obj_data *cont;
-  struct char_data *tmp_char;
+  char_data *tmp_char;
  one_argument(two_arguments(argument, arg1, arg2), arg3); /* three_arguments */
@@ -397,9 +395,9 @@ ACMD(do_get)
  }
 }
-static void perform_drop_gold(struct char_data *ch, int amount, byte mode, room_rnum RDR)
+static void perform_drop_gold(char_data *ch, int amount, byte mode, room_rnum RDR)
 {
-  struct obj_data *obj;
+  obj_data *obj;
  if (amount <= 0)
    send_to_char(ch, "Heh heh heh.. we are jolly funny today, eh?\r\n");
@@ -446,7 +444,8 @@ static void perform_drop_gold(struct char_data *ch, int amount, byte mode, room_
 #define VANISH(mode) ((mode == SCMD_DONATE || mode == SCMD_JUNK) ? \
 		      "  It vanishes in a puff of smoke!" : "")
-static int perform_drop(struct char_data *ch, struct obj_data *obj,
+
 static int perform_drop(char_data *ch, obj_data *obj,
                        byte mode, const char *sname, room_rnum RDR)
 {
  char buf[MAX_STRING_LENGTH];
@@ -507,7 +506,7 @@ static int perform_drop(struct char_data *ch, struct obj_data *obj,
 ACMD(do_drop)
 {
  char arg[MAX_INPUT_LENGTH];
-  struct obj_data *obj, *next_obj;
+  obj_data *obj, *next_obj;
  room_rnum RDR = 0;
  byte mode = SCMD_DROP;
  int dotmode, amount = 0, multi, num_don_rooms;
@@ -533,8 +532,12 @@ ACMD(do_drop)
    case 2:
      RDR = real_room(CONFIG_DON_ROOM_1);
      break;
-    case 3: RDR = real_room(CONFIG_DON_ROOM_2); break;
+    case 3:
-    case 4: RDR = real_room(CONFIG_DON_ROOM_3); break;
+      RDR = real_room(CONFIG_DON_ROOM_2);
      break;
    case 4:
      RDR = real_room(CONFIG_DON_ROOM_3);
      break;
    }
    if (RDR == NOWHERE) {
@@ -568,7 +571,8 @@ ACMD(do_drop)
        next_obj = get_obj_in_list_vis(ch, arg, NULL, obj->next_content);
        amount += perform_drop(ch, obj, mode, sname, RDR);
        obj = next_obj;
-      } while (obj && --multi);
+      }
      while (obj && --multi);
    }
  } else {
    dotmode = find_all_dots(arg);
@@ -617,8 +621,8 @@ ACMD(do_drop)
  }
 }
-static void perform_give(struct char_data *ch, struct char_data *vict,
+static void perform_give(char_data *ch, char_data *vict,
-		       struct obj_data *obj)
+                         obj_data *obj)
 {
  if (!give_otrigger(obj, ch, vict))
    return;
@@ -633,7 +637,8 @@ static void perform_give(struct char_data *ch, struct char_data *vict,
    act("$N seems to have $S hands full.", FALSE, ch, 0, vict, TO_CHAR);
    return;
  }
-  if (GET_OBJ_WEIGHT(obj) + IS_CARRYING_W(vict) > CAN_CARRY_W(vict) && GET_LEVEL(ch) < LVL_IMMORT && GET_LEVEL(vict) < LVL_IMMORT) {
+  if (GET_OBJ_WEIGHT(obj) + IS_CARRYING_W(vict) > CAN_CARRY_W(vict) && GET_LEVEL(ch) < LVL_IMMORT && GET_LEVEL(vict) <
      LVL_IMMORT) {
    act("$E can't carry that much weight.", FALSE, ch, 0, vict, TO_CHAR);
    return;
  }
@@ -647,9 +652,9 @@ static void perform_give(struct char_data *ch, struct char_data *vict,
 }
 /* utility function for give */
-static struct char_data *give_find_vict(struct char_data *ch, char *arg)
+static char_data *give_find_vict(char_data *ch, char *arg)
 {
-  struct char_data *vict;
+  char_data *vict;
  skip_spaces(&arg);
  if (!*arg)
@@ -664,7 +669,7 @@ static struct char_data *give_find_vict(struct char_data *ch, char *arg)
  return (NULL);
 }
-static void perform_give_gold(struct char_data *ch, struct char_data *vict,
+static void perform_give_gold(char_data *ch, char_data *vict,
                              int amount)
 {
  char buf[MAX_STRING_LENGTH];
@@ -696,8 +701,8 @@ ACMD(do_give)
 {
  char arg[MAX_STRING_LENGTH];
  int amount, dotmode;
-  struct char_data *vict;
+  char_data *vict;
-  struct obj_data *obj, *next_obj;
+  obj_data *obj, *next_obj;
  argument = one_argument(argument, arg);
@@ -754,10 +759,10 @@ ACMD(do_give)
  }
 }
-void weight_change_object(struct obj_data *obj, int weight)
+void weight_change_object(obj_data *obj, int weight)
 {
-  struct obj_data *tmp_obj;
+  obj_data *tmp_obj;
-  struct char_data *tmp_ch;
+  char_data *tmp_ch;
  if (IN_ROOM(obj) != NOWHERE) {
    GET_OBJ_WEIGHT(obj) += weight;
@@ -777,7 +782,7 @@ void weight_change_object(struct obj_data *obj, int weight)
  }
 }
-void name_from_drinkcon(struct obj_data *obj)
+void name_from_drinkcon(obj_data *obj)
 {
  const char *liqname;
  char *new_name;
@@ -797,7 +802,7 @@ void name_from_drinkcon(struct obj_data *obj)
 }
-void name_to_drinkcon(struct obj_data *obj, int type)
+void name_to_drinkcon(obj_data *obj, int type)
 {
  char *new_name;
@@ -816,7 +821,7 @@ void name_to_drinkcon(struct obj_data *obj, int type)
 ACMD(do_drink)
 {
  char arg[MAX_INPUT_LENGTH];
-  struct obj_data *temp;
+  obj_data *temp;
  struct affected_type af;
  int amount, weight;
  int on_ground = 0;
@@ -946,7 +951,7 @@ ACMD(do_drink)
 ACMD(do_eat)
 {
  char arg[MAX_INPUT_LENGTH];
-  struct obj_data *food;
+  obj_data *food;
  struct affected_type af;
  int amount;
@@ -1019,7 +1024,7 @@ ACMD(do_eat)
 ACMD(do_pour)
 {
  char arg1[MAX_INPUT_LENGTH], arg2[MAX_INPUT_LENGTH];
-  struct obj_data *from_obj = NULL, *to_obj = NULL;
+  obj_data *from_obj = NULL, *to_obj = NULL;
  int amount = 0;
  two_arguments(argument, arg1, arg2);
@@ -1084,8 +1089,7 @@ ACMD(do_pour)
        GET_OBJ_VAL(from_obj, 1) = 0;
        GET_OBJ_VAL(from_obj, 2) = 0;
        GET_OBJ_VAL(from_obj, 3) = 0;
-      }
+      } else
      else
        send_to_char(ch, "You can't possibly pour that container out!\r\n");
      return;
@@ -1142,14 +1146,12 @@ ACMD(do_pour)
      GET_OBJ_VAL(from_obj, 2) = 0;
      GET_OBJ_VAL(from_obj, 3) = 0;
    }
-  }
+  } else {
  else {
    GET_OBJ_VAL(to_obj, 1) = GET_OBJ_VAL(to_obj, 0);
    amount = GET_OBJ_VAL(to_obj, 0);
  }
  /* Poisoned? */
-  GET_OBJ_VAL(to_obj, 3) = (GET_OBJ_VAL(to_obj, 3) || GET_OBJ_VAL(from_obj, 3))
+  GET_OBJ_VAL(to_obj, 3) = (GET_OBJ_VAL(to_obj, 3) || GET_OBJ_VAL(from_obj, 3));
 ;
  /* Weight change, except for unlimited. */
  if (GET_OBJ_VAL(from_obj, 0) > 0) {
    weight_change_object(from_obj, -amount);
@@ -1157,7 +1159,7 @@ ACMD(do_pour)
  weight_change_object(to_obj, amount); /* Add weight */
 }
-static void wear_message(struct char_data *ch, struct obj_data *obj, int where)
+static void wear_message(char_data *ch, obj_data *obj, int where)
 {
  const char *wear_messages[][2] = {
      {"$n lights $p and holds it.",
@@ -1219,7 +1221,7 @@ static void wear_message(struct char_data *ch, struct obj_data *obj, int where)
  act(wear_messages[where][1], FALSE, ch, obj, 0, TO_CHAR);
 }
-static void perform_wear(struct char_data *ch, struct obj_data *obj, int where)
+static void perform_wear(char_data *ch, obj_data *obj, int where)
 {
  /*
   * ITEM_WEAR_TAKE is used for objects that do not require special bits
@@ -1280,7 +1282,7 @@ static void perform_wear(struct char_data *ch, struct obj_data *obj, int where)
  equip_char(ch, obj, where);
 }
-int find_eq_pos(struct char_data *ch, struct obj_data *obj, char *arg)
+int find_eq_pos(char_data *ch, obj_data *obj, char *arg)
 {
  int where = -1;
@@ -1307,18 +1309,30 @@ int find_eq_pos(struct char_data *ch, struct obj_data *obj, char *arg)
  };
  if (!arg || !*arg) {
-    if (CAN_WEAR(obj, ITEM_WEAR_FINGER))      where = WEAR_FINGER_R;
+    if (CAN_WEAR(obj, ITEM_WEAR_FINGER))
-    if (CAN_WEAR(obj, ITEM_WEAR_NECK))        where = WEAR_NECK_1;
+      where = WEAR_FINGER_R;
-    if (CAN_WEAR(obj, ITEM_WEAR_BODY))        where = WEAR_BODY;
+    if (CAN_WEAR(obj, ITEM_WEAR_NECK))
-    if (CAN_WEAR(obj, ITEM_WEAR_HEAD))        where = WEAR_HEAD;
+      where = WEAR_NECK_1;
-    if (CAN_WEAR(obj, ITEM_WEAR_LEGS))        where = WEAR_LEGS;
+    if (CAN_WEAR(obj, ITEM_WEAR_BODY))
-    if (CAN_WEAR(obj, ITEM_WEAR_FEET))        where = WEAR_FEET;
+      where = WEAR_BODY;
-    if (CAN_WEAR(obj, ITEM_WEAR_HANDS))       where = WEAR_HANDS;
+    if (CAN_WEAR(obj, ITEM_WEAR_HEAD))
-    if (CAN_WEAR(obj, ITEM_WEAR_ARMS))        where = WEAR_ARMS;
+      where = WEAR_HEAD;
-    if (CAN_WEAR(obj, ITEM_WEAR_SHIELD))      where = WEAR_SHIELD;
+    if (CAN_WEAR(obj, ITEM_WEAR_LEGS))
-    if (CAN_WEAR(obj, ITEM_WEAR_ABOUT))       where = WEAR_ABOUT;
+      where = WEAR_LEGS;
-    if (CAN_WEAR(obj, ITEM_WEAR_WAIST))       where = WEAR_WAIST;
+    if (CAN_WEAR(obj, ITEM_WEAR_FEET))
-    if (CAN_WEAR(obj, ITEM_WEAR_WRIST))       where = WEAR_WRIST_R;
+      where = WEAR_FEET;
    if (CAN_WEAR(obj, ITEM_WEAR_HANDS))
      where = WEAR_HANDS;
    if (CAN_WEAR(obj, ITEM_WEAR_ARMS))
      where = WEAR_ARMS;
    if (CAN_WEAR(obj, ITEM_WEAR_SHIELD))
      where = WEAR_SHIELD;
    if (CAN_WEAR(obj, ITEM_WEAR_ABOUT))
      where = WEAR_ABOUT;
    if (CAN_WEAR(obj, ITEM_WEAR_WAIST))
      where = WEAR_WAIST;
    if (CAN_WEAR(obj, ITEM_WEAR_WRIST))
      where = WEAR_WRIST_R;
  } else if ((where = search_block(arg, keywords, FALSE)) < 0)
    send_to_char(ch, "'%s'?  What part of your body is THAT?\r\n", arg);
@@ -1329,7 +1343,7 @@ ACMD(do_wear)
 {
  char arg1[MAX_INPUT_LENGTH];
  char arg2[MAX_INPUT_LENGTH];
-  struct obj_data *obj, *next_obj;
+  obj_data *obj, *next_obj;
  int where, dotmode, items_worn = 0;
  two_arguments(argument, arg1, arg2);
@@ -1393,7 +1407,7 @@ ACMD(do_wear)
 ACMD(do_wield)
 {
  char arg[MAX_INPUT_LENGTH];
-  struct obj_data *obj;
+  obj_data *obj;
  one_argument(argument, arg);
@@ -1416,7 +1430,7 @@ ACMD(do_wield)
 ACMD(do_grab)
 {
  char arg[MAX_INPUT_LENGTH];
-  struct obj_data *obj;
+  obj_data *obj;
  one_argument(argument, arg);
@@ -1440,9 +1454,9 @@ ACMD(do_grab)
  }
 }
-static void perform_remove(struct char_data *ch, int pos)
+static void perform_remove(char_data *ch, int pos)
 {
-  struct obj_data *obj;
+  obj_data *obj;
  if (!(obj = GET_EQ(ch, pos)))
    log("SYSERR: perform_remove: bad pos %d passed.", pos);
@@ -1509,7 +1523,7 @@ ACMD(do_remove)
 ACMD(do_sac)
 {
  char arg[MAX_INPUT_LENGTH];
-  struct obj_data *j, *jj, *next_thing2;
+  obj_data *j, *jj, *next_thing2;
  one_argument(argument, arg);
@@ -1518,7 +1532,8 @@ ACMD(do_sac)
    return;
  }
-  if (!(j = get_obj_in_list_vis(ch, arg, NULL, world[IN_ROOM(ch)].contents)) && (!(j = get_obj_in_list_vis(ch, arg, NULL, ch->carrying)))) {
+  if (!(j = get_obj_in_list_vis(ch, arg, NULL, world[IN_ROOM(ch)].contents)) && (!(
        j = get_obj_in_list_vis(ch, arg, NULL, ch->carrying)))) {
    send_to_char(ch, "It doesn't seem to be here.\n\r");
    return;
  }
@@ -1532,18 +1547,21 @@ ACMD(do_sac)
  switch (rand_number(0, 5)) {
  case 0:
-      send_to_char(ch, "You sacrifice %s to the Gods.\r\nYou receive one gold coin for your humility.\r\n", GET_OBJ_SHORT(j));
+    send_to_char(ch, "You sacrifice %s to the Gods.\r\nYou receive one gold coin for your humility.\r\n",
                 GET_OBJ_SHORT(j));
    increase_gold(ch, 1);
    break;
  case 1:
    send_to_char(ch, "You sacrifice %s to the Gods.\r\nThe Gods ignore your sacrifice.\r\n", GET_OBJ_SHORT(j));
    break;
  case 2:
-      send_to_char(ch, "You sacrifice %s to the Gods.\r\nThe gods give you %d experience points.\r\n", GET_OBJ_SHORT(j), 1+2*GET_OBJ_LEVEL(j));
+    send_to_char(ch, "You sacrifice %s to the Gods.\r\nThe gods give you %d experience points.\r\n", GET_OBJ_SHORT(j),
                 1 + 2 * GET_OBJ_LEVEL(j));
    GET_EXP(ch) += (1 + 2 * GET_OBJ_LEVEL(j));
    break;
  case 3:
-      send_to_char(ch, "You sacrifice %s to the Gods.\r\nYou receive %d experience points.\r\n", GET_OBJ_SHORT(j), 1+GET_OBJ_LEVEL(j));
+    send_to_char(ch, "You sacrifice %s to the Gods.\r\nYou receive %d experience points.\r\n", GET_OBJ_SHORT(j),
                 1 + GET_OBJ_LEVEL(j));
    GET_EXP(ch) += (1 + GET_OBJ_LEVEL(j));
    break;
  case 4:
@@ -1555,7 +1573,8 @@ ACMD(do_sac)
    increase_gold(ch, (1 + 2 * GET_OBJ_LEVEL(j)));
    break;
  default:
-      send_to_char(ch, "You sacrifice %s to the Gods.\r\nYou receive one gold coin for your humility.\r\n",GET_OBJ_SHORT(j));
+    send_to_char(ch, "You sacrifice %s to the Gods.\r\nYou receive one gold coin for your humility.\r\n",
                 GET_OBJ_SHORT(j));
    increase_gold(ch, 1);
    break;
  }
@@ -27,18 +27,18 @@
 /* local only functions */
 /* do_simple_move utility functions */
-static int has_boat(struct char_data *ch);
+static int has_boat(char_data *ch);
 /* do_gen_door utility functions */
-static int find_door(struct char_data *ch, const char *type, char *dir, const char *cmdname);
+static int find_door(char_data *ch, const char *type, char *dir, const char *cmdname);
-static int has_key(struct char_data *ch, obj_vnum key);
+static int has_key(char_data *ch, obj_vnum key);
-static void do_doorcmd(struct char_data *ch, struct obj_data *obj, int door, int scmd);
+static void do_doorcmd(char_data *ch, obj_data *obj, int door, int scmd);
-static int ok_pick(struct char_data *ch, obj_vnum keynum, int pickproof, int scmd);
+static int ok_pick(char_data *ch, obj_vnum keynum, int pickproof, int scmd);
 /* simple function to determine if char can walk on water */
-static int has_boat(struct char_data *ch)
+static int has_boat(char_data *ch)
 {
-  struct obj_data *obj;
+  obj_data *obj;
  int i;
  if (GET_LEVEL(ch) > LVL_IMMORT)
@@ -61,9 +61,9 @@ static int has_boat(struct char_data *ch)
 }
 /* Simple function to determine if char can fly. */
-static int has_flight(struct char_data *ch)
+static int has_flight(char_data *ch)
 {
-  struct obj_data *obj;
+  obj_data *obj;
  int i;
  if (GET_LEVEL(ch) > LVL_IMMORT)
@@ -86,9 +86,9 @@ static int has_flight(struct char_data *ch)
 }
 /* Simple function to determine if char can scuba. */
-static int has_scuba(struct char_data *ch)
+static int has_scuba(char_data *ch)
 {
-  struct obj_data *obj;
+  obj_data *obj;
  int i;
  if (GET_LEVEL(ch) > LVL_IMMORT)
@@ -126,7 +126,7 @@ static int has_scuba(struct char_data *ch)
 * @param need_specials_check If TRUE will cause 
 * @retval int 1 for a successful move (ch is now in a new location)		
 * or 0 for a failed move (ch is still in the original location). */
-int do_simple_move(struct char_data *ch, int dir, int need_specials_check)
+int do_simple_move(char_data *ch, int dir, int need_specials_check)
 {
  /* Begin Local variable definitions */
  /*---------------------------------------------------------------------*/
@@ -166,8 +166,7 @@ int do_simple_move(struct char_data *ch, int dir, int need_specials_check)
    return 0;
  /* Charm effect: Does it override the movement? */
-  if (AFF_FLAGGED(ch, AFF_CHARM) && ch->master && was_in == IN_ROOM(ch->master))
+  if (AFF_FLAGGED(ch, AFF_CHARM) && ch->master && was_in == IN_ROOM(ch->master)) {
  {
    send_to_char(ch, "The thought of leaving your master makes you weep.\r\n");
    act("$n bursts into tears.", FALSE, ch, 0, 0, TO_ROOM);
    return (0);
@@ -175,28 +174,23 @@ int do_simple_move(struct char_data *ch, int dir, int need_specials_check)
  /* Water, No Swimming Rooms: Does the deep water prevent movement? */
  if ((SECT(was_in) == SECT_WATER_NOSWIM) ||
-      (SECT(going_to) == SECT_WATER_NOSWIM))
+      (SECT(going_to) == SECT_WATER_NOSWIM)) {
-  {
+    if (!has_boat(ch)) {
    if (!has_boat(ch))
    {
      send_to_char(ch, "You need a boat to go there.\r\n");
      return (0);
    }
  }
  /* Flying Required: Does lack of flying prevent movement? */
-  if ((SECT(was_in) == SECT_FLYING) || (SECT(going_to) == SECT_FLYING))
+  if ((SECT(was_in) == SECT_FLYING) || (SECT(going_to) == SECT_FLYING)) {
-  {
+    if (!has_flight(ch)) {
    if (!has_flight(ch))
    {
      send_to_char(ch, "You need to be flying to go there!\r\n");
      return (0);
    }
  }
  /* 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) && !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");
      return (0);
@@ -204,10 +198,8 @@ int do_simple_move(struct char_data *ch, int dir, int need_specials_check)
  }
  /* Houses: Can the player walk into the house? */
-  if (ROOM_FLAGGED(was_in, ROOM_ATRIUM))
+  if (ROOM_FLAGGED(was_in, ROOM_ATRIUM)) {
-  {
+    if (!House_can_enter(ch, GET_ROOM_VNUM(going_to))) {
    if (!House_can_enter(ch, GET_ROOM_VNUM(going_to)))
    {
      send_to_char(ch, "That's private property -- no trespassing!\r\n");
      return (0);
    }
@@ -223,15 +215,15 @@ int do_simple_move(struct char_data *ch, int dir, int need_specials_check)
    send_to_char(ch, "A mysterious barrier forces you back! That area is off-limits.\r\n");
    return (0);
  }
-  if (ZONE_FLAGGED(GET_ROOM_ZONE(going_to), ZONE_NOIMMORT) && (GET_LEVEL(ch) >= LVL_IMMORT) && (GET_LEVEL(ch) < LVL_GRGOD)) {
+  if (ZONE_FLAGGED(GET_ROOM_ZONE(going_to), ZONE_NOIMMORT) && (GET_LEVEL(ch) >= LVL_IMMORT) && (
        GET_LEVEL(ch) < LVL_GRGOD)) {
    send_to_char(ch, "A mysterious barrier forces you back! That area is off-limits.\r\n");
    return (0);
  }
  /* Room Size Capacity: Is the room full of people already? */
  if (ROOM_FLAGGED(going_to, ROOM_TUNNEL) &&
-      num_pc_in_room(&(world[going_to])) >= CONFIG_TUNNEL_SIZE)
+      num_pc_in_room(&(world[going_to])) >= CONFIG_TUNNEL_SIZE) {
  {
    if (CONFIG_TUNNEL_SIZE > 1)
      send_to_char(ch, "There isn't enough room for you to go there!\r\n");
    else
@@ -240,8 +232,7 @@ int do_simple_move(struct char_data *ch, int dir, int need_specials_check)
  }
  /* Room Level Requirements: Is ch privileged enough to enter the room? */
-  if (ROOM_FLAGGED(going_to, ROOM_GODROOM) && GET_LEVEL(ch) < LVL_GOD)
+  if (ROOM_FLAGGED(going_to, ROOM_GODROOM) && GET_LEVEL(ch) < LVL_GOD) {
  {
    send_to_char(ch, "You aren't godly enough to use that room!\r\n");
    return (0);
  }
@@ -253,8 +244,7 @@ int do_simple_move(struct char_data *ch, int dir, int need_specials_check)
                   movement_loss[SECT(going_to)]) / 2;
  /* Move Point Requirement Check */
-  if (GET_MOVE(ch) < need_movement && !IS_NPC(ch))
+  if (GET_MOVE(ch) < need_movement && !IS_NPC(ch)) {
  {
    if (need_specials_check && ch->master)
      send_to_char(ch, "You are too exhausted to follow.\r\n");
    else
@@ -274,8 +264,7 @@ int do_simple_move(struct char_data *ch, int dir, int need_specials_check)
    GET_MOVE(ch) -= need_movement;
  /* Generate the leave message and display to others in the was_in room. */
-  if (!AFF_FLAGGED(ch, AFF_SNEAK))
+  if (!AFF_FLAGGED(ch, AFF_SNEAK)) {
  {
    snprintf(leave_message, sizeof(leave_message), "$n leaves %s.", dirs[dir]);
    act(leave_message, TRUE, ch, 0, 0, TO_ROOM);
  }
@@ -307,9 +296,9 @@ int do_simple_move(struct char_data *ch, int dir, int need_specials_check)
    look_at_room(ch, 0);
  /* ... and Kill the player if the room is a death trap. */
-  if (ROOM_FLAGGED(going_to, ROOM_DEATH) && GET_LEVEL(ch) < LVL_IMMORT)
+  if (ROOM_FLAGGED(going_to, ROOM_DEATH) && GET_LEVEL(ch) < LVL_IMMORT) {
-  {
+    mudlog(BRF, LVL_IMMORT, TRUE, "%s hit death trap #%d (%s)", GET_NAME(ch), GET_ROOM_VNUM(going_to),
-    mudlog(BRF, LVL_IMMORT, TRUE, "%s hit death trap #%d (%s)", GET_NAME(ch), GET_ROOM_VNUM(going_to), world[going_to].name);
+           world[going_to].name);
    death_cry(ch);
    extract_char(ch);
    return (0);
@@ -319,15 +308,13 @@ int do_simple_move(struct char_data *ch, int dir, int need_specials_check)
  /* Fire memory and greet triggers, check and see if the greet trigger
   * prevents movement, and if so, move the player back to the previous room. */
  entry_memory_mtrigger(ch);
-  if (!greet_mtrigger(ch, dir))
+  if (!greet_mtrigger(ch, dir)) {
  {
    char_from_room(ch);
    char_to_room(ch, was_in);
    look_at_room(ch, 0);
    /* Failed move, return a failure */
    return (0);
-  }
+  } else
  else
    greet_memory_mtrigger(ch);
  /*---------------------------------------------------------------------*/
  /* End: Post-move operations. */
@@ -337,7 +324,7 @@ int do_simple_move(struct char_data *ch, int dir, int need_specials_check)
  return (1);
 }
-int perform_move(struct char_data *ch, int dir, int need_specials_check)
+int perform_move(char_data *ch, int dir, int need_specials_check)
 {
  room_rnum was_in;
  struct follow_type *k, *next;
@@ -348,7 +335,8 @@ int perform_move(struct char_data *ch, int dir, int need_specials_check)
    send_to_char(ch, "Alas, you cannot go that way...\r\n");
  else if ((!EXIT(ch, dir) && !buildwalk(ch, dir)) || EXIT(ch, dir)->to_room == NOWHERE)
    send_to_char(ch, "Alas, you cannot go that way...\r\n");
-  else if (EXIT_FLAGGED(EXIT(ch, dir), EX_CLOSED) && (GET_LEVEL(ch) < LVL_IMMORT || (!IS_NPC(ch) && !PRF_FLAGGED(ch, PRF_NOHASSLE)))) {
+  else if (EXIT_FLAGGED(EXIT(ch, dir), EX_CLOSED) && (GET_LEVEL(ch) < LVL_IMMORT || (
                                                        !IS_NPC(ch) && !PRF_FLAGGED(ch, PRF_NOHASSLE)))) {
    if (EXIT(ch, dir)->keyword)
      send_to_char(ch, "The %s seems to be closed.\r\n", fname(EXIT(ch, dir)->keyword));
    else
@@ -380,7 +368,7 @@ ACMD(do_move)
  perform_move(ch, subcmd, 0);
 }
-static int find_door(struct char_data *ch, const char *type, char *dir, const char *cmdname)
+static int find_door(char_data *ch, const char *type, char *dir, const char *cmdname)
 {
  int door;
@@ -410,24 +398,18 @@ static int find_door(struct char_data *ch, const char *type, char *dir, const ch
      send_to_char(ch, "What is it you want to %s?\r\n", cmdname);
      return (-1);
    }
-    for (door = 0; door < DIR_COUNT; door++)
+    for (door = 0; door < DIR_COUNT; door++) {
-    {
+      if (EXIT(ch, door)) {
-      if (EXIT(ch, door))
+        if (EXIT(ch, door)->keyword) {
-      {
+          if (isname(type, EXIT(ch, door)->keyword)) {
        if (EXIT(ch, door)->keyword)
        {
          if (isname(type, EXIT(ch, door)->keyword))
          {
            if ((!IS_NPC(ch)) && (!PRF_FLAGGED(ch, PRF_AUTODOOR)))
              return door;
-            else if (is_abbrev(cmdname, "open"))
+            else if (is_abbrev(cmdname, "open")) {
            {
              if (IS_SET(EXIT(ch, door)->exit_info, EX_CLOSED))
                return door;
              else if (IS_SET(EXIT(ch, door)->exit_info, EX_LOCKED))
                return door;
-            }
+            } else if ((is_abbrev(cmdname, "close")) && (!(IS_SET(EXIT(ch, door)->exit_info, EX_CLOSED))))
            else if ((is_abbrev(cmdname, "close")) && (!(IS_SET(EXIT(ch, door)->exit_info, EX_CLOSED))) )
              return door;
            else if ((is_abbrev(cmdname, "lock")) && (!(IS_SET(EXIT(ch, door)->exit_info, EX_LOCKED))))
              return door;
@@ -457,9 +439,9 @@ static int find_door(struct char_data *ch, const char *type, char *dir, const ch
  }
 }
-int has_key(struct char_data *ch, obj_vnum key)
+int has_key(char_data *ch, obj_vnum key)
 {
-  struct obj_data *o;
+  obj_data *o;
  if (key == NOTHING)
    return (0);
@@ -516,7 +498,7 @@ static const int flags_door[] =
 		(TOGGLE_BIT(GET_OBJ_VAL(obj, 1), CONT_LOCKED)) :\
 		(TOGGLE_BIT(EXITN(room, door)->exit_info, EX_LOCKED)))
-static void do_doorcmd(struct char_data *ch, struct obj_data *obj, int door, int scmd)
+static void do_doorcmd(char_data *ch, obj_data *obj, int door, int scmd)
 {
  char buf[MAX_STRING_LENGTH];
  size_t len;
@@ -587,7 +569,7 @@ static void do_doorcmd(struct char_data *ch, struct obj_data *obj, int door, int
                 scmd == SCMD_CLOSE ? "d" : "ed");
 }
-static int ok_pick(struct char_data *ch, obj_vnum keynum, int pickproof, int scmd)
+static int ok_pick(char_data *ch, obj_vnum keynum, int pickproof, int scmd)
 {
  int percent, skill_lvl;
@@ -628,8 +610,8 @@ ACMD(do_gen_door)
  int door = -1;
  obj_vnum keynum;
  char type[MAX_INPUT_LENGTH], dir[MAX_INPUT_LENGTH];
-  struct obj_data *obj = NULL;
+  obj_data *obj = NULL;
-  struct char_data *victim = NULL;
+  char_data *victim = NULL;
  skip_spaces(&argument);
  if (!*argument) {
@@ -655,17 +637,15 @@ ACMD(do_gen_door)
      send_to_char(ch, "But it's currently open!\r\n");
    else if (!(DOOR_IS_LOCKED(ch, obj, door)) && IS_SET(flags_door[subcmd], NEED_LOCKED))
      send_to_char(ch, "Oh.. it wasn't locked, after all..\r\n");
-    else if (!(DOOR_IS_UNLOCKED(ch, obj, door)) && IS_SET(flags_door[subcmd], NEED_UNLOCKED) && ((!IS_NPC(ch) && PRF_FLAGGED(ch, PRF_AUTOKEY))) && (has_key(ch, keynum)) )
+    else if (!(DOOR_IS_UNLOCKED(ch, obj, door)) && IS_SET(flags_door[subcmd], NEED_UNLOCKED) && ((
-    {
+               !IS_NPC(ch) && PRF_FLAGGED(ch, PRF_AUTOKEY))) && (has_key(ch, keynum))) {
      send_to_char(ch, "It is locked, but you have the key.\r\n");
      do_doorcmd(ch, obj, door, SCMD_UNLOCK);
      do_doorcmd(ch, obj, door, subcmd);
-    }
+    } else if (!(DOOR_IS_UNLOCKED(ch, obj, door)) && IS_SET(flags_door[subcmd], NEED_UNLOCKED) && ((
-    else if (!(DOOR_IS_UNLOCKED(ch, obj, door)) && IS_SET(flags_door[subcmd], NEED_UNLOCKED) && ((!IS_NPC(ch) && PRF_FLAGGED(ch, PRF_AUTOKEY))) && (!has_key(ch, keynum)) )
+                 !IS_NPC(ch) && PRF_FLAGGED(ch, PRF_AUTOKEY))) && (!has_key(ch, keynum))) {
    {
      send_to_char(ch, "It is locked, and you do not have the key!\r\n");
-    }
+    } else if (!(DOOR_IS_UNLOCKED(ch, obj, door)) && IS_SET(flags_door[subcmd], NEED_UNLOCKED) &&
    else if (!(DOOR_IS_UNLOCKED(ch, obj, door)) && IS_SET(flags_door[subcmd], NEED_UNLOCKED) &&
               (GET_LEVEL(ch) < LVL_IMMORT || (!IS_NPC(ch) && !PRF_FLAGGED(ch, PRF_NOHASSLE))))
      send_to_char(ch, "It seems to be locked.\r\n");
    else if (!has_key(ch, keynum) && (GET_LEVEL(ch) < LVL_GOD) && ((subcmd == SCMD_LOCK) || (subcmd == SCMD_UNLOCK)))
@@ -767,8 +747,8 @@ ACMD(do_stand)
 ACMD(do_sit)
 {
  char arg[MAX_STRING_LENGTH];
-  struct obj_data *furniture;
+  obj_data *furniture;
-  struct char_data *tempch;
+  char_data *tempch;
  int found;
  one_argument(argument, arg);
@@ -893,7 +873,7 @@ ACMD(do_sleep)
 ACMD(do_wake)
 {
  char arg[MAX_INPUT_LENGTH];
-  struct char_data *vict;
+  char_data *vict;
  int self = 0;
  one_argument(argument, arg);
@@ -932,7 +912,7 @@ ACMD(do_wake)
 ACMD(do_follow)
 {
  char buf[MAX_INPUT_LENGTH];
-  struct char_data *leader;
+  char_data *leader;
  one_argument(argument, buf);
@@ -24,7 +24,7 @@
 ACMD(do_assist)
 {
  char arg[MAX_INPUT_LENGTH];
-  struct char_data *helpee, *opponent;
+  char_data *helpee, *opponent;
  if (FIGHTING(ch)) {
    send_to_char(ch, "You're already fighting!  How can you assist someone else?\r\n");
@@ -68,7 +68,7 @@ ACMD(do_assist)
 ACMD(do_hit)
 {
  char arg[MAX_INPUT_LENGTH];
-  struct char_data *vict;
+  char_data *vict;
  one_argument(argument, arg);
@@ -88,7 +88,8 @@ ACMD(do_hit)
    if ((GET_POS(ch) == POS_STANDING) && (vict != FIGHTING(ch))) {
      if (GET_DEX(ch) > GET_DEX(vict) || (GET_DEX(ch) == GET_DEX(vict) && rand_number(1, 2) == 1)) /* if faster */
        hit(ch, vict, TYPE_UNDEFINED);                                                             /* first */
-      else hit(vict, ch, TYPE_UNDEFINED);  /* or the victim is first */
+      else
        hit(vict, ch, TYPE_UNDEFINED); /* or the victim is first */
      WAIT_STATE(ch, PULSE_VIOLENCE + 2);
    } else
      send_to_char(ch, "You're fighting the best you can!\r\n");
@@ -98,7 +99,7 @@ ACMD(do_hit)
 ACMD(do_kill)
 {
  char arg[MAX_INPUT_LENGTH];
-  struct char_data *vict;
+  char_data *vict;
  if (GET_LEVEL(ch) < LVL_GRGOD || IS_NPC(ch) || !PRF_FLAGGED(ch, PRF_NOHASSLE)) {
    do_hit(ch, argument, cmd, subcmd);
@@ -125,7 +126,7 @@ ACMD(do_kill)
 ACMD(do_backstab)
 {
  char buf[MAX_INPUT_LENGTH];
-  struct char_data *vict;
+  char_data *vict;
  int percent, prob;
  if (IS_NPC(ch) || !GET_SKILL(ch, SKILL_BACKSTAB)) {
@@ -179,7 +180,7 @@ ACMD(do_order)
 {
  char name[MAX_INPUT_LENGTH], message[MAX_INPUT_LENGTH];
  bool found = FALSE;
-  struct char_data *vict;
+  char_data *vict;
  struct follow_type *k;
  half_chop(argument, name, message);
@@ -232,7 +233,7 @@ ACMD(do_order)
 ACMD(do_flee)
 {
  int i, attempt, loss;
-  struct char_data *was_fighting;
+  char_data *was_fighting;
  if (GET_POS(ch) < POS_FIGHTING) {
    send_to_char(ch, "You are in pretty bad shape, unable to flee!\r\n");
@@ -268,7 +269,7 @@ ACMD(do_flee)
 ACMD(do_bash)
 {
  char arg[MAX_INPUT_LENGTH];
-  struct char_data *vict;
+  char_data *vict;
  int percent, prob;
  one_argument(argument, arg);
@@ -330,7 +331,7 @@ ACMD(do_bash)
 ACMD(do_rescue)
 {
  char arg[MAX_INPUT_LENGTH];
-  struct char_data *vict, *tmp_ch;
+  char_data *vict, *tmp_ch;
  int percent, prob;
  if (IS_NPC(ch) || !GET_SKILL(ch, SKILL_RESCUE)) {
@@ -393,7 +394,7 @@ ACMD(do_rescue)
 EVENTFUNC(event_whirlwind)
 {
-  struct char_data *ch, *tch;
+  char_data *ch, *tch;
  struct mud_event_data *pMudEvent;
  struct list_data *room_list;
  int count;
@@ -405,7 +406,7 @@ EVENTFUNC(event_whirlwind)
  /* For the sake of simplicity, we will place the event data in easily
   * referenced pointers */
  pMudEvent = (struct mud_event_data *)event_obj;
-  ch = (struct char_data *) pMudEvent->pStruct;    
+  ch = (char_data *)pMudEvent->pStruct;
  /* When using a list, we have to make sure to allocate the list as it
   * uses dynamic memory */
@@ -491,7 +492,7 @@ ACMD(do_whirlwind)
 ACMD(do_kick)
 {
  char arg[MAX_INPUT_LENGTH];
-  struct char_data *vict;
+  char_data *vict;
  int percent, prob;
  if (IS_NPC(ch) || !GET_SKILL(ch, SKILL_KICK)) {
@@ -509,6 +510,8 @@ ACMD(do_kick)
      return;
    }
  }
  log("ch class = %d vict class = %d", GET_CLASS(ch), GET_CLASS(vict));
  if (vict == ch) {
    send_to_char(ch, "Aren't we funny today...\r\n");
    return;
@@ -528,11 +531,10 @@ ACMD(do_kick)
 ACMD(do_bandage)
 {
  char arg[MAX_INPUT_LENGTH];
-  struct char_data * vict;
+  char_data *vict;
  int percent, prob;
-  if (!GET_SKILL(ch, SKILL_BANDAGE))
+  if (!GET_SKILL(ch, SKILL_BANDAGE)) {
  {
    send_to_char(ch, "You are unskilled in the art of bandaging.\r\n");
    return;
  }
@@ -32,8 +32,8 @@
 /* Local defined utility functions */
 /* do_group utility functions */
-static void print_group(struct char_data *ch);
+static void print_group(char_data *ch);
-static void display_group_list(struct char_data * ch);
+static void display_group_list(char_data *ch);
 ACMD(do_quit)
 {
@@ -145,8 +145,8 @@ ACMD(do_hide)
 ACMD(do_steal)
 {
-  struct char_data *vict;
+  char_data *vict;
-  struct obj_data *obj;
+  obj_data *obj;
  char vict_name[MAX_INPUT_LENGTH], obj_name[MAX_INPUT_LENGTH];
  int percent, gold, eq_pos, pcsteal = 0, ohoh = 0;
@@ -315,13 +315,13 @@ ACMD(do_title)
  }
 }
-static void print_group(struct char_data *ch)
+static void print_group(char_data *ch)
 {
-  struct char_data * k;
+  char_data *k;
  send_to_char(ch, "Your group consists of:\r\n");
-  while ((k = (struct char_data *) simple_list(ch->group->members)) != NULL)
+  while ((k = (char_data *)simple_list(ch->group->members)) != NULL)
    send_to_char(ch, "%-*s: %s[%4d/%-4d]H [%4d/%-4d]M [%4d/%-4d]V%s\r\n",
                 count_color_chars(GET_NAME(k)) + 22, GET_NAME(k),
                 GROUP_LEADER(GROUP(ch)) == k ? CBGRN(ch, C_NRM) : CCGRN(ch, C_NRM),
@@ -331,7 +331,7 @@ static void print_group(struct char_data *ch)
                 CCNRM(ch, C_NRM));
 }
-static void display_group_list(struct char_data * ch)
+static void display_group_list(char_data *ch)
 {
  struct group_data *group;
  int count = 0;
@@ -347,7 +347,8 @@ static void display_group_list(struct char_data * ch)
        send_to_char(ch, "%-2d) %s%-12s     %-2d              %s%s\r\n",
                     ++count,
                     IS_SET(GROUP_FLAGS(group), GROUP_OPEN) ? CCGRN(ch, C_NRM) : CCRED(ch, C_NRM),
-          GET_NAME(GROUP_LEADER(group)), group->members->iSize, zone_table[world[IN_ROOM(GROUP_LEADER(group))].zone].name,
+                     GET_NAME(GROUP_LEADER(group)), group->members->iSize,
                     zone_table[world[IN_ROOM(GROUP_LEADER(group))].zone].name,
                     CCNRM(ch, C_NRM));
      else
        send_to_char(ch, "%-2d) Hidden\r\n", ++count);
@@ -369,7 +370,7 @@ static void display_group_list(struct char_data * ch)
 ACMD(do_group)
 {
  char buf[MAX_STRING_LENGTH];
-  struct char_data *vict;
+  char_data *vict;
  argument = one_argument(argument, buf);
@@ -459,10 +460,12 @@ ACMD(do_group)
    }
    if (is_abbrev(argument, "open")) {
      TOGGLE_BIT(GROUP_FLAGS(GROUP(ch)), GROUP_OPEN);
-      send_to_char(ch, "The group is now %s to new members.\r\n", IS_SET(GROUP_FLAGS(GROUP(ch)), GROUP_OPEN) ? "open" : "closed");
+      send_to_char(ch, "The group is now %s to new members.\r\n",
                   IS_SET(GROUP_FLAGS(GROUP(ch)), GROUP_OPEN) ? "open" : "closed");
    } else if (is_abbrev(argument, "anonymous")) {
      TOGGLE_BIT(GROUP_FLAGS(GROUP(ch)), GROUP_ANON);
-      send_to_char(ch, "The group location is now %s to other players.\r\n", IS_SET(GROUP_FLAGS(GROUP(ch)), GROUP_ANON) ? "invisible" : "visible");
+      send_to_char(ch, "The group location is now %s to other players.\r\n",
                   IS_SET(GROUP_FLAGS(GROUP(ch)), GROUP_ANON) ? "invisible" : "visible");
    } else
      send_to_char(ch, "The flag options are: Open, Anonymous\r\n");
  } else {
@@ -492,7 +495,7 @@ ACMD(do_split)
  char buf[MAX_INPUT_LENGTH];
  int amount, num = 0, share, rest;
  size_t len;
-  struct char_data *k;
+  char_data *k;
  if (IS_NPC(ch))
    return;
@@ -511,7 +514,7 @@ ACMD(do_split)
    }
    if (GROUP(ch))
-      while ((k = (struct char_data *) simple_list(GROUP(ch)->members)) != NULL)
+      while ((k = (char_data *)simple_list(GROUP(ch)->members)) != NULL)
        if (IN_ROOM(ch) == IN_ROOM(k) && !IS_NPC(k))
          num++;
@@ -534,7 +537,7 @@ ACMD(do_split)
               (rest == 1) ? "" : "s", (rest == 1) ? "was" : "were", GET_NAME(ch));
    }
-    while ((k = (struct char_data *) simple_list(GROUP(ch)->members)) != NULL)
+    while ((k = (char_data *)simple_list(GROUP(ch)->members)) != NULL)
      if (k != ch && IN_ROOM(ch) == IN_ROOM(k) && !IS_NPC(k)) {
        increase_gold(k, share);
        send_to_char(k, "%s", buf);
@@ -556,7 +559,7 @@ ACMD(do_split)
 ACMD(do_use)
 {
  char buf[MAX_INPUT_LENGTH], arg[MAX_INPUT_LENGTH];
-  struct obj_data *mag_item;
+  obj_data *mag_item;
  half_chop(argument, arg, buf);
  if (!*arg) {
@@ -857,13 +860,12 @@ ACMD(do_gen_tog)
  return;
 }
-static void show_happyhour(struct char_data *ch)
+static void show_happyhour(char_data *ch)
 {
  char happyexp[80], happygold[80], happyqp[80];
  int secs_left;
-  if ((IS_HAPPYHOUR) || (GET_LEVEL(ch) >= LVL_GRGOD))
+  if ((IS_HAPPYHOUR) || (GET_LEVEL(ch) >= LVL_GRGOD)) {
  {
    if (HAPPY_TIME)
      secs_left = ((HAPPY_TIME - 1) * SECS_PER_MUD_HOUR) + next_tick;
    else
@@ -882,9 +884,7 @@ static void show_happyhour(struct char_data *ch)
                 CCYEL(ch, C_NRM), (secs_left / 3600), CCNRM(ch, C_NRM),
                 CCYEL(ch, C_NRM), (secs_left % 3600) / 60, CCNRM(ch, C_NRM),
                 CCYEL(ch, C_NRM), (secs_left % 60), CCNRM(ch, C_NRM));
-  }
+  } else {
  else
  {
    send_to_char(ch, "Sorry, there is currently no happy hour!\r\n");
  }
 }
@@ -894,8 +894,7 @@ ACMD(do_happyhour)
  char arg[MAX_INPUT_LENGTH], val[MAX_INPUT_LENGTH];
  int num;
-  if (GET_LEVEL(ch) < LVL_GOD)
+  if (GET_LEVEL(ch) < LVL_GOD) {
  {
    show_happyhour(ch);
    return;
  }
@@ -903,20 +902,15 @@ ACMD(do_happyhour)
  /* Only Imms get here, so check args */
  two_arguments(argument, arg, val);
-  if (is_abbrev(arg, "experience"))
+  if (is_abbrev(arg, "experience")) {
  {
    num = MIN(MAX((atoi(val)), 0), 1000);
    HAPPY_EXP = num;
    send_to_char(ch, "Happy Hour Exp rate set to +%d%%\r\n", HAPPY_EXP);
-  }
+  } else if ((is_abbrev(arg, "gold")) || (is_abbrev(arg, "coins"))) {
  else if ((is_abbrev(arg, "gold")) || (is_abbrev(arg, "coins")))
  {
    num = MIN(MAX((atoi(val)), 0), 1000);
    HAPPY_GOLD = num;
    send_to_char(ch, "Happy Hour Gold rate set to +%d%%\r\n", HAPPY_GOLD);
-  }
+  } else if ((is_abbrev(arg, "time")) || (is_abbrev(arg, "ticks"))) {
  else if ((is_abbrev(arg, "time")) || (is_abbrev(arg, "ticks")))
  {
    num = MIN(MAX((atoi(val)), 0), 1000);
    if (HAPPY_TIME && !num)
      game_info("Happyhour has been stopped!");
@@ -929,27 +923,19 @@ ACMD(do_happyhour)
                 (HAPPY_TIME * SECS_PER_MUD_HOUR) / 3600,
                 ((HAPPY_TIME * SECS_PER_MUD_HOUR) % 3600) / 60,
                 (HAPPY_TIME * SECS_PER_MUD_HOUR) % 60);
-  }
+  } else if ((is_abbrev(arg, "qp")) || (is_abbrev(arg, "questpoints"))) {
  else if ((is_abbrev(arg, "qp")) || (is_abbrev(arg, "questpoints")))
  {
    num = MIN(MAX((atoi(val)), 0), 1000);
    HAPPY_QP = num;
    send_to_char(ch, "Happy Hour Questpoints rate set to +%d%%\r\n", HAPPY_QP);
-  }
+  } else if (is_abbrev(arg, "show")) {
  else if (is_abbrev(arg, "show"))
  {
    show_happyhour(ch);
-  }
+  } else if (is_abbrev(arg, "default")) {
  else if (is_abbrev(arg, "default"))
  {
    HAPPY_EXP = 100;
    HAPPY_GOLD = 50;
    HAPPY_QP = 50;
    HAPPY_TIME = 48;
    game_info("A Happyhour has started!");
-  }
+  } else {
  else
  {
    send_to_char(ch, "Usage: %shappyhour              %s- show usage (this info)\r\n"
                 "       %shappyhour show         %s- display current settings (what mortals see)\r\n"
                 "       %shappyhour time <ticks> %s- set happyhour time and start timer\r\n"
@@ -30,8 +30,8 @@ ACMD(do_action)
  char arg[MAX_INPUT_LENGTH], part[MAX_INPUT_LENGTH];
  int act_nr;
  struct social_messg *action;
-  struct char_data *vict;
+  char_data *vict;
-  struct obj_data *targ;
+  obj_data *targ;
  if ((act_nr = find_action(cmd)) < 0) {
    send_to_char(ch, "That action is not supported.\r\n");
@@ -65,7 +65,8 @@ ACMD(do_action)
  if (!vict) {
    if (action->char_obj_found) {
      targ = get_obj_in_list_vis(ch, arg, NULL, ch->carrying);
-      if (!targ) targ = get_obj_in_list_vis(ch, arg, NULL, world[IN_ROOM(ch)].contents);
+      if (!targ)
        targ = get_obj_in_list_vis(ch, arg, NULL, world[IN_ROOM(ch)].contents);
      if (targ) {
        act(action->char_obj_found, action->hide, ch, targ, 0, TO_CHAR);
        act(action->others_obj_found, action->hide, ch, targ, 0, TO_ROOM);
@@ -92,9 +93,9 @@ ACMD(do_action)
    act("$N is not in a proper position for that.", FALSE, ch, 0, vict, TO_CHAR | TO_SLEEP);
  else {
    if (*part) {
-      act(action->char_body_found, 0, ch, (struct obj_data *)part, vict, TO_CHAR | TO_SLEEP);
+      act(action->char_body_found, 0, ch, (obj_data *)part, vict, TO_CHAR | TO_SLEEP);
-      act(action->others_body_found, action->hide, ch, (struct obj_data *)part, vict, TO_NOTVICT);
+      act(action->others_body_found, action->hide, ch, (obj_data *)part, vict, TO_NOTVICT);
-      act(action->vict_body_found, action->hide, ch, (struct obj_data *)part, vict, TO_VICT);
+      act(action->vict_body_found, action->hide, ch, (obj_data *)part, vict, TO_VICT);
    } else {
      act(action->char_found, 0, ch, 0, vict, TO_CHAR | TO_SLEEP);
      act(action->others_found, action->hide, ch, 0, vict, TO_NOTVICT);
@@ -128,7 +129,8 @@ void create_command_list(void)
  /* count the commands in the command list */
  i = 0;
-  while(*cmd_info[i].command != '\n') i++;
+  while (*cmd_info[i].command != '\n')
    i++;
  i++;
  CREATE(complete_cmd_info, struct command_info, top_of_socialt + i + 2);
@@ -173,22 +175,38 @@ void free_social_messages(void)
  free(soc_mess_list);
 }
-void free_action(struct social_messg *mess)  {
+void free_action(struct social_messg *mess)
-  if (mess->command) free(mess->command);
+{
-  if (mess->sort_as) free(mess->sort_as);
+  if (mess->command)
-  if (mess->char_no_arg) free(mess->char_no_arg);
+    free(mess->command);
-  if (mess->others_no_arg) free(mess->others_no_arg);
+  if (mess->sort_as)
-  if (mess->char_found) free(mess->char_found);
+    free(mess->sort_as);
-  if (mess->others_found) free(mess->others_found);
+  if (mess->char_no_arg)
-  if (mess->vict_found) free(mess->vict_found);
+    free(mess->char_no_arg);
-  if (mess->char_body_found) free(mess->char_body_found);
+  if (mess->others_no_arg)
-  if (mess->others_body_found) free(mess->others_body_found);
+    free(mess->others_no_arg);
-  if (mess->vict_body_found) free(mess->vict_body_found);
+  if (mess->char_found)
-  if (mess->not_found) free(mess->not_found);
+    free(mess->char_found);
-  if (mess->char_auto) free(mess->char_auto);
+  if (mess->others_found)
-  if (mess->others_auto) free(mess->others_auto);
+    free(mess->others_found);
-  if (mess->char_obj_found) free(mess->char_obj_found);
+  if (mess->vict_found)
-  if (mess->others_obj_found) free(mess->others_obj_found);
+    free(mess->vict_found);
  if (mess->char_body_found)
    free(mess->char_body_found);
  if (mess->others_body_found)
    free(mess->others_body_found);
  if (mess->vict_body_found)
    free(mess->vict_body_found);
  if (mess->not_found)
    free(mess->not_found);
  if (mess->char_auto)
    free(mess->char_auto);
  if (mess->others_auto)
    free(mess->others_auto);
  if (mess->char_obj_found)
    free(mess->char_obj_found);
  if (mess->others_obj_found)
    free(mess->others_obj_found);
  memset(mess, 0, sizeof(struct social_messg));
 }
@@ -222,7 +240,7 @@ ACMD(do_gmote)
  int act_nr, length;
  char arg[MAX_INPUT_LENGTH], buf[MAX_INPUT_LENGTH];
  struct social_messg *action;
-  struct char_data *vict = NULL;
+  char_data *vict = NULL;
  half_chop(argument, buf, arg);
@@ -22,20 +22,19 @@
 /* local utility functions */
 static int aedit_find_command(const char *txt);
-static void aedit_disp_menu(struct descriptor_data * d);
+static void aedit_disp_menu(descriptor_data *d);
-static void aedit_save_to_disk(struct descriptor_data *d);
+static void aedit_save_to_disk(descriptor_data *d);
 /* used in aedit parse */
-static void aedit_setup_new(struct descriptor_data *d);
+static void aedit_setup_new(descriptor_data *d);
-static void aedit_setup_existing(struct descriptor_data *d, int real_num);
+static void aedit_setup_existing(descriptor_data *d, int real_num);
-static void aedit_save_internally(struct descriptor_data *d);
+static void aedit_save_internally(descriptor_data *d);
 /* Utils and exported functions. */
 ACMD(do_oasis_aedit)
 {
  char arg[MAX_INPUT_LENGTH];
-  struct descriptor_data *d;
+  descriptor_data *d;
  int i;
  /* No building as a mob or while being forced. */
@@ -107,7 +106,8 @@ ACMD(do_oasis_aedit)
  mudlog(CMP, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE, "OLC: %s starts editing actions.", GET_NAME(ch));
 }
-static void aedit_setup_new(struct descriptor_data *d) {
+static void aedit_setup_new(descriptor_data *d)
 {
  CREATE(OLC_ACTION(d), struct social_messg, 1);
  OLC_ACTION(d)->command = strdup(OLC_STORAGE(d));
  OLC_ACTION(d)->sort_as = strdup(OLC_STORAGE(d));
@@ -132,7 +132,8 @@ static void aedit_setup_new(struct descriptor_data *d) {
  OLC_VAL(d) = 0;
 }
-static void aedit_setup_existing(struct descriptor_data *d, int real_num) {
+static void aedit_setup_existing(descriptor_data *d, int real_num)
 {
  CREATE(OLC_ACTION(d), struct social_messg, 1);
  OLC_ACTION(d)->command = strdup(soc_mess_list[real_num].command);
  OLC_ACTION(d)->sort_as = strdup(soc_mess_list[real_num].sort_as);
@@ -170,7 +171,8 @@ static void aedit_setup_existing(struct descriptor_data *d, int real_num) {
  aedit_disp_menu(d);
 }
-static void aedit_save_internally(struct descriptor_data *d) {
+static void aedit_save_internally(descriptor_data *d)
 {
  struct social_messg *new_soc_mess_list = NULL;
  int i;
@@ -200,7 +202,8 @@ static void aedit_save_internally(struct descriptor_data *d) {
  aedit_save_to_disk(d); /* autosave by Rumble */
 }
-static void aedit_save_to_disk(struct descriptor_data *d) {
+static void aedit_save_to_disk(descriptor_data *d)
 {
  FILE *fp;
  int i;
  char buf[MAX_STRING_LENGTH];
@@ -252,9 +255,10 @@ static void aedit_save_to_disk(struct descriptor_data *d) {
 }
 /* The Main Menu. */
-static void aedit_disp_menu(struct descriptor_data * d) {
+static void aedit_disp_menu(descriptor_data *d)
 {
  struct social_messg *action = OLC_ACTION(d);
-   struct char_data *ch        = d->character;
+  char_data *ch = d->character;
  get_char_colors(ch);
@@ -322,13 +326,15 @@ static void aedit_disp_menu(struct descriptor_data * d) {
 }
 /* The main loop. */
-void aedit_parse(struct descriptor_data * d, char *arg) {
+void aedit_parse(descriptor_data *d, char *arg)
 {
  int i;
  switch (OLC_MODE(d)) {
  case AEDIT_CONFIRM_SAVESTRING:
    switch (*arg) {
-       case 'y': case 'Y':
+    case 'y':
    case 'Y':
      aedit_save_internally(d);
      mudlog(CMP, MAX(LVL_GOD, GET_INVIS_LEV(d->character)), TRUE, "OLC: %s edits action %s",
             GET_NAME(d->character), OLC_ACTION(d)->command);
@@ -337,7 +343,8 @@ void aedit_parse(struct descriptor_data * d, char *arg) {
      cleanup_olc(d, CLEANUP_STRUCTS);
      write_to_output(d, "Action saved to disk.\r\n");
      break;
-       case 'n': case 'N':
+    case 'n':
    case 'N':
      /* free everything up, including strings etc */
      cleanup_olc(d, CLEANUP_ALL);
      break;
@@ -350,13 +357,16 @@ void aedit_parse(struct descriptor_data * d, char *arg) {
  case AEDIT_CONFIRM_EDIT:
    switch (*arg) {
-       case 'y': case 'Y':
+    case 'y':
    case 'Y':
      aedit_setup_existing(d, OLC_ZNUM(d));
      break;
-       case 'q': case 'Q':
+    case 'q':
    case 'Q':
      cleanup_olc(d, CLEANUP_ALL);
      break;
-       case 'n': case 'N':
+    case 'n':
    case 'N':
      OLC_ZNUM(d)++;
      for (; (OLC_ZNUM(d) <= top_of_socialt); OLC_ZNUM(d)++)
        if (is_abbrev(OLC_STORAGE(d), soc_mess_list[OLC_ZNUM(d)].command))
@@ -386,10 +396,14 @@ void aedit_parse(struct descriptor_data * d, char *arg) {
  case AEDIT_CONFIRM_ADD:
    switch (*arg) {
-       case 'y': case 'Y':
+    case 'y':
    case 'Y':
      aedit_setup_new(d);
      break;
-       case 'n': case 'N': case 'q': case 'Q':
+    case 'n':
    case 'N':
    case 'q':
    case 'Q':
      cleanup_olc(d, CLEANUP_ALL);
      break;
    default:
@@ -402,12 +416,13 @@ void aedit_parse(struct descriptor_data * d, char *arg) {
  case AEDIT_MAIN_MENU:
    switch (*arg) {
-       case 'q': case 'Q':
+    case 'q':
    case 'Q':
      if (OLC_VAL(d)) { /* Something was modified */
        write_to_output(d, "Do you wish to save your changes? : ");
        OLC_MODE(d) = AEDIT_CONFIRM_SAVESTRING;
-         }
+      } else
-         else cleanup_olc(d, CLEANUP_ALL);
+        cleanup_olc(d, CLEANUP_ALL);
      break;
    case 'n':
      write_to_output(d, "Enter action name: ");
@@ -442,21 +457,24 @@ void aedit_parse(struct descriptor_data * d, char *arg) {
      aedit_disp_menu(d);
      OLC_VAL(d) = 1;
      break;
-       case 'a': case 'A':
+    case 'a':
    case 'A':
      write_to_output(d, "Enter social shown to the Character when there is no argument supplied.\r\n"
                      "[OLD]: %s\r\n"
                      "[NEW]: ",
                      ((OLC_ACTION(d)->char_no_arg) ? OLC_ACTION(d)->char_no_arg : "NULL"));
      OLC_MODE(d) = AEDIT_NOVICT_CHAR;
      return;
-       case 'b': case 'B':
+    case 'b':
    case 'B':
      write_to_output(d, "Enter social shown to Others when there is no argument supplied.\r\n"
                      "[OLD]: %s\r\n"
                      "[NEW]: ",
                      ((OLC_ACTION(d)->others_no_arg) ? OLC_ACTION(d)->others_no_arg : "NULL"));
      OLC_MODE(d) = AEDIT_NOVICT_OTHERS;
      return;
-       case 'c': case 'C':
+    case 'c':
    case 'C':
      write_to_output(d, "Enter text shown to the Character when his victim isnt found.\r\n"
                      "[OLD]: %s\r\n"
                      "[NEW]: ",
@@ -464,7 +482,8 @@ void aedit_parse(struct descriptor_data * d, char *arg) {
      OLC_MODE(d) = AEDIT_VICT_NOT_FOUND;
      return;
-       case 'd': case 'D':
+    case 'd':
    case 'D':
      write_to_output(d, "Enter social shown to the Character when it is its own victim.\r\n"
                      "[OLD]: %s\r\n"
                      "[NEW]: ",
@@ -472,7 +491,8 @@ void aedit_parse(struct descriptor_data * d, char *arg) {
      OLC_MODE(d) = AEDIT_SELF_CHAR;
      return;
-       case 'e': case 'E':
+    case 'e':
    case 'E':
      write_to_output(d, "Enter social shown to Others when the Char is its own victim.\r\n"
                      "[OLD]: %s\r\n"
                      "[NEW]: ",
@@ -480,7 +500,8 @@ void aedit_parse(struct descriptor_data * d, char *arg) {
      OLC_MODE(d) = AEDIT_SELF_OTHERS;
      return;
-       case 'f': case 'F':
+    case 'f':
    case 'F':
      write_to_output(d, "Enter normal social shown to the Character when the victim is found.\r\n"
                      "[OLD]: %s\r\n"
                      "[NEW]: ",
@@ -488,7 +509,8 @@ void aedit_parse(struct descriptor_data * d, char *arg) {
      OLC_MODE(d) = AEDIT_VICT_CHAR_FOUND;
      return;
-       case 'g': case 'G':
+    case 'g':
    case 'G':
      write_to_output(d, "Enter normal social shown to Others when the victim is found.\r\n"
                      "[OLD]: %s\r\n"
                      "[NEW]: ",
@@ -496,7 +518,8 @@ void aedit_parse(struct descriptor_data * d, char *arg) {
      OLC_MODE(d) = AEDIT_VICT_OTHERS_FOUND;
      return;
-       case 'h': case 'H':
+    case 'h':
    case 'H':
      write_to_output(d, "Enter normal social shown to the Victim when the victim is found.\r\n"
                      "[OLD]: %s\r\n"
                      "[NEW]: ",
@@ -504,7 +527,8 @@ void aedit_parse(struct descriptor_data * d, char *arg) {
      OLC_MODE(d) = AEDIT_VICT_VICT_FOUND;
      return;
-       case 'i': case 'I':
+    case 'i':
    case 'I':
      write_to_output(d, "Enter 'body part' social shown to the Character when the victim is found.\r\n"
                      "[OLD]: %s\r\n"
                      "[NEW]: ",
@@ -512,7 +536,8 @@ void aedit_parse(struct descriptor_data * d, char *arg) {
      OLC_MODE(d) = AEDIT_VICT_CHAR_BODY_FOUND;
      return;
-       case 'j': case 'J':
+    case 'j':
    case 'J':
      write_to_output(d, "Enter 'body part' social shown to Others when the victim is found.\r\n"
                      "[OLD]: %s\r\n"
                      "[NEW]: ",
@@ -520,7 +545,8 @@ void aedit_parse(struct descriptor_data * d, char *arg) {
      OLC_MODE(d) = AEDIT_VICT_OTHERS_BODY_FOUND;
      return;
-       case 'k': case 'K':
+    case 'k':
    case 'K':
      write_to_output(d, "Enter 'body part' social shown to the Victim when the victim is found.\r\n"
                      "[OLD]: %s\r\n"
                      "[NEW]: ",
@@ -528,7 +554,8 @@ void aedit_parse(struct descriptor_data * d, char *arg) {
      OLC_MODE(d) = AEDIT_VICT_VICT_BODY_FOUND;
      return;
-       case 'l': case 'L':
+    case 'l':
    case 'L':
      write_to_output(d, "Enter 'object' social shown to the Character when the object is found.\r\n"
                      "[OLD]: %s\r\n"
                      "[NEW]: ",
@@ -536,7 +563,8 @@ void aedit_parse(struct descriptor_data * d, char *arg) {
      OLC_MODE(d) = AEDIT_OBJ_CHAR_FOUND;
      return;
-       case 'm': case 'M':
+    case 'm':
    case 'M':
      write_to_output(d, "Enter 'object' social shown to the Room when the object is found.\r\n"
                      "[OLD]: %s\r\n"
                      "[NEW]: ",
@@ -818,4 +846,3 @@ static int aedit_find_command(const char *txt)
      return (cmd);
  return (-1);
 }
@@ -15,12 +15,8 @@
 #include "utils.h"
 #include "comm.h"
 #include "interpreter.h"
 #include "handler.h"
 #include "db.h"
 #include "spells.h"
 #include "house.h"
 #include "constants.h"
 #include "dg_scripts.h"
 #include "asciimap.h"
 /******************************************************************************
@@ -33,29 +29,28 @@
 #define DEFAULT_MAP_SIZE CONFIG_MAP_SIZE
-#define MAX_MAP_SIZE (CANVAS_WIDTH - 1)/4
+#define MAX_MAP_SIZE ((CANVAS_WIDTH - 1)/4)
 #define MAX_MAP      CANVAS_WIDTH
 #define MAX_MAP_DIR    10
 #define MAX_MAP_FOLLOW 10
 #define SECT_EMPTY                    30 /* anything greater than num sect types */
 #define SECT_STRANGE    (SECT_EMPTY + 1)
 #define SECT_HERE     (SECT_STRANGE + 1)
-#define DOOR_NS   -1
+#define DOOR_NS          (-1)
-#define DOOR_EW   -2
+#define DOOR_EW          (-2)
-#define DOOR_UP   -3
+#define DOOR_UP          (-3)
-#define DOOR_DOWN -4
+#define DOOR_DOWN        (-4)
-#define DOOR_DIAGNE      -5
+#define DOOR_DIAGNE      (-5)
-#define DOOR_DIAGNW      -6
+#define DOOR_DIAGNW      (-6)
-#define VDOOR_NS         -7
+#define VDOOR_NS         (-7)
-#define VDOOR_EW         -8
+#define VDOOR_EW         (-8)
-#define VDOOR_DIAGNE     -9
+#define VDOOR_DIAGNE     (-9)
-#define VDOOR_DIAGNW     -10
+#define VDOOR_DIAGNW     (-10)
-#define DOOR_UP_AND_NE   -11
+#define DOOR_UP_AND_NE   (-11)
-#define DOOR_DOWN_AND_SE -12
+#define DOOR_DOWN_AND_SE (-12)
-#define DOOR_NONE        -13
+#define DOOR_NONE        (-13)
 #define NUM_DOOR_TYPES 13
 #define MAP_CIRCLE    0
@@ -64,8 +59,6 @@
 #define MAP_NORMAL  0
 #define MAP_COMPACT 1
 static bool show_worldmap(struct char_data *ch);
 struct map_info_type
 {
  int sector_type;
@@ -192,9 +185,12 @@ static int door_offsets[6][2] ={ {-1, 0},{ 0, 1},{ 1, 0},{ 0, -1},{ -1, 1},{ 1,
 static int door_marks[6] = { DOOR_NS, DOOR_EW, DOOR_NS, DOOR_EW, DOOR_UP, DOOR_DOWN };
 */
 static int offsets[10][2] = {{-2, 0}, {0, 2}, {2, 0}, {0, -2}, {0, 0}, {0, 0}, {-2, -2}, {-2, 2}, {2, 2}, {2, -2}};
-static int offsets_worldmap[10][2] ={ {-1, 0},{ 0, 1},{ 1, 0},{ 0, -1},{0, 0},{ 0, 0},{ -1, -1},{ -1, 1},{1, 1},{ 1, -1} };
+static int offsets_worldmap[10][2] = {{-1, 0}, {0, 1}, {1, 0}, {0, -1}, {0, 0}, {0, 0}, {-1, -1}, {-1, 1}, {1, 1},
-static int door_offsets[10][2] ={ {-1, 0},{ 0, 1},{ 1, 0},{ 0, -1},{ -1, 1},{ 1, 1},{ -1, -1},{ -1, 1},{ 1, 1},{ 1, -1} };
+                                      {1, -1}};
-static int door_marks[10] = { DOOR_NS, DOOR_EW, DOOR_NS, DOOR_EW, DOOR_UP, DOOR_DOWN, DOOR_DIAGNW, DOOR_DIAGNE, DOOR_DIAGNW, DOOR_DIAGNE};
+static int door_offsets[10][2] = {{-1, 0}, {0, 1}, {1, 0}, {0, -1}, {-1, 1}, {1, 1}, {-1, -1}, {-1, 1}, {1, 1},
                                  {1, -1}};
 static int door_marks[10] = {DOOR_NS, DOOR_EW, DOOR_NS, DOOR_EW, DOOR_UP, DOOR_DOWN, DOOR_DIAGNW, DOOR_DIAGNE,
                             DOOR_DIAGNW, DOOR_DIAGNE};
 static int vdoor_marks[4] = {VDOOR_NS, VDOOR_EW, VDOOR_NS, VDOOR_EW};
 /******************************************************************************
 * End Local (File Scope) Defines and Global Variables
@@ -203,33 +199,36 @@ static int vdoor_marks[4] = { VDOOR_NS, VDOOR_EW, VDOOR_NS, VDOOR_EW };
 /******************************************************************************
 * Begin Local (File Scope) Function Prototypes
 *****************************************************************************/
-static void MapArea(room_rnum room, struct char_data *ch, int x, int y, int min, int max, sh_int xpos, sh_int ypos, bool worldmap);
+static void MapArea(room_rnum room, const char_data *ch, int x, int y, int min, int max, int xpos, int ypos,
                    bool worldmap);
 static char *StringMap(int centre, int size);
 static char *WorldMap(int centre, int size, int mapshape, int maptype);
 static char *CompactStringMap(int centre, int size);
-static void perform_map( struct char_data *ch, char *argument, bool worldmap );
+static void perform_map(char_data *ch, char *argument, bool worldmap);
 static bool show_worldmap(const char_data *ch);
 /******************************************************************************
 * End Local (File Scope) Function Prototypes
 *****************************************************************************/
-bool can_see_map(struct char_data *ch) {
+bool can_see_map(const char_data *ch)
 {
  /* Is the map funcionality disabled? */
-  if (CONFIG_MAP == MAP_OFF)
+  if (CONFIG_MAP == MAP_OFF || (CONFIG_MAP == MAP_IMM_ONLY && GET_LEVEL(ch) < LVL_IMMORT))
    return FALSE;
  else if ((CONFIG_MAP == MAP_IMM_ONLY) && (GET_LEVEL(ch) < LVL_IMMORT))
    return FALSE;
  return TRUE;
 }
 /* MapArea function - create the actual map */
-static void MapArea(room_rnum room, struct char_data *ch, int x, int y, int min, int max, sh_int xpos, sh_int ypos, bool worldmap)
+static void MapArea(const room_rnum room, const char_data *ch, const int x, const int y, // NOLINT(*-no-recursion)
  const int min, const int max, const int xpos, const int ypos, const bool worldmap)
 {
  room_rnum prospect_room;
  struct room_direction_data *pexit;
-  int door, ew_size=0, ns_size=0, x_exit_pos=0, y_exit_pos=0;
+  int door;
-  sh_int prospect_xpos, prospect_ypos;
+  const int ew_size = 0, ns_size = 0, x_exit_pos = 0, y_exit_pos = 0;
  int prospect_xpos, prospect_ypos;
  if (map[x][y] < 0)
    return; /* this is a door */
@@ -240,56 +239,74 @@ static void MapArea(room_rnum room, struct char_data *ch, int x, int y, int min,
  else
    map[x][y] = SECT(room);
-  if ( (x < min) || ( y < min) || ( x > max ) || ( y > max) ) return;
+  if (x < min || y < min || x > max || y > max)
    return;
  /* Check for exits */
  for (door = 0; door < MAX_MAP_DIR; door++) {
-    if( door < MAX_MAP_FOLLOW &&
+    if (xpos + door_offsets[door][0] >= 0 &&
        xpos+door_offsets[door][0] >= 0 &&
        xpos + door_offsets[door][0] <= ns_size &&
        ypos + door_offsets[door][1] >= 0 &&
-        ypos+door_offsets[door][1] <= ew_size)
+        ypos + door_offsets[door][1] <= ew_size) { /* Virtual exit */
-    { /* Virtual exit */
+      // linting tells me vdoor_marks will have an index out of bounds here, since doors can have more values than
-
+      // vdoor_marks contains. Either we're not actually getting here for those values, or we're not getting here at all.
      // Adding a guard for now. --welcor 20241230
      if (door < sizeof(vdoor_marks))
        map[x + door_offsets[door][0]][y + door_offsets[door][1]] = vdoor_marks[door];
      if (map[x + offsets[door][0]][y + offsets[door][1]] == SECT_EMPTY)
-        MapArea(room,ch,x + offsets[door][0], y + offsets[door][1], min, max, xpos+door_offsets[door][0], ypos+door_offsets[door][1], worldmap);
+        MapArea(room, ch, x + offsets[door][0], y + offsets[door][1], min, max, xpos + door_offsets[door][0],
                ypos + door_offsets[door][1], worldmap);
      continue;
    }
    if ((pexit = world[room].dir_option[door]) != NULL &&
-         (pexit->to_room > 0 ) && (pexit->to_room != NOWHERE) &&
+        pexit->to_room > 0 && pexit->to_room != NOWHERE &&
-         (!IS_SET(pexit->exit_info, EX_CLOSED)) &&
+        !IS_SET(pexit->exit_info, EX_CLOSED) &&
-         (!IS_SET(pexit->exit_info, EX_HIDDEN) || PRF_FLAGGED(ch, PRF_HOLYLIGHT)) )
+        (!IS_SET(pexit->exit_info, EX_HIDDEN) || PRF_FLAGGED(ch, PRF_HOLYLIGHT))) { /* A real exit */
    { /* A real exit */
      /* But is the door here... */
      switch (door) {
      case NORTH:
-        if(xpos > 0 || ypos!=y_exit_pos) continue;
+        if (xpos > 0 || ypos != y_exit_pos)
          continue;
        break;
      case SOUTH:
-        if(xpos < ns_size || ypos!=y_exit_pos) continue;
+        if (xpos < ns_size || ypos != y_exit_pos)
          continue;
        break;
      case EAST:
-        if(ypos < ew_size || xpos!=x_exit_pos) continue;
+        if (ypos < ew_size || xpos != x_exit_pos)
          continue;
        break;
      case WEST:
-        if(ypos > 0 || xpos!=x_exit_pos) continue;
+        if (ypos > 0 || xpos != x_exit_pos)
          continue;
        break;
      case NORTHWEST:
-        if(xpos > 0 || ypos!=y_exit_pos || ypos > 0 || xpos!=x_exit_pos) continue;
+        if (xpos > 0 || ypos != y_exit_pos || ypos > 0 || xpos != x_exit_pos)
          continue;
        break;
      case NORTHEAST:
-        if(xpos > 0 || ypos!=y_exit_pos || ypos < ew_size || xpos!=x_exit_pos) continue;
+        if (xpos > 0 || ypos != y_exit_pos || ypos < ew_size || xpos != x_exit_pos)
          continue;
        break;
      case SOUTHEAST:
-        if(xpos < ns_size || ypos!=y_exit_pos || ypos < ew_size || xpos!=x_exit_pos) continue;
+        if (xpos < ns_size || ypos != y_exit_pos || ypos < ew_size || xpos != x_exit_pos)
          continue;
        break;
      case SOUTHWEST:
-        if(xpos < ns_size || ypos!=y_exit_pos || ypos > 0 || xpos!=x_exit_pos) continue;
+        if (xpos < ns_size || ypos != y_exit_pos || ypos > 0 || xpos != x_exit_pos)
          continue;
        break;
      case UP:
      case DOWN:
        /* no check for up/down here */
        break;
      default:
        log("Default case reached in switch in door check in asciimap. "
            "Are any directions unaccounted for? door = %d", door);
      }
@@ -304,16 +321,16 @@ static void MapArea(room_rnum room, struct char_data *ch, int x, int y, int min,
      }
      if (!worldmap) {
-        if ((map[x+door_offsets[door][0]][y+door_offsets[door][1]] == DOOR_NONE) ||
+        if (map[x + door_offsets[door][0]][y + door_offsets[door][1]] == DOOR_NONE ||
-            (map[x+door_offsets[door][0]][y+door_offsets[door][1]] == SECT_EMPTY)  ) {
+            map[x + door_offsets[door][0]][y + door_offsets[door][1]] == SECT_EMPTY) {
          map[x + door_offsets[door][0]][y + door_offsets[door][1]] = door_marks[door];
        } else {
-          if ( ((door == NORTHEAST) && (map[x+door_offsets[door][0]][y+door_offsets[door][1]] == DOOR_UP)) ||
+          if ((door == NORTHEAST && map[x + door_offsets[door][0]][y + door_offsets[door][1]] == DOOR_UP) ||
-               ((door == UP) && (map[x+door_offsets[door][0]][y+door_offsets[door][1]] == DOOR_DIAGNE))  ) {
+              (door == UP && map[x + door_offsets[door][0]][y + door_offsets[door][1]] == DOOR_DIAGNE)) {
            map[x + door_offsets[door][0]][y + door_offsets[door][1]] = DOOR_UP_AND_NE;
-          }
+          } else if ((door == SOUTHEAST && map[x + door_offsets[door][0]][y + door_offsets[door][1]] == DOOR_DOWN)
-          else if ( ((door == SOUTHEAST) && (map[x+door_offsets[door][0]][y+door_offsets[door][1]] == DOOR_DOWN)) ||
+                     ||
-                    ((door == DOWN) && (map[x+door_offsets[door][0]][y+door_offsets[door][1]] == DOOR_DIAGNW))  ) {
+                     (door == DOWN && map[x + door_offsets[door][0]][y + door_offsets[door][1]] == DOOR_DIAGNW)) {
            map[x + door_offsets[door][0]][y + door_offsets[door][1]] = DOOR_DOWN_AND_SE;
          }
        }
@@ -338,21 +355,29 @@ static void MapArea(room_rnum room, struct char_data *ch, int x, int y, int min,
        prospect_xpos = world[prospect_room].dir_option[rev_dir[door]] ? x_exit_pos : ns_size / 2;
        prospect_ypos = world[prospect_room].dir_option[rev_dir[door]] ? y_exit_pos : ew_size / 2;
        break;
      case UP:
      case DOWN:
        /* no check for up/down here */
        break;
      default:
        log("Default case reached in prospect switch in asciimap. Are any directions unaccounted for? door = %d", door);
      }
      if (worldmap) {
- if ( door < MAX_MAP_FOLLOW && map[x+offsets_worldmap[door][0]][y+offsets_worldmap[door][1]] == SECT_EMPTY )
+        if (map[x + offsets_worldmap[door][0]][y + offsets_worldmap[door][1]] == SECT_EMPTY)
-   MapArea(pexit->to_room,ch,x + offsets_worldmap[door][0], y + offsets_worldmap[door][1], min, max, prospect_xpos, prospect_ypos, worldmap);
+          MapArea(pexit->to_room, ch, x + offsets_worldmap[door][0], y + offsets_worldmap[door][1], min, max,
                  prospect_xpos, prospect_ypos, worldmap);
      } else {
- if ( door < MAX_MAP_FOLLOW && map[x+offsets[door][0]][y+offsets[door][1]] == SECT_EMPTY )
+        if (map[x + offsets[door][0]][y + offsets[door][1]] == SECT_EMPTY)
-   MapArea(pexit->to_room,ch,x + offsets[door][0], y + offsets[door][1], min, max, prospect_xpos, prospect_ypos, worldmap);
+          MapArea(pexit->to_room, ch, x + offsets[door][0], y + offsets[door][1], min, max, prospect_xpos,
                  prospect_ypos, worldmap);
      }
    } /* end if exit there */
  }
  return;
 }
 /* Returns a string representation of the map */
 // ReSharper disable once CppDFAConstantParameter
 static char *StringMap(int centre, int size)
 {
  static char strmap[MAX_MAP * MAX_MAP * 11 + MAX_MAP * 2 + 1];
@@ -365,9 +390,7 @@ static char *StringMap(int centre, int size)
    /* every column */
    for (y = centre - CANVAS_WIDTH / 6; y <= centre + CANVAS_WIDTH / 6; y++) {
      if (abs(centre - x) <= size && abs(centre - y) <= size)
-        tmp = (map[x][y]<0) ? \
+        tmp = map[x][y] < 0 ? door_info[NUM_DOOR_TYPES + map[x][y]].disp : map_info[map[x][y]].disp;
       door_info[NUM_DOOR_TYPES + map[x][y]].disp : \
       map_info[map[x][y]].disp ;
      else
        tmp = map_info[SECT_EMPTY].disp;
      strcpy(mp, tmp);
@@ -380,6 +403,7 @@ static char *StringMap(int centre, int size)
  return strmap;
 }
 // ReSharper disable once CppDFAConstantParameter
 static char *WorldMap(int centre, int size, int mapshape, int maptype)
 {
  static char strmap[MAX_MAP * MAX_MAP * 4 + MAX_MAP * 2 + 1];
@@ -387,14 +411,12 @@ static char *WorldMap(int centre, int size, int mapshape, int maptype )
  int x, y;
  int xmin, xmax, ymin, ymax;
-  switch(maptype) {
+  if (maptype == MAP_COMPACT) {
    case MAP_COMPACT:
    xmin = centre - size;
    xmax = centre + size;
    ymin = centre - 2 * size;
    ymax = centre + 2 * size;
-      break;
+  } else {
    default:
    xmin = centre - CANVAS_HEIGHT / 2;
    xmax = centre + CANVAS_HEIGHT / 2;
    ymin = centre - CANVAS_WIDTH / 2;
@@ -410,7 +432,8 @@ static char *WorldMap(int centre, int size, int mapshape, int maptype )
    for (y = ymin; y <= ymax; y++) {
      if ((mapshape == MAP_RECTANGLE && abs(centre - y) <= size * 2 && abs(centre - x) <= size) ||
-   ((mapshape == MAP_CIRCLE) && (centre-x)*(centre-x) + (centre-y)*(centre-y)/4 <= (size * size + 1))) {
+          (mapshape == MAP_CIRCLE && (centre - x) * (centre - x) + (centre - y) * (centre - y) / 4 <= size * size +
           1)) {
        strcpy(mp, world_map_info[map[x][y]].disp);
        mp += strlen(world_map_info[map[x][y]].disp);
      } else {
@@ -424,6 +447,7 @@ static char *WorldMap(int centre, int size, int mapshape, int maptype )
  return strmap;
 }
 // ReSharper disable once CppDFAConstantParameter
 static char *CompactStringMap(int centre, int size)
 {
  static char strmap[MAX_MAP * MAX_MAP * 12 + MAX_MAP * 2 + 1];
@@ -434,12 +458,8 @@ static char *CompactStringMap(int centre, int size)
  for (x = centre - size; x <= centre + size; x++) {
    /* every column */
    for (y = centre - size; y <= centre + size; y++) {
-      strcpy(mp, (map[x][y]<0) ? \
+      strcpy(mp, map[x][y] < 0 ? compact_door_info[NUM_DOOR_TYPES + map[x][y]].disp : map_info[map[x][y]].disp);
-       compact_door_info[NUM_DOOR_TYPES + map[x][y]].disp : \
+      mp += strlen(map[x][y] < 0 ? compact_door_info[NUM_DOOR_TYPES + map[x][y]].disp : map_info[map[x][y]].disp);
       map_info[map[x][y]].disp);
      mp += strlen((map[x][y]<0) ? \
       compact_door_info[NUM_DOOR_TYPES + map[x][y]].disp : \
       map_info[map[x][y]].disp);
    }
    strcpy(mp, "\r\n");
    mp += 2;
@@ -449,24 +469,25 @@ static char *CompactStringMap(int centre, int size)
 }
 /* Display a nicely formatted map with a legend */
-static void perform_map( struct char_data *ch, char *argument, bool worldmap )
+static void perform_map(char_data *ch, char *argument, bool worldmap)
 {
  int size = DEFAULT_MAP_SIZE;
  int centre, x, y, min, max;
-  char arg1[MAX_INPUT_LENGTH], arg2[MAX_INPUT_LENGTH], buf[MAX_STRING_LENGTH], buf1[MAX_STRING_LENGTH], buf2[MAX_STRING_LENGTH];
+  char arg1[MAX_INPUT_LENGTH], arg2[MAX_INPUT_LENGTH], buf[MAX_STRING_LENGTH], buf1[MAX_STRING_LENGTH], buf2[
         MAX_STRING_LENGTH];
  int count = 0;
-  int ew_size=0, ns_size=0;
+  const int ew_size = 0, ns_size = 0;
  int mapshape = MAP_CIRCLE;
  two_arguments(argument, arg1, arg2);
-  if(*arg1)
+  if (*arg1) {
-  {
+    size = parse_int(arg1);
    size = atoi(arg1);
  }
-  if (*arg2)
+  if (*arg2) {
-  {
+    if (is_abbrev(arg2, "normal"))
-    if (is_abbrev(arg2, "normal")) worldmap=FALSE;
+      worldmap = FALSE;
-    else if (is_abbrev(arg2, "world")) worldmap=TRUE;
+    else if (is_abbrev(arg2, "world"))
      worldmap = TRUE;
    else {
      send_to_char(ch, "Usage: \tymap <distance> [ normal | world ]\tn");
      return;
@@ -492,7 +513,7 @@ static void perform_map( struct char_data *ch, char *argument, bool worldmap )
  /* Blank the map */
  for (x = 0; x < MAX_MAP; ++x)
    for (y = 0; y < MAX_MAP; ++y)
-           map[x][y]= (!(y%2) && !worldmap) ? DOOR_NONE : SECT_EMPTY;
+      map[x][y] = !(y % 2) && !worldmap ? DOOR_NONE : SECT_EMPTY;
  /* starts the mapping with the centre room */
  MapArea(IN_ROOM(ch), ch, centre, centre, min, max, ns_size / 2, ew_size / 2, worldmap);
@@ -503,7 +524,7 @@ static void perform_map( struct char_data *ch, char *argument, bool worldmap )
  /* Feel free to put your own MUD name or header in here */
  send_to_char(ch, " \tY-\tytbaMUD Map System\tY-\tn\r\n"
               "\tD  .-.__--.,--.__.-.\tn\r\n");
-
+// TODO switch to snprintf
  count += sprintf(buf + count, "\tn\tn\tn%s Up\\\\", door_info[NUM_DOOR_TYPES + DOOR_UP].disp);
  count += sprintf(buf + count, "\tn\tn\tn%s Down\\\\", door_info[NUM_DOOR_TYPES + DOOR_DOWN].disp);
  count += sprintf(buf + count, "\tn%s You\\\\", map_info[SECT_HERE].disp);
@@ -528,7 +549,7 @@ static void perform_map( struct char_data *ch, char *argument, bool worldmap )
  /* Set up the map */
  memset(buf, ' ', CANVAS_WIDTH);
-  count = (CANVAS_WIDTH);
+  count = CANVAS_WIDTH;
  if (worldmap)
    count += sprintf(buf + count, "\r\n%s", WorldMap(centre, size, mapshape, MAP_NORMAL));
  else
@@ -543,11 +564,11 @@ static void perform_map( struct char_data *ch, char *argument, bool worldmap )
  send_to_char(ch, "%s", buf2);
  send_to_char(ch, "\tD `.-.__--.,-.__.-.-'\tn\r\n");
  return;
 }
 /* Display a string with the map beside it */
-void str_and_map(char *str, struct char_data *ch, room_vnum target_room ) {
+void str_and_map(char *str, char_data *ch, room_vnum target_room)
 {
  int size, centre, x, y, min, max, char_size;
  int ew_size = 0, ns_size = 0;
  bool worldmap;
@@ -572,7 +593,7 @@ void str_and_map(char *str, struct char_data *ch, room_vnum target_room ) {
  for (x = 0; x < MAX_MAP; ++x)
    for (y = 0; y < MAX_MAP; ++y)
-      map[x][y]= (!(y%2) && !worldmap) ? DOOR_NONE : SECT_EMPTY;
+      map[x][y] = !(y % 2) && !worldmap ? DOOR_NONE : SECT_EMPTY;
  /* starts the mapping with the center room */
  MapArea(target_room, ch, centre, centre, min, max, ns_size / 2, ew_size / 2, worldmap);
@@ -582,26 +603,32 @@ MapArea(target_room, ch, centre, centre, min, max, ns_size/2, ew_size/2, worldma
  if (worldmap)
    char_size = size * 4 + 5;
  else
-    char_size = 3*(size+1) + (size) + 4;
+    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(strfrmt(str, GET_SCREEN_WIDTH(ch) - char_size, size * 2 + 1, FALSE, TRUE, TRUE),
                                    WorldMap(centre, size, MAP_CIRCLE, MAP_COMPACT), " \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(strfrmt(str, GET_SCREEN_WIDTH(ch) - char_size, size * 2 + 1, FALSE, TRUE, TRUE),
                                    CompactStringMap(centre, size), " \tn"));
 }
-static bool show_worldmap(struct char_data *ch) {
+static bool show_worldmap(const char_data *ch)
 {
  room_rnum rm = IN_ROOM(ch);
  zone_rnum zn = GET_ROOM_ZONE(rm);
-  if (ROOM_FLAGGED(rm, ROOM_WORLDMAP)) return TRUE;
+  if (ROOM_FLAGGED(rm, ROOM_WORLDMAP))
-  if (ZONE_FLAGGED(zn, ZONE_WORLDMAP)) return TRUE;
+    return TRUE;
  if (ZONE_FLAGGED(zn, ZONE_WORLDMAP))
    return TRUE;
  return FALSE;
 }
-ACMD(do_map) {
+ACMD(do_map)
 {
  if (!can_see_map(ch)) {
    send_to_char(ch, "Sorry, the map is disabled!\r\n");
    return;
@@ -16,8 +16,8 @@
 #define MAP_IMM_ONLY 2
 /* Exported function prototypes */
-bool can_see_map(struct char_data *ch);
+bool can_see_map(const char_data *ch);
-void str_and_map(char *str, struct char_data *ch, room_vnum target_room );
+void str_and_map(char *str, char_data *ch, room_vnum target_room);
 ACMD(do_map);
 #endif /* ASCIIMAP_H_*/
@@ -14,7 +14,6 @@
 #include "utils.h"
 #include "comm.h"
 #include "interpreter.h"
 #include "handler.h"
 #include "db.h"
 #include "ban.h"
@@ -28,7 +27,7 @@ static char *invalid_list[MAX_INVALID_NAMES];
 /* local utility functions */
 static void write_ban_list(void);
-static void _write_one_node(FILE *fp, struct ban_list_element *node);
+static void write_one_node(FILE *fp, struct ban_list_element *node);
 static const char *ban_types[] = {
    "no",
@@ -41,27 +40,27 @@ static const char *ban_types[] = {
 void load_banned(void)
 {
  FILE *fl;
-  int i, date;
+  int i;
  char site_name[BANNED_SITE_LENGTH + 1], ban_type[100];
-  char name[MAX_NAME_LENGTH + 1];
+  char name[MAX_NAME_LENGTH + 1], date_str[30];
  struct ban_list_element *next_node;
  ban_list = 0;
-  if (!(fl = fopen(BAN_FILE, "r"))) {
+  if ((fl = fopen(BAN_FILE, "r")) != NULL) {
    if (errno != ENOENT) {
      log("SYSERR: Unable to open banfile '%s': %s", BAN_FILE, strerror(errno));
    } else
      log("   Ban file '%s' doesn't exist.", BAN_FILE);
    return;
  }
-  while (fscanf(fl, " %s %s %d %s ", ban_type, site_name, &date, name) == 4) {
+  while (fscanf(fl, " %s %s %s %s ", ban_type, site_name, date_str, name) == 4) {
    CREATE(next_node, struct ban_list_element, 1);
    strncpy(next_node->site, site_name, BANNED_SITE_LENGTH); /* strncpy: OK (n_n->site:BANNED_SITE_LENGTH+1) */
    next_node->site[BANNED_SITE_LENGTH] = '\0';
    strncpy(next_node->name, name, MAX_NAME_LENGTH); /* strncpy: OK (n_n->name:MAX_NAME_LENGTH+1) */
    next_node->name[MAX_NAME_LENGTH] = '\0';
-    next_node->date = date;
+    next_node->date = parse_int(date_str);
    for (i = BAN_NOT; i <= BAN_ALL; i++)
      if (!strcmp(ban_type, ban_types[i]))
@@ -81,7 +80,7 @@ int isbanned(char *hostname)
  char *nextchar;
  if (!hostname || !*hostname)
-    return (0);
+    return 0;
  i = 0;
  for (nextchar = hostname; *nextchar; nextchar++)
@@ -91,15 +90,15 @@ int isbanned(char *hostname)
    if (strstr(hostname, banned_node->site)) /* if hostname is a substring */
      i = MAX(i, banned_node->type);
-  return (i);
+  return i;
 }
-static void _write_one_node(FILE *fp, struct ban_list_element *node)
+static void write_one_node(FILE *fp, struct ban_list_element *node) // NOLINT(*-no-recursion)
 {
  if (node) {
-    _write_one_node(fp, node->next);
+    write_one_node(fp, node->next);
    fprintf(fp, "%s %s %ld %s\n", ban_types[node->type],
-	    node->site, (long) node->date, node->name);
+            node->site, node->date, node->name);
  }
 }
@@ -107,13 +106,12 @@ static void write_ban_list(void)
 {
  FILE *fl;
-  if (!(fl = fopen(BAN_FILE, "w"))) {
+  if ((fl = fopen(BAN_FILE, "w")) == NULL) {
    perror("SYSERR: Unable to open '" BAN_FILE "' for writing");
    return;
  }
-  _write_one_node(fl, ban_list);/* recursively write from end to start */
+  write_one_node(fl, ban_list); /* recursively write from end to start */
  fclose(fl);
  return;
 }
 #define BAN_LIST_FORMAT "%-25.25s  %-8.8s  %-15.15s  %-16.16s\r\n"
@@ -216,6 +214,7 @@ ACMD(do_unban)
  REMOVE_FROM_LIST(ban_node, ban_list, next);
  send_to_char(ch, "Site unbanned.\r\n");
  mudlog(NRM, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE, "%s removed the %s-player ban on %s.",
         // ReSharper disable once CppDFANullDereference
         GET_NAME(ch), ban_types[ban_node->type], ban_node->site);
  free(ban_node);
@@ -223,12 +222,11 @@ ACMD(do_unban)
 }
 /* Check for invalid names (i.e., profanity, etc.) Written by Sharon P Garza. */
-int valid_name(char *newname)
+int valid_name(const char *newname)
 {
  int i, vowels = 0;
-  struct descriptor_data *dt;
+  descriptor_data *dt;
  char tempname[MAX_INPUT_LENGTH];
  /* Make sure someone isn't trying to create this same name.  We want to do a 
@@ -290,7 +288,7 @@ void read_invalid_list(void)
  FILE *fp;
  char temp[256];
-  if (!(fp = fopen(XNAME_FILE, "r"))) {
+  if ((fp = fopen(XNAME_FILE, "r")) != NULL) {
    perror("SYSERR: Unable to open '" XNAME_FILE "' for reading");
    return;
  }
@@ -37,7 +37,7 @@ struct ban_list_element {
 /* Utility Functions */
 void load_banned(void);
 int isbanned(char *hostname);
-int valid_name(char *newname);
+int valid_name(const char *newname);
 void read_invalid_list(void);
 void free_invalid_list(void);
 /* Command functions without subcommands */
@@ -63,7 +63,7 @@ static struct board_msginfo msg_index[NUM_OF_BOARDS][MAX_BOARD_MESSAGES];
 /* local static utility functions */
 static int find_slot(void);
-static int find_board(struct char_data *ch);
+static int find_board(const char_data *ch);
 static void init_boards(void);
 static void board_reset_board(int board_type);
 static void board_clear_board(int board_type);
@@ -75,29 +75,29 @@ static int find_slot(void)
  for (i = 0; i < INDEX_SIZE; i++)
    if (!msg_storage_taken[i]) {
      msg_storage_taken[i] = 1;
-      return (i);
+      return i;
    }
-  return (-1);
+  return -1;
 }
 /* search the room ch is standing in to find which board he's looking at */
-static int find_board(struct char_data *ch)
+static int find_board(const char_data *ch)
 {
-  struct obj_data *obj;
+  obj_data *obj;
  int i;
  for (obj = world[IN_ROOM(ch)].contents; obj; obj = obj->next_content)
    for (i = 0; i < NUM_OF_BOARDS; i++)
      if (BOARD_RNUM(i) == GET_OBJ_RNUM(obj))
-	return (i);
+        return i;
  if (GET_LEVEL(ch) >= LVL_IMMORT)
    for (obj = ch->carrying; obj; obj = obj->next_content)
      for (i = 0; i < NUM_OF_BOARDS; i++)
        if (BOARD_RNUM(i) == GET_OBJ_RNUM(obj))
-          return (i);
+          return i;
-  return (-1);
+  return -1;
 }
 static void init_boards(void)
@@ -117,7 +117,7 @@ static void init_boards(void)
    }
    num_of_msgs[i] = 0;
    for (j = 0; j < MAX_BOARD_MESSAGES; j++) {
-      memset((char *) &(msg_index[i][j]), 0, sizeof(struct board_msginfo));
+      memset((char *)&msg_index[i][j], 0, sizeof(struct board_msginfo));
      msg_index[i][j].slot_num = -1;
    }
    board_load_board(i);
@@ -131,7 +131,7 @@ SPECIAL(gen_board)
 {
  int board_type;
  static int loaded = 0;
-  struct obj_data *board = (struct obj_data *)me;
+  obj_data *board = (obj_data *)me;
  /* These were originally globals for some unknown reason. */
  int ACMD_READ, ACMD_LOOK, ACMD_EXAMINE, ACMD_WRITE, ACMD_REMOVE;
@@ -141,7 +141,7 @@ SPECIAL(gen_board)
    loaded = 1;
  }
  if (!ch->desc)
-    return (0);
+    return 0;
  ACMD_READ = find_command("read");
  ACMD_WRITE = find_command("write");
@@ -151,41 +151,42 @@ SPECIAL(gen_board)
  if (cmd != ACMD_WRITE && cmd != ACMD_LOOK && cmd != ACMD_EXAMINE &&
      cmd != ACMD_READ && cmd != ACMD_REMOVE)
-    return (0);
+    return 0;
  if ((board_type = find_board(ch)) == -1) {
    log("SYSERR:  degenerate board!  (what the hell...)");
-    return (0);
+    return 0;
  }
  if (cmd == ACMD_WRITE)
-    return (board_write_message(board_type, ch, argument, board));
+    return board_write_message(board_type, ch, argument, board);
-  else if (cmd == ACMD_LOOK || cmd == ACMD_EXAMINE)
+  if (cmd == ACMD_LOOK || cmd == ACMD_EXAMINE)
-    return (board_show_board(board_type, ch, argument, board));
+    return board_show_board(board_type, ch, argument, board);
-  else if (cmd == ACMD_READ)
+  if (cmd == ACMD_READ)
-    return (board_display_msg(board_type, ch, argument, board));
+    return board_display_msg(board_type, ch, argument, board);
-  else if (cmd == ACMD_REMOVE)
+  if (cmd == ACMD_REMOVE)
-    return (board_remove_msg(board_type, ch, argument, board));
+    return board_remove_msg(board_type, ch, argument, board);
-  else
+
-    return (0);
+  return 0;
 }
-int board_write_message(int board_type, struct char_data *ch, char *arg, struct obj_data *board)
+// ReSharper disable once CppDFAConstantFunctionResult
 int board_write_message(int board_type, char_data *ch, char *arg, obj_data *board)
 {
  time_t ct;
  char buf[MAX_INPUT_LENGTH], buf2[MAX_NAME_LENGTH + 3], tmstr[100];
  if (GET_LEVEL(ch) < WRITE_LVL(board_type)) {
    send_to_char(ch, "You are not holy enough to write on this board.\r\n");
-    return (1);
+    return 1;
  }
  if (num_of_msgs[board_type] >= MAX_BOARD_MESSAGES) {
    send_to_char(ch, "The board is full.\r\n");
-    return (1);
+    return 1;
  }
  if ((NEW_MSG_INDEX(board_type).slot_num = find_slot()) == -1) {
    send_to_char(ch, "The board is malfunctioning - sorry.\r\n");
    log("SYSERR: Board: failed to find empty slot on write.");
-    return (1);
+    return 1;
  }
  /* skip blanks */
  skip_spaces(&arg);
@@ -196,7 +197,7 @@ int board_write_message(int board_type, struct char_data *ch, char *arg, struct
  if (!*arg) {
    send_to_char(ch, "We must have a headline!\r\n");
-    return (1);
+    return 1;
  }
  ct = time(0);
  strftime(tmstr, sizeof(tmstr), "%a %b %d %Y", localtime(&ct));
@@ -204,40 +205,41 @@ int board_write_message(int board_type, struct char_data *ch, char *arg, struct
  snprintf(buf2, sizeof(buf2), "(%s)", GET_NAME(ch));
  snprintf(buf, sizeof(buf), "%s %-12s :: %s", tmstr, buf2, arg);
  NEW_MSG_INDEX(board_type).heading = strdup(buf);
-  NEW_MSG_INDEX(board_type).level = GET_LEVEL(ch);
+  NEW_MSG_INDEX(board_type).level = (int)GET_LEVEL(ch);
  send_to_char(ch, "Write your message.\r\n");
  send_editor_help(ch->desc);
  act("$n starts to write a message.", TRUE, ch, 0, 0, TO_ROOM);
-  string_write(ch->desc, &(msg_storage[NEW_MSG_INDEX(board_type).slot_num]),
+  string_write(ch->desc, &msg_storage[NEW_MSG_INDEX(board_type).slot_num],
               MAX_MESSAGE_LENGTH, board_type + BOARD_MAGIC, NULL);
  num_of_msgs[board_type]++;
-  return (1);
+  return 1;
 }
-int board_show_board(int board_type, struct char_data *ch, char *arg, struct obj_data *board)
+int board_show_board(int board_type, char_data *ch, char *arg, obj_data *board)
 {
  int i;
  char tmp[MAX_STRING_LENGTH], buf[MAX_STRING_LENGTH];
  if (!ch->desc)
-    return (0);
+    return 0;
  one_argument(arg, tmp);
  if (!*tmp || !isname(tmp, board->name))
-    return (0);
+    return 0;
  if (GET_LEVEL(ch) < READ_LVL(board_type)) {
    send_to_char(ch, "You try but fail to understand the holy words.\r\n");
-    return (1);
+    return 1;
  }
  act("$n studies the board.", TRUE, ch, 0, 0, TO_ROOM);
  if (!num_of_msgs[board_type])
-    send_to_char(ch, "This is a bulletin board.  Usage: READ/REMOVE <messg #>, WRITE <header>.\r\nThe board is empty.\r\n");
+    send_to_char(
        ch, "This is a bulletin board.  Usage: READ/REMOVE <messg #>, WRITE <header>.\r\nThe board is empty.\r\n");
  else {
    size_t len = 0;
    int nlen;
@@ -270,40 +272,40 @@ int board_show_board(int board_type, struct char_data *ch, char *arg, struct obj
 #endif
    page_string(ch->desc, buf, TRUE);
  }
-  return (1);
+  return 1;
 fubar:
  log("SYSERR: Board %d is fubar'd.", board_type);
  send_to_char(ch, "Sorry, the board isn't working.\r\n");
-  return (1);
+  return 1;
 }
-int board_display_msg(int board_type, struct char_data *ch, char *arg, struct obj_data *board)
+int board_display_msg(int board_type, char_data *ch, char *arg, obj_data *board)
 {
  char number[MAX_INPUT_LENGTH], buffer[MAX_STRING_LENGTH];
  int msg, ind;
  one_argument(arg, number);
  if (!*number)
-    return (0);
+    return 0;
  if (isname(number, board->name)) /* so "read board" works */
-    return (board_show_board(board_type, ch, arg, board));
+    return board_show_board(board_type, ch, arg, board);
  if (!is_number(number)) /* read 2.mail, look 2.sword */
-    return (0);
+    return 0;
-  if (!(msg = atoi(number)))
+  if ((msg = parse_int(number)) == 0)
-    return (0);
+    return 0;
  if (GET_LEVEL(ch) < READ_LVL(board_type)) {
    send_to_char(ch, "You try but fail to understand the holy words.\r\n");
-    return (1);
+    return 1;
  }
  if (!num_of_msgs[board_type]) {
    send_to_char(ch, "The board is empty!\r\n");
-    return (1);
+    return 1;
  }
  if (msg < 1 || msg > num_of_msgs[board_type]) {
    send_to_char(ch, "That message exists only in your imagination.\r\n");
-    return (1);
+    return 1;
  }
 #if NEWEST_AT_TOP
  ind = num_of_msgs[board_type] - msg;
@@ -314,15 +316,15 @@ int board_display_msg(int board_type, struct char_data *ch, char *arg, struct ob
      MSG_SLOTNUM(board_type, ind) >= INDEX_SIZE) {
    send_to_char(ch, "Sorry, the board is not working.\r\n");
    log("SYSERR: Board is screwed up. (Room #%d)", GET_ROOM_VNUM(IN_ROOM(ch)));
-    return (1);
+    return 1;
  }
-  if (!(MSG_HEADING(board_type, ind))) {
+  if (!MSG_HEADING(board_type, ind)) {
    send_to_char(ch, "That message appears to be screwed up.\r\n");
-    return (1);
+    return 1;
  }
-  if (!(msg_storage[MSG_SLOTNUM(board_type, ind)])) {
+  if (!msg_storage[MSG_SLOTNUM(board_type, ind)]) {
    send_to_char(ch, "That message seems to be empty.\r\n");
-    return (1);
+    return 1;
  }
  snprintf(buffer, sizeof(buffer), "Message %d : %s\r\n\r\n%s\r\n", msg,
           MSG_HEADING(board_type, ind),
@@ -330,29 +332,29 @@ int board_display_msg(int board_type, struct char_data *ch, char *arg, struct ob
  page_string(ch->desc, buffer, TRUE);
-  return (1);
+  return 1;
 }
-int board_remove_msg(int board_type, struct char_data *ch, char *arg, struct obj_data *board)
+int board_remove_msg(int board_type, char_data *ch, char *arg, obj_data *board)
 {
  int ind, msg, slot_num;
  char number[MAX_INPUT_LENGTH], buf[MAX_INPUT_LENGTH];
-  struct descriptor_data *d;
+  descriptor_data *d;
  one_argument(arg, number);
  if (!*number || !is_number(number))
-    return (0);
+    return 0;
-  if (!(msg = atoi(number)))
+  if ((msg = parse_int(number)) == 0)
-    return (0);
+    return 0;
  if (!num_of_msgs[board_type]) {
    send_to_char(ch, "The board is empty!\r\n");
-    return (1);
+    return 1;
  }
  if (msg < 1 || msg > num_of_msgs[board_type]) {
    send_to_char(ch, "That message exists only in your imagination.\r\n");
-    return (1);
+    return 1;
  }
 #if NEWEST_AT_TOP
  ind = num_of_msgs[board_type] - msg;
@@ -361,28 +363,28 @@ int board_remove_msg(int board_type, struct char_data *ch, char *arg, struct obj
 #endif
  if (!MSG_HEADING(board_type, ind)) {
    send_to_char(ch, "That message appears to be screwed up.\r\n");
-    return (1);
+    return 1;
  }
  snprintf(buf, sizeof(buf), "(%s)", GET_NAME(ch));
  if (GET_LEVEL(ch) < REMOVE_LVL(board_type) &&
-      !(strstr(MSG_HEADING(board_type, ind), buf))) {
+      !strstr(MSG_HEADING(board_type, ind), buf)) {
    send_to_char(ch, "You are not holy enough to remove other people's messages.\r\n");
-    return (1);
+    return 1;
  }
  if (GET_LEVEL(ch) < MSG_LEVEL(board_type, ind)) {
    send_to_char(ch, "You can't remove a message holier than yourself.\r\n");
-    return (1);
+    return 1;
  }
  slot_num = MSG_SLOTNUM(board_type, ind);
  if (slot_num < 0 || slot_num >= INDEX_SIZE) {
    send_to_char(ch, "That message is majorly screwed up.\r\n");
    log("SYSERR: The board is seriously screwed up. (Room #%d)", GET_ROOM_VNUM(IN_ROOM(ch)));
-    return (1);
+    return 1;
  }
  for (d = descriptor_list; d; d = d->next)
-    if (STATE(d) == CON_PLAYING && d->str == &(msg_storage[slot_num])) {
+    if (STATE(d) == CON_PLAYING && d->str == &msg_storage[slot_num]) {
      send_to_char(ch, "At least wait until the author is finished before removing it!\r\n");
-      return (1);
+      return 1;
    }
  if (msg_storage[slot_num])
    free(msg_storage[slot_num]);
@@ -403,7 +405,7 @@ int board_remove_msg(int board_type, struct char_data *ch, char *arg, struct obj
  act(buf, FALSE, ch, 0, 0, TO_ROOM);
  board_save_board(board_type);
-  return (1);
+  return 1;
 }
 void board_save_board(int board_type)
@@ -416,26 +418,26 @@ void board_save_board(int board_type)
    remove(FILENAME(board_type));
    return;
  }
-  if (!(fl = fopen(FILENAME(board_type), "wb"))) {
+  if ((fl = fopen(FILENAME(board_type), "wb")) == NULL) {
    perror("SYSERR: Error writing board");
    return;
  }
-  fwrite(&(num_of_msgs[board_type]), sizeof(int), 1, fl);
+  fwrite(&num_of_msgs[board_type], sizeof(int), 1, fl);
  for (i = 0; i < num_of_msgs[board_type]; i++) {
    if ((tmp1 = MSG_HEADING(board_type, i)) != NULL)
-      msg_index[board_type][i].heading_len = strlen(tmp1) + 1;
+      msg_index[board_type][i].heading_len = (int)strlen(tmp1) + 1;
    else
      msg_index[board_type][i].heading_len = 0;
    if (MSG_SLOTNUM(board_type, i) < 0 ||
        MSG_SLOTNUM(board_type, i) >= INDEX_SIZE ||
-	(!(tmp2 = msg_storage[MSG_SLOTNUM(board_type, i)])))
+        (tmp2 = msg_storage[MSG_SLOTNUM(board_type, i)]) == NULL)
      msg_index[board_type][i].message_len = 0;
    else
-      msg_index[board_type][i].message_len = strlen(tmp2) + 1;
+      msg_index[board_type][i].message_len = (int)strlen(tmp2) + 1;
-    fwrite(&(msg_index[board_type][i]), sizeof(struct board_msginfo), 1, fl);
+    fwrite(&msg_index[board_type][i], sizeof(struct board_msginfo), 1, fl);
    if (tmp1)
      fwrite(tmp1, sizeof(char), msg_index[board_type][i].heading_len, fl);
    if (tmp2)
@@ -451,12 +453,12 @@ void board_load_board(int board_type)
  int i, len1, len2;
  char *tmp1, *tmp2;
-  if (!(fl = fopen(FILENAME(board_type), "rb"))) {
+  if ((fl = fopen(FILENAME(board_type), "rb")) == NULL) {
    if (errno != ENOENT)
      perror("SYSERR: Error reading board");
    return;
  }
-  if (fread(&(num_of_msgs[board_type]), sizeof(int), 1, fl) != 1)
+  if (fread(&num_of_msgs[board_type], sizeof(int), 1, fl) != 1)
    return;
  if (num_of_msgs[board_type] < 1 || num_of_msgs[board_type] > MAX_BOARD_MESSAGES) {
    log("SYSERR: Board file %d corrupt.  Resetting.", board_type);
@@ -464,7 +466,7 @@ void board_load_board(int board_type)
    return;
  }
  for (i = 0; i < num_of_msgs[board_type]; i++) {
-    if (fread(&(msg_index[board_type][i]), sizeof(struct board_msginfo), 1, fl) != 1) {
+    if (fread(&msg_index[board_type][i], sizeof(struct board_msginfo), 1, fl) != 1) {
      if (feof(fl))
        log("SYSERR: Unexpected EOF encountered in board file %d! Resetting.", board_type);
      else if (ferror(fl))
@@ -540,7 +542,7 @@ void board_clear_board(int board_type)
    if (msg_storage[MSG_SLOTNUM(board_type, i)])
      free(msg_storage[MSG_SLOTNUM(board_type, i)]);
    msg_storage_taken[MSG_SLOTNUM(board_type, i)] = 0;
-    memset((char *)&(msg_index[board_type][i]),0,sizeof(struct board_msginfo));
+    memset((char *)&msg_index[board_type][i], 0, sizeof(struct board_msginfo));
    msg_index[board_type][i].slot_num = -1;
  }
  num_of_msgs[board_type] = 0;
@@ -51,10 +51,10 @@ struct board_info_type {
 #define MSG_LEVEL(i, j) (msg_index[i][j].level)
 SPECIAL(gen_board);
-int board_display_msg(int board_type, struct char_data *ch, char *arg, struct obj_data *board);
+int board_display_msg(int board_type, char_data *ch, char *arg, obj_data *board);
-int board_show_board(int board_type, struct char_data *ch, char *arg, struct obj_data *board);
+int board_show_board(int board_type, char_data *ch, char *arg, obj_data *board);
-int board_remove_msg(int board_type, struct char_data *ch, char *arg, struct obj_data *board);
+int board_remove_msg(int board_type, char_data *ch, char *arg, obj_data *board);
-int board_write_message(int board_type, struct char_data *ch, char *arg, struct obj_data *board);
+int board_write_message(int board_type, char_data *ch, char *arg, obj_data *board);
 void board_save_board(int board_type);
 void board_load_board(int board_type);
 void board_clear_all(void);
@@ -13,7 +13,6 @@
 #include "structs.h"
 #include "utils.h"
 #include "comm.h"
 #include "interpreter.h"
 #include "handler.h"
 #include "db.h"
 #include "spells.h"
@@ -30,18 +29,18 @@
 /* local, file scope restricted functions */
 static mob_vnum castle_virtual(mob_vnum offset);
 static room_rnum castle_real_room(room_vnum roomoffset);
-static struct char_data *find_npc_by_name(struct char_data *chAtChar, const char *pszName, int iLen);
+static char_data *find_npc_by_name(const char_data *chAtChar, const char *pszName, int iLen);
-static int block_way(struct char_data *ch, int cmd, char *arg, room_vnum iIn_room, int iProhibited_direction);
+static int block_way(char_data *ch, int cmd, char *arg, room_vnum iIn_room, int iProhibited_direction);
-static int member_of_staff(struct char_data *chChar);
+static int member_of_staff(const char_data *chChar);
-static int member_of_royal_guard(struct char_data *chChar);
+static int member_of_royal_guard(const char_data *chChar);
-static struct char_data *find_guard(struct char_data *chAtChar);
+static char_data *find_guard(const char_data *chAtChar);
-static struct char_data *get_victim(struct char_data *chAtChar);
+static char_data *get_victim(const char_data *chAtChar);
-static int banzaii(struct char_data *ch);
+static int banzaii(char_data *ch);
-static int do_npc_rescue(struct char_data *ch_hero, struct char_data *ch_victim);
+static int do_npc_rescue(char_data *ch_hero, char_data *ch_victim);
-static int is_trash(struct obj_data *i);
+static int is_trash(const obj_data *i);
-static void fry_victim(struct char_data *ch);
+static void fry_victim(char_data *ch);
-static int castle_cleaner(struct char_data *ch, int cmd, int gripe);
+static int castle_cleaner(char_data *ch, int cmd, int gripe);
-static int castle_twin_proc(struct char_data *ch, int cmd, char *arg, int ctlnum, const char *twinname);
+static int castle_twin_proc(char_data *ch, int cmd, char *arg, int ctlnum, const char *twinname);
 static void castle_mob_spec(mob_vnum mobnum, SPECIAL(*specproc));
 /* Special procedures for Kings Castle by Pjotr. Coded by Sapowox. */
 SPECIAL(CastleGuard);
@@ -129,86 +128,86 @@ void assign_kings_castle(void)
 /* Routine: member_of_staff. Used to see if a character is a member of the 
 * castle staff. Used mainly by BANZAI:ng NPC:s. */
-static int member_of_staff(struct char_data *chChar)
+static int member_of_staff(const char_data *chChar)
 {
  int ch_num;
  if (!IS_NPC(chChar))
-    return (FALSE);
+    return FALSE;
  ch_num = GET_MOB_VNUM(chChar);
  if (ch_num == castle_virtual(1))
-    return (TRUE);
+    return TRUE;
  if (ch_num > castle_virtual(2) && ch_num < castle_virtual(15))
-    return (TRUE);
+    return TRUE;
  if (ch_num > castle_virtual(15) && ch_num < castle_virtual(18))
-    return (TRUE);
+    return TRUE;
  if (ch_num > castle_virtual(18) && ch_num < castle_virtual(30))
-    return (TRUE);
+    return TRUE;
-  return (FALSE);
+  return FALSE;
 }
 /* Function: member_of_royal_guard. Returns TRUE if the character is a guard on
 * duty, otherwise FALSE. Used by Peter the captain of the royal guard. */
-static int member_of_royal_guard(struct char_data *chChar)
+static int member_of_royal_guard(const char_data *chChar)
 {
  int ch_num;
  if (!chChar || !IS_NPC(chChar))
-    return (FALSE);
+    return FALSE;
  ch_num = GET_MOB_VNUM(chChar);
  if (ch_num == castle_virtual(3) || ch_num == castle_virtual(6))
-    return (TRUE);
+    return TRUE;
  if (ch_num > castle_virtual(7) && ch_num < castle_virtual(12))
-    return (TRUE);
+    return TRUE;
  if (ch_num > castle_virtual(23) && ch_num < castle_virtual(26))
-    return (TRUE);
+    return TRUE;
-  return (FALSE);
+  return FALSE;
 }
 /* Function: find_npc_by_name. Returns a pointer to an npc by the given name.
 * Used by Tim and Tom. */
-static struct char_data *find_npc_by_name(struct char_data *chAtChar,
+static char_data *find_npc_by_name(const char_data *chAtChar,
 		const char *pszName, int iLen)
 {
-  struct char_data *ch;
+  char_data *ch;
  for (ch = world[IN_ROOM(chAtChar)].people; ch; ch = ch->next_in_room)
    if (IS_NPC(ch) && !strncmp(pszName, ch->player.short_descr, iLen))
-      return (ch);
+      return ch;
-  return (NULL);
+  return NULL;
 }
 /* Function: find_guard. Returns the pointer to a guard on duty. Used by Peter
 * the Captain of the Royal Guard */
-static struct char_data *find_guard(struct char_data *chAtChar)
+static char_data *find_guard(const char_data *chAtChar)
 {
-  struct char_data *ch;
+  char_data *ch;
  for (ch = world[IN_ROOM(chAtChar)].people; ch; ch = ch->next_in_room)
    if (!FIGHTING(ch) && member_of_royal_guard(ch))
-      return (ch);
+      return ch;
-  return (NULL);
+  return NULL;
 }
 /* Function: get_victim. Returns a pointer to a randomly chosen character in
 * the same room, fighting someone in the castle staff. Used by BANZAII-ing
 * characters and King Welmar... */
-static struct char_data *get_victim(struct char_data *chAtChar)
+static char_data *get_victim(const char_data *chAtChar)
 {
-  struct char_data *ch;
+  char_data *ch;
  int iNum_bad_guys = 0, iVictim;
  for (ch = world[IN_ROOM(chAtChar)].people; ch; ch = ch->next_in_room)
@@ -216,11 +215,11 @@ static struct char_data *get_victim(struct char_data *chAtChar)
      iNum_bad_guys++;
  if (!iNum_bad_guys)
-    return (NULL);
+    return NULL;
  iVictim = rand_number(0, iNum_bad_guys);	/* How nice, we give them a chance */
  if (!iVictim)
-    return (NULL);
+    return NULL;
  iNum_bad_guys = 0;
@@ -234,39 +233,40 @@ static struct char_data *get_victim(struct char_data *chAtChar)
    if (++iNum_bad_guys != iVictim)
      continue;
-    return (ch);
+    return ch;
  }
-  return (NULL);
+  return NULL;
 }
 /* Banzaii. Makes a character banzaii on attackers of the castle staff. Used
 * by Guards, Tim, Tom, Dick, David, Peter, Master, and the King. */
-static int banzaii(struct char_data *ch)
+static int banzaii(char_data *ch)
 {
-  struct char_data *chOpponent;
+  char_data *chOpponent;
-  if (!AWAKE(ch) || GET_POS(ch) == POS_FIGHTING || !(chOpponent = get_victim(ch)))
+  if (!AWAKE(ch) || GET_POS(ch) == POS_FIGHTING || (chOpponent = get_victim(ch)) == NULL)
-    return (FALSE);
+    return FALSE;
  act("$n roars: 'Protect the Kingdom of Great King Welmar!  BANZAIIII!!!'",
 	FALSE, ch, 0, 0, TO_ROOM);
  hit(ch, chOpponent, TYPE_UNDEFINED);
-  return (TRUE);
+  return TRUE;
 }
 /* Do_npc_rescue. Makes ch_hero rescue ch_victim. Used by Tim and Tom. */
-static int do_npc_rescue(struct char_data *ch_hero, struct char_data *ch_victim)
+static int do_npc_rescue(char_data *ch_hero, char_data *ch_victim)
 {
-  struct char_data *ch_bad_guy;
+  char_data *ch_bad_guy;
  for (ch_bad_guy = world[IN_ROOM(ch_hero)].people;
-       ch_bad_guy && (FIGHTING(ch_bad_guy) != ch_victim);
+       ch_bad_guy && FIGHTING(ch_bad_guy) != ch_victim;
-       ch_bad_guy = ch_bad_guy->next_in_room);
+       ch_bad_guy = ch_bad_guy->next_in_room)
    ;
  /* NO WAY I'll rescue the one I'm fighting! */
  if (!ch_bad_guy || ch_bad_guy == ch_hero)
-    return (FALSE);
+    return FALSE;
  act("You bravely rescue $N.\r\n", FALSE, ch_hero, 0, ch_victim, TO_CHAR);
  act("You are rescued by $N, your loyal friend!\r\n",
@@ -280,54 +280,54 @@ static int do_npc_rescue(struct char_data *ch_hero, struct char_data *ch_victim)
  set_fighting(ch_hero, ch_bad_guy);
  set_fighting(ch_bad_guy, ch_hero);
-  return (TRUE);
+  return TRUE;
 }
 /* Procedure to block a person trying to enter a room. Used by Tim/Tom at Kings
 * bedroom and Dick/David at treasury. */
-static int block_way(struct char_data *ch, int cmd, char *arg, room_vnum iIn_room,
+static int block_way(char_data *ch, int cmd, char *arg, room_vnum iIn_room,
 	          int iProhibited_direction)
 {
  if (cmd != ++iProhibited_direction)
-    return (FALSE);
+    return FALSE;
  if (ch->player.short_descr && !strncmp(ch->player.short_descr, "King Welmar", 11))
-    return (FALSE);
+    return FALSE;
  if (IN_ROOM(ch) != real_room(iIn_room))
-    return (FALSE);
+    return FALSE;
  if (!member_of_staff(ch))
    act("The guard roars at $n and pushes $m back.", FALSE, ch, 0, 0, TO_ROOM);
  send_to_char(ch, "The guard roars: 'Entrance is Prohibited!', and pushes you back.\r\n");
-  return (TRUE);
+  return TRUE;
 }
 /* Routine to check if an object is trash. Used by James the Butler and the
 * Cleaning Lady. */
-static int is_trash(struct obj_data *i)
+static int is_trash(const obj_data *i)
 {
  if (!OBJWEAR_FLAGGED(i, ITEM_WEAR_TAKE))
-    return (FALSE);
+    return FALSE;
  if (GET_OBJ_TYPE(i) == ITEM_DRINKCON || GET_OBJ_COST(i) <= 10)
-    return (TRUE);
+    return TRUE;
-  return (FALSE);
+  return FALSE;
 }
 /* Fry_victim. Finds a suitabe victim, and cast some _NASTY_ spell on him. Used
 * by King Welmar. */
-static void fry_victim(struct char_data *ch)
+static void fry_victim(char_data *ch)
 {
-  struct char_data *tch;
+  char_data *tch;
  if (ch->points.mana < 10)
    return;
  /* Find someone suitable to fry ! */
-  if (!(tch = get_victim(ch)))
+  if ((tch = get_victim(ch)) == NULL)
    return;
  switch (rand_number(0, 8)) {
@@ -358,8 +358,6 @@ static void fry_victim(struct char_data *ch)
  }
  ch->points.mana -= 10;
  return;
 }
 /* King_welmar. Control the actions and movements of the King. */
@@ -397,18 +395,19 @@ SPECIAL(king_welmar)
      path_index = 0;
    }
  }
-  if (cmd || (GET_POS(ch) < POS_SLEEPING) ||
+  if (cmd || GET_POS(ch) < POS_SLEEPING ||
      (GET_POS(ch) == POS_SLEEPING && !move))
-    return (FALSE);
+    return FALSE;
  if (GET_POS(ch) == POS_FIGHTING) {
    fry_victim(ch);
-    return (FALSE);
+    return FALSE;
-  } else if (banzaii(ch))
+  }
-    return (FALSE);
+  if (banzaii(ch))
    return FALSE;
  if (!move)
-    return (FALSE);
+    return FALSE;
  switch (path[path_index]) {
  case '0':
@@ -471,10 +470,14 @@ SPECIAL(king_welmar)
  case '.':
    move = FALSE;
    break;
  default:
    log("default case hit in king_welmar spec proc. path_index=%d path[path_index] = %c",
      path_index, path[path_index]);
    break;
  }
  path_index++;
-  return (FALSE);
+  return FALSE;
 }
 /* Training_master. Acts actions to the training room, if his students are
@@ -482,25 +485,25 @@ SPECIAL(king_welmar)
 * Master. */
 SPECIAL(training_master)
 {
-  struct char_data *pupil1, *pupil2 = NULL, *tch;
+  char_data *pupil1, *pupil2 = NULL, *tch;
-  if (!AWAKE(ch) || (GET_POS(ch) == POS_FIGHTING))
+  if (!AWAKE(ch) || GET_POS(ch) == POS_FIGHTING)
-    return (FALSE);
+    return FALSE;
  if (cmd)
-    return (FALSE);
+    return FALSE;
  if (banzaii(ch) || rand_number(0, 2))
-    return (FALSE);
+    return FALSE;
-  if (!(pupil1 = find_npc_by_name(ch, "Brian", 5)))
+  if ((pupil1 = find_npc_by_name(ch, "Brian", 5)) == NULL)
-    return (FALSE);
+    return FALSE;
-  if (!(pupil2 = find_npc_by_name(ch, "Mick", 4)))
+  if ((pupil2 = find_npc_by_name(ch, "Mick", 4)) == NULL)
-    return (FALSE);
+    return FALSE;
  if (FIGHTING(pupil1) || FIGHTING(pupil2))
-    return (FALSE);
+    return FALSE;
  if (rand_number(0, 1)) {
    tch = pupil1;
@@ -562,7 +565,7 @@ SPECIAL(training_master)
    break;
  }
-  return (FALSE);
+  return FALSE;
 }
 SPECIAL(tom)
@@ -576,12 +579,12 @@ SPECIAL(tim)
 }
 /* Common routine for the Castle Twins. */
-static int castle_twin_proc(struct char_data *ch, int cmd, char *arg, int ctlnum, const char *twinname)
+static int castle_twin_proc(char_data *ch, int cmd, char *arg, int ctlnum, const char *twinname)
 {
-  struct char_data *king, *twin;
+  char_data *king, *twin;
  if (!AWAKE(ch))
-    return (FALSE);
+    return FALSE;
  if (cmd)
    return block_way(ch, cmd, arg, castle_virtual(ctlnum), 1);
@@ -595,14 +598,14 @@ static int castle_twin_proc(struct char_data *ch, int cmd, char *arg, int ctlnum
      do_npc_rescue(ch, king);
  }
-  if ((twin = find_npc_by_name(ch, twinname, strlen(twinname))) != NULL)
+  if ((twin = find_npc_by_name(ch, twinname, (int)strlen(twinname))) != NULL)
    if (FIGHTING(twin) && 2 * GET_HIT(twin) < GET_HIT(ch))
      do_npc_rescue(ch, twin);
  if (GET_POS(ch) != POS_FIGHTING)
    banzaii(ch);
-  return (FALSE);
+  return FALSE;
 }
@@ -614,12 +617,12 @@ SPECIAL(James)
 }
 /* Common code for James and the Cleaning Woman. */
-static int castle_cleaner(struct char_data *ch, int cmd, int gripe)
+static int castle_cleaner(char_data *ch, int cmd, int gripe)
 {
-  struct obj_data *i;
+  obj_data *i;
  if (cmd || !AWAKE(ch) || GET_POS(ch) == POS_FIGHTING)
-    return (FALSE);
+    return FALSE;
  for (i = world[IN_ROOM(ch)].contents; i; i = i->next_content) {
    if (!is_trash(i))
@@ -632,10 +635,10 @@ static int castle_cleaner(struct char_data *ch, int cmd, int gripe)
    }
    obj_from_room(i);
    obj_to_char(i, ch);
-    return (TRUE);
+    return TRUE;
  }
-  return (FALSE);
+  return FALSE;
 }
 /* Routine for the Cleaning Woman. Picks up any trash she finds. */
@@ -647,36 +650,36 @@ SPECIAL(cleaning)
 /* CastleGuard. Standard routine for ordinary castle guards. */
 SPECIAL(CastleGuard)
 {
-  if (cmd || !AWAKE(ch) || (GET_POS(ch) == POS_FIGHTING))
+  if (cmd || !AWAKE(ch) || GET_POS(ch) == POS_FIGHTING)
-    return (FALSE);
+    return FALSE;
-  return (banzaii(ch));
+  return banzaii(ch);
 }
 /* DicknDave. Routine for the guards Dick and David. */
 SPECIAL(DicknDavid)
 {
  if (!AWAKE(ch))
-    return (FALSE);
+    return FALSE;
  if (!cmd && GET_POS(ch) != POS_FIGHTING)
    banzaii(ch);
-  return (block_way(ch, cmd, argument, castle_virtual(36), 1));
+  return block_way(ch, cmd, argument, castle_virtual(36), 1);
 }
 /*Peter. Routine for Captain of the Guards. */
 SPECIAL(peter)
 {
-  struct char_data *ch_guard = NULL;
+  char_data *ch_guard = NULL;
  if (cmd || !AWAKE(ch) || GET_POS(ch) == POS_FIGHTING)
-    return (FALSE);
+    return FALSE;
  if (banzaii(ch))
-    return (FALSE);
+    return FALSE;
-  if (!(rand_number(0, 3)) && (ch_guard = find_guard(ch)))
+  if (!rand_number(0, 3) && (ch_guard = find_guard(ch)) != NULL)
    switch (rand_number(0, 5)) {
    case 0:
      act("$N comes sharply into attention as $n inspects $M.",
@@ -725,32 +728,32 @@ SPECIAL(peter)
      break;
    }
-  return (FALSE);
+  return FALSE;
 }
 /* Procedure for Jerry and Michael in x08 of King's Castle. Code by Sapowox
 * modified by Pjotr.(Original code from Master) */
 SPECIAL(jerry)
 {
-  struct char_data *gambler1, *gambler2 = NULL, *tch;
+  char_data *gambler1, *gambler2 = NULL, *tch;
-  if (!AWAKE(ch) || (GET_POS(ch) == POS_FIGHTING))
+  if (!AWAKE(ch) || GET_POS(ch) == POS_FIGHTING)
-    return (FALSE);
+    return FALSE;
  if (cmd)
-    return (FALSE);
+    return FALSE;
  if (banzaii(ch) || rand_number(0, 2))
-    return (FALSE);
+    return FALSE;
-  if (!(gambler1 = ch))
+  if ((gambler1 = ch) == NULL)
-    return (FALSE);
+    return FALSE;
-  if (!(gambler2 = find_npc_by_name(ch, "Michael", 7)))
+  if ((gambler2 = find_npc_by_name(ch, "Michael", 7)) == NULL)
-    return (FALSE);
+    return FALSE;
  if (FIGHTING(gambler1) || FIGHTING(gambler2))
-    return (FALSE);
+    return FALSE;
  if (rand_number(0, 1)) {
    tch = gambler1;
@@ -808,5 +811,5 @@ SPECIAL(jerry)
 	    FALSE, gambler1, 0, gambler2, TO_VICT);
    break;
  }
-  return (FALSE);
+  return FALSE;
 }
@@ -19,20 +19,20 @@
 #include "modify.h"
 /* local scope functions, not used externally */
-static void cedit_disp_menu(struct descriptor_data *d);
+static void cedit_disp_menu(descriptor_data *d);
-static void cedit_save_internally(struct descriptor_data *d);
+static void cedit_save_internally(descriptor_data *d);
-static void cedit_disp_game_play_options(struct descriptor_data *d);
+static void cedit_disp_game_play_options(descriptor_data *d);
-static void cedit_disp_crash_save_options(struct descriptor_data *d);
+static void cedit_disp_crash_save_options(descriptor_data *d);
-static void cedit_disp_room_numbers(struct descriptor_data *d);
+static void cedit_disp_room_numbers(descriptor_data *d);
-static void cedit_disp_operation_options(struct descriptor_data *d);
+static void cedit_disp_operation_options(descriptor_data *d);
-static void cedit_disp_autowiz_options(struct descriptor_data *d);
+static void cedit_disp_autowiz_options(descriptor_data *d);
 static void reassign_rooms(void);
-static void cedit_setup(struct descriptor_data *d);
+static void cedit_setup(descriptor_data *d);
 ACMD(do_oasis_cedit)
 {
-  struct descriptor_data *d;
+  descriptor_data *d;
  char buf1[MAX_STRING_LENGTH];
  /* No building as a mob or while being forced. */
@@ -72,7 +72,7 @@ ACMD(do_oasis_cedit)
  cedit_save_to_disk();
 }
-static void cedit_setup(struct descriptor_data *d)
+static void cedit_setup(descriptor_data *d)
 {
  /* Create the config_data struct. */
  CREATE(OLC_CONFIG(d), struct config_data, 1);
@@ -178,7 +178,7 @@ static void cedit_setup(struct descriptor_data *d)
  cedit_disp_menu(d);
 }
-static void cedit_save_internally(struct descriptor_data *d)
+static void cedit_save_internally(descriptor_data *d)
 {
  /* see if we need to reassign spec procs on rooms */
  int reassign = (CONFIG_DTS_ARE_DUMPS != OLC_CONFIG(d)->play.dts_are_dumps);
@@ -578,7 +578,7 @@ int save_config( IDXTYPE nowhere )
 }
 /* Menu functions - The main menu. */
-static void cedit_disp_menu(struct descriptor_data *d)
+static void cedit_disp_menu(descriptor_data *d)
 {
  get_char_colors(d->character);
@@ -606,7 +606,7 @@ static void cedit_disp_menu(struct descriptor_data *d)
  OLC_MODE(d) = CEDIT_MAIN_MENU;
 }
-static void cedit_disp_game_play_options(struct descriptor_data *d)
+static void cedit_disp_game_play_options(descriptor_data *d)
 {
  int m_opt;
  m_opt = OLC_CONFIG(d)->play.map_option;
@@ -679,7 +679,7 @@ static void cedit_disp_game_play_options(struct descriptor_data *d)
  OLC_MODE(d) = CEDIT_GAME_OPTIONS_MENU;
 }
-static void cedit_disp_crash_save_options(struct descriptor_data *d)
+static void cedit_disp_crash_save_options(descriptor_data *d)
 {
  get_char_colors(d->character);
  clear_screen(d);
@@ -707,7 +707,7 @@ static void cedit_disp_crash_save_options(struct descriptor_data *d)
  OLC_MODE(d) = CEDIT_CRASHSAVE_OPTIONS_MENU;
 }
-static void cedit_disp_room_numbers(struct descriptor_data *d)
+static void cedit_disp_room_numbers(descriptor_data *d)
 {
  get_char_colors(d->character);
  clear_screen(d);
@@ -733,7 +733,7 @@ static void cedit_disp_room_numbers(struct descriptor_data *d)
  OLC_MODE(d) = CEDIT_ROOM_NUMBERS_MENU;
 }
-static void cedit_disp_operation_options(struct descriptor_data *d)
+static void cedit_disp_operation_options(descriptor_data *d)
 {
  get_char_colors(d->character);
  clear_screen(d);
@@ -785,7 +785,7 @@ static void cedit_disp_operation_options(struct descriptor_data *d)
  OLC_MODE(d) = CEDIT_OPERATION_OPTIONS_MENU;
 }
-static void cedit_disp_autowiz_options(struct descriptor_data *d)
+static void cedit_disp_autowiz_options(descriptor_data *d)
 {
  get_char_colors(d->character);
  clear_screen(d);
@@ -804,7 +804,7 @@ static void cedit_disp_autowiz_options(struct descriptor_data *d)
 }
 /* The event handler. */
-void cedit_parse(struct descriptor_data *d, char *arg)
+void cedit_parse(descriptor_data *d, char *arg)
 {
  char *oldtext = NULL;
@@ -1520,12 +1520,12 @@ void cedit_parse(struct descriptor_data *d, char *arg)
        write_to_output(d,
          "That is an invalid choice!\r\n"
          "Enter the room's vnum where mortals should load into : ");
-      } else if (real_room(atoi(arg)) == NOWHERE) {
+      } else if (real_room(atoidx(arg)) == NOWHERE) {
        write_to_output(d,
          "That room doesn't exist!\r\n"
          "Enter the room's vnum where mortals should load into : ");
      } else {
-        OLC_CONFIG(d)->room_nums.mortal_start_room = atoi(arg);
+        OLC_CONFIG(d)->room_nums.mortal_start_room = atoidx(arg);
        cedit_disp_room_numbers(d);
      }
      break;
@@ -1535,12 +1535,12 @@ void cedit_parse(struct descriptor_data *d, char *arg)
        write_to_output(d,
          "That is an invalid choice!\r\n"
          "Enter the room's vnum where immortals should load into : ");
-      } else if (real_room(atoi(arg)) == NOWHERE) {
+      } else if (real_room(atoidx(arg)) == NOWHERE) {
        write_to_output(d,
          "That room doesn't exist!\r\n"
          "Enter the room's vnum where immortals should load into : ");
      } else {
-        OLC_CONFIG(d)->room_nums.immort_start_room = atoi(arg);
+        OLC_CONFIG(d)->room_nums.immort_start_room = atoidx(arg);
        cedit_disp_room_numbers(d);
      }
      break;
@@ -1550,12 +1550,12 @@ void cedit_parse(struct descriptor_data *d, char *arg)
        write_to_output(d,
          "That is an invalid choice!\r\n"
          "Enter the room's vnum where frozen people should load into : ");
-      } else if (real_room(atoi(arg)) == NOWHERE) {
+      } else if (real_room(atoidx(arg)) == NOWHERE) {
        write_to_output(d,
          "That room doesn't exist!\r\n"
          "Enter the room's vnum where frozen people should load into : ");
      } else {
-        OLC_CONFIG(d)->room_nums.frozen_start_room = atoi(arg);
+        OLC_CONFIG(d)->room_nums.frozen_start_room = atoidx(arg);
        cedit_disp_room_numbers(d);
      }
      break;
@@ -1565,12 +1565,12 @@ void cedit_parse(struct descriptor_data *d, char *arg)
        write_to_output(d,
          "That is an invalid choice!\r\n"
          "Enter the vnum for donation room #1 : ");
-      } else if (real_room(atoi(arg)) == NOWHERE) {
+      } else if (real_room(atoidx(arg)) == NOWHERE) {
        write_to_output(d,
          "That room doesn't exist!\r\n"
          "Enter the vnum for donation room #1 : ");
      } else {
-        OLC_CONFIG(d)->room_nums.donation_room_1 = atoi(arg);
+        OLC_CONFIG(d)->room_nums.donation_room_1 = atoidx(arg);
        cedit_disp_room_numbers(d);
      }
      break;
@@ -1580,12 +1580,12 @@ void cedit_parse(struct descriptor_data *d, char *arg)
        write_to_output(d,
          "That is an invalid choice!\r\n"
          "Enter the vnum for donation room #2 : ");
-      } else if (real_room(atoi(arg)) == NOWHERE) {
+      } else if (real_room(atoidx(arg)) == NOWHERE) {
        write_to_output(d,
          "That room doesn't exist!\r\n"
          "Enter the vnum for donation room #2 : ");
      } else {
-        OLC_CONFIG(d)->room_nums.donation_room_2 = atoi(arg);
+        OLC_CONFIG(d)->room_nums.donation_room_2 = atoidx(arg);
        cedit_disp_room_numbers(d);
      }
      break;
@@ -1595,12 +1595,12 @@ void cedit_parse(struct descriptor_data *d, char *arg)
        write_to_output(d,
          "That is an invalid choice!\r\n"
          "Enter the vnum for donation room #3 : ");
-      } else if (real_room(atoi(arg)) == NOWHERE) {
+      } else if (real_room(atoidx(arg)) == NOWHERE) {
        write_to_output(d,
          "That room doesn't exist!\r\n"
          "Enter the vnum for donation room #3 : ");
      } else {
-        OLC_CONFIG(d)->room_nums.donation_room_3 = atoi(arg);
+        OLC_CONFIG(d)->room_nums.donation_room_3 = atoidx(arg);
        cedit_disp_room_numbers(d);
      }
      break;
@@ -1729,7 +1729,7 @@ static void reassign_rooms(void)
  assign_rooms();
 }
-void cedit_string_cleanup(struct descriptor_data *d, int terminator)
+void cedit_string_cleanup(descriptor_data *d, int terminator)
 {
  switch (OLC_MODE(d)) {
  case CEDIT_MENU:
@@ -1343,7 +1343,7 @@ int thaco(int class_num, int level)
 /* Roll the 6 stats for a character... each stat is made of the sum of the best
 * 3 out of 4 rolls of a 6-sided die.  Each class then decides which priority
 * will be given for the best to worst stats. */
-void roll_real_abils(struct char_data *ch)
+void roll_real_abils(char_data *ch)
 {
  int i, j, k, temp;
  ubyte table[6];
@@ -1410,7 +1410,7 @@ void roll_real_abils(struct char_data *ch)
 }
 /* Some initializations for characters, including initial skills */
-void do_start(struct char_data *ch)
+void do_start(char_data *ch)
 {
  GET_LEVEL(ch) = 1;
  GET_EXP(ch) = 1;
@@ -1459,7 +1459,7 @@ void do_start(struct char_data *ch)
 /* This function controls the change to maxmove, maxmana, and maxhp for each
 * class every time they gain a level. */
-void advance_level(struct char_data *ch)
+void advance_level(char_data *ch)
 {
  int add_hp, add_mana = 0, add_move = 0, i;
@@ -1537,7 +1537,7 @@ int backstab_mult(int level)
 /* invalid_class is used by handler.c to determine if a piece of equipment is
 * usable by a particular class, based on the ITEM_ANTI_{class} bitvectors. */
-int invalid_class(struct char_data *ch, struct obj_data *obj)
+int invalid_class(char_data *ch, obj_data *obj)
 {
  if (OBJ_FLAGGED(obj, ITEM_ANTI_MAGIC_USER) && IS_MAGIC_USER(ch))
    return TRUE;
@@ -15,12 +15,12 @@
 /* Functions available through class.c */
 int backstab_mult(int level);
-void do_start(struct char_data *ch);
+void do_start(char_data *ch);
 bitvector_t find_class_bitvector(const char *arg);
-int invalid_class(struct char_data *ch, struct obj_data *obj);
+int invalid_class(char_data *ch, obj_data *obj);
 int level_exp(int chclass, int level);
 int parse_class(char arg);
-void roll_real_abils(struct char_data *ch);
+void roll_real_abils(char_data *ch);
 byte saving_throws(int class_num, int type, int level);
 int thaco(int class_num, int level);
 const char *title_female(int chclass, int level);
@@ -87,11 +87,8 @@
 #define INVALID_SOCKET (-1)
 #endif
 extern time_t motdmod;
 extern time_t newsmod;
 /* locally defined globals, used externally */
-struct descriptor_data *descriptor_list = NULL;   /* master desc list */
+descriptor_data *descriptor_list = NULL;   /* master desc list */
 int buf_largecount = 0;   /* # of large buffers which exist */
 int buf_overflows = 0;    /* # of overflows of output */
 int buf_switches = 0;     /* # of switches from small to large buf */
@@ -108,7 +105,7 @@ int next_tick = SECS_PER_MUD_HOUR;  /* Tick countdown */
 /* static local global variable declarations (current file scope only) */
 static struct txt_block *bufpool = 0;  /* pool of large output buffers */
-static int max_players = 0;   /* max descriptors available */
+static unsigned long max_players = 0;   /* max descriptors available */
 static int tics_passed = 0;     /* for extern checkpointing */
 static struct timeval null_time; /* zero-valued time structure */
 static byte reread_wizlist;   /* signal: SIGUSR1 */
@@ -134,18 +131,18 @@ static void init_game(ush_int port);
 static void signal_setup(void);
 static socket_t init_socket(ush_int port);
 static int new_descriptor(socket_t s);
-static int get_max_players(void);
+static unsigned long get_max_players(void);
-static int process_output(struct descriptor_data *t);
+static ssize_t process_output(descriptor_data *t);
-static int process_input(struct descriptor_data *t);
+static int process_input(descriptor_data *t);
-static void timediff(struct timeval *diff, struct timeval *a, struct timeval *b);
+static void timediff(struct timeval *rslt, const struct timeval *a, const struct timeval *b);
-static void timeadd(struct timeval *sum, struct timeval *a, struct timeval *b);
+static void timeadd(struct timeval *rslt, const struct timeval *a, const struct timeval *b);
-static void flush_queues(struct descriptor_data *d);
+static void flush_queues(descriptor_data *d);
 static void nonblock(socket_t s);
-static int perform_subst(struct descriptor_data *t, char *orig, char *subst);
+static int perform_subst(descriptor_data *t, const char *orig, char *subst);
 static void record_usage(void);
-static char *make_prompt(struct descriptor_data *point);
+static char *make_prompt(const descriptor_data *d);
 static void check_idle_passwords(void);
-static void init_descriptor (struct descriptor_data *newd, int desc);
+static void init_descriptor (descriptor_data *newd, int desc);
 static struct in_addr *get_bind_addr(void);
 static int parse_ip(const char *addr, struct in_addr *inaddr);
@@ -318,7 +315,8 @@ int main(int argc, char **argv)
    if (!isdigit(*argv[pos])) {
      printf("Usage: %s [-c] [-m] [-q] [-r] [-s] [-d pathname] [port #]\n", argv[0]);
      exit(1);
-    } else if ((port = atoi(argv[pos])) <= 1024) {
+    }
    if ((port = atoi(argv[pos])) <= 1024) {
      printf("SYSERR: Illegal port number %d.\n", port);
      exit(1);
    }
@@ -380,13 +378,13 @@ int main(int argc, char **argv)
  zmalloc_check();
 #endif
-  return (0);
+  return 0;
 }
 /* Reload players after a copyover */
 void copyover_recover()
 {
-  struct descriptor_data *d;
+  descriptor_data *d;
  FILE *fp;
  char host[1024], guiopt[1024];
  int desc, i, player_i;
@@ -448,7 +446,7 @@ void copyover_recover()
    CopyoverSet(d,guiopt);
    /* Now, find the pfile */
-    CREATE(d->character, struct char_data, 1);
+    CREATE(d->character, char_data, 1);
    clear_char(d->character);
    CREATE(d->character->player_specials, struct player_special_data, 1);
@@ -644,13 +642,13 @@ static socket_t init_socket(ush_int local_port)
  return (s);
 }
-static int get_max_players(void)
+static unsigned long get_max_players(void)
 {
 #ifndef CIRCLE_UNIX
  return (CONFIG_MAX_PLAYING);
 #else
-  int max_descs = 0;
+  unsigned long max_descs = 0;
  const char *method;
 /* First, we'll try using getrlimit/setrlimit.  This will probably work
@@ -683,7 +681,7 @@ static int get_max_players(void)
    if (limit.rlim_max == RLIM_INFINITY)
      max_descs = CONFIG_MAX_PLAYING + NUM_RESERVED_DESCS;
    else
-      max_descs = MIN(CONFIG_MAX_PLAYING + NUM_RESERVED_DESCS, limit.rlim_max);
+      max_descs = ULMIN(CONFIG_MAX_PLAYING + NUM_RESERVED_DESCS, limit.rlim_max);
 #else
    max_descs = MIN(CONFIG_MAX_PLAYING + NUM_RESERVED_DESCS, limit.rlim_max);
 #endif
@@ -717,15 +715,15 @@ static int get_max_players(void)
 #endif
  /* now calculate max _players_ based on max descs */
-  max_descs = MIN(CONFIG_MAX_PLAYING, max_descs - NUM_RESERVED_DESCS);
+  max_descs = ULMIN(CONFIG_MAX_PLAYING, max_descs - NUM_RESERVED_DESCS);
  if (max_descs <= 0) {
-    log("SYSERR: Non-positive max player limit!  (Set at %d using %s).",
+    log("SYSERR: Non-positive max player limit!  (Set at %ld using %s).",
 	    max_descs, method);
    exit(1);
  }
-  log("   Setting player limit to %d using %s.", max_descs, method);
+  log("   Setting player limit to %ld using %s.", max_descs, method);
-  return (max_descs);
+  return max_descs;
 #endif /* CIRCLE_UNIX */
 }
@@ -740,8 +738,9 @@ void game_loop(socket_t local_mother_desc)
  struct timeval last_time, opt_time, process_time, temp_time;
  struct timeval before_sleep, now, timeout;
  char comm[MAX_INPUT_LENGTH];
-  struct descriptor_data *d, *next_d;
+  descriptor_data *d, *next_d;
-  int missed_pulses, maxdesc, aliased;
+  int maxdesc, aliased;
  long missed_pulses;
  /* initialize various time values */
  null_time.tv_sec = 0;
@@ -767,7 +766,8 @@ void game_loop(socket_t local_mother_desc)
 	        perror("SYSERR: Select coma");
      } else
 	      log("New connection.  Waking up.");
-      gettimeofday(&last_time, (struct timezone *) 0);
+
      gettimeofday(&last_time, 0);
    }
    /* Set up the input, output, and exception sets for select(). */
    FD_ZERO(&input_set);
@@ -791,7 +791,7 @@ void game_loop(socket_t local_mother_desc)
     * to sleep until the next 0.1 second tick.  The first step is to
     * calculate how long we took processing the previous iteration. */
-    gettimeofday(&before_sleep, (struct timezone *) 0); /* current time */
+    gettimeofday(&before_sleep, 0); /* current time */
    timediff(&process_time, &before_sleep, &last_time);
    /* If we were asleep for more than one pass, count missed pulses and sleep
@@ -810,13 +810,13 @@ void game_loop(socket_t local_mother_desc)
    timeadd(&last_time, &before_sleep, &temp_time);
    /* Now keep sleeping until that time has come */
-    gettimeofday(&now, (struct timezone *) 0);
+    gettimeofday(&now, 0);
    timediff(&timeout, &last_time, &now);
    /* Go to sleep */
    do {
      circle_sleep(&timeout);
-      gettimeofday(&now, (struct timezone *) 0);
+      gettimeofday(&now, 0);
      timediff(&timeout, &last_time, &now);
    } while (timeout.tv_usec || timeout.tv_sec);
@@ -931,13 +931,13 @@ void game_loop(socket_t local_mother_desc)
    missed_pulses++;
    if (missed_pulses <= 0) {
-      log("SYSERR: **BAD** MISSED_PULSES NONPOSITIVE (%d), TIME GOING BACKWARDS!!", missed_pulses);
+      log("SYSERR: **BAD** MISSED_PULSES NONPOSITIVE (%ld), TIME GOING BACKWARDS!!", missed_pulses);
      missed_pulses = 1;
    }
    /* If we missed more than 30 seconds worth of pulses, just do 30 secs */
    if (missed_pulses > 30 RL_SEC) {
-      log("SYSERR: Missed %d seconds worth of pulses.", missed_pulses / PASSES_PER_SEC);
+      log("SYSERR: Missed %ld seconds worth of pulses.", missed_pulses / PASSES_PER_SEC);
      missed_pulses = 30 RL_SEC;
    }
@@ -968,7 +968,7 @@ void game_loop(socket_t local_mother_desc)
  }
 }
-void heartbeat(int heart_pulse)
+void heartbeat(const unsigned long heart_pulse)
 {
  static int mins_since_crashsave = 0;
@@ -1026,7 +1026,7 @@ void heartbeat(int heart_pulse)
 * Based on code submitted by ss@sirocco.cup.hp.com. Code to return the time
 * difference between a and b (a-b). Always returns a nonnegative value
 * (floors at 0). */
-static void timediff(struct timeval *rslt, struct timeval *a, struct timeval *b)
+static void timediff(struct timeval *rslt, const struct timeval *a, const struct timeval *b)
 {
  if (a->tv_sec < b->tv_sec)
    *rslt = null_time;
@@ -1048,7 +1048,7 @@ static void timediff(struct timeval *rslt, struct timeval *a, struct timeval *b)
 }
 /* Add 2 time values.  Patch sent by "d. hall" to fix 'static' usage. */
-static void timeadd(struct timeval *rslt, struct timeval *a, struct timeval *b)
+static void timeadd(struct timeval *rslt, const struct timeval *a, const struct timeval *b)
 {
  rslt->tv_sec = a->tv_sec + b->tv_sec;
  rslt->tv_usec = a->tv_usec + b->tv_usec;
@@ -1062,7 +1062,7 @@ static void timeadd(struct timeval *rslt, struct timeval *a, struct timeval *b)
 static void record_usage(void)
 {
  int sockets_connected = 0, sockets_playing = 0;
-  struct descriptor_data *d;
+  descriptor_data *d;
  for (d = descriptor_list; d; d = d->next) {
    sockets_connected++;
@@ -1085,7 +1085,7 @@ static void record_usage(void)
 }
 /* Turn off echoing (specific to telnet client) */
-void echo_off(struct descriptor_data *d)
+void echo_off(descriptor_data *d)
 {
  char off_string[] =
  {
@@ -1099,7 +1099,7 @@ void echo_off(struct descriptor_data *d)
 }
 /* Turn on echoing (specific to telnet client) */
-void echo_on(struct descriptor_data *d)
+void echo_on(descriptor_data *d)
 {
  char on_string[] =
  {
@@ -1112,7 +1112,7 @@ void echo_on(struct descriptor_data *d)
  write_to_output(d, "%s", on_string);
 }
-static char *make_prompt(struct descriptor_data *d)
+static char *make_prompt(const descriptor_data *d)
 {
  static char prompt[MAX_PROMPT_LENGTH];
@@ -1137,7 +1137,7 @@ static char *make_prompt(struct descriptor_data *d)
    }
    /* show only when below 25% */
    if (PRF_FLAGGED(d->character, PRF_DISPAUTO) && len < sizeof(prompt)) {
-      struct char_data *ch = d->character;
+      const char_data *ch = d->character;
      if (GET_HIT(ch) << 2 < GET_MAX_HIT(ch) ) {
        count = snprintf(prompt + len, sizeof(prompt) - len, "%dH ", GET_HIT(ch));
        if (count >= 0)
@@ -1206,11 +1206,11 @@ static char *make_prompt(struct descriptor_data *d)
  else
    *prompt = '\0';
-  return (prompt);
+  return prompt;
 }
 /* NOTE: 'txt' must be at most MAX_INPUT_LENGTH big. */
-void write_to_q(const char *txt, struct txt_q *queue, int aliased)
+void write_to_q(const char *txt, struct txt_q *queue, const int aliased)
 {
  struct txt_block *newt;
@@ -1250,7 +1250,7 @@ static int get_from_q(struct txt_q *queue, char *dest, int *aliased)
 }
 /* Empty the queues before closing connection */
-static void flush_queues(struct descriptor_data *d)
+static void flush_queues(descriptor_data *d)
 {
  if (d->large_outbuf) {
    d->large_outbuf->next = bufpool;
@@ -1265,7 +1265,7 @@ static void flush_queues(struct descriptor_data *d)
 }
 /* Add a new string to a player's output queue. For outside use. */
-size_t write_to_output(struct descriptor_data *t, const char *txt, ...)
+size_t write_to_output(descriptor_data *t, const char *txt, ...)
 {
  va_list args;
  size_t left;
@@ -1278,23 +1278,23 @@ size_t write_to_output(struct descriptor_data *t, const char *txt, ...)
 }
 /* Add a new string to a player's output queue. */
-size_t vwrite_to_output(struct descriptor_data *t, const char *format, va_list args)
+size_t vwrite_to_output(descriptor_data *t, const char *format, va_list args)
 {
  const char *text_overflow = "\r\nOVERFLOW\r\n";
  static char txt[MAX_STRING_LENGTH];
  size_t wantsize;
-  int size;
+  size_t size;
  /* if we're in the overflow state already, ignore this new output */
  if (t->bufspace == 0)
-    return (0);
+    return 0;
  wantsize = size = vsnprintf(txt, sizeof(txt), format, args);
-  strcpy(txt, ProtocolOutput( t, txt, (int*)&wantsize )); /* <--- Add this line */
+  strcpy(txt, ProtocolOutput( t, txt, &wantsize ));
-  size = wantsize;                    /* <--- Add this line */
+  size = wantsize;
-  if ( t->pProtocol->WriteOOB > 0 )   /* <--- Add this line */
+  if ( t->pProtocol->WriteOOB > 0 )
-    --t->pProtocol->WriteOOB;         /* <--- Add this line */
+    --t->pProtocol->WriteOOB;
  /* If exceeding the size of the buffer, truncate it for the overflow message */
  if (size < 0 || wantsize >= sizeof(txt)) {
@@ -1315,9 +1315,9 @@ size_t vwrite_to_output(struct descriptor_data *t, const char *format, va_list a
   * text just barely fits, then it's switched to a large buffer instead. */
  if (t->bufspace > size) {
    strcpy(t->output + t->bufptr, txt);	/* strcpy: OK (size checked above) */
-    t->bufspace -= size;
+    t->bufspace -= (ssize_t)size;
-    t->bufptr += size;
+    t->bufptr += (ssize_t)size;
-    return (t->bufspace);
+    return t->bufspace;
  }
  buf_switches++;
@@ -1337,12 +1337,12 @@ size_t vwrite_to_output(struct descriptor_data *t, const char *format, va_list a
  strcat(t->output, txt);	/* strcat: OK (size checked) */
  /* set the pointer for the next write */
-  t->bufptr = strlen(t->output);
+  t->bufptr = (ssize_t)strlen(t->output); // cast ok, strlen <<< SSIZE_MAX
  /* calculate how much space is left in the buffer */
  t->bufspace = LARGE_BUFSIZE - 1 - t->bufptr;
-  return (t->bufspace);
+  return t->bufspace;
 }
 static void free_bufpool(void)
@@ -1423,7 +1423,7 @@ int parse_ip(const char *addr, struct in_addr *inaddr)
      "functions to parse IP addresses (how bizarre!)");
  return (0);
 }
-#endif /* INET_ATON and INET_ADDR */
+#endif /* HAVE_INET_ATON HAVE_INET_ADDR */
 /* Sets the kernel's send buffer size for the descriptor */
 static int set_sendbuf(socket_t s)
@@ -1441,7 +1441,7 @@ static int set_sendbuf(socket_t s)
 }
 /* Initialize a descriptor */
-static void init_descriptor (struct descriptor_data *newd, int desc)
+static void init_descriptor (descriptor_data *newd, int desc)
 {
  static int last_desc = 0;	/* last descriptor number */
@@ -1467,9 +1467,9 @@ static int new_descriptor(socket_t s)
 {
  socket_t desc;
  int sockets_connected = 0;
-  int greetsize;
+  size_t greetsize;
  socklen_t i;
-  struct descriptor_data *newd;
+  descriptor_data *newd;
  struct sockaddr_in peer;
  struct hostent *from;
@@ -1477,7 +1477,7 @@ static int new_descriptor(socket_t s)
  i = sizeof(peer);
  if ((desc = accept(s, (struct sockaddr *) &peer, &i)) == INVALID_SOCKET) {
    perror("SYSERR: accept");
-    return (-1);
+    return -1;
  }
  /* keep it from blocking */
  nonblock(desc);
@@ -1485,7 +1485,7 @@ static int new_descriptor(socket_t s)
  /* set the send buffer size */
  if (set_sendbuf(desc) < 0) {
    CLOSE_SOCKET(desc);
-    return (0);
+    return 0;
  }
  /* make sure we have room for it */
@@ -1495,15 +1495,15 @@ static int new_descriptor(socket_t s)
  if (sockets_connected >= CONFIG_MAX_PLAYING) {
    write_to_descriptor(desc, "Sorry, the game is full right now... please try again later!\r\n");
    CLOSE_SOCKET(desc);
-    return (0);
+    return 0;
  }
  /* create a new descriptor */
  CREATE(newd, struct descriptor_data, 1);
  /* find the sitename */
  if (CONFIG_NS_IS_SLOW ||
-      !(from = gethostbyaddr((char *) &peer.sin_addr,
+      !((from = gethostbyaddr((char *) &peer.sin_addr,
-		             sizeof(peer.sin_addr), AF_INET))) {
+                              sizeof(peer.sin_addr), AF_INET)))) {
    /* resolution failed */
    if (!CONFIG_NS_IS_SLOW)
@@ -1522,7 +1522,7 @@ static int new_descriptor(socket_t s)
    CLOSE_SOCKET(desc);
    mudlog(CMP, LVL_GOD, TRUE, "Connection attempt denied from [%s]", newd->host);
    free(newd);
-    return (0);
+    return 0;
  }
  /* initialize descriptor data */
@@ -1551,10 +1551,10 @@ static int new_descriptor(socket_t s)
 *	14 bytes: overflow message
 *	 2 bytes: extra \r\n for non-comapct
 *      14 bytes: unused */
-static int process_output(struct descriptor_data *t)
+static ssize_t process_output(descriptor_data *t)
 {
  char i[MAX_SOCK_BUF], *osb = i + 2;
-  int result;
+  ssize_t result;
  /* we may need this \r\n for later -- see below */
  strcpy(i, "\r\n");	/* strcpy: OK (for 'MAX_SOCK_BUF >= 3') */
@@ -1584,15 +1584,14 @@ static int process_output(struct descriptor_data *t)
  } else
    result = write_to_descriptor(t->descriptor, osb);
-  if (result < 0) {	/* Oops, fatal error. Bye! */
+  if (result < 0) /* Oops, fatal error. Bye! */
-//    close_socket(t); // close_socket is called after return of negative result
+    return -1;
-    return (-1);
+  if (result == 0)	/* Socket buffer full. Try later. */
-  } else if (result == 0)	/* Socket buffer full. Try later. */
+    return 0;
    return (0);
  /* Handle snooping: prepend "% " and send to snooper. */
  if (t->snoop_by)
-    write_to_output(t->snoop_by, "%% %*s%%%%", result, t->output);
+    write_to_output(t->snoop_by, "%% %*s%%%%", (int)result, t->output);
  /* The common case: all saved output was handed off to the kernel buffer. */
  if (result >= t->bufptr) {
@@ -1607,17 +1606,17 @@ static int process_output(struct descriptor_data *t)
    /* reset total bufspace back to that of a small buffer */
    t->bufspace = SMALL_BUFSIZE - 1;
    t->bufptr = 0;
-    *(t->output) = '\0';
+    *t->output = '\0';
    /* If the overflow message or prompt were partially written, try to save
     * them. There will be enough space for them if this is true.  'result'
     * is effectively unsigned here anyway. */
    if ((unsigned int)result < strlen(osb)) {
-      size_t savetextlen = strlen(osb + result);
+      const size_t savetextlen = strlen(osb + result);
      strcat(t->output, osb + result);
-      t->bufptr   -= savetextlen;
+      t->bufptr   -= (ssize_t)savetextlen; // safe cast - savetextlen will always be <<< SSIZE_MAX
-      t->bufspace += savetextlen;
+      t->bufspace += (ssize_t)savetextlen;
    }
  } else {
@@ -1627,7 +1626,7 @@ static int process_output(struct descriptor_data *t)
    t->bufspace += result;
  }
-  return (result);
+  return result;
 }
 /* perform_socket_write: takes a descriptor, a pointer to text, and a
@@ -1684,13 +1683,13 @@ static ssize_t perform_socket_write(socket_t desc, const char *txt, size_t lengt
  if (result > 0) {
    /* Write was successful. */
-    return (result);
+    return result;
  }
  if (result == 0) {
    /* This should never happen! */
    log("SYSERR: Huh??  write() returned 0???  Please report this!");
-    return (-1);
+    return -1;
  }
  /* result < 0, so an error was encountered - is it transient? Unfortunately,
@@ -1698,21 +1697,21 @@ static ssize_t perform_socket_write(socket_t desc, const char *txt, size_t lengt
 #ifdef EAGAIN		/* POSIX */
  if (errno == EAGAIN)
-    return (0);
+    return 0;
 #endif
 #ifdef EWOULDBLOCK	/* BSD */
  if (errno == EWOULDBLOCK)
-    return (0);
+    return 0;
 #endif
 #ifdef EDEADLK		/* Macintosh */
  if (errno == EDEADLK)
-    return (0);
+    return 0;
 #endif
  /* Looks like the error was fatal.  Too bad. */
-  return (-1);
+  return -1;
 }
 #endif /* CIRCLE_WINDOWS */
@@ -1721,10 +1720,10 @@ static ssize_t perform_socket_write(socket_t desc, const char *txt, size_t lengt
 * delivered to the OS, or until an error is encountered. Returns:
 * >=0  If all is well and good.
 *  -1  If an error was encountered, so that the player should be cut off. */
-int write_to_descriptor(socket_t desc, const char *txt)
+ssize_t write_to_descriptor(socket_t desc, const char *txt)
 {
-  ssize_t bytes_written;
+  ssize_t bytes_written, write_total = 0;
-  size_t total = strlen(txt), write_total = 0;
+  size_t total = strlen(txt);
  while (total > 0) {
    bytes_written = perform_socket_write(desc, txt, total);
@@ -1733,17 +1732,17 @@ int write_to_descriptor(socket_t desc, const char *txt)
      /* Fatal error.  Disconnect the player. */
      perror("SYSERR: Write to socket");
      return (-1);
-    } else if (bytes_written == 0) {
+    }
    if (bytes_written == 0) {
      /* Temporary failure -- socket buffer full. */
-      return (write_total);
+      return write_total;
-    } else {
+    }
    txt += bytes_written;
    total -= bytes_written;
    write_total += bytes_written;
  }
  }
-  return (write_total);
+  return write_total;
 }
 /* Same information about perform_socket_write applies here. I like
@@ -1819,11 +1818,11 @@ static ssize_t perform_socket_read(socket_t desc, char *read_point, size_t space
 * above, 'tmp' lost the '+8' since it doesn't need it and the code has been
 * changed to reserve space by accepting one less character. (Do you really
 * need 256 characters on a line?) -gg 1/21/2000 */
-static int process_input(struct descriptor_data *t)
+static int process_input(descriptor_data *t)
 {
-  int buf_length, failed_subst;
+  int failed_subst;
  ssize_t bytes_read;
-  size_t space_left;
+  size_t buf_length, space_left;
  char *ptr, *read_point, *write_point, *nl_pos = NULL;
  char tmp[MAX_INPUT_LENGTH];
  static char read_buf[MAX_PROTOCOL_BUFFER] = { '\0' }; /* KaVir's plugin */
@@ -1836,7 +1835,7 @@ static int process_input(struct descriptor_data *t)
  do {
    if (space_left <= 0) {
      log("WARNING: process_input: about to close connection: input overflow");
-      return (-1);
+      return -1;
    }
    /* Read # of "bytes_read" from socket, and if we have something, mark the sizeof data
@@ -1850,9 +1849,9 @@ static int process_input(struct descriptor_data *t)
      bytes_read = ProtocolInput( t, read_buf, bytes_read, t->inbuf );
    if (bytes_read < 0)	/* Error, disconnect them. */
-      return (-1);
+      return -1;
-    else if (bytes_read == 0)	/* Just blocking, no problems. */
+    if (bytes_read == 0)	/* Just blocking, no problems. */
-      return (0);
+      return 0;
    /* at this point, we know we got some data from the read */
    *(read_point + bytes_read) = '\0';	/* terminate the string */
@@ -1912,23 +1911,24 @@ static int process_input(struct descriptor_data *t)
    *write_point = '\0';
-    if ((space_left <= 0) && (ptr < nl_pos)) {
+    if (space_left <= 0 && ptr < nl_pos) {
      char buffer[MAX_INPUT_LENGTH + 64];
      snprintf(buffer, sizeof(buffer), "Line too long.  Truncated to:\r\n%s\r\n", tmp);
      if (write_to_descriptor(t->descriptor, buffer) < 0)
-	return (-1);
+	      return -1;
    }
    if (t->snoop_by)
      write_to_output(t->snoop_by, "%% %s\r\n", tmp);
    failed_subst = 0;
-    if (*tmp == '!' && !(*(tmp + 1)))	/* Redo last command. */
+    if (*tmp == '!' && !*(tmp + 1))	/* Redo last command. */
      strcpy(tmp, t->last_input);	/* strcpy: OK (by mutual MAX_INPUT_LENGTH) */
    else if (*tmp == '!' && *(tmp + 1)) {
-      char *commandln = (tmp + 1);
+      char *commandln = tmp + 1;
      int starting_pos = t->history_pos,
-	  cnt = (t->history_pos == 0 ? HISTORY_SIZE - 1 : t->history_pos - 1);
+	    cnt = t->history_pos == 0 ? HISTORY_SIZE - 1 : t->history_pos - 1;
      skip_spaces(&commandln);
      for (; cnt != starting_pos; cnt--) {
@@ -1942,7 +1942,7 @@ static int process_input(struct descriptor_data *t)
 	        cnt = HISTORY_SIZE;
      }
    } else if (*tmp == '^') {
-      if (!(failed_subst = perform_subst(t, t->last_input, tmp)))
+      if (!((failed_subst = perform_subst(t, t->last_input, tmp))))
 	      strcpy(t->last_input, tmp);	/* strcpy: OK (by mutual MAX_INPUT_LENGTH) */
    } else {
      strcpy(t->last_input, tmp);	/* strcpy: OK (by mutual MAX_INPUT_LENGTH) */
@@ -1954,8 +1954,7 @@ static int process_input(struct descriptor_data *t)
    }
    /* The '--' command flushes the queue. */
-   if ( (*tmp == '-') && (*(tmp+1) == '-') && !(*(tmp+2)) )
+    if ( *tmp == '-' && *(tmp+1) == '-' && !*(tmp+2) ) {
   {
      write_to_output(t, "All queued commands cancelled.\r\n");
      flush_queues(t);  /* Flush the command queue */
      failed_subst = 1;  /* Allow the read point to be moved, but don't add to queue */
@@ -1981,13 +1980,13 @@ static int process_input(struct descriptor_data *t)
    *(write_point++) = *(read_point++);
  *write_point = '\0';
-  return (1);
+  return 1;
 }
 /* Perform substitution for the '^..^' csh-esque syntax orig is the orig string,
 * i.e. the one being modified.  subst contains the substition string, i.e.
 * "^telm^tell" */
-static int perform_subst(struct descriptor_data *t, char *orig, char *subst)
+static int perform_subst(descriptor_data *t, const char *orig, char *subst)
 {
  char newsub[MAX_INPUT_LENGTH + 5];
@@ -1998,16 +1997,16 @@ static int perform_subst(struct descriptor_data *t, char *orig, char *subst)
  first = subst + 1;
  /* now find the second '^' */
-  if (!(second = strchr(first, '^'))) {
+  if (!((second = strchr(first, '^')))) {
    write_to_output(t, "Invalid substitution.\r\n");
    return (1);
  }
  /* terminate "first" at the position of the '^' and make 'second' point
   * to the beginning of the second string */
-  *(second++) = '\0';
+  *second++ = '\0';
  /* now, see if the contents of the first string appear in the original */
-  if (!(strpos = strstr(orig, first))) {
+  if (!((strpos = strstr(orig, first)))) {
    write_to_output(t, "Invalid substitution.\r\n");
    return (1);
  }
@@ -2022,7 +2021,7 @@ static int perform_subst(struct descriptor_data *t, char *orig, char *subst)
  /* now, if there's anything left in the original after the string to
   * replaced, copy that too. */
-  if (((strpos - orig) + strlen(first)) < strlen(orig))
+  if (strpos - orig + strlen(first) < strlen(orig))
    strncat(newsub, strpos + strlen(first), MAX_INPUT_LENGTH - strlen(newsub) - 1);	/* strncpy: OK */
  /* terminate the string in case of an overflow from strncat */
@@ -2032,9 +2031,9 @@ static int perform_subst(struct descriptor_data *t, char *orig, char *subst)
  return (0);
 }
-void close_socket(struct descriptor_data *d)
+void close_socket(descriptor_data *d)
 {
-  struct descriptor_data *temp;
+  descriptor_data *temp;
  REMOVE_FROM_LIST(d, descriptor_list, next);
  CLOSE_SOCKET(d->descriptor);
@@ -2067,7 +2066,7 @@ void close_socket(struct descriptor_data *d)
    add_llog_entry(d->character, LAST_DISCONNECT);
    if (IS_PLAYING(d) || STATE(d) == CON_DISCONNECT) {
-      struct char_data *link_challenged = d->original ? d->original : d->character;
+      char_data *link_challenged = d->original ? d->original : d->character;
      /* We are guaranteed to have a person. */
      act("$n has lost $s link.", TRUE, link_challenged, 0, 0, TO_ROOM);
@@ -2135,7 +2134,7 @@ void close_socket(struct descriptor_data *d)
 static void check_idle_passwords(void)
 {
-  struct descriptor_data *d, *next_d;
+  descriptor_data *d, *next_d;
  for (d = descriptor_list; d; d = next_d) {
    next_d = d->next;
@@ -2144,13 +2143,12 @@ static void check_idle_passwords(void)
    if (!d->idle_tics) {
      d->idle_tics++;
      continue;
-    } else {
+    }
    echo_on(d);
    write_to_output(d, "\r\nTimed out... goodbye.\r\n");
    STATE(d) = CON_CLOSE;
  }
 }
 }
 /* I tried to universally convert Circle over to POSIX compliance, but
 * alas, some systems are still straggling behind and don't have all the
@@ -2231,7 +2229,8 @@ static RETSIGTYPE unrestrict_game(int sig)
 /* clean up our zombie kids to avoid defunct processes */
 static RETSIGTYPE reap(int sig)
 {
-  while (waitpid(-1, NULL, WNOHANG) > 0);
+  while (waitpid(-1, NULL, WNOHANG) > 0)
    ;
  my_signal(SIGCHLD, reap);
 }
@@ -2324,7 +2323,7 @@ static void signal_setup(void)
 /* Public routines for system-to-player-communication. */
 void game_info(const char *format, ...)
 {
-  struct descriptor_data *i;
+  descriptor_data *i;
  va_list args;
  char messg[MAX_STRING_LENGTH];
  if (format == NULL)
@@ -2344,7 +2343,7 @@ void game_info(const char *format, ...)
  }
 }
-size_t send_to_char(struct char_data *ch, const char *messg, ...)
+size_t send_to_char(const char_data *ch, const char *messg, ...)
 {
  if (ch->desc && messg && *messg) {
    size_t left;
@@ -2360,7 +2359,7 @@ size_t send_to_char(struct char_data *ch, const char *messg, ...)
 void send_to_all(const char *messg, ...)
 {
-  struct descriptor_data *i;
+  descriptor_data *i;
  va_list args;
  if (messg == NULL)
@@ -2378,7 +2377,7 @@ void send_to_all(const char *messg, ...)
 void send_to_outdoor(const char *messg, ...)
 {
-  struct descriptor_data *i;
+  descriptor_data *i;
  va_list args;
  if (!messg || !*messg)
@@ -2399,7 +2398,7 @@ void send_to_outdoor(const char *messg, ...)
 void send_to_room(room_rnum room, const char *messg, ...)
 {
-  struct char_data *i;
+  char_data *i;
  va_list args;
  if (messg == NULL)
@@ -2418,9 +2417,9 @@ void send_to_room(room_rnum room, const char *messg, ...)
 /* Sends a message to the entire group, except for ch.
 * Send 'ch' as NULL, if you want to message to reach
 * everyone. -Vatiken */
-void send_to_group(struct char_data *ch, struct group_data *group, const char * msg, ...)
+void send_to_group(const char_data *ch, const struct group_data *group, const char * msg, ...)
 {
-	struct char_data *tch;
+	char_data *tch;
  va_list args;
  if (msg == NULL)
@@ -2441,10 +2440,15 @@ void send_to_group(struct char_data *ch, struct group_data *group, const char *
 /* Thx to Jamie Nelson of 4D for this contribution */
 void send_to_range(room_vnum start, room_vnum finish, const char *messg, ...)
 {
-  struct char_data *i;
+  char_data *i;
  va_list args;
  int j;
  if (start == NOWHERE || finish == NOWHERE) {
    log("send_to_range passed start room or end room NOWHERE.");
    return;
  }
  if (start > finish) {
    log("send_to_range passed start room value greater then finish.");
    return;
@@ -2470,14 +2474,15 @@ static const char *ACTNULL = "<NULL>";
 #define CHECK_NULL(pointer, expression) \
  if ((pointer) == NULL) i = ACTNULL; else i = (expression);
 /* higher-level communication: the act() function */
-void perform_act(const char *orig, struct char_data *ch, struct obj_data *obj,
+void perform_act(const char *orig, char_data *ch, obj_data *obj,
-    void *vict_obj, struct char_data *to)
+                 // ReSharper disable once CppParameterMayBeConstPtrOrRef
                 void *vict_obj, char_data *to)
 {
  const char *i = NULL;
  char lbuf[MAX_STRING_LENGTH], *buf, *j;
  bool uppercasenext = FALSE;
-  struct char_data *dg_victim = (to == vict_obj) ? vict_obj : NULL;
+  char_data *dg_victim = (to == vict_obj) ? vict_obj : NULL;
-  struct obj_data *dg_target = NULL;
+  obj_data *dg_target = NULL;
  char *dg_arg = NULL;
  buf = lbuf;
@@ -2489,50 +2494,50 @@ void perform_act(const char *orig, struct char_data *ch, struct obj_data *obj,
 	      i = PERS(ch, to);
 	      break;
      case 'N':
-	CHECK_NULL(vict_obj, PERS((const struct char_data *) vict_obj, to));
+	      CHECK_NULL(vict_obj, PERS((const char_data *) vict_obj, to));
-	dg_victim = (struct char_data *) vict_obj;
+	      dg_victim = (char_data *) vict_obj;
 	      break;
      case 'm':
 	      i = HMHR(ch);
 	      break;
      case 'M':
-	CHECK_NULL(vict_obj, HMHR((const struct char_data *) vict_obj));
+	      CHECK_NULL(vict_obj, HMHR((const char_data *) vict_obj));
-	dg_victim = (struct char_data *) vict_obj;
+	      dg_victim = (char_data *) vict_obj;
 	      break;
      case 's':
 	      i = HSHR(ch);
 	      break;
      case 'S':
-	CHECK_NULL(vict_obj, HSHR((const struct char_data *) vict_obj));
+	      CHECK_NULL(vict_obj, HSHR((const char_data *) vict_obj));
-	dg_victim = (struct char_data *) vict_obj;
+	      dg_victim = (char_data *) vict_obj;
 	      break;
      case 'e':
 	      i = HSSH(ch);
 	      break;
      case 'E':
-	CHECK_NULL(vict_obj, HSSH((const struct char_data *) vict_obj));
+	      CHECK_NULL(vict_obj, HSSH((const char_data *) vict_obj));
-	dg_victim = (struct char_data *) vict_obj;
+	      dg_victim = (char_data *) vict_obj;
 	      break;
      case 'o':
 	      CHECK_NULL(obj, OBJN(obj, to));
 	      break;
      case 'O':
-	CHECK_NULL(vict_obj, OBJN((const struct obj_data *) vict_obj, to));
+	      CHECK_NULL(vict_obj, OBJN((const obj_data *) vict_obj, to));
-	dg_target = (struct obj_data *) vict_obj;
+	      dg_target = (obj_data *) vict_obj;
 	      break;
      case 'p':
 	      CHECK_NULL(obj, OBJS(obj, to));
 	      break;
      case 'P':
-	CHECK_NULL(vict_obj, OBJS((const struct obj_data *) vict_obj, to));
+	      CHECK_NULL(vict_obj, OBJS((const obj_data *) vict_obj, to));
-	dg_target = (struct obj_data *) vict_obj;
+	      dg_target = (obj_data *) vict_obj;
 	      break;
      case 'a':
 	      CHECK_NULL(obj, SANA(obj));
 	      break;
      case 'A':
-	CHECK_NULL(vict_obj, SANA((const struct obj_data *) vict_obj));
+	      CHECK_NULL(vict_obj, SANA((const obj_data *) vict_obj));
-	dg_target = (struct obj_data *) vict_obj;
+	      dg_target = (obj_data *) vict_obj;
 	      break;
      case 'T':
 	      CHECK_NULL(vict_obj, (const char *) vict_obj);
@@ -2542,11 +2547,12 @@ void perform_act(const char *orig, struct char_data *ch, struct obj_data *obj,
 	      CHECK_NULL(obj, (char *) obj);
 	      break;
      case 'F':
-	CHECK_NULL(vict_obj, fname((const char *) vict_obj));
+	      CHECK_NULL(vict_obj, fname(vict_obj));
 	      break;
      /* uppercase previous word */
      case 'u':
-        for (j=buf; j > lbuf && !isspace((int) *(j-1)); j--);
+        for (j=buf; j > lbuf && !isspace((int) *(j-1)); j--)
          ;
        if (j != buf)
          *j = UPPER(*j);
        i = "";
@@ -2565,17 +2571,15 @@ void perform_act(const char *orig, struct char_data *ch, struct obj_data *obj,
 	      i = "";
 	      break;
      }
-      while ((*buf = *(i++)))
+      while ((*buf = *(i++))) {
-        {
+        if (uppercasenext && !isspace((int) *buf)) {
        if (uppercasenext && !isspace((int) *buf))
          {
          *buf = UPPER(*buf);
          uppercasenext = FALSE;
        }
 	      buf++;
      }
      orig++;
-    } else if (!(*(buf++) = *(orig++))) {
+    } else if (!((*buf++ = *orig++))) {
      break;
    } else if (uppercasenext && !isspace((int) *(buf-1))) {
      *(buf-1) = UPPER(*(buf-1));
@@ -2598,10 +2602,10 @@ void perform_act(const char *orig, struct char_data *ch, struct obj_data *obj,
  last_act_message = strdup(lbuf);
 }
-char *act(const char *str, int hide_invisible, struct char_data *ch,
+char *act(const char *str, int hide_invisible, char_data *ch,
-	 struct obj_data *obj, void *vict_obj, int type)
+	 obj_data *obj, void *vict_obj, int type)
 {
-  struct char_data *to;
+  char_data *to;
  int to_sleeping;
  if (!str || !*str)
@@ -2616,12 +2620,12 @@ char *act(const char *str, int hide_invisible, struct char_data *ch,
   * short, it is a hack. */
  /* check if TO_SLEEP is there, and remove it if it is. */
-  if ((to_sleeping = (type & TO_SLEEP)))
+  if ((to_sleeping = type & TO_SLEEP))
    type &= ~TO_SLEEP;
  /* this is a hack as well - DG_NO_TRIG is 256 -- Welcor */
  /* If the bit is set, unset dg_act_check, thus the ! below */
-  if (!(dg_act_check = !IS_SET(type, DG_NO_TRIG)))
+  if (!((dg_act_check = !IS_SET(type, DG_NO_TRIG))))
    REMOVE_BIT(type, DG_NO_TRIG);
  if (type == TO_CHAR) {
@@ -2641,7 +2645,7 @@ char *act(const char *str, int hide_invisible, struct char_data *ch,
  }
  if (type == TO_GMOTE && !IS_NPC(ch)) {
-    struct descriptor_data *i;
+    descriptor_data *i;
    char buf[MAX_STRING_LENGTH];
    for (i = descriptor_list; i; i = i->next) {
@@ -2764,17 +2768,17 @@ static void circle_sleep(struct timeval *timeout)
 /* KaVir's plugin*/
 static void msdp_update( void )
 {
-  struct descriptor_data *d;
+  descriptor_data *d;
  int PlayerCount = 0;
  char buf[MAX_STRING_LENGTH];
  extern const char *pc_class_types[];
  for (d = descriptor_list; d; d = d->next)
  {
-    struct char_data *ch = d->character;
+    char_data *ch = d->character;
    if ( ch && !IS_NPC(ch) && d->connected == CON_PLAYING )
    {
-      struct char_data *pOpponent = FIGHTING(ch);
+      char_data *pOpponent = FIGHTING(ch);
      ++PlayerCount;
      MSDPSetString( d, eMSDP_CHARACTER_NAME, GET_NAME(ch) );
@@ -17,20 +17,14 @@
 #define COPYOVER_FILE "copyover.dat"
 /* comm.c */
-void close_socket(struct descriptor_data *d);
+void close_socket(descriptor_data *d);
 void game_info(const char *messg, ...) __attribute__ ((format (printf, 1, 2)));
-size_t send_to_char(struct char_data *ch, const char *messg, ...) __attribute__
+size_t send_to_char(const char_data *ch, const char *messg, ...) __attribute__((format (printf, 2, 3)));
-    ((format (printf, 2, 3)));
+void send_to_all(const char *messg, ...) __attribute__ ((format (printf, 1, 2)));
-void send_to_all(const char *messg, ...) __attribute__ ((format (printf, 1,
+void send_to_room(room_rnum room, const char *messg, ...) __attribute__ ((format (printf, 2, 3)));
-    2)));
+void send_to_outdoor(const char *messg, ...) __attribute__ ((format (printf, 1, 2)));
-void send_to_room(room_rnum room, const char *messg, ...) __attribute__ ((format
+void send_to_group(const char_data *ch, const struct group_data *group, const char * msg, ...) __attribute__ ((format(printf, 3, 4)));
-    (printf, 2, 3)));
+void send_to_range(room_vnum start, room_vnum finish, const char *messg, ...) __attribute__ ((format (printf, 3, 4)));
 void send_to_outdoor(const char *messg, ...) __attribute__ ((format (printf, 1,
    2)));
 void send_to_group(struct char_data *ch, struct group_data *group, const char * msg, ...) __attribute__ ((format
    (printf, 3, 4)));
 void send_to_range(room_vnum start, room_vnum finish, const char *messg, ...)
    __attribute__ ((format (printf, 3, 4)));
 /* Act type settings and flags */
 #define TO_ROOM     1   /**< act() type: to everyone in room, except ch. */
@@ -43,24 +37,24 @@ void send_to_range(room_vnum start, room_vnum finish, const char *messg, ...)
 /* act functions */
-void perform_act(const char *orig, struct char_data *ch, struct obj_data *obj, void *vict_obj, struct char_data *to);
+void perform_act(const char *orig, char_data *ch, obj_data *obj, void *vict_obj, char_data *to);
-char * act(const char *str, int hide_invisible, struct char_data *ch, struct obj_data *obj, void *vict_obj, int type);
+char * act(const char *str, int hide_invisible, char_data *ch, obj_data *obj, void *vict_obj, int type);
 /* I/O functions */
 void write_to_q(const char *txt, struct txt_q *queue, int aliased);
-int	write_to_descriptor(socket_t desc, const char *txt);
+ssize_t write_to_descriptor(socket_t desc, const char *txt);
-size_t	write_to_output(struct descriptor_data *d, const char *txt, ...) __attribute__ ((format (printf, 2, 3)));
+size_t write_to_output(descriptor_data *d, const char *txt, ...) __attribute__ ((format (printf, 2, 3)));
-size_t	vwrite_to_output(struct descriptor_data *d, const char *format, va_list args);
+size_t vwrite_to_output(descriptor_data *d, const char *format, va_list args);
 typedef RETSIGTYPE sigfunc(int);
-void echo_off(struct descriptor_data *d);
+void echo_off(descriptor_data *d);
-void echo_on(struct descriptor_data *d);
+void echo_on(descriptor_data *d);
 void game_loop(socket_t mother_desc);
-void heartbeat(int heart_pulse);
+void heartbeat(unsigned long heart_pulse);
 void copyover_recover(void);
-extern struct descriptor_data *descriptor_list;
+extern descriptor_data *descriptor_list;
 extern int buf_largecount;
 extern int buf_overflows;
 extern int buf_switches;
@@ -46,14 +46,14 @@ struct config_data config_info; /* Game configuration list.	 */
 struct room_data *world = NULL;	/* array of rooms		 */
 room_rnum top_of_world = 0;	/* ref to top element of world	 */
-struct char_data *character_list = NULL; /* global linked list of chars	*/
+char_data *character_list = NULL; /* global linked list of chars	*/
 struct index_data *mob_index;	/* index table for mobile file	 */
-struct char_data *mob_proto;	/* prototypes for mobs		 */
+char_data *mob_proto;	/* prototypes for mobs		 */
 mob_rnum top_of_mobt = 0;	/* top of mobile index table	 */
-struct obj_data *object_list = NULL;	/* global linked list of objs	*/
+obj_data *object_list = NULL;	/* global linked list of objs	*/
 struct index_data *obj_index;	/* index table for object file	 */
-struct obj_data *obj_proto;	/* prototypes for objs		 */
+obj_data *obj_proto;	/* prototypes for objs		 */
 obj_rnum top_of_objt = 0;	/* top of object index table	 */
 struct zone_data *zone_table; /* zone table      */
@@ -128,9 +128,9 @@ static int converting = FALSE;
 /* Local (file scope) utility functions */
 static int check_bitvector_names(bitvector_t bits, size_t namecount, const char *whatami, const char *whatbits);
-static int check_object_spell_number(struct obj_data *obj, int val);
+static int check_object_spell_number(obj_data *obj, int val);
-static int check_object_level(struct obj_data *obj, int val);
+static int check_object_level(obj_data *obj, int val);
-static int check_object(struct obj_data *);
+static int check_object(obj_data *);
 static void load_zones(FILE *fl, char *zonename);
 static int file_to_string(const char *name, char *buf);
 static int file_to_string_alloc(const char *name, char **buf);
@@ -501,8 +501,8 @@ static void free_extra_descriptions(struct extra_descr_data *edesc)
 void destroy_db(void)
 {
  ssize_t cnt, itr;
-  struct char_data *chtmp, *i = character_list;
+  char_data *chtmp, *i = character_list;
-  struct obj_data *objtmp;
+  obj_data *objtmp;
  /* Active Mobiles & Players */
  while (i) {
@@ -1040,17 +1040,17 @@ void index_boot(int mode)
    log("   %d rooms, %d bytes.", rec_count, size[0]);
    break;
  case DB_BOOT_MOB:
-    CREATE(mob_proto, struct char_data, rec_count);
+    CREATE(mob_proto, char_data, rec_count);
    CREATE(mob_index, struct index_data, rec_count);
    size[0] = sizeof(struct index_data) * rec_count;
-    size[1] = sizeof(struct char_data) * rec_count;
+    size[1] = sizeof(char_data) * rec_count;
    log("   %d mobs, %d bytes in index, %d bytes in prototypes.", rec_count, size[0], size[1]);
    break;
  case DB_BOOT_OBJ:
-    CREATE(obj_proto, struct obj_data, rec_count);
+    CREATE(obj_proto, obj_data, rec_count);
    CREATE(obj_index, struct index_data, rec_count);
    size[0] = sizeof(struct index_data) * rec_count;
-    size[1] = sizeof(struct obj_data) * rec_count;
+    size[1] = sizeof(obj_data) * rec_count;
    log("   %d objs, %d bytes in index, %d bytes in prototypes.", rec_count, size[0], size[1]);
    break;
  case DB_BOOT_ZON:
@@ -2349,7 +2349,7 @@ static int hsort(const void *a, const void *b)
  return (str_cmp(a1->keywords, b1->keywords));
 }
-int vnum_mobile(char *searchname, struct char_data *ch)
+int vnum_mobile(char *searchname, char_data *ch)
 {
  int nr, found = 0;
@@ -2362,7 +2362,7 @@ int vnum_mobile(char *searchname, struct char_data *ch)
  return (found);
 }
-int vnum_object(char *searchname, struct char_data *ch)
+int vnum_object(char *searchname, char_data *ch)
 {
  int nr, found = 0;
@@ -2375,7 +2375,7 @@ int vnum_object(char *searchname, struct char_data *ch)
  return (found);
 }
-int vnum_room(char *searchname, struct char_data *ch)
+int vnum_room(char *searchname, char_data *ch)
 {
 int nr, found = 0;
@@ -2387,7 +2387,7 @@ int vnum_room(char *searchname, struct char_data *ch)
  return (found);
 }
-int vnum_trig(char *searchname, struct char_data *ch)
+int vnum_trig(char *searchname, char_data *ch)
 {
 int nr, found = 0;
  for (nr = 0; nr < top_of_trigt; nr++)
@@ -2398,11 +2398,11 @@ int vnum_trig(char *searchname, struct char_data *ch)
 }
 /* create a character, and add it to the char list */
-struct char_data *create_char(void)
+char_data *create_char(void)
 {
-  struct char_data *ch;
+  char_data *ch;
-  CREATE(ch, struct char_data, 1);
+  CREATE(ch, char_data, 1);
  clear_char(ch);
  new_mobile_data(ch);
@@ -2415,7 +2415,7 @@ struct char_data *create_char(void)
  return (ch);
 }
-void new_mobile_data(struct char_data *ch)
+void new_mobile_data(char_data *ch)
 {
  ch->events   = NULL;
  ch->group    = NULL;
@@ -2423,10 +2423,10 @@ void new_mobile_data(struct char_data *ch)
 /* create a new mobile from a prototype */
-struct char_data *read_mobile(mob_vnum nr, int type) /* and mob_rnum */
+char_data *read_mobile(mob_vnum nr, int type) /* and mob_rnum */
 {
  mob_rnum i;
-  struct char_data *mob;
+  char_data *mob;
  if (type == VIRTUAL) {
    if ((i = real_mobile(nr)) == NOBODY) {
@@ -2436,7 +2436,7 @@ struct char_data *read_mobile(mob_vnum nr, int type) /* and mob_rnum */
  } else
    i = nr;
-  CREATE(mob, struct char_data, 1);
+  CREATE(mob, char_data, 1);
  clear_char(mob);
  *mob = mob_proto[i];
@@ -2470,11 +2470,11 @@ struct char_data *read_mobile(mob_vnum nr, int type) /* and mob_rnum */
 }
 /* create an object, and add it to the object list */
-struct obj_data *create_obj(void)
+obj_data *create_obj(void)
 {
-  struct obj_data *obj;
+  obj_data *obj;
-  CREATE(obj, struct obj_data, 1);
+  CREATE(obj, obj_data, 1);
  clear_object(obj);
  obj->next = object_list;
  object_list = obj;
@@ -2487,9 +2487,9 @@ struct obj_data *create_obj(void)
 }
 /* create a new object from a prototype */
-struct obj_data *read_object(obj_vnum nr, int type) /* and obj_rnum */
+obj_data *read_object(obj_vnum nr, int type) /* and obj_rnum */
 {
-  struct obj_data *obj;
+  obj_data *obj;
  obj_rnum i = type == VIRTUAL ? real_object(nr) : nr;
  if (i == NOTHING || i > top_of_objt) {
@@ -2497,7 +2497,7 @@ struct obj_data *read_object(obj_vnum nr, int type) /* and obj_rnum */
    return (NULL);
  }
-  CREATE(obj, struct obj_data, 1);
+  CREATE(obj, obj_data, 1);
  clear_object(obj);
  *obj = obj_proto[i];
  obj->next = object_list;
@@ -2565,7 +2565,7 @@ void zone_update(void)
      reset_zone(update_u->zone_to_reset);
      mudlog(CMP, LVL_IMPL+1, FALSE, "Auto zone reset: %s (Zone %d)",
          zone_table[update_u->zone_to_reset].name, zone_table[update_u->zone_to_reset].number);
-      struct descriptor_data *pt;
+      descriptor_data *pt;
      for (pt = descriptor_list; pt; pt = pt->next)
        if (IS_PLAYING(pt) && pt->character && PRF_FLAGGED(pt->character, PRF_ZONERESETS))
          send_to_char(pt->character, "%s[Auto zone reset: %s (Zone %d)]%s", 
@@ -2603,12 +2603,12 @@ static void log_zone_error(zone_rnum zone, int cmd_no, const char *message)
 void reset_zone(zone_rnum zone)
 {
  int cmd_no, last_cmd = 0;
-  struct char_data *mob = NULL;
+  char_data *mob = NULL;
-  struct obj_data *obj, *obj_to;
+  obj_data *obj, *obj_to;
  room_vnum rvnum;
  room_rnum rrnum;
-  struct char_data *tmob=NULL; /* for trigger assignment */
+  char_data *tmob=NULL; /* for trigger assignment */
-  struct obj_data *tobj=NULL;  /* for trigger assignment */
+  obj_data *tobj=NULL;  /* for trigger assignment */
  for (cmd_no = 0; ZCMD.command != 'S'; cmd_no++) {
@@ -2835,7 +2835,7 @@ void reset_zone(zone_rnum zone)
 /* for use in reset_zone; return TRUE if zone 'nr' is free of PC's  */
 int is_empty(zone_rnum zone_nr)
 {
-  struct descriptor_data *i;
+  descriptor_data *i;
  for (i = descriptor_list; i; i = i->next) {
    if (STATE(i) != CON_PLAYING)
@@ -3226,7 +3226,7 @@ static void free_followers(struct follow_type *k)
 }
 /* release memory allocated for a char struct */
-void free_char(struct char_data *ch)
+void free_char(char_data *ch)
 {
  int i;
  struct alias_data *a;
@@ -3320,7 +3320,7 @@ void free_char(struct char_data *ch)
 }
 /* release memory allocated for an obj struct */
-void free_obj(struct obj_data *obj)
+void free_obj(obj_data *obj)
 {
  if (GET_OBJ_RNUM(obj) == NOWHERE) {
    free_object_strings(obj);
@@ -3357,7 +3357,7 @@ static int file_to_string_alloc(const char *name, char **buf)
 {
  int temppage;
  char temp[MAX_STRING_LENGTH];
-  struct descriptor_data *in_use;
+  descriptor_data *in_use;
  for (in_use = descriptor_list; in_use; in_use = in_use->next)
    if (in_use->showstr_vector && *in_use->showstr_vector == *buf)
@@ -3435,7 +3435,7 @@ static int file_to_string(const char *name, char *buf)
 }
 /* clear some of the the working variables of a char */
-void reset_char(struct char_data *ch)
+void reset_char(char_data *ch)
 {
  int i;
@@ -3467,9 +3467,9 @@ void reset_char(struct char_data *ch)
 }
 /* clear ALL the working variables of a char; do NOT free any space alloc'ed */
-void clear_char(struct char_data *ch)
+void clear_char(char_data *ch)
 {
-  memset((char *) ch, 0, sizeof(struct char_data));
+  memset((char *) ch, 0, sizeof(char_data));
  IN_ROOM(ch) = NOWHERE;
  GET_PFILEPOS(ch) = -1;
@@ -3484,9 +3484,9 @@ void clear_char(struct char_data *ch)
    ch->points.max_mana = 100;
 }
-void clear_object(struct obj_data *obj)
+void clear_object(obj_data *obj)
 {
-  memset((char *) obj, 0, sizeof(struct obj_data));
+  memset((char *) obj, 0, sizeof(obj_data));
  obj->item_number = NOTHING;
  IN_ROOM(obj) = NOWHERE;
@@ -3495,7 +3495,7 @@ void clear_object(struct obj_data *obj)
 /* Called during character creation after picking character class (and then
 * never again for that character). */
-void init_char(struct char_data *ch)
+void init_char(char_data *ch)
 {
  int i;
@@ -3597,7 +3597,7 @@ room_rnum real_room(room_vnum vnum)
  bot = 0;
  top = top_of_world;
-  if (world[bot].number > vnum || world[top].number < vnum)
+  if (vnum == NOWHERE || world[bot].number > vnum || world[top].number < vnum)
    return (NOWHERE);
  /* perform binary search on world-table */
@@ -3623,7 +3623,7 @@ mob_rnum real_mobile(mob_vnum vnum)
  top = top_of_mobt;
  /* quickly reject out-of-range vnums */
-  if (mob_index[bot].vnum > vnum || mob_index[top].vnum < vnum)
+  if (vnum == NOBODY || mob_index[bot].vnum > vnum || mob_index[top].vnum < vnum)
    return (NOBODY);
  /* perform binary search on mob-table */
@@ -3649,7 +3649,7 @@ obj_rnum real_object(obj_vnum vnum)
  top = top_of_objt;
  /* quickly reject out-of-range vnums */
-  if (obj_index[bot].vnum > vnum || obj_index[top].vnum < vnum)
+  if (vnum == NOTHING || obj_index[bot].vnum > vnum || obj_index[top].vnum < vnum)
    return (NOTHING);
  /* perform binary search on obj-table */
@@ -3674,7 +3674,7 @@ zone_rnum real_zone(zone_vnum vnum)
  bot = 0;
  top = top_of_zone_table;
-  if (zone_table[bot].number > vnum || zone_table[top].number < vnum)
+  if (vnum == NOWHERE || zone_table[bot].number > vnum || zone_table[top].number < vnum)
    return (NOWHERE);
  /* perform binary search on zone-table */
@@ -3692,7 +3692,7 @@ zone_rnum real_zone(zone_vnum vnum)
 }
 /* Extend later to include more checks and add checks for unknown bitvectors. */
-static int check_object(struct obj_data *obj)
+static int check_object(obj_data *obj)
 {
  char objname[MAX_INPUT_LENGTH + 32];
  int error = FALSE, y;
@@ -3770,7 +3770,7 @@ static int check_object(struct obj_data *obj)
  return (error);
 }
-static int check_object_spell_number(struct obj_data *obj, int val)
+static int check_object_spell_number(obj_data *obj, int val)
 {
  int error = FALSE;
  const char *spellname;
@@ -3804,7 +3804,7 @@ static int check_object_spell_number(struct obj_data *obj, int val)
  return (error);
 }
-static int check_object_level(struct obj_data *obj, int val)
+static int check_object_level(obj_data *obj, int val)
 {
  int error = FALSE;
@@ -174,8 +174,7 @@ struct reset_com {
 /* zone definition structure. for the 'zone-table'   */
 struct zone_data {
    char *name;              /* name of this zone                  */
-   char *builders;          /* namelist of builders allowed to    */
+    char *builders;          /* namelist of builders allowed to  modify this zone. */
                            /* modify this zone.		  */
    int  lifespan;           /* how long between resets (minutes)  */
    int  age;                /* current age of this zone (minutes) */
    room_vnum bot;           /* starting room number for this zone */
@@ -229,7 +228,7 @@ struct help_index_element {
 /* for the "buffered" rent and house object loading */
 struct obj_save_data_t {
-  struct obj_data *obj;
+    obj_data *obj;
    int locate;
    struct obj_save_data_t *next;
 };
@@ -256,7 +255,7 @@ void  free_text_files(void);
 void  free_help_table(void);
 void  free_player_index(void);
 void  load_help(FILE *fl, char *name);
-void  new_mobile_data(struct char_data *ch);
+void  new_mobile_data(char_data *ch);
 zone_rnum real_zone(zone_vnum vnum);
 room_rnum real_room(room_vnum vnum);
@@ -265,45 +264,45 @@ obj_rnum real_object(obj_vnum vnum);
 /* Public Procedures from objsave.c */
 void  Crash_save_all(void);
-void  Crash_idlesave(struct char_data *ch);
+void  Crash_idlesave(char_data *ch);
-void  Crash_crashsave(struct char_data *ch);
+void  Crash_crashsave(char_data *ch);
-int Crash_load(struct char_data *ch);
+int Crash_load(char_data *ch);
-void  Crash_listrent(struct char_data *ch, char *name);
+void  Crash_listrent(char_data *ch, char *name);
 int Crash_clean_file(char *name);
-int Crash_delete_crashfile(struct char_data *ch);
+int Crash_delete_crashfile(char_data *ch);
 int Crash_delete_file(char *name);
 void update_obj_file(void);
-void Crash_rentsave(struct char_data *ch, int cost);
+void Crash_rentsave(char_data *ch, int cost);
 obj_save_data *objsave_parse_objects(FILE *fl);
-int objsave_save_obj_record(struct obj_data *obj, FILE *fl, int location);
+int objsave_save_obj_record(obj_data *obj, FILE *fl, int location);
 /* Special functions */
 SPECIAL(receptionist);
 SPECIAL(cryogenicist);
 /* Functions from players.c */
 void   tag_argument(char *argument, char *tag);
-int    load_char(const char *name, struct char_data *ch);
+int    load_char(const char *name, char_data *ch);
-void   save_char(struct char_data *ch);
+void   save_char(char_data *ch);
-void   init_char(struct char_data *ch);
+void   init_char(char_data *ch);
-struct char_data* create_char(void);
+char_data* create_char(void);
-struct char_data *read_mobile(mob_vnum nr, int type);
+char_data *read_mobile(mob_vnum nr, int type);
-int    vnum_mobile(char *searchname, struct char_data *ch);
+int    vnum_mobile(char *searchname, char_data *ch);
-void   clear_char(struct char_data *ch);
+void   clear_char(char_data *ch);
-void   reset_char(struct char_data *ch);
+void   reset_char(char_data *ch);
-void   free_char(struct char_data *ch);
+void   free_char(char_data *ch);
 void   save_player_index(void);
 long   get_ptable_by_name(const char *name);
 void   remove_player(int pfilepos);
 void   clean_pfiles(void);
 void   build_player_index(void);
-struct obj_data *create_obj(void);
+obj_data *create_obj(void);
-void   clear_object(struct obj_data *obj);
+void   clear_object(obj_data *obj);
-void   free_obj(struct obj_data *obj);
+void   free_obj(obj_data *obj);
-struct obj_data *read_object(obj_vnum nr, int type);
+obj_data *read_object(obj_vnum nr, int type);
-int    vnum_object(char *searchname, struct char_data *ch);
+int    vnum_object(char *searchname, char_data *ch);
-int    vnum_room(char *, struct char_data *);
+int    vnum_room(char *, char_data *);
-int    vnum_trig(char *, struct char_data *);
+int    vnum_trig(char *, char_data *);
 void setup_dir(FILE *fl, int room, int dir);
 void index_boot(int mode);
@@ -366,15 +365,15 @@ extern room_rnum top_of_world;
 extern struct zone_data *zone_table;
 extern zone_rnum top_of_zone_table;
-extern struct char_data *character_list;
+extern char_data *character_list;
 extern struct index_data *mob_index;
-extern struct char_data *mob_proto;
+extern char_data *mob_proto;
 extern mob_rnum top_of_mobt;
 extern struct index_data *obj_index;
-extern struct obj_data *object_list;
+extern obj_data *object_list;
-extern struct obj_data *obj_proto;
+extern obj_data *obj_proto;
 extern obj_rnum top_of_objt;
 extern struct social_messg *soc_mess_list;
@@ -188,7 +188,7 @@ void sub_write(char *arg, char_data *ch, byte find_invis, int targets)
 void send_to_zone(char *messg, zone_rnum zone)
 {
-  struct descriptor_data *i;
+  descriptor_data *i;
  if (!messg || !*messg)
    return;
@@ -214,7 +214,7 @@ void dg_read_trigger(FILE *fp, void *proto, int type)
  }
 }
-void dg_obj_trigger(char *line, struct obj_data *obj)
+void dg_obj_trigger(char *line, obj_data *obj)
 {
  char junk[8];
  int vnum, rnum, count;
@@ -251,8 +251,8 @@ void dg_obj_trigger(char *line, struct obj_data *obj)
 void assign_triggers(void *i, int type)
 {
-  struct char_data *mob = NULL;
+  char_data *mob = NULL;
-  struct obj_data *obj = NULL;
+  obj_data *obj = NULL;
  struct room_data *room = NULL;
  int rnum;
  struct trig_proto_list *trg_proto;
@@ -119,12 +119,12 @@ void extract_script(void *thing, int type)
  switch (type) {
    case MOB_TRIGGER:
-      mob = (struct char_data *)thing;
+      mob = (char_data *)thing;
      sc = SCRIPT(mob);
      SCRIPT(mob) = NULL;
      break;
    case OBJ_TRIGGER:
-      obj = (struct obj_data *)thing;
+      obj = (obj_data *)thing;
      sc = SCRIPT(obj);
      SCRIPT(obj) = NULL;
      break;
@@ -137,8 +137,8 @@ void extract_script(void *thing, int type)
 #if 1 /* debugging */
  {
-    struct char_data *i = character_list;
+    char_data *i = character_list;
-    struct obj_data *j = object_list;
+    obj_data *j = object_list;
    room_rnum k;
    if (sc) {
      for ( ; i ; i = i->next)
@@ -185,12 +185,12 @@ void free_proto_script(void *thing, int type)
  switch (type) {
    case MOB_TRIGGER:
-      mob = (struct char_data *)thing;
+      mob = (char_data *)thing;
      proto = mob->proto_script;
      mob->proto_script = NULL;
      break;
    case OBJ_TRIGGER:
-      obj = (struct obj_data *)thing;
+      obj = (obj_data *)thing;
      proto = obj->proto_script;
      obj->proto_script = NULL;
      break;
@@ -202,8 +202,8 @@ void free_proto_script(void *thing, int type)
  }
 #if 1 /* debugging */
  {
-    struct char_data *i = character_list;
+    char_data *i = character_list;
-    struct obj_data *j = object_list;
+    obj_data *j = object_list;
    room_rnum k;
    if (proto) {
      for ( ; i ; i = i->next)
@@ -35,9 +35,9 @@
 * the spell is set to TAR_IGNORE. Also, group spells are not permitted. */
 void do_dg_cast(void *go, struct script_data *sc, trig_data *trig, int type, char *cmd)
 {
-  struct char_data *caster = NULL;
+  char_data *caster = NULL;
-  struct char_data *tch = NULL;
+  char_data *tch = NULL;
-  struct obj_data *tobj = NULL;
+  obj_data *tobj = NULL;
  struct room_data *caster_room = NULL;
  char *s, *t;
  int spellnum, target = 0;
@@ -46,13 +46,13 @@ void do_dg_cast(void *go, struct script_data *sc, trig_data *trig, int type, cha
  /* need to get the caster or the room of the temporary caster */
  switch (type) {
    case MOB_TRIGGER:
-      caster = (struct char_data *)go;
+      caster = (char_data *)go;
      break;
    case WLD_TRIGGER:
      caster_room = (struct room_data *)go;
      break;
    case OBJ_TRIGGER:
-      caster_room = dg_room_of_obj((struct obj_data *)go);
+      caster_room = dg_room_of_obj((obj_data *)go);
      if (!caster_room) {
        script_log("dg_do_cast: unknown room for object-caster!");
        return;
@@ -131,7 +131,7 @@ void do_dg_cast(void *go, struct script_data *sc, trig_data *trig, int type, cha
    /* set the caster's name to that of the object, or the gods.... */
    if (type==OBJ_TRIGGER)
      caster->player.short_descr =
-        strdup(((struct obj_data *)go)->short_description);
+        strdup(((obj_data *)go)->short_description);
    else if (type==WLD_TRIGGER)
      caster->player.short_descr = strdup("The gods");
    caster->next_in_room = caster_room->people;
@@ -152,7 +152,7 @@ void do_dg_cast(void *go, struct script_data *sc, trig_data *trig, int type, cha
 void do_dg_affect(void *go, struct script_data *sc, trig_data *trig,
 		  int script_type, char *cmd)
 {
-  struct char_data *ch = NULL;
+  char_data *ch = NULL;
  int value=0, duration=0;
  char junk[MAX_INPUT_LENGTH]; /* will be set to "dg_affect" */
  char charname[MAX_INPUT_LENGTH], property[MAX_INPUT_LENGTH];
@@ -238,7 +238,7 @@ void do_dg_affect(void *go, struct script_data *sc, trig_data *trig,
  affect_to_char(ch, &af);
 }
-void send_char_pos(struct char_data *ch, int dam)
+void send_char_pos(char_data *ch, int dam)
 {
  switch (GET_POS(ch)) {
    case POS_MORTALLYW:
@@ -269,7 +269,7 @@ void send_char_pos(struct char_data *ch, int dam)
 /* Used throughout the xxxcmds.c files for checking if a char can be targetted
 * - allow_gods is false when called by %force%, for instance, while true for
 * %teleport%. - Welcor */
-int valid_dg_target(struct char_data *ch, int bitvector)
+int valid_dg_target(char_data *ch, int bitvector)
 {
  if (IS_NPC(ch))
    return TRUE;  /* all npcs are allowed as targets */
@@ -286,7 +286,7 @@ int valid_dg_target(struct char_data *ch, int bitvector)
    return FALSE;  /* The rest are gods with nohassle on... */
 }
-void script_damage(struct char_data *vict, int dam)
+void script_damage(char_data *vict, int dam)
 {
  if (GET_LEVEL(vict)>=LVL_IMMORT && (dam > 0)) {
    send_to_char(vict, "Being the cool immortal you are, you sidestep a trap, "
@@ -320,7 +320,7 @@ ACMD(do_mzoneecho)
    if (!*room_number || !*msg)
        mob_log(ch, "mzoneecho called with too few args");
-    else if ((zone = real_zone_by_thing(atoi(room_number))) == NOWHERE)
+    else if ((zone = real_zone_by_thing(atoidx(room_number))) == NOWHERE)
        mob_log(ch, "mzoneecho called for nonexistant zone");
    else {
@@ -355,7 +355,7 @@ ACMD(do_mload)
    target = two_arguments(argument, arg1, arg2);
-    if (!*arg1 || !*arg2 || !is_number(arg2) || ((number = atoi(arg2)) < 0)) {
+    if (!*arg1 || !*arg2 || !is_number(arg2) || ((number = atoidx(arg2)) == NOBODY)) {
        mob_log(ch, "mload: bad syntax");
        return;
    }
@@ -366,7 +366,7 @@ ACMD(do_mload)
      if (!target || !*target) {
        rnum = IN_ROOM(ch);
      } else {
-        if (!isdigit(*target) || (rnum = real_room(atoi(target))) == NOWHERE) {
+        if (!isdigit(*target) || (rnum = real_room(atoidx(target))) == NOWHERE) {
          mob_log(ch, "mload: room target vnum doesn't exist "
                      "(loading mob vnum %d to room %s)", number, target);
          return;
@@ -699,7 +699,7 @@ ACMD(do_mforce)
    }
    if (!str_cmp(arg, "all")) {
-        struct descriptor_data *i;
+        descriptor_data *i;
        char_data *vch;
        for (i = descriptor_list; i ; i = i->next) {
@@ -914,10 +914,10 @@ ACMD(do_mtransform)
    mob_log(ch, "mtransform: bad argument");
  else {
    if (isdigit(*arg))
-      m = read_mobile(atoi(arg), VIRTUAL);
+      m = read_mobile(atoidx(arg), VIRTUAL);
    else {
      keep_hp = 0;
-      m = read_mobile(atoi(arg+1), VIRTUAL);
+      m = read_mobile(atoidx(arg+1), VIRTUAL);
    }
    if (m==NULL) {
      mob_log(ch, "mtransform: bad mobile vnum");
@@ -1070,7 +1070,7 @@ ACMD(do_mdoor)
            newexit->exit_info = (sh_int)asciiflag_conv(value);
            break;
        case 3:  /* key         */
-            newexit->key = atoi(value);
+            newexit->key = atoidx(value);
            break;
        case 4:  /* name        */
            if (newexit->keyword)
@@ -1079,7 +1079,7 @@ ACMD(do_mdoor)
            strcpy(newexit->keyword, value);
            break;
        case 5:  /* room        */
-            if ((to_room = real_room(atoi(value))) != NOWHERE)
+            if ((to_room = real_room(atoidx(value))) != NOWHERE)
                newexit->to_room = to_room;
            else
                mob_log(ch, "mdoor: invalid door target");
@@ -1091,7 +1091,7 @@ ACMD(do_mdoor)
 ACMD(do_mfollow)
 {
  char buf[MAX_INPUT_LENGTH];
-  struct char_data *leader;
+  char_data *leader;
  struct follow_type *j, *k;
  if (!MOB_OR_IMPL(ch)) {
@@ -1176,5 +1176,5 @@ ACMD(do_mrecho)
    if (!*msg || !*start || !*finish || !is_number(start) || !is_number(finish))
      mob_log(ch, "mrecho called with too few args");
    else
-      send_to_range(atoi(start), atoi(finish), "%s\r\n", msg);
+      send_to_range(atoidx(start), atoidx(finish), "%s\r\n", msg);
 }
@@ -88,7 +88,7 @@ room_rnum obj_room(obj_data *obj)
 /* returns the real room number, or NOWHERE if not found or invalid */
 static room_rnum find_obj_target_room(obj_data *obj, char *rawroomstr)
 {
-    int tmp;
+    room_vnum tmp;
    room_rnum location;
    char_data *target_mob;
    obj_data *target_obj;
@@ -101,7 +101,7 @@ static room_rnum find_obj_target_room(obj_data *obj, char *rawroomstr)
    if (isdigit(*roomstr) && !strchr(roomstr, '.'))
    {
-        tmp = atoi(roomstr);
+        tmp = atoidx(roomstr);
        if ((location = real_room(tmp)) == NOWHERE)
            return NOWHERE;
    }
@@ -220,7 +220,7 @@ static OCMD(do_ozoneecho)
    if (!*room_number || !*msg)
 	obj_log(obj, "ozoneecho called with too few args");
-    else if ((zone = real_zone_by_thing(atoi(room_number))) == NOWHERE)
+    else if ((zone = real_zone_by_thing(atoidx(room_number))) == NOWHERE)
 	obj_log(obj, "ozoneecho called for nonexistant zone");
    else {
@@ -275,7 +275,7 @@ static OCMD(do_orecho)
    if (!*msg || !*start || !*finish || !is_number(start) || !is_number(finish))
      obj_log(obj, "orecho: too few args");
    else
-      send_to_range(atoi(start), atoi(finish), "%s\r\n", msg);
+      send_to_range(atoidx(start), atoidx(finish), "%s\r\n", msg);
 }
@@ -300,7 +300,7 @@ static OCMD(do_otransform)
 {
  char arg[MAX_INPUT_LENGTH];
  obj_data *o, tmpobj;
-  struct char_data *wearer=NULL;
+  char_data *wearer=NULL;
  int pos = 0;
  one_argument(argument, arg);
@@ -310,7 +310,7 @@ static OCMD(do_otransform)
  else if (!isdigit(*arg))
    obj_log(obj, "otransform: bad argument");
  else {
-    o = read_object(atoi(arg), VIRTUAL);
+    o = read_object(atoidx(arg), VIRTUAL);
    if (o==NULL) {
      obj_log(obj, "otransform: bad object vnum");
      return;
@@ -459,7 +459,7 @@ static OCMD(do_dgoload)
    target = two_arguments(argument, arg1, arg2);
-    if (!*arg1 || !*arg2 || !is_number(arg2) || ((number = atoi(arg2)) < 0))
+    if (!*arg1 || !*arg2 || !is_number(arg2) || ((number = atoidx(arg2)) == NOTHING))
    {
        obj_log(obj, "oload: bad syntax");
        return;
@@ -477,7 +477,7 @@ static OCMD(do_dgoload)
      if (!target || !*target) {
        rnum = room;
      } else {
-        if (!isdigit(*target) || (rnum = real_room(atoi(target))) == NOWHERE) {
+        if (!isdigit(*target) || (rnum = real_room(atoidx(target))) == NOWHERE) {
          obj_log(obj, "oload: room target vnum doesn't exist "
                       "(loading mob vnum %d to room %s)", number, target);
          return;
@@ -671,7 +671,7 @@ static OCMD(do_odoor)
            newexit->exit_info = (sh_int)asciiflag_conv(value);
            break;
        case 3:  /* key         */
-            newexit->key = atoi(value);
+            newexit->key = atoidx(value);
            break;
        case 4:  /* name        */
            if (newexit->keyword)
@@ -680,7 +680,7 @@ static OCMD(do_odoor)
            strcpy(newexit->keyword, value);
            break;
        case 5:  /* room        */
-            if ((to_room = real_room(atoi(value))) != NOWHERE)
+            if ((to_room = real_room(atoidx(value))) != NOWHERE)
                newexit->to_room = to_room;
            else
                obj_log(obj, "odoor: invalid door target");
@@ -693,7 +693,7 @@ static OCMD(do_osetval)
 {
  char arg1[MAX_INPUT_LENGTH], arg2[MAX_INPUT_LENGTH];
  int position, new_value, worn_on;
-  struct char_data *worn_by = NULL;
+  char_data *worn_by = NULL;
  two_arguments(argument, arg1, arg2);
  if (!*arg1 || !*arg2 || !is_number(arg1) || !is_number(arg2)) {
@@ -725,8 +725,8 @@ static OCMD(do_osetval)
 static OCMD(do_oat)
 {
  room_rnum loc = NOWHERE;
-  struct char_data *ch;
+  char_data *ch;
-  struct obj_data *object;
+  obj_data *object;
  char arg[MAX_INPUT_LENGTH], *command;
  command = any_one_arg(argument, arg);
@@ -743,7 +743,7 @@ static OCMD(do_oat)
    return;
  }
-  if (isdigit(*arg)) loc = real_room(atoi(arg));
+  if (isdigit(*arg)) loc = real_room(atoidx(arg));
  else if ((ch = get_char_by_obj(obj, arg))) loc = IN_ROOM(ch); 
  if (loc == NOWHERE) {
@@ -24,17 +24,17 @@
 /* local functions */
-static void trigedit_disp_menu(struct descriptor_data *d);
+static void trigedit_disp_menu(descriptor_data *d);
-static void trigedit_disp_types(struct descriptor_data *d);
+static void trigedit_disp_types(descriptor_data *d);
 static void trigedit_create_index(int znum, char *type);
-static void trigedit_setup_new(struct descriptor_data *d);
+static void trigedit_setup_new(descriptor_data *d);
 /* Trigedit */
 ACMD(do_oasis_trigedit)
 {
  int number, real_num;
-  struct descriptor_data *d;
+  descriptor_data *d;
  /* No building as a mob or while being forced. */
  if (IS_NPC(ch) || !ch->desc || STATE(ch->desc) != CON_PLAYING)
@@ -115,9 +115,9 @@ void script_save_to_disk(FILE *fp, void *item, int type)
  struct trig_proto_list *t;
  if (type==MOB_TRIGGER)
-    t = ((struct char_data *)item)->proto_script;
+    t = ((char_data *)item)->proto_script;
  else if (type==OBJ_TRIGGER)
-    t = ((struct obj_data *)item)->proto_script;
+    t = ((obj_data *)item)->proto_script;
  else if (type==WLD_TRIGGER)
    t = ((struct room_data *)item)->proto_script;
  else {
@@ -132,7 +132,7 @@ void script_save_to_disk(FILE *fp, void *item, int type)
  }
 }
-static void trigedit_setup_new(struct descriptor_data *d)
+static void trigedit_setup_new(descriptor_data *d)
 {
  struct trig_data *trig;
@@ -155,7 +155,7 @@ static void trigedit_setup_new(struct descriptor_data *d)
  OLC_VAL(d) = 0;  /* Has changed flag. (It hasn't so far, we just made it.) */
 }
-void trigedit_setup_existing(struct descriptor_data *d, int rtrg_num)
+void trigedit_setup_existing(descriptor_data *d, int rtrg_num)
 {
  struct trig_data *trig;
  struct cmdlist_element *c;
@@ -182,7 +182,7 @@ void trigedit_setup_existing(struct descriptor_data *d, int rtrg_num)
  OLC_VAL(d) = 0;  /* Has changed flag. (It hasn't so far, we just made it.) */
 }
-static void trigedit_disp_menu(struct descriptor_data *d)
+static void trigedit_disp_menu(descriptor_data *d)
 {
  struct trig_data *trig = OLC_TRIG(d);
  char *attach_type;
@@ -227,7 +227,7 @@ static void trigedit_disp_menu(struct descriptor_data *d)
  OLC_MODE(d) = TRIGEDIT_MAIN_MENU;
 }
-static void trigedit_disp_types(struct descriptor_data *d)
+static void trigedit_disp_types(descriptor_data *d)
 {
  int i, columns = 0;
  const char **types;
@@ -420,7 +420,7 @@ static const char *command_color_replacement[COMMAND_TERMS][2] =
 };
-static void script_syntax_highlighting(struct descriptor_data *d, char *string)
+static void script_syntax_highlighting(descriptor_data *d, char *string)
 {
    ACMD(do_action);
    char buffer[MAX_STRING_LENGTH] = "";
@@ -484,7 +484,7 @@ static void script_syntax_highlighting(struct descriptor_data *d, char *string)
 }
 /****************************************************************************************/
-void trigedit_parse(struct descriptor_data *d, char *arg)
+void trigedit_parse(descriptor_data *d, char *arg)
 {
  int i = 0;
@@ -602,7 +602,7 @@ void trigedit_parse(struct descriptor_data *d, char *arg)
      return;
    case TRIGEDIT_COPY:
-      if ((i = real_trigger(atoi(arg))) != NOWHERE) {
+      if ((i = real_trigger(atoidx(arg))) != NOWHERE) {
        trigedit_setup_existing(d, i);
      } else
        write_to_output(d, "That trigger does not exist.\r\n");
@@ -618,7 +618,7 @@ void trigedit_parse(struct descriptor_data *d, char *arg)
 }
 /* save the zone's triggers to internal memory and to disk */
-void trigedit_save(struct descriptor_data *d)
+void trigedit_save(descriptor_data *d)
 {
  int i;
  trig_rnum rnum;
@@ -629,7 +629,7 @@ void trigedit_save(struct descriptor_data *d)
  trig_data *live_trig;
  struct cmdlist_element *cmd, *next_cmd;
  struct index_data **new_index;
-  struct descriptor_data *dsc;
+  descriptor_data *dsc;
  FILE *trig_file;
  int zone, top;
  char buf[MAX_CMD_LENGTH];
@@ -911,7 +911,7 @@ static void trigedit_create_index(int znum, char *type)
  rename(new_name, old_name);
 }
-void dg_olc_script_copy(struct descriptor_data *d)
+void dg_olc_script_copy(descriptor_data *d)
 {
  struct trig_proto_list *origscript, *editscript;
@@ -936,7 +936,7 @@ void dg_olc_script_copy(struct descriptor_data *d)
      OLC_SCRIPT(d) = NULL;
 }
-void dg_script_menu(struct descriptor_data *d)
+void dg_script_menu(descriptor_data *d)
 {
  struct trig_proto_list *editscript;
  int i = 0;
@@ -972,7 +972,7 @@ void dg_script_menu(struct descriptor_data *d)
    grn, nrm, grn, nrm, grn, nrm);
 }
-int dg_script_edit_parse(struct descriptor_data *d, char *arg)
+int dg_script_edit_parse(descriptor_data *d, char *arg)
 {
  struct trig_proto_list *trig, *currtrig;
  int count, pos, vnum;
@@ -1077,7 +1077,7 @@ int dg_script_edit_parse(struct descriptor_data *d, char *arg)
  return 1;
 }
-void trigedit_string_cleanup(struct descriptor_data *d, int terminator)
+void trigedit_string_cleanup(descriptor_data *d, int terminator)
 {
  switch (OLC_MODE(d)) {
    case TRIGEDIT_COMMANDS:
@@ -1086,7 +1086,7 @@ void trigedit_string_cleanup(struct descriptor_data *d, int terminator)
  }
 }
-int format_script(struct descriptor_data *d)
+int format_script(descriptor_data *d)
 {
  char nsc[MAX_CMD_LENGTH], *t, line[READ_SIZE];
  char *sc;
@@ -41,9 +41,9 @@
 /* prototype exported functions from dg_olc.c */
 void script_save_to_disk(FILE *fp, void *item, int type);
-void dg_olc_script_copy(struct descriptor_data *d);
+void dg_olc_script_copy(descriptor_data *d);
-void dg_script_menu(struct descriptor_data *d);
+void dg_script_menu(descriptor_data *d);
-int dg_script_edit_parse(struct descriptor_data *d, char *arg);
+int dg_script_edit_parse(descriptor_data *d, char *arg);
 #endif /* _DG_OLC_H_ */
@@ -35,7 +35,7 @@
 /* Local functions not used elsewhere */
 static obj_data *find_obj(long n);
 static room_data *find_room(long n);
-static void do_stat_trigger(struct char_data *ch, trig_data *trig);
+static void do_stat_trigger(char_data *ch, trig_data *trig);
 static void script_stat(char_data *ch, struct script_data *sc);
 static int remove_trigger(struct script_data *sc, char *name);
 static int is_num(char *arg);
@@ -71,8 +71,8 @@ static void dg_letter_value(struct script_data *sc, trig_data *trig, char *cmd);
 static struct cmdlist_element * find_case(struct trig_data *trig, struct cmdlist_element *cl,
          void *go, struct script_data *sc, int type, char *cond);
 static struct cmdlist_element *find_done(struct cmdlist_element *cl);
-static struct char_data *find_char_by_uid_in_lookup_table(long uid);
+static char_data *find_char_by_uid_in_lookup_table(long uid);
-static struct obj_data *find_obj_by_uid_in_lookup_table(long uid);
+static obj_data *find_obj_by_uid_in_lookup_table(long uid);
 static EVENTFUNC(trig_wait_event);
@@ -186,7 +186,7 @@ obj_data *get_object_in_equip(char_data * ch, char *name)
        if (id == obj->script_id)
          return (obj);
  } else if (is_number(name)) {
-    obj_vnum ovnum = atoi(name);
+    obj_vnum ovnum = atoidx(name);
    for (j = 0; j < NUM_WEARS; j++)
      if ((obj = GET_EQ(ch, j)))
        if (GET_OBJ_VNUM(obj) == ovnum)
@@ -258,7 +258,7 @@ int find_eq_pos_script(char *arg)
 * @param pos The defined wear location to check.
 * @retval int TRUE if obj can be worn on pos, FALSE if not.
 */
-int can_wear_on_pos(struct obj_data *obj, int pos)
+int can_wear_on_pos(obj_data *obj, int pos)
 {
  switch (pos) {
    case WEAR_HOLD:
@@ -288,7 +288,7 @@ int can_wear_on_pos(struct obj_data *obj, int pos)
 * @retval char_data * Pointer to the character structure if it exists, or NULL
 * if it cannot be found.
 */
-struct char_data *find_char(long n)
+char_data *find_char(long n)
 {
  if (n>=ROOM_ID_BASE) /* See note in dg_scripts.h */
    return NULL;
@@ -486,7 +486,7 @@ room_data *get_room(char *name)
  if (*name == UID_CHAR)
    return find_room(atoi(name + 1));
-  else if ((nr = real_room(atoi(name))) == NOWHERE)
+  else if ((nr = real_room(atoidx(name))) == NOWHERE)
    return NULL;
  else
    return &world[nr];
@@ -722,14 +722,14 @@ static EVENTFUNC(trig_wait_event)
  {
    int found = FALSE;
    if (type == MOB_TRIGGER) {
-      struct char_data *tch;
+      char_data *tch;
      for (tch = character_list;tch && !found;tch = tch->next)
-        if (tch == (struct char_data *)go)
+        if (tch == (char_data *)go)
          found = TRUE;
    } else if (type == OBJ_TRIGGER) {
-      struct obj_data *obj;
+      obj_data *obj;
      for (obj = object_list;obj && !found;obj = obj->next)
-        if (obj == (struct obj_data *)go)
+        if (obj == (obj_data *)go)
          found = TRUE;
    } else {
      room_rnum i;
@@ -753,7 +753,7 @@ static EVENTFUNC(trig_wait_event)
  return 0;
 }
-static void do_stat_trigger(struct char_data *ch, trig_data *trig)
+static void do_stat_trigger(char_data *ch, trig_data *trig)
 {
    struct cmdlist_element *cmd_list;
    char sb[MAX_STRING_LENGTH], buf[MAX_STRING_LENGTH];
@@ -878,7 +878,7 @@ static void script_stat (char_data *ch, struct script_data *sc)
  }
 }
-void do_sstat_room(struct char_data * ch, struct room_data *rm)
+void do_sstat_room(char_data * ch, struct room_data *rm)
 {
  send_to_char(ch, "Triggers:\r\n");
  if (!SCRIPT(rm)) {
@@ -944,8 +944,11 @@ ACMD(do_attach)
  trig_data *trig;
  char targ_name[MAX_INPUT_LENGTH], trig_name[MAX_INPUT_LENGTH];
  char loc_name[MAX_INPUT_LENGTH], arg[MAX_INPUT_LENGTH];
-  int loc, tn, rn, num_arg;
+  int loc;
  trig_rnum rn;
  room_rnum rnum;
  IDXTYPE num_arg;
  trig_vnum tn;
  argument = two_arguments(argument, arg, trig_name);
  two_arguments(argument, targ_name, loc_name);
@@ -955,8 +958,8 @@ ACMD(do_attach)
    return;
  }
-  num_arg = atoi(targ_name);
+  num_arg = atoidx(targ_name);
-  tn = atoi(trig_name);
+  tn = atoidx(trig_name);
  loc = (*loc_name) ? atoi(loc_name) : -1;
  if (is_abbrev(arg, "mobile") || is_abbrev(arg, "mtr")) {
@@ -1147,13 +1150,15 @@ ACMD(do_detach)
  struct room_data *room;
  char arg1[MAX_INPUT_LENGTH], arg2[MAX_INPUT_LENGTH], arg3[MAX_INPUT_LENGTH], *snum;
  char *trigger = 0;
-  int num_arg, tn, rn;
+  IDXTYPE num_arg;
  trig_vnum tn;
  trig_rnum rn;
  room_rnum rnum;
  trig_data *trig;
  argument = two_arguments(argument, arg1, arg2);
  one_argument(argument, arg3);
-  tn = atoi(arg3);
+  tn = atoidx(arg3);
  rn = real_trigger(tn);
  trig = read_trigger(rn);
@@ -1164,7 +1169,7 @@ ACMD(do_detach)
  }
  /* vnum of mob/obj, if given */
-  num_arg = atoi(arg2);
+  num_arg = atoidx(arg2);
  if (!str_cmp(arg1, "room") || !str_cmp(arg1, "wtr")) {
    if (!*arg3 || (strchr(arg2, '.')))
@@ -1321,7 +1326,7 @@ ACMD(do_detach)
 void script_vlog(const char *format, va_list args)
 {
  char output[MAX_STRING_LENGTH];
-  struct descriptor_data *i;
+  descriptor_data *i;
  /* parse the args, making the error message */ 
  vsnprintf(output, sizeof(output) - 2, format, args); 
@@ -1793,7 +1798,8 @@ static void process_attach(void *go, struct script_data *sc, trig_data *trig,
  char_data *c=NULL;
  obj_data *o=NULL;
  room_data *r=NULL;
-  long trignum, id;
+  long id;
  trig_rnum trignum;
  id_p = two_arguments(cmd, arg, trignum_s);
  skip_spaces(&id_p);
@@ -1831,7 +1837,7 @@ static void process_attach(void *go, struct script_data *sc, trig_data *trig,
  }
  /* locate and load the trigger specified */
-  trignum = real_trigger(atoi(trignum_s));
+  trignum = real_trigger(atoidx(trignum_s));
  if (trignum == NOTHING || !(newtrig=read_trigger(trignum))) {
    script_log("Trigger: %s, VNum %d. attach invalid trigger: '%s'",
            GET_TRIG_NAME(trig), GET_TRIG_VNUM(trig), trignum_s);
@@ -1953,7 +1959,7 @@ static void process_detach(void *go, struct script_data *sc, trig_data *trig,
 }
-struct room_data *dg_room_of_obj(struct obj_data *obj)
+struct room_data *dg_room_of_obj(obj_data *obj)
 {
  if (IN_ROOM(obj) != NOWHERE) return &world[IN_ROOM(obj)];
  if (obj->carried_by)        return &world[IN_ROOM(obj->carried_by)];
@@ -2002,34 +2008,34 @@ static void makeuid_var(void *go, struct script_data *sc, trig_data *trig,
    }
    if (is_abbrev(arg, "mob")) {
-      struct char_data *c = NULL;
+      char_data *c = NULL;
      switch (type) {
        case WLD_TRIGGER:
          c = get_char_in_room((struct room_data *)go, name);
          break;
        case OBJ_TRIGGER:
-          c = get_char_near_obj((struct obj_data *)go, name);
+          c = get_char_near_obj((obj_data *)go, name);
          break;
        case MOB_TRIGGER:
-          c = get_char_room_vis((struct char_data *)go, name, NULL);
+          c = get_char_room_vis((char_data *)go, name, NULL);
          break;
      }
      if (c)
        snprintf(uid, sizeof(uid), "%c%ld", UID_CHAR, char_script_id(c));
    } else if (is_abbrev(arg, "obj")) {
-      struct obj_data *o = NULL;
+      obj_data *o = NULL;
      switch (type) {
        case WLD_TRIGGER:
          o = get_obj_in_room((struct room_data *)go, name);
          break;
        case OBJ_TRIGGER:
-          o = get_obj_near_obj((struct obj_data *)go, name);
+          o = get_obj_near_obj((obj_data *)go, name);
          break;
        case MOB_TRIGGER:
-          if ((o = get_obj_in_list_vis((struct char_data *)go, name, NULL,
+          if ((o = get_obj_in_list_vis((char_data *)go, name, NULL,
-                    ((struct char_data *)go)->carrying)) == NULL)
+                    ((char_data *)go)->carrying)) == NULL)
-            o = get_obj_in_list_vis((struct char_data *)go, name, NULL,
+            o = get_obj_in_list_vis((char_data *)go, name, NULL,
-                    world[IN_ROOM((struct char_data *)go)].contents);
+                    world[IN_ROOM((char_data *)go)].contents);
          break;
      }
      if (o)
@@ -2041,10 +2047,10 @@ static void makeuid_var(void *go, struct script_data *sc, trig_data *trig,
          r = real_room(((struct room_data *) go)->number);
          break;
        case OBJ_TRIGGER:
-          r = obj_room((struct obj_data *)go);
+          r = obj_room((obj_data *)go);
          break;
        case MOB_TRIGGER:
-          r = IN_ROOM((struct char_data *)go);
+          r = IN_ROOM((char_data *)go);
          break;
      }
      if (r != NOWHERE)
@@ -2261,7 +2267,7 @@ ACMD(do_vdelete)
 /* Called from do_set - return 0 for failure, 1 for success.  ch and vict are 
 * verified. */
-int perform_set_dg_var(struct char_data *ch, struct char_data *vict, char *val_arg)
+int perform_set_dg_var(char_data *ch, char_data *vict, char *val_arg)
 {
  char var_name[MAX_INPUT_LENGTH], *var_value;
@@ -2725,7 +2731,7 @@ trig_rnum real_trigger(trig_vnum vnum)
  bot = 0;
  top = top_of_trigt - 1;
-  if (!top_of_trigt || trig_index[bot]->vnum > vnum || trig_index[top]->vnum < vnum)
+  if (vnum == NOTHING || !top_of_trigt || trig_index[bot]->vnum > vnum || trig_index[top]->vnum < vnum)
    return (NOTHING);
  /* perform binary search on trigger-table */
@@ -2749,7 +2755,7 @@ ACMD(do_tstat)
  half_chop(argument, str, argument);
  if (*str) {
-    rnum = real_trigger(atoi(str));
+    rnum = real_trigger(atoidx(str));
    if (rnum == NOTHING) {
      send_to_char(ch, "That vnum does not exist.\r\n");
      return;
@@ -2821,7 +2827,7 @@ static struct cmdlist_element *find_done(struct cmdlist_element *cl)
 /* load in a character's saved variables */
-void read_saved_vars(struct char_data *ch)
+void read_saved_vars(char_data *ch)
 {
  FILE *file;
  long context;
@@ -2868,7 +2874,7 @@ void read_saved_vars(struct char_data *ch)
 }
 /* save a characters variables out to disk */
-void save_char_vars(struct char_data *ch)
+void save_char_vars(char_data *ch)
 {
  FILE *file;
  char fn[127];
@@ -2907,7 +2913,7 @@ void save_char_vars(struct char_data *ch)
 }
 /* load in a character's saved variables from an ASCII pfile*/
-void read_saved_vars_ascii(FILE *file, struct char_data *ch, int count)
+void read_saved_vars_ascii(FILE *file, char_data *ch, int count)
 {
  long context;
  char input_line[1024], *temp, *p;
@@ -2942,7 +2948,7 @@ void read_saved_vars_ascii(FILE *file, struct char_data *ch, int count)
 }
 /* save a characters variables out to an ASCII pfile */
-void save_char_vars_ascii(FILE *file, struct char_data *ch)
+void save_char_vars_ascii(FILE *file, char_data *ch)
 {
  struct trig_var_data *vars;
  int count = 0;
@@ -3008,23 +3014,23 @@ static inline struct lookup_table_t *find_element_by_uid_in_lookup_table(long ui
  return lt;
 }
-static struct char_data *find_char_by_uid_in_lookup_table(long uid)
+static char_data *find_char_by_uid_in_lookup_table(long uid)
 {
  struct lookup_table_t *lt = find_element_by_uid_in_lookup_table(uid);
  if (lt)
-    return (struct char_data *)(lt->c);
+    return (char_data *)(lt->c);
  log("find_char_by_uid_in_lookup_table : No entity with number %ld in lookup table", uid);
  return NULL;
 }
-static struct obj_data *find_obj_by_uid_in_lookup_table(long uid)
+static obj_data *find_obj_by_uid_in_lookup_table(long uid)
 {
  struct lookup_table_t *lt = find_element_by_uid_in_lookup_table(uid);
  if (lt)
-    return (struct obj_data *)(lt->c);
+    return (obj_data *)(lt->c);
  log("find_obj_by_uid_in_lookup_table : No entity with number %ld in lookup table", uid);
  return NULL;
@@ -3096,7 +3102,7 @@ bool check_flags_by_name_ar(int *array, int numflags, char *search, const char *
  return FALSE; 
 }
-int trig_is_attached(struct script_data *sc, int trig_num) 
+int trig_is_attached(struct script_data *sc, trig_vnum trig_num)
 { 
  trig_data *t; 
@@ -16,6 +16,7 @@
 #define _DG_SCRIPTS_H_
 #include "utils.h" /* To make sure ACMD is defined */
 #include "structs.h" /* To make sure we have access to typedefs */
 #define    MOB_TRIGGER   0
 #define    OBJ_TRIGGER   1
@@ -126,8 +127,7 @@
 * same time. */
 #define PULSE_DG_SCRIPT         (13 RL_SEC)
-#define MAX_SCRIPT_DEPTH      10          /* maximum depth triggers can
+#define MAX_SCRIPT_DEPTH      10          /* maximum depth triggers can recurse into each other */
 					     recurse into each other */
 #define SCRIPT_ERROR_CODE     -9999999   /* this shouldn't happen too often */
@@ -193,21 +193,13 @@ struct script_memory {
    struct script_memory *next;
 };
 /* typedefs that the dg functions rely on */
 typedef struct index_data index_data;
 typedef struct room_data room_data;
 typedef struct obj_data obj_data;
 typedef struct trig_data trig_data;
 typedef struct char_data char_data;
 /* function prototypes from dg_triggers.c */
 char *one_phrase(char *arg, char *first_arg);
 int is_substring(char *sub, char *string);
 int word_check(char *str, char *wordlist);
-void act_mtrigger(const char_data *ch, char *str,
+void act_mtrigger(const char_data *ch, char *str, char_data *actor, char_data *victim, obj_data *object,
-	char_data *actor, char_data *victim, obj_data *object, obj_data *target, char *arg);
+                  obj_data *target, char *arg);
 void speech_mtrigger(char_data *actor, char *str);
 void speech_wtrigger(char_data *actor, char *str);
 void greet_memory_mtrigger(char_data *ch);
@@ -219,17 +211,13 @@ int drop_otrigger(obj_data *obj, char_data *actor);
 void timer_otrigger(obj_data *obj);
 int get_otrigger(obj_data *obj, char_data *actor);
 int drop_wtrigger(obj_data *obj, char_data *actor);
-int give_otrigger(obj_data *obj, char_data *actor,
+int give_otrigger(obj_data *obj, char_data *actor, char_data *victim);
-         char_data *victim);
+int receive_mtrigger(char_data *ch, char_data *actor, obj_data *obj);
-int receive_mtrigger(char_data *ch, char_data *actor,
+void bribe_mtrigger(char_data *ch, char_data *actor, int amount);
         obj_data *obj);
 void bribe_mtrigger(char_data *ch, char_data *actor,
         int amount);
 int wear_otrigger(obj_data *obj, char_data *actor, int where);
 int remove_otrigger(obj_data *obj, char_data *actor);
-int cmd_otrig(obj_data *obj, char_data *actor, char *cmd,
+int cmd_otrig(obj_data *obj, char_data *actor, char *cmd, char *argument, int type);
              char *argument, int type);
 int command_mtrigger(char_data *actor, char *cmd, char *argument);
 int command_otrigger(char_data *actor, char *cmd, char *argument);
 int command_wtrigger(char_data *actor, char *cmd, char *argument);
@@ -273,8 +261,8 @@ ACMD(do_vdelete);
 ACMD(do_tstat);
 char *str_str(char *cs, char *ct);
 int find_eq_pos_script(char *arg);
-int can_wear_on_pos(struct obj_data *obj, int pos);
+int can_wear_on_pos(obj_data *obj, int pos);
-struct char_data *find_char(long n);
+char_data *find_char(long n);
 char_data *get_char(char *name);
 char_data *get_char_near_obj(obj_data *obj, char *name);
 char_data *get_char_in_room(room_data *room, char *name);
@@ -292,28 +280,27 @@ obj_data *get_object_in_equip(char_data * ch, char *name);
 void script_trigger_check(void);
 void check_time_triggers(void);
 void find_uid_name(char *uid, char *name, size_t nlen);
-void do_sstat_room(struct char_data * ch, room_data *r);
+void do_sstat_room(char_data * ch, room_data *r);
 void do_sstat_object(char_data *ch, obj_data *j);
 void do_sstat_character(char_data *ch, char_data *k);
 void add_trigger(struct script_data *sc, trig_data *t, int loc);
 void script_vlog(const char *format, va_list args);
 void script_log(const char *format, ...) __attribute__ ((format (printf, 1, 2)));
 char *matching_quote(char *p);
-struct room_data *dg_room_of_obj(struct obj_data *obj);
+struct room_data *dg_room_of_obj(obj_data *obj);
 bool check_flags_by_name_ar(int *array, int numflags, char *search, const char *namelist[]);
-void read_saved_vars_ascii(FILE *file, struct char_data *ch, int count);
+void read_saved_vars_ascii(FILE *file, char_data *ch, int count);
-void save_char_vars_ascii(FILE *file, struct char_data *ch);
+void save_char_vars_ascii(FILE *file, char_data *ch);
-int perform_set_dg_var(struct char_data *ch, struct char_data *vict, char *val_arg);
+int perform_set_dg_var(char_data *ch, char_data *vict, char *val_arg);
-int trig_is_attached(struct script_data *sc, int trig_num);
+int trig_is_attached(struct script_data *sc, trig_vnum trig_num);
 /* To maintain strict-aliasing we'll have to do this trick with a union */
 /* Thanks to Chris Gilbert for reminding me that there are other options. */
 int script_driver(void *go_adress, trig_data *trig, int type, int mode);
 trig_rnum real_trigger(trig_vnum vnum);
-void process_eval(void *go, struct script_data *sc, trig_data *trig,
+void process_eval(void *go, struct script_data *sc, trig_data *trig, int type, char *cmd);
-                 int type, char *cmd);
+void read_saved_vars(char_data *ch);
-void read_saved_vars(struct char_data *ch);
+void save_char_vars(char_data *ch);
 void save_char_vars(struct char_data *ch);
 void init_lookup_table(void);
 void add_to_lookup_table(long uid, void *c);
 void remove_from_lookup_table(long uid);
@@ -323,20 +310,18 @@ void parse_trigger(FILE *trig_f, int nr);
 trig_data *read_trigger(int nr);
 void trig_data_copy(trig_data *this_data, const trig_data *trg);
 void dg_read_trigger(FILE *fp, void *proto, int type);
-void dg_obj_trigger(char *line, struct obj_data *obj);
+void dg_obj_trigger(char *line, obj_data *obj);
 void assign_triggers(void *i, int type);
 /* From dg_variables.c */
 void add_var(struct trig_var_data **var_list, const char *name, const char *value, long id);
 int item_in_list(char *item, obj_data *list);
-char *skill_percent(struct char_data *ch, char *skill);
+char *skill_percent(char_data *ch, char *skill);
-int char_has_item(char *item, struct char_data *ch);
+int char_has_item(char *item, char_data *ch);
-void var_subst(void *go, struct script_data *sc, trig_data *trig,
+void var_subst(void *go, struct script_data *sc, trig_data *trig, int type, char *line, char *buf);
-               int type, char *line, char *buf);
+int text_processed(char *field, char *subfield, struct trig_var_data *vd, char *str, size_t slen);
-int text_processed(char *field, char *subfield, struct trig_var_data *vd,
+void find_replacement(void *go, struct script_data *sc, trig_data *trig, int type, char *var, char *field,
-                   char *str, size_t slen);
+                      char *subfield, char *str, size_t slen);
 void find_replacement(void *go, struct script_data *sc, trig_data *trig,
                int type, char *var, char *field, char *subfield, char *str, size_t slen);
 /* From dg_handler.c */
 void free_var_el(struct trig_var_data *var);
@@ -357,11 +342,9 @@ void sub_write(char *arg, char_data *ch, byte find_invis, int targets);
 void send_to_zone(char *messg, zone_rnum zone);
 /* from dg_misc.c */
-void do_dg_cast(void *go, struct script_data *sc, trig_data *trig,
+void do_dg_cast(void *go, struct script_data *sc, trig_data *trig, int type, char *cmd);
-    int type, char *cmd);
+void do_dg_affect(void *go, struct script_data *sc, trig_data *trig, int type, char *cmd);
-void do_dg_affect(void *go, struct script_data *sc, trig_data *trig,
+void send_char_pos(char_data *ch, int dam);
    int type, char *cmd);
 void send_char_pos(struct char_data *ch, int dam);
 int valid_dg_target(char_data *ch, int bitvector);
 void script_damage(char_data *vict, int dam);
@@ -390,10 +373,10 @@ ACMD(do_mzoneecho);
 ACMD(do_mlog);
 /* from dg_olc.c... thinking these should be moved to oasis.h */
-void trigedit_save(struct descriptor_data *d);
+void trigedit_save(descriptor_data *d);
-void trigedit_string_cleanup(struct descriptor_data *d, int terminator);
+void trigedit_string_cleanup(descriptor_data *d, int terminator);
-int format_script(struct descriptor_data *d);
+int format_script(descriptor_data *d);
-void trigedit_setup_existing(struct descriptor_data *d, int rtrg_num);
+void trigedit_setup_existing(descriptor_data *d, int rtrg_num);
 /* from dg_objcmd.c */
 room_rnum obj_room(obj_data *obj);
@@ -435,10 +418,8 @@ void wld_command_interpreter(room_data *room, char *argument);
 #define GET_SHORT(ch)            ((ch)->player.short_descr)
-#define SCRIPT_CHECK(go, type)   (SCRIPT(go) && \
+#define SCRIPT_CHECK(go, type)   (SCRIPT(go) && IS_SET(SCRIPT_TYPES(SCRIPT(go)), type))
-				  IS_SET(SCRIPT_TYPES(SCRIPT(go)), type))
+#define TRIGGER_CHECK(t, type)   (IS_SET(GET_TRIG_TYPE(t), type) && !GET_TRIG_DEPTH(t))
 #define TRIGGER_CHECK(t, type)   (IS_SET(GET_TRIG_TYPE(t), type) && \
 				  !GET_TRIG_DEPTH(t))
 /* This formerly used 'go' instead of 'id' and referenced 'go->id' but this is
@@ -412,7 +412,7 @@ void act_mtrigger(const char_data *ch, char *str, char_data *actor,
 void fight_mtrigger(char_data *ch)
 {
-  struct char_data *actor;
+  char_data *actor;
  trig_data *t;
  char buf[MAX_INPUT_LENGTH];
@@ -437,7 +437,7 @@ void fight_mtrigger(char_data *ch)
 void hitprcnt_mtrigger(char_data *ch)
 {
-  struct char_data *actor;
+  char_data *actor;
  trig_data *t;
  char buf[MAX_INPUT_LENGTH];
@@ -676,7 +676,7 @@ void random_otrigger(obj_data *obj)
  }
 }
-void timer_otrigger(struct obj_data *obj)
+void timer_otrigger(obj_data *obj)
 {
  trig_data *t;
@@ -65,7 +65,7 @@ void add_var(struct trig_var_data **var_list, const char *name, const char *valu
 }
 /* perhaps not the best place for this, but I didn't want a new file */
-char *skill_percent(struct char_data *ch, char *skill)
+char *skill_percent(char_data *ch, char *skill)
 {
  static char retval[16];
  int skillnum;
@@ -98,7 +98,7 @@ int item_in_list(char *item, obj_data *list)
        count += item_in_list(item, i->contains);
    }
  } else if (is_number(item)) { /* check for vnum */
-    obj_vnum ovnum = atoi(item);
+    obj_vnum ovnum = atoidx(item);
    for (i = list; i; i = i->next_content) {
      if (GET_OBJ_VNUM(i) == ovnum)
@@ -120,7 +120,7 @@ int item_in_list(char *item, obj_data *list)
 /* BOOLEAN return, just check if a player or mob has an item of any sort,
 * searched for by name or id. Searching equipment as well as inventory, and
 * containers. Jamie Nelson */
-int char_has_item(char *item, struct char_data *ch)
+int char_has_item(char *item, char_data *ch)
 {
  /* If this works, no more searching needed */
@@ -133,7 +133,7 @@ int char_has_item(char *item, struct char_data *ch)
    return 1;
 }
-static int handle_oset(struct obj_data * obj, char * argument)
+static int handle_oset(obj_data * obj, char * argument)
 {
  int i = 0;
  bool found = FALSE;
@@ -141,7 +141,7 @@ static int handle_oset(struct obj_data * obj, char * argument)
  struct oset_handler {
    const char * type;
-    bool (* name)(struct obj_data *, char *);
+    bool (* name)(obj_data *, char *);
  } handler[] = {
    { "alias",     oset_alias },
    { "apply",     oset_apply },
@@ -256,6 +256,7 @@ void find_replacement(void *go, struct script_data *sc, trig_data *trig,
  struct room_data *room, *r = NULL;
  char *name;
  int num, count, i, j, doors;
  IDXTYPE idx;
  char *log_cmd[]        = {"mlog ",        "olog ",        "wlog "       };
  char *send_cmd[]       = {"msend ",       "osend ",       "wsend "      };
@@ -429,7 +430,7 @@ void find_replacement(void *go, struct script_data *sc, trig_data *trig,
        return;
      }
      else if (!str_cmp(var, "people")) {
-        snprintf(str, slen, "%d",((num = atoi(field)) > 0) ? trgvar_in_room(num) : 0);
+        snprintf(str, slen, "%d",((num = atoidx(field)) > 0) ? trgvar_in_room(num) : 0);
        return;
      }
      else if (!str_cmp(var, "happyhour")) {
@@ -469,8 +470,8 @@ void find_replacement(void *go, struct script_data *sc, trig_data *trig,
          script_log("findmob.vnum(mvnum) - illegal syntax");
          strcpy(str, "0");
        } else {
-          room_rnum rrnum = real_room(atoi(field));
+          room_rnum rrnum = real_room(atoidx(field));
-          mob_vnum mvnum = atoi(subfield);
+          mob_vnum mvnum = atoidx(subfield);
          if (rrnum == NOWHERE) {
            script_log("findmob.vnum(ovnum): No room with vnum %d", atoi(field));
@@ -490,7 +491,7 @@ void find_replacement(void *go, struct script_data *sc, trig_data *trig,
          script_log("findobj.vnum(ovnum) - illegal syntax");
          strcpy(str, "0");
        } else {
-          room_rnum rrnum = real_room(atoi(field));
+          room_rnum rrnum = real_room(atoidx(field));
          if (rrnum == NOWHERE) {
            script_log("findobj.vnum(ovnum): No room with vnum %d", atoi(field));
@@ -552,10 +553,10 @@ void find_replacement(void *go, struct script_data *sc, trig_data *trig,
              in_room = real_room(((struct room_data *) go)->number);
              break;
            case OBJ_TRIGGER:
-              in_room = obj_room((struct obj_data *) go);
+              in_room = obj_room((obj_data *) go);
              break;
            case MOB_TRIGGER:
-              in_room = IN_ROOM((struct char_data *)go);
+              in_room = IN_ROOM((char_data *)go);
              break;
          }
          if (in_room == NOWHERE) {
@@ -978,7 +979,7 @@ void find_replacement(void *go, struct script_data *sc, trig_data *trig,
           else if (!str_cmp(field, "questdone"))
           {
               if (!IS_NPC(c) && subfield && *subfield) {
-                 int q_num = atoi(subfield);
+                 qst_vnum q_num = atoidx(subfield);
                 if (is_complete(c, q_num))
                   strcpy(str, "1");
                 else
@@ -1111,7 +1112,7 @@ void find_replacement(void *go, struct script_data *sc, trig_data *trig,
              * something like if %actor.vnum(500)%. It should return false for PC's instead 
              * -- Fizban 02/18
              */ 
-              snprintf(str, slen, "%d", IS_NPC(c) ? (int)(GET_MOB_VNUM(c) == atoi(subfield)) : 0 );
+              snprintf(str, slen, "%d", IS_NPC(c) ? GET_MOB_VNUM(c) == atoidx(subfield) : 0 );
            } else {
              if (IS_NPC(c))
                snprintf(str, slen, "%d", GET_MOB_VNUM(c));
@@ -1249,8 +1250,8 @@ void find_replacement(void *go, struct script_data *sc, trig_data *trig,
            if (!(subfield && *subfield))
              *str = '\0';
            else {
-              i = atoi(subfield);
+              idx = atoidx(subfield);
-              snprintf(str, slen, "%d", trig_is_attached(SCRIPT(o), i));
+              snprintf(str, slen, "%d", trig_is_attached(SCRIPT(o), idx));
            }
          }
          break;
@@ -1311,7 +1312,7 @@ void find_replacement(void *go, struct script_data *sc, trig_data *trig,
        case 'v':
          if (!str_cmp(field, "vnum"))
            if (subfield && *subfield) {
-              snprintf(str, slen, "%d", (int)(GET_OBJ_VNUM(o) == atoi(subfield)));
+              snprintf(str, slen, "%d", GET_OBJ_VNUM(o) == atoidx(subfield));
            } else {
              snprintf(str, slen, "%d", GET_OBJ_VNUM(o));
            }
@@ -1403,14 +1404,14 @@ void find_replacement(void *go, struct script_data *sc, trig_data *trig,
      else if (!str_cmp(field, "vnum")) {
        if (subfield && *subfield) {
-          snprintf(str, slen, "%d", (int)(r->number == atoi(subfield)));
+          snprintf(str, slen, "%d", r->number == atoidx(subfield));
        } else {
          snprintf(str, slen,"%d",r->number);
        }
      } else if (!str_cmp(field, "contents")) {
        if (subfield && *subfield) {
          for (obj = r->contents; obj; obj = obj->next_content) {
-            if (GET_OBJ_VNUM(obj) == atoi(subfield)) {
+            if (GET_OBJ_VNUM(obj) == atoidx(subfield)) {
              /* arg given, found */
              snprintf(str, slen, "%c%ld", UID_CHAR, obj_script_id(obj));
              return;
@@ -1457,8 +1458,8 @@ void find_replacement(void *go, struct script_data *sc, trig_data *trig,
        if (!(subfield && *subfield))
          *str = '\0';
        else {
-          i = atoi(subfield);
+          idx = atoidx(subfield);
-          snprintf(str, slen, "%d", trig_is_attached(SCRIPT(r), i));
+          snprintf(str, slen, "%d", trig_is_attached(SCRIPT(r), idx));
        }
      }
      else if (!str_cmp(field, "zonenumber"))
@@ -169,7 +169,7 @@ WCMD(do_wzoneecho)
    if (!*room_num || !*msg)
        wld_log(room, "wzoneecho called with too few args");
-    else if ((zone = real_zone_by_thing(atoi(room_num))) == NOWHERE)
+    else if ((zone = real_zone_by_thing(atoidx(room_num))) == NOWHERE)
        wld_log(room, "wzoneecho called for nonexistant zone");
    else {
@@ -191,7 +191,7 @@ WCMD(do_wrecho)
    if (!*msg || !*start || !*finish || !is_number(start) || !is_number(finish))
      wld_log(room, "wrecho: too few args");
    else
-      send_to_range(atoi(start), atoi(finish), "%s\r\n", msg);
+      send_to_range(atoidx(start), atoidx(finish), "%s\r\n", msg);
 }
@@ -270,7 +270,7 @@ WCMD(do_wdoor)
            newexit->exit_info = (sh_int)asciiflag_conv(value);
            break;
        case 3:  /* key         */
-            newexit->key = atoi(value);
+            newexit->key = atoidx(value);
            break;
        case 4:  /* name        */
            if (newexit->keyword)
@@ -279,7 +279,7 @@ WCMD(do_wdoor)
            strcpy(newexit->keyword, value);
            break;
        case 5:  /* room        */
-            if ((to_room = real_room(atoi(value))) != NOWHERE)
+            if ((to_room = real_room(atoidx(value))) != NOWHERE)
                newexit->to_room = to_room;
            else
                wld_log(room, "wdoor: invalid door target");
@@ -291,7 +291,8 @@ WCMD(do_wdoor)
 WCMD(do_wteleport)
 {
    char_data *ch, *next_ch;
-    room_rnum target, nr;
+    room_rnum target;
    room_vnum nr;
    char arg1[MAX_INPUT_LENGTH], arg2[MAX_INPUT_LENGTH];
    two_arguments(argument, arg1, arg2);
@@ -301,7 +302,7 @@ WCMD(do_wteleport)
        return;
    }
-    nr = atoi(arg2);
+    nr = atoidx(arg2);
    target = real_room(nr);
    if (target == NOWHERE)
@@ -435,7 +436,7 @@ WCMD(do_wpurge)
 WCMD(do_wload)
 {
    char arg1[MAX_INPUT_LENGTH], arg2[MAX_INPUT_LENGTH];
-    int number = 0;
+    IDXTYPE number = NOTHING;
    char_data *mob;
    obj_data *object;
    char *target;
@@ -445,7 +446,7 @@ WCMD(do_wload)
    target = two_arguments(argument, arg1, arg2);
-    if (!*arg1 || !*arg2 || !is_number(arg2) || ((number = atoi(arg2)) < 0)) {
+    if (!*arg1 || !*arg2 || !is_number(arg2) || (number = atoidx(arg2)) == NOTHING) {
        wld_log(room, "wload: bad syntax");
        return;
    }
@@ -456,7 +457,7 @@ WCMD(do_wload)
      if (!target || !*target) {
        rnum = real_room(room->number);
      } else {
-        if (!isdigit(*target) || (rnum = real_room(atoi(target))) == NOWHERE) {
+        if (!isdigit(*target) || (rnum = real_room(atoidx(target))) == NOWHERE) {
          wld_log(room, "wload: room target vnum doesn't exist (loading mob vnum %d to room %s)", number, target);
          return;
        }
@@ -547,7 +548,7 @@ WCMD(do_wdamage) {
 WCMD(do_wat)     
 {
  room_rnum loc = NOWHERE;
-  struct char_data *ch;
+  char_data *ch;
  char arg[MAX_INPUT_LENGTH], *command; 
  command = any_one_arg(argument, arg); 
@@ -564,7 +565,7 @@ WCMD(do_wat)
    return;
  }
-  if (isdigit(*arg)) loc = real_room(atoi(arg));
+  if (isdigit(*arg)) loc = real_room(atoidx(arg));
  else if ((ch = get_char_by_room(room, arg))) loc = IN_ROOM(ch);
  if (loc == NOWHERE) {
@@ -577,7 +578,8 @@ WCMD(do_wat)
 WCMD(do_wmove)
 {
    obj_data *obj, *next_obj;
-    room_rnum target, nr;
+    room_rnum target;
    room_vnum nr;
    char arg1[MAX_INPUT_LENGTH], arg2[MAX_INPUT_LENGTH];
    two_arguments(argument, arg1, arg2);
@@ -587,7 +589,7 @@ WCMD(do_wmove)
        return;
    }
-    nr = atoi(arg2);
+    nr = atoidx(arg2);
    target = real_room(nr);
    if (target == NOWHERE) {
@@ -1054,7 +1054,7 @@ INCLUDE_FILE_PATTERNS =
 # undefined via #undef or recursively expanded use the := operator 
 # instead of the = operator.
-PREDEFINED = "ACMD(name)=void name (struct char_data *ch, char *argument, int cmd, int subcmd)" "WCMD(name)=void name (room_data *room, char *argument, int cmd, int subcmd)" "OCMD(name)=void name(obj_data *obj, char *argument, int cmd, int subcmd)" "SPECIAL(name)=int name(struct char_data *ch, void *me, int cmd, char *argument)"
+PREDEFINED = "ACMD(name)=void name (char_data *ch, char *argument, int cmd, int subcmd)" "WCMD(name)=void name (room_data *room, char *argument, int cmd, int subcmd)" "OCMD(name)=void name(obj_data *obj, char *argument, int cmd, int subcmd)" "SPECIAL(name)=int name(char_data *ch, void *me, int cmd, char *argument)"
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 
@@ -1054,7 +1054,7 @@ INCLUDE_FILE_PATTERNS =
 # undefined via #undef or recursively expanded use the := operator 
 # instead of the = operator.
-PREDEFINED = "ACMD(name)=void name (struct char_data *ch, char *argument, int cmd, int subcmd)" "WCMD(name)=void name (room_data *room, char *argument, int cmd, int subcmd)" "OCMD(name)=void name(obj_data *obj, char *argument, int cmd, int subcmd)" "SPECIAL(name)=int name(struct char_data *ch, void *me, int cmd, char *argument)"
+PREDEFINED = "ACMD(name)=void name (char_data *ch, char *argument, int cmd, int subcmd)" "WCMD(name)=void name (room_data *room, char *argument, int cmd, int subcmd)" "OCMD(name)=void name(obj_data *obj, char *argument, int cmd, int subcmd)" "SPECIAL(name)=int name(char_data *ch, void *me, int cmd, char *argument)"
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 
@@ -29,7 +29,7 @@
 /* locally defined global variables, used externally */
 /* head of l-list of fighting chars */
-struct char_data *combat_list = NULL;
+char_data *combat_list = NULL;
 /* Weapon attack texts */
 struct attack_hit_type attack_hit_text[] =
 {
@@ -51,23 +51,23 @@ struct attack_hit_type attack_hit_text[] =
 };
 /* local (file scope only) variables */
-static struct char_data *next_combat_list = NULL;
+static char_data *next_combat_list = NULL;
 /* local file scope utility functions */
-static void perform_group_gain(struct char_data *ch, int base, struct char_data *victim);
+static void perform_group_gain(char_data *ch, int base, char_data *victim);
-static void dam_message(int dam, struct char_data *ch, struct char_data *victim, int w_type);
+static void dam_message(int dam, char_data *ch, char_data *victim, int w_type);
-static void make_corpse(struct char_data *ch);
+static void make_corpse(char_data *ch);
-static void change_alignment(struct char_data *ch, struct char_data *victim);
+static void change_alignment(char_data *ch, char_data *victim);
-static void group_gain(struct char_data *ch, struct char_data *victim);
+static void group_gain(char_data *ch, char_data *victim);
-static void solo_gain(struct char_data *ch, struct char_data *victim);
+static void solo_gain(char_data *ch, char_data *victim);
 /** @todo refactor this function name */
 static char *replace_string(const char *str, const char *weapon_singular, const char *weapon_plural);
-static int compute_thaco(struct char_data *ch, struct char_data *vict);
+static int compute_thaco(char_data *ch, char_data *vict);
 #define IS_WEAPON(type) (((type) >= TYPE_HIT) && ((type) < TYPE_SUFFERING))
 /* The Fight related routines */
-void appear(struct char_data *ch)
+void appear(char_data *ch)
 {
  if (affected_by_spell(ch, SPELL_INVISIBLE))
    affect_from_char(ch, SPELL_INVISIBLE);
@@ -82,7 +82,7 @@ void appear(struct char_data *ch)
 	FALSE, ch, 0, 0, TO_ROOM);
 }
-int compute_armor_class(struct char_data *ch)
+int compute_armor_class(char_data *ch)
 {
  int armorclass = GET_AC(ch);
@@ -92,7 +92,7 @@ int compute_armor_class(struct char_data *ch)
  return (MAX(-100, armorclass));      /* -100 is lowest */
 }
-void update_pos(struct char_data *victim)
+void update_pos(char_data *victim)
 {
  if ((GET_HIT(victim) > 0) && (GET_POS(victim) > POS_STUNNED))
    return;
@@ -108,7 +108,7 @@ void update_pos(struct char_data *victim)
    GET_POS(victim) = POS_STUNNED;
 }
-void check_killer(struct char_data *ch, struct char_data *vict)
+void check_killer(char_data *ch, char_data *vict)
 {
  if (PLR_FLAGGED(vict, PLR_KILLER) || PLR_FLAGGED(vict, PLR_THIEF))
    return;
@@ -123,7 +123,7 @@ void check_killer(struct char_data *ch, struct char_data *vict)
 }
 /* start one char fighting another (yes, it is horrible, I know... )  */
-void set_fighting(struct char_data *ch, struct char_data *vict)
+void set_fighting(char_data *ch, char_data *vict)
 {
  if (ch == vict)
    return;
@@ -147,9 +147,9 @@ void set_fighting(struct char_data *ch, struct char_data *vict)
 }
 /* remove a char from the list of fighting chars */
-void stop_fighting(struct char_data *ch)
+void stop_fighting(char_data *ch)
 {
-  struct char_data *temp;
+  char_data *temp;
  if (ch == next_combat_list)
    next_combat_list = ch->next_fighting;
@@ -161,11 +161,11 @@ void stop_fighting(struct char_data *ch)
  update_pos(ch);
 }
-static void make_corpse(struct char_data *ch)
+static void make_corpse(char_data *ch)
 {
  char buf2[MAX_NAME_LENGTH + 64];
-  struct obj_data *corpse, *o;
+  obj_data *corpse, *o;
-  struct obj_data *money;
+  obj_data *money;
  int i, x, y;
  corpse = create_obj();
@@ -232,14 +232,14 @@ static void make_corpse(struct char_data *ch)
 }
 /* When ch kills victim */
-static void change_alignment(struct char_data *ch, struct char_data *victim)
+static void change_alignment(char_data *ch, char_data *victim)
 {
  /* new alignment change algorithm: if you kill a monster with alignment A,
   * you move 1/16th of the way to having alignment -A.  Simple and fast. */
  GET_ALIGNMENT(ch) += (-GET_ALIGNMENT(victim) - GET_ALIGNMENT(ch)) / 16;
 }
-void death_cry(struct char_data *ch)
+void death_cry(char_data *ch)
 {
  int door;
@@ -250,9 +250,9 @@ void death_cry(struct char_data *ch)
      send_to_room(world[IN_ROOM(ch)].dir_option[door]->to_room, "Your blood freezes as you hear someone's death cry.\r\n");
 }
-void raw_kill(struct char_data * ch, struct char_data * killer)
+void raw_kill(char_data * ch, char_data * killer)
 {
-struct char_data *i;
+char_data *i;
  if (FIGHTING(ch))
    stop_fighting(ch);
@@ -271,7 +271,7 @@ struct char_data *i;
  if (killer) {
    if (killer->group) {
-      while ((i = (struct char_data *) simple_list(killer->group->members)) != NULL)
+      while ((i = (char_data *) simple_list(killer->group->members)) != NULL)
        if(IN_ROOM(i) == IN_ROOM(ch)  || (world[IN_ROOM(i)].zone == world[IN_ROOM(ch)].zone))
          autoquest_trigger_check(i, ch, NULL, AQ_MOB_KILL);      
    } else
@@ -293,7 +293,7 @@ struct char_data *i;
  }
 }
-void die(struct char_data * ch, struct char_data * killer)
+void die(char_data * ch, char_data * killer)
 {
  gain_exp(ch, -(GET_EXP(ch) / 2));
  if (!IS_NPC(ch)) {
@@ -303,8 +303,8 @@ void die(struct char_data * ch, struct char_data * killer)
  raw_kill(ch, killer);
 }
-static void perform_group_gain(struct char_data *ch, int base,
+static void perform_group_gain(char_data *ch, int base,
-			     struct char_data *victim)
+			     char_data *victim)
 {
  int share, hap_share;
@@ -325,12 +325,12 @@ static void perform_group_gain(struct char_data *ch, int base,
  change_alignment(ch, victim);
 }
-static void group_gain(struct char_data *ch, struct char_data *victim)
+static void group_gain(char_data *ch, char_data *victim)
 {
  int tot_members = 0, base, tot_gain;
-  struct char_data *k;
+  char_data *k;
-  while ((k = (struct char_data *) simple_list(GROUP(ch)->members)) != NULL)
+  while ((k = (char_data *) simple_list(GROUP(ch)->members)) != NULL)
    if (IN_ROOM(ch) == IN_ROOM(k))
      tot_members++;
@@ -346,12 +346,12 @@ static void group_gain(struct char_data *ch, struct char_data *victim)
  else
    base = 0;
-  while ((k = (struct char_data *) simple_list(GROUP(ch)->members)) != NULL)
+  while ((k = (char_data *) simple_list(GROUP(ch)->members)) != NULL)
    if (IN_ROOM(k) == IN_ROOM(ch))
      perform_group_gain(k, base, victim);
 }
-static void solo_gain(struct char_data *ch, struct char_data *victim)
+static void solo_gain(char_data *ch, char_data *victim)
 {
  int exp, happy_exp;
@@ -407,7 +407,7 @@ static char *replace_string(const char *str, const char *weapon_singular, const
 }
 /* message for doing damage with a weapon */
-static void dam_message(int dam, struct char_data *ch, struct char_data *victim,
+static void dam_message(int dam, char_data *ch, char_data *victim,
 		      int w_type)
 {
  char *buf;
@@ -512,13 +512,13 @@ static void dam_message(int dam, struct char_data *ch, struct char_data *victim,
 /*  message for doing damage with a spell or skill. Also used for weapon
 *  damage on miss and death blows. */
-int skill_message(int dam, struct char_data *ch, struct char_data *vict,
+int skill_message(int dam, char_data *ch, char_data *vict,
 		      int attacktype)
 {
  int i, j, nr;
  struct message_type *msg;
-  struct obj_data *weap = GET_EQ(ch, WEAR_WIELD);
+  obj_data *weap = GET_EQ(ch, WEAR_WIELD);
  /* @todo restructure the messages library to a pointer based system as
   * opposed to the current cyclic location system. */
@@ -585,12 +585,12 @@ int skill_message(int dam, struct char_data *ch, struct char_data *vict,
 *	< 0	Victim died.
 *	= 0	No damage.
 *	> 0	How much damage done. */
-int damage(struct char_data *ch, struct char_data *victim, int dam, int attacktype)
+int damage(char_data *ch, char_data *victim, int dam, int attacktype)
 {
  long local_gold = 0, happy_gold = 0;
  char local_buf[256];
-  struct char_data *tmp_char;
+  char_data *tmp_char;
-  struct obj_data *corpse_obj;
+  obj_data *corpse_obj;
  if (GET_POS(victim) <= POS_DEAD) {
    /* This is "normal"-ish now with delayed extraction. -gg 3/15/2001 */
@@ -791,7 +791,7 @@ int damage(struct char_data *ch, struct char_data *victim, int dam, int attackty
 /* Calculate the THAC0 of the attacker. 'victim' currently isn't used but you
 * could use it for special cases like weapons that hit evil creatures easier
 * or a weapon that always misses attacking an animal. */
-static int compute_thaco(struct char_data *ch, struct char_data *victim)
+static int compute_thaco(char_data *ch, char_data *victim)
 {
  int calc_thaco;
@@ -807,9 +807,9 @@ static int compute_thaco(struct char_data *ch, struct char_data *victim)
  return calc_thaco;
 }
-void hit(struct char_data *ch, struct char_data *victim, int type)
+void hit(char_data *ch, char_data *victim, int type)
 {
-  struct obj_data *wielded = GET_EQ(ch, WEAR_WIELD);
+  obj_data *wielded = GET_EQ(ch, WEAR_WIELD);
  int w_type, victim_ac, calc_thaco, dam, diceroll;
  /* Check that the attacker and victim exist */
@@ -910,7 +910,7 @@ void hit(struct char_data *ch, struct char_data *victim, int type)
 /* control the fights going on.  Called every 2 seconds from comm.c. */
 void perform_violence(void)
 {
-  struct char_data *ch, *tch;
+  char_data *ch, *tch;
  for (ch = combat_list; ch; ch = next_combat_list) {
    next_combat_list = ch->next_fighting;
@@ -940,7 +940,7 @@ void perform_violence(void)
 if (GROUP(ch) && GROUP(ch)->members && GROUP(ch)->members->iSize) {
      struct iterator_data Iterator;
-      tch = (struct char_data *) merge_iterator(&Iterator, GROUP(ch)->members);
+      tch = (char_data *) merge_iterator(&Iterator, GROUP(ch)->members);
    for (; tch ; tch = next_in_list(&Iterator)) {
        if (tch == ch)
          continue;
@@ -21,23 +21,22 @@ struct attack_hit_type {
 };
 /* Functions available in fight.c */
-void appear(struct char_data *ch);
+void appear(char_data *ch);
-void check_killer(struct char_data *ch, struct char_data *vict);
+void check_killer(char_data *ch, char_data *vict);
-int compute_armor_class(struct char_data *ch);
+int compute_armor_class(char_data *ch);
-int damage(struct char_data *ch, struct char_data *victim, int dam, int attacktype);
+int damage(char_data *ch, char_data *victim, int dam, int attacktype);
-void death_cry(struct char_data *ch);
+void death_cry(char_data *ch);
-void die(struct char_data * ch, struct char_data * killer);
+void die(char_data * ch, char_data * killer);
-void hit(struct char_data *ch, struct char_data *victim, int type);
+void hit(char_data *ch, char_data *victim, int type);
 void perform_violence(void);
-void raw_kill(struct char_data * ch, struct char_data * killer);
+void raw_kill(char_data * ch, char_data * killer);
-void  set_fighting(struct char_data *ch, struct char_data *victim);
+void  set_fighting(char_data *ch, char_data *victim);
-int skill_message(int dam, struct char_data *ch, struct char_data *vict,
+int skill_message(int dam, char_data *ch, char_data *vict, int attacktype);
-          int attacktype);
+void  stop_fighting(char_data *ch);
 void  stop_fighting(struct char_data *ch);
 /* Global variables */
 extern struct attack_hit_type attack_hit_text[];
-extern struct char_data *combat_list;
+extern char_data *combat_list;
 #endif /* _FIGHT_H_*/
@@ -21,11 +21,11 @@
 /* local functions */
 static void extract_mobile_all(mob_vnum vnum);
-int add_mobile(struct char_data *mob, mob_vnum vnum)
+int add_mobile(char_data *mob, mob_vnum vnum)
 {
  int rnum, i, found = FALSE, shop, cmd_no;
  zone_rnum zone;
-  struct char_data *live_mob;
+  char_data *live_mob;
  if ((rnum = real_mobile(vnum)) != NOBODY) {
    /* Copy over the mobile and free() the old strings. */
@@ -41,7 +41,7 @@ int add_mobile(struct char_data *mob, mob_vnum vnum)
    return rnum;
  }
-  RECREATE(mob_proto, struct char_data, top_of_mobt + 2);
+  RECREATE(mob_proto, char_data, top_of_mobt + 2);
  RECREATE(mob_index, struct index_data, top_of_mobt + 2);
  top_of_mobt++;
@@ -90,7 +90,7 @@ int add_mobile(struct char_data *mob, mob_vnum vnum)
  return found;
 }
-int copy_mobile(struct char_data *to, struct char_data *from)
+int copy_mobile(char_data *to, char_data *from)
 {
  free_mobile_strings(to);
  *to = *from;
@@ -101,7 +101,7 @@ int copy_mobile(struct char_data *to, struct char_data *from)
 static void extract_mobile_all(mob_vnum vnum)
 {
-  struct char_data *next, *ch;
+  char_data *next, *ch;
  int i;
  for (ch = character_list; ch; ch = next) {
@@ -140,8 +140,8 @@ static void extract_mobile_all(mob_vnum vnum)
 int delete_mobile(mob_rnum refpt)
 {
-  struct char_data *live_mob;
+  char_data *live_mob;
-  struct char_data *proto;
+  char_data *proto;
  int counter, cmd_no;
  mob_vnum vnum;
  zone_rnum zone;
@@ -169,7 +169,7 @@ int delete_mobile(mob_rnum refpt)
  top_of_mobt--;
  RECREATE(mob_index, struct index_data, top_of_mobt + 1);
-  RECREATE(mob_proto, struct char_data, top_of_mobt + 1);
+  RECREATE(mob_proto, char_data, top_of_mobt + 1);
  /* Update live mobile rnums. */
  for (live_mob = character_list; live_mob; live_mob = live_mob->next)
@@ -195,7 +195,7 @@ int delete_mobile(mob_rnum refpt)
  return refpt;
 }
-int copy_mobile_strings(struct char_data *t, struct char_data *f)
+int copy_mobile_strings(char_data *t, char_data *f)
 {
  if (f->player.name)
    t->player.name = strdup(f->player.name);
@@ -210,7 +210,7 @@ int copy_mobile_strings(struct char_data *t, struct char_data *f)
  return TRUE;
 }
-int update_mobile_strings(struct char_data *t, struct char_data *f)
+int update_mobile_strings(char_data *t, char_data *f)
 {
  if (f->player.name)
    t->player.name = f->player.name;
@@ -225,7 +225,7 @@ int update_mobile_strings(struct char_data *t, struct char_data *f)
  return TRUE;
 }
-int free_mobile_strings(struct char_data *mob)
+int free_mobile_strings(char_data *mob)
 {
  if (mob->player.name)
    free(mob->player.name);
@@ -242,7 +242,7 @@ int free_mobile_strings(struct char_data *mob)
 /* Free a mobile structure that has been edited. Take care of existing mobiles
 * and their mob_proto! */
-int free_mobile(struct char_data *mob)
+int free_mobile(char_data *mob)
 {
  mob_rnum i;
@@ -325,7 +325,7 @@ int save_mobiles(zone_rnum rznum)
  return written;
 }
-int write_mobile_espec(mob_vnum mvnum, struct char_data *mob, FILE *fd)
+int write_mobile_espec(mob_vnum mvnum, char_data *mob, FILE *fd)
 {
  if (GET_ATTACK(mob) != 0)
    fprintf(fd, "BareHandAttack: %d\n", GET_ATTACK(mob));
@@ -357,7 +357,7 @@ int write_mobile_espec(mob_vnum mvnum, struct char_data *mob, FILE *fd)
  return TRUE;
 }
-int write_mobile_record(mob_vnum mvnum, struct char_data *mob, FILE *fd)
+int write_mobile_record(mob_vnum mvnum, char_data *mob, FILE *fd)
 {
  char ldesc[MAX_STRING_LENGTH];
  char ddesc[MAX_STRING_LENGTH];
@@ -419,7 +419,7 @@ int write_mobile_record(mob_vnum mvnum, struct char_data *mob, FILE *fd)
  return TRUE;
 }
-void check_mobile_strings(struct char_data *mob)
+void check_mobile_strings(char_data *mob)
 {
  mob_vnum mvnum = mob_index[mob->nr].vnum;
  check_mobile_string(mvnum, &GET_LDESC(mob), "long description");
@@ -13,21 +13,21 @@
 #define _GENMOB_H_
 int delete_mobile(mob_rnum);
-int copy_mobile(struct char_data *to, struct char_data *from);
+int copy_mobile(char_data *to, char_data *from);
-int add_mobile(struct char_data *, mob_vnum);
+int add_mobile(char_data *, mob_vnum);
-int copy_mob_strings(struct char_data *to, struct char_data *from);
+int copy_mob_strings(char_data *to, char_data *from);
-int free_mob_strings(struct char_data *);
+int free_mob_strings(char_data *);
-int free_mobile(struct char_data *mob);
+int free_mobile(char_data *mob);
 int save_mobiles(zone_rnum rznum);
-int update_mobile_strings(struct char_data *t, struct char_data *f);
+int update_mobile_strings(char_data *t, char_data *f);
-void check_mobile_strings(struct char_data *mob);
+void check_mobile_strings(char_data *mob);
 void check_mobile_string(mob_vnum i, char **string, const char *desc);
-int write_mobile_record(mob_vnum mvnum, struct char_data *mob, FILE *fd);
+int write_mobile_record(mob_vnum mvnum, char_data *mob, FILE *fd);
-int write_mobile_espec(mob_vnum mvnum, struct char_data *mob, FILE *fd);
+int write_mobile_espec(mob_vnum mvnum, char_data *mob, FILE *fd);
-int free_mobile_strings(struct char_data *mob);
+int free_mobile_strings(char_data *mob);
-int copy_mobile_strings(struct char_data *t, struct char_data *f);
+int copy_mobile_strings(char_data *t, char_data *f);
 #if CONFIG_GENOLC_MOBPROG
-int write_mobile_mobprog(mob_vnum mvnum, struct char_data *mob, FILE *fd);
+int write_mobile_mobprog(mob_vnum mvnum, char_data *mob, FILE *fd);
 #endif
 /* Handy macros. */
@@ -22,10 +22,10 @@
 /* local functions */
-static int update_all_objects(struct obj_data *obj);
+static int update_all_objects(obj_data *obj);
-static void copy_object_strings(struct obj_data *to, struct obj_data *from);
+static void copy_object_strings(obj_data *to, obj_data *from);
-obj_rnum add_object(struct obj_data *newobj, obj_vnum ovnum)
+obj_rnum add_object(obj_data *newobj, obj_vnum ovnum)
 {
  int found = NOTHING;
  zone_rnum rznum = real_zone_by_thing(ovnum);
@@ -48,9 +48,9 @@ obj_rnum add_object(struct obj_data *newobj, obj_vnum ovnum)
 * and every object currently in the game to see which ones are pointing to
 * this prototype. If object is pointing to this prototype, then we need to
 * replace it with the new one. */
-static int update_all_objects(struct obj_data *refobj)
+static int update_all_objects(obj_data *refobj)
 {
-  struct obj_data *obj, swap;
+  obj_data *obj, swap;
  int count = 0;
  for (obj = object_list; obj; obj = obj->next) {
@@ -85,7 +85,7 @@ static int update_all_objects(struct obj_data *refobj)
 obj_rnum adjust_objects(obj_rnum refpt)
 {
  int shop, i, zone, cmd_no;
-  struct obj_data *obj;
+  obj_data *obj;
 #if CIRCLE_UNSIGNED_INDEX
  if (refpt == NOTHING || refpt > top_of_objt)
@@ -132,13 +132,13 @@ obj_rnum adjust_objects(obj_rnum refpt)
 /* Function handle the insertion of an object within the prototype framework.
 * Note that this does not adjust internal values of other objects, use
 * add_object() for that. */
-obj_rnum insert_object(struct obj_data *obj, obj_vnum ovnum)
+obj_rnum insert_object(obj_data *obj, obj_vnum ovnum)
 {
  obj_rnum i;
  top_of_objt++;
  RECREATE(obj_index, struct index_data, top_of_objt + 1);
-  RECREATE(obj_proto, struct obj_data, top_of_objt + 1);
+  RECREATE(obj_proto, obj_data, top_of_objt + 1);
  /* Start counting through both tables. */
  for (i = top_of_objt; i > 0; i--) {
@@ -156,7 +156,7 @@ obj_rnum insert_object(struct obj_data *obj, obj_vnum ovnum)
  return index_object(obj, ovnum, 0);
 }
-obj_rnum index_object(struct obj_data *obj, obj_vnum ovnum, obj_rnum ornum)
+obj_rnum index_object(obj_data *obj, obj_vnum ovnum, obj_rnum ornum)
 {
 #if CIRCLE_UNSIGNED_INDEX
  if (obj == NULL || ornum == NOTHING || ornum > top_of_objt)
@@ -184,7 +184,7 @@ int save_objects(zone_rnum zone_num)
  char pbuf1[MAX_STRING_LENGTH], pbuf2[MAX_STRING_LENGTH], pbuf3[MAX_STRING_LENGTH], pbuf4[MAX_STRING_LENGTH];
  int counter, counter2, realcounter;
  FILE *fp;
-  struct obj_data *obj;
+  obj_data *obj;
  struct extra_descr_data *ex_desc;
 #if CIRCLE_UNSIGNED_INDEX
@@ -299,7 +299,7 @@ int save_objects(zone_rnum zone_num)
 }
 /* Free all, unconditionally. */
-void free_object_strings(struct obj_data *obj)
+void free_object_strings(obj_data *obj)
 {
  if (obj->name)
    free(obj->name);
@@ -314,7 +314,7 @@ void free_object_strings(struct obj_data *obj)
 }
 /* For object instances that are not the prototype. */
-void free_object_strings_proto(struct obj_data *obj)
+void free_object_strings_proto(obj_data *obj)
 {
  int robj_num = GET_OBJ_RNUM(obj);
@@ -349,7 +349,7 @@ void free_object_strings_proto(struct obj_data *obj)
  }
 }
-static void copy_object_strings(struct obj_data *to, struct obj_data *from)
+static void copy_object_strings(obj_data *to, obj_data *from)
 {
  to->name = from->name ? strdup(from->name) : NULL;
  to->description = from->description ? strdup(from->description) : NULL;
@@ -362,18 +362,18 @@ static void copy_object_strings(struct obj_data *to, struct obj_data *from)
    to->ex_description = NULL;
 }
-int copy_object(struct obj_data *to, struct obj_data *from)
+int copy_object(obj_data *to, obj_data *from)
 {
  free_object_strings(to);
  return copy_object_main(to, from, TRUE);
 }
-int copy_object_preserve(struct obj_data *to, struct obj_data *from)
+int copy_object_preserve(obj_data *to, obj_data *from)
 {
  return copy_object_main(to, from, FALSE);
 }
-int copy_object_main(struct obj_data *to, struct obj_data *from, int free_object)
+int copy_object_main(obj_data *to, obj_data *from, int free_object)
 {
  *to = *from;
  copy_object_strings(to, from);
@@ -384,7 +384,7 @@ int delete_object(obj_rnum rnum)
 {
  obj_rnum i;
  zone_rnum zrnum;
-  struct obj_data *obj, *tmp, *next_obj;
+  obj_data *obj, *tmp, *next_obj;
  int shop, j, zone, cmd_no;
  if (rnum == NOTHING || rnum > top_of_objt)
@@ -404,7 +404,7 @@ int delete_object(obj_rnum rnum)
    /* extract_obj() will just axe contents. */
    if (tmp->contains) {
-      struct obj_data *this_content, *next_content;
+      obj_data *this_content, *next_content;
      for (this_content = tmp->contains; this_content; this_content = next_content) {
        next_content = this_content->next_content;
        if (IN_ROOM(tmp)) {
@@ -442,7 +442,7 @@ int delete_object(obj_rnum rnum)
  top_of_objt--;
  RECREATE(obj_index, struct index_data, top_of_objt + 1);
-  RECREATE(obj_proto, struct obj_data, top_of_objt + 1);
+  RECREATE(obj_proto, obj_data, top_of_objt + 1);
  /* Renumber notice boards. */
  for (j = 0; j < NUM_OF_BOARDS; j++)
@@ -487,7 +487,7 @@ int delete_object(obj_rnum rnum)
 }
 /* oset handling, this location should be temporary */
-bool oset_alias(struct obj_data *obj, char * argument)
+bool oset_alias(obj_data *obj, char * argument)
 { 
  static size_t max_len = 64;
  int i = GET_OBJ_RNUM(obj);
@@ -505,7 +505,7 @@ bool oset_alias(struct obj_data *obj, char * argument)
  return TRUE;
 }
-bool oset_apply(struct obj_data *obj, char * argument)
+bool oset_apply(obj_data *obj, char * argument)
 { 
  int i = 0, apply = -1, location = -1, mod = 0, empty = -1, value;
  char arg[MAX_INPUT_LENGTH];
@@ -558,7 +558,7 @@ bool oset_apply(struct obj_data *obj, char * argument)
  return TRUE;
 }
-bool oset_short_description(struct obj_data *obj, char * argument)
+bool oset_short_description(obj_data *obj, char * argument)
 { 
  static size_t max_len = 64;
  int i = GET_OBJ_RNUM(obj);
@@ -576,7 +576,7 @@ bool oset_short_description(struct obj_data *obj, char * argument)
  return TRUE;
 }
-bool oset_long_description(struct obj_data *obj, char * argument)
+bool oset_long_description(obj_data *obj, char * argument)
 {
  static size_t max_len = 128;
  int i = GET_OBJ_RNUM(obj);  
@@ -12,20 +12,20 @@
 #ifndef _GENOBJ_H_
 #define _GENOBJ_H_
-void free_object_strings_proto(struct obj_data *obj);
+void free_object_strings_proto(obj_data *obj);
-void free_object_strings(struct obj_data *obj);
+void free_object_strings(obj_data *obj);
-int copy_object(struct obj_data *to, struct obj_data *from);
+int copy_object(obj_data *to, obj_data *from);
-int copy_object_preserve(struct obj_data *to, struct obj_data *from);
+int copy_object_preserve(obj_data *to, obj_data *from);
 int save_objects(zone_rnum vznum);
-obj_rnum insert_object(struct obj_data *obj, obj_vnum ovnum);
+obj_rnum insert_object(obj_data *obj, obj_vnum ovnum);
 obj_rnum adjust_objects(obj_rnum refpt);
-obj_rnum index_object(struct obj_data *obj, obj_vnum ovnum, obj_rnum ornum);
+obj_rnum index_object(obj_data *obj, obj_vnum ovnum, obj_rnum ornum);
-obj_rnum add_object(struct obj_data *, obj_vnum ovnum);
+obj_rnum add_object(obj_data *, obj_vnum ovnum);
-int copy_object_main(struct obj_data *to, struct obj_data *from, int free_object);
+int copy_object_main(obj_data *to, obj_data *from, int free_object);
 int delete_object(obj_rnum);
-bool oset_alias(struct obj_data *obj, char * argument);
+bool oset_alias(obj_data *obj, char * argument);
-bool oset_apply(struct obj_data *obj, char * argument);
+bool oset_apply(obj_data *obj, char * argument);
-bool oset_short_description(struct obj_data *obj, char * argument);
+bool oset_short_description(obj_data *obj, char * argument);
-bool oset_long_description(struct obj_data *obj, char * argument);
+bool oset_long_description(obj_data *obj, char * argument);
 #endif /* _GENOBJ_H_ */
@@ -60,11 +60,11 @@ static int export_save_zone(zone_rnum zrnum);
 static int export_save_objects(zone_rnum zrnum);
 static int export_save_rooms(zone_rnum zrnum);
 static int export_save_triggers(zone_rnum zrnum);
-static int export_mobile_record(mob_vnum mvnum, struct char_data *mob, FILE *fd);
+static int export_mobile_record(mob_vnum mvnum, char_data *mob, FILE *fd);
 static void export_script_save_to_disk(FILE *fp, void *item, int type);
 static int export_info_file(zone_rnum zrnum);
-int genolc_checkstring(struct descriptor_data *d, char *arg)
+int genolc_checkstring(descriptor_data *d, char *arg)
 {
  smash_tilde(arg);
  parse_at(arg);
@@ -330,7 +330,7 @@ ACMD(do_export_zone)
    return; 
  } 
-  zvnum = atoi(argument); 
+  zvnum = atoidx(argument);
  zrnum = real_zone(zvnum); 
  if (zrnum == NOWHERE) { 
@@ -589,7 +589,7 @@ static int export_save_mobiles(zone_rnum rznum)
  return TRUE;
 }
-static int export_mobile_record(mob_vnum mvnum, struct char_data *mob, FILE *fd)
+static int export_mobile_record(mob_vnum mvnum, char_data *mob, FILE *fd)
 {
  char ldesc[MAX_STRING_LENGTH];
@@ -774,7 +774,7 @@ static int export_save_objects(zone_rnum zrnum)
  obj_vnum ovnum;
  int i;
  FILE *obj_file;
-  struct obj_data *obj;
+  obj_data *obj;
  struct extra_descr_data *ex_desc;
  if (!(obj_file = fopen("world/export/qq.obj", "w"))) {
@@ -996,9 +996,9 @@ static void export_script_save_to_disk(FILE *fp, void *item, int type)
  struct trig_proto_list *t;
  if (type==MOB_TRIGGER)
-    t = ((struct char_data *)item)->proto_script;
+    t = ((char_data *)item)->proto_script;
  else if (type==OBJ_TRIGGER)
-    t = ((struct obj_data *)item)->proto_script;
+    t = ((obj_data *)item)->proto_script;
  else if (type==WLD_TRIGGER)
    t = ((struct room_data *)item)->proto_script;
  else {
@@ -15,7 +15,7 @@
 #define STRING_TERMINATOR       '~'
 #define CONFIG_GENOLC_MOBPROG   0
-int genolc_checkstring(struct descriptor_data *d, char *arg);
+int genolc_checkstring(descriptor_data *d, char *arg);
 int remove_from_save_list(zone_vnum, int type);
 int add_to_save_list(zone_vnum, int type);
 int in_save_list(zone_vnum, int type);
@@ -24,8 +24,8 @@
 * the description, title, and such. */
 room_rnum add_room(struct room_data *room)
 {
-  struct char_data *tch;
+  char_data *tch;
-  struct obj_data *tobj;
+  obj_data *tobj;
  int j, found = FALSE;
  room_rnum i;
@@ -123,8 +123,8 @@ int delete_room(room_rnum rnum)
 {
  room_rnum i;
  int j;
-  struct char_data *ppl, *next_ppl;
+  char_data *ppl, *next_ppl;
-  struct obj_data *obj, *next_obj;
+  obj_data *obj, *next_obj;
  struct room_data *room;
  if (rnum <= 0 || rnum > top_of_world)	/* Can't delete void yet. */
@@ -141,7 +141,7 @@ static int find_first_step(room_rnum src, room_rnum target)
 ACMD(do_track)
 {
  char arg[MAX_INPUT_LENGTH];
-  struct char_data *vict;
+  char_data *vict;
  int dir;
  /* The character must have the track skill. */
@@ -195,11 +195,11 @@ ACMD(do_track)
  }
 }
-void hunt_victim(struct char_data *ch)
+void hunt_victim(char_data *ch)
 {
  int dir;
  byte found;
-  struct char_data *tmp;
+  char_data *tmp;
  if (!ch || !HUNTING(ch) || FIGHTING(ch))
    return;
@@ -15,6 +15,6 @@
 #define _GRAPH_H_
 ACMD(do_track);
-void hunt_victim(struct char_data *ch);
+void hunt_victim(char_data *ch);
 #endif /* _GRAPH_H_*/
@@ -29,9 +29,9 @@
 static int extractions_pending = 0;
 /* local file scope functions */
-static int apply_ac(struct char_data *ch, int eq_pos);
+static int apply_ac(char_data *ch, int eq_pos);
-static void update_object(struct obj_data *obj, int use);
+static void update_object(obj_data *obj, int use);
-static void affect_modify_ar(struct char_data * ch, byte loc, sbyte mod, int bitv[], bool add);
+static void affect_modify_ar(char_data * ch, byte loc, sbyte mod, int bitv[], bool add);
 char *fname(const char *namelist)
 {
@@ -105,7 +105,7 @@ int isname(const char *str, const char *namelist)
  return 0;
 }
-static void aff_apply_modify(struct char_data *ch, byte loc, sbyte mod, char *msg)
+static void aff_apply_modify(char_data *ch, byte loc, sbyte mod, char *msg)
 {
  switch (loc) {
  case APPLY_NONE:
@@ -205,7 +205,7 @@ static void aff_apply_modify(struct char_data *ch, byte loc, sbyte mod, char *ms
  } /* switch */
 }
-static void affect_modify_ar(struct char_data * ch, byte loc, sbyte mod, int bitv[], bool add)
+static void affect_modify_ar(char_data * ch, byte loc, sbyte mod, int bitv[], bool add)
 {
  int i , j;
@@ -227,7 +227,7 @@ static void affect_modify_ar(struct char_data * ch, byte loc, sbyte mod, int bit
 /* This updates a character by subtracting everything he is affected by
 * restoring original abilities, and then affecting all again. */
-void affect_total(struct char_data *ch)
+void affect_total(char_data *ch)
 {
  struct affected_type *af;
  int i, j;
@@ -279,7 +279,7 @@ void affect_total(struct char_data *ch)
 /* Insert an affect_type in a char_data structure. Automatically sets
 * apropriate bits and apply's */
-void affect_to_char(struct char_data *ch, struct affected_type *af)
+void affect_to_char(char_data *ch, struct affected_type *af)
 {
  struct affected_type *affected_alloc;
@@ -296,7 +296,7 @@ void affect_to_char(struct char_data *ch, struct affected_type *af)
 /* Remove an affected_type structure from a char (called when duration reaches
 * zero). Pointer *af must never be NIL!  Frees mem and calls
 * affect_location_apply */
-void affect_remove(struct char_data *ch, struct affected_type *af)
+void affect_remove(char_data *ch, struct affected_type *af)
 {
  struct affected_type *temp;
@@ -312,7 +312,7 @@ void affect_remove(struct char_data *ch, struct affected_type *af)
 }
 /* Call affect_remove with every affect from the spell "type" */
-void affect_from_char(struct char_data *ch, int type)
+void affect_from_char(char_data *ch, int type)
 {
  struct affected_type *hjp, *next;
@@ -325,7 +325,7 @@ void affect_from_char(struct char_data *ch, int type)
 /* Return TRUE if a char is affected by a spell (SPELL_XXX), FALSE indicates
 * not affected. */
-bool affected_by_spell(struct char_data *ch, int type)
+bool affected_by_spell(char_data *ch, int type)
 {
  struct affected_type *hjp;
@@ -336,7 +336,7 @@ bool affected_by_spell(struct char_data *ch, int type)
  return (FALSE);
 }
-void affect_join(struct char_data *ch, struct affected_type *af,
+void affect_join(char_data *ch, struct affected_type *af,
 		      bool add_dur, bool avg_dur, bool add_mod, bool avg_mod)
 {
  struct affected_type *hjp, *next;
@@ -365,9 +365,9 @@ void affect_join(struct char_data *ch, struct affected_type *af,
 }
 /* move a player out of a room */
-void char_from_room(struct char_data *ch)
+void char_from_room(char_data *ch)
 {
-  struct char_data *temp;
+  char_data *temp;
  if (ch == NULL || IN_ROOM(ch) == NOWHERE) {
    log("SYSERR: NULL character or NOWHERE in %s, char_from_room", __FILE__);
@@ -390,7 +390,7 @@ void char_from_room(struct char_data *ch)
 }
 /* place a character in a room */
-void char_to_room(struct char_data *ch, room_rnum room)
+void char_to_room(char_data *ch, room_rnum room)
 {
  if (ch == NULL || room == NOWHERE || room > top_of_world)
    log("SYSERR: Illegal value(s) passed to char_to_room. (Room: %d/%d Ch: %p",
@@ -417,7 +417,7 @@ void char_to_room(struct char_data *ch, room_rnum room)
 }
 /* Give an object to a char. */
-void obj_to_char(struct obj_data *object, struct char_data *ch)
+void obj_to_char(obj_data *object, char_data *ch)
 {
  if (object && ch) {
    object->next_content = ch->carrying;
@@ -437,9 +437,9 @@ void obj_to_char(struct obj_data *object, struct char_data *ch)
 }
 /* take an object from a char */
-void obj_from_char(struct obj_data *object)
+void obj_from_char(obj_data *object)
 {
-  struct obj_data *temp;
+  obj_data *temp;
  if (object == NULL) {
    log("SYSERR: NULL object passed to obj_from_char.");
@@ -458,7 +458,7 @@ void obj_from_char(struct obj_data *object)
 }
 /* Return the effect of a piece of armor in position eq_pos */
-static int apply_ac(struct char_data *ch, int eq_pos)
+static int apply_ac(char_data *ch, int eq_pos)
 {
  int factor;
@@ -489,7 +489,7 @@ static int apply_ac(struct char_data *ch, int eq_pos)
  return (factor * GET_OBJ_VAL(GET_EQ(ch, eq_pos), 0));
 }
-int invalid_align(struct char_data *ch, struct obj_data *obj)
+int invalid_align(char_data *ch, obj_data *obj)
 {
  if (OBJ_FLAGGED(obj, ITEM_ANTI_EVIL) && IS_EVIL(ch))
    return TRUE;
@@ -500,7 +500,7 @@ int invalid_align(struct char_data *ch, struct obj_data *obj)
  return FALSE;
 }
-void equip_char(struct char_data *ch, struct obj_data *obj, int pos)
+void equip_char(char_data *ch, obj_data *obj, int pos)
 {
  int j;
@@ -552,10 +552,10 @@ void equip_char(struct char_data *ch, struct obj_data *obj, int pos)
  affect_total(ch);
 }
-struct obj_data *unequip_char(struct char_data *ch, int pos)
+obj_data *unequip_char(char_data *ch, int pos)
 {
  int j;
-  struct obj_data *obj;
+  obj_data *obj;
  if ((pos < 0 || pos >= NUM_WEARS) || GET_EQ(ch, pos) == NULL) {
    core_dump();
@@ -611,9 +611,9 @@ int get_number(char **name)
 }
 /* Search a given list for an object number, and return a ptr to that obj */
-struct obj_data *get_obj_in_list_num(int num, struct obj_data *list)
+obj_data *get_obj_in_list_num(int num, obj_data *list)
 {
-  struct obj_data *i;
+  obj_data *i;
  for (i = list; i; i = i->next_content)
    if (GET_OBJ_RNUM(i) == num)
@@ -623,9 +623,9 @@ struct obj_data *get_obj_in_list_num(int num, struct obj_data *list)
 }
 /* search the entire world for an object number, and return a pointer  */
-struct obj_data *get_obj_num(obj_rnum nr)
+obj_data *get_obj_num(obj_rnum nr)
 {
-  struct obj_data *i;
+  obj_data *i;
  for (i = object_list; i; i = i->next)
    if (GET_OBJ_RNUM(i) == nr)
@@ -635,9 +635,9 @@ struct obj_data *get_obj_num(obj_rnum nr)
 }
 /* search a room for a char, and return a pointer if found..  */
-struct char_data *get_char_room(char *name, int *number, room_rnum room)
+char_data *get_char_room(char *name, int *number, room_rnum room)
 {
-  struct char_data *i;
+  char_data *i;
  int num;
  if (!number) {
@@ -657,9 +657,9 @@ struct char_data *get_char_room(char *name, int *number, room_rnum room)
 }
 /* search all over the world for a char num, and return a pointer if found */
-struct char_data *get_char_num(mob_rnum nr)
+char_data *get_char_num(mob_rnum nr)
 {
-  struct char_data *i;
+  char_data *i;
  for (i = character_list; i; i = i->next)
    if (GET_MOB_RNUM(i) == nr)
@@ -669,7 +669,7 @@ struct char_data *get_char_num(mob_rnum nr)
 }
 /* put an object in a room */
-void obj_to_room(struct obj_data *object, room_rnum room)
+void obj_to_room(obj_data *object, room_rnum room)
 {
  if (!object || room == NOWHERE || room > top_of_world){
    log("SYSERR: Illegal value(s) passed to obj_to_room. (Room #%d/%d, obj %p)",
@@ -680,7 +680,7 @@ void obj_to_room(struct obj_data *object, room_rnum room)
      world[room].contents = object; // add object to list
    }
    else {
-      struct obj_data *i = world[room].contents; // define a temporary pointer
+      obj_data *i = world[room].contents; // define a temporary pointer
      while (i->next_content != NULL) i = i->next_content; // find the first without a next_content
        i->next_content = object; // add object at the end
    }
@@ -693,10 +693,10 @@ void obj_to_room(struct obj_data *object, room_rnum room)
 }
 /* Take an object from a room */
-void obj_from_room(struct obj_data *object)
+void obj_from_room(obj_data *object)
 {
-  struct obj_data *temp;
+  obj_data *temp;
-  struct char_data *t, *tempch;
+  char_data *t, *tempch;
  if (!object || IN_ROOM(object) == NOWHERE) {
    log("SYSERR: NULL object (%p) or obj not in a room (%d) passed to obj_from_room",
@@ -722,9 +722,9 @@ void obj_from_room(struct obj_data *object)
 }
 /* put an object in an object (quaint)  */
-void obj_to_obj(struct obj_data *obj, struct obj_data *obj_to)
+void obj_to_obj(obj_data *obj, obj_data *obj_to)
 {
-  struct obj_data *tmp_obj;
+  obj_data *tmp_obj;
  if (!obj || !obj_to || obj == obj_to) {
    log("SYSERR: NULL object (%p) or same source (%p) and target (%p) obj passed to obj_to_obj.",
@@ -749,9 +749,9 @@ void obj_to_obj(struct obj_data *obj, struct obj_data *obj_to)
 }
 /* remove an object from an object */
-void obj_from_obj(struct obj_data *obj)
+void obj_from_obj(obj_data *obj)
 {
-  struct obj_data *temp, *obj_from;
+  obj_data *temp, *obj_from;
  if (obj->in_obj == NULL) {
    log("SYSERR: (%s): trying to illegally extract obj from obj.", __FILE__);
@@ -775,7 +775,7 @@ void obj_from_obj(struct obj_data *obj)
 }
 /* Set all carried_by to point to new owner */
-void object_list_new_owner(struct obj_data *list, struct char_data *ch)
+void object_list_new_owner(obj_data *list, char_data *ch)
 {
  if (list) {
    object_list_new_owner(list->contains, ch);
@@ -785,10 +785,10 @@ void object_list_new_owner(struct obj_data *list, struct char_data *ch)
 }
 /* Extract an object from the world */
-void extract_obj(struct obj_data *obj)
+void extract_obj(obj_data *obj)
 {
-  struct char_data *ch, *next = NULL;
+  char_data *ch, *next = NULL;
-  struct obj_data *temp;
+  obj_data *temp;
  if (obj->worn_by != NULL)
    if (unequip_char(obj->worn_by, obj->worn_on) != obj)
@@ -840,7 +840,7 @@ void extract_obj(struct obj_data *obj)
  free_obj(obj);
 }
-static void update_object(struct obj_data *obj, int use)
+static void update_object(obj_data *obj, int use)
 {
  /* dont update objects with a timer trigger */
  if (!SCRIPT_CHECK(obj, OTRIG_TIMER) && (GET_OBJ_TIMER(obj) > 0))
@@ -851,7 +851,7 @@ static void update_object(struct obj_data *obj, int use)
    update_object(obj->next_content, use);
 }
-void update_char_objects(struct char_data *ch)
+void update_char_objects(char_data *ch)
 {
  int i;
@@ -878,11 +878,11 @@ void update_char_objects(struct char_data *ch)
 }
 /* Extract a ch completely from the world, and leave his stuff behind */
-void extract_char_final(struct char_data *ch)
+void extract_char_final(char_data *ch)
 {
-  struct char_data *k, *temp;
+  char_data *k, *temp;
-  struct descriptor_data *d;
+  descriptor_data *d;
-  struct obj_data *obj;
+  obj_data *obj;
  int i;
  if (IN_ROOM(ch) == NOWHERE) {
@@ -1001,7 +1001,7 @@ void extract_char_final(struct char_data *ch)
 * Fixed a bug where it would over-count extractions if you try to extract the
 * same character twice (e.g. double-purging in a script) -khufu / EmpireMUD
 */
-void extract_char(struct char_data *ch)
+void extract_char(char_data *ch)
 {
  char_from_furniture(ch);
  clear_char_event_list(ch);
@@ -1022,7 +1022,7 @@ void extract_char(struct char_data *ch)
 * confusing some code. -gg This doesn't handle recursive extractions. */
 void extract_pending_chars(void)
 {
-  struct char_data *vict, *next_vict, *prev_vict;
+  char_data *vict, *next_vict, *prev_vict;
  if (extractions_pending < 0)
    log("SYSERR: Negative (%d) extractions pending.", extractions_pending);
@@ -1057,9 +1057,9 @@ void extract_pending_chars(void)
 /* Here follows high-level versions of some earlier routines, ie functions
 * which incorporate the actual player-data */
-struct char_data *get_player_vis(struct char_data *ch, char *name, int *number, int inroom)
+char_data *get_player_vis(char_data *ch, char *name, int *number, int inroom)
 {
-  struct char_data *i;
+  char_data *i;
  int num;
  if (!number) {
@@ -1084,9 +1084,9 @@ struct char_data *get_player_vis(struct char_data *ch, char *name, int *number,
  return (NULL);
 }
-struct char_data *get_char_room_vis(struct char_data *ch, char *name, int *number)
+char_data *get_char_room_vis(char_data *ch, char *name, int *number)
 {
-  struct char_data *i;
+  char_data *i;
  int num;
  if (!number) {
@@ -1111,9 +1111,9 @@ struct char_data *get_char_room_vis(struct char_data *ch, char *name, int *numbe
  return (NULL);
 }
-struct char_data *get_char_world_vis(struct char_data *ch, char *name, int *number)
+char_data *get_char_world_vis(char_data *ch, char *name, int *number)
 {
-  struct char_data *i;
+  char_data *i;
  int num;
  if (!number) {
@@ -1142,7 +1142,7 @@ struct char_data *get_char_world_vis(struct char_data *ch, char *name, int *numb
  return (NULL);
 }
-struct char_data *get_char_vis(struct char_data *ch, char *name, int *number, int where)
+char_data *get_char_vis(char_data *ch, char *name, int *number, int where)
 {
  if (where == FIND_CHAR_ROOM)
    return get_char_room_vis(ch, name, number);
@@ -1152,9 +1152,9 @@ struct char_data *get_char_vis(struct char_data *ch, char *name, int *number, in
    return (NULL);
 }
-struct obj_data *get_obj_in_list_vis(struct char_data *ch, char *name, int *number, struct obj_data *list)
+obj_data *get_obj_in_list_vis(char_data *ch, char *name, int *number, obj_data *list)
 {
-  struct obj_data *i;
+  obj_data *i;
  int num;
  if (!number) {
@@ -1175,9 +1175,9 @@ struct obj_data *get_obj_in_list_vis(struct char_data *ch, char *name, int *numb
 }
 /* search the entire world for an object, and return a pointer  */
-struct obj_data *get_obj_vis(struct char_data *ch, char *name, int *number)
+obj_data *get_obj_vis(char_data *ch, char *name, int *number)
 {
-  struct obj_data *i;
+  obj_data *i;
  int num;
  if (!number) {
@@ -1206,7 +1206,7 @@ struct obj_data *get_obj_vis(struct char_data *ch, char *name, int *number)
  return (NULL);
 }
-struct obj_data *get_obj_in_equip_vis(struct char_data *ch, char *arg, int *number, struct obj_data *equipment[])
+obj_data *get_obj_in_equip_vis(char_data *ch, char *arg, int *number, obj_data *equipment[])
 {
  int j, num;
@@ -1226,7 +1226,7 @@ struct obj_data *get_obj_in_equip_vis(struct char_data *ch, char *arg, int *numb
  return (NULL);
 }
-int get_obj_pos_in_equip_vis(struct char_data *ch, char *arg, int *number, struct obj_data *equipment[])
+int get_obj_pos_in_equip_vis(char_data *ch, char *arg, int *number, obj_data *equipment[])
 {
  int j, num;
@@ -1282,9 +1282,9 @@ const char *money_desc(int amount)
  return ("an absolutely colossal mountain of gold coins");
 }
-struct obj_data *create_money(int amount)
+obj_data *create_money(int amount)
 {
-  struct obj_data *obj;
+  obj_data *obj;
  struct extra_descr_data *new_descr;
  char buf[200];
  int y;
@@ -1350,8 +1350,8 @@ struct obj_data *create_money(int amount)
 * The routine used to return a pointer to the next word in *arg (just
 * like the one_argument routine), but now it returns an integer that
 * describes what it filled in. */
-int generic_find(char *arg, bitvector_t bitvector, struct char_data *ch,
+int generic_find(char *arg, bitvector_t bitvector, char_data *ch,
-		     struct char_data **tar_ch, struct obj_data **tar_obj)
+		     char_data **tar_ch, obj_data **tar_obj)
 {
  int i, found, number;
  char name_val[MAX_INPUT_LENGTH];
@@ -1418,7 +1418,7 @@ int find_all_dots(char *arg)
 }
 /* Group Handlers */
-struct group_data * create_group(struct char_data * leader) 
+struct group_data * create_group(char_data * leader)
 {
  struct group_data * new_group;
@@ -1445,11 +1445,11 @@ struct group_data * create_group(struct char_data * leader)
 void free_group(struct group_data * group)
 {
-  struct char_data *tch;
+  char_data *tch;
 	struct iterator_data Iterator;
  if (group->members->iSize) {
-		for (tch = (struct char_data *) merge_iterator(&Iterator, group->members);
+		for (tch = (char_data *) merge_iterator(&Iterator, group->members);
 		  tch; 
 		    tch = next_in_list(&Iterator))
          leave_group(tch);
@@ -1462,10 +1462,10 @@ void free_group(struct group_data * group)
  free(group);
 }
-void leave_group(struct char_data *ch)
+void leave_group(char_data *ch)
 {
  struct group_data *group;
-  struct char_data *tch;
+  char_data *tch;
  struct iterator_data Iterator;
  bool found_pc = FALSE;
@@ -1478,7 +1478,7 @@ void leave_group(struct char_data *ch)
  ch->group = NULL;
  if (group->members->iSize) {
-    for (tch = (struct char_data *) merge_iterator(&Iterator, group->members);
+    for (tch = (char_data *) merge_iterator(&Iterator, group->members);
      tch; tch = next_in_list(&Iterator))
        if (!IS_NPC(tch)) 
          found_pc = TRUE;
@@ -1490,13 +1490,13 @@ void leave_group(struct char_data *ch)
    SET_BIT(GROUP_FLAGS(group), GROUP_NPC);
  if (GROUP_LEADER(group) == ch && group->members->iSize) {
-    group->leader = (struct char_data *) random_from_list(group->members);
+    group->leader = (char_data *) random_from_list(group->members);
    send_to_group(NULL, group, "%s has assumed leadership of the group.\r\n", GET_NAME(GROUP_LEADER(group)));
  } else if (group->members->iSize == 0)
    free_group(group); 
 }
-void join_group(struct char_data *ch, struct group_data *group)
+void join_group(char_data *ch, struct group_data *group)
 {
  add_to_list(ch, group->members);
@@ -13,62 +13,61 @@
 #define _HANDLER_H_
 /* handling the affected-structures */
-void	affect_total(struct char_data *ch);
+void affect_total(char_data *ch);
-void	affect_to_char(struct char_data *ch, struct affected_type *af);
+void affect_to_char(char_data *ch, struct affected_type *af);
-void	affect_remove(struct char_data *ch, struct affected_type *af);
+void affect_remove(char_data *ch, struct affected_type *af);
-void	affect_from_char(struct char_data *ch, int type);
+void affect_from_char(char_data *ch, int type);
-bool	affected_by_spell(struct char_data *ch, int type);
+bool affected_by_spell(char_data *ch, int type);
-void	affect_join(struct char_data *ch, struct affected_type *af,
+void affect_join(char_data *ch, struct affected_type *af, bool add_dur, bool avg_dur, bool add_mod, bool avg_mod);
 bool add_dur, bool avg_dur, bool add_mod, bool avg_mod);
 /* utility */
 const char *money_desc(int amount);
-struct obj_data *create_money(int amount);
+obj_data *create_money(int amount);
 int isname(const char *str, const char *namelist);
 int is_name(const char *str, const char *namelist);
 char *fname(const char *namelist);
 int get_number(char **name);
 /* objects */
-void	obj_to_char(struct obj_data *object, struct char_data *ch);
+void obj_to_char(obj_data *object, char_data *ch);
-void	obj_from_char(struct obj_data *object);
+void obj_from_char(obj_data *object);
-void	equip_char(struct char_data *ch, struct obj_data *obj, int pos);
+void equip_char(char_data *ch, obj_data *obj, int pos);
-struct obj_data *unequip_char(struct char_data *ch, int pos);
+obj_data *unequip_char(char_data *ch, int pos);
-int	invalid_align(struct char_data *ch, struct obj_data *obj);
+int invalid_align(char_data *ch, obj_data *obj);
-void	obj_to_room(struct obj_data *object, room_rnum room);
+void obj_to_room(obj_data *object, room_rnum room);
-void	obj_from_room(struct obj_data *object);
+void obj_from_room(obj_data *object);
-void	obj_to_obj(struct obj_data *obj, struct obj_data *obj_to);
+void obj_to_obj(obj_data *obj, obj_data *obj_to);
-void	obj_from_obj(struct obj_data *obj);
+void obj_from_obj(obj_data *obj);
-void	object_list_new_owner(struct obj_data *list, struct char_data *ch);
+void object_list_new_owner(obj_data *list, char_data *ch);
-void	extract_obj(struct obj_data *obj);
+void extract_obj(obj_data *obj);
-void update_char_objects(struct char_data *ch);
+void update_char_objects(char_data *ch);
 /* characters*/
-struct char_data *get_char_room(char *name, int *num, room_rnum room);
+char_data *get_char_room(char *name, int *num, room_rnum room);
-struct char_data *get_char_num(mob_rnum nr);
+char_data *get_char_num(mob_rnum nr);
-void	char_from_room(struct char_data *ch);
+void char_from_room(char_data *ch);
-void	char_to_room(struct char_data *ch, room_rnum room);
+void char_to_room(char_data *ch, room_rnum room);
-void	extract_char(struct char_data *ch);
+void extract_char(char_data *ch);
-void	extract_char_final(struct char_data *ch);
+void extract_char_final(char_data *ch);
 void extract_pending_chars(void);
 /* find if character can see */
-struct char_data *get_player_vis(struct char_data *ch, char *name, int *number, int inroom);
+char_data *get_player_vis(char_data *ch, char *name, int *number, int inroom);
-struct char_data *get_char_vis(struct char_data *ch, char *name, int *number, int where);
+char_data *get_char_vis(char_data *ch, char *name, int *number, int where);
-struct char_data *get_char_room_vis(struct char_data *ch, char *name, int *number);
+char_data *get_char_room_vis(char_data *ch, char *name, int *number);
-struct char_data *get_char_world_vis(struct char_data *ch, char *name, int *number);
+char_data *get_char_world_vis(char_data *ch, char *name, int *number);
-struct obj_data *get_obj_in_list_num(int num, struct obj_data *list);
+obj_data *get_obj_in_list_num(int num, obj_data *list);
-struct obj_data *get_obj_num(obj_rnum nr);
+obj_data *get_obj_num(obj_rnum nr);
-struct obj_data *get_obj_in_list_vis(struct char_data *ch, char *name, int *number, struct obj_data *list);
+obj_data *get_obj_in_list_vis(char_data *ch, char *name, int *number, obj_data *list);
-struct obj_data *get_obj_vis(struct char_data *ch, char *name, int *num);
+obj_data *get_obj_vis(char_data *ch, char *name, int *num);
-struct obj_data *get_obj_in_equip_vis(struct char_data *ch, char *arg, int *number, struct obj_data *equipment[]);
+obj_data *get_obj_in_equip_vis(char_data *ch, char *arg, int *number, obj_data *equipment[]);
-int              get_obj_pos_in_equip_vis(struct char_data *ch, char *arg, int *num, struct obj_data *equipment[]);
+int              get_obj_pos_in_equip_vis(char_data *ch, char *arg, int *num, obj_data *equipment[]);
 /* find all dots */
 int find_all_dots(char *arg);
@@ -78,14 +77,13 @@ int	find_all_dots(char *arg);
 #define FIND_ALLDOT 2
 /* group */
-struct group_data * create_group(struct char_data * leader);
+struct group_data * create_group(char_data * leader);
 void free_group(struct group_data * group);
-void leave_group(struct char_data *ch);
+void leave_group(char_data *ch);
-void join_group(struct char_data *ch, struct group_data *group);
+void join_group(char_data *ch, struct group_data *group);
 /* Generic Find */
-int	generic_find(char *arg, bitvector_t bitvector, struct char_data *ch,
+int generic_find(char *arg, bitvector_t bitvector, char_data *ch, char_data **tar_ch, obj_data **tar_obj);
 		struct char_data **tar_ch, struct obj_data **tar_obj);
 #define FIND_CHAR_ROOM     (1 << 0)
 #define FIND_CHAR_WORLD    (1 << 1)
@@ -96,10 +94,10 @@ int	generic_find(char *arg, bitvector_t bitvector, struct char_data *ch,
 /* prototypes from mobact.c */
-void forget(struct char_data *ch, struct char_data *victim);
+void forget(char_data *ch, char_data *victim);
-void remember(struct char_data *ch, struct char_data *victim);
+void remember(char_data *ch, char_data *victim);
 void mobile_activity(void);
-void clearMemory(struct char_data *ch);
+void clearMemory(char_data *ch);
 /* For new last command: */
@@ -127,7 +125,7 @@ struct last_entry {
    int punique;
 };
-void add_llog_entry(struct char_data *ch, int type);
+void add_llog_entry(char_data *ch, int type);
 struct last_entry *find_llog_entry(int punique, long idnum);
 #endif /* _HANDLER_H_ */
@@ -26,17 +26,17 @@
 #include "modify.h"
 /* local functions */
-static void hedit_disp_menu(struct descriptor_data *);
+static void hedit_disp_menu(descriptor_data *);
-static void hedit_setup_new(struct descriptor_data *);
+static void hedit_setup_new(descriptor_data *);
-static void hedit_setup_existing(struct descriptor_data *, int);
+static void hedit_setup_existing(descriptor_data *, int);
-static void hedit_save_to_disk(struct descriptor_data *);
+static void hedit_save_to_disk(descriptor_data *);
-static void hedit_save_internally(struct descriptor_data *);
+static void hedit_save_internally(descriptor_data *);
 ACMD(do_oasis_hedit)
 {
  char arg[MAX_INPUT_LENGTH];
-  struct descriptor_data *d;
+  descriptor_data *d;
  int i;
  /* No building as a mob or while being forced. */
@@ -107,7 +107,7 @@ ACMD(do_oasis_hedit)
    TRUE, "OLC: %s starts editing help files.", GET_NAME(d->character));
 }
-static void hedit_setup_new(struct descriptor_data *d)
+static void hedit_setup_new(descriptor_data *d)
 {
  CREATE(OLC_HELP(d), struct help_index_element, 1);
@@ -120,7 +120,7 @@ static void hedit_setup_new(struct descriptor_data *d)
  hedit_disp_menu(d);
 }
-static void hedit_setup_existing(struct descriptor_data *d, int rnum)
+static void hedit_setup_existing(descriptor_data *d, int rnum)
 {
  CREATE(OLC_HELP(d), struct help_index_element, 1);
@@ -133,7 +133,7 @@ static void hedit_setup_existing(struct descriptor_data *d, int rnum)
  hedit_disp_menu(d);
 }
-static void hedit_save_internally(struct descriptor_data *d)
+static void hedit_save_internally(descriptor_data *d)
 {
  struct help_index_element *new_help_table = NULL;
@@ -154,7 +154,7 @@ static void hedit_save_internally(struct descriptor_data *d)
  hedit_save_to_disk(d);
 }
-static void hedit_save_to_disk(struct descriptor_data *d)
+static void hedit_save_to_disk(descriptor_data *d)
 {
  FILE *fp;
  char buf1[MAX_STRING_LENGTH], index_name[READ_SIZE];
@@ -187,7 +187,7 @@ static void hedit_save_to_disk(struct descriptor_data *d)
 }
 /* The main menu. */
-static void hedit_disp_menu(struct descriptor_data *d)
+static void hedit_disp_menu(descriptor_data *d)
 {
  get_char_colors(d->character);
@@ -205,7 +205,7 @@ static void hedit_disp_menu(struct descriptor_data *d)
  OLC_MODE(d) = HEDIT_MAIN_MENU;
 }
-void hedit_parse(struct descriptor_data *d, char *arg)
+void hedit_parse(descriptor_data *d, char *arg)
 {
  char buf[MAX_STRING_LENGTH];
  char *oldtext = "";
@@ -357,7 +357,7 @@ void hedit_parse(struct descriptor_data *d, char *arg)
  hedit_disp_menu(d);
 }
-void hedit_string_cleanup(struct descriptor_data *d, int terminator)
+void hedit_string_cleanup(descriptor_data *d, int terminator)
 {
  switch (OLC_MODE(d)) {
  case HEDIT_ENTRY:
@@ -19,8 +19,8 @@
 /* Utility functions */
 /*
 * All the following functions are declared in oasis.h
-  void hedit_parse(struct descriptor_data *, char *);
+  void hedit_parse(descriptor_data *, char *);
-  void hedit_string_cleanup(struct descriptor_data *, int);
+  void hedit_string_cleanup(descriptor_data *, int);
  ACMD(do_oasis_hedit);
 */
 /* Action fuctions */
@@ -27,18 +27,18 @@ static int num_of_houses = 0;
 /* local functions */
 static int House_get_filename(room_vnum vnum, char *filename, size_t maxlen);
 static int House_load(room_vnum vnum);
-static void House_restore_weight(struct obj_data *obj);
+static void House_restore_weight(obj_data *obj);
 static void House_delete_file(room_vnum vnum);
 static int find_house(room_vnum vnum);
 static void House_save_control(void);
-static void hcontrol_build_house(struct char_data *ch, char *arg);
+static void hcontrol_build_house(char_data *ch, char *arg);
-static void hcontrol_destroy_house(struct char_data *ch, char *arg);
+static void hcontrol_destroy_house(char_data *ch, char *arg);
-static void hcontrol_pay_house(struct char_data *ch, char *arg);
+static void hcontrol_pay_house(char_data *ch, char *arg);
-static void House_listrent(struct char_data *ch, room_vnum vnum);
+static void House_listrent(char_data *ch, room_vnum vnum);
 /* CONVERSION code starts here -- see comment below. */
-static int ascii_convert_house(struct char_data *ch, obj_vnum vnum);
+static int ascii_convert_house(char_data *ch, obj_vnum vnum);
-static void hcontrol_convert_houses(struct char_data *ch);
+static void hcontrol_convert_houses(char_data *ch);
-static struct obj_data *Obj_from_store(struct obj_file_elem object, int *location);
+static obj_data *Obj_from_store(struct obj_file_elem object, int *location);
 /* CONVERSION code ends here -- see comment below. */
 /* First, the basics: finding the filename; loading/saving objects */
@@ -88,9 +88,9 @@ static int House_load(room_vnum vnum)
 /* Save all objects for a house (recursive; initial call must be followed by a 
 * call to House_restore_weight)  Assumes file is open already. */
-int House_save(struct obj_data *obj, FILE *fp)
+int House_save(obj_data *obj, FILE *fp)
 {
-  struct obj_data *tmp;
+  obj_data *tmp;
  int result;
  if (obj) {
@@ -107,7 +107,7 @@ int House_save(struct obj_data *obj, FILE *fp)
 }
 /* restore weight of containers after House_save has changed them for saving */
-static void House_restore_weight(struct obj_data *obj)
+static void House_restore_weight(obj_data *obj)
 {
  if (obj) {
    House_restore_weight(obj->contains);
@@ -160,7 +160,7 @@ static void House_delete_file(room_vnum vnum)
 }
 /* List all objects in a house file */
-static void House_listrent(struct char_data *ch, room_vnum vnum)
+static void House_listrent(char_data *ch, room_vnum vnum)
 {
  FILE *fl;
  char filename[MAX_STRING_LENGTH];
@@ -288,7 +288,7 @@ static const char *HCONTROL_FORMAT =
 "       hcontrol pay <house vnum>\r\n"
 "       hcontrol show [house vnum | .]\r\n";
-void hcontrol_list_houses(struct char_data *ch, char *arg)
+void hcontrol_list_houses(char_data *ch, char *arg)
 {
  int i;
  char *temp;
@@ -300,7 +300,7 @@ void hcontrol_list_houses(struct char_data *ch, char *arg)
 		if (*arg == '.')
 			toshow = GET_ROOM_VNUM(IN_ROOM(ch));
 		else
-			toshow = atoi(arg);
+			toshow = atoidx(arg);
 	  if ((i = find_house(toshow)) == NOWHERE) {
  	  send_to_char(ch, "Unknown house, \"%s\".\r\n", arg);
@@ -343,7 +343,7 @@ void hcontrol_list_houses(struct char_data *ch, char *arg)
  }
 }
-static void hcontrol_build_house(struct char_data *ch, char *arg)
+static void hcontrol_build_house(char_data *ch, char *arg)
 {
  char arg1[MAX_INPUT_LENGTH];
  struct house_control_rec temp_house;
@@ -363,7 +363,7 @@ static void hcontrol_build_house(struct char_data *ch, char *arg)
    send_to_char(ch, "%s", HCONTROL_FORMAT);
    return;
  }
-  virt_house = atoi(arg1);
+  virt_house = atoidx(arg1);
  if ((real_house = real_room(virt_house)) == NOWHERE) {
    send_to_char(ch, "No such room exists.\r\n");
    return;
@@ -427,7 +427,7 @@ static void hcontrol_build_house(struct char_data *ch, char *arg)
  House_save_control();
 }
-static void hcontrol_destroy_house(struct char_data *ch, char *arg)
+static void hcontrol_destroy_house(char_data *ch, char *arg)
 {
  int i, j;
  room_rnum real_atrium, real_house;
@@ -436,17 +436,17 @@ static void hcontrol_destroy_house(struct char_data *ch, char *arg)
    send_to_char(ch, "%s", HCONTROL_FORMAT);
    return;
  }
-  if ((i = find_house(atoi(arg))) == NOWHERE) {
+  if ((i = find_house(atoidx(arg))) == NOWHERE) {
    send_to_char(ch, "Unknown house.\r\n");
    return;
  }
  if ((real_atrium = real_room(house_control[i].atrium)) == NOWHERE)
-    log("SYSERR: House %d had invalid atrium %d!", atoi(arg), house_control[i].atrium);
+    log("SYSERR: House %s had invalid atrium %d!", arg, house_control[i].atrium);
  else
    REMOVE_BIT_AR(ROOM_FLAGS(real_atrium), ROOM_ATRIUM);
  if ((real_house = real_room(house_control[i].vnum)) == NOWHERE)
-    log("SYSERR: House %d had invalid vnum %d!", atoi(arg), house_control[i].vnum);
+    log("SYSERR: House %s had invalid vnum %d!", arg, house_control[i].vnum);
  else {
    REMOVE_BIT_AR(ROOM_FLAGS(real_house), ROOM_HOUSE);
    REMOVE_BIT_AR(ROOM_FLAGS(real_house), ROOM_PRIVATE);
@@ -469,13 +469,13 @@ static void hcontrol_destroy_house(struct char_data *ch, char *arg)
      SET_BIT_AR(ROOM_FLAGS(real_atrium), ROOM_ATRIUM);
 }
-static void hcontrol_pay_house(struct char_data *ch, char *arg)
+static void hcontrol_pay_house(char_data *ch, char *arg)
 {
  int i;
  if (!*arg)
    send_to_char(ch, "%s", HCONTROL_FORMAT);
-  else if ((i = find_house(atoi(arg))) == NOWHERE)
+  else if ((i = find_house(atoidx(arg))) == NOWHERE)
    send_to_char(ch, "Unknown house.\r\n");
  else {
    mudlog(NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE, "Payment for house %s collected by %s.", arg, GET_NAME(ch));
@@ -564,7 +564,7 @@ void House_save_all(void)
 }
 /* note: arg passed must be house vnum, so there. */
-int House_can_enter(struct char_data *ch, room_vnum house)
+int House_can_enter(char_data *ch, room_vnum house)
 {
  int i, j;
@@ -583,7 +583,7 @@ int House_can_enter(struct char_data *ch, room_vnum house)
  return (0);
 }
-void House_list_guests(struct char_data *ch, int i, int quiet)
+void House_list_guests(char_data *ch, int i, int quiet)
 {
  int j, num_printed;
  char *temp;
@@ -622,7 +622,7 @@ void House_list_guests(struct char_data *ch, int i, int quiet)
 * will let your house files load on the next bootup. -Welcor            *
 ************************************************************************/
 /* Code for conversion to ascii house rent files. */
-static void hcontrol_convert_houses(struct char_data *ch)
+static void hcontrol_convert_houses(char_data *ch)
 {
  int i;
@@ -656,11 +656,11 @@ static void hcontrol_convert_houses(struct char_data *ch)
 	send_to_char(ch, "All done.\r\n");
 }
-static int ascii_convert_house(struct char_data *ch, obj_vnum vnum)
+static int ascii_convert_house(char_data *ch, obj_vnum vnum)
 {
 	FILE *in, *out;
 	char infile[MAX_INPUT_LENGTH], *outfile;
-	struct obj_data *tmp;
+	obj_data *tmp;
 	int i, j=0;
  House_get_filename(vnum, infile, sizeof(infile));
@@ -722,9 +722,9 @@ static int ascii_convert_house(struct char_data *ch, obj_vnum vnum)
 }
 /* The circle 3.1 function for reading rent files. No longer used by the rent system. */
-static struct obj_data *Obj_from_store(struct obj_file_elem object, int *location)
+static obj_data *Obj_from_store(struct obj_file_elem object, int *location)
 {
-  struct obj_data *obj;
+  obj_data *obj;
  obj_rnum itemnum;
  int j, taeller;
@@ -37,18 +37,17 @@ struct house_control_rec {
    long spare7;
 };
-#define TOROOM(room, dir) (world[room].dir_option[dir] ? \
+#define TOROOM(room, dir) (world[room].dir_option[dir] ? world[room].dir_option[dir]->to_room : NOWHERE)
 			    world[room].dir_option[dir]->to_room : NOWHERE)
 /* Functions in house.c made externally available */
 /* Utility Functions */
 void House_boot(void);
 void House_save_all(void);
-int	House_can_enter(struct char_data *ch, room_vnum house);
+int House_can_enter(char_data *ch, room_vnum house);
 void House_crashsave(room_vnum vnum);
-void	House_list_guests(struct char_data *ch, int i, int quiet);
+void House_list_guests(char_data *ch, int i, int quiet);
-int House_save(struct obj_data *obj, FILE *fp);
+int House_save(obj_data *obj, FILE *fp);
-void hcontrol_list_houses(struct char_data *ch, char *arg);
+void hcontrol_list_houses(char_data *ch, char *arg);
 /* In game Commands */
 ACMD(do_hcontrol);
 ACMD(do_house);
@@ -56,12 +56,12 @@ static void free_ibt_list(IBT_DATA *first_ibt, IBT_DATA *last_ibt);
 static IBT_DATA *read_ibt(char *filename, FILE *fp);
 static IBT_DATA *get_first_ibt(int mode);
 static IBT_DATA *get_last_ibt(int mode);
-static bool is_ibt_logger(IBT_DATA *ibtData, struct char_data *ch);
+static bool is_ibt_logger(IBT_DATA *ibtData, char_data *ch);
 /* Internal (static) OLC functions */
-static void ibtedit_setup(struct descriptor_data *d);
+static void ibtedit_setup(descriptor_data *d);
-static void ibtedit_save(struct descriptor_data *d);
+static void ibtedit_save(descriptor_data *d);
-static void ibtedit_disp_main_menu(struct descriptor_data *d);
+static void ibtedit_disp_main_menu(descriptor_data *d);
-static void ibtedit_disp_flags(struct descriptor_data *d);
+static void ibtedit_disp_flags(descriptor_data *d);
 static IBT_DATA *new_ibt(void)
 {
@@ -436,7 +436,7 @@ static bool free_ibt(int mode, IBT_DATA *ibtData)
 }
 /* Return TRUE if 'ch' is the person who logged the IBT */
-static bool is_ibt_logger(IBT_DATA *ibtData, struct char_data *ch)
+static bool is_ibt_logger(IBT_DATA *ibtData, char_data *ch)
 {
  if ( ch && !IS_NPC(ch) && ibtData ) {
@@ -773,7 +773,7 @@ ACMD(do_ibt)
 ACMD(do_oasis_ibtedit)
 {
  int number = NOTHING;
-  struct descriptor_data *d;
+  descriptor_data *d;
  char buf1[MAX_STRING_LENGTH], buf2[MAX_STRING_LENGTH];
  /* No editing as a mob or while being forced. */
@@ -845,7 +845,7 @@ ACMD(do_oasis_ibtedit)
 /*-------------------------------------------------------------------*/
 /* Copy IBT data into the OLC structure                              */
-static void ibtedit_setup(struct descriptor_data *d)
+static void ibtedit_setup(descriptor_data *d)
 {
  IBT_DATA *ibtData;
  int i;
@@ -877,7 +877,7 @@ static void ibtedit_setup(struct descriptor_data *d)
 /*-------------------------------------------------------------------*/
 /* Copy IBT data back to the correct list                            */
-static void ibtedit_save(struct descriptor_data *d)
+static void ibtedit_save(descriptor_data *d)
 {
  IBT_DATA *ibtData;
  int i;
@@ -944,9 +944,9 @@ void free_olc_ibt(IBT_DATA *toFree) {
 /*-------------------------------------------------------------------*/
 /* main ibtedit menu function...                                     */
-static void ibtedit_disp_main_menu(struct descriptor_data *d)
+static void ibtedit_disp_main_menu(descriptor_data *d)
 {
-  struct char_data *ch = d->character;
+  char_data *ch = d->character;
  char flg_text[MAX_STRING_LENGTH];
  room_rnum rr;
@@ -978,7 +978,7 @@ static void ibtedit_disp_main_menu(struct descriptor_data *d)
 }
 /*-------------------------------------------------------------------*/
 /* Display IBT-flags menu. */
-static void ibtedit_disp_flags(struct descriptor_data *d)
+static void ibtedit_disp_flags(descriptor_data *d)
 {
  char buf[MAX_STRING_LENGTH];
@@ -995,7 +995,7 @@ static void ibtedit_disp_flags(struct descriptor_data *d)
 }
 /*-------------------------------------------------------------------*/
 /* main clanedit parser function... interpreter throws all input to here. */
-void ibtedit_parse(struct descriptor_data *d, char *arg)
+void ibtedit_parse(descriptor_data *d, char *arg)
 {
  int i;
  char *oldtext = NULL;
@@ -1145,7 +1145,7 @@ void ibtedit_parse(struct descriptor_data *d, char *arg)
 }
 /*-------------------------------------------------------------------*/
-void ibtedit_string_cleanup(struct descriptor_data *d, int terminator)
+void ibtedit_string_cleanup(descriptor_data *d, int terminator)
 {
  switch (OLC_MODE(d)) {
@@ -69,8 +69,7 @@ typedef struct  ibt_data               IBT_DATA;
                                    break;                              \
                                }
-struct ibt_data
+struct ibt_data {
 {
    IBT_DATA   *next;                 /**< Pointer to next IBT in the list           */
    IBT_DATA   *prev;                 /**< Pointer to previous IBT in the list       */
    char       *text;                 /**< Header Text for this IBT                  */
@@ -96,8 +95,8 @@ ACMD(do_ibt);
 ACMD(do_oasis_ibtedit);
 void save_ibt_file(int mode);
 void load_ibt_file(int mode);
-void ibtedit_parse(struct descriptor_data *d, char *arg);
+void ibtedit_parse(descriptor_data *d, char *arg);
-void ibtedit_string_cleanup(struct descriptor_data *d, int terminator);
+void ibtedit_string_cleanup(descriptor_data *d, int terminator);
 void free_ibt_lists(void);
 void free_olc_ibt(IBT_DATA *toFree);
 void clean_ibt_list(int mode);
@@ -15,7 +15,7 @@
 #include "modify.h"
-void send_editor_help(struct descriptor_data *d)
+void send_editor_help(descriptor_data *d)
 {
  if (using_improved_editor)
    write_to_output(d, "Instructions: /s to save, /h for more options.\r\n");
@@ -25,7 +25,7 @@ void send_editor_help(struct descriptor_data *d)
 #if CONFIG_IMPROVED_EDITOR
-int improved_editor_execute(struct descriptor_data *d, char *str)
+int improved_editor_execute(descriptor_data *d, char *str)
 {
  char actions[MAX_INPUT_LENGTH];
@@ -96,7 +96,7 @@ int improved_editor_execute(struct descriptor_data *d, char *str)
 }
 /* Handle some editor commands. */
-void parse_edit_action(int command, char *string, struct descriptor_data *d)
+void parse_edit_action(int command, char *string, descriptor_data *d)
 {
  int indent = 0, rep_all = 0, flags = 0, replaced, i, line_low, line_high, j = 0;
  unsigned int total_len;
@@ -503,7 +503,7 @@ void parse_edit_action(int command, char *string, struct descriptor_data *d)
 /* Re-formats message type formatted char *. (for strings edited with d->str) 
 * (mostly olc and mail). */
-int format_text(char **ptr_string, int mode, struct descriptor_data *d, unsigned int maxlen, int low, int high)
+int format_text(char **ptr_string, int mode, descriptor_data *d, unsigned int maxlen, int low, int high)
 {
  int line_chars, cap_next = TRUE, cap_next_next = FALSE, color_chars = 0, i, pass_line = 0;
  char *flow, *start = NULL, temp;
@@ -17,11 +17,11 @@
 #define using_improved_editor   CONFIG_IMPROVED_EDITOR
-void parse_edit_action(int command, char *string, struct descriptor_data *d);
+void parse_edit_action(int command, char *string, descriptor_data *d);
-int improved_editor_execute(struct descriptor_data *d, char *string);
+int improved_editor_execute(descriptor_data *d, char *string);
-int format_text(char **ptr_string, int mode, struct descriptor_data *d, unsigned int maxlen, int low, int high);
+int format_text(char **ptr_string, int mode, descriptor_data *d, unsigned int maxlen, int low, int high);
 int replace_str(char **string, char *pattern, char *replacement, int rep_all, unsigned int max_size);
-void send_editor_help(struct descriptor_data *d);
+void send_editor_help(descriptor_data *d);
 /* Action modes for parse_edit_action(). */
 #define PARSE_FORMAT        0
@@ -39,11 +39,11 @@
 #include "mud_event.h"
 /* local (file scope) functions */
-static int perform_dupe_check(struct descriptor_data *d);
+static int perform_dupe_check(descriptor_data *d);
 static struct alias_data *find_alias(struct alias_data *alias_list, char *str);
 static void perform_complex_alias(struct txt_q *input_q, char *orig, struct alias_data *a);
 static int _parse_name(char *arg, char *name);
-static bool perform_new_char_dupe_check(struct descriptor_data *d);
+static bool perform_new_char_dupe_check(descriptor_data *d);
 /* sort_commands utility */
 static int sort_commands_helper(const void *a, const void *b);
@@ -364,7 +364,8 @@ cpp_extern const struct command_info cmd_info[] = {
    { "zcheck", "zcheck", POS_DEAD, do_zcheck, LVL_BUILDER, 0 },
    { "zpurge", "zpurge", POS_DEAD, do_zpurge, LVL_BUILDER, 0 },
-  { "\n", "zzzzzzz", 0, 0, 0, 0 } };    /* this must be last */
+    { "\n", "zzzzzzz", 0, 0, 0, 0 }
 };    /* this must be last */
 /* Thanks to Melzaren for this change to allow DG Scripts to be attachable
@@ -394,9 +395,11 @@ static const struct mob_script_command_t mob_script_commands[] = {
    { "mzoneecho", do_mzoneecho, 0 },
    { "mfollow", do_mfollow, 0 },
    { "mlog", do_mlog, 0 },
-  { "\n" , do_not_here , 0 } };
+    { "\n", do_not_here, 0 }
 };
-int script_command_interpreter(struct char_data *ch, char *arg) {
+int script_command_interpreter(char_data *ch, char *arg)
 {
    /* DG trigger commands */
    int i;
@@ -422,8 +425,7 @@ int script_command_interpreter(struct char_data *ch, char *arg) {
    return 1; // We took care of execution. Let caller know.
 }
-static const char *fill[] =
+static const char *fill[] = {
 {
    "in",
    "from",
    "with",
@@ -434,8 +436,7 @@ static const char *fill[] =
    "\n"
 };
-static const char *reserved[] =
+static const char *reserved[] = {
 {
    "a",
    "an",
    "self",
@@ -474,7 +475,7 @@ void sort_commands(void)
 /* This is the actual command interpreter called from game_loop() in comm.c
 * It makes sure you are the proper level and position to execute the command,
 * then calls the appropriate function. */
-void command_interpreter(struct char_data *ch, char *argument)
+void command_interpreter(char_data *ch, char *argument)
 {
    int cmd, length;
    char *line;
@@ -532,25 +533,21 @@ void command_interpreter(struct char_data *ch, char *argument)
        int found = 0;
        send_to_char(ch, "%s", CONFIG_HUH);
-    for (cmd = 0; *cmd_info[cmd].command != '\n'; cmd++)
+        for (cmd = 0; *cmd_info[cmd].command != '\n'; cmd++) {
    {
            if (*arg != *cmd_info[cmd].command || cmd_info[cmd].minimum_level > GET_LEVEL(ch))
                continue;
            /* Only apply levenshtein counts if the command is not a trigger command. */
            if ( (levenshtein_distance(arg, cmd_info[cmd].command) <= 2) &&
-           (cmd_info[cmd].minimum_level >= 0) )
+                    (cmd_info[cmd].minimum_level >= 0) ) {
-      {
+                if (!found) {
        if (!found)
        {
                    send_to_char(ch, "\r\nDid you mean:\r\n");
                    found = 1;
                }
                send_to_char(ch, "  %s\r\n", cmd_info[cmd].command);
            }
        }
-  }
+    } else if (!IS_NPC(ch) && PLR_FLAGGED(ch, PLR_FROZEN) && GET_LEVEL(ch) < LVL_IMPL)
  else if (!IS_NPC(ch) && PLR_FLAGGED(ch, PLR_FROZEN) && GET_LEVEL(ch) < LVL_IMPL)
        send_to_char(ch, "You try, but the mind-numbing cold prevents you...\r\n");
    else if (complete_cmd_info[cmd].command_pointer == NULL)
        send_to_char(ch, "Sorry, that command hasn't been implemented yet.\r\n");
@@ -727,7 +724,7 @@ static void perform_complex_alias(struct txt_q *input_q, char *orig, struct alia
 *   0: String was modified in place; call command_interpreter immediately.
 *   1: String was _not_ modified in place; rather, the expanded aliases
 *      have been placed at the front of the character's input queue. */
-int perform_alias(struct descriptor_data *d, char *orig, size_t maxlen)
+int perform_alias(descriptor_data *d, char *orig, size_t maxlen)
 {
    char first_arg[MAX_INPUT_LENGTH], *ptr;
    struct alias_data *a, *tmp;
@@ -970,10 +967,10 @@ int find_command(const char *command)
    return (-1);
 }
-int special(struct char_data *ch, int cmd, char *arg)
+int special(char_data *ch, int cmd, char *arg)
 {
-  struct obj_data *i;
+    obj_data *i;
-  struct char_data *k;
+    char_data *k;
    int j;
    /* special in room? */
@@ -1030,10 +1027,10 @@ static int _parse_name(char *arg, char *name)
 #define UNSWITCH    3
 /* This function seems a bit over-extended. */
-static int perform_dupe_check(struct descriptor_data *d)
+static int perform_dupe_check(descriptor_data *d)
 {
-  struct descriptor_data *k, *next_k;
+    descriptor_data *k, *next_k;
-  struct char_data *target = NULL, *ch, *next_ch;
+    char_data *target = NULL, *ch, *next_ch;
    int mode = 0;
    int pref_temp = 0; /* for "last" log */
    int id = GET_IDNUM(d->character);
@@ -1149,7 +1146,8 @@ static int perform_dupe_check(struct descriptor_data *d)
    case RECON:
        write_to_output(d, "Reconnecting.\r\n");
        act("$n has reconnected.", TRUE, d->character, 0, 0, TO_ROOM);
-    mudlog(NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(d->character)), TRUE, "%s [%s] has reconnected.", GET_NAME(d->character), d->host);
+        mudlog(NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(d->character)), TRUE, "%s [%s] has reconnected.", GET_NAME(d->character),
               d->host);
        if (has_mail(GET_IDNUM(d->character)))
            write_to_output(d, "You have mail waiting.\r\n");
        break;
@@ -1163,7 +1161,8 @@ static int perform_dupe_check(struct descriptor_data *d)
        break;
    case UNSWITCH:
        write_to_output(d, "Reconnecting to unswitched char.");
-    mudlog(NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(d->character)), TRUE, "%s [%s] has reconnected.", GET_NAME(d->character), d->host);
+        mudlog(NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(d->character)), TRUE, "%s [%s] has reconnected.", GET_NAME(d->character),
               d->host);
        break;
    }
@@ -1171,9 +1170,9 @@ static int perform_dupe_check(struct descriptor_data *d)
 }
 /* New Char dupe-check called at the start of character creation */
-static bool perform_new_char_dupe_check(struct descriptor_data *d)
+static bool perform_new_char_dupe_check(descriptor_data *d)
 {
-  struct descriptor_data *k, *next_k;
+    descriptor_data *k, *next_k;
    bool found = FALSE;
    /* Now that this descriptor has successfully logged in, disconnect all
@@ -1227,7 +1226,7 @@ static bool perform_new_char_dupe_check(struct descriptor_data *d)
 }
 /* load the player, put them in the right room - used by copyover_recover too */
-int enter_player_game (struct descriptor_data *d)
+int enter_player_game (descriptor_data *d)
 {
    int load_result;
    room_vnum load_room;
@@ -1281,7 +1280,7 @@ int enter_player_game (struct descriptor_data *d)
 EVENTFUNC(get_protocols)
 {
-  struct descriptor_data *d;
+    descriptor_data *d;
    struct mud_event_data *pMudEvent;
    char buf[MAX_STRING_LENGTH];
    size_t len;
@@ -1290,12 +1289,13 @@ EVENTFUNC(get_protocols)
        return 0;
    pMudEvent = (struct mud_event_data *) event_obj;
-  d = (struct descriptor_data *) pMudEvent->pStruct;  
+    d = (descriptor_data *) pMudEvent->pStruct;
    /* Clear extra white space from the "protocol scroll" */
    write_to_output(d, "[H[J");
-  len = snprintf(buf, MAX_STRING_LENGTH,   "\tO[\toClient\tO] \tw%s\tn | ", d->pProtocol->pVariables[eMSDP_CLIENT_ID]->pValueString);
+    len = snprintf(buf, MAX_STRING_LENGTH,   "\tO[\toClient\tO] \tw%s\tn | ",
                   d->pProtocol->pVariables[eMSDP_CLIENT_ID]->pValueString);
    if (d->pProtocol->pVariables[eMSDP_XTERM_256_COLORS]->ValueInt)
        len += snprintf(buf + len, MAX_STRING_LENGTH - len, "\tO[\toColors\tO] \tw256\tn | ");
@@ -1305,7 +1305,8 @@ EVENTFUNC(get_protocols)
        len += snprintf(buf + len, MAX_STRING_LENGTH - len, "[Colors] No Color | ");
    len += snprintf(buf + len, MAX_STRING_LENGTH - len,   "\tO[\toMXP\tO] \tw%s\tn | ", d->pProtocol->bMXP ? "Yes" : "No");
-  len += snprintf(buf + len, MAX_STRING_LENGTH - len,   "\tO[\toMSDP\tO] \tw%s\tn | ", d->pProtocol->bMSDP ? "Yes" : "No");
+    len += snprintf(buf + len, MAX_STRING_LENGTH - len,   "\tO[\toMSDP\tO] \tw%s\tn | ",
                    d->pProtocol->bMSDP ? "Yes" : "No");
    snprintf(buf + len, MAX_STRING_LENGTH - len,   "\tO[\toATCP\tO] \tw%s\tn\r\n\r\n", d->pProtocol->bATCP ? "Yes" : "No");
    write_to_output(d, buf, 0);
@@ -1316,7 +1317,7 @@ EVENTFUNC(get_protocols)
 }
 /* deal with newcomers and other non-playing sockets */
-void nanny(struct descriptor_data *d, char *arg)
+void nanny(descriptor_data *d, char *arg)
 {
    int load_result;  /* Overloaded variable */
    int player_i;
@@ -1324,7 +1325,7 @@ void nanny(struct descriptor_data *d, char *arg)
    /* OasisOLC states */
    struct {
        int state;
-    void (*func)(struct descriptor_data *, char *);
+        void (*func)(descriptor_data *, char *);
    } olc_functions[] = {
        { CON_OEDIT, oedit_parse },
        { CON_ZEDIT, zedit_parse },
@@ -1358,7 +1359,7 @@ void nanny(struct descriptor_data *d, char *arg)
        return;
    case CON_GET_NAME:        /* wait for input of name */
        if (d->character == NULL) {
-      CREATE(d->character, struct char_data, 1);
+            CREATE(d->character, char_data, 1);
            clear_char(d->character);
            CREATE(d->character->player_specials, struct player_special_data, 1);
@@ -1395,7 +1396,7 @@ void nanny(struct descriptor_data *d, char *arg)
                        write_to_output(d, "Invalid name, please try another.\r\nName: ");
                        return;
                    }
-          CREATE(d->character, struct char_data, 1);
+                    CREATE(d->character, char_data, 1);
                    clear_char(d->character);
                    CREATE(d->character->player_specials, struct player_special_data, 1);
@@ -1525,13 +1526,13 @@ void nanny(struct descriptor_data *d, char *arg)
                write_to_output(d, "%s", motd);
            if (GET_INVIS_LEV(d->character))
-        mudlog(BRF, MAX(LVL_IMMORT, GET_INVIS_LEV(d->character)), TRUE, "%s has connected. (invis %d)", GET_NAME(d->character), GET_INVIS_LEV(d->character));
+                mudlog(BRF, MAX(LVL_IMMORT, GET_INVIS_LEV(d->character)), TRUE, "%s has connected. (invis %d)", GET_NAME(d->character),
                       GET_INVIS_LEV(d->character));
            else
                mudlog(BRF, LVL_IMMORT, TRUE, "%s has connected.", GET_NAME(d->character));
            /* Add to the list of 'recent' players (since last reboot) */
-      if (AddRecentPlayer(GET_NAME(d->character), d->host, FALSE, FALSE) == FALSE)
+            if (AddRecentPlayer(GET_NAME(d->character), d->host, FALSE, FALSE) == FALSE) {
      {
                mudlog(BRF, MAX(LVL_IMMORT, GET_INVIS_LEV(d->character)), TRUE, "Failure to AddRecentPlayer (returned FALSE).");
            }
@@ -1554,7 +1555,8 @@ void nanny(struct descriptor_data *d, char *arg)
            write_to_output(d, "\r\nIllegal password.\r\nPassword: ");
            return;
        }
-    strncpy(GET_PASSWD(d->character), CRYPT(arg, GET_PC_NAME(d->character)), MAX_PWD_LENGTH);	/* strncpy: OK (G_P:MAX_PWD_LENGTH+1) */
+        strncpy(GET_PASSWD(d->character), CRYPT(arg, GET_PC_NAME(d->character)),
                MAX_PWD_LENGTH);   /* strncpy: OK (G_P:MAX_PWD_LENGTH+1) */
        *(GET_PASSWD(d->character) + MAX_PWD_LENGTH) = '\0';
        write_to_output(d, "\r\nPlease retype password: ");
@@ -1634,8 +1636,7 @@ void nanny(struct descriptor_data *d, char *arg)
        mudlog(NRM, LVL_GOD, TRUE, "%s [%s] new player.", GET_NAME(d->character), d->host);
        /* Add to the list of 'recent' players (since last reboot) */
-    if (AddRecentPlayer(GET_NAME(d->character), d->host, TRUE, FALSE) == FALSE)
+        if (AddRecentPlayer(GET_NAME(d->character), d->host, TRUE, FALSE) == FALSE) {
    {
            mudlog(BRF, MAX(LVL_IMMORT, GET_INVIS_LEV(d->character)), TRUE, "Failure to AddRecentPlayer (returned FALSE).");
        }
        break;
@@ -21,7 +21,7 @@
 #define IS_MOVE(cmdnum) (complete_cmd_info[cmdnum].command_pointer == do_move)
 void sort_commands(void);
-void	command_interpreter(struct char_data *ch, char *argument);
+void command_interpreter(char_data *ch, char *argument);
 int search_block(char *arg, const char **list, int exact);
 char *one_argument(char *argument, char *first_arg);
 char *one_word(char *argument, char *first_arg);
@@ -30,16 +30,16 @@ char	*two_arguments(char *argument, char *first_arg, char *second_arg);
 int fill_word(char *argument);
 int reserved_word(char *argument);
 void half_chop(char *string, char *arg1, char *arg2);
-void	nanny(struct descriptor_data *d, char *arg);
+void nanny(descriptor_data *d, char *arg);
 int is_abbrev(const char *arg1, const char *arg2);
 int is_number(const char *str);
 int find_command(const char *command);
 void skip_spaces(char **string);
 char *delete_doubledollar(char *string);
-int special(struct char_data *ch, int cmd, char *arg);
+int special(char_data *ch, int cmd, char *arg);
 void free_alias(struct alias_data *a);
-int perform_alias(struct descriptor_data *d, char *orig, size_t maxlen);
+int perform_alias(descriptor_data *d, char *orig, size_t maxlen);
-int enter_player_game (struct descriptor_data *d);
+int enter_player_game (descriptor_data *d);
 /* ACMDs available through interpreter.c */
 ACMD(do_alias);
@@ -58,7 +58,7 @@ struct command_info {
    const char *sort_as;
    byte minimum_position;
    void (*command_pointer)
-	   (struct char_data *ch, char *argument, int cmd, int subcmd);
+    (char_data *ch, char *argument, int cmd, int subcmd);
    sh_int minimum_level;
    int  subcmd;
 };
@@ -66,7 +66,7 @@ struct command_info {
 struct mob_script_command_t {
    const char *command_name;
    void (*command_pointer)
-         (struct char_data *ch, char *argument, int cmd, int subcmd);
+    (char_data *ch, char *argument, int cmd, int subcmd);
    int subcmd;
 };
@@ -25,7 +25,7 @@
 /* local file scope function prototypes */
 static int graf(int grafage, int p0, int p1, int p2, int p3, int p4, int p5, int p6);
-static void check_idling(struct char_data *ch);
+static void check_idling(char_data *ch);
 /* When age < 15 return the value p0
@@ -58,7 +58,7 @@ static int graf(int grafage, int p0, int p1, int p2, int p3, int p4, int p5, int
 * that a character's age will now only affect the HMV gain per tick, and _not_
 * the HMV maximums. */
 /* manapoint gain pr. game hour */
-int mana_gain(struct char_data *ch)
+int mana_gain(char_data *ch)
 {
  int gain;
@@ -99,7 +99,7 @@ int mana_gain(struct char_data *ch)
 }
 /* Hitpoint gain pr. game hour */
-int hit_gain(struct char_data *ch)
+int hit_gain(char_data *ch)
 {
  int gain;
@@ -140,7 +140,7 @@ int hit_gain(struct char_data *ch)
 }
 /* move gain pr. game hour */
-int move_gain(struct char_data *ch)
+int move_gain(char_data *ch)
 {
  int gain;
@@ -175,7 +175,7 @@ int move_gain(struct char_data *ch)
  return (gain);
 }
-void set_title(struct char_data *ch, char *title)
+void set_title(char_data *ch, char *title)
 {
  if (GET_TITLE(ch) != NULL)
    free(GET_TITLE(ch));
@@ -220,7 +220,7 @@ void run_autowiz(void)
 #endif /* CIRCLE_UNIX || CIRCLE_WINDOWS */
 }
-void gain_exp(struct char_data *ch, int gain)
+void gain_exp(char_data *ch, int gain)
 {
  int is_altered = FALSE;
  int num_levels = 0;
@@ -267,7 +267,7 @@ void gain_exp(struct char_data *ch, int gain)
    run_autowiz();
  }
-void gain_exp_regardless(struct char_data *ch, int gain)
+void gain_exp_regardless(char_data *ch, int gain)
 {
  int is_altered = FALSE;
  int num_levels = 0;
@@ -302,7 +302,7 @@ void gain_exp_regardless(struct char_data *ch, int gain)
    run_autowiz();
 }
-void gain_condition(struct char_data *ch, int condition, int value)
+void gain_condition(char_data *ch, int condition, int value)
 {
  bool intoxicated;
@@ -336,7 +336,7 @@ void gain_condition(struct char_data *ch, int condition, int value)
 }
-static void check_idling(struct char_data *ch)
+static void check_idling(char_data *ch)
 {
  if (ch->char_specials.timer > CONFIG_IDLE_VOID) {
    if (GET_WAS_IN(ch) == NOWHERE && IN_ROOM(ch) != NOWHERE) {
@@ -378,8 +378,8 @@ static void check_idling(struct char_data *ch)
 /* Update PCs, NPCs, and objects */
 void point_update(void)
 {
-  struct char_data *i, *next_char;
+  char_data *i, *next_char;
-  struct obj_data *j, *next_thing, *jj, *next_thing2;
+  obj_data *j, *next_thing, *jj, *next_thing2;
  /* characters */
  for (i = character_list; i; i = next_char) {
@@ -471,7 +471,7 @@ void point_update(void)
 }
 /* Note: amt may be negative */
-int increase_gold(struct char_data *ch, int amt)
+int increase_gold(char_data *ch, int amt)
 {
  int curr_gold;
@@ -492,7 +492,7 @@ int increase_gold(struct char_data *ch, int amt)
  return (GET_GOLD(ch));
 }
-int decrease_gold(struct char_data *ch, int deduction)
+int decrease_gold(char_data *ch, int deduction)
 {
  int amt;
  amt = (deduction * -1);
@@ -500,7 +500,7 @@ int decrease_gold(struct char_data *ch, int deduction)
  return (GET_GOLD(ch));
 }
-int increase_bank(struct char_data *ch, int amt)
+int increase_bank(char_data *ch, int amt)
 {
  int curr_bank;
@@ -522,7 +522,7 @@ int increase_bank(struct char_data *ch, int amt)
  return (GET_BANK_GOLD(ch));
 }
-int decrease_bank(struct char_data *ch, int deduction)
+int decrease_bank(char_data *ch, int deduction)
 {
  int amt;
  amt = (deduction * -1);
@@ -25,15 +25,15 @@
 /* local file scope function prototypes */
-static int mag_materials(struct char_data *ch, IDXTYPE item0, IDXTYPE item1, IDXTYPE item2, int extract, int verbose);
+static int mag_materials(char_data *ch, IDXTYPE item0, IDXTYPE item1, IDXTYPE item2, int extract, int verbose);
-static void perform_mag_groups(int level, struct char_data *ch, struct char_data *tch, int spellnum, int savetype);
+static void perform_mag_groups(int level, char_data *ch, char_data *tch, int spellnum, int savetype);
 /* Negative apply_saving_throw[] values make saving throws better! So do
 * negative modifiers.  Though people may be used to the reverse of that.
 * It's due to the code modifying the target saving throw instead of the
 * random number of the character as in some other systems. */
-int mag_savingthrow(struct char_data *ch, int type, int modifier)
+int mag_savingthrow(char_data *ch, int type, int modifier)
 {
  /* NPCs use warrior tables according to some book */
  int class_sav = CLASS_WARRIOR;
@@ -58,7 +58,7 @@ int mag_savingthrow(struct char_data *ch, int type, int modifier)
 void affect_update(void)
 {
  struct affected_type *af, *next;
-  struct char_data *i;
+  char_data *i;
  for (i = character_list; i; i = i->next)
    for (af = i->affected; af; af = next) {
@@ -92,15 +92,15 @@ void affect_update(void)
 * FALSE to send no in game messages from this function.
 * @retval int TRUE if ch has all materials to cast the spell, FALSE if not.
 */
-static int mag_materials(struct char_data *ch, IDXTYPE item0,
+static int mag_materials(char_data *ch, IDXTYPE item0,
    IDXTYPE item1, IDXTYPE item2, int extract, int verbose)
 {
  /* Begin Local variable definitions. */
  /*------------------------------------------------------------------------*/
  /* Used for object searches. */
-  struct obj_data *tobj = NULL;
+  obj_data *tobj = NULL;
  /* Points to found reagents. */
-  struct obj_data *obj0 = NULL, *obj1 = NULL, *obj2 = NULL;
+  obj_data *obj0 = NULL, *obj1 = NULL, *obj2 = NULL;
  /*------------------------------------------------------------------------*/
  /* End Local variable definitions. */
@@ -192,7 +192,7 @@ static int mag_materials(struct char_data *ch, IDXTYPE item0,
 /* Every spell that does damage comes through here.  This calculates the amount
 * of damage, adds in any modifiers, determines what the saves are, tests for
 * save and calls damage(). -1 = dead, otherwise the amount of damage done. */
-int mag_damage(int level, struct char_data *ch, struct char_data *victim,
+int mag_damage(int level, char_data *ch, char_data *victim,
 		     int spellnum, int savetype)
 {
  int dam = 0;
@@ -300,7 +300,7 @@ int mag_damage(int level, struct char_data *ch, struct char_data *victim,
 * affect_join(vict, aff, add_dur, avg_dur, add_mod, avg_mod) */
 #define MAX_SPELL_AFFECTS 5	/* change if more needed */
-void mag_affects(int level, struct char_data *ch, struct char_data *victim,
+void mag_affects(int level, char_data *ch, char_data *victim,
 		      int spellnum, int savetype)
 {
  struct affected_type af[MAX_SPELL_AFFECTS];
@@ -552,8 +552,8 @@ void mag_affects(int level, struct char_data *ch, struct char_data *victim,
 /* This function is used to provide services to mag_groups.  This function is
 * the one you should change to add new group spells. */
-static void perform_mag_groups(int level, struct char_data *ch,
+static void perform_mag_groups(int level, char_data *ch,
-			struct char_data *tch, int spellnum, int savetype)
+			char_data *tch, int spellnum, int savetype)
 {
  switch (spellnum) {
    case SPELL_GROUP_HEAL:
@@ -573,9 +573,9 @@ static void perform_mag_groups(int level, struct char_data *ch,
 * affect everyone grouped with the caster who is in the room, caster last. To
 * add new group spells, you shouldn't have to change anything in mag_groups.
 * Just add a new case to perform_mag_groups. */
-void mag_groups(int level, struct char_data *ch, int spellnum, int savetype)
+void mag_groups(int level, char_data *ch, int spellnum, int savetype)
 {
-  struct char_data *tch;
+  char_data *tch;
  if (ch == NULL)
    return;
@@ -583,7 +583,7 @@ void mag_groups(int level, struct char_data *ch, int spellnum, int savetype)
  if (!GROUP(ch))
    return;
-  while ((tch = (struct char_data *) simple_list(GROUP(ch)->members)) != NULL) {
+  while ((tch = (char_data *) simple_list(GROUP(ch)->members)) != NULL) {
    if (IN_ROOM(tch) != IN_ROOM(ch))
      continue;
    if (tch == ch)
@@ -596,9 +596,9 @@ void mag_groups(int level, struct char_data *ch, int spellnum, int savetype)
 /* Mass spells affect every creature in the room except the caster. No spells
 * of this class currently implemented. */
-void mag_masses(int level, struct char_data *ch, int spellnum, int savetype)
+void mag_masses(int level, char_data *ch, int spellnum, int savetype)
 {
-  struct char_data *tch, *tch_next;
+  char_data *tch, *tch_next;
  for (tch = world[IN_ROOM(ch)].people; tch; tch = tch_next) {
    tch_next = tch->next_in_room;
@@ -614,9 +614,9 @@ void mag_masses(int level, struct char_data *ch, int spellnum, int savetype)
 * generally offensive spells.  This calls mag_damage to do the actual damage.
 * All spells listed here must also have a case in mag_damage() in order for
 * them to work. Area spells have limited targets within the room. */
-void mag_areas(int level, struct char_data *ch, int spellnum, int savetype)
+void mag_areas(int level, char_data *ch, int spellnum, int savetype)
 {
-  struct char_data *tch, *next_tch;
+  char_data *tch, *next_tch;
  const char *to_char = NULL, *to_room = NULL;
  if (ch == NULL)
@@ -702,11 +702,11 @@ static const char *mag_summon_fail_msgs[] = {
 #define OBJ_CLONE            161  /**< vnum for clone material. */
 #define MOB_ZOMBIE           11   /**< vnum for the zombie mob. */
-void mag_summons(int level, struct char_data *ch, struct obj_data *obj,
+void mag_summons(int level, char_data *ch, obj_data *obj,
 		      int spellnum, int savetype)
 {
-  struct char_data *mob = NULL;
+  char_data *mob = NULL;
-  struct obj_data *tobj, *next_obj;
+  obj_data *tobj, *next_obj;
  int pfail = 0, msg = 0, fmsg = 0, num = 1, handle_corpse = FALSE, i;
  mob_vnum mob_num;
@@ -798,7 +798,7 @@ void mag_summons(int level, struct char_data *ch, struct obj_data *obj,
 /*----------------------------------------------------------------------------*/
-void mag_points(int level, struct char_data *ch, struct char_data *victim,
+void mag_points(int level, char_data *ch, char_data *victim,
 		     int spellnum, int savetype)
 {
  int healing = 0, move = 0;
@@ -825,7 +825,7 @@ void mag_points(int level, struct char_data *ch, struct char_data *victim,
  update_pos(victim);
 }
-void mag_unaffects(int level, struct char_data *ch, struct char_data *victim,
+void mag_unaffects(int level, char_data *ch, char_data *victim,
 		        int spellnum, int type)
 {
  int spell = 0, msg_not_affected = TRUE;
@@ -872,7 +872,7 @@ void mag_unaffects(int level, struct char_data *ch, struct char_data *victim,
    act(to_room, TRUE, victim, 0, ch, TO_ROOM);
 }
-void mag_alter_objs(int level, struct char_data *ch, struct obj_data *obj,
+void mag_alter_objs(int level, char_data *ch, obj_data *obj,
 		         int spellnum, int savetype)
 {
  const char *to_char = NULL, *to_room = NULL;
@@ -939,9 +939,9 @@ void mag_alter_objs(int level, struct char_data *ch, struct obj_data *obj,
    act(to_char, TRUE, ch, obj, 0, TO_ROOM);
 }
-void mag_creations(int level, struct char_data *ch, int spellnum)
+void mag_creations(int level, char_data *ch, int spellnum)
 {
-  struct obj_data *tobj;
+  obj_data *tobj;
  obj_vnum z;
  if (ch == NULL)
@@ -969,7 +969,7 @@ void mag_creations(int level, struct char_data *ch, int spellnum)
  load_otrigger(tobj);
 }
-void mag_rooms(int level, struct char_data *ch, int spellnum)
+void mag_rooms(int level, char_data *ch, int spellnum)
 {
  room_rnum rnum;
  int duration = 0;
@@ -21,9 +21,9 @@
 #include "modify.h"
 /* local (file scope) function prototypes */
-static void postmaster_send_mail(struct char_data *ch, struct char_data *mailman, int cmd, char *arg);
+static void postmaster_send_mail(char_data *ch, char_data *mailman, int cmd, char *arg);
-static void postmaster_check_mail(struct char_data *ch, struct char_data *mailman, int cmd, char *arg);
+static void postmaster_check_mail(char_data *ch, char_data *mailman, int cmd, char *arg);
-static void postmaster_receive_mail(struct char_data *ch, struct char_data *mailman, int cmd, char *arg);
+static void postmaster_receive_mail(char_data *ch, char_data *mailman, int cmd, char *arg);
 static int mail_recip_ok(const char *name);
 static void write_mail_record(FILE *mail_file, struct mail_t *record);
 static void free_mail_record(struct mail_t *record);
@@ -257,19 +257,19 @@ SPECIAL(postmaster)
  }
  if (CMD_IS("mail")) {
-    postmaster_send_mail(ch, (struct char_data *)me, cmd, argument);
+    postmaster_send_mail(ch, (char_data *)me, cmd, argument);
    return (1);
  } else if (CMD_IS("check")) {
-    postmaster_check_mail(ch, (struct char_data *)me, cmd, argument);
+    postmaster_check_mail(ch, (char_data *)me, cmd, argument);
    return (1);
  } else if (CMD_IS("receive")) {
-    postmaster_receive_mail(ch, (struct char_data *)me, cmd, argument);
+    postmaster_receive_mail(ch, (char_data *)me, cmd, argument);
    return (1);
  } else
    return (0);
 }
-static void postmaster_send_mail(struct char_data *ch, struct char_data *mailman,
+static void postmaster_send_mail(char_data *ch, char_data *mailman,
 			  int cmd, char *arg)
 {
  long recipient;
@@ -316,7 +316,7 @@ static void postmaster_send_mail(struct char_data *ch, struct char_data *mailman
  string_write(ch->desc, mailwrite, MAX_MAIL_SIZE, recipient, NULL);
 }
-static void postmaster_check_mail(struct char_data *ch, struct char_data *mailman,
+static void postmaster_check_mail(char_data *ch, char_data *mailman,
 			  int cmd, char *arg)
 {
  if (has_mail(GET_IDNUM(ch)))
@@ -325,11 +325,11 @@ static void postmaster_check_mail(struct char_data *ch, struct char_data *mailma
    act("$n tells you, 'Sorry, you don't have any mail waiting.'", FALSE, mailman, 0, ch, TO_VICT);
 }
-static void postmaster_receive_mail(struct char_data *ch, struct char_data *mailman,
+static void postmaster_receive_mail(char_data *ch, char_data *mailman,
 			  int cmd, char *arg)
 {
  char buf[256];
-  struct obj_data *obj;
+  obj_data *obj;
  int y;
  if (!has_mail(GET_IDNUM(ch))) {
@@ -364,9 +364,9 @@ static void postmaster_receive_mail(struct char_data *ch, struct char_data *mail
  }
 }
-void notify_if_playing(struct char_data *from, int recipient_id) 
+void notify_if_playing(char_data *from, int recipient_id)
 { 
-  struct descriptor_data *d; 
+  descriptor_data *d;
  for (d = descriptor_list; d; d = d->next) 
    if ((IS_PLAYING(d)) && (GET_IDNUM(d->character) == recipient_id) && (has_mail(GET_IDNUM(d->character)))) 
@@ -41,7 +41,7 @@ int	scan_file(void);
 int has_mail(long recipient);
 void store_mail(long to, long from, char *message_pointer);
 char *read_delete(long recipient);
-void    notify_if_playing(struct char_data *from, int recipient_id);
+void    notify_if_playing(char_data *from, int recipient_id);
 struct mail_t {
    long recipient;
@@ -66,8 +66,7 @@ struct header_data_type {
 };
 /* size of the data part of a header block */
-#define HEADER_BLOCK_DATASIZE \
+#define HEADER_BLOCK_DATASIZE (BLOCK_SIZE - sizeof(long) - sizeof(struct header_data_type) - sizeof(char))
 	(BLOCK_SIZE - sizeof(long) - sizeof(struct header_data_type) - sizeof(char))
 /* size of the data part of a data block */
 #define DATA_BLOCK_DATASIZE (BLOCK_SIZE - sizeof(long) - sizeof(char))
@@ -28,23 +28,23 @@
 #include "modify.h"      /* for smash_tilde */
 /* local functions */
-static void medit_setup_new(struct descriptor_data *d);
+static void medit_setup_new(descriptor_data *d);
-static void init_mobile(struct char_data *mob);
+static void init_mobile(char_data *mob);
 static void medit_save_to_disk(zone_vnum zone_num);
-static void medit_disp_positions(struct descriptor_data *d);
+static void medit_disp_positions(descriptor_data *d);
-static void medit_disp_sex(struct descriptor_data *d);
+static void medit_disp_sex(descriptor_data *d);
-static void medit_disp_attack_types(struct descriptor_data *d);
+static void medit_disp_attack_types(descriptor_data *d);
 static bool medit_illegal_mob_flag(int fl);
 static int  medit_get_mob_flag_by_number(int num);
-static void medit_disp_mob_flags(struct descriptor_data *d);
+static void medit_disp_mob_flags(descriptor_data *d);
-static void medit_disp_aff_flags(struct descriptor_data *d);
+static void medit_disp_aff_flags(descriptor_data *d);
-static void medit_disp_menu(struct descriptor_data *d);
+static void medit_disp_menu(descriptor_data *d);
 /*  utility functions */
 ACMD(do_oasis_medit)
 {
  int number = NOBODY, save = 0, real_num;
-  struct descriptor_data *d;
+  descriptor_data *d;
  char buf1[MAX_STRING_LENGTH];
  char buf2[MAX_STRING_LENGTH];
@@ -175,12 +175,12 @@ static void medit_save_to_disk(zone_vnum foo)
  save_mobiles(real_zone(foo));
 }
-static void medit_setup_new(struct descriptor_data *d)
+static void medit_setup_new(descriptor_data *d)
 {
-  struct char_data *mob;
+  char_data *mob;
  /* Allocate a scratch mobile structure. */
-  CREATE(mob, struct char_data, 1);
+  CREATE(mob, char_data, 1);
  init_mobile(mob);
@@ -199,12 +199,12 @@ static void medit_setup_new(struct descriptor_data *d)
  OLC_ITEM_TYPE(d) = MOB_TRIGGER;
 }
-void medit_setup_existing(struct descriptor_data *d, int rmob_num)
+void medit_setup_existing(descriptor_data *d, int rmob_num)
 {
-  struct char_data *mob;
+  char_data *mob;
  /* Allocate a scratch mobile structure. */
-  CREATE(mob, struct char_data, 1);
+  CREATE(mob, char_data, 1);
  copy_mobile(mob, mob_proto + rmob_num);
@@ -220,7 +220,7 @@ void medit_setup_existing(struct descriptor_data *d, int rmob_num)
 }
 /* Ideally, this function should be in db.c, but I'll put it here for portability. */
-static void init_mobile(struct char_data *mob)
+static void init_mobile(char_data *mob)
 {
  clear_char(mob);
@@ -245,12 +245,12 @@ static void init_mobile(struct char_data *mob)
 }
 /* Save new/edited mob to memory. */
-void medit_save_internally(struct descriptor_data *d)
+void medit_save_internally(descriptor_data *d)
 {
  int i;
  mob_rnum new_rnum;
-  struct descriptor_data *dsc;
+  descriptor_data *dsc;
-  struct char_data *mob;
+  char_data *mob;
  i = (real_mobile(OLC_NUM(d)) == NOBODY);
@@ -303,7 +303,7 @@ void medit_save_internally(struct descriptor_data *d)
 /* Menu functions
   Display positions. (sitting, standing, etc) */
-static void medit_disp_positions(struct descriptor_data *d)
+static void medit_disp_positions(descriptor_data *d)
 {
  get_char_colors(d->character);
  clear_screen(d);
@@ -312,7 +312,7 @@ static void medit_disp_positions(struct descriptor_data *d)
 }
 /* Display the gender of the mobile. */
-static void medit_disp_sex(struct descriptor_data *d)
+static void medit_disp_sex(descriptor_data *d)
 {
  get_char_colors(d->character);
  clear_screen(d);
@@ -321,7 +321,7 @@ static void medit_disp_sex(struct descriptor_data *d)
 }
 /* Display attack types menu. */
-static void medit_disp_attack_types(struct descriptor_data *d)
+static void medit_disp_attack_types(descriptor_data *d)
 {
  int i;
@@ -370,7 +370,7 @@ static int medit_get_mob_flag_by_number(int num)
 }
 /* Display mob-flags menu. */
-static void medit_disp_mob_flags(struct descriptor_data *d)
+static void medit_disp_mob_flags(descriptor_data *d)
 {
  int i, count = 0, columns = 0;
  char flags[MAX_STRING_LENGTH];
@@ -390,7 +390,7 @@ static void medit_disp_mob_flags(struct descriptor_data *d)
 }
 /* Display affection flags menu. */
-static void medit_disp_aff_flags(struct descriptor_data *d)
+static void medit_disp_aff_flags(descriptor_data *d)
 {
  char flags[MAX_STRING_LENGTH];
@@ -404,9 +404,9 @@ static void medit_disp_aff_flags(struct descriptor_data *d)
 }
 /* Display main menu. */
-static void medit_disp_menu(struct descriptor_data *d)
+static void medit_disp_menu(descriptor_data *d)
 {
-  struct char_data *mob;
+  char_data *mob;
  char flags[MAX_STRING_LENGTH], flag2[MAX_STRING_LENGTH];
  mob = OLC_MOB(d);
@@ -459,9 +459,9 @@ static void medit_disp_menu(struct descriptor_data *d)
 }
 /* Display main menu. */
-static void medit_disp_stats_menu(struct descriptor_data *d)
+static void medit_disp_stats_menu(descriptor_data *d)
 {
-  struct char_data *mob;
+  char_data *mob;
  char buf[MAX_STRING_LENGTH];
  mob = OLC_MOB(d);
@@ -525,7 +525,7 @@ static void medit_disp_stats_menu(struct descriptor_data *d)
  OLC_MODE(d) = MEDIT_STATS_MENU;
 }
-void medit_parse(struct descriptor_data *d, char *arg)
+void medit_parse(descriptor_data *d, char *arg)
 {
  int i = -1, j;
  char *oldtext = NULL;
@@ -1103,7 +1103,7 @@ void medit_parse(struct descriptor_data *d, char *arg)
  medit_disp_menu(d);
 }
-void medit_string_cleanup(struct descriptor_data *d, int terminator)
+void medit_string_cleanup(descriptor_data *d, int terminator)
 {
  switch (OLC_MODE(d)) {
@@ -1114,7 +1114,7 @@ void medit_string_cleanup(struct descriptor_data *d, int terminator)
  }
 }
-void medit_autoroll_stats(struct descriptor_data *d)
+void medit_autoroll_stats(descriptor_data *d)
 {
  int mob_lev;
@@ -24,12 +24,12 @@
 /* local file scope only function prototypes */
-static bool aggressive_mob_on_a_leash(struct char_data *slave, struct char_data *master, struct char_data *attack);
+static bool aggressive_mob_on_a_leash(char_data *slave, char_data *master, char_data *attack);
 void mobile_activity(void)
 {
-  struct char_data *ch, *next_ch, *vict;
+  char_data *ch, *next_ch, *vict;
-  struct obj_data *obj, *best_obj;
+  obj_data *obj, *best_obj;
  int door, found, max;
  memory_rec *names;
@@ -174,7 +174,7 @@ void mobile_activity(void)
 /* Mob Memory Routines */
 /* make ch remember victim */
-void remember(struct char_data *ch, struct char_data *victim)
+void remember(char_data *ch, char_data *victim)
 {
  memory_rec *tmp;
  bool present = FALSE;
@@ -195,7 +195,7 @@ void remember(struct char_data *ch, struct char_data *victim)
 }
 /* make ch forget victim */
-void forget(struct char_data *ch, struct char_data *victim)
+void forget(char_data *ch, char_data *victim)
 {
  memory_rec *curr, *prev = NULL;
@@ -219,7 +219,7 @@ void forget(struct char_data *ch, struct char_data *victim)
 }
 /* erase ch's memory */
-void clearMemory(struct char_data *ch)
+void clearMemory(char_data *ch)
 {
  memory_rec *curr, *next;
@@ -237,7 +237,7 @@ void clearMemory(struct char_data *ch)
 /* An aggressive mobile wants to attack something.  If they're under the 
 * influence of mind altering PC, then see if their master can talk them out 
 * of it, eye them down, or otherwise intimidate the slave. */
-static bool aggressive_mob_on_a_leash(struct char_data *slave, struct char_data *master, struct char_data *attack)
+static bool aggressive_mob_on_a_leash(char_data *slave, char_data *master, char_data *attack)
 {
  static int snarl_cmd;
  int dieroll;
@@ -28,10 +28,10 @@
 #include "ibt.h"
 /* local (file scope) function prototpyes  */
-static char *next_page(char *str, struct char_data *ch);
+static char *next_page(char *str, char_data *ch);
-static int count_pages(char *str, struct char_data *ch);
+static int count_pages(char *str, char_data *ch);
-static void playing_string_cleanup(struct descriptor_data *d, int action);
+static void playing_string_cleanup(descriptor_data *d, int action);
-static void exdesc_string_cleanup(struct descriptor_data *d, int action);
+static void exdesc_string_cleanup(descriptor_data *d, int action);
 /* Local (file scope) global variables */
 /* @deprecated string_fields appears to be no longer be used.
@@ -105,7 +105,7 @@ void parse_tab(char *str)
 * can use it to pass whatever else you may want through it.  The improved
 * editor patch when updated could use it to pass the old text buffer, for
 * instance. */
-void string_write(struct descriptor_data *d, char **writeto, size_t len, long mailto, void *data)
+void string_write(descriptor_data *d, char **writeto, size_t len, long mailto, void *data)
 {
  if (d->character && !IS_NPC(d->character))
    SET_BIT_AR(PLR_FLAGS(d->character), PLR_WRITING);
@@ -122,7 +122,7 @@ void string_write(struct descriptor_data *d, char **writeto, size_t len, long ma
 /* Add user input to the 'current' string (as defined by d->str). This is still
 * overly complex. */
-void string_add(struct descriptor_data *d, char *str)
+void string_add(descriptor_data *d, char *str)
 {
  int action;
@@ -209,7 +209,7 @@ void string_add(struct descriptor_data *d, char *str)
    int i;
    struct {
      int mode;
-      void (*func)(struct descriptor_data *d, int action);
+      void (*func)(descriptor_data *d, int action);
    } cleanup_modes[] = {
      { CON_CEDIT  , cedit_string_cleanup },
      { CON_MEDIT  , medit_string_cleanup },
@@ -244,7 +244,7 @@ void string_add(struct descriptor_data *d, char *str)
     strcat(*d->str, "\r\n");
 }
-static void playing_string_cleanup(struct descriptor_data *d, int action)
+static void playing_string_cleanup(descriptor_data *d, int action)
 {
  if (PLR_FLAGGED(d->character, PLR_MAILING)) {
    if (action == STRINGADD_SAVE && *d->str) {
@@ -294,7 +294,7 @@ static void playing_string_cleanup(struct descriptor_data *d, int action)
  }
 }
-static void exdesc_string_cleanup(struct descriptor_data *d, int action)
+static void exdesc_string_cleanup(descriptor_data *d, int action)
 {
  if (action == STRINGADD_ABORT)
    write_to_output(d, "Description aborted.\r\n");
@@ -306,7 +306,7 @@ static void exdesc_string_cleanup(struct descriptor_data *d, int action)
 /* Modification of character skills. */
 ACMD(do_skillset)
 {
-  struct char_data *vict;
+  char_data *vict;
  char name[MAX_INPUT_LENGTH];
  char buf[MAX_INPUT_LENGTH], helpbuf[MAX_STRING_LENGTH];
  int skill, value, i, qend, pc, pl;
@@ -397,7 +397,7 @@ ACMD(do_skillset)
 /* By Michael Buselli. Traverse down the string until the begining of the next
 * page has been reached.  Return NULL if this is the last page of the string. */
-static char *next_page(char *str, struct char_data *ch)
+static char *next_page(char *str, char_data *ch)
 {
  int col = 1, line = 1, count, pw;
@@ -442,7 +442,7 @@ static char *next_page(char *str, struct char_data *ch)
 }
 /* Function that returns the number of pages in the string. */
-static int count_pages(char *str, struct char_data *ch)
+static int count_pages(char *str, char_data *ch)
 {
  int pages;
@@ -454,7 +454,7 @@ static int count_pages(char *str, struct char_data *ch)
 /* This function assigns all the pointers for showstr_vector for the
 * page_string function, after showstr_vector has been allocated and
 * showstr_count set. */
-void paginate_string(char *str, struct descriptor_data *d)
+void paginate_string(char *str, descriptor_data *d)
 {
  int i;
@@ -468,7 +468,7 @@ void paginate_string(char *str, struct descriptor_data *d)
 }
 /* The call that gets the paging ball rolling... */
-void page_string(struct descriptor_data *d, char *str, int keep_internal)
+void page_string(descriptor_data *d, char *str, int keep_internal)
 {
  char actbuf[MAX_INPUT_LENGTH] = "";
@@ -493,7 +493,7 @@ void page_string(struct descriptor_data *d, char *str, int keep_internal)
 }
 /* The call that displays the next page. */
-void show_string(struct descriptor_data *d, char *input)
+void show_string(descriptor_data *d, char *input)
 {
  char buffer[MAX_STRING_LENGTH], buf[MAX_INPUT_LENGTH];
  int diff;
@@ -20,17 +20,17 @@
 #define _MODIFY_H_
 /* Public functions */
-void show_string(struct descriptor_data *d, char *input);
+void show_string(descriptor_data *d, char *input);
 void smash_tilde(char *str);
 void parse_at(char *str);
 void parse_tab(char *str);
-void paginate_string(char *str, struct descriptor_data *d);
+void paginate_string(char *str, descriptor_data *d);
 /** @todo should this really be in modify.c? */
 ACMD(do_skillset);
 /* Following function prototypes moved here from comm.h */
-void  string_write(struct descriptor_data *d, char **txt, size_t len, long mailto, void *data);
+void  string_write(descriptor_data *d, char **txt, size_t len, long mailto, void *data);
-void  string_add(struct descriptor_data *d, char *str);
+void  string_add(descriptor_data *d, char *str);
-void  page_string(struct descriptor_data *d, char *str, int keep_internal);
+void  page_string(descriptor_data *d, char *str, int keep_internal);
 /* page string function & defines */
 #define PAGE_LENGTH 22
 #define PAGE_WIDTH  80
@@ -21,7 +21,7 @@
 /* Statics */
 static void free_messages_type(struct msg_type *msg);
-static void msgedit_main_menu(struct descriptor_data * d);
+static void msgedit_main_menu(descriptor_data * d);
 static void copy_message_strings(struct message_type *tmsg, struct message_type * fmsg);
 static void copy_message_list(struct message_list *to, struct message_list *from);
@@ -149,7 +149,7 @@ void load_messages(void)
  log("Loaded %d Combat Messages...", i);
 }
-static void show_messages(struct char_data *ch)
+static void show_messages(char_data *ch)
 {
  int i, half = MAX_MESSAGES / 2, count = 0;
  char buf[MAX_STRING_LENGTH];
@@ -227,7 +227,7 @@ void save_messages_to_disk(void)
  fclose(fp);
 }
-static void msgedit_setup(struct descriptor_data *d)
+static void msgedit_setup(descriptor_data *d)
 {
  CREATE(OLC_MSG_LIST(d), struct message_list, 1);
  OLC_MSG_LIST(d)->msg = NULL;  
@@ -301,7 +301,7 @@ static void copy_message_strings(struct message_type *tmsg, struct message_type
 ACMD(do_msgedit)
 {
  int num;
-  struct descriptor_data *d;
+  descriptor_data *d;
  if (!*argument) {
    show_messages(ch);
@@ -352,7 +352,7 @@ ACMD(do_msgedit)
    GET_NAME(ch), OLC_NUM(d));
 }
-static void msgedit_main_menu(struct descriptor_data * d)
+static void msgedit_main_menu(descriptor_data * d)
 {
  get_char_colors(d->character);
@@ -405,7 +405,7 @@ static void msgedit_main_menu(struct descriptor_data * d)
  OLC_MODE(d) = MSGEDIT_MAIN_MENU;  
 }
-void msgedit_parse(struct descriptor_data *d, char *arg)
+void msgedit_parse(descriptor_data *d, char *arg)
 {
  struct message_type * temp;
  static bool quit = FALSE;
@@ -93,8 +93,8 @@ EVENTFUNC(event_countdown)
 void attach_mud_event(struct mud_event_data *pMudEvent, long time)
 {
  struct event * pEvent;
-  struct descriptor_data * d;
+  descriptor_data * d;
-  struct char_data * ch;
+  char_data * ch;
  struct room_data * room;
  pEvent = event_create(mud_event_index[pMudEvent->iId].func, pMudEvent, time);
@@ -106,11 +106,11 @@ void attach_mud_event(struct mud_event_data *pMudEvent, long time)
      add_to_list(pEvent, world_events);
    break;
    case EVENT_DESC:
-      d = (struct descriptor_data *) pMudEvent->pStruct;
+      d = (descriptor_data *) pMudEvent->pStruct;
      add_to_list(pEvent, d->events);
    break;
    case EVENT_CHAR:
-      ch = (struct char_data *) pMudEvent->pStruct;
+      ch = (char_data *) pMudEvent->pStruct;
      if (ch->events == NULL)
        ch->events = create_list();
@@ -146,8 +146,8 @@ struct mud_event_data *new_mud_event(event_id iId, void *pStruct, char *sVariabl
 void free_mud_event(struct mud_event_data *pMudEvent)
 {
-  struct descriptor_data * d;
+  descriptor_data * d;
-  struct char_data * ch;
+  char_data * ch;
  struct room_data * room;
  switch (mud_event_index[pMudEvent->iId].iEvent_Type) {
@@ -155,11 +155,11 @@ void free_mud_event(struct mud_event_data *pMudEvent)
      remove_from_list(pMudEvent->pEvent, world_events);
    break;
    case EVENT_DESC:
-      d = (struct descriptor_data *) pMudEvent->pStruct;
+      d = (descriptor_data *) pMudEvent->pStruct;
      remove_from_list(pMudEvent->pEvent, d->events);
    break;
    case EVENT_CHAR:
-      ch = (struct char_data *) pMudEvent->pStruct;
+      ch = (char_data *) pMudEvent->pStruct;
      remove_from_list(pMudEvent->pEvent, ch->events);
      if (ch->events->iSize == 0) {
@@ -185,7 +185,7 @@ void free_mud_event(struct mud_event_data *pMudEvent)
  free(pMudEvent);
 }
-struct mud_event_data * char_has_mud_event(struct char_data * ch, event_id iId)
+struct mud_event_data * char_has_mud_event(char_data * ch, event_id iId)
 {
  struct event * pEvent;
  struct mud_event_data * pMudEvent = NULL;
@@ -215,7 +215,7 @@ struct mud_event_data * char_has_mud_event(struct char_data * ch, event_id iId)
  return NULL;
 } 
-void clear_char_event_list(struct char_data * ch)
+void clear_char_event_list(char_data * ch)
 {
  struct event * pEvent;
@@ -50,8 +50,8 @@ void init_events(void);
 struct mud_event_data *new_mud_event(event_id iId, void *pStruct, char *sVariables);
 void attach_mud_event(struct mud_event_data *pMudEvent, long time);
 void free_mud_event(struct mud_event_data *pMudEvent);
-struct mud_event_data * char_has_mud_event(struct char_data * ch, event_id iId);
+struct mud_event_data * char_has_mud_event(char_data * ch, event_id iId);
-void clear_char_event_list(struct char_data * ch);
+void clear_char_event_list(char_data * ch);
 /* Events */
 EVENTFUNC(event_countdown);
@@ -35,7 +35,7 @@ const char *nrm, *grn, *cyn, *yel;
 static void free_config(struct config_data *data);
 /* Only player characters should be using OLC anyway. */
-void clear_screen(struct descriptor_data *d)
+void clear_screen(descriptor_data *d)
 {
  if (PRF_FLAGGED(d->character, PRF_CLS))
    write_to_output(d, "[H[J");
@@ -45,7 +45,7 @@ void clear_screen(struct descriptor_data *d)
 /* Set the color string pointers for that which this char will see at color
 * level NRM.  Changing the entries here will change the colour scheme
 * throughout the OLC. */
-void get_char_colors(struct char_data *ch)
+void get_char_colors(char_data *ch)
 {
  nrm = CCNRM(ch, C_NRM);
  grn = CCGRN(ch, C_NRM);
@@ -55,7 +55,7 @@ void get_char_colors(struct char_data *ch)
 /* This procedure frees up the strings and/or the structures attatched to a
 * descriptor, sets all flags back to how they should be. */
-void cleanup_olc(struct descriptor_data *d, byte cleanup_type)
+void cleanup_olc(descriptor_data *d, byte cleanup_type)
 {
  /* Clean up WHAT? */
  if (d->olc == NULL)
@@ -253,7 +253,7 @@ static void free_config(struct config_data *data)
 * requesting access to modify this zone. Rnum is the real number of the zone
 * attempted to be modified. Returns TRUE if the builder has access, otherwisei
 * FALSE. */
-int can_edit_zone(struct char_data *ch, zone_rnum rnum)
+int can_edit_zone(char_data *ch, zone_rnum rnum)
 {
  /* no access if called with bad arguments */
  if (!ch->desc || IS_NPC(ch) || rnum == NOWHERE)
@@ -297,7 +297,7 @@ int can_edit_zone(struct char_data *ch, zone_rnum rnum)
  return (FALSE);
 }
-void send_cannot_edit(struct char_data *ch, zone_vnum zone)
+void send_cannot_edit(char_data *ch, zone_vnum zone)
 {
  char buf[MAX_STRING_LENGTH];
@@ -75,10 +75,10 @@
 #define OASIS_CFG   5
 /* Utilities exported from oasis.c. */
-void cleanup_olc(struct descriptor_data *d, byte cleanup_type);
+void cleanup_olc(descriptor_data *d, byte cleanup_type);
-void get_char_colors(struct char_data *ch);
+void get_char_colors(char_data *ch);
 void split_argument(char *argument, char *tag);
-void send_cannot_edit(struct char_data *ch, zone_vnum zone);
+void send_cannot_edit(char_data *ch, zone_vnum zone);
 /* OLC structures. */
 /* NO and YES are defined in utils.h. Removed from here. */
@@ -89,9 +89,9 @@ struct oasis_olc_data {
    room_vnum number;              /* vnum of subject          */
    int value;                     /* mostly 'has changed' flag*/
    char *storage;                 /* used for 'tedit'         */
-  struct char_data *mob;         /* used for 'medit'         */
+    char_data *mob;         /* used for 'medit'         */
    struct room_data *room;        /* used for 'redit'         */
-  struct obj_data *obj;          /* used for 'oedit'         */
+    obj_data *obj;          /* used for 'oedit'         */
    struct zone_data *zone;        /* used for 'zedit'         */
    struct shop_data *shop;        /* used for 'sedit'         */
    struct config_data *config;    /* used for 'cedit'         */
@@ -393,67 +393,67 @@ extern const char *nrm, *grn, *cyn, *yel;
 int  save_config( IDXTYPE nowhere );
 /* Prototypes to keep. */
-void clear_screen(struct descriptor_data *);
+void clear_screen(descriptor_data *);
-int can_edit_zone(struct char_data *ch, zone_rnum rnum);
+int can_edit_zone(char_data *ch, zone_rnum rnum);
 ACMD(do_oasis);
 /* public functions from medit.c */
-void medit_setup_existing(struct descriptor_data *d, int rnum);
+void medit_setup_existing(descriptor_data *d, int rnum);
-void medit_save_internally(struct descriptor_data *d);
+void medit_save_internally(descriptor_data *d);
-void medit_parse(struct descriptor_data *d, char *arg);
+void medit_parse(descriptor_data *d, char *arg);
-void medit_string_cleanup(struct descriptor_data *d, int terminator);
+void medit_string_cleanup(descriptor_data *d, int terminator);
 ACMD(do_oasis_medit);
-void medit_autoroll_stats(struct descriptor_data *d);
+void medit_autoroll_stats(descriptor_data *d);
 /* public functions from oedit.c */
-void oedit_setup_existing(struct descriptor_data *d, int rnum);
+void oedit_setup_existing(descriptor_data *d, int rnum);
-void oedit_save_internally(struct descriptor_data *d);
+void oedit_save_internally(descriptor_data *d);
-void oedit_parse(struct descriptor_data *d, char *arg);
+void oedit_parse(descriptor_data *d, char *arg);
-void oedit_string_cleanup(struct descriptor_data *d, int terminator);
+void oedit_string_cleanup(descriptor_data *d, int terminator);
 ACMD(do_oasis_oedit);
 /* public functions from redit.c */
-void redit_setup_existing(struct descriptor_data *d, int rnum);
+void redit_setup_existing(descriptor_data *d, int rnum);
-void redit_string_cleanup(struct descriptor_data *d, int terminator);
+void redit_string_cleanup(descriptor_data *d, int terminator);
-void redit_save_internally(struct descriptor_data *d);
+void redit_save_internally(descriptor_data *d);
 void redit_save_to_disk(zone_vnum zone_num);
-void redit_parse(struct descriptor_data *d, char *arg);
+void redit_parse(descriptor_data *d, char *arg);
 void free_room(struct room_data *room);
 ACMD(do_oasis_redit);
 /* public functions from sedit.c */
-void sedit_setup_existing(struct descriptor_data *d, int rnum);
+void sedit_setup_existing(descriptor_data *d, int rnum);
-void sedit_save_internally(struct descriptor_data *d);
+void sedit_save_internally(descriptor_data *d);
-void sedit_parse(struct descriptor_data *d, char *arg);
+void sedit_parse(descriptor_data *d, char *arg);
 ACMD(do_oasis_sedit);
 /* public functions from zedit.c */
-void zedit_parse(struct descriptor_data *d, char *arg);
+void zedit_parse(descriptor_data *d, char *arg);
 ACMD(do_oasis_zedit);
 /* public functions from cedit.c */
 void cedit_save_to_disk( void );
-void cedit_parse(struct descriptor_data *d, char *arg);
+void cedit_parse(descriptor_data *d, char *arg);
-void cedit_string_cleanup(struct descriptor_data *d, int terminator);
+void cedit_string_cleanup(descriptor_data *d, int terminator);
 ACMD(do_oasis_cedit);
 /* public functions from dg_olc.c */
-void trigedit_parse(struct descriptor_data *d, char *arg);
+void trigedit_parse(descriptor_data *d, char *arg);
 ACMD(do_oasis_trigedit);
 /* public functions from from aedit.c */
-void aedit_parse(struct descriptor_data * d, char *arg);
+void aedit_parse(descriptor_data * d, char *arg);
 ACMD(do_oasis_aedit);
 ACMD(do_astat);
 /* public functions from hedit.c */
-void hedit_parse(struct descriptor_data *d, char *arg);
+void hedit_parse(descriptor_data *d, char *arg);
-void hedit_string_cleanup(struct descriptor_data *d, int terminator);
+void hedit_string_cleanup(descriptor_data *d, int terminator);
 void free_help(struct help_index_element *help);
 ACMD(do_oasis_hedit);
 /* public functions from tedit.c */
-void tedit_string_cleanup(struct descriptor_data *d, int terminator);
+void tedit_string_cleanup(descriptor_data *d, int terminator);
 ACMD(do_tedit);
 /* public functions from qedit.c */
@@ -461,10 +461,10 @@ ACMD(do_oasis_qedit);
 /* public functions from msgedit.c */
 ACMD(do_msgedit);
-void msgedit_parse(struct descriptor_data *d, char *arg);
+void msgedit_parse(descriptor_data *d, char *arg);
 /* public functions from oasis_copy.c */
-int buildwalk(struct char_data *ch, int dir);
+int buildwalk(char_data *ch, int dir);
 ACMD(do_dig);
 ACMD(do_oasis_copy);
@@ -472,7 +472,7 @@ ACMD(do_oasis_copy);
 int free_strings(void *data, int type);
 /* public functions from oasis_list.c */
-void print_zone(struct char_data *ch, zone_rnum rnum);
+void print_zone(char_data *ch, zone_rnum rnum);
 /** @deprecated is do_oasis_links intentionally dead code? */
 ACMD(do_oasis_links);
 ACMD(do_oasis_list);
@@ -37,16 +37,18 @@ static room_vnum redit_find_new_vnum(zone_rnum zone);
 ***********************************************************/
 ACMD(do_oasis_copy)
 {
-  int i, src_vnum, src_rnum, dst_vnum, dst_rnum;
+  int i;
  room_vnum src_vnum, dst_vnum;
  room_rnum src_rnum, dst_rnum;
  char buf1[MAX_INPUT_LENGTH];
  char buf2[MAX_INPUT_LENGTH];
-  struct descriptor_data *d;
+  descriptor_data *d;
  struct {
    int con_type;
    IDXTYPE (*binary_search)(IDXTYPE vnum);
-    void (*save_func)(struct descriptor_data *d);
+    void (*save_func)(descriptor_data *d);
-    void (*setup_existing)(struct descriptor_data *d, int rnum);
+    void (*setup_existing)(descriptor_data *d, int rnum);
    const char *command;
    const char *text;
  } oasis_copy_info[] = {
@@ -82,7 +84,7 @@ ACMD(do_oasis_copy)
  /* We can't copy non-existing data. */
  /* Note: the source data can be in any zone. It's not restricted */
  /* to the builder's designated OLC zone. */
-  src_vnum = atoi(buf1);
+  src_vnum = atoidx(buf1);
  src_rnum = (*oasis_copy_info[i].binary_search)(src_vnum);
  if (src_rnum == NOWHERE) {
    send_to_char(ch, "The source %s (#%d) does not exist.\r\n", oasis_copy_info[i].text, src_vnum);
@@ -90,7 +92,7 @@ ACMD(do_oasis_copy)
  }
  /* Don't copy if the target already exists. */
-  dst_vnum = atoi(buf2);
+  dst_vnum = atoidx(buf2);
  dst_rnum = (*oasis_copy_info[i].binary_search)(dst_vnum);
  if (dst_rnum != NOWHERE) {
    send_to_char(ch, "The target %s (#%d) already exists.\r\n", oasis_copy_info[i].text, dst_vnum);
@@ -156,7 +158,7 @@ ACMD(do_dig)
  room_rnum rrnum = NOWHERE;
  zone_rnum zone;
  int dir = 0, rawvnum;
-  struct descriptor_data *d = ch->desc; /* will save us some typing */
+  descriptor_data *d = ch->desc; /* will save us some typing */
  /* Grab the room's name (if available). */
  new_room_name = two_arguments(argument, sdir, sroom);
@@ -308,7 +310,7 @@ static room_vnum redit_find_new_vnum(zone_rnum zone)
  return(vnum);
 }
-int buildwalk(struct char_data *ch, int dir)
+int buildwalk(char_data *ch, int dir)
 {
  char buf[MAX_INPUT_LENGTH];
  room_vnum vnum;
@@ -324,7 +326,7 @@ int buildwalk(struct char_data *ch, int dir)
    } else if ((vnum = redit_find_new_vnum(world[IN_ROOM(ch)].zone)) == NOWHERE) {
      send_to_char(ch, "No free vnums are available in this zone!\r\n");
    } else {
-      struct descriptor_data *d = ch->desc;
+      descriptor_data *d = ch->desc;
      /* Give the descriptor an olc struct. This way we can let 
       * redit_save_internally handle the room adding. */
      if (d->olc) {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Thomas Arp	744286a1f7	Merge branch 'master' into kaizen/reformatting-and-linting	2025-07-02 22:46:56 +02:00
Thomas Arp	df3aefe9b8	Merge branch 'master' into kaizen/reformatting-and-linting # Conflicts: # src/act.comm.c # src/act.informative.c # src/aedit.c # src/comm.c # src/comm.h # src/dg_olc.h	2025-07-02 22:31:44 +02:00
welcor	0e110b93d5	Actually ue typedefs for obj_data, char_data and descriptor_data. Some linting in a couple of files. Massive commit...	2025-04-20 02:22:15 +02:00
welcor	b489a72c58	Switch to using atoidx whenever we are handling an IDXTYPE. cleanup and linting of asciimap.c	2024-12-31 00:18:53 +01:00
welcor	9c5787129b	Merge branch 'master' into kaizen/reformatting-and-linting # Conflicts: # src/sysdep.h	2024-12-30 13:07:05 +01:00
welcor	fdb6ff3771	act-files formatted	2024-10-01 00:09:30 +02:00
welcor	5c44f0575e	clang-format file added, quest.c and .h formatted	2024-09-30 22:36:30 +02:00
welcor	e6085172d5	KAIZEN formatting and linting, header files	2024-09-17 01:04:36 +02:00
		`@@ -1 +0,0 @@`
			`Jan 19 20:20:26 2026 :: Tobi [localhost] new player.`
		`@@ -1,2 +0,0 @@`
			`Jan 19 20:15:16 2026 :: Loading triggers and generating index.`
			`Jan 19 20:16:30 2026 :: Loading triggers and generating index.`
		`@@ -1 +0,0 @@`
			`Jan 19 20:58:18 2026 :: nusage: 1 sockets connected, 0 sockets playing`