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

implement map_invalidate_animations

This commit is contained in:
IntelOrca 2015-03-17 23:47:54 +00:00
parent d862ff73a7
commit 058f10845f
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/world/map.c
View File

@ -42,6 +42,7 @@ const rct_xy16 TileDirectionDelta[] = {
};
rct_xy16 *gMapSelectionTiles = (rct_xy16*)0x009DE596;
rct_animated_object *gAnimatedObjects = (rct_animated_object*)0x013886A0;
int _sub_6A876D_save_x;
int _sub_6A876D_save_y;
@ -458,13 +459,39 @@ int map_coord_is_connected(int x, int y, int z, uint8 faceDirection)
return 0;
}
/** rct2: 0x009819DC */
const uint32 *_animatedObjectEventHandlers = (uint32*)0x009819DC;
/**
* @returns true if the animation should be removed.
*/
bool map_invalidate_animation(rct_animated_object *obj)
{
uint32 address = _animatedObjectEventHandlers[obj->type];
int result = RCT2_CALLPROC_X(address, obj->x, 0, obj->y, obj->baseZ, 0, 0, 0);
return (result & 0x100) != 0;
}
/**
*
* rct2: 0x0068AFAD
*/
void map_invalidate_animations()
{
RCT2_CALLPROC_EBPSAFE(0x0068AFAD);
rct_animated_object *aobj = &gAnimatedObjects[0];
int numAnimatedObjects = RCT2_GLOBAL(0x0138B580, uint16);
while (numAnimatedObjects > 0) {
if (map_invalidate_animation(aobj)) {
// Remove animated object
RCT2_GLOBAL(0x0138B580, uint16)--;
numAnimatedObjects--;
if (numAnimatedObjects > 0)
memmove(aobj, aobj + 1, numAnimatedObjects);
} else {
numAnimatedObjects--;
aobj++;
}
}
}
/**

12
src/world/map.h
View File

@ -229,8 +229,20 @@ typedef struct {
uint8 direction;
} rct2_peep_spawn;
/**
* Animated object
* size: 0x06
*/
typedef struct {
uint8 baseZ;
uint8 type;
uint16 x;
uint16 y;
} rct_animated_object;
extern const rct_xy16 TileDirectionDelta[];
extern rct_xy16 *gMapSelectionTiles;
extern rct_animated_object *gAnimatedObjects;
void map_init(int size);
void map_update_tile_pointers();