• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revisioncec3d180eefe5c5bba6418ab4d5ae1311d1fdb11 (tree)
Time2019-05-21 00:16:52
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 PARSE_ERROR_* 定義を dungeon.h へ移動.

Change Summary

Incremental Difference

--- a/src/defines.h
+++ b/src/defines.h
@@ -2576,21 +2576,6 @@ extern int PlayerUID;
25762576 */
25772577 #define TOKENIZE_CHECKQUOTE 0x01 /* Special handling of single quotes */
25782578
2579-/*
2580- * Parse errors
2581- */
2582-#define PARSE_ERROR_GENERIC 1
2583-#define PARSE_ERROR_ABSOLETE_FILE 2
2584-#define PARSE_ERROR_MISSING_RECORD_HEADER 3
2585-#define PARSE_ERROR_NON_SEQUENTIAL_RECORDS 4
2586-#define PARSE_ERROR_INVALID_FLAG 5
2587-#define PARSE_ERROR_UNDEFINED_DIRECTIVE 6
2588-#define PARSE_ERROR_OUT_OF_MEMORY 7
2589-#define PARSE_ERROR_OUT_OF_BOUNDS 8
2590-#define PARSE_ERROR_TOO_FEW_ARGUMENTS 9
2591-#define PARSE_ERROR_UNDEFINED_TERRAIN_TAG 10
2592-#define PARSE_ERROR_MAX 11
2593-
25942579 #define GINOU_MAX 10
25952580
25962581 #define NO_TOWN 6
--- a/src/dungeon-file.h
+++ b/src/dungeon-file.h
@@ -24,6 +24,21 @@ struct dungeon_grid
2424 #define RANDOM_ARTIFACT 0x00000010
2525 #define RANDOM_TRAP 0x00000020
2626
27+/*
28+ * Parse errors
29+ */
30+#define PARSE_ERROR_GENERIC 1
31+#define PARSE_ERROR_ABSOLETE_FILE 2
32+#define PARSE_ERROR_MISSING_RECORD_HEADER 3
33+#define PARSE_ERROR_NON_SEQUENTIAL_RECORDS 4
34+#define PARSE_ERROR_INVALID_FLAG 5
35+#define PARSE_ERROR_UNDEFINED_DIRECTIVE 6
36+#define PARSE_ERROR_OUT_OF_MEMORY 7
37+#define PARSE_ERROR_OUT_OF_BOUNDS 8
38+#define PARSE_ERROR_TOO_FEW_ARGUMENTS 9
39+#define PARSE_ERROR_UNDEFINED_TERRAIN_TAG 10
40+#define PARSE_ERROR_MAX 11
41+
2742 extern concptr err_str[PARSE_ERROR_MAX];
2843 extern errr process_dungeon_file(concptr name, int ymin, int xmin, int ymax, int xmax);
2944 extern errr init_v_info(void);
Show on old repository browser