• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revisionde8236ab7ef1ed03b5c4e4b35d5c67997544fafe (tree)
Time2019-05-25 19:05:58
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 TERRAIN_* 定義を wild.h へ移動.

Change Summary

Incremental Difference

--- a/src/defines.h
+++ b/src/defines.h
@@ -434,26 +434,6 @@
434434 */
435435 #define MAX_FEAT_STATES 8
436436
437-
438-/*
439- * Wilderness terrains
440- */
441-#define TERRAIN_EDGE 0 /* Edge of the World */
442-#define TERRAIN_TOWN 1 /* Town */
443-#define TERRAIN_DEEP_WATER 2 /* Deep water */
444-#define TERRAIN_SHALLOW_WATER 3 /* Shallow water */
445-#define TERRAIN_SWAMP 4 /* Swamp */
446-#define TERRAIN_DIRT 5 /* Dirt */
447-#define TERRAIN_GRASS 6 /* Grass */
448-#define TERRAIN_TREES 7 /* Trees */
449-#define TERRAIN_DESERT 8 /* Desert */
450-#define TERRAIN_SHALLOW_LAVA 9 /* Shallow lava */
451-#define TERRAIN_DEEP_LAVA 10 /* Deep lava */
452-#define TERRAIN_MOUNTAIN 11 /* Mountain */
453-
454-#define MAX_WILDERNESS 12 /* Maximum wilderness index */
455-
456-
457437 /*
458438 * Feature flags - should be used instead of feature indexes unless generating.
459439 * Originally from UnAngband, and modified into TR-like style in Hengband
--- a/src/wild.h
+++ b/src/wild.h
@@ -1,5 +1,24 @@
11 #pragma once
22
3+/*
4+ * Wilderness terrains
5+ */
6+#define TERRAIN_EDGE 0 /* Edge of the World */
7+#define TERRAIN_TOWN 1 /* Town */
8+#define TERRAIN_DEEP_WATER 2 /* Deep water */
9+#define TERRAIN_SHALLOW_WATER 3 /* Shallow water */
10+#define TERRAIN_SWAMP 4 /* Swamp */
11+#define TERRAIN_DIRT 5 /* Dirt */
12+#define TERRAIN_GRASS 6 /* Grass */
13+#define TERRAIN_TREES 7 /* Trees */
14+#define TERRAIN_DESERT 8 /* Desert */
15+#define TERRAIN_SHALLOW_LAVA 9 /* Shallow lava */
16+#define TERRAIN_DEEP_LAVA 10 /* Deep lava */
17+#define TERRAIN_MOUNTAIN 11 /* Mountain */
18+
19+#define MAX_WILDERNESS 12 /* Maximum wilderness index */
20+
21+
322 /* wild.c */
423 extern void set_floor_and_wall(DUNGEON_IDX type);
524 extern void wilderness_gen(void);
Show on old repository browser