summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2015-03-07 16:55:42 +0100
committerBardur Arantsson <bardur@scientician.net>2015-03-07 16:55:42 +0100
commit09c129b63548338b120d54915153ae9321f51a76 (patch)
tree588fe9f740d3002a65fb117444f8e483d48503ec
parentf93c700dc8320da438ad46b59b2541e29d9b6d68 (diff)
Move {optimize,describe}_flag to object2.hpp
-rw-r--r--src/externs.h16
-rw-r--r--src/object2.hpp6
2 files changed, 5 insertions, 17 deletions
diff --git a/src/externs.h b/src/externs.h
index 62fa3151..a718f63b 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -1,19 +1,3 @@
-/* File: externs.h */
-
-/* Purpose: extern declarations (variables and functions) */
-
-/*
- * Note that some files have their own header files
- * (z-util.h, z-form.h, term.h, random.h)
- */
-
-/*
- * Options for inc_stack_size_ex
- */
-typedef enum { OPTIMIZE, NO_OPTIMIZE } optimize_flag;
-typedef enum { DESCRIBE, NO_DESCRIBE } describe_flag;
-
-
/*
* Automatically generated "variable" declarations
*/
diff --git a/src/object2.hpp b/src/object2.hpp
index 07986cd3..c205334c 100644
--- a/src/object2.hpp
+++ b/src/object2.hpp
@@ -1,6 +1,10 @@
#pragma once
-#include "angband.h"
+#include "h-basic.h"
+#include "types_fwd.h"
+
+typedef enum { OPTIMIZE, NO_OPTIMIZE } optimize_flag;
+typedef enum { DESCRIBE, NO_DESCRIBE } describe_flag;
extern void inc_stack_size(int item, int delta);
extern void inc_stack_size_ex(int item, int delta, optimize_flag opt, describe_flag desc);