Mercurial > mm7
comparison Outdoor.cpp @ 750:23a07ead5980
Night fixed.
author | Nomad |
---|---|
date | Fri, 22 Mar 2013 23:50:02 +0200 |
parents | 9d13d2ec35a6 |
children | 5ba796adbf5e |
comparison
equal
deleted
inserted
replaced
749:f39fbeb65b28 | 750:23a07ead5980 |
---|---|
169 goto LABEL_9; | 169 goto LABEL_9; |
170 if ( pParty->uCurrentHour >= 6 ) | 170 if ( pParty->uCurrentHour >= 6 ) |
171 { | 171 { |
172 if ( pParty->uCurrentHour < 0x14 ) | 172 if ( pParty->uCurrentHour < 0x14 ) |
173 { | 173 { |
174 pWeather->field_FA0 = 0; | 174 pWeather->bNight = 0; |
175 v2 = 0.0; | 175 v2 = 0.0; |
176 return v2 * 0.016666668; | 176 return v2 * 0.016666668; |
177 } | 177 } |
178 if ( pParty->uCurrentHour < 0x15 ) | 178 if ( pParty->uCurrentHour < 0x15 ) |
179 { | 179 { |
181 v2 = (double)(pParty->uCurrentHour - 20) * 60.0 + (double)(signed int)pParty->uCurrentMinute; | 181 v2 = (double)(pParty->uCurrentHour - 20) * 60.0 + (double)(signed int)pParty->uCurrentMinute; |
182 goto LABEL_4; | 182 goto LABEL_4; |
183 } | 183 } |
184 LABEL_9: | 184 LABEL_9: |
185 v2 = 60.0; | 185 v2 = 60.0; |
186 pWeather->field_FA0 = 1; | 186 pWeather->bNight = 1; |
187 return v2 * 0.016666668; | 187 return v2 * 0.016666668; |
188 } | 188 } |
189 v1 = 0; | 189 v1 = 0; |
190 v2 = 60.0 - (double)(60 * pParty->uCurrentHour + pParty->uCurrentMinute - 300); | 190 v2 = 60.0 - (double)(60 * pParty->uCurrentHour + pParty->uCurrentMinute - 300); |
191 LABEL_4: | 191 LABEL_4: |
192 pWeather->field_FA0 = v1; | 192 pWeather->bNight = v1; |
193 return v2 * 0.016666668; | 193 return v2 * 0.016666668; |
194 } | 194 } |
195 | 195 |
196 //----- (00488EB1) -------------------------------------------------------- | 196 //----- (00488EB1) -------------------------------------------------------- |
197 int OutdoorLocation::GetSomeOtherTileInfo(int sX, int sY) | 197 int OutdoorLocation::GetSomeOtherTileInfo(int sX, int sY) |