Skip to content

Commit 14189e7

Browse files
committed
Updated c_window_manager::allocate_named_screen
1 parent 0bd0451 commit 14189e7

16 files changed

+153
-38
lines changed

game/source/interface/gui_screens/boot_betrayer/gui_screen_boot_betrayer.cpp

Lines changed: 37 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,58 @@
33
#include "interface/user_interface_mapping.hpp"
44
#include "tag_files/string_ids.hpp"
55

6-
void c_gui_screen_boot_betrayer::set_current_player_id(s_player_identifier const* current_player_id)
6+
//00AB5450
7+
c_load_boot_betrayer_screen_message::c_load_boot_betrayer_screen_message(e_controller_index controller, e_window_index window, long layered_position, s_player_identifier const* current_player_id, s_player_identifier const* target_player_id) :
8+
c_load_screen_message(STRING_ID(gui, boot_betrayer) + (user_interface_get_local_user_window_count() > 1), controller, window, layered_position),
9+
m_current_player_id(*current_player_id),
10+
m_target_player_id(*target_player_id)
711
{
8-
m_current_player_id = *current_player_id;
912
}
1013

11-
s_player_identifier const* c_gui_screen_boot_betrayer::get_target_player_id()
14+
//.text:00AB54B0 ; public: virtual c_gui_screen_boot_betrayer::~c_gui_screen_boot_betrayer()
15+
16+
//00AB54C0
17+
c_load_boot_betrayer_screen_message::~c_load_boot_betrayer_screen_message()
1218
{
13-
return &m_target_player_id;
1419
}
1520

16-
void c_gui_screen_boot_betrayer::set_target_player_id(s_player_identifier const* target_player_id)
21+
//.text:00AB54D0 ; public: virtual void* c_gui_screen_boot_betrayer::`vector deleting destructor'(unsigned int)
22+
//.text:00AB5500 ; public: virtual void* c_load_boot_betrayer_screen_message::`vector deleting destructor'(unsigned int)
23+
24+
void c_load_boot_betrayer_screen_message::apply_initial_state(c_gui_screen_widget* screen) const
1725
{
18-
m_target_player_id = *target_player_id;
26+
//INVOKE_CLASS_MEMBER(0x00AB5530, c_load_boot_betrayer_screen_message, apply_initial_state, screen);
27+
28+
static_cast<c_gui_screen_boot_betrayer*>(screen)->set_current_player_id(&m_current_player_id);
29+
static_cast<c_gui_screen_boot_betrayer*>(screen)->set_target_player_id(&m_target_player_id);
1930
}
2031

21-
c_load_boot_betrayer_screen_message::c_load_boot_betrayer_screen_message(e_controller_index controller, e_window_index window, long layered_position, s_player_identifier const* current_player_id, s_player_identifier const* target_player_id) :
22-
c_load_screen_message(STRING_ID(gui, boot_betrayer) + (user_interface_get_local_user_window_count() > 1), controller, window, layered_position),
23-
m_current_player_id(*current_player_id),
24-
m_target_player_id(*target_player_id)
32+
//.text:00AB5560 ; private: void c_gui_screen_boot_betrayer::boot_player()
33+
//.text:00AB5660 ; public: virtual void c_gui_screen_boot_betrayer::dispose()
34+
35+
s_player_identifier const* c_gui_screen_boot_betrayer::get_target_player_id() const
2536
{
37+
//return INVOKE_CLASS_MEMBER(0x00AB5690, c_gui_screen_boot_betrayer, get_target_player_id);
38+
39+
return &m_target_player_id;
2640
}
2741

28-
c_load_boot_betrayer_screen_message::~c_load_boot_betrayer_screen_message()
42+
//.text:00AB56A0 ; public: virtual bool c_gui_screen_boot_betrayer::handle_controller_input_message(c_controller_input_message const*)
43+
//.text:00AB5760 ; public: virtual bool c_gui_screen_boot_betrayer::handle_dialog_result(c_dialog_result_message const*)
44+
//.text:00AB57A0 ; public: virtual void c_gui_screen_boot_betrayer::initialize()
45+
//.text:00AB5820 ; parse_griefer_name
46+
47+
void c_gui_screen_boot_betrayer::set_current_player_id(s_player_identifier const* current_player_id)
2948
{
49+
//INVOKE_CLASS_MEMBER(0x00AB5890, c_gui_screen_boot_betrayer, set_current_player_id, current_player_id);
50+
51+
m_current_player_id = *current_player_id;
3052
}
3153

32-
void c_load_boot_betrayer_screen_message::apply_initial_state(c_gui_screen_widget* screen) const
54+
void c_gui_screen_boot_betrayer::set_target_player_id(s_player_identifier const* target_player_id)
3355
{
34-
static_cast<c_gui_screen_boot_betrayer*>(screen)->set_current_player_id(&m_current_player_id);
35-
static_cast<c_gui_screen_boot_betrayer*>(screen)->set_target_player_id(&m_target_player_id);
56+
//INVOKE_CLASS_MEMBER(0x00AB58B0, c_gui_screen_boot_betrayer, set_target_player_id, target_player_id);
57+
58+
m_target_player_id = *target_player_id;
3659
}
3760

