• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revision7810378b2019a42115cc3a777bddbe84883a4d21 (tree)
Time2019-06-02 21:33:02
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 DOOR_* を grid.h へ移動.

Change Summary

Incremental Difference

--- a/src/defines.h
+++ b/src/defines.h
@@ -207,14 +207,6 @@
207207 #define FAF_NO_DROP 0x02
208208 #define FAF_CRASH_GLASS 0x04
209209
210-/* Types of doors */
211-#define DOOR_DEFAULT -1
212-#define DOOR_DOOR 0
213-#define DOOR_GLASS_DOOR 1
214-#define DOOR_CURTAIN 2
215-
216-#define MAX_DOOR_TYPES 3
217-
218210 #define feat_locked_door_random(DOOR_TYPE) \
219211 (feat_door[(DOOR_TYPE)].num_locked ? \
220212 feat_door[(DOOR_TYPE)].locked[randint0(feat_door[(DOOR_TYPE)].num_locked)] : feat_none)
--- a/src/grid.h
+++ b/src/grid.h
@@ -372,9 +372,17 @@ extern bool new_player_spot(void);
372372
373373 extern void place_random_stairs(POSITION y, POSITION x);
374374 extern void place_random_door(POSITION y, POSITION x, bool room);
375-extern void place_closed_door(POSITION y, POSITION x, int type);
376375 extern void add_door(POSITION x, POSITION y);
376+
377+/* Types of doors */
378+#define DOOR_DEFAULT -1
379+#define DOOR_DOOR 0
380+#define DOOR_GLASS_DOOR 1
381+#define DOOR_CURTAIN 2
382+#define MAX_DOOR_TYPES 3
383+extern void place_closed_door(POSITION y, POSITION x, int type);
377384 extern void place_secret_door(POSITION y, POSITION x, int type);
385+
378386 extern void place_locked_door(POSITION y, POSITION x);
379387 extern void try_door(POSITION y, POSITION x);
380388 extern void place_floor(POSITION x1, POSITION x2, POSITION y1, POSITION y2, bool light);
Show on old repository browser