| リビジョン | 4c97fb2ec6ded2b036de7bd53c0047caf962d3e7 (tree) |
|---|---|
| 日時 | 2017-10-11 18:03:21 |
| 作者 | Deskull <desull@user...> |
| コミッター | Deskull |
src/japanese.c (diff) src/object1.c (diff) src/rooms.c (diff)
src/types.h (diff)| @@ -70,7 +70,7 @@ void sindarin_to_kana(char *kana, const char *sindarin) | ||
| 70 | 70 | |
| 71 | 71 | sprintf(kana, "%s$", sindarin); |
| 72 | 72 | for (idx = 0; kana[idx]; idx++) |
| 73 | - if (isupper(kana[idx])) kana[idx] = tolower(kana[idx]); | |
| 73 | + if (isupper(kana[idx])) kana[idx] = (char)tolower(kana[idx]); | |
| 74 | 74 | |
| 75 | 75 | for (idx = 0; s2j_table[idx].key1 != NULL; idx++) |
| 76 | 76 | { |
| @@ -1856,7 +1856,7 @@ void display_equip(void) | ||
| 1856 | 1856 | * Also, the tag "@xn" will work as well, where "n" is a any tag-char,\n |
| 1857 | 1857 | * and "x" is the "current" command_cmd code.\n |
| 1858 | 1858 | */ |
| 1859 | -static bool get_tag(int *cp, char tag, int mode) | |
| 1859 | +static bool get_tag(COMMAND_CODE *cp, char tag, int mode) | |
| 1860 | 1860 | { |
| 1861 | 1861 | int i, start, end; |
| 1862 | 1862 | cptr s; |
| @@ -5456,7 +5456,7 @@ static void build_elemental_vault(int x0, int y0, int xsiz, int ysiz) | ||
| 5456 | 5456 | */ |
| 5457 | 5457 | static bool build_type10(void) |
| 5458 | 5458 | { |
| 5459 | - int y0, x0, xsize, ysize, vtype; | |
| 5459 | + POSITION y0, x0, xsize, ysize, vtype; | |
| 5460 | 5460 | |
| 5461 | 5461 | /* Get size */ |
| 5462 | 5462 | /* big enough to look good, small enough to be fairly common. */ |
| @@ -5564,7 +5564,7 @@ static bool build_type11(void) | ||
| 5564 | 5564 | */ |
| 5565 | 5565 | static bool build_type12(void) |
| 5566 | 5566 | { |
| 5567 | - int rad, x, y, x0, y0; | |
| 5567 | + POSITION rad, x, y, x0, y0; | |
| 5568 | 5568 | int light = FALSE; |
| 5569 | 5569 | bool emptyflag = TRUE; |
| 5570 | 5570 |
| @@ -6561,7 +6561,7 @@ static bool build_type16(void) | ||
| 6561 | 6561 | STORE_ALCHEMIST, STORE_MAGIC, STORE_BLACK, STORE_BOOK, |
| 6562 | 6562 | }; |
| 6563 | 6563 | int n = sizeof stores / sizeof (int); |
| 6564 | - int i, y, x, y1, x1, yval, xval; | |
| 6564 | + POSITION i, y, x, y1, x1, yval, xval; | |
| 6565 | 6565 | int town_hgt = rand_range(MIN_TOWN_HGT, MAX_TOWN_HGT); |
| 6566 | 6566 | int town_wid = rand_range(MIN_TOWN_WID, MAX_TOWN_WID); |
| 6567 | 6567 | bool prevent_bm = FALSE; |
| @@ -168,29 +168,30 @@ struct artifact_type | ||
| 168 | 168 | STR_OFFSET name; /*!< アーティファクト名(headerオフセット参照) / Name (offset) */ |
| 169 | 169 | STR_OFFSET text; /*!< アーティファクト解説(headerオフセット参照) / Text (offset) */ |
| 170 | 170 | |
| 171 | - byte tval; /*!< ベースアイテム大項目ID / Artifact type */ | |
| 172 | - byte sval; /*!< ベースアイテム小項目ID / Artifact sub type */ | |
| 171 | + OBJECT_TYPE_VALUE tval; /*!< ベースアイテム大項目ID / Artifact type */ | |
| 172 | + OBJECT_SUBTYPE_VALUE sval; /*!< ベースアイテム小項目ID / Artifact sub type */ | |
| 173 | 173 | |
| 174 | - s16b pval; /*!< pval修正値 / Artifact extra info */ | |
| 174 | + PARAMETER_VALUE pval; /*!< pval修正値 / Artifact extra info */ | |
| 175 | 175 | |
| 176 | - s16b to_h; /*!< 命中ボーナス値 / Bonus to hit */ | |
| 177 | - s16b to_d; /*!< ダメージボーナス値 / Bonus to damage */ | |
| 178 | - s16b to_a; /*!< ACボーナス値 / Bonus to armor */ | |
| 176 | + HIT_PROB to_h; /*!< 命中ボーナス値 / Bonus to hit */ | |
| 177 | + HIT_POINT to_d; /*!< ダメージボーナス値 / Bonus to damage */ | |
| 178 | + ARMOUR_CLASS to_a; /*!< ACボーナス値 / Bonus to armor */ | |
| 179 | 179 | |
| 180 | - s16b ac; /*!< 上書きベースAC値 / Base armor */ | |
| 180 | + ARMOUR_CLASS ac; /*!< 上書きベースAC値 / Base armor */ | |
| 181 | 181 | |
| 182 | - byte dd, ds; /*!< ダイス値 / Damage when hits */ | |
| 182 | + DICE_NUMBER dd; | |
| 183 | + DICE_SID ds; /*!< ダイス値 / Damage when hits */ | |
| 183 | 184 | |
| 184 | - s16b weight; /*!< 重量 / Weight */ | |
| 185 | + WEIGHT weight; /*!< 重量 / Weight */ | |
| 185 | 186 | |
| 186 | - s32b cost; /*!< 基本価格 / Artifact "cost" */ | |
| 187 | + PRICE cost; /*!< 基本価格 / Artifact "cost" */ | |
| 187 | 188 | |
| 188 | - u32b flags[TR_FLAG_SIZE]; /*! アイテムフラグ / Artifact Flags */ | |
| 189 | + BIT_FLAGS flags[TR_FLAG_SIZE]; /*! アイテムフラグ / Artifact Flags */ | |
| 189 | 190 | |
| 190 | - u32b gen_flags; /*! アイテム生成フラグ / flags for generate */ | |
| 191 | + BIT_FLAGS gen_flags; /*! アイテム生成フラグ / flags for generate */ | |
| 191 | 192 | |
| 192 | - byte level; /*! 基本生成階 / Artifact level */ | |
| 193 | - byte rarity; /*! レアリティ / Artifact rarity */ | |
| 193 | + DEPTH level; /*! 基本生成階 / Artifact level */ | |
| 194 | + RARITY rarity; /*! レアリティ / Artifact rarity */ | |
| 194 | 195 | |
| 195 | 196 | byte cur_num; /*! 現在の生成数 / Number created (0 or 1) */ |
| 196 | 197 | byte max_num; /*! (未使用)最大生成数 / Unused (should be "1") */ |
| @@ -305,25 +306,25 @@ struct monster_race | ||
| 305 | 306 | byte aaf; /*!< 感知範囲(1-100スクエア) / Area affect radius (1-100) */ |
| 306 | 307 | SPEED speed; /*!< 加速(110で+0) / Speed (normally 110) */ |
| 307 | 308 | |
| 308 | - s32b mexp; /*!< 殺害時基本経験値 / Exp value for kill */ | |
| 309 | + EXP mexp; /*!< 殺害時基本経験値 / Exp value for kill */ | |
| 309 | 310 | |
| 310 | 311 | s16b extra; /*!< 未使用 / Unused (for now) */ |
| 311 | 312 | |
| 312 | 313 | byte freq_spell; /*!< 魔法＆特殊能力仕様頻度(1/n) / Spell frequency */ |
| 313 | 314 | |
| 314 | - u32b flags1; /* Flags 1 (general) */ | |
| 315 | - u32b flags2; /* Flags 2 (abilities) */ | |
| 316 | - u32b flags3; /* Flags 3 (race/resist) */ | |
| 317 | - u32b flags4; /* Flags 4 (inate/breath) */ | |
| 318 | - u32b flags7; /* Flags 7 (movement related abilities) */ | |
| 319 | - u32b flags8; /* Flags 8 (wilderness info) */ | |
| 320 | - u32b flags9; /* Flags 9 (drops info) */ | |
| 321 | - u32b flagsr; /* Flags R (resistances info) */ | |
| 315 | + BIT_FLAGS flags1; /* Flags 1 (general) */ | |
| 316 | + BIT_FLAGS flags2; /* Flags 2 (abilities) */ | |
| 317 | + BIT_FLAGS flags3; /* Flags 3 (race/resist) */ | |
| 318 | + BIT_FLAGS flags4; /* Flags 4 (inate/breath) */ | |
| 319 | + BIT_FLAGS flags7; /* Flags 7 (movement related abilities) */ | |
| 320 | + BIT_FLAGS flags8; /* Flags 8 (wilderness info) */ | |
| 321 | + BIT_FLAGS flags9; /* Flags 9 (drops info) */ | |
| 322 | + BIT_FLAGS flagsr; /* Flags R (resistances info) */ | |
| 322 | 323 | |
| 323 | - u32b a_ability_flags1; /* Activate Ability Flags 5 (normal spells) */ | |
| 324 | - u32b a_ability_flags2; /* Activate Ability Flags 6 (special spells) */ | |
| 325 | - u32b a_ability_flags3; /* Activate Ability Flags 7 (implementing) */ | |
| 326 | - u32b a_ability_flags4; /* Activate Ability Flags 8 (implementing) */ | |
| 324 | + BIT_FLAGS a_ability_flags1; /* Activate Ability Flags 5 (normal spells) */ | |
| 325 | + BIT_FLAGS a_ability_flags2; /* Activate Ability Flags 6 (special spells) */ | |
| 326 | + BIT_FLAGS a_ability_flags3; /* Activate Ability Flags 7 (implementing) */ | |
| 327 | + BIT_FLAGS a_ability_flags4; /* Activate Ability Flags 8 (implementing) */ | |
| 327 | 328 | |
| 328 | 329 | monster_blow blow[4]; /* Up to four blows per round */ |
| 329 | 330 | MONRACE_IDX reinforce_id[6]; |
| @@ -336,8 +337,8 @@ struct monster_race | ||
| 336 | 337 | |
| 337 | 338 | PERCENTAGE arena_ratio; /* アリーナの評価修正値(%基準 / 0=100%) / Arena */ |
| 338 | 339 | |
| 339 | - IDX next_r_idx; | |
| 340 | - u32b next_exp; | |
| 340 | + MONRACE_IDX next_r_idx; | |
| 341 | + EXP next_exp; | |
| 341 | 342 | |
| 342 | 343 | DEPTH level; /* Level of creature */ |
| 343 | 344 | RARITY rarity; /* Rarity of creature */ |
| @@ -1704,13 +1705,13 @@ typedef struct | ||
| 1704 | 1705 | */ |
| 1705 | 1706 | typedef struct |
| 1706 | 1707 | { |
| 1707 | - s16b open; | |
| 1708 | - s16b broken; | |
| 1709 | - s16b closed; | |
| 1710 | - s16b locked[MAX_LJ_DOORS]; | |
| 1711 | - s16b num_locked; | |
| 1712 | - s16b jammed[MAX_LJ_DOORS]; | |
| 1713 | - s16b num_jammed; | |
| 1708 | + FEAT_IDX open; | |
| 1709 | + FEAT_IDX broken; | |
| 1710 | + FEAT_IDX closed; | |
| 1711 | + FEAT_IDX locked[MAX_LJ_DOORS]; | |
| 1712 | + FEAT_IDX num_locked; | |
| 1713 | + FEAT_IDX jammed[MAX_LJ_DOORS]; | |
| 1714 | + FEAT_IDX num_jammed; | |
| 1714 | 1715 | } door_type; |
| 1715 | 1716 | |
| 1716 | 1717 |
Fork