diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2019-02-15 19:20:25 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2019-02-15 19:20:25 +0100 |
| commit | a478b9be4e52f6a374d521565c55988cbf80c015 (patch) | |
| tree | 461775d691ab2380acfed2e6c2ee63467a7ce423 /src/cave.hpp | |
| parent | 23d4052eb88176ceb3cb3d769b09aa46a56e79cc (diff) | |
Move 'effects' global into Game struct
We change the type to std::vector<> while we're at it and make
cave_type::effect to a boost::optional<>
Diffstat (limited to 'src/cave.hpp')
| -rw-r--r-- | src/cave.hpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/cave.hpp b/src/cave.hpp index ce1631a1..ed352abc 100644 --- a/src/cave.hpp +++ b/src/cave.hpp @@ -4,6 +4,8 @@ #include "cave_type_fwd.hpp" #include "object_type_fwd.hpp" +#include <boost/optional.hpp> + int distance(int y1, int x1, int y2, int x2); bool_ los(int y1, int x1, int y2, int x2); bool_ cave_valid_bold(int y, int x); @@ -40,7 +42,7 @@ void disturb(); void disturb_on_state(); void disturb_on_other(); int is_quest(int level); -int new_effect(int type, int dam, int time, int cy, int cx, int rad, s32b flags); +boost::optional<s16b> new_effect(int type, int dam, int time, int cy, int cx, int rad, s32b flags); bool cave_floor_bold(int y, int x); bool cave_floor_grid(cave_type const *c); bool cave_plain_floor_bold(int y, int x); |