mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1679 from zsilencer/bugfixes 

fix couple of bugs
This commit is contained in:
Duncan 2015-07-25 15:55:34 +01:00
parent 2d11e54fa7 c4a8d27648
commit 3d4cbfff6e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/management/news_item.c
View File

@ -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) {

6
src/world/map.c
View File

@ -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)