diff options
| author | pauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-10 03:30:55 +0000 |
|---|---|---|
| committer | pauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-10 03:30:55 +0000 |
| commit | 77b5cadac636ddee4ed39bcaf1344c270fcaa447 (patch) | |
| tree | 909c1ce1e1fa67eb83548c97790da2287c4d01e1 /crawl-ref/source/beam.h | |
| parent | de978e5fed84aaa1b077fed70b93eba1a3d82edc (diff) | |
| download | crawl-ref-77b5cadac636ddee4ed39bcaf1344c270fcaa447.tar.gz crawl-ref-77b5cadac636ddee4ed39bcaf1344c270fcaa447.zip | |
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
Diffstat (limited to 'crawl-ref/source/beam.h')
| -rw-r--r-- | crawl-ref/source/beam.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/crawl-ref/source/beam.h b/crawl-ref/source/beam.h index f3bd33b2ca..a384ddd6d1 100644 --- a/crawl-ref/source/beam.h +++ b/crawl-ref/source/beam.h @@ -18,6 +18,8 @@ #include "externs.h" #include "ray.h" +class monsters; + enum demon_beam_type { DMNBM_HELLFIRE, // 0 @@ -181,8 +183,8 @@ void fire_beam( struct bolt &pbolt, item_def *item = NULL, /* *********************************************************************** * called from: beam * *********************************************************************** */ -bool nasty_beam( struct monsters *mon, struct bolt &beam ); -bool nice_beam( struct monsters *mon, struct bolt &beam ); +bool nasty_beam( monsters *mon, struct bolt &beam ); +bool nice_beam( monsters *mon, struct bolt &beam ); // last updated 12may2000 {dlb} /* *********************************************************************** @@ -199,7 +201,7 @@ void explosion( bolt &pbolt, bool hole_in_the_middle = false, /* *********************************************************************** * called from: effects - spells2 - spells4 * *********************************************************************** */ -int mons_adjust_flavoured( struct monsters *monster, struct bolt &pbolt, +int mons_adjust_flavoured( monsters *monster, struct bolt &pbolt, int hurted, bool doFlavouredEffects = true ); @@ -214,7 +216,7 @@ bool mass_enchantment( enchant_type wh_enchant, int pow, int who, /* *********************************************************************** * called from: fight - monstuff - mstuff2 * *********************************************************************** */ -int mons_ench_f2( struct monsters *monster, struct bolt &pbolt ); +int mons_ench_f2( monsters *monster, struct bolt &pbolt ); /* *********************************************************************** @@ -234,7 +236,7 @@ bool check_line_of_sight( int sx, int sy, int tx, int ty ); /* *********************************************************************** * called from: monstuff * *********************************************************************** */ -void mimic_alert( struct monsters *mimic ); +void mimic_alert( monsters *mimic ); void zapping( zap_type ztype, int power, struct bolt &pbolt ); |