game/source/interface/gui_screens/boot_betrayer/gui_screen_boot_betrayer.hpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,15 @@ struct c_gui_screen_boot_betrayer :
88
public c_gui_screen_widget
99
{
1010
public:
11+
c_gui_screen_boot_betrayer(long name) :
12+
c_gui_screen_widget(name)
13+
{
14+
DECLFUNC(0x00AB5410, c_gui_screen_boot_betrayer*, __thiscall, c_gui_screen_boot_betrayer*, long)(this, name);
15+
}
16+
1117
void set_current_player_id(s_player_identifier const* current_player_id);
1218

13-
s_player_identifier const* get_target_player_id();
19+
s_player_identifier const* get_target_player_id() const;
1420
void set_target_player_id(s_player_identifier const* target_player_id);
1521

1622
protected:

game/source/interface/gui_screens/campaign/gui_screen_campaign_select_difficulty.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ struct c_gui_screen_campaign_select_difficulty :
1111
public c_gui_screen_widget
1212
{
1313
public:
14+
c_gui_screen_campaign_select_difficulty(long name) :
15+
c_gui_screen_widget(name)
16+
{
17+
DECLFUNC(0x00AFC2D0, c_gui_screen_campaign_select_difficulty*, __thiscall, c_gui_screen_campaign_select_difficulty*, long)(this, name);
18+
}
19+
1420
void setup(e_gui_campaign_difficulty_setup_mode campaign_setup_mode, e_campaign_id campaign_id, e_map_id map_id, e_campaign_difficulty_level difficulty);
1521

1622
//protected:

game/source/interface/gui_screens/campaign/gui_screen_campaign_select_level.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ struct c_gui_screen_campaign_select_level :
1414
public:
1515
void __thiscall post_initialize_();
1616

17+
c_gui_screen_campaign_select_level(long name) :
18+
c_gui_screen_widget(name)
19+
{
20+
DECLFUNC(0x00AFCA00, c_gui_screen_campaign_select_level*, __thiscall, c_gui_screen_campaign_select_level*, long)(this, name);
21+
}
22+
1723
void setup(e_gui_campaign_level_setup_mode campaign_setup_mode, e_campaign_id campaign_id, e_map_id map_id, short campaign_insertion_point);
1824

1925
//protected:

game/source/interface/gui_screens/error_dialogs/screen_error_dialog.hpp

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,7 @@
22

33
#include "interface/c_gui_screen_widget.hpp"
44

5-
enum e_gui_error_category
6-
{
7-
_gui_error_category_default = 0,
8-
_gui_error_category_networking,
9-
_gui_error_category_storage,
10-
_gui_error_category_controller,
11-
12-
k_gui_error_category_count
13-
};
5+
enum e_gui_error_category;
146

157
struct s_gui_error
168
{

game/source/interface/gui_screens/game_details/gui_game_details.hpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,19 @@
22

33
#include "interface/gui_screens/game_info_screen/game_info_screen.hpp"
44
#include "networking/logic/network_session_interface.hpp"
5+
#include "networking/messages/network_messages_out_of_band.hpp"
56

67
struct c_gui_game_details :
78
c_gui_game_info_screen
89
{
10+
public:
11+
c_gui_game_details(long name) :
12+
c_gui_game_info_screen(name)
13+
{
14+
DECLFUNC(0x00B0AB70, c_gui_game_info_screen*, __thiscall, c_gui_game_info_screen*, long)(this, name);
15+
}
16+
17+
//protected:
918
s_network_session_status_data m_status_data;
1019
};
1120
static_assert(sizeof(c_gui_game_details) == 0x17F60);

game/source/interface/gui_screens/game_info_screen/game_info_screen.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,11 @@
55
struct c_gui_game_info_screen :
66
c_gui_screen_widget
77
{
8+
public:
9+
c_gui_game_info_screen(long name) :
10+
c_gui_screen_widget(name)
11+
{
12+
DECLFUNC(0x00ADE090, c_gui_game_info_screen*, __thiscall, c_gui_game_info_screen*, long)(this, name);
13+
}
814
};
915
static_assert(sizeof(c_gui_game_info_screen) == sizeof(c_gui_screen_widget));

game/source/interface/gui_screens/player_select/gui_player_select_screen_widget.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ struct c_gui_player_select_screen_widget :
99
public:
1010
void __thiscall initialize_();
1111

12+
c_gui_player_select_screen_widget(long name) :
13+
c_gui_screen_widget(name)
14+
{
15+
DECLFUNC(0x00B07790, c_gui_player_select_screen_widget*, __thiscall, c_gui_player_select_screen_widget*, long)(this, name);
16+
}
17+
1218
//protected:
1319
s_player_identifier m_current_player_id;
1420
s_player_identifier m_target_player_id;

game/source/interface/gui_screens/pregame_lobby/gui_screen_pregame_lobby.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ struct c_gui_screen_pregame_lobby :
1919
//virtual void stop_fade_during_countdown();
2020

2121
public:
22+
c_gui_screen_pregame_lobby(long name) :
23+
c_gui_screen_widget(name)
24+
{
25+
DECLFUNC(0x00B21180, c_gui_screen_pregame_lobby*, __thiscall, c_gui_screen_pregame_lobby*, long)(this, name);
26+
}
27+
2228
bool __thiscall handle_controller_input_message_(c_controller_input_message* message);
2329
bool __thiscall handle_list_item_chosen_(c_controller_input_message const* message, long list_name, c_gui_list_item_widget* list_item_widget, c_gui_data* datasource);
2430
void __thiscall initialize_();

game/source/interface/gui_screens/pregame_lobby/gui_screen_pregame_lobby_campaign.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ struct c_gui_screen_pregame_lobby_campaign :
1616
//void __thiscall initialize_();
1717
//void __thiscall load_progress_ui_(e_controller_index controller_index);
1818

19+
c_gui_screen_pregame_lobby_campaign(long name) :
20+
c_gui_screen_pregame_lobby(name)
21+
{
22+
DECLFUNC(0x00AFF7A0, c_gui_screen_pregame_lobby_campaign*, __thiscall, c_gui_screen_pregame_lobby_campaign*, long)(this, name);
23+
}
24+
1925
//protected:
2026
long m_last_player_count;
2127
e_network_session_class m_session_class;

0 commit comments

Comments
 (0)