• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision894cc0f247b3ebb78acdcaf43f271e8a4f6123ed (tree)
Time2019-06-12 22:15:14
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 CFM_* 定義を prepare_change_floor_mode() 付近に移動。

Change Summary

Incremental Difference

--- a/src/floor-save.h
+++ b/src/floor-save.h
@@ -24,6 +24,21 @@ extern void leave_floor(void);
2424 extern void clear_saved_floor_files(void);
2525 extern saved_floor_type *get_sf_ptr(FLOOR_IDX floor_id);
2626 extern FLOOR_IDX get_new_floor_id(void);
27+
28+/*
29+ * Flags for change floor mode
30+ */
31+#define CFM_UP 0x0001 /* Move up */
32+#define CFM_DOWN 0x0002 /* Move down */
33+#define CFM_LONG_STAIRS 0x0004 /* Randomly occurred long stairs/shaft */
34+#define CFM_XXX 0x0008 /* XXX */
35+#define CFM_SHAFT 0x0010 /* Shaft */
36+#define CFM_RAND_PLACE 0x0020 /* Arrive at random grid */
37+#define CFM_RAND_CONNECT 0x0040 /* Connect with random stairs */
38+#define CFM_SAVE_FLOORS 0x0080 /* Save floors */
39+#define CFM_NO_RETURN 0x0100 /* Flee from random quest etc... */
40+#define CFM_FIRST_FLOOR 0x0200 /* Create exit from the dungeon */
2741 extern void prepare_change_floor_mode(BIT_FLAGS mode);
42+
2843 extern void precalc_cur_num_of_pet(void);
2944 extern FLOOR_IDX max_floor_id;
\ No newline at end of file
--- a/src/floor.h
+++ b/src/floor.h
@@ -188,20 +188,6 @@ typedef struct {
188188 #define DUNGEON_DARKNESS 19
189189
190190 /*
191- * Flags for change floor mode
192- */
193-#define CFM_UP 0x0001 /* Move up */
194-#define CFM_DOWN 0x0002 /* Move down */
195-#define CFM_LONG_STAIRS 0x0004 /* Randomly occurred long stairs/shaft */
196-#define CFM_XXX 0x0008 /* XXX */
197-#define CFM_SHAFT 0x0010 /* Shaft */
198-#define CFM_RAND_PLACE 0x0020 /* Arrive at random grid */
199-#define CFM_RAND_CONNECT 0x0040 /* Connect with random stairs */
200-#define CFM_SAVE_FLOORS 0x0080 /* Save floors */
201-#define CFM_NO_RETURN 0x0100 /* Flee from random quest etc... */
202-#define CFM_FIRST_FLOOR 0x0200 /* Create exit from the dungeon */
203-
204-/*
205191 * Determines if a map location is fully inside the outer walls
206192 */
207193 #define in_bounds(Y,X) \
Show on old repository browser