summaryrefslogtreecommitdiff
path: root/src/object2.hpp
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2015-09-14 17:30:27 +0200
committerBardur Arantsson <bardur@scientician.net>2015-09-14 17:30:27 +0200
commit87544c0599ec69df0af560dbfe7f58482d2a0bf5 (patch)
tree501ace7c8a913a23e74debda1c6026bad20d6364 /src/object2.hpp
parentb7ceceb10db03a8d59de5de39a7cd6465409c35c (diff)
Replace hack_apply_magic_power with optional parameter
Diffstat (limited to 'src/object2.hpp')
-rw-r--r--src/object2.hpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/object2.hpp b/src/object2.hpp
index 6d5d7160..26d07b25 100644
--- a/src/object2.hpp
+++ b/src/object2.hpp
@@ -4,6 +4,8 @@
#include "object_type_fwd.hpp"
#include "obj_theme_fwd.hpp"
+#include <boost/optional.hpp>
+
typedef enum { OPTIMIZE, NO_OPTIMIZE } optimize_flag;
typedef enum { DESCRIBE, NO_DESCRIBE } describe_flag;
@@ -49,8 +51,7 @@ extern s16b lookup_kind(int tval, int sval);
extern void object_wipe(object_type *o_ptr);
extern void object_prep(object_type *o_ptr, int k_idx);
extern void object_copy(object_type *o_ptr, object_type *j_ptr);
-extern int hack_apply_magic_power;
-extern void apply_magic(object_type *o_ptr, int lev, bool_ okay, bool_ good, bool_ great);
+extern void apply_magic(object_type *o_ptr, int lev, bool_ okay, bool_ good, bool_ great, boost::optional<int> force_power = boost::none);
extern bool_ make_object(object_type *j_ptr, bool_ good, bool_ great, obj_theme const &theme);
extern void place_object(int y, int x, bool_ good, bool_ great, int where);
extern bool_ make_gold(object_type *j_ptr);