Partial revert of 6e640ad

Author: twist84

game/source/hs/hs_globals_external.cpp

@@ -78,11 +78,14 @@ c_gui_screen_widget::c_gui_screen_widget(int32 name) :
 	m_current_focused_widget(nullptr),
 	m_suppress_focus(false),
 	m_render_in_screenshot(false),
+	m_current_display_group_widgets(),
+	m_previous_display_group_widgets(),
+	m_current_display_group_indicies(),
 	m_reload_next_frame(false),
 	m_responds_to_controller_events(true),
 	m_initial_focused_widget(NONE),
 	m_initial_focused_widget_element_handle(NONE),
-	m_initial_focused_widget_column_name(NONE),
+	m_initial_focused_widget_column_name(_string_id_invalid),
 	m_initial_focused_widget_column_value(NONE),
 	m_definition(),
 	m_datasource_count(0),
@@ -1199,7 +1202,7 @@ bool c_gui_screen_widget::try_and_get_render_data_emblem_info(c_gui_bitmap_widge
 {
 	//return INVOKE_CLASS_MEMBER(0x00AB2930, c_gui_screen_widget, try_and_get_render_data_emblem_info, bitmap_widget, emblem_info);
 
-	return nullptr;
+	return false;
 }
 
 void c_gui_screen_widget::update(uns32 current_milliseconds)

game/source/interface/c_gui_screen_widget.cpp

@@ -279,8 +279,8 @@ class c_gui_screen_widget :
 	c_gui_widget* m_current_focused_widget;
 	bool m_suppress_focus;
 	bool m_render_in_screenshot;
-	int32 m_current_display_group_widgets[k_display_group_type_count];
-	int32 m_previous_display_group_widgets[k_display_group_type_count];
+	c_gui_group_widget* m_current_display_group_widgets[k_display_group_type_count];
+	c_gui_group_widget* m_previous_display_group_widgets[k_display_group_type_count];
 	int32 m_current_display_group_indicies[k_display_group_type_count];
 	bool m_reload_next_frame;
 	bool m_responds_to_controller_events;

game/source/interface/c_gui_screen_widget.hpp

@@ -119,7 +119,7 @@ c_gui_widget::c_gui_widget(e_gui_widget_type type) :
 	m_children(nullptr),
 	m_next(nullptr),
 	m_previous(nullptr),
-	m_name(nullptr),
+	m_name(_string_id_invalid),
 	__unknown44(0),
 	m_flags(0),
 	__unknown4C(0),

game/source/interface/c_gui_widget.cpp

@@ -312,7 +312,7 @@ const char* debug_menu_build_item_hs_variable_global(c_debug_menu* menu, char* e
 		real32 max_value = g_parser_state.m_has_max ? g_parser_state.m_max : k_real_max;
 		real32 min_value = g_parser_state.m_has_min ? g_parser_state.m_min : k_real_min;
 
-		item = DEBUG_MENU_MALLOC(c_debug_menu_item_type_real, menu, name, nullptr, g_parser_state.m_variable, min_value, max_value, inc_value);
+		item = DEBUG_MENU_MALLOC(c_debug_menu_item_type_real, menu, name, NULL, g_parser_state.m_variable, min_value, max_value, inc_value);
 	}
 	break;
 	case _hs_type_short_integer:
@@ -321,7 +321,7 @@ const char* debug_menu_build_item_hs_variable_global(c_debug_menu* menu, char* e
 		int16 max_value = g_parser_state.m_has_max ? (int16)g_parser_state.m_max : SHRT_MAX - 1;
 		int16 min_value = g_parser_state.m_has_min ? (int16)g_parser_state.m_min : SHRT_MIN + 1;
 
-		item = DEBUG_MENU_MALLOC(c_debug_menu_item_type_short, menu, name, nullptr, g_parser_state.m_variable, min_value, max_value, inc_value);
+		item = DEBUG_MENU_MALLOC(c_debug_menu_item_type_short, menu, name, NULL, g_parser_state.m_variable, min_value, max_value, inc_value);
 	}
 	break;
 	case _hs_type_long_integer:
@@ -330,7 +330,7 @@ const char* debug_menu_build_item_hs_variable_global(c_debug_menu* menu, char* e
 		int32 max_value = g_parser_state.m_has_max ? (int32)g_parser_state.m_max : LONG_MAX - 1;
 		int32 min_value = g_parser_state.m_has_min ? (int32)g_parser_state.m_min : LONG_MIN + 1;
 
-		item = DEBUG_MENU_MALLOC(c_debug_menu_item_type_long, menu, name, nullptr, g_parser_state.m_variable, min_value, max_value, inc_value);
+		item = DEBUG_MENU_MALLOC(c_debug_menu_item_type_long, menu, name, NULL, g_parser_state.m_variable, min_value, max_value, inc_value);
 	}
 	break;
 	}

