diff options
Diffstat (limited to 'crawl-ref/source/dgnevent.h')
| -rw-r--r-- | crawl-ref/source/dgnevent.h | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/crawl-ref/source/dgnevent.h b/crawl-ref/source/dgnevent.h index 3ccd1d0246..c04ca45749 100644 --- a/crawl-ref/source/dgnevent.h +++ b/crawl-ref/source/dgnevent.h @@ -15,19 +15,15 @@ // Keep event names in luadgn.cc in sync. enum dgn_event_type { - DET_NONE = 0x0000, + DET_NONE = 0x0000, - DET_TURN_ELAPSED = 0x0001, - DET_MONSTER_MOVED = 0x0002, - DET_PLAYER_MOVED = 0x0004, - DET_LEAVING_LEVEL = 0x0008, - DET_ENTERING_LEVEL = 0x0010, - DET_ENTERED_LEVEL = 0x0020, - DET_PLAYER_IN_LOS = 0x0040, // Player just entered LOS. - DET_PLAYER_CLIMBS = 0x0080, // Player climbing stairs. - DET_MONSTER_DIED = 0x0100, - DET_ITEM_PICKUP = 0x0200, - DET_FEAT_CHANGE = 0x0400 + DET_TURN_ELAPSED = 0x0001, + DET_MONSTER_MOVED = 0x0002, + DET_PLAYER_MOVED = 0x0004, + DET_LEAVING_LEVEL = 0x0008, + DET_ENTERING_LEVEL = 0x0010, + DET_PLAYER_IN_LOS = 0x0020, // Player just entered LOS. + DET_PLAYER_CLIMBS = 0x0040 // Player climbing stairs. }; class dgn_event @@ -36,12 +32,11 @@ public: dgn_event_type type; coord_def place; int elapsed_ticks; - long arg1, arg2; public: dgn_event(dgn_event_type t, const coord_def &p = coord_def(), - int ticks = you.time_taken, long a1 = 0, long a2 = 0) - : type(t), place(p), elapsed_ticks(ticks), arg1(a1), arg2(a2) + int ticks = you.time_taken) + : type(t), place(p), elapsed_ticks(ticks) { } }; @@ -93,7 +88,6 @@ public: void move_listeners(const coord_def &from, const coord_def &to); void fire_position_event(dgn_event_type et, const coord_def &pos); - void fire_position_event(const dgn_event &e, const coord_def &pos); void fire_event(dgn_event_type et); void fire_event(const dgn_event &e); |