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

Use our own assert_struct_size macro for static assert

This commit is contained in:
Michał Janiszewski 2017-01-24 23:33:33 +01:00
parent be97031bb9
commit fc42dce87e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/windows/tile_inspector.c
View File

@ -696,7 +696,7 @@ static void window_tile_inspector_paste_element(rct_window *w)
// Construct the data to send using the surface's properties
sint32 data[2];
memcpy(&data[0], &tileInspectorCopiedElement, 8);
static_assert(sizeof(data) == sizeof(tileInspectorCopiedElement), "Sizes do not match");
assert_struct_size(data, sizeof(tileInspectorCopiedElement));
game_do_command(
TILE_INSPECTOR_ANY_PASTE,

2
src/openrct2/world/map.c
View File

@ -5643,8 +5643,8 @@ void game_command_modify_tile(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx
{
rct_map_element element_to_paste;
sint32 data[] = { *edx, *edi };
assert_struct_size(data, sizeof(element_to_paste));
memcpy(&element_to_paste, data, 8);
static_assert(sizeof(data) == sizeof(element_to_paste), "Sizes do not match");
*ebx = tile_inspector_paste_element_at(x, y, element_to_paste, flags);
return;
}