リビジョン | 6cf96c6b1c3341ee94382b482f969b4b7f9d5858 (tree) |
---|---|
日時 | 2017-12-13 01:02:50 |
作者 | Deskull <desull@user...> |
コミッター | Deskull |
@@ -1,5 +1,17 @@ | ||
1 | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | |
2 | + <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | |
3 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | |
4 | + <ConfigurationType>StaticLibrary</ConfigurationType> | |
5 | + <UseDebugLibraries>true</UseDebugLibraries> | |
6 | + <PlatformToolset>v120</PlatformToolset> | |
7 | + <CharacterSet>Unicode</CharacterSet> | |
8 | + </PropertyGroup> | |
9 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | |
10 | + <ConfigurationType>StaticLibrary</ConfigurationType> | |
11 | + <UseDebugLibraries>false</UseDebugLibraries> | |
12 | + <PlatformToolset>v120</PlatformToolset> | |
13 | + <CharacterSet>Unicode</CharacterSet> | |
14 | + </PropertyGroup> | |
3 | 15 | <ItemGroup Label="ProjectConfigurations"> |
4 | 16 | <ProjectConfiguration Include="Debug|Win32"> |
5 | 17 | <Configuration>Debug</Configuration> |
@@ -4293,8 +4293,8 @@ static bool research_mon(void) | ||
4293 | 4293 | */ |
4294 | 4294 | static void bldg_process_command(building_type *bldg, int i) |
4295 | 4295 | { |
4296 | - int bact = bldg->actions[i]; | |
4297 | - int bcost; | |
4296 | + BACT_IDX bact = bldg->actions[i]; | |
4297 | + PRICE bcost; | |
4298 | 4298 | bool paid = FALSE; |
4299 | 4299 | int amt; |
4300 | 4300 |
@@ -113,6 +113,8 @@ typedef s16b CLASS_IDX; /*!< ゲーム中のプレイヤー職業ID型を定 | ||
113 | 113 | typedef s16b MIMIC_RACE_IDX; /*!< ゲーム中のプレイヤー変身種族ID型を定義 */ |
114 | 114 | typedef s16b PATRON_IDX; /*!< ゲーム中のプレイヤーパトロンID型を定義 */ |
115 | 115 | typedef s32b ACTION_IDX; /*!< プレイヤーが現在取っている常時行動のID定義 */ |
116 | +typedef s16b BACT_IDX; /*!< 町の施設処理のID定義 */ | |
117 | +typedef s16b BACT_RESTRICT_IDX; /*!< 町の施設処理の規制処理ID定義 */ | |
116 | 118 | |
117 | 119 | typedef s16b MONRACE_IDX; /*!< ゲーム中のモンスター種族ID型を定義 */ |
118 | 120 | typedef s16b MONSTER_IDX; /*!< ゲーム中のモンスター個体ID型を定義 */ |
@@ -3864,10 +3864,10 @@ static errr parse_line_building(char *buf) | ||
3864 | 3864 | building[index].letters[action_index] = zz[4][0]; |
3865 | 3865 | |
3866 | 3866 | /* Action code */ |
3867 | - building[index].actions[action_index] = atoi(zz[5]); | |
3867 | + building[index].actions[action_index] = (BACT_IDX)atoi(zz[5]); | |
3868 | 3868 | |
3869 | 3869 | /* Action restriction */ |
3870 | - building[index].action_restr[action_index] = atoi(zz[6]); | |
3870 | + building[index].action_restr[action_index] = (BACT_RESTRICT_IDX)atoi(zz[6]); | |
3871 | 3871 | |
3872 | 3872 | break; |
3873 | 3873 | } |
@@ -1463,8 +1463,8 @@ struct building_type | ||
1463 | 1463 | PRICE member_costs[8]; /* Costs for class members of building */ |
1464 | 1464 | PRICE other_costs[8]; /* Costs for nonguild members */ |
1465 | 1465 | char letters[8]; /* action letters */ |
1466 | - s16b actions[8]; /* action codes */ | |
1467 | - s16b action_restr[8]; /* action restrictions */ | |
1466 | + BACT_IDX actions[8]; /* action codes */ | |
1467 | + BACT_RESTRICT_IDX action_restr[8]; /* action restrictions */ | |
1468 | 1468 | |
1469 | 1469 | CLASS_IDX member_class[MAX_CLASS]; /* which classes are part of guild */ |
1470 | 1470 | RACE_IDX member_race[MAX_RACES]; /* which classes are part of guild */ |
@@ -1539,9 +1539,8 @@ static void do_cmd_wiz_jump(void) | ||
1539 | 1539 | if (command_arg <= 0) |
1540 | 1540 | { |
1541 | 1541 | char ppp[80]; |
1542 | - | |
1543 | 1542 | char tmp_val[160]; |
1544 | - int tmp_dungeon_type; | |
1543 | + DUNGEON_IDX tmp_dungeon_type; | |
1545 | 1544 | |
1546 | 1545 | /* Prompt */ |
1547 | 1546 | sprintf(ppp, "Jump which dungeon : "); |
@@ -1552,7 +1551,7 @@ static void do_cmd_wiz_jump(void) | ||
1552 | 1551 | /* Ask for a level */ |
1553 | 1552 | if (!get_string(ppp, tmp_val, 2)) return; |
1554 | 1553 | |
1555 | - tmp_dungeon_type = atoi(tmp_val); | |
1554 | + tmp_dungeon_type = (DUNGEON_IDX)atoi(tmp_val); | |
1556 | 1555 | if (!d_info[tmp_dungeon_type].maxdepth || (tmp_dungeon_type > max_d_idx)) tmp_dungeon_type = DUNGEON_ANGBAND; |
1557 | 1556 | |
1558 | 1557 | /* Prompt */ |
@@ -1566,9 +1565,9 @@ static void do_cmd_wiz_jump(void) | ||
1566 | 1565 | if (!get_string(ppp, tmp_val, 10)) return; |
1567 | 1566 | |
1568 | 1567 | /* Extract request */ |
1569 | - command_arg = (s16b)atoi(tmp_val); | |
1568 | + command_arg = (COMMAND_ARG)atoi(tmp_val); | |
1570 | 1569 | |
1571 | - dungeon_type = (byte_hack)tmp_dungeon_type; | |
1570 | + dungeon_type = tmp_dungeon_type; | |
1572 | 1571 | } |
1573 | 1572 | |
1574 | 1573 | /* Paranoia */ |