Merge branch 'develop' into macos-develop

[hengbandforosx/hengbandosx.git] / src / floor / object-allocator.h

diff --git a/src/floor/object-allocator.h b/src/floor/object-allocator.h
index 31fa4d3..00422b4 100644 (file)
--- a/src/floor/object-allocator.h
+++ b/src/floor/object-allocator.h
@@ -1,7 +1,9 @@
-#pragma once
+#pragma once
 
+#include "floor/floor-allocation-types.h"
 #include "system/angband.h"
 
-typedef enum dap_type dap_type;
-bool alloc_stairs(player_type *owner_ptr, FEAT_IDX feat, int num, int walls);
-void alloc_object(player_type *owner_ptr, dap_type set, EFFECT_ID typ, int num);
+enum dap_type : int;
+class PlayerType;
+bool alloc_stairs(PlayerType *player_ptr, FEAT_IDX feat, int num, int walls);
+void alloc_object(PlayerType *player_ptr, dap_type set, dungeon_allocation_type typ, int num);