• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revisionf070da1b5cbd3bfcc6c64a56a1dc27ba165e430b (tree)
Time2019-06-01 13:23:54
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

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

Change Summary

Incremental Difference

--- a/src/defines.h
+++ b/src/defines.h
@@ -271,17 +271,6 @@
271271 feat_door[(DOOR_TYPE)].jammed[randint0(feat_door[(DOOR_TYPE)].num_jammed)] : feat_none)
272272
273273
274-
275-/* Types of conversions */
276-#define CONVERT_TYPE_FLOOR 0
277-#define CONVERT_TYPE_WALL 1
278-#define CONVERT_TYPE_INNER 2
279-#define CONVERT_TYPE_OUTER 3
280-#define CONVERT_TYPE_SOLID 4
281-#define CONVERT_TYPE_STREAM1 5
282-#define CONVERT_TYPE_STREAM2 6
283-
284-
285274 /*
286275 * Bit flags for the *_can_enter() and monster_can_cross_terrain()
287276 */
--- a/src/grid.c
+++ b/src/grid.c
@@ -1965,7 +1965,6 @@ void cave_set_feat(POSITION y, POSITION x, FEAT_IDX feat)
19651965 }
19661966 }
19671967
1968-
19691968 FEAT_IDX conv_dungeon_feat(FEAT_IDX newfeat)
19701969 {
19711970 feature_type *f_ptr = &f_info[newfeat];
--- a/src/grid.h
+++ b/src/grid.h
@@ -357,6 +357,15 @@ typedef struct
357357 #define CAVE_UNSAFE 0x2000 /* Might have trap */
358358 #define CAVE_IN_DETECT 0x4000 /* trap detected area (inner circle only) */
359359
360+/* Types of conversions */
361+#define CONVERT_TYPE_FLOOR 0
362+#define CONVERT_TYPE_WALL 1
363+#define CONVERT_TYPE_INNER 2
364+#define CONVERT_TYPE_OUTER 3
365+#define CONVERT_TYPE_SOLID 4
366+#define CONVERT_TYPE_STREAM1 5
367+#define CONVERT_TYPE_STREAM2 6
368+
360369 /* Externs */
361370
362371 extern bool new_player_spot(void);
Show on old repository browser