Batch of tiny changes for MSVC compiles.

Most of these fall into the category:
- don't use struct to refer to a class, and vice versa
- msvc doesn't like unistd.h or dirent.h

Doesn't fix all the struct/class problems; I think I'll silence
those for now and move on because it's not all that important.

Tested on OS X.



git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3571 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 8 insertions, 8 deletions

diff --git a/crawl-ref/source/monstuff.h b/crawl-ref/source/monstuff.h
index e097ac040f..034aabe13d 100644
--- a/crawl-ref/source/monstuff.h
+++ b/crawl-ref/source/monstuff.h
@@ -82,13 +82,13 @@ void mons_check_pool(monsters *monster, killer_type killer = KILL_NONE,
 /* ***********************************************************************
    * called from: monstuff - fight
    * *********************************************************************** */
-void monster_cleanup(struct monsters *monster);
+void monster_cleanup(monsters *monster);
 
 
 /* ***********************************************************************
  * called from: monstuff beam effects fight view
  * *********************************************************************** */
-void behaviour_event( struct monsters *mon, int event_type, 
+void behaviour_event( monsters *mon, int event_type, 
                       int src = MHITNOT, int src_x = 0, int src_y = 0 ); 
 
 /* ***********************************************************************
@@ -100,7 +100,7 @@ bool curse_an_item(bool decay_potions);
 /* ***********************************************************************
  * called from: fight
  * *********************************************************************** */
-bool monster_blink(struct monsters *monster);
+bool monster_blink(monsters *monster);
 
 
 /* ***********************************************************************
@@ -124,13 +124,13 @@ bool simple_monster_message(const monsters *monster, const char *event,
 /* ***********************************************************************
  * called from: acr
  * *********************************************************************** */
-bool swap_places(struct monsters *monster);
+bool swap_places(monsters *monster);
 
 
 /* ***********************************************************************
  * called from: bang - beam - direct - fight - spells1 - spells2 - spells3
  * *********************************************************************** */
-void print_wounds(const struct monsters *monster);
+void print_wounds(const monsters *monster);
 
 
 /* ***********************************************************************
@@ -174,14 +174,14 @@ int hurt_monster(monsters *victim, int damage_dealt);
 /* ***********************************************************************
  * called from: beam - fight - files - monstuff - spells1
  * *********************************************************************** */
-bool heal_monster(struct monsters *patient, int health_boost, bool permit_growth);
+bool heal_monster(monsters *patient, int health_boost, bool permit_growth);
 
 /* ***********************************************************************
  * called from: monplace - spells2 - view
  * *********************************************************************** */
-void seen_monster(struct monsters *monster);
+void seen_monster(monsters *monster);
 
-bool shift_monster( struct monsters *mon, int x = 0, int y = 0 );
+bool shift_monster(monsters *mon, int x = 0, int y = 0 );
 
 int mons_weapon_damage_rating(const item_def &launcher);
 int mons_pick_best_missile(monsters *mons, item_def **launcher,