変愚蛮怒のメインリポジトリです
Revision | 6984d94ea6fb681701faf64b8f296e18c3ab43c4 (tree) |
---|---|
Time | 2003-05-04 03:54:24 |
Author | nothere <nothere@0568...> |
Commiter | nothere |
種族変更するとターン数が狂い日付がずれるので, 経過ゲームターン数計算には
スタート時の種族を見るように修正.
@@ -6800,11 +6800,14 @@ msg_print("ĥ | ||
6800 | 6800 | |
6801 | 6801 | s32b turn_real(s32b hoge) |
6802 | 6802 | { |
6803 | - if ((p_ptr->prace == RACE_VAMPIRE) || | |
6804 | - (p_ptr->prace == RACE_SKELETON) || | |
6805 | - (p_ptr->prace == RACE_ZOMBIE) || | |
6806 | - (p_ptr->prace == RACE_SPECTRE)) | |
6807 | - return hoge-(TURNS_PER_TICK * TOWN_DAWN *3/ 4); | |
6808 | - else | |
6803 | + switch (p_ptr->start_race) | |
6804 | + { | |
6805 | + case RACE_VAMPIRE: | |
6806 | + case RACE_SKELETON: | |
6807 | + case RACE_ZOMBIE: | |
6808 | + case RACE_SPECTRE: | |
6809 | + return hoge - (TURNS_PER_TICK * TOWN_DAWN * 3 / 4); | |
6810 | + default: | |
6809 | 6811 | return hoge; |
6812 | + } | |
6810 | 6813 | } |
@@ -132,13 +132,18 @@ void extract_day_hour_min(int *day, int *hour, int *min) | ||
132 | 132 | s32b len = TURNS_PER_TICK * TOWN_DAWN; |
133 | 133 | s32b tick = turn % len + len / 4; |
134 | 134 | |
135 | - if ((p_ptr->prace == RACE_VAMPIRE) || | |
136 | - (p_ptr->prace == RACE_SKELETON) || | |
137 | - (p_ptr->prace == RACE_ZOMBIE) || | |
138 | - (p_ptr->prace == RACE_SPECTRE)) | |
139 | - *day = (turn - (TURNS_PER_TICK * TOWN_DAWN *3/4)) / len + 1; | |
140 | - else | |
141 | - *day = (turn + (TURNS_PER_TICK * TOWN_DAWN /4))/ len + 1; | |
135 | + switch (p_ptr->start_race) | |
136 | + { | |
137 | + case RACE_VAMPIRE: | |
138 | + case RACE_SKELETON: | |
139 | + case RACE_ZOMBIE: | |
140 | + case RACE_SPECTRE: | |
141 | + *day = (turn - (TURNS_PER_TICK * TOWN_DAWN * 3 / 4)) / len + 1; | |
142 | + break; | |
143 | + default: | |
144 | + *day = (turn + (TURNS_PER_TICK * TOWN_DAWN / 4)) / len + 1; | |
145 | + break; | |
146 | + } | |
142 | 147 | *hour = (24 * tick / len) % 24; |
143 | 148 | *min = (1440 * tick / len) % 60; |
144 | 149 | } |