mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 11:33:03 +01:00
Code Issues Releases Wiki Activity

Merge pull request #2202 from HaasJona/fixrotation

Browse Source 
Fix Bug #2201
This commit is contained in:
Ted John
2015-11-04 12:06:01 +00:00
parent 569a1f34cc 96d71ac174
commit e2ce5ee49e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/interface/viewport.c
View File

@@ -2908,10 +2908,10 @@ void screen_get_map_xy_side_with_z(sint16 screenX, sint16 screenY, sint16 z, sin
*
* @returns rotation in range 0-3 (inclusive)
*/
int get_current_rotation()
uint32 get_current_rotation()
{
int rotation = RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_ROTATION, uint32);
int rotation_masked = rotation & 3;
uint32 rotation = RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_ROTATION, uint32);
uint32 rotation_masked = rotation & 3;
#if DEBUG_LEVEL_1
if (rotation != rotation_masked) {
log_error("Found wrong rotation %d! Will return %d instead.", rotation, rotation_masked);

2
src/interface/viewport.h
View File

@@ -144,6 +144,6 @@ void screen_get_map_xy_quadrant_with_z(sint16 screenX, sint16 screenY, sint16 z,
void screen_get_map_xy_side(sint16 screenX, sint16 screenY, sint16 *mapX, sint16 *mapY, uint8 *side);
void screen_get_map_xy_side_with_z(sint16 screenX, sint16 screenY, sint16 z, sint16 *mapX, sint16 *mapY, uint8 *side);
int get_current_rotation();
uint32 get_current_rotation();
#endif