game/source/interface/debug_menu/debug_menu_parse.cpp

@@ -401,7 +401,7 @@ uns32 __cdecl online_guide_show_player_review_ui(e_controller_index controller_i
 	MessageBoxA(nullptr, "Player Review UI Placeholder", "networking:online:guide", MB_OK);
 
 	ASSERT(VALID_INDEX(controller_index, k_number_of_controllers));
-	ASSERT(target_user_xuid != nullptr);
+	ASSERT(target_user_xuid != NULL);
 
 	//uns32 result = E_FAIL;
 	//c_static_string<256> error_string;

game/source/networking/online/online_guide_pc.cpp

@@ -56,7 +56,7 @@ c_splash_screen::c_splash_screen() :
 	m_instance(GetModuleHandle(nullptr)),
 	m_hwnd(nullptr),
 	m_bitmap(nullptr),
-	m_gdiplus_token(nullptr),
+	m_gdiplus_token(NULL),
 	m_alpha(0),
 	m_step(0),
 	m_timer_interval(0),

game/source/shell/shell_splash.cpp

@@ -10,22 +10,18 @@ bool __cdecl font_character_validate(const s_font_character* character)
 {
 	return INVOKE(0x0065B4B0, font_character_validate, character);
 
-	//ASSERT(character);
-	//int16 character_width = character->character_width;
-	//if (character->character_width < 0)
-	//	character_width = -character_width;
-	//int16 initial_offset = character->initial_offset;
-	//if (initial_offset < 0)
-	//	initial_offset = -initial_offset;
-	//bool valid = initial_offset < 256
-	//	&& character->bitmap_height < 64
-	//	&& character->bitmap_width < 256
-	//	&& character->packed_size < 0x2000
-	//	&& character_width <= 256;
-	//int16 bitmap_origin_y = character->bitmap_origin_y;
-	//if (bitmap_origin_y < 0)
-	//	bitmap_origin_y = -bitmap_origin_y;
-	//return bitmap_origin_y < 64 && valid;
+#if 0
+	ASSERT(character);
+
+	bool valid = (character->initial_offset < 0 ? -character->initial_offset : character->initial_offset) < 256;
+	valid = valid && character->bitmap_height < 64;
+	valid = valid && character->bitmap_width < 256;
+	valid = valid && character->packed_size < 0x2000;
+	valid = valid && (character->character_width < 0 ? -character->character_width : character->character_width) <= 256;
+	valid = valid && (character->bitmap_origin_y < 0 ? -character->bitmap_origin_y : character->bitmap_origin_y) < 64;
+
+	return valid;
+#endif
 }
 
 int16 __cdecl font_get_kerning_pair_offset(const s_font_header* header, uns32 first_character, uns32 second_character)

game/source/text/font_group.cpp

@@ -64,7 +64,7 @@ bool __cdecl font_package_file_header_validate(const s_font_package_file_header*
 
 	for (int32 font_mapping_index = 0; font_mapping_index < NUMBEROF(package_header->font_mapping); font_mapping_index++)
 	{
-		int32 font_index = package_header->font_mapping[k];
+		int32 font_index = package_header->font_mapping[font_mapping_index];
 		valid = valid && font_index == NONE || VALID_INDEX(font_index, package_header->font_count);
 	}
 

game/source/text/font_package_cache.cpp

@@ -83,7 +83,7 @@ void c_raw_connection::connect()
 {
 	SOCKADDR_IN server_addr;
 
-	assert(m_remote_ip && m_remote_ip[0] != nullptr);
+	assert(m_remote_ip && m_remote_ip[0] != 0);
 	assert(m_remote_port);
 
 	server_addr.sin_family = AF_INET;