mirror of https://github.com/OpenRCT2/OpenRCT2.git
fix couple of bugs
This commit is contained in:
parent
2d11e54fa7
commit
c4a8d27648
|
@ -112,7 +112,7 @@ static bool news_item_is_current_old()
|
|||
*/
|
||||
void news_item_update_current()
|
||||
{
|
||||
short ax, bx, remove_time;
|
||||
short ax, bx;
|
||||
|
||||
get_system_time();
|
||||
|
||||
|
@ -415,7 +415,7 @@ void news_item_disable_news(uint8 type, uint32 assoc) {
|
|||
{
|
||||
if (!news_item_is_empty(i))
|
||||
{
|
||||
rct_news_item * const newsItem;
|
||||
rct_news_item * const newsItem = news_item_get(i);
|
||||
if (type == newsItem->type && assoc == newsItem->assoc) {
|
||||
newsItem->flags |= 0x1;
|
||||
if (i == 0) {
|
||||
|
|
|
@ -2999,9 +2999,9 @@ int map_can_construct_with_clear_at(int x, int y, int zLow, int zHigh, void *cle
|
|||
continue;
|
||||
}
|
||||
int water_height = ((map_element->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK) * 2);
|
||||
if (water_height && water_height >= zLow && map_element->base_height < zHigh) {
|
||||
if (water_height && water_height > zLow && map_element->base_height < zHigh) {
|
||||
RCT2_GLOBAL(0x00F1AD60, uint8) |= 4;
|
||||
if (water_height > zHigh) {
|
||||
if (water_height < zHigh) {
|
||||
goto loc_68BAE6;
|
||||
}
|
||||
}
|
||||
|
@ -3025,7 +3025,7 @@ int map_can_construct_with_clear_at(int x, int y, int zLow, int zHigh, void *cle
|
|||
int ah = al;
|
||||
int cl = al;
|
||||
int ch = al;
|
||||
uint8 slope = map_element->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK; //F
|
||||
uint8 slope = map_element->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK;
|
||||
if (slope & 1) {
|
||||
al += 2;
|
||||
if (slope == 0x1B)
|
||||
|
|
Loading…
Reference in New Issue