mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 00:04:43 +01:00
Code Issues Releases Wiki Activity

Merge pull request #1170 from zsilencer/bugfixes

Browse Source 
#1165
This commit is contained in:
Ted John
2015-05-30 12:59:45 +01:00
parent 8bc877ad27 5c7dc6bb9a
commit ba48b474b9
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/world/map.c
View File

@@ -1865,7 +1865,7 @@ void game_command_place_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi
if(RCT2_GLOBAL(0x009D8150, uint8) & 1 || (x <= RCT2_GLOBAL(0x01358836, uint16) && y <= RCT2_GLOBAL(0x01358836, uint16))){
rct_scenery_entry* scenery_entry = (rct_scenery_entry*)object_entry_groups[OBJECT_TYPE_SMALL_SCENERY].chunks[scenery_type];
if((scenery_entry->small_scenery.flags & SMALL_SCENERY_FLAG_FULL_TILE && scenery_entry->small_scenery.flags & (SMALL_SCENERY_FLAG9 | SMALL_SCENERY_FLAG24 | SMALL_SCENERY_FLAG25)) || scenery_entry->small_scenery.flags & SMALL_SCENERY_FLAG9){
base_height = 0;
quadrant = 0;
}
int x2 = x;
int y2 = y;
@@ -1936,7 +1936,6 @@ void game_command_place_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi
}
if(!(scenery_entry->small_scenery.flags & SMALL_SCENERY_FLAG24)){
if(scenery_entry->small_scenery.flags & SMALL_SCENERY_FLAG9 && scenery_entry->small_scenery.flags & SMALL_SCENERY_FLAG_FULL_TILE){
// this stuff that uses rol and ror are untested, couldnt find any scenery with these flags
if(scenery_entry->small_scenery.flags & SMALL_SCENERY_FLAG25){
bp ^= 2;
bp += rotation;
@@ -1948,7 +1947,7 @@ void game_command_place_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi
bp += rotation;
bp &= 1;
bl = 0xA;
bl = ror8(bl, bp);
bl >>= bp;
}
}
}else{