From 10ab0030ae19005708dd3cf6503f1ea0325cbb89 Mon Sep 17 00:00:00 2001 From: Tom van der Kleij Date: Thu, 4 Sep 2014 22:10:53 +0200 Subject: [PATCH 1/4] Decompiled peep_create (0x0069EC6B) --- src/peep.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ src/peep.h | 1 + src/staff.c | 11 +++++------ 3 files changed, 53 insertions(+), 6 deletions(-) diff --git a/src/peep.c b/src/peep.c index ea85a117e4..56fa5dd5e9 100644 --- a/src/peep.c +++ b/src/peep.c @@ -410,6 +410,53 @@ rct_peep *peep_generate(int x, int y, int z) return (rct_peep*)esi; } +/* +* rct2: 69EC6B +* bl: unclear what this does +*/ +rct_peep *peep_create(uint8 bl) +{ + rct_peep *peep = NULL; + + int ecx = 0xA; + + if ((bl & 2 != 0)) + { + // 69EC96; + uint16 cx = 0x12C - RCT2_GLOBAL(0x13573CE, uint16); + if (cx >= RCT2_GLOBAL(0x13573C8, uint16)) + { + return NULL; + } + + ecx = 6; + } + else if (RCT2_GLOBAL(0x13573C8, uint16) <= 0) + { + return NULL; + } + + peep = &g_sprite_list[RCT2_GLOBAL(RCT2_ADDRESS_SPRITES_NEXT_INDEX, uint16)]; + + RCT2_CALLPROC_X(0x0069ED0B, 0, 0, ecx, 0, (int)peep, 0, 0); + + peep->x = SPRITE_LOCATION_NULL; + peep->y = SPRITE_LOCATION_NULL; + peep->z = 0; + peep->name_string_idx = 0; + peep->var_14 = 0x10; + peep->var_09 = 0x14; + peep->var_15 = 0x8; + peep->var_0C = 0x0; + peep->var_16 = SPRITE_LOCATION_NULL; + + uint16 oldGlobal = RCT2_GLOBAL(0xF3EF60, uint16); + RCT2_GLOBAL(0xF3EF60, uint16) = peep->sprite_index; + peep->var_02 = oldGlobal; + + return peep; +} + /** * rct2: 0x00698B0D * peep.sprite_index (eax) diff --git a/src/peep.h b/src/peep.h index 3f18e5d587..306ff82551 100644 --- a/src/peep.h +++ b/src/peep.h @@ -443,6 +443,7 @@ void peep_problem_warnings_update(); void peep_update_crowd_noise(); void peep_applause(); rct_peep *peep_generate(int x, int y, int z); +rct_peep *peep_create(uint8 bl); void get_arguments_from_action(rct_peep* peep, uint32 *argument_1, uint32* argument_2); void get_arguments_from_thought(rct_peep_thought thought, uint32* argument_1, uint32* argument_2); diff --git a/src/staff.c b/src/staff.c index 1e0bc041cb..7ec082a5c1 100644 --- a/src/staff.c +++ b/src/staff.c @@ -111,14 +111,13 @@ void game_command_hire_new_staff_member(int* eax, int* ebx, int* ecx, int* edx, int newStaffId = i; - int _eax, _ebx, _ecx = _cx, _edx, _esi, _edi, _ebp; - _esi = 0; + int _eax, _ebx, _ecx = _cx, _edx, _edi, _ebp; + int _esi; _ebx = _bl; - RCT2_CALLFUNC_X(0x0069EC6B, &_eax, &_ebx, &_ecx, &_edx, &_esi, &_edi, &_ebp); - rct_peep* newPeep = (rct_peep*)_esi; - //if ((newPeep = create_peep_sprite(_bl)) == NULL) - if (_esi == 0) + rct_peep* newPeep = peep_create(_bl); + + if (newPeep == 0) { *ebx = 0x80000000; RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TEXT, uint16) = STR_TOO_MANY_PEOPLE_IN_GAME; From 657621db20a139d8f75d8a3394efcb964f2a01c8 Mon Sep 17 00:00:00 2001 From: adrian17 Date: Thu, 4 Sep 2014 21:09:54 +0200 Subject: [PATCH 2/4] Decompile window_rotate_camera, change sub_689174 to use z parameter --- src/map.c | 4 +++- src/viewport.c | 10 ++++++---- src/viewport.h | 3 +++ src/window.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 57 insertions(+), 6 deletions(-) diff --git a/src/map.c b/src/map.c index ac086487e4..f654935c4a 100644 --- a/src/map.c +++ b/src/map.c @@ -138,7 +138,9 @@ void map_update_tile_pointers() /** * Return the absolute height of an element, given its (x,y) coordinates - * + * ax: x + * cx: y + * dx: return * rct2: 0x00662783 */ int map_element_height(int x, int y) diff --git a/src/viewport.c b/src/viewport.c index e47bc4f653..4266f27c8e 100644 --- a/src/viewport.c +++ b/src/viewport.c @@ -221,8 +221,8 @@ void viewport_update_pointers() *vp = NULL; } -void sub_689174(sint16* x, sint16* y, uint8 curr_rotation){ - //RCT2_CALLFUNC_X(0x00689174, (int*)&x, (int*)&y, &ecx, &curr_rotation, (int*)&window, (int*)&viewport, &ebp); +void sub_689174(sint16* x, sint16* y, sint16 *z, uint8 curr_rotation){ + //RCT2_CALLFUNC_X(0x00689174, (int*)&x, (int*)&y, (int*)&z, &curr_rotation, (int*)&window, (int*)&viewport, &ebp); sint16 start_x = *x; sint16 start_y = *y; @@ -262,6 +262,7 @@ void sub_689174(sint16* x, sint16* y, uint8 curr_rotation){ } break; } + *z = height; } /** @@ -296,11 +297,12 @@ void viewport_update_position(rct_window *window) sint16 x = viewport->view_width / 2 + window->saved_view_x; sint16 y = viewport->view_height / 2 + window->saved_view_y; + sint16 z; int curr_rotation = RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_ROTATION, uint32); - sub_689174(&x, &y, curr_rotation); + sub_689174(&x, &y, &z, curr_rotation); - RCT2_CALLPROC_X(0x006E7A15, x, y, 0, 0, (int)window, (int)viewport, 0); + RCT2_CALLPROC_X(0x006E7A15, x, y, z, 0, (int)window, (int)viewport, 0); //Clamp to the map minimum value int at_map_edge = 0; diff --git a/src/viewport.h b/src/viewport.h index 9b709f8d03..dfbcfb8c5c 100644 --- a/src/viewport.h +++ b/src/viewport.h @@ -47,11 +47,14 @@ enum { extern rct_viewport* g_viewport_list; void viewport_init_all(); +void center_2d_coordinates(int x, int y, int z, int* out_x, int* out_y, rct_viewport* viewport); void viewport_create(rct_window *w, int x, int y, int width, int height, int zoom, int center_x, int center_y, int center_z, char flags, sint16 sprite); void viewport_update_pointers(); void viewport_update_position(rct_window *window); void viewport_render(rct_drawpixelinfo *dpi, rct_viewport *viewport, int left, int top, int right, int bottom); +void sub_689174(sint16* x, sint16* y, sint16 *z, uint8 curr_rotation); + void screen_pos_to_map_pos(short *x, short *y); void show_gridlines(); diff --git a/src/window.c b/src/window.c index 4351d90d1a..af22ebfc4a 100644 --- a/src/window.c +++ b/src/window.c @@ -21,7 +21,9 @@ #include #include "addresses.h" #include "audio.h" +#include "game.h" #include "gfx.h" +#include "map.h" #include "osinterface.h" #include "rct2.h" #include "widget.h" @@ -963,7 +965,49 @@ void window_scroll_to_location(rct_window *w, int x, int y, int z) */ void window_rotate_camera(rct_window *w) { - RCT2_CALLPROC_X(0x0068881A, 0, 0, 0, 0, (int)w, 0, 0); + //RCT2_CALLPROC_X(0x0068881A, 0, 0, 0, 0, (int)w, 0, 0); + + rct_viewport *viewport = w->viewport; + if (viewport == NULL) + return; + + sint16 x = (viewport->width >> 1) + viewport->x; + sint16 y = (viewport->height >> 1) + viewport->y; + sint16 z; + + uint8 rot = RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_ROTATION, uint8); + + int ecx, edx, esi, edi = (int)viewport, ebp; + //has something to do with checking if middle of the viewport is obstructed + RCT2_CALLFUNC_X(0x00688972, (int*)&x, (int*)&y, &ecx, &edx, &esi, &edi, &ebp); + rct_viewport *other = (rct_viewport*)edi; + + // other != viewport probably triggers on viewports in ride or guest window? + // x is 0x8000 if middle of viewport is obstructed by another window? + if (x == (sint16)SPRITE_LOCATION_NULL || other != viewport){ + x = (viewport->view_width >> 1) + viewport->view_x; + y = (viewport->view_height >> 1) + viewport->view_y; + + sub_689174(&x, &y, &z, rot); + } else { + z = map_element_height(x, y); + } + + RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_ROTATION, uint32) = (rot + 1) % 4; + + int new_x, new_y; + center_2d_coordinates(x, y, z, &new_x, &new_y, viewport); + + w->saved_view_x = new_x; + w->saved_view_y = new_y; + viewport->view_x = new_x; + viewport->view_y = new_y; + + window_invalidate(w); + + RCT2_CALLPROC_EBPSAFE(0x00688956); + + sub_0x0069E9A7(); } /** From 7359134fc549518bdc80cc6f532ececcf7be616e Mon Sep 17 00:00:00 2001 From: adrian17 Date: Thu, 4 Sep 2014 21:10:49 +0200 Subject: [PATCH 3/4] Fix off-by-one error in center_2d_coordinates --- src/viewport.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/viewport.c b/src/viewport.c index 4266f27c8e..d39bf92a8d 100644 --- a/src/viewport.c +++ b/src/viewport.c @@ -113,19 +113,19 @@ void center_2d_coordinates(int x, int y, int z, int* out_x, int* out_y, rct_view switch (RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_ROTATION, uint32)){ case 0: x = y - x; - y = y / 2 + start_x / 2 - z; + y = (y + start_x) / 2 - z; break; case 1: x = -y - x; - y = y / 2 - start_x / 2 - z; + y = (y - start_x) / 2 - z; break; case 2: x = -y + x; - y = -y / 2 - start_x / 2 - z; + y = (-y - start_x) / 2 - z; break; case 3: x = y + x; - y = -y / 2 + start_x / 2 - z; + y = (-y + start_x) / 2 - z; break; } From c9f081e5d2bfd41bf471e1ed03bf9f8dd86cc48d Mon Sep 17 00:00:00 2001 From: Tom van der Kleij Date: Thu, 4 Sep 2014 23:21:17 +0200 Subject: [PATCH 4/4] Renamed peep_create --> create_sprite + minor changes from feedback --- src/peep.c | 47 ----------------------------------------------- src/peep.h | 1 - src/sprite.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/sprite.h | 8 ++++++-- src/staff.c | 5 ++--- 5 files changed, 52 insertions(+), 53 deletions(-) diff --git a/src/peep.c b/src/peep.c index 56fa5dd5e9..ea85a117e4 100644 --- a/src/peep.c +++ b/src/peep.c @@ -410,53 +410,6 @@ rct_peep *peep_generate(int x, int y, int z) return (rct_peep*)esi; } -/* -* rct2: 69EC6B -* bl: unclear what this does -*/ -rct_peep *peep_create(uint8 bl) -{ - rct_peep *peep = NULL; - - int ecx = 0xA; - - if ((bl & 2 != 0)) - { - // 69EC96; - uint16 cx = 0x12C - RCT2_GLOBAL(0x13573CE, uint16); - if (cx >= RCT2_GLOBAL(0x13573C8, uint16)) - { - return NULL; - } - - ecx = 6; - } - else if (RCT2_GLOBAL(0x13573C8, uint16) <= 0) - { - return NULL; - } - - peep = &g_sprite_list[RCT2_GLOBAL(RCT2_ADDRESS_SPRITES_NEXT_INDEX, uint16)]; - - RCT2_CALLPROC_X(0x0069ED0B, 0, 0, ecx, 0, (int)peep, 0, 0); - - peep->x = SPRITE_LOCATION_NULL; - peep->y = SPRITE_LOCATION_NULL; - peep->z = 0; - peep->name_string_idx = 0; - peep->var_14 = 0x10; - peep->var_09 = 0x14; - peep->var_15 = 0x8; - peep->var_0C = 0x0; - peep->var_16 = SPRITE_LOCATION_NULL; - - uint16 oldGlobal = RCT2_GLOBAL(0xF3EF60, uint16); - RCT2_GLOBAL(0xF3EF60, uint16) = peep->sprite_index; - peep->var_02 = oldGlobal; - - return peep; -} - /** * rct2: 0x00698B0D * peep.sprite_index (eax) diff --git a/src/peep.h b/src/peep.h index 306ff82551..3f18e5d587 100644 --- a/src/peep.h +++ b/src/peep.h @@ -443,7 +443,6 @@ void peep_problem_warnings_update(); void peep_update_crowd_noise(); void peep_applause(); rct_peep *peep_generate(int x, int y, int z); -rct_peep *peep_create(uint8 bl); void get_arguments_from_action(rct_peep* peep, uint32 *argument_1, uint32* argument_2); void get_arguments_from_thought(rct_peep_thought thought, uint32* argument_1, uint32* argument_2); diff --git a/src/sprite.c b/src/sprite.c index c2c80cb5dd..96dbdc4596 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -104,4 +104,48 @@ void reset_0x69EBE4(){ spr->unknown.var_02 = ax; } } +} + +/* +* rct2: 0x0069EC6B +* bl: unclear what this does +*/ +rct_sprite *create_sprite(uint8 bl) +{ + int ecx = 0xA; + + if ((bl & 2 != 0)) + { + // 69EC96; + uint16 cx = 0x12C - RCT2_GLOBAL(0x13573CE, uint16); + if (cx >= RCT2_GLOBAL(0x13573C8, uint16)) + { + return NULL; + } + + ecx = 6; + } + else if (RCT2_GLOBAL(0x13573C8, uint16) <= 0) + { + return NULL; + } + + rct_unk_sprite *sprite = &g_sprite_list[RCT2_GLOBAL(RCT2_ADDRESS_SPRITES_NEXT_INDEX, uint16)]; + + RCT2_CALLPROC_X(0x0069ED0B, 0, 0, ecx, 0, (int)sprite, 0, 0); + + sprite->x = SPRITE_LOCATION_NULL; + sprite->y = SPRITE_LOCATION_NULL; + sprite->z = 0; + sprite->name_string_idx = 0; + sprite->var_14 = 0x10; + sprite->pad_09 = 0x14; + sprite->var_15 = 0x8; + sprite->pad_0C[0] = 0x0; + sprite->var_16 = SPRITE_LOCATION_NULL; + + sprite->var_02 = RCT2_GLOBAL(0xF3EF60, uint16); + RCT2_GLOBAL(0xF3EF60, uint16) = sprite->sprite_index; + + return sprite; } \ No newline at end of file diff --git a/src/sprite.h b/src/sprite.h index 701d448cbc..81f6955956 100644 --- a/src/sprite.h +++ b/src/sprite.h @@ -49,12 +49,15 @@ typedef struct { sint16 x; // 0x0E sint16 y; // 0x10 sint16 z; // 0x12 - uint16 pad_14; + uint8 var_14; // 0x14 + uint8 var_15; // 0x15 sint16 var_16; //x related sint16 var_18; //y related sint16 var_1A; //x related sint16 var_1C; //y related - uint8 sprite_direction; //direction of sprite? + uint8 sprite_direction; //direction of sprite? 0x1e + uint8 pad_1F[3]; // 0x1f + uint16 name_string_idx; // 0x22 } rct_unk_sprite; typedef struct { @@ -86,6 +89,7 @@ typedef union { extern rct_sprite* g_sprite_list; void create_balloon(int x, int y, int z, int colour); +rct_sprite *create_sprite(uint8 bl); void reset_sprite_list(); void reset_0x69EBE4(); diff --git a/src/staff.c b/src/staff.c index 7ec082a5c1..4fe6e6eb68 100644 --- a/src/staff.c +++ b/src/staff.c @@ -112,12 +112,11 @@ void game_command_hire_new_staff_member(int* eax, int* ebx, int* ecx, int* edx, int newStaffId = i; int _eax, _ebx, _ecx = _cx, _edx, _edi, _ebp; - int _esi; _ebx = _bl; - rct_peep* newPeep = peep_create(_bl); + rct_peep* newPeep = create_sprite(_bl); - if (newPeep == 0) + if (newPeep == NULL) { *ebx = 0x80000000; RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TEXT, uint16) = STR_TOO_MANY_PEOPLE_IN_GAME;