mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenRCT2/src/openrct2-ui/windows/Guest.cpp

2247 lines
70 KiB
C++
Raw Normal View History

Actually add the file
2014-06-24 23:12:26 +02:00
/*****************************************************************************
Update copyright notices for 2019. (#8903)
2019-03-17 08:16:15 +01:00
* Copyright (c) 2014-2019 OpenRCT2 developers
Add and correct licence headers to all sources (#3108)
2016-05-04 19:24:41 +02:00
*
Ready copyright notice for clang-format Clang-format sees the text behind `#pragma region` as code and formats it. Instead of stating the copyright and date there, it's now in the comment block right below it. The text "Copyright" is left in the `#pragma region` line, as clang-format sees it as a single identifier. I took the opportunity to normalize the dates, and add the copyright notice to the source files where it was missing them (except for third-party and the generated resources.h file).
2018-06-15 14:07:34 +02:00
* For a complete list of all authors, please refer to contributors.md
* Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2
Add and correct licence headers to all sources (#3108)
2016-05-04 19:24:41 +02:00
*
Ready copyright notice for clang-format Clang-format sees the text behind `#pragma region` as code and formats it. Instead of stating the copyright and date there, it's now in the comment block right below it. The text "Copyright" is left in the `#pragma region` line, as clang-format sees it as a single identifier. I took the opportunity to normalize the dates, and add the copyright notice to the source files where it was missing them (except for third-party and the generated resources.h file).
2018-06-15 14:07:34 +02:00
* OpenRCT2 is licensed under the GNU General Public License version 3.
Add and correct licence headers to all sources (#3108)
2016-05-04 19:24:41 +02:00
*****************************************************************************/
Actually add the file
2014-06-24 23:12:26 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
Move staff and guest windows
2017-10-06 23:21:00 +02:00
#include <openrct2-ui/windows/Window.h>
Sort includes in Guest.cpp
2017-10-22 01:22:08 +02:00
#include <openrct2/Context.h>
Compile game.c and game.h as C++
2017-11-30 18:17:06 +01:00
#include <openrct2/Game.h>
Compile files in base dir as C++
2017-12-12 14:52:57 +01:00
#include <openrct2/Input.h>
Fix #8900: Implement GuestSetFlagsAction.
2019-03-16 22:25:56 +01:00
#include <openrct2/actions/GuestSetFlagsAction.hpp>
clang-format UI windows
2018-06-22 23:21:44 +02:00
#include <openrct2/config/Config.h>
Compile localisation folder as C++
2018-01-06 18:32:25 +01:00
#include <openrct2/localisation/Localisation.h>
Compile management as C++
2017-10-11 21:38:26 +02:00
#include <openrct2/management/Marketing.h>
Sort includes in Guest.cpp
2017-10-22 01:22:08 +02:00
#include <openrct2/network/network.h>
Use constants for energy bars in Peep window
2017-10-24 09:19:17 +02:00
#include <openrct2/peep/Peep.h>
Compile peep and staff logic as C++
2017-10-13 10:06:36 +02:00
#include <openrct2/peep/Staff.h>
Change casing of header files
2018-01-10 00:00:09 +01:00
#include <openrct2/ride/RideData.h>
Spin off shop item stuff to separate files
2018-05-14 19:21:43 +02:00
#include <openrct2/ride/ShopItem.h>
clang-format UI windows
2018-06-22 23:21:44 +02:00
#include <openrct2/scenario/Scenario.h>
Move staff and guest windows
2017-10-06 23:21:00 +02:00
#include <openrct2/sprites.h>
Compile util and cheats as C++
2017-12-13 13:02:24 +01:00
#include <openrct2/util/Util.h>
Move Ride window to UI module
2017-10-21 16:03:33 +02:00
#include <openrct2/windows/Intent.h>
Compile files in world folder as C++
2018-01-11 10:59:26 +01:00
#include <openrct2/world/Footpath.h>
Reduce includes in common header
2018-03-19 23:28:40 +01:00
#include <openrct2/world/Park.h>
Actually add the file
2014-06-24 23:12:26 +02:00
Exclude pre-formatted blocks from clang-format (#7520) [ci skip]
2018-05-16 20:41:29 +02:00
// clang-format off
organise: refactor peep / staff window names
2014-10-07 20:39:52 +02:00
enum WINDOW_GUEST_PAGE {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
WINDOW_GUEST_OVERVIEW,
WINDOW_GUEST_STATS,
WINDOW_GUEST_RIDES,
WINDOW_GUEST_FINANCE,
WINDOW_GUEST_THOUGHTS,
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
WINDOW_GUEST_INVENTORY,
WINDOW_GUEST_DEBUG
Added more to window_peep
2014-06-25 19:01:10 +02:00
};
organise: refactor peep / staff window names
2014-10-07 20:39:52 +02:00
enum WINDOW_GUEST_WIDGET_IDX {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
WIDX_BACKGROUND,
WIDX_TITLE,
WIDX_CLOSE,
WIDX_PAGE_BACKGROUND,
WIDX_TAB_1,
WIDX_TAB_2,
WIDX_TAB_3,
WIDX_TAB_4,
WIDX_TAB_5,
WIDX_TAB_6,
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
WIDX_TAB_7,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
WIDX_MARQUEE = 11,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
WIDX_VIEWPORT,
WIDX_ACTION_LBL,
WIDX_PICKUP,
WIDX_RENAME,
WIDX_LOCATE,
WIDX_TRACK,
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
WIDX_RIDE_SCROLL = 11
Added more to window_peep
2014-06-25 19:01:10 +02:00
};
Move staff and guest windows
2017-10-06 23:21:00 +02:00
validate_global_widx(WC_PEEP, WIDX_PICKUP);
Add compile-time checked constants for widget ids
2017-05-02 02:01:29 +02:00
Use constexpr instead of const For a static constant integer value, it's stylistically clearer to use constexpr instead of const. The resulting variable is implicitly const, but is also guaranteed to have a compile-time-computable value.
2019-01-05 14:09:58 +01:00
static constexpr int32_t TabWidth = 30;
Fix guest window width for debugging tab Introduce a named constant for the width of a tab in the Guest window, and touch the places that set the window width to add it to the minimum window width when the debugging tab is enabled, so that the tab doesn't render off the side of the window.
2019-01-01 20:40:11 +01:00
Make more window variables and functions static
2017-08-06 14:41:13 +02:00
static rct_widget window_guest_overview_widgets[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{WWT_FRAME, 0, 0, 191, 0, 156, 0xFFFFFFFF, STR_NONE}, // Panel / Background
{WWT_CAPTION, 0, 1, 190, 1, 14, STR_STRINGID, STR_WINDOW_TITLE_TIP}, // Title
{WWT_CLOSEBOX, 0, 179, 189, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP}, // Close x button
{WWT_RESIZE, 1, 0, 191, 43, 156, 0xFFFFFFFF, STR_NONE}, // Resize
Fix guest window width for debugging tab Introduce a named constant for the width of a tab in the Guest window, and touch the places that set the window width to add it to the minimum window width when the debugging tab is enabled, so that the tab doesn't render off the side of the window.
2019-01-01 20:40:11 +01:00
{WWT_TAB, 1, 3, TabWidth + 3, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_VIEW_TIP}, // Tab 1
{WWT_TAB, 1, 34, TabWidth + 34, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_NEEDS_TIP}, // Tab 2
{WWT_TAB, 1, 65, TabWidth + 65, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_VISITED_RIDES_TIP}, // Tab 3
{WWT_TAB, 1, 96, TabWidth + 96, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_FINANCE_TIP}, // Tab 4
{WWT_TAB, 1, 127, TabWidth + 127, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_THOUGHTS_TIP}, // Tab 5
{WWT_TAB, 1, 158, TabWidth + 158, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_ITEMS_TIP}, // Tab 6
{WWT_TAB, 1, 189, TabWidth + 189, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_DEBUG_TIP}, // Tab 7
Rename WWT_12 to WWT_LABEL_CENTRED. This is used for centred textual labels.
2018-01-03 19:19:33 +01:00
{WWT_LABEL_CENTRED, 1, 3, 166, 45, 56, 0xFFFFFFFF, STR_NONE}, // Label Thought marquee
{WWT_VIEWPORT, 1, 3, 166, 57, 143, 0xFFFFFFFF, STR_NONE}, // Viewport
{WWT_LABEL_CENTRED, 1, 3, 166, 144, 154, 0xFFFFFFFF, STR_NONE}, // Label Action
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{WWT_FLATBTN, 1, 167, 190, 45, 68, SPR_PICKUP_BTN, STR_PICKUP_TIP}, // Pickup Button
{WWT_FLATBTN, 1, 167, 190, 69, 92, SPR_RENAME, STR_NAME_GUEST_TIP}, // Rename Button
{WWT_FLATBTN, 1, 167, 190, 93, 116, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP}, // Locate Button
{WWT_FLATBTN, 1, 167, 190, 117, 140, SPR_TRACK_PEEP, STR_TOGGLE_GUEST_TRACKING_TIP}, // Track Button
{ WIDGETS_END },
Actually add the file
2014-06-24 23:12:26 +02:00
};
Make more window variables and functions static
2017-08-06 14:41:13 +02:00
static rct_widget window_guest_stats_widgets[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{WWT_FRAME, 0, 0, 191, 0, 156, STR_NONE, STR_NONE},
{WWT_CAPTION, 0, 1, 190, 1, 14, STR_STRINGID, STR_WINDOW_TITLE_TIP},
{WWT_CLOSEBOX, 0, 179, 189, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP},
{WWT_RESIZE, 1, 0, 191, 43, 156, STR_NONE, STR_NONE},
Fix guest window width for debugging tab Introduce a named constant for the width of a tab in the Guest window, and touch the places that set the window width to add it to the minimum window width when the debugging tab is enabled, so that the tab doesn't render off the side of the window.
2019-01-01 20:40:11 +01:00
{WWT_TAB, 1, 3, TabWidth + 3, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_VIEW_TIP},
{WWT_TAB, 1, 34, TabWidth + 34, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_NEEDS_TIP},
{WWT_TAB, 1, 65, TabWidth + 65, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_VISITED_RIDES_TIP},
{WWT_TAB, 1, 96, TabWidth + 96, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_FINANCE_TIP},
{WWT_TAB, 1, 127, TabWidth + 127, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_THOUGHTS_TIP},
{WWT_TAB, 1, 158, TabWidth + 158, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_ITEMS_TIP},
{WWT_TAB, 1, 189, TabWidth + 189, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_DEBUG_TIP},
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{WIDGETS_END},
Added more to window_peep overview paint Moved get_arguments_from_thought to peep.c and added to peep.h Fixed possible crash in viewport_update_position Fixed compile error
2014-08-25 20:31:53 +02:00
};
Added peep_stats_widgets
2014-08-25 17:47:01 +02:00
Make more window variables and functions static
2017-08-06 14:41:13 +02:00
static rct_widget window_guest_rides_widgets[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{WWT_FRAME, 0, 0, 191, 0, 156, STR_NONE, STR_NONE},
{WWT_CAPTION, 0, 1, 190, 1, 14, STR_STRINGID, STR_WINDOW_TITLE_TIP},
{WWT_CLOSEBOX, 0, 179, 189, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP},
{WWT_RESIZE, 1, 0, 191, 43, 156, STR_NONE, STR_NONE},
Fix guest window width for debugging tab Introduce a named constant for the width of a tab in the Guest window, and touch the places that set the window width to add it to the minimum window width when the debugging tab is enabled, so that the tab doesn't render off the side of the window.
2019-01-01 20:40:11 +01:00
{WWT_TAB, 1, 3, TabWidth + 3, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_VIEW_TIP},
{WWT_TAB, 1, 34, TabWidth + 34, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_NEEDS_TIP},
{WWT_TAB, 1, 65, TabWidth + 65, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_VISITED_RIDES_TIP},
{WWT_TAB, 1, 96, TabWidth + 96, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_FINANCE_TIP},
{WWT_TAB, 1, 127, TabWidth + 127, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_THOUGHTS_TIP},
{WWT_TAB, 1, 158, TabWidth + 158, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_ITEMS_TIP},
{WWT_TAB, 1, 189, TabWidth + 189, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_DEBUG_TIP},
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{WWT_SCROLL, 1, 3, 188, 57, 143, SCROLL_VERTICAL, STR_NONE},
{WIDGETS_END},
Added remaining window_peep widgets.
2014-08-26 13:30:06 +02:00
};
Make more window variables and functions static
2017-08-06 14:41:13 +02:00
static rct_widget window_guest_finance_widgets[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{WWT_FRAME, 0, 0, 191, 0, 156, STR_NONE, STR_NONE},
{WWT_CAPTION, 0, 1, 190, 1, 14, STR_STRINGID, STR_WINDOW_TITLE_TIP},
{WWT_CLOSEBOX, 0, 179, 189, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP},
{WWT_RESIZE, 1, 0, 191, 43, 156, STR_NONE, STR_NONE},
Fix guest window width for debugging tab Introduce a named constant for the width of a tab in the Guest window, and touch the places that set the window width to add it to the minimum window width when the debugging tab is enabled, so that the tab doesn't render off the side of the window.
2019-01-01 20:40:11 +01:00
{WWT_TAB, 1, 3, TabWidth + 3, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_VIEW_TIP},
{WWT_TAB, 1, 34, TabWidth + 34, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_NEEDS_TIP},
{WWT_TAB, 1, 65, TabWidth + 65, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_VISITED_RIDES_TIP},
{WWT_TAB, 1, 96, TabWidth + 96, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_FINANCE_TIP},
{WWT_TAB, 1, 127, TabWidth + 127, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_THOUGHTS_TIP},
{WWT_TAB, 1, 158, TabWidth + 158, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_ITEMS_TIP},
{WWT_TAB, 1, 189, TabWidth + 189, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_DEBUG_TIP},
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{WIDGETS_END},
Added remaining window_peep widgets.
2014-08-26 13:30:06 +02:00
};
Make more window variables and functions static
2017-08-06 14:41:13 +02:00
static rct_widget window_guest_thoughts_widgets[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{WWT_FRAME, 0, 0, 191, 0, 156, STR_NONE, STR_NONE},
{WWT_CAPTION, 0, 1, 190, 1, 14, STR_STRINGID, STR_WINDOW_TITLE_TIP},
{WWT_CLOSEBOX, 0, 179, 189, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP},
{WWT_RESIZE, 1, 0, 191, 43, 156, STR_NONE, STR_NONE},
Fix guest window width for debugging tab Introduce a named constant for the width of a tab in the Guest window, and touch the places that set the window width to add it to the minimum window width when the debugging tab is enabled, so that the tab doesn't render off the side of the window.
2019-01-01 20:40:11 +01:00
{WWT_TAB, 1, 3, TabWidth + 3, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_VIEW_TIP},
{WWT_TAB, 1, 34, TabWidth + 34, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_NEEDS_TIP},
{WWT_TAB, 1, 65, TabWidth + 65, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_VISITED_RIDES_TIP},
{WWT_TAB, 1, 96, TabWidth + 96, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_FINANCE_TIP},
{WWT_TAB, 1, 127, TabWidth + 127, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_THOUGHTS_TIP},
{WWT_TAB, 1, 158, TabWidth + 158, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_ITEMS_TIP},
{WWT_TAB, 1, 189, TabWidth + 189, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_DEBUG_TIP},
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{WIDGETS_END},
Added remaining window_peep widgets.
2014-08-26 13:30:06 +02:00
};
Make more window variables and functions static
2017-08-06 14:41:13 +02:00
static rct_widget window_guest_inventory_widgets[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{WWT_FRAME, 0, 0, 191, 0, 156, STR_NONE, STR_NONE},
{WWT_CAPTION, 0, 1, 190, 1, 14, STR_STRINGID, STR_WINDOW_TITLE_TIP},
{WWT_CLOSEBOX, 0, 179, 189, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP},
{WWT_RESIZE, 1, 0, 191, 43, 156, STR_NONE, STR_NONE},
Fix guest window width for debugging tab Introduce a named constant for the width of a tab in the Guest window, and touch the places that set the window width to add it to the minimum window width when the debugging tab is enabled, so that the tab doesn't render off the side of the window.
2019-01-01 20:40:11 +01:00
{WWT_TAB, 1, 3, TabWidth + 3, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_VIEW_TIP},
{WWT_TAB, 1, 34, TabWidth + 34, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_NEEDS_TIP},
{WWT_TAB, 1, 65, TabWidth + 65, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_VISITED_RIDES_TIP},
{WWT_TAB, 1, 96, TabWidth + 96, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_FINANCE_TIP},
{WWT_TAB, 1, 127, TabWidth + 127, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_THOUGHTS_TIP},
{WWT_TAB, 1, 158, TabWidth + 158, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_ITEMS_TIP},
{WWT_TAB, 1, 189, TabWidth + 189, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_DEBUG_TIP},
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
{WIDGETS_END},
};
static rct_widget window_guest_debug_widgets[] = {
{WWT_FRAME, 0, 0, 191, 0, 156, STR_NONE, STR_NONE},
{WWT_CAPTION, 0, 1, 190, 1, 14, STR_STRINGID, STR_WINDOW_TITLE_TIP},
{WWT_CLOSEBOX, 0, 179, 189, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP},
{WWT_RESIZE, 1, 0, 191, 43, 156, STR_NONE, STR_NONE},
Fix guest window width for debugging tab Introduce a named constant for the width of a tab in the Guest window, and touch the places that set the window width to add it to the minimum window width when the debugging tab is enabled, so that the tab doesn't render off the side of the window.
2019-01-01 20:40:11 +01:00
{WWT_TAB, 1, 3, TabWidth + 3, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_VIEW_TIP},
{WWT_TAB, 1, 34, TabWidth + 34, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_NEEDS_TIP},
{WWT_TAB, 1, 65, TabWidth + 65, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_VISITED_RIDES_TIP},
{WWT_TAB, 1, 96, TabWidth + 96, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_FINANCE_TIP},
{WWT_TAB, 1, 127, TabWidth + 127, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_THOUGHTS_TIP},
{WWT_TAB, 1, 158, TabWidth + 158, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_ITEMS_TIP},
{WWT_TAB, 1, 189, TabWidth + 189, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_DEBUG_TIP},
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{WIDGETS_END},
Added remaining window_peep widgets.
2014-08-26 13:30:06 +02:00
};
More readability, grammar, spelling fixes
2017-05-15 09:28:43 +02:00
// 0x981D0C
Make more window variables and functions static
2017-08-06 14:41:13 +02:00
static rct_widget *window_guest_page_widgets[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_overview_widgets,
window_guest_stats_widgets,
window_guest_rides_widgets,
window_guest_finance_widgets,
window_guest_thoughts_widgets,
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
window_guest_inventory_widgets,
window_guest_debug_widgets
Added more to window_peep
2014-06-25 19:01:10 +02:00
};
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void window_guest_set_page(rct_window* w, int32_t page);
Make more window variables and functions static
2017-08-06 14:41:13 +02:00
static void window_guest_disable_widgets(rct_window* w);
static void window_guest_viewport_init(rct_window* w);
static void window_guest_overview_close(rct_window *w);
static void window_guest_overview_resize(rct_window *w);
static void window_guest_overview_mouse_up(rct_window *w, rct_widgetindex widgetIndex);
static void window_guest_overview_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_guest_overview_invalidate(rct_window *w);
static void window_guest_overview_viewport_rotate(rct_window *w);
static void window_guest_overview_update(rct_window* w);
static void window_guest_overview_text_input(rct_window *w, rct_widgetindex widgetIndex, char *text);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void window_guest_overview_tool_update(rct_window* w, rct_widgetindex widgetIndex, int32_t x, int32_t y);
static void window_guest_overview_tool_down(rct_window* w, rct_widgetindex widgetIndex, int32_t x, int32_t y);
Make more window variables and functions static
2017-08-06 14:41:13 +02:00
static void window_guest_overview_tool_abort(rct_window *w, rct_widgetindex widgetIndex);
static void window_guest_mouse_up(rct_window *w, rct_widgetindex widgetIndex);
static void window_guest_unknown_05(rct_window *w);
static void window_guest_stats_resize(rct_window *w);
static void window_guest_stats_update(rct_window *w);
static void window_guest_stats_invalidate(rct_window *w);
static void window_guest_stats_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_guest_rides_resize(rct_window *w);
static void window_guest_rides_update(rct_window *w);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void window_guest_rides_scroll_get_size(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void window_guest_rides_scroll_mouse_down(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
static void window_guest_rides_scroll_mouse_over(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
Make more window variables and functions static
2017-08-06 14:41:13 +02:00
static void window_guest_rides_invalidate(rct_window *w);
static void window_guest_rides_paint(rct_window *w, rct_drawpixelinfo *dpi);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static void window_guest_rides_scroll_paint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
Make more window variables and functions static
2017-08-06 14:41:13 +02:00
static void window_guest_finance_resize(rct_window *w);
static void window_guest_finance_update(rct_window *w);
static void window_guest_finance_invalidate(rct_window *w);
static void window_guest_finance_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_guest_thoughts_resize(rct_window *w);
static void window_guest_thoughts_update(rct_window *w);
static void window_guest_thoughts_invalidate(rct_window *w);
static void window_guest_thoughts_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_guest_inventory_resize(rct_window *w);
static void window_guest_inventory_update(rct_window *w);
static void window_guest_inventory_invalidate(rct_window *w);
static void window_guest_inventory_paint(rct_window *w, rct_drawpixelinfo *dpi);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
static void window_guest_debug_resize(rct_window *w);
static void window_guest_debug_invalidate(rct_window *w);
static void window_guest_debug_paint(rct_window *w, rct_drawpixelinfo* dpi);
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static rct_window_event_list window_guest_overview_events = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_overview_close,
window_guest_overview_mouse_up,
window_guest_overview_resize,
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr,
nullptr,
nullptr,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_overview_update,
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr,
nullptr,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_overview_tool_update,
window_guest_overview_tool_down,
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr,
nullptr,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_overview_tool_abort,
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_overview_text_input,
rename event unknown_14 to viewport_rotate
2017-06-26 09:56:41 +02:00
window_guest_overview_viewport_rotate,
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr,
nullptr,
nullptr,
nullptr,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_overview_invalidate,
window_guest_overview_paint,
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr
Actually add the file
2014-06-24 23:12:26 +02:00
};
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static rct_window_event_list window_guest_stats_events = {
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_mouse_up,
window_guest_stats_resize,
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr,
nullptr,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_unknown_05,
window_guest_stats_update,
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_stats_invalidate,
window_guest_stats_paint,
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr
Added window_peep_event arrays.
2014-08-25 13:58:59 +02:00
};
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static rct_window_event_list window_guest_rides_events = {
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_mouse_up,
window_guest_rides_resize,
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr,
nullptr,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_unknown_05,
window_guest_rides_update,
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_rides_scroll_get_size,
window_guest_rides_scroll_mouse_down,
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_rides_scroll_mouse_over,
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr,
nullptr,
nullptr,
Remove more strings, fix error
2018-08-04 16:24:24 +02:00
nullptr,
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr,
nullptr,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_rides_invalidate,
window_guest_rides_paint,
window_guest_rides_scroll_paint
Added window_peep_event arrays.
2014-08-25 13:58:59 +02:00
};
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static rct_window_event_list window_guest_finance_events = {
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_mouse_up,
window_guest_finance_resize,
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr,
nullptr,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_unknown_05,
window_guest_finance_update,
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_finance_invalidate,
window_guest_finance_paint,
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr
Added window_peep_event arrays.
2014-08-25 13:58:59 +02:00
};
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static rct_window_event_list window_guest_thoughts_events = {
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_mouse_up,
window_guest_thoughts_resize,
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr,
nullptr,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_unknown_05,
window_guest_thoughts_update,
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_thoughts_invalidate,
window_guest_thoughts_paint,
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr
Added window_peep_event arrays.
2014-08-25 13:58:59 +02:00
};
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static rct_window_event_list window_guest_inventory_events = {
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_mouse_up,
window_guest_inventory_resize,
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr,
nullptr,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_unknown_05,
window_guest_inventory_update,
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_inventory_invalidate,
window_guest_inventory_paint,
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
nullptr
Added window_peep_event arrays.
2014-08-25 13:58:59 +02:00
};
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
static rct_window_event_list window_guest_debug_events = {
nullptr, // void (*close)(struct rct_window*);
window_guest_mouse_up, // void (*mouse_up)(struct rct_window*, rct_widgetindex);
window_guest_debug_resize, // void (*resize)(struct rct_window*);
nullptr, // void (*mouse_down)(struct rct_window*, rct_widgetindex, rct_widget*);
nullptr, // void (*dropdown)(struct rct_window*, rct_widgetindex, int32_t);
window_guest_unknown_05, // void (*unknown_05)(struct rct_window*);
nullptr, // void (*update)(struct rct_window*);
nullptr, // void (*unknown_07)(struct rct_window*);
nullptr, // void (*unknown_08)(struct rct_window*);
nullptr, // void (*tool_update)(struct rct_window*, rct_widgetindex, int32_t, int32_t);
nullptr, // void (*tool_down)(struct rct_window*, rct_widgetindex, int32_t, int32_t);
nullptr, // void (*tool_drag)(struct rct_window*, rct_widgetindex, int32_t, int32_t);
nullptr, // void (*tool_up)(struct rct_window*, rct_widgetindex, int32_t, int32_t);
nullptr, // void (*tool_abort)(struct rct_window*, rct_widgetindex);
nullptr, // void (*unknown_0E)(struct rct_window*);
nullptr, // void (*get_scroll_size)(struct rct_window*, int32_t, int32_t*, int32_t*);
nullptr, // void (*scroll_mousedown)(struct rct_window*, int32_t, int32_t, int32_t);
nullptr, // void (*scroll_mousedrag)(struct rct_window*, int32_t, int32_t, int32_t);
nullptr, // void (*scroll_mouseover)(struct rct_window*, int32_t, int32_t, int32_t);
nullptr, // void (*text_input)(struct rct_window*, rct_widgetindex, char*);
nullptr, // void (*viewport_rotate)(struct rct_window*);
nullptr, // void (*unknown_15)(struct rct_window*, int32_t, int32_t);
nullptr, // void (*tooltip)(struct rct_window*, rct_widgetindex, rct_string_id*);
nullptr, // void (*cursor)(struct rct_window*, rct_widgetindex, int32_t, int32_t, int32_t*);
nullptr, // void (*moved)(struct rct_window*, int32_t, int32_t);
window_guest_debug_invalidate, // void (*invalidate)(struct rct_window*);
window_guest_debug_paint, // void (*paint)(struct rct_window*, rct_drawpixelinfo*);
nullptr // void (*scroll_paint)(struct rct_window*, rct_drawpixelinfo*, int32_t);
};
More readability, grammar, spelling fixes
2017-05-15 09:28:43 +02:00
// 0x981D24
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
static rct_window_event_list *window_guest_page_events[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
&window_guest_overview_events,
&window_guest_stats_events,
&window_guest_rides_events,
&window_guest_finance_events,
&window_guest_thoughts_events,
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
&window_guest_inventory_events,
&window_guest_debug_events
Added more to window_peep
2014-06-25 19:01:10 +02:00
};
Add GUI option for switching to the RCT1 colour scheme, along with proper invalidation of the affected windows
2015-05-21 12:28:51 +02:00
void window_guest_set_colours();
More readability, grammar, spelling fixes
2017-05-15 09:28:43 +02:00
// 0x981D3C
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
static constexpr const uint32_t window_guest_page_enabled_widgets[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
(1 << WIDX_CLOSE) |
(1 << WIDX_TAB_1) |
(1 << WIDX_TAB_2) |
(1 << WIDX_TAB_3) |
(1 << WIDX_TAB_4) |
(1 << WIDX_TAB_5) |
(1 << WIDX_TAB_6) |
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
(1 << WIDX_TAB_7) |
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
(1 << WIDX_RENAME)|
(1 << WIDX_PICKUP)|
(1 << WIDX_LOCATE)|
(1 << WIDX_TRACK),
(1 << WIDX_CLOSE) |
(1 << WIDX_TAB_1) |
(1 << WIDX_TAB_2) |
(1 << WIDX_TAB_3) |
(1 << WIDX_TAB_4) |
(1 << WIDX_TAB_5) |
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
(1 << WIDX_TAB_6) |
(1 << WIDX_TAB_7),
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
(1 << WIDX_CLOSE) |
(1 << WIDX_TAB_1) |
(1 << WIDX_TAB_2) |
(1 << WIDX_TAB_3) |
(1 << WIDX_TAB_4) |
(1 << WIDX_TAB_5) |
(1 << WIDX_TAB_6) |
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
(1 << WIDX_TAB_7) |
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
(1 << WIDX_RIDE_SCROLL),
(1 << WIDX_CLOSE) |
(1 << WIDX_TAB_1) |
(1 << WIDX_TAB_2) |
(1 << WIDX_TAB_3) |
(1 << WIDX_TAB_4) |
(1 << WIDX_TAB_5) |
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
(1 << WIDX_TAB_6) |
(1 << WIDX_TAB_7),
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
(1 << WIDX_CLOSE) |
(1 << WIDX_TAB_1) |
(1 << WIDX_TAB_2) |
(1 << WIDX_TAB_3) |
(1 << WIDX_TAB_4) |
(1 << WIDX_TAB_5) |
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
(1 << WIDX_TAB_6) |
(1 << WIDX_TAB_7),
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
(1 << WIDX_CLOSE) |
(1 << WIDX_TAB_1) |
(1 << WIDX_TAB_2) |
(1 << WIDX_TAB_3) |
(1 << WIDX_TAB_4) |
(1 << WIDX_TAB_5) |
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
(1 << WIDX_TAB_6) |
(1 << WIDX_TAB_7),
(1 << WIDX_CLOSE) |
(1 << WIDX_TAB_1) |
(1 << WIDX_TAB_2) |
(1 << WIDX_TAB_3) |
(1 << WIDX_TAB_4) |
(1 << WIDX_TAB_5) |
(1 << WIDX_TAB_6) |
(1 << WIDX_TAB_7)
Added more to window_peep
2014-06-25 19:01:10 +02:00
};
Exclude pre-formatted blocks from clang-format (#7520) [ci skip]
2018-05-16 20:41:29 +02:00
// clang-format on
Added more to window_peep
2014-06-25 19:01:10 +02:00
Actually add the file
2014-06-24 23:12:26 +02:00
/**
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
*
* rct2: 0x006989E9
Actually add the file
2014-06-24 23:12:26 +02:00
*
*/
Refactor peep struct
2019-02-28 20:28:58 +01:00
rct_window* window_guest_open(Peep* peep)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
if (peep->type == PEEP_TYPE_STAFF)
{
Move staff and guest windows
2017-10-06 23:21:00 +02:00
return window_staff_open(peep);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
rct_window* window;
window = window_bring_to_front_by_number(WC_PEEP, peep->sprite_index);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (window == nullptr)
{
Pull window width into temporary variable As suggested in review, it's a little easier to read this way.
2019-01-05 14:14:57 +01:00
int32_t windowWidth = 192;
if (gConfigGeneral.debugging_tools)
windowWidth += TabWidth;
window = window_create_auto_pos(windowWidth, 157, &window_guest_overview_events, WC_PEEP, WF_RESIZABLE);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window->widgets = window_guest_overview_widgets;
window->enabled_widgets = window_guest_page_enabled_widgets[0];
window->number = peep->sprite_index;
window->page = 0;
window->viewport_focus_coordinates.y = 0;
window->frame_no = 0;
window->list_information_type = 0;
window->picked_peep_frame = 0;
window->highlighted_item = 0;
window_guest_disable_widgets(window);
Pull window width into temporary variable As suggested in review, it's a little easier to read this way.
2019-01-05 14:14:57 +01:00
window->min_width = windowWidth;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window->min_height = 157;
window->max_width = 500;
window->max_height = 450;
window->no_list_items = 0;
window->selected_list_item = -1;
window->viewport_focus_coordinates.y = -1;
}
window->page = 0;
window_invalidate(window);
window->widgets = window_guest_page_widgets[WINDOW_GUEST_OVERVIEW];
window->enabled_widgets = window_guest_page_enabled_widgets[WINDOW_GUEST_OVERVIEW];
window->hold_down_widgets = 0;
window->event_handlers = window_guest_page_events[WINDOW_GUEST_OVERVIEW];
window->pressed_widgets = 0;
window_guest_disable_widgets(window);
window_init_scroll_widgets(window);
window_guest_viewport_init(window);
Move staff and guest windows
2017-10-06 23:21:00 +02:00
return window;
Input first two fields to widget array Consider splitting up into separate pages once the widgets are properly decompiled. See park_window.
2014-06-25 13:53:05 +02:00
}
Added window_peep_close Not tested. Cancels any tool that was in use by the window.
2014-08-20 13:36:29 +02:00
Refactor invalidate methods
2019-05-04 16:40:45 +02:00
static void window_guest_common_invalidate(rct_window* w)
{
if (window_guest_page_widgets[w->page] != w->widgets)
{
w->widgets = window_guest_page_widgets[w->page];
window_init_scroll_widgets(w);
}
w->pressed_widgets |= 1ULL << (w->page + WIDX_TAB_1);
auto peep = GET_PEEP(w->number);
set_format_arg(0, rct_string_id, peep->name_string_idx);
set_format_arg(2, uint32_t, peep->id);
w->widgets[WIDX_BACKGROUND].right = w->width - 1;
w->widgets[WIDX_BACKGROUND].bottom = w->height - 1;
w->widgets[WIDX_PAGE_BACKGROUND].right = w->width - 1;
w->widgets[WIDX_PAGE_BACKGROUND].bottom = w->height - 1;
w->widgets[WIDX_TITLE].right = w->width - 2;
w->widgets[WIDX_CLOSE].left = w->width - 13;
w->widgets[WIDX_CLOSE].right = w->width - 3;
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_7);
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
Added window_peep_viewport_init
2014-08-23 11:39:15 +02:00
* Disables the finance tab when no money.
* Disables peep pickup when in certain no pickup states.
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x006987A6
Added window_peep_viewport_init
2014-08-23 11:39:15 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_disable_widgets(rct_window* w)
{
Refactor peep struct
2019-02-28 20:28:58 +01:00
Peep* peep = &get_sprite(w->number)->peep;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint64_t disabled_widgets = 0;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (peep_can_be_picked_up(peep))
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (w->disabled_widgets & (1 << WIDX_PICKUP))
window_invalidate(w);
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
else
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
disabled_widgets = (1 << WIDX_PICKUP);
if (!(w->disabled_widgets & (1 << WIDX_PICKUP)))
window_invalidate(w);
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gParkFlags & PARK_FLAGS_NO_MONEY)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
disabled_widgets |= (1 << WIDX_TAB_4); // Disable finance tab if no money
}
Disable guest debug tab when debug tools not turned on Disable the debug tab in the guest window when the debugging tools are not turned on, causing it to be completely hidden from view.
2019-01-01 20:18:07 +01:00
if (!gConfigGeneral.debugging_tools)
{
disabled_widgets |= (1 << WIDX_TAB_7); // Disable debug tab when debug tools not turned on
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->disabled_widgets = disabled_widgets;
Added window_peep_viewport_init
2014-08-23 11:39:15 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x00696A75
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_overview_close(rct_window* w)
Fix memory leak in screenshot.c and guest.c
2015-09-22 19:02:39 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (input_test_flag(INPUT_FLAG_TOOL_ACTIVE))
{
if (w->classification == gCurrentToolWidget.window_classification && w->number == gCurrentToolWidget.window_number)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
tool_cancel();
}
Added window_peep_close Not tested. Cancels any tool that was in use by the window.
2014-08-20 13:36:29 +02:00
}
Started addition of window_peep_resize Not tested.
2014-08-20 13:52:27 +02:00
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x00696FBE
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_overview_resize(rct_window* w)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_disable_widgets(w);
window_event_invalidate_call(w);
widget_invalidate(w, WIDX_MARQUEE);
Add parens to fix operator precedence issue I missed one... thankfully the CI did not.
2019-01-05 14:46:05 +01:00
window_set_resize(w, 192 + (gConfigGeneral.debugging_tools ? TabWidth : 0), 159, 500, 450);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_viewport* view = w->viewport;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (view)
{
if ((w->width - 30) == view->width)
{
if ((w->height - 72) == view->height)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_viewport_init(w);
return;
}
}
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint8_t zoom_amount = 1 << view->zoom;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
view->width = w->width - 30;
view->height = w->height - 72;
view->view_width = view->width / zoom_amount;
view->view_height = view->height / zoom_amount;
}
window_guest_viewport_init(w);
Started addition of window_peep_resize Not tested.
2014-08-20 13:52:27 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x00696A06
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_overview_mouse_up(rct_window* w, rct_widgetindex widgetIndex)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Refactor peep struct
2019-02-28 20:28:58 +01:00
Peep* peep = GET_PEEP(w->number);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_CLOSE:
window_close(w);
break;
case WIDX_TAB_1:
case WIDX_TAB_2:
case WIDX_TAB_3:
case WIDX_TAB_4:
case WIDX_TAB_5:
case WIDX_TAB_6:
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
case WIDX_TAB_7:
clang-format UI windows
2018-06-22 23:21:44 +02:00
window_guest_set_page(w, widgetIndex - WIDX_TAB_1);
break;
case WIDX_PICKUP:
if (!peep_can_be_picked_up(peep))
{
return;
}
w->picked_peep_old_x = peep->x;
game_command_callback = game_command_callback_pickup_guest;
game_do_command(w->number, GAME_COMMAND_FLAG_APPLY, 0, 0, GAME_COMMAND_PICKUP_GUEST, 0, 0);
break;
case WIDX_RENAME:
window_text_input_open(
w, widgetIndex, STR_GUEST_RENAME_TITLE, STR_GUEST_RENAME_PROMPT, peep->name_string_idx, peep->id, 32);
break;
case WIDX_LOCATE:
window_scroll_to_viewport(w);
break;
case WIDX_TRACK:
Fix #8900: Implement GuestSetFlagsAction.
2019-03-16 22:25:56 +01:00
{
uint32_t flags = peep->peep_flags ^ PEEP_FLAGS_TRACKING;
auto guestSetFlagsAction = GuestSetFlagsAction(w->number, flags);
GameActions::Execute(&guestSetFlagsAction);
}
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Added start of window_peep_overview_mouse_down Not tested.
2014-08-21 14:05:46 +02:00
}
Added set_page Not tested.
2014-08-21 17:45:01 +02:00
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x696AA0
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_set_page(rct_window* w, int32_t page)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (input_test_flag(INPUT_FLAG_TOOL_ACTIVE))
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->number == gCurrentToolWidget.window_number && w->classification == gCurrentToolWidget.window_classification)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
tool_cancel();
}
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t listen = 0;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (page == WINDOW_GUEST_OVERVIEW && w->page == WINDOW_GUEST_OVERVIEW && w->viewport)
{
if (!(w->viewport->flags & VIEWPORT_FLAG_SOUND_ON))
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
listen = 1;
}
w->page = page;
w->frame_no = 0;
w->no_list_items = 0;
w->selected_list_item = -1;
rct_viewport* viewport = w->viewport;
Apply some refactoring
2017-10-03 00:00:32 +02:00
w->viewport = nullptr;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (viewport)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
viewport->width = 0;
}
w->enabled_widgets = window_guest_page_enabled_widgets[page];
w->hold_down_widgets = 0;
w->event_handlers = window_guest_page_events[page];
w->pressed_widgets = 0;
w->widgets = window_guest_page_widgets[page];
window_guest_disable_widgets(w);
window_invalidate(w);
window_event_resize_call(w);
window_event_invalidate_call(w);
window_init_scroll_widgets(w);
window_invalidate(w);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (listen && w->viewport)
w->viewport->flags |= VIEWPORT_FLAG_SOUND_ON;
Added set_page Not tested.
2014-08-21 17:45:01 +02:00
}
Added window_peep_viewport_init
2014-08-23 11:39:15 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_overview_viewport_rotate(rct_window* w)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_viewport_init(w);
Added viewport_init_wrapper for event
2014-08-27 13:48:29 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x0069883C
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_viewport_init(rct_window* w)
{
if (w->page != WINDOW_GUEST_OVERVIEW)
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Fix #8829: invalid read in window_guest_open
2019-03-09 13:29:33 +01:00
auto peep = GET_PEEP(w->number);
if (peep != nullptr)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Fix #8829: invalid read in window_guest_open
2019-03-09 13:29:33 +01:00
auto focus = viewport_update_smart_guest_follow(w, peep);
bool reCreateViewport = false;
uint16_t origViewportFlags{};
if (w->viewport != nullptr)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Fix #8829: invalid read in window_guest_open
2019-03-09 13:29:33 +01:00
// Check all combos, for now skipping y and rot
if (focus.coordinate.x == w->viewport_focus_coordinates.x
&& (focus.coordinate.y & VIEWPORT_FOCUS_Y_MASK) == w->viewport_focus_coordinates.y
&& focus.coordinate.z == w->viewport_focus_coordinates.z
&& focus.coordinate.rotation == w->viewport_focus_coordinates.rotation)
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Fix #8829: invalid read in window_guest_open
2019-03-09 13:29:33 +01:00
origViewportFlags = w->viewport->flags;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Fix #8829: invalid read in window_guest_open
2019-03-09 13:29:33 +01:00
reCreateViewport = true;
w->viewport->width = 0;
w->viewport = nullptr;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Fix #8829: invalid read in window_guest_open
2019-03-09 13:29:33 +01:00
window_event_invalidate_call(w);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Fix #8829: invalid read in window_guest_open
2019-03-09 13:29:33 +01:00
w->viewport_focus_coordinates.x = focus.coordinate.x;
w->viewport_focus_coordinates.y = focus.coordinate.y;
w->viewport_focus_coordinates.z = focus.coordinate.z;
w->viewport_focus_coordinates.rotation = focus.coordinate.rotation;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Fix #8829: invalid read in window_guest_open
2019-03-09 13:29:33 +01:00
if (peep->state != PEEP_STATE_PICKED && w->viewport == nullptr)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Fix #8829: invalid read in window_guest_open
2019-03-09 13:29:33 +01:00
auto view_widget = &w->widgets[WIDX_VIEWPORT];
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t x = view_widget->left + 1 + w->x;
int32_t y = view_widget->top + 1 + w->y;
int32_t width = view_widget->right - view_widget->left - 1;
int32_t height = view_widget->bottom - view_widget->top - 1;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
viewport_create(
Fix #7462: Guest window goes beyond the map edge on a spiral slide. (#7752)
2018-08-07 16:20:51 +02:00
w, x, y, width, height, 0, focus.coordinate.x, focus.coordinate.y & VIEWPORT_FOCUS_Y_MASK, focus.coordinate.z,
Binpack function arguments together Previously when the arguments of a function wouldn't fit on a single line, clang-format would put each argument on its own line instead. By enabling the binpack parameter setting, it tried to fit as many on one line as possible instead. Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2018-07-21 13:51:54 +02:00
focus.sprite.type & VIEWPORT_FOCUS_TYPE_MASK, focus.sprite.sprite_id);
Fix #8829: invalid read in window_guest_open
2019-03-09 13:29:33 +01:00
if (w->viewport != nullptr && reCreateViewport)
{
w->viewport->flags = origViewportFlags;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->flags |= WF_NO_SCROLLING;
window_invalidate(w);
}
Fix #8829: invalid read in window_guest_open
2019-03-09 13:29:33 +01:00
window_invalidate(w);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Started peep_overview_paint
2014-08-23 13:06:25 +02:00
}
Moved get_peep_face_sprite to peep.c added stats_tab paint
2014-09-08 19:21:01 +02:00
/**
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
*
* rct2: 0x6983dd
Moved get_peep_face_sprite to peep.c added stats_tab paint
2014-09-08 19:21:01 +02:00
* used by window_staff as well
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_guest_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
if (w->disabled_widgets & (1 << WIDX_TAB_1))
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
rct_widget* widget = &w->widgets[WIDX_TAB_1];
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t width = widget->right - widget->left - 1;
int32_t height = widget->bottom - widget->top - 1;
int32_t x = widget->left + 1 + w->x;
int32_t y = widget->top + 1 + w->y;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->page == WINDOW_GUEST_OVERVIEW)
height++;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_drawpixelinfo clip_dpi;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (!clip_drawpixelinfo(&clip_dpi, dpi, x, y, width, height))
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
}
x = 14;
y = 20;
Refactor peep struct
2019-02-28 20:28:58 +01:00
Peep* peep = GET_PEEP(w->number);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (peep->type == PEEP_TYPE_STAFF && peep->staff_type == STAFF_TYPE_ENTERTAINER)
y++;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t ebx = g_peep_animation_entries[peep->sprite_type].sprite_animation->base_image + 1;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t eax = 0;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->page == WINDOW_GUEST_OVERVIEW)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
eax = w->var_496;
eax &= 0xFFFC;
}
ebx += eax;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t sprite_id = ebx | SPRITE_ID_PALETTE_COLOUR_2(peep->tshirt_colour, peep->trousers_colour);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_sprite(&clip_dpi, sprite_id, x, y, 0);
// If holding a balloon
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (ebx >= 0x2A1D && ebx < 0x2A3D)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
ebx += 32;
Use remap flags, SPRITE_ID_PALETTE_COLOUR_1 and _2 in many more places
2017-07-20 20:56:29 +02:00
ebx |= SPRITE_ID_PALETTE_COLOUR_1(peep->balloon_colour);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_sprite(&clip_dpi, ebx, x, y, 0);
}
// If holding umbrella
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (ebx >= 0x2BBD && ebx < 0x2BDD)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
ebx += 32;
Use remap flags, SPRITE_ID_PALETTE_COLOUR_1 and _2 in many more places
2017-07-20 20:56:29 +02:00
ebx |= SPRITE_ID_PALETTE_COLOUR_1(peep->umbrella_colour);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_sprite(&clip_dpi, ebx, x, y, 0);
}
// If wearing hat
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (ebx >= 0x29DD && ebx < 0x29FD)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
ebx += 32;
Use remap flags, SPRITE_ID_PALETTE_COLOUR_1 and _2 in many more places
2017-07-20 20:56:29 +02:00
ebx |= SPRITE_ID_PALETTE_COLOUR_1(peep->hat_colour);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_sprite(&clip_dpi, ebx, x, y, 0);
}
Added window_peep_overview_tab_paint Looks to be used by staff window as well. Not tested.
2014-09-08 13:45:38 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x69869b
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_guest_stats_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (w->disabled_widgets & (1 << WIDX_TAB_2))
return;
rct_widget* widget = &w->widgets[WIDX_TAB_2];
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t x = widget->left + w->x;
int32_t y = widget->top + w->y;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor peep struct
2019-02-28 20:28:58 +01:00
Peep* peep = GET_PEEP(w->number);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t image_id = get_peep_face_sprite_large(peep);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->page == WINDOW_GUEST_STATS)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// If currently viewing this tab animate tab
// if it is very sick or angry.
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (image_id)
{
case SPR_PEEP_LARGE_FACE_VERY_VERY_SICK_0:
image_id += (w->frame_no / 4) & 0xF;
break;
case SPR_PEEP_LARGE_FACE_VERY_SICK_0:
image_id += (w->frame_no / 8) & 0x3;
break;
case SPR_PEEP_LARGE_FACE_ANGRY_0:
image_id += (w->frame_no / 8) & 0x3;
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
}
gfx_draw_sprite(dpi, image_id, x, y, 0);
Moved get_peep_face_sprite to peep.c added stats_tab paint
2014-09-08 19:21:01 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x69861F
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_guest_rides_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
if (w->disabled_widgets & (1 << WIDX_TAB_3))
return;
Added final window_peep tab paint functions Not tested.
2014-09-09 13:29:55 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_widget* widget = &w->widgets[WIDX_TAB_3];
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t x = widget->left + w->x;
int32_t y = widget->top + w->y;
Added final window_peep tab paint functions Not tested.
2014-09-09 13:29:55 +02:00
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t image_id = SPR_TAB_RIDE_0;
Added final window_peep tab paint functions Not tested.
2014-09-09 13:29:55 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->page == WINDOW_GUEST_RIDES)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
image_id += (w->frame_no / 4) & 0xF;
}
Fix memory leak in screenshot.c and guest.c
2015-09-22 19:02:39 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_sprite(dpi, image_id, x, y, 0);
Added final window_peep tab paint functions Not tested.
2014-09-09 13:29:55 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x698597
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_guest_finance_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
if (w->disabled_widgets & (1 << WIDX_TAB_4))
return;
Added final window_peep tab paint functions Not tested.
2014-09-09 13:29:55 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_widget* widget = &w->widgets[WIDX_TAB_4];
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t x = widget->left + w->x;
int32_t y = widget->top + w->y;
Added final window_peep tab paint functions Not tested.
2014-09-09 13:29:55 +02:00
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t image_id = SPR_TAB_FINANCES_SUMMARY_0;
Added final window_peep tab paint functions Not tested.
2014-09-09 13:29:55 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->page == WINDOW_GUEST_FINANCE)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
image_id += (w->frame_no / 2) & 0x7;
}
Fix memory leak in screenshot.c and guest.c
2015-09-22 19:02:39 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_sprite(dpi, image_id, x, y, 0);
Added final window_peep tab paint functions Not tested.
2014-09-09 13:29:55 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x6985D8
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_guest_thoughts_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
if (w->disabled_widgets & (1 << WIDX_TAB_5))
return;
Added final window_peep tab paint functions Not tested.
2014-09-09 13:29:55 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_widget* widget = &w->widgets[WIDX_TAB_5];
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t x = widget->left + w->x;
int32_t y = widget->top + w->y;
Added final window_peep tab paint functions Not tested.
2014-09-09 13:29:55 +02:00
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t image_id = SPR_TAB_THOUGHTS_0;
Added final window_peep tab paint functions Not tested.
2014-09-09 13:29:55 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->page == WINDOW_GUEST_THOUGHTS)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
image_id += (w->frame_no / 2) & 0x7;
}
Fix memory leak in screenshot.c and guest.c
2015-09-22 19:02:39 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_sprite(dpi, image_id, x, y, 0);
Added final window_peep tab paint functions Not tested.
2014-09-09 13:29:55 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x698661
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
static void window_guest_inventory_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
if (w->disabled_widgets & (1 << WIDX_TAB_6))
return;
Added final window_peep tab paint functions Not tested.
2014-09-09 13:29:55 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_widget* widget = &w->widgets[WIDX_TAB_6];
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t x = widget->left + w->x;
int32_t y = widget->top + w->y;
Added final window_peep tab paint functions Not tested.
2014-09-09 13:29:55 +02:00
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t image_id = SPR_TAB_GUEST_INVENTORY;
Fix memory leak in screenshot.c and guest.c
2015-09-22 19:02:39 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_sprite(dpi, image_id, x, y, 0);
Added final window_peep tab paint functions Not tested.
2014-09-09 13:29:55 +02:00
}
Formatting
2019-01-01 20:18:14 +01:00
static void window_guest_debug_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
{
if (w->disabled_widgets & (1 << WIDX_TAB_7))
return;
rct_widget* widget = &w->widgets[WIDX_TAB_7];
int32_t x = widget->left + w->x;
int32_t y = widget->top + w->y;
int32_t image_id = SPR_TAB_GEARS_0;
if (w->page == WINDOW_GUEST_DEBUG)
{
image_id += (w->frame_no / 2) & 0x3;
}
gfx_draw_sprite(dpi, image_id, x, y, 0);
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x696887
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_overview_paint(rct_window* w, rct_drawpixelinfo* dpi)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_draw_widgets(w, dpi);
window_guest_overview_tab_paint(w, dpi);
window_guest_stats_tab_paint(w, dpi);
window_guest_rides_tab_paint(w, dpi);
window_guest_finance_tab_paint(w, dpi);
window_guest_thoughts_tab_paint(w, dpi);
window_guest_inventory_tab_paint(w, dpi);
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
window_guest_debug_tab_paint(w, dpi);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Draw the viewport no sound sprite
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->viewport)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_draw_viewport(dpi, w);
rct_viewport* viewport = w->viewport;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (viewport->flags & VIEWPORT_FLAG_SOUND_ON)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_sprite(dpi, SPR_HEARING_VIEWPORT, w->x + 2, w->y + 2, 0);
}
}
Replace 'center' with 'centre' (#5745)
2017-07-01 00:11:28 +02:00
// Draw the centred label
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint32_t argument1, argument2;
Refactor peep struct
2019-02-28 20:28:58 +01:00
Peep* peep = GET_PEEP(w->number);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
get_arguments_from_action(peep, &argument1, &argument2);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
set_format_arg(0, uint32_t, argument1);
set_format_arg(4, uint32_t, argument2);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_widget* widget = &w->widgets[WIDX_ACTION_LBL];
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t x = (widget->left + widget->right) / 2 + w->x;
int32_t y = w->y + widget->top - 1;
int32_t width = widget->right - widget->left;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_string_centred_clipped(dpi, STR_BLACK_STRING, gCommonFormatArgs, COLOUR_BLACK, x, y, width);
// Draw the marquee thought
widget = &w->widgets[WIDX_MARQUEE];
width = widget->right - widget->left - 3;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t left = widget->left + 2 + w->x;
int32_t top = widget->top + w->y;
int32_t height = widget->bottom - widget->top;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
rct_drawpixelinfo dpi_marquee;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (!clip_drawpixelinfo(&dpi_marquee, dpi, left, top, width, height))
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
}
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t i = 0;
clang-format UI windows
2018-06-22 23:21:44 +02:00
for (; i < PEEP_MAX_THOUGHTS; ++i)
{
if (peep->thoughts[i].type == PEEP_THOUGHT_TYPE_NONE)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->list_information_type = 0;
return;
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (peep->thoughts[i].freshness == 1)
{ // If a fresh thought
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
break;
}
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (i == PEEP_MAX_THOUGHTS)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->list_information_type = 0;
return;
}
x = widget->right - widget->left - w->list_information_type;
peep_thought_set_format_args(&peep->thoughts[i]);
gfx_draw_string_left(&dpi_marquee, STR_WINDOW_COLOUR_2_STRINGID, gCommonFormatArgs, COLOUR_BLACK, x, 0);
Added window_peep_event arrays.
2014-08-25 13:58:59 +02:00
}
Added window_peep_invalidate Not tested.
2014-08-26 14:10:36 +02:00
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x696749
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_overview_invalidate(rct_window* w)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Refactor invalidate methods
2019-05-04 16:40:45 +02:00
window_guest_common_invalidate(w);
Fix memory leak in screenshot.c and guest.c
2015-09-22 19:02:39 +02:00
Refactor invalidate methods
2019-05-04 16:40:45 +02:00
auto peep = GET_PEEP(w->number);
clang-format UI windows
2018-06-22 23:21:44 +02:00
w->pressed_widgets &= ~(1 << WIDX_TRACK);
if (peep->peep_flags & PEEP_FLAGS_TRACKING)
{
w->pressed_widgets |= (1 << WIDX_TRACK);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Fix memory leak in screenshot.c and guest.c
2015-09-22 19:02:39 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_overview_widgets[WIDX_VIEWPORT].right = w->width - 26;
window_guest_overview_widgets[WIDX_VIEWPORT].bottom = w->height - 14;
cleaned up peep invalidate
2014-08-27 13:14:52 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_overview_widgets[WIDX_ACTION_LBL].top = w->height - 12;
window_guest_overview_widgets[WIDX_ACTION_LBL].bottom = w->height - 3;
window_guest_overview_widgets[WIDX_ACTION_LBL].right = w->width - 24;
Fix memory leak in screenshot.c and guest.c
2015-09-22 19:02:39 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_overview_widgets[WIDX_MARQUEE].right = w->width - 24;
cleaned up peep invalidate
2014-08-27 13:14:52 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_overview_widgets[WIDX_PICKUP].right = w->width - 2;
window_guest_overview_widgets[WIDX_RENAME].right = w->width - 2;
window_guest_overview_widgets[WIDX_LOCATE].right = w->width - 2;
window_guest_overview_widgets[WIDX_TRACK].right = w->width - 2;
cleaned up peep invalidate
2014-08-27 13:14:52 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_overview_widgets[WIDX_PICKUP].left = w->width - 25;
window_guest_overview_widgets[WIDX_RENAME].left = w->width - 25;
window_guest_overview_widgets[WIDX_LOCATE].left = w->width - 25;
window_guest_overview_widgets[WIDX_TRACK].left = w->width - 25;
Added window_peep_invalidate Not tested.
2014-08-26 14:10:36 +02:00
}
Added start of window_peep_overview_tab_paint Will not compile at present.
2014-08-27 17:49:31 +02:00
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x696F45
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_overview_update(rct_window* w)
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t var_496 = w->var_496;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
var_496++;
var_496 %= 24;
w->var_496 = var_496;
widget_invalidate(w, WIDX_TAB_1);
widget_invalidate(w, WIDX_TAB_2);
Add changelog entry, minor code improvements
2019-04-15 19:11:30 +02:00
Peep* peep = GET_PEEP(w->number);
if (peep != nullptr && peep->window_invalidate_flags & PEEP_INVALIDATE_PEEP_ACTION)
Fix #5893: Invalidate widget only if it's visible Remove the widget_invalidate() call after changing a guest's guest_heading_to_ride_id, because that call fails a debug assertion if the guest window is open and the currently active tab is not the "overview" tab. In Release builds (if assertion is disabled), widget_invalidate() might access the widgets array out of bounds. Instead, introduce a new flag PEEP_INVALIDATE_PEEP_ACTION for window_invalidate_flags in the peep struct and set that flag. The guest window update function then makes sure to invalidate the label if the flag is set. The flag could be used in other places to reduce libopenrct2 dependency on window_*() calls (see #6808), but this commit only cares about cases where the assertion would fail.
2019-04-15 14:03:24 +02:00
{
peep->window_invalidate_flags &= ~PEEP_INVALIDATE_PEEP_ACTION;
widget_invalidate(w, WIDX_ACTION_LBL);
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->list_information_type += 2;
if ((w->highlighted_item & 0xFFFF) == 0xFFFF)
w->highlighted_item &= 0xFFFF0000;
else
w->highlighted_item++;
// Disable peep watching thought for multiplayer as it's client specific
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (network_get_mode() == NETWORK_MODE_NONE)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Create the "I have the strangest feeling I am being watched thought"
clang-format UI windows
2018-06-22 23:21:44 +02:00
if ((w->highlighted_item & 0xFFFF) >= 3840)
{
if (!(w->highlighted_item & 0x3FF))
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t random = util_rand() & 0xFFFF;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (random <= 0x2AAA)
{
Fix #6948 & #6949: Removing or trying to build a ride freezes game
2018-01-06 00:38:44 +01:00
peep_insert_new_thought(peep, PEEP_THOUGHT_TYPE_WATCHED, PEEP_THOUGHT_ITEM_NONE);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
}
}
}
Added window_peep_overview_update Not tested will not work at present missing two function calls.
2014-09-09 13:53:10 +02:00
}
Added peep_text_input
2014-09-09 19:08:34 +02:00
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/* rct2: 0x696A6A */
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_overview_text_input(rct_window* w, rct_widgetindex widgetIndex, char* text)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (widgetIndex != WIDX_RENAME)
return;
Added peep_text_input
2014-09-09 19:08:34 +02:00
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
if (text == nullptr)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
Fix code style. Fix error text
2017-10-04 15:51:45 +02:00
guest_set_name(w->number, text);
Added window_peep_overview_tool_update
2014-09-13 12:03:46 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x696A5F
*/
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
void window_guest_overview_tool_update(rct_window* w, rct_widgetindex widgetIndex, int32_t x, int32_t y)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (widgetIndex != WIDX_PICKUP)
return;
map_invalidate_selection_rect();
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t map_x, map_y;
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
footpath_get_coordinates_from_pos(x, y + 16, &map_x, &map_y, nullptr, nullptr);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (map_x != LOCATION_NULL)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE;
gMapSelectType = MAP_SELECT_TYPE_FULL;
gMapSelectPositionA.x = map_x;
gMapSelectPositionB.x = map_x;
gMapSelectPositionA.y = map_y;
gMapSelectPositionB.y = map_y;
map_invalidate_selection_rect();
}
gPickupPeepImage = UINT32_MAX;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t interactionType;
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
get_map_coordinates_from_pos(x, y, VIEWPORT_INTERACTION_MASK_NONE, nullptr, nullptr, &interactionType, nullptr, nullptr);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (interactionType == VIEWPORT_INTERACTION_ITEM_NONE)
return;
x--;
y += 16;
gPickupPeepX = x;
gPickupPeepY = y;
w->picked_peep_frame++;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->picked_peep_frame >= 48)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->picked_peep_frame = 0;
}
Refactor peep struct
2019-02-28 20:28:58 +01:00
Peep* peep;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
peep = GET_PEEP(w->number);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint32_t imageId = g_peep_animation_entries[peep->sprite_type].sprite_animation[PEEP_ACTION_SPRITE_TYPE_UI].base_image;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
imageId += w->picked_peep_frame >> 2;
Use remap flags, SPRITE_ID_PALETTE_COLOUR_1 and _2 in many more places
2017-07-20 20:56:29 +02:00
imageId |= (peep->tshirt_colour << 19) | (peep->trousers_colour << 24) | IMAGE_TYPE_REMAP | IMAGE_TYPE_REMAP_2_PLUS;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gPickupPeepImage = imageId;
Added window_peep_overview_tool_down. Modified RCT2_CALLPROC_X to return the flags register.
2014-09-13 13:49:18 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x696A54
*/
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
void window_guest_overview_tool_down(rct_window* w, rct_widgetindex widgetIndex, int32_t x, int32_t y)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (widgetIndex != WIDX_PICKUP)
return;
Added window_peep_overview_tool_down. Modified RCT2_CALLPROC_X to return the flags register.
2014-09-13 13:49:18 +02:00
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t dest_x, dest_y;
Rename rct_tile_element to TileElement
2018-11-01 13:53:50 +01:00
TileElement* tileElement;
Replace mapElement with tileElement
2017-10-31 14:03:45 +01:00
footpath_get_coordinates_from_pos(x, y + 16, &dest_x, &dest_y, nullptr, &tileElement);
Code review
2016-10-18 21:33:43 +02:00
Use constant for LOCATION_NULL, split off location stuff to Location.h
2017-10-13 22:23:07 +02:00
if (dest_x == LOCATION_NULL)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
return;
Code review
2016-10-18 21:33:43 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
game_command_callback = game_command_callback_pickup_guest;
Replace mapElement with tileElement
2017-10-31 14:03:45 +01:00
game_do_command(w->number, GAME_COMMAND_FLAG_APPLY, 2, tileElement->base_height, GAME_COMMAND_PICKUP_GUEST, dest_x, dest_y);
Added window_peep_abort tool. Fixed bug with pickup
2014-09-13 14:58:25 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x696A49
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_overview_tool_abort(rct_window* w, rct_widgetindex widgetIndex)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (widgetIndex != WIDX_PICKUP)
return;
Added window_peep_abort tool. Fixed bug with pickup
2014-09-13 14:58:25 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
game_do_command(w->number, GAME_COMMAND_FLAG_APPLY, 1, 0, GAME_COMMAND_PICKUP_GUEST, w->picked_peep_old_x, 0);
Added window_peep_not_overview_mouse_up a combination function for all peep pages
2014-09-13 15:11:44 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
Added window_peep_not_overview_mouse_up a combination function for all peep pages
2014-09-13 15:11:44 +02:00
* This is a combination of 5 functions that were identical
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x69744F, 0x697795, 0x697BDD, 0x697E18, 0x698279
Added window_peep_not_overview_mouse_up a combination function for all peep pages
2014-09-13 15:11:44 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_mouse_up(rct_window* w, rct_widgetindex widgetIndex)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (widgetIndex)
{
case WIDX_CLOSE:
window_close(w);
break;
case WIDX_TAB_1:
case WIDX_TAB_2:
case WIDX_TAB_3:
case WIDX_TAB_4:
case WIDX_TAB_5:
case WIDX_TAB_6:
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
case WIDX_TAB_7:
clang-format UI windows
2018-06-22 23:21:44 +02:00
window_guest_set_page(w, widgetIndex - WIDX_TAB_1);
break;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Added window_peep_unknown_05 and stats_resize. Added note about unknown 05
2014-09-13 15:30:21 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x697488
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_stats_resize(rct_window* w)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Fix guest window width for debugging tab Introduce a named constant for the width of a tab in the Guest window, and touch the places that set the window width to add it to the minimum window width when the debugging tab is enabled, so that the tab doesn't render off the side of the window.
2019-01-01 20:40:11 +01:00
const int32_t fixedWidth = 192 + (gConfigGeneral.debugging_tools ? TabWidth : 0);
window_set_resize(w, fixedWidth, 180, fixedWidth, 180);
Added window_peep_unknown_05 and stats_resize. Added note about unknown 05
2014-09-13 15:30:21 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
Added window_peep_unknown_05 and stats_resize. Added note about unknown 05
2014-09-13 15:30:21 +02:00
* This is a combination of 5 functions that were identical
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
* rct2: 0x6974ED, 0x00697959, 0x00697C7B, 0x00697ED2, 0x00698333
Added window_peep_unknown_05 and stats_resize. Added note about unknown 05
2014-09-13 15:30:21 +02:00
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_unknown_05(rct_window* w)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
widget_invalidate(w, WIDX_TAB_1);
Added window_peep_stats_invalidate and resize
2014-09-13 15:58:51 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x69746A
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_stats_update(rct_window* w)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->frame_no++;
Refactor peep struct
2019-02-28 20:28:58 +01:00
Peep* peep = GET_PEEP(w->number);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
peep->window_invalidate_flags &= ~PEEP_INVALIDATE_PEEP_STATS;
Added window_peep_stats_invalidate and resize
2014-09-13 15:58:51 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_invalidate(w);
Added window_peep_stats_invalidate and resize
2014-09-13 15:58:51 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x69707D
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_stats_invalidate(rct_window* w)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Refactor invalidate methods
2019-05-04 16:40:45 +02:00
window_guest_common_invalidate(w);
Started adding peep_stats_paint.
2014-09-13 16:43:25 +02:00
}
Decompile window_peep_stats_bars_paint
2014-09-20 12:12:45 +02:00
/**
clang-format UI windows
2018-06-22 23:21:44 +02:00
*
* rct2: 0x0066ECC1
*
* ebp: colour, contains flag BAR_BLINK for blinking
*/
Enforce not breaking before assignments and function names Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2018-07-21 11:50:45 +02:00
static void window_guest_stats_bars_paint(
int32_t value, int32_t x, int32_t y, rct_window* w, rct_drawpixelinfo* dpi, int32_t colour)
Add extra padding to label text in guest window.
2018-01-03 00:09:25 +01:00
{
if (font_get_line_height(gCurrentFontSpriteBase) > 10)
{
y += 1;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Add extra padding to label text in guest window.
2018-01-03 00:09:25 +01:00
gfx_fill_rect_inset(dpi, x + 61, y + 1, x + 61 + 121, y + 9, w->colours[1], INSET_RECT_F_30);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t blink_flag = colour & BAR_BLINK;
Name and fix vehicle entry and tertiary colour flags
2017-07-20 12:57:37 +02:00
colour &= ~BAR_BLINK;
Use gCurrentRealTimeTicks whenever appropriate.
2018-12-01 17:00:11 +01:00
if (!blink_flag || game_is_paused() || (gCurrentRealTimeTicks & 8) == 0)
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
{
Add extra padding to label text in guest window.
2018-01-03 00:09:25 +01:00
value *= 118;
value >>= 8;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
if (value <= 2)
return;
Decompile window_peep_stats_bars_paint
2014-09-20 12:12:45 +02:00
Add extra padding to label text in guest window.
2018-01-03 00:09:25 +01:00
gfx_fill_rect_inset(dpi, x + 63, y + 2, x + 63 + value - 1, y + 8, colour, 0);
}
Decompile window_peep_stats_bars_paint
2014-09-20 12:12:45 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x0069711D
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_draw_widgets(w, dpi);
window_guest_overview_tab_paint(w, dpi);
window_guest_stats_tab_paint(w, dpi);
window_guest_rides_tab_paint(w, dpi);
window_guest_finance_tab_paint(w, dpi);
window_guest_thoughts_tab_paint(w, dpi);
window_guest_inventory_tab_paint(w, dpi);
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
window_guest_debug_tab_paint(w, dpi);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// ebx
Refactor peep struct
2019-02-28 20:28:58 +01:00
Peep* peep = GET_PEEP(w->number);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Not sure why this is not stats widgets
// cx
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t x = w->x + window_guest_rides_widgets[WIDX_PAGE_BACKGROUND].left + 4;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// dx
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t y = w->y + window_guest_rides_widgets[WIDX_PAGE_BACKGROUND].top + 4;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Happiness
gfx_draw_string_left(dpi, STR_GUEST_STAT_HAPPINESS_LABEL, gCommonFormatArgs, COLOUR_BLACK, x, y);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t happiness = peep->happiness;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (happiness < 10)
happiness = 10;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t ebp = COLOUR_BRIGHT_GREEN;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (happiness < 50)
{
Name and fix vehicle entry and tertiary colour flags
2017-07-20 12:57:37 +02:00
ebp |= BAR_BLINK;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
window_guest_stats_bars_paint(happiness, x, y, w, dpi, ebp);
// Energy
Add extra padding to label text in guest window.
2018-01-03 00:09:25 +01:00
y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_string_left(dpi, STR_GUEST_STAT_ENERGY_LABEL, gCommonFormatArgs, COLOUR_BLACK, x, y);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t energy = ((peep->energy - PEEP_MIN_ENERGY) * 255) / (PEEP_MAX_ENERGY - PEEP_MIN_ENERGY);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
ebp = COLOUR_BRIGHT_GREEN;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (energy < 50)
{
Name and fix vehicle entry and tertiary colour flags
2017-07-20 12:57:37 +02:00
ebp |= BAR_BLINK;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (energy < 10)
energy = 10;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_stats_bars_paint(energy, x, y, w, dpi, ebp);
// Hunger
Add extra padding to label text in guest window.
2018-01-03 00:09:25 +01:00
y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_string_left(dpi, STR_GUEST_STAT_HUNGER_LABEL, gCommonFormatArgs, COLOUR_BLACK, x, y);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t hunger = peep->hunger;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (hunger > 190)
hunger = 190;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
hunger -= 32;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (hunger < 0)
hunger = 0;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
hunger *= 51;
hunger /= 32;
hunger = 0xFF & ~hunger;
ebp = COLOUR_BRIGHT_RED;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (hunger > 170)
{
Name and fix vehicle entry and tertiary colour flags
2017-07-20 12:57:37 +02:00
ebp |= BAR_BLINK;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
window_guest_stats_bars_paint(hunger, x, y, w, dpi, ebp);
// Thirst
Add extra padding to label text in guest window.
2018-01-03 00:09:25 +01:00
y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_string_left(dpi, STR_GUEST_STAT_THIRST_LABEL, gCommonFormatArgs, COLOUR_BLACK, x, y);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t thirst = peep->thirst;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (thirst > 190)
thirst = 190;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
thirst -= 32;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (thirst < 0)
thirst = 0;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
thirst *= 51;
thirst /= 32;
thirst = 0xFF & ~thirst;
ebp = COLOUR_BRIGHT_RED;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (thirst > 170)
{
Name and fix vehicle entry and tertiary colour flags
2017-07-20 12:57:37 +02:00
ebp |= BAR_BLINK;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
window_guest_stats_bars_paint(thirst, x, y, w, dpi, ebp);
// Nausea
Add extra padding to label text in guest window.
2018-01-03 00:09:25 +01:00
y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_string_left(dpi, STR_GUEST_STAT_NAUSEA_LABEL, gCommonFormatArgs, COLOUR_BLACK, x, y);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t nausea = peep->nausea - 32;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (nausea < 0)
nausea = 0;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
nausea *= 36;
nausea /= 32;
ebp = COLOUR_BRIGHT_RED;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (nausea > 120)
{
Name and fix vehicle entry and tertiary colour flags
2017-07-20 12:57:37 +02:00
ebp |= BAR_BLINK;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
window_guest_stats_bars_paint(nausea, x, y, w, dpi, ebp);
Name some rct(1)_peep fields
2018-01-09 09:32:21 +01:00
// Toilet
Add extra padding to label text in guest window.
2018-01-03 00:09:25 +01:00
y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_string_left(dpi, STR_GUEST_STAT_TOILET_LABEL, gCommonFormatArgs, COLOUR_BLACK, x, y);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t toilet = peep->toilet - 32;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (toilet > 210)
toilet = 210;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Name some rct(1)_peep fields
2018-01-09 09:32:21 +01:00
toilet -= 32;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (toilet < 0)
toilet = 0;
Name some rct(1)_peep fields
2018-01-09 09:32:21 +01:00
toilet *= 45;
toilet /= 32;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
ebp = COLOUR_BRIGHT_RED;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (toilet > 160)
{
Name and fix vehicle entry and tertiary colour flags
2017-07-20 12:57:37 +02:00
ebp |= BAR_BLINK;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Name some rct(1)_peep fields
2018-01-09 09:32:21 +01:00
window_guest_stats_bars_paint(toilet, x, y, w, dpi, ebp);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Time in park
Add extra padding to label text in guest window.
2018-01-03 00:09:25 +01:00
y += LIST_ROW_HEIGHT + 1;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (peep->time_in_park != -1)
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t eax = gScenarioTicks;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
eax -= peep->time_in_park;
eax >>= 11;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
set_format_arg(0, uint16_t, eax & 0xFFFF);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_string_left(dpi, STR_GUEST_STAT_TIME_IN_PARK, gCommonFormatArgs, COLOUR_BLACK, x, y);
}
Add extra padding to label text in guest window.
2018-01-03 00:09:25 +01:00
y += LIST_ROW_HEIGHT + 9;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_fill_rect_inset(dpi, x, y - 6, x + 179, y - 5, w->colours[1], INSET_RECT_FLAG_BORDER_INSET);
// Preferred Ride
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
gfx_draw_string_left(dpi, STR_GUEST_STAT_PREFERRED_RIDE, nullptr, COLOUR_BLACK, x, y);
Add extra padding to label text in guest window.
2018-01-03 00:09:25 +01:00
y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Intensity
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t intensity = peep->intensity / 16;
set_format_arg(0, uint16_t, intensity);
int32_t string_id = STR_GUEST_STAT_PREFERRED_INTESITY_BELOW;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (peep->intensity & 0xF)
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
set_format_arg(0, uint16_t, peep->intensity & 0xF);
set_format_arg(2, uint16_t, intensity);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
string_id = STR_GUEST_STAT_PREFERRED_INTESITY_BETWEEN;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (intensity == 15)
string_id = STR_GUEST_STAT_PREFERRED_INTESITY_ABOVE;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
gfx_draw_string_left(dpi, string_id, gCommonFormatArgs, COLOUR_BLACK, x + 4, y);
// Nausea tolerance
Use const and constexpr whenever possible.
2018-01-11 14:50:31 +01:00
static constexpr const rct_string_id nauseaTolerances[] = {
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
STR_PEEP_STAT_NAUSEA_TOLERANCE_NONE,
STR_PEEP_STAT_NAUSEA_TOLERANCE_LOW,
STR_PEEP_STAT_NAUSEA_TOLERANCE_AVERAGE,
STR_PEEP_STAT_NAUSEA_TOLERANCE_HIGH,
};
Add extra padding to label text in guest window.
2018-01-03 00:09:25 +01:00
y += LIST_ROW_HEIGHT;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t nausea_tolerance = peep->nausea_tolerance & 0x3;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
set_format_arg(0, rct_string_id, nauseaTolerances[nausea_tolerance]);
gfx_draw_string_left(dpi, STR_GUEST_STAT_NAUSEA_TOLERANCE, gCommonFormatArgs, COLOUR_BLACK, x, y);
Added window_peep_rides_resize and update. Added not on use of peep rides been on
2014-09-14 14:50:39 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x006978F4
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_rides_resize(rct_window* w)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Fix guest window width for debugging tab Introduce a named constant for the width of a tab in the Guest window, and touch the places that set the window width to add it to the minimum window width when the debugging tab is enabled, so that the tab doesn't render off the side of the window.
2019-01-01 20:40:11 +01:00
window_set_resize(w, 192 + (gConfigGeneral.debugging_tools ? TabWidth : 0), 128, 500, 400);
Added window_peep_rides_resize and update. Added not on use of peep rides been on
2014-09-14 14:50:39 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x6977B0
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_rides_update(rct_window* w)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->frame_no++;
widget_invalidate(w, WIDX_TAB_2);
widget_invalidate(w, WIDX_TAB_3);
Refactor peep struct
2019-02-28 20:28:58 +01:00
Peep* peep = GET_PEEP(w->number);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Every 2048 ticks do a full window_invalidate
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t number_of_ticks = gScenarioTicks - peep->time_in_park;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (!(number_of_ticks & 0x7FF))
window_invalidate(w);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint8_t curr_list_position = 0;
Use new ride_id_t typedef (#8561)
2019-01-12 11:11:55 +01:00
for (ride_id_t ride_id = 0; ride_id < MAX_RIDES; ride_id++)
clang-format UI windows
2018-06-22 23:21:44 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Offset to the ride_id bit in peep_rides_been_on
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint8_t ride_id_bit = ride_id % 8;
uint8_t ride_id_offset = ride_id / 8;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (peep->rides_been_on[ride_id_offset] & (1 << ride_id_bit))
{
Split Ride and rct2_ride
2017-09-12 11:16:57 +02:00
Ride* ride = get_ride(ride_id);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (gRideClassifications[ride->type] == RIDE_CLASS_RIDE)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->list_item_positions[curr_list_position] = ride_id;
curr_list_position++;
}
}
}
// If there are new items
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->no_list_items != curr_list_position)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->no_list_items = curr_list_position;
window_invalidate(w);
}
Added window_peep_rides_scroll_get_size and tooltip
2014-09-14 15:15:32 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x69784E
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_rides_scroll_get_size(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
remove asm for set scroll size and add gCurrentAwards
2015-05-26 20:28:37 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
*height = w->no_list_items * 10;
Added window_peep_rides_scroll_get_size and tooltip
2014-09-14 15:15:32 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (w->selected_list_item != -1)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->selected_list_item = -1;
window_invalidate(w);
}
Added window_peep_rides_scroll_get_size and tooltip
2014-09-14 15:15:32 +02:00
Enforce not breaking before assignments and function names Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2018-07-21 11:50:45 +02:00
int32_t visable_height = *height - window_guest_rides_widgets[WIDX_RIDE_SCROLL].bottom
+ window_guest_rides_widgets[WIDX_RIDE_SCROLL].top + 21;
Added window_peep_rides_scroll_get_size and tooltip
2014-09-14 15:15:32 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (visable_height < 0)
visable_height = 0;
Added window_peep_rides_scroll_get_size and tooltip
2014-09-14 15:15:32 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (visable_height < w->scrolls[0].v_top)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->scrolls[0].v_top = visable_height;
window_invalidate(w);
}
Added window_peep_rides_scroll_mouse_down and over
2014-09-14 15:33:20 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x006978CC
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_rides_scroll_mouse_down(rct_window* w, int32_t scrollIndex, int32_t x, int32_t y)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t index;
Added window_peep_rides_scroll_mouse_down and over
2014-09-14 15:33:20 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
index = y / 10;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (index >= w->no_list_items)
return;
Added window_peep_rides_scroll_mouse_down and over
2014-09-14 15:33:20 +02:00
Move Ride window to UI module
2017-10-21 16:03:33 +02:00
auto intent = Intent(WC_RIDE);
intent.putExtra(INTENT_EXTRA_RIDE_ID, w->list_item_positions[index]);
context_open_intent(&intent);
Added window_peep_rides_scroll_mouse_down and over
2014-09-14 15:33:20 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x0069789C
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_rides_scroll_mouse_over(rct_window* w, int32_t scrollIndex, int32_t x, int32_t y)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t index;
Added window_peep_rides_scroll_mouse_down and over
2014-09-14 15:33:20 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
index = y / 10;
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (index >= w->no_list_items)
return;
Added window_peep_rides_scroll_mouse_down and over
2014-09-14 15:33:20 +02:00
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (index == w->selected_list_item)
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->selected_list_item = index;
Added window_peep_rides_scroll_mouse_down and over
2014-09-14 15:33:20 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_invalidate(w);
Added window_peep_rides_invalidate and paint
2014-09-14 16:46:50 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x0069757A
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_rides_invalidate(rct_window* w)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Refactor invalidate methods
2019-05-04 16:40:45 +02:00
window_guest_common_invalidate(w);
Added window_peep_rides_invalidate and paint
2014-09-14 16:46:50 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_guest_rides_widgets[WIDX_RIDE_SCROLL].right = w->width - 4;
window_guest_rides_widgets[WIDX_RIDE_SCROLL].bottom = w->height - 15;
Added window_peep_rides_invalidate and paint
2014-09-14 16:46:50 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x00697637
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_rides_paint(rct_window* w, rct_drawpixelinfo* dpi)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_draw_widgets(w, dpi);
window_guest_overview_tab_paint(w, dpi);
window_guest_stats_tab_paint(w, dpi);
window_guest_rides_tab_paint(w, dpi);
window_guest_finance_tab_paint(w, dpi);
window_guest_thoughts_tab_paint(w, dpi);
window_guest_inventory_tab_paint(w, dpi);
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
window_guest_debug_tab_paint(w, dpi);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor peep struct
2019-02-28 20:28:58 +01:00
Peep* peep = GET_PEEP(w->number);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// cx
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t x = w->x + window_guest_rides_widgets[WIDX_PAGE_BACKGROUND].left + 2;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// dx
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t y = w->y + window_guest_rides_widgets[WIDX_PAGE_BACKGROUND].top + 2;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
gfx_draw_string_left(dpi, STR_GUEST_LABEL_RIDES_BEEN_ON, nullptr, COLOUR_BLACK, x, y);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
y = w->y + window_guest_rides_widgets[WIDX_PAGE_BACKGROUND].bottom - 12;
Add null check for showing guest's favourite ride
2018-06-13 19:27:32 +02:00
rct_string_id ride_string_id = STR_PEEP_FAVOURITE_RIDE_NOT_AVAILABLE;
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
uint32_t ride_string_arguments = 0;
Add null check for showing guest's favourite ride
2018-06-13 19:27:32 +02:00
if (peep->favourite_ride != 0xFF)
{
auto ride = get_ride(peep->favourite_ride);
if (ride != nullptr)
{
ride_string_arguments = ride->name_arguments;
ride_string_id = ride->name;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
set_format_arg(0, rct_string_id, ride_string_id);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
set_format_arg(2, uint32_t, ride_string_arguments);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_string_left_clipped(dpi, STR_FAVOURITE_RIDE, gCommonFormatArgs, COLOUR_BLACK, x, y, w->width - 14);
Added window_peep_rides_scroll_paint. Peep rides finished
2014-09-14 21:06:32 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x006976FC
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_rides_scroll_paint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t left = dpi->x;
int32_t right = dpi->x + dpi->width - 1;
int32_t top = dpi->y;
int32_t bottom = dpi->y + dpi->height - 1;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Fix #7674: Rides show up as random numbers in guest's ride list
2018-06-13 19:32:00 +02:00
auto colour = ColourMapA[w->colours[1]].mid_light;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_fill_rect(dpi, left, top, right, bottom, colour);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
for (int32_t list_index = 0; list_index < w->no_list_items; list_index++)
Fix #7674: Rides show up as random numbers in guest's ride list
2018-06-13 19:32:00 +02:00
{
auto y = list_index * 10;
rct_string_id stringId = STR_BLACK_STRING;
if (list_index == w->selected_list_item)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_filter_rect(dpi, 0, y, 800, y + 9, PALETTE_DARKEN_1);
Fix #7674: Rides show up as random numbers in guest's ride list
2018-06-13 19:32:00 +02:00
stringId = STR_WINDOW_COLOUR_2_STRINGID;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Fix #7674: Rides show up as random numbers in guest's ride list
2018-06-13 19:32:00 +02:00
auto ride = get_ride(w->list_item_positions[list_index]);
if (ride != nullptr)
{
set_format_arg(0, rct_string_id, ride->name);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
set_format_arg(2, uint32_t, ride->name_arguments);
Fix #7674: Rides show up as random numbers in guest's ride list
2018-06-13 19:32:00 +02:00
gfx_draw_string_left(dpi, stringId, gCommonFormatArgs, COLOUR_BLACK, 0, y - 1);
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Finished window_peep_finance events. Added note to peep.h
2014-09-14 22:21:54 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x00697C16
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_finance_resize(rct_window* w)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Fix guest window width for debugging tab Introduce a named constant for the width of a tab in the Guest window, and touch the places that set the window width to add it to the minimum window width when the debugging tab is enabled, so that the tab doesn't render off the side of the window.
2019-01-01 20:40:11 +01:00
int32_t fixedWidth = 210 + (gConfigGeneral.debugging_tools ? TabWidth : 0);
window_set_resize(w, fixedWidth, 148, fixedWidth, 148);
Finished window_peep_finance events. Added note to peep.h
2014-09-14 22:21:54 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x00697BF8
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_finance_update(rct_window* w)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->frame_no++;
Finished window_peep_finance events. Added note to peep.h
2014-09-14 22:21:54 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
widget_invalidate(w, WIDX_TAB_2);
widget_invalidate(w, WIDX_TAB_4);
Finished window_peep_finance events. Added note to peep.h
2014-09-14 22:21:54 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x00697968
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_finance_invalidate(rct_window* w)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Refactor invalidate methods
2019-05-04 16:40:45 +02:00
window_guest_common_invalidate(w);
Finished window_peep_finance events. Added note to peep.h
2014-09-14 22:21:54 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x00697A08
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_finance_paint(rct_window* w, rct_drawpixelinfo* dpi)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_draw_widgets(w, dpi);
window_guest_overview_tab_paint(w, dpi);
window_guest_stats_tab_paint(w, dpi);
window_guest_rides_tab_paint(w, dpi);
window_guest_finance_tab_paint(w, dpi);
window_guest_thoughts_tab_paint(w, dpi);
window_guest_inventory_tab_paint(w, dpi);
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
window_guest_debug_tab_paint(w, dpi);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor peep struct
2019-02-28 20:28:58 +01:00
Peep* peep = GET_PEEP(w->number);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// cx
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t x = w->x + window_guest_finance_widgets[WIDX_PAGE_BACKGROUND].left + 4;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// dx
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t y = w->y + window_guest_finance_widgets[WIDX_PAGE_BACKGROUND].top + 4;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Cash in pocket
set_format_arg(0, money32, peep->cash_in_pocket);
gfx_draw_string_left(dpi, STR_GUEST_STAT_CASH_IN_POCKET, gCommonFormatArgs, COLOUR_BLACK, x, y);
// Cash spent
Add extra padding to label text in guest window.
2018-01-03 00:09:25 +01:00
y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
set_format_arg(0, money32, peep->cash_spent);
gfx_draw_string_left(dpi, STR_GUEST_STAT_CASH_SPENT, gCommonFormatArgs, COLOUR_BLACK, x, y);
Add extra padding to label text in guest window.
2018-01-03 00:09:25 +01:00
y += LIST_ROW_HEIGHT * 2;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_fill_rect_inset(dpi, x, y - 6, x + 179, y - 5, w->colours[1], INSET_RECT_FLAG_BORDER_INSET);
// Paid to enter
set_format_arg(0, money32, peep->paid_to_enter);
gfx_draw_string_left(dpi, STR_GUEST_EXPENSES_ENTRANCE_FEE, gCommonFormatArgs, COLOUR_BLACK, x, y);
// Paid on rides
Add extra padding to label text in guest window.
2018-01-03 00:09:25 +01:00
y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
set_format_arg(0, money32, peep->paid_on_rides);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
set_format_arg(4, uint16_t, peep->no_of_rides);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (peep->no_of_rides != 1)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_string_left(dpi, STR_GUEST_EXPENSES_RIDE_PLURAL, gCommonFormatArgs, COLOUR_BLACK, x, y);
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
else
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_string_left(dpi, STR_GUEST_EXPENSES_RIDE, gCommonFormatArgs, COLOUR_BLACK, x, y);
}
// Paid on food
Add extra padding to label text in guest window.
2018-01-03 00:09:25 +01:00
y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
set_format_arg(0, money32, peep->paid_on_food);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
set_format_arg(4, uint16_t, peep->no_of_food);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (peep->no_of_food != 1)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_string_left(dpi, STR_GUEST_EXPENSES_FOOD_PLURAL, gCommonFormatArgs, COLOUR_BLACK, x, y);
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
else
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_string_left(dpi, STR_GUEST_EXPENSES_FOOD, gCommonFormatArgs, COLOUR_BLACK, x, y);
}
// Paid on drinks
Add extra padding to label text in guest window.
2018-01-03 00:09:25 +01:00
y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
set_format_arg(0, money32, peep->paid_on_drink);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
set_format_arg(4, uint16_t, peep->no_of_drinks);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (peep->no_of_drinks != 1)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_string_left(dpi, STR_GUEST_EXPENSES_DRINK_PLURAL, gCommonFormatArgs, COLOUR_BLACK, x, y);
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
else
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_string_left(dpi, STR_GUEST_EXPENSES_DRINK, gCommonFormatArgs, COLOUR_BLACK, x, y);
}
// Paid on souvenirs
Add extra padding to label text in guest window.
2018-01-03 00:09:25 +01:00
y += LIST_ROW_HEIGHT;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
set_format_arg(0, money32, peep->paid_on_souvenirs);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
set_format_arg(4, uint16_t, peep->no_of_souvenirs);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (peep->no_of_souvenirs != 1)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_string_left(dpi, STR_GUEST_EXPENSES_SOUVENIR_PLURAL, gCommonFormatArgs, COLOUR_BLACK, x, y);
}
clang-format UI windows
2018-06-22 23:21:44 +02:00
else
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
gfx_draw_string_left(dpi, STR_GUEST_EXPENSES_SOUVENIR, gCommonFormatArgs, COLOUR_BLACK, x, y);
}
Added window_peep_thoughts events.
2014-09-14 22:56:45 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x00697E33
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_thoughts_resize(rct_window* w)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Refactor peep struct
2019-02-28 20:28:58 +01:00
Peep* peep = GET_PEEP(w->number);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (peep->window_invalidate_flags & PEEP_INVALIDATE_PEEP_THOUGHTS)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
peep->window_invalidate_flags &= ~PEEP_INVALIDATE_PEEP_THOUGHTS;
window_invalidate(w);
}
Added window_peep_thoughts events.
2014-09-14 22:56:45 +02:00
Fix guest window width for debugging tab Introduce a named constant for the width of a tab in the Guest window, and touch the places that set the window width to add it to the minimum window width when the debugging tab is enabled, so that the tab doesn't render off the side of the window.
2019-01-01 20:40:11 +01:00
window_set_resize(w, 192 + (gConfigGeneral.debugging_tools ? TabWidth : 0), 159, 500, 450);
Added window_peep_thoughts events.
2014-09-14 22:56:45 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x00697EB4
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_thoughts_update(rct_window* w)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->frame_no++;
Added window_peep_thoughts events.
2014-09-14 22:56:45 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
widget_invalidate(w, WIDX_TAB_2);
widget_invalidate(w, WIDX_TAB_5);
Added window_peep_thoughts events.
2014-09-14 22:56:45 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x00697C8A
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_thoughts_invalidate(rct_window* w)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Refactor invalidate methods
2019-05-04 16:40:45 +02:00
window_guest_common_invalidate(w);
Added window_peep_thoughts events.
2014-09-14 22:56:45 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x00697D2A
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_thoughts_paint(rct_window* w, rct_drawpixelinfo* dpi)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_draw_widgets(w, dpi);
window_guest_overview_tab_paint(w, dpi);
window_guest_stats_tab_paint(w, dpi);
window_guest_rides_tab_paint(w, dpi);
window_guest_finance_tab_paint(w, dpi);
window_guest_thoughts_tab_paint(w, dpi);
window_guest_inventory_tab_paint(w, dpi);
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
window_guest_debug_tab_paint(w, dpi);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor peep struct
2019-02-28 20:28:58 +01:00
Peep* peep = GET_PEEP(w->number);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// cx
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t x = w->x + window_guest_thoughts_widgets[WIDX_PAGE_BACKGROUND].left + 4;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// dx
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t y = w->y + window_guest_thoughts_widgets[WIDX_PAGE_BACKGROUND].top + 4;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Convert NULL -> nullptr in C++
2017-08-15 10:07:44 +02:00
gfx_draw_string_left(dpi, STR_GUEST_RECENT_THOUGHTS_LABEL, nullptr, COLOUR_BLACK, x, y);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
y += 10;
clang-format UI windows
2018-06-22 23:21:44 +02:00
for (rct_peep_thought* thought = peep->thoughts; thought < &peep->thoughts[PEEP_MAX_THOUGHTS]; ++thought)
{
if (thought->type == PEEP_THOUGHT_TYPE_NONE)
return;
if (thought->freshness == 0)
continue;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
int32_t width = window_guest_thoughts_widgets[WIDX_PAGE_BACKGROUND].right
clang-format UI windows
2018-06-22 23:21:44 +02:00
- window_guest_thoughts_widgets[WIDX_PAGE_BACKGROUND].left - 8;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
peep_thought_set_format_args(thought);
y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, width, STR_BLACK_STRING, COLOUR_BLACK);
// If this is the last visible line end drawing.
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (y > w->y + window_guest_thoughts_widgets[WIDX_PAGE_BACKGROUND].bottom - 32)
return;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Added window_peep_inventory events. All events finished.
2014-09-15 18:42:49 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x00698294
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_inventory_resize(rct_window* w)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Refactor peep struct
2019-02-28 20:28:58 +01:00
Peep* peep = GET_PEEP(w->number);
clang-format UI windows
2018-06-22 23:21:44 +02:00
if (peep->window_invalidate_flags & PEEP_INVALIDATE_PEEP_INVENTORY)
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
peep->window_invalidate_flags &= ~PEEP_INVALIDATE_PEEP_INVENTORY;
window_invalidate(w);
}
Added window_peep_inventory events. All events finished.
2014-09-15 18:42:49 +02:00
Fix guest window width for debugging tab Introduce a named constant for the width of a tab in the Guest window, and touch the places that set the window width to add it to the minimum window width when the debugging tab is enabled, so that the tab doesn't render off the side of the window.
2019-01-01 20:40:11 +01:00
window_set_resize(w, 192 + (gConfigGeneral.debugging_tools ? TabWidth : 0), 159, 500, 450);
Added window_peep_inventory events. All events finished.
2014-09-15 18:42:49 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x00698315
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_inventory_update(rct_window* w)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
w->frame_no++;
Added window_peep_inventory events. All events finished.
2014-09-15 18:42:49 +02:00
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
widget_invalidate(w, WIDX_TAB_2);
widget_invalidate(w, WIDX_TAB_6);
Added window_peep_inventory events. All events finished.
2014-09-15 18:42:49 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x00697EE1
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_inventory_invalidate(rct_window* w)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Refactor invalidate methods
2019-05-04 16:40:45 +02:00
window_guest_common_invalidate(w);
Added window_peep_inventory events. All events finished.
2014-09-15 18:42:49 +02:00
}
Refactor peep struct
2019-02-28 20:28:58 +01:00
static rct_string_id window_guest_inventory_format_item(Peep* peep, int32_t item)
refactor shop item strings
2015-08-05 20:17:37 +02:00
{
clang-format UI windows
2018-06-22 23:21:44 +02:00
Ride* ride;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Default arguments
Create ShopItemDescriptor
2019-04-26 20:25:11 +02:00
set_format_arg(0, uint32_t, ShopItems[item].Image);
set_format_arg(4, rct_string_id, ShopItems[item].Naming.Display);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
set_format_arg(6, rct_string_id, gParkName);
Replace our own integer types with standard ones
2018-06-20 17:28:51 +02:00
set_format_arg(8, uint32_t, gParkNameArgs);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
// Special overrides
clang-format UI windows
2018-06-22 23:21:44 +02:00
switch (item)
{
case SHOP_ITEM_BALLOON:
Create ShopItemDescriptor
2019-04-26 20:25:11 +02:00
set_format_arg(0, uint32_t, SPRITE_ID_PALETTE_COLOUR_1(peep->balloon_colour) | ShopItems[item].Image);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
case SHOP_ITEM_PHOTO:
ride = get_ride(peep->photo1_ride_ref);
set_format_arg(6, rct_string_id, ride->name);
set_format_arg(8, uint32_t, ride->name_arguments);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
case SHOP_ITEM_UMBRELLA:
Create ShopItemDescriptor
2019-04-26 20:25:11 +02:00
set_format_arg(0, uint32_t, SPRITE_ID_PALETTE_COLOUR_1(peep->umbrella_colour) | ShopItems[item].Image);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
break;
clang-format UI windows
2018-06-22 23:21:44 +02:00
case SHOP_ITEM_VOUCHER:
switch (peep->voucher_type)
{
case VOUCHER_TYPE_PARK_ENTRY_FREE:
set_format_arg(6, rct_string_id, STR_PEEP_INVENTORY_VOUCHER_PARK_ENTRY_FREE);
set_format_arg(8, rct_string_id, gParkName);
set_format_arg(10, uint32_t, gParkNameArgs);
break;
case VOUCHER_TYPE_RIDE_FREE:
ride = get_ride(peep->voucher_arguments);
set_format_arg(6, rct_string_id, STR_PEEP_INVENTORY_VOUCHER_RIDE_FREE);
set_format_arg(8, rct_string_id, ride->name);
set_format_arg(10, uint32_t, ride->name_arguments);
break;
case VOUCHER_TYPE_PARK_ENTRY_HALF_PRICE:
set_format_arg(6, rct_string_id, STR_PEEP_INVENTORY_VOUCHER_PARK_ENTRY_HALF_PRICE);
set_format_arg(8, rct_string_id, gParkName);
set_format_arg(10, uint32_t, gParkNameArgs);
break;
case VOUCHER_TYPE_FOOD_OR_DRINK_FREE:
set_format_arg(6, rct_string_id, STR_PEEP_INVENTORY_VOUCHER_FOOD_OR_DRINK_FREE);
Create ShopItemDescriptor
2019-04-26 20:25:11 +02:00
set_format_arg(8, rct_string_id, ShopItems[peep->voucher_arguments].Naming.Singular);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
}
break;
case SHOP_ITEM_HAT:
Create ShopItemDescriptor
2019-04-26 20:25:11 +02:00
set_format_arg(0, uint32_t, SPRITE_ID_PALETTE_COLOUR_1(peep->hat_colour) | ShopItems[item].Image);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case SHOP_ITEM_TSHIRT:
Create ShopItemDescriptor
2019-04-26 20:25:11 +02:00
set_format_arg(0, uint32_t, SPRITE_ID_PALETTE_COLOUR_1(peep->tshirt_colour) | ShopItems[item].Image);
clang-format UI windows
2018-06-22 23:21:44 +02:00
break;
case SHOP_ITEM_PHOTO2:
ride = get_ride(peep->photo2_ride_ref);
set_format_arg(6, rct_string_id, ride->name);
set_format_arg(8, uint32_t, ride->name_arguments);
break;
case SHOP_ITEM_PHOTO3:
ride = get_ride(peep->photo3_ride_ref);
set_format_arg(6, rct_string_id, ride->name);
set_format_arg(8, uint32_t, ride->name_arguments);
break;
case SHOP_ITEM_PHOTO4:
ride = get_ride(peep->photo4_ride_ref);
set_format_arg(6, rct_string_id, ride->name);
set_format_arg(8, uint32_t, ride->name_arguments);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
break;
}
return STR_GUEST_ITEM_FORMAT;
refactor shop item strings
2015-08-05 20:17:37 +02:00
}
Clean up the comments a litte • Make comment heads be /** • Make rct2 addresses be double spaced indented • Make there be a space afte rct2: and the address • Make single-line rct2 addresses be full block comments • Move description of method to top of comment
2015-12-11 16:38:37 +01:00
/**
*
* rct2: 0x00697F81
*/
clang-format UI windows
2018-06-22 23:21:44 +02:00
void window_guest_inventory_paint(rct_window* w, rct_drawpixelinfo* dpi)
remove registers from window events and changed to typed signatures
2015-07-10 02:39:16 +02:00
{
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
window_draw_widgets(w, dpi);
window_guest_overview_tab_paint(w, dpi);
window_guest_stats_tab_paint(w, dpi);
window_guest_rides_tab_paint(w, dpi);
window_guest_finance_tab_paint(w, dpi);
window_guest_thoughts_tab_paint(w, dpi);
window_guest_inventory_tab_paint(w, dpi);
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
window_guest_debug_tab_paint(w, dpi);
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor peep struct
2019-02-28 20:28:58 +01:00
const auto guest = (GET_PEEP(w->number))->AsGuest();
if (guest != nullptr)
{
rct_widget* pageBackgroundWidget = &window_guest_inventory_widgets[WIDX_PAGE_BACKGROUND];
int32_t x = w->x + pageBackgroundWidget->left + 4;
int32_t y = w->y + pageBackgroundWidget->top + 2;
int32_t itemNameWidth = pageBackgroundWidget->right - pageBackgroundWidget->left - 8;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor peep struct
2019-02-28 20:28:58 +01:00
int32_t maxY = w->y + w->height - 22;
int32_t numItems = 0;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor peep struct
2019-02-28 20:28:58 +01:00
gfx_draw_string_left(dpi, STR_CARRYING, nullptr, COLOUR_BLACK, x, y);
y += 10;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor peep struct
2019-02-28 20:28:58 +01:00
for (int32_t item = 0; item < SHOP_ITEM_COUNT; item++)
{
if (y >= maxY)
break;
if (!guest->HasItem(item))
continue;
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor peep struct
2019-02-28 20:28:58 +01:00
rct_string_id stringId = window_guest_inventory_format_item(guest, item);
y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, itemNameWidth, stringId, COLOUR_BLACK);
numItems++;
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
Refactor peep struct
2019-02-28 20:28:58 +01:00
if (numItems == 0)
{
gfx_draw_string_left(dpi, STR_NOTHING, nullptr, COLOUR_BLACK, x, y);
}
Expand tabs to spaces This commit expands tabs to spaces (ts=4) in all the files under src/ and test/. Until now we had two wildly different code styles with C using tabs and new C++ using spaces. It is painful to maintain as none of the commonly used tools support this kind of setup and in reality is needless, as we can simply convert all the sources to spaces and have opened PRs do the same, where needed. Additionally, trailing whitespace has been removed.
2017-06-06 23:24:18 +02:00
}
Added start of window_peep_overview_tab_paint Will not compile at present.
2014-08-27 17:49:31 +02:00
}
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
void window_guest_debug_resize(rct_window* w)
{
Fix guest window width for debugging tab Introduce a named constant for the width of a tab in the Guest window, and touch the places that set the window width to add it to the minimum window width when the debugging tab is enabled, so that the tab doesn't render off the side of the window.
2019-01-01 20:40:11 +01:00
window_set_resize(w, 192 + TabWidth, 159, 500, 450);
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
}
void window_guest_debug_invalidate(rct_window* w)
{
Refactor invalidate methods
2019-05-04 16:40:45 +02:00
window_guest_common_invalidate(w);
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
}
Improve text colour
2019-05-03 02:18:14 +02:00
static void draw_debug_label(rct_drawpixelinfo* dpi, int32_t x, int32_t y, const char* label, const char* value)
{
const char* args[2] = { label, value };
gfx_draw_string_left(dpi, STR_PEEP_DEBUG_LABEL, args, 0, x, y);
}
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
void window_guest_debug_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
window_guest_overview_tab_paint(w, dpi);
window_guest_stats_tab_paint(w, dpi);
window_guest_rides_tab_paint(w, dpi);
window_guest_finance_tab_paint(w, dpi);
window_guest_thoughts_tab_paint(w, dpi);
window_guest_inventory_tab_paint(w, dpi);
window_guest_debug_tab_paint(w, dpi);
Show peep coordinates in debug tab As a first debug stat to show, display a peep's current coordinates in the debug tab
2019-01-01 20:58:23 +01:00
Fix build
2019-05-02 22:56:03 +02:00
auto peep = GET_PEEP(w->number);
Improve text colour
2019-05-03 02:18:14 +02:00
auto x = w->x + window_guest_debug_widgets[WIDX_PAGE_BACKGROUND].left + 4;
auto y = w->y + window_guest_debug_widgets[WIDX_PAGE_BACKGROUND].top + 4;
Show peep coordinates in debug tab As a first debug stat to show, display a peep's current coordinates in the debug tab
2019-01-01 20:58:23 +01:00
Improve text colour
2019-05-03 02:18:14 +02:00
char buffer[512]{};
snprintf(buffer, sizeof(buffer), "%i, %i, %i", peep->x, peep->y, peep->z);
draw_debug_label(dpi, x, y, "Position", buffer);
Show peep coordinates in debug tab As a first debug stat to show, display a peep's current coordinates in the debug tab
2019-01-01 20:58:23 +01:00
y += LIST_ROW_HEIGHT;
More peep pathing info Show more peep debug data in the Guest debug tab, mostly to help with understanding pathfinding behaviour.
2019-01-01 21:36:31 +01:00
Improve text colour
2019-05-03 02:18:14 +02:00
snprintf(buffer, sizeof(buffer), "%u, %u, %u", peep->next_x, peep->next_y, peep->next_z);
More peep pathing info Show more peep debug data in the Guest debug tab, mostly to help with understanding pathfinding behaviour.
2019-01-01 21:36:31 +01:00
if (peep->GetNextIsSurface())
Use safe_strcat instead of strcat_s strcat_s is not available on all platforms, and we have a utility in the codebase that does basically the same thing already.
2019-01-05 13:53:08 +01:00
safe_strcat(buffer, " (surface)", sizeof(buffer));
More peep pathing info Show more peep debug data in the Guest debug tab, mostly to help with understanding pathfinding behaviour.
2019-01-01 21:36:31 +01:00
if (peep->GetNextIsSloped())
{
Improve text colour
2019-05-03 02:18:14 +02:00
char slopeBuf[32]{};
Eliminate itoa and use correct format specifiers Use snprintf instead of _itoa as it's not available on all platforms. Also change the format specifies for unsigned variables to %u instead of %i, to be more correct...
2019-01-05 14:01:48 +01:00
snprintf(slopeBuf, sizeof(slopeBuf), " (slope %u)", peep->GetNextDirection());
safe_strcat(buffer, slopeBuf, sizeof(buffer));
More peep pathing info Show more peep debug data in the Guest debug tab, mostly to help with understanding pathfinding behaviour.
2019-01-01 21:36:31 +01:00
}
Improve text colour
2019-05-03 02:18:14 +02:00
draw_debug_label(dpi, x, y, "Next", buffer);
More peep pathing info Show more peep debug data in the Guest debug tab, mostly to help with understanding pathfinding behaviour.
2019-01-01 21:36:31 +01:00
y += LIST_ROW_HEIGHT;
Use sizeof(buffer) instead of hardcoded size Use sizeof(buffer) instead of repeating 4096 in a bunch of places. Also, 4096 was maybe a bit overkill, drop it down to 512 instead.
2019-01-05 13:50:43 +01:00
snprintf(
Improve text colour
2019-05-03 02:18:14 +02:00
buffer, sizeof(buffer), "%u, %u, tolerance %u", peep->destination_x, peep->destination_y,
Use sizeof(buffer) instead of hardcoded size Use sizeof(buffer) instead of repeating 4096 in a bunch of places. Also, 4096 was maybe a bit overkill, drop it down to 512 instead.
2019-01-05 13:50:43 +01:00
peep->destination_tolerance);
Improve text colour
2019-05-03 02:18:14 +02:00
draw_debug_label(dpi, x, y, "Dest", buffer);
More peep pathing info Show more peep debug data in the Guest debug tab, mostly to help with understanding pathfinding behaviour.
2019-01-01 21:36:31 +01:00
y += LIST_ROW_HEIGHT;
Use sizeof(buffer) instead of hardcoded size Use sizeof(buffer) instead of repeating 4096 in a bunch of places. Also, 4096 was maybe a bit overkill, drop it down to 512 instead.
2019-01-05 13:50:43 +01:00
snprintf(
Improve text colour
2019-05-03 02:18:14 +02:00
buffer, sizeof(buffer), "%u, %u, %u dir %u", peep->pathfind_goal.x, peep->pathfind_goal.y,
Use sizeof(buffer) instead of hardcoded size Use sizeof(buffer) instead of repeating 4096 in a bunch of places. Also, 4096 was maybe a bit overkill, drop it down to 512 instead.
2019-01-05 13:50:43 +01:00
peep->pathfind_goal.z, peep->pathfind_goal.direction);
Improve text colour
2019-05-03 02:18:14 +02:00
draw_debug_label(dpi, x, y, "Pathfind Goal", buffer);
More peep pathing info Show more peep debug data in the Guest debug tab, mostly to help with understanding pathfinding behaviour.
2019-01-01 21:36:31 +01:00
y += LIST_ROW_HEIGHT;
Improve text colour
2019-05-03 02:18:14 +02:00
draw_debug_label(dpi, x, y, "Pathfind history", nullptr);
More peep pathing info Show more peep debug data in the Guest debug tab, mostly to help with understanding pathfinding behaviour.
2019-01-01 21:36:31 +01:00
y += LIST_ROW_HEIGHT;
x += 10;
Eliminate itoa and use correct format specifiers Use snprintf instead of _itoa as it's not available on all platforms. Also change the format specifies for unsigned variables to %u instead of %i, to be more correct...
2019-01-05 14:01:48 +01:00
for (auto& point : peep->pathfind_history)
{
Improve text colour
2019-05-03 02:18:14 +02:00
auto o = utf8_insert_codepoint(buffer, FORMAT_BLACK);
snprintf(buffer + o, sizeof(buffer) - o, "%u, %u, %u dir %u", point.x, point.y, point.z, point.direction);
gfx_draw_string(dpi, buffer, PALETTE_INDEX_10, x, y);
More peep pathing info Show more peep debug data in the Guest debug tab, mostly to help with understanding pathfinding behaviour.
2019-01-01 21:36:31 +01:00
y += LIST_ROW_HEIGHT;
}
x -= 10;
Add new debugging tab to the Guest window Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-01-01 20:13:18 +01:00
}