Skip to content

Commit df08f56

Browse files
twist84twist84
committed
Another handful of hs functions
1 parent 7624854 commit df08f56

20 files changed

+491
-138
lines changed

‎game/game.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ copy /b "$(ProjectDir)source\config\version.cpp" +,, "$(ProjectDir)source\config
235235
<ClCompile Include="source\interface\gui_screens\campaign\gui_screen_campaign_select_level.cpp" />
236236
<ClCompile Include="source\interface\gui_screens\campaign\gui_screen_campaign_select_skulls.cpp" />
237237
<ClCompile Include="source\interface\gui_screens\campaign\gui_screen_campaign_settings.cpp" />
238+
<ClCompile Include="source\interface\gui_screens\dialog\gui_screen_dialog.cpp" />
238239
<ClCompile Include="source\interface\gui_screens\director\gui_screen_saved_film_control_pad.cpp" />
239240
<ClCompile Include="source\interface\gui_screens\error_dialogs\screen_error_dialog_ok.cpp" />
240241
<ClCompile Include="source\interface\gui_screens\game_options\gui_screen_game_options.cpp" />
@@ -988,6 +989,7 @@ copy /b "$(ProjectDir)source\config\version.cpp" +,, "$(ProjectDir)source\config
988989
<ClInclude Include="source\interface\debug_menu\debug_menu_scroll.hpp" />
989990
<ClInclude Include="source\interface\debug_menu\debug_menu_zone_sets.hpp" />
990991
<ClInclude Include="source\interface\gui_pregame_setup_manager.hpp" />
992+
<ClInclude Include="source\interface\gui_screens\dialog\gui_screen_dialog.hpp" />
991993
<ClInclude Include="source\interface\gui_screens\director\gui_screen_saved_film_control_pad.hpp" />
992994
<ClInclude Include="source\interface\gui_screens\error_dialogs\screen_error_dialog.hpp" />
993995
<ClInclude Include="source\interface\gui_screens\error_dialogs\screen_error_dialog_ok.hpp" />

‎game/game.vcxproj.filters‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2079,6 +2079,9 @@
20792079
<ClCompile Include="source\game\player_scipting.cpp">
20802080
<Filter>Source Files</Filter>
20812081
</ClCompile>
2082+
<ClCompile Include="source\interface\gui_screens\dialog\gui_screen_dialog.cpp">
2083+
<Filter>Source Files</Filter>
2084+
</ClCompile>
20822085
</ItemGroup>
20832086
<ItemGroup>
20842087
<ClInclude Include="source\camera\camera.hpp">
@@ -4589,6 +4592,9 @@
45894592
<ClInclude Include="source\game\player_scipting.hpp">
45904593
<Filter>Header Files</Filter>
45914594
</ClInclude>
4595+
<ClInclude Include="source\interface\gui_screens\dialog\gui_screen_dialog.hpp">
4596+
<Filter>Header Files</Filter>
4597+
</ClInclude>
45924598
</ItemGroup>
45934599
<ItemGroup>
45944600
<ResourceCompile Include="resource\resource.rc">

‎game/source/cseries/cseries_events.cpp‎

Lines changed: 211 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,13 @@ void events_debug_render()
578578
}
579579
}
580580

581+
void events_disable_suppression(bool enable)
582+
{
583+
event_globals.disable_event_suppression = enable;
584+
console_printf("event suppression now %s",
585+
enable ? "enabled" : "disabled");
586+
}
587+
581588
void events_dispose()
582589
{
583590
event_logs_dispose();
@@ -586,6 +593,13 @@ void events_dispose()
586593
g_events_initialized = false;
587594
}
588595

596+
void events_enabled(bool enable)
597+
{
598+
event_globals.enable_events = enable;
599+
console_printf("events now %s",
600+
enable ? "enabled" : "disabled");
601+
}
602+
589603
const char* __cdecl events_get()
590604
{
591605
return event_globals.message_buffer;
@@ -891,6 +905,16 @@ void __cdecl events_initialize()
891905
event(_event_message, "lifecycle: events initalize");
892906
}
893907

908+
void events_suppress_console_display(bool suppress)
909+
{
910+
event_globals.suppress_console_display_and_show_spinner = suppress;
911+
}
912+
913+
void event_dump_categories(const char* event_name)
914+
{
915+
// $IMPLEMENT
916+
}
917+
894918
void event_initialize_primary_logs()
895919
{
896920
{
@@ -1578,6 +1602,193 @@ int32 c_event::generate_va(const char* format, char* argument_list)
15781602
return m_event_category_index;
15791603
}
15801604

1605+
void event_set_display_level_global(int32 display_level)
1606+
{
1607+
if (!VALID_INDEX(display_level, k_event_level_count))
1608+
{
1609+
console_printf("invalid display_level (%d)", display_level);
1610+
}
1611+
else
1612+
{
1613+
e_event_level level = (e_event_level)display_level;
1614+
if (display_level == k_event_level_count)
1615+
{
1616+
display_level = k_event_level_none;
1617+
}
1618+
1619+
event_globals.current_display_level = level;
1620+
console_printf("global display level set to %s",
1621+
k_event_level_names[display_level]);
1622+
}
1623+
}
1624+
1625+
void event_set_log_level_global(int32 log_level)
1626+
{
1627+
if (!VALID_INDEX(log_level, k_event_level_count))
1628+
{
1629+
console_printf("invalid display_level (%d)",
1630+
log_level);
1631+
}
1632+
else
1633+
{
1634+
e_event_level level = (e_event_level)log_level;
1635+
if (log_level == k_event_level_count)
1636+
{
1637+
log_level = k_event_level_none;
1638+
}
1639+
1640+
event_globals.current_log_level = level;
1641+
console_printf("global log level set to %s",
1642+
k_event_level_names[log_level]);
1643+
}
1644+
}
1645+
1646+
void event_set_remote_log_level_global(int32 remote_log_level)
1647+
{
1648+
if (!VALID_INDEX(remote_log_level, k_event_level_count))
1649+
{
1650+
console_printf("invalid remote_log_level (%d)",
1651+
remote_log_level);
1652+
}
1653+
else
1654+
{
1655+
e_event_level level = (e_event_level)remote_log_level;
1656+
if (remote_log_level == k_event_level_count)
1657+
{
1658+
remote_log_level = k_event_level_none;
1659+
}
1660+
1661+
event_globals.current_remote_log_level = level;
1662+
console_printf("global remote log level set to %s",
1663+
k_event_level_names[remote_log_level]);
1664+
}
1665+
}
1666+
1667+
static void event_set_category_level_by_name_internal(char const* category, c_category_properties_flags flags, e_event_level event_level, long event_listener_index, bool display_results_to_console)
1668+
{
1669+
// $IMPLEMENT
1670+
}
1671+
1672+
void event_set_debugger_break_level_by_name(const char* event_name, int32 debugger_break_level)
1673+
{
1674+
if (!VALID_INDEX(debugger_break_level, k_event_level_count))
1675+
{
1676+
console_printf("invalid debugger_break_level (%d)",
1677+
debugger_break_level);
1678+
}
1679+
else
1680+
{
1681+
e_event_level level = (e_event_level)debugger_break_level;
1682+
if (debugger_break_level == k_event_level_count)
1683+
{
1684+
debugger_break_level = k_event_level_none;
1685+
}
1686+
1687+
c_category_properties_flags flags = FLAG(_category_properties_debugger_break_level_bit);
1688+
event_set_category_level_by_name_internal(event_name, flags, level, k_event_level_none, true);
1689+
}
1690+
}
1691+
1692+
void event_set_display_level_by_name(const char* event_name, int32 display_level)
1693+
{
1694+
if (!VALID_INDEX(display_level, k_event_level_count))
1695+
{
1696+
console_printf("invalid display_level (%d)",
1697+
display_level);
1698+
}
1699+
else
1700+
{
1701+
e_event_level level = (e_event_level)display_level;
1702+
if (display_level == k_event_level_count)
1703+
{
1704+
display_level = k_event_level_none;
1705+
}
1706+
1707+
c_category_properties_flags flags = FLAG(_category_properties_display_level_bit);
1708+
event_set_category_level_by_name_internal(event_name, flags, level, k_event_level_none, true);
1709+
}
1710+
}
1711+
1712+
void event_set_force_display_level_by_name(const char* event_name, int32 force_display_level)
1713+
{
1714+
if (!VALID_INDEX(force_display_level, k_event_level_count))
1715+
{
1716+
console_printf("invalid force_display_level (%d)",
1717+
force_display_level);
1718+
}
1719+
else
1720+
{
1721+
e_event_level level = (e_event_level)force_display_level;
1722+
if (force_display_level == k_event_level_count)
1723+
{
1724+
force_display_level = k_event_level_none;
1725+
}
1726+
1727+
c_category_properties_flags flags = FLAG(_category_properties_force_display_level_bit);
1728+
event_set_category_level_by_name_internal(event_name, flags, level, k_event_level_none, true);
1729+
}
1730+
}
1731+
1732+
void event_set_halt_level_by_name(const char* event_name, int32 halt_level)
1733+
{
1734+
if (!VALID_INDEX(halt_level, k_event_level_count))
1735+
{
1736+
console_printf("invalid halt_level (%d)",
1737+
halt_level);
1738+
}
1739+
else
1740+
{
1741+
e_event_level level = (e_event_level)halt_level;
1742+
if (halt_level == k_event_level_count)
1743+
{
1744+
halt_level = k_event_level_none;
1745+
}
1746+
1747+
c_category_properties_flags flags = FLAG(_category_properties_halt_level_bit);
1748+
event_set_category_level_by_name_internal(event_name, flags, level, k_event_level_none, true);
1749+
}
1750+
}
1751+
1752+
void event_set_log_level_by_name(const char* event_name, int32 log_level)
1753+
{
1754+
if (!VALID_INDEX(log_level, k_event_level_count))
1755+
{
1756+
console_printf("invalid log_level (%d)",
1757+
log_level);
1758+
}
1759+
else
1760+
{
1761+
e_event_level level = (e_event_level)log_level;
1762+
if (log_level == k_event_level_count)
1763+
{
1764+
log_level = k_event_level_none;
1765+
}
1766+
1767+
c_category_properties_flags flags = FLAG(_category_properties_log_level_bit);
1768+
event_set_category_level_by_name_internal(event_name, flags, level, k_event_level_none, true);
1769+
}
1770+
}
1771+
1772+
void event_set_remote_log_level_by_name(const char* event_name, int32 remote_log_level)
1773+
{
1774+
if (!VALID_INDEX(remote_log_level, k_event_level_count))
1775+
{
1776+
console_printf("invalid remote_log_level (%d)",
1777+
remote_log_level);
1778+
}
1779+
else
1780+
{
1781+
e_event_level level = (e_event_level)remote_log_level;
1782+
if (remote_log_level == k_event_level_count)
1783+
{
1784+
remote_log_level = k_event_level_none;
1785+
}
1786+
1787+
c_category_properties_flags flags = FLAG(_category_properties_remote_log_level_bit);
1788+
event_set_category_level_by_name_internal(event_name, flags, level, k_event_level_none, true);
1789+
}
1790+
}
1791+
15811792
void reset_event_message_buffer()
15821793
{
15831794
event_globals.message_buffer_size = 0;

‎game/source/cseries/cseries_events.hpp‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
#include "cseries/cseries.hpp"
44
#include "memory/read_write_lock.hpp"
55

6+
typedef c_flags<e_category_properties_flags, uns16, k_category_properties_flags_count> c_category_properties_flags;
7+
68
enum e_event_respose_suppress_flag
79
{
810
_event_response_suppress_console_bit = 0,
@@ -177,13 +179,26 @@ struct s_file_reference;
177179
extern s_file_reference* __cdecl create_report_file_reference(s_file_reference* reference, const char* name, bool place_in_report_directory);
178180
extern void events_clear();
179181
extern void events_debug_render();
182+
extern void events_disable_suppression(bool enable);
180183
extern void events_dispose();
184+
extern void events_enabled(bool enable);
181185
extern const char* events_get();
182186
extern void events_initialize();
187+
extern void events_suppress_console_display(bool suppress);
188+
extern void event_dump_categories(const char* event_name);
183189
extern void event_initialize_primary_logs();
184190
extern int32 event_interlocked_compare_exchange(int32 volatile* destination, int32 exchange, int32 comperand);
185191
extern void event_recalculate_minimum_category_level();
186192
extern void event_recalculate_minimum_level();
193+
extern void event_set_display_level_global(int32 display_level);
194+
extern void event_set_log_level_global(int32 log_level);
195+
extern void event_set_remote_log_level_global(int32 remote_log_level);
196+
extern void event_set_debugger_break_level_by_name(const char* event_name, int32 debugger_break_level);
197+
extern void event_set_display_level_by_name(const char* event_name, int32 display_level);
198+
extern void event_set_force_display_level_by_name(const char* event_name, int32 force_display_level);
199+
extern void event_set_halt_level_by_name(const char* event_name, int32 halt_level);
200+
extern void event_set_log_level_by_name(const char* event_name, int32 log_level);
201+
extern void event_set_remote_log_level_by_name(const char* event_name, int32 remote_log_level);
187202
extern void reset_event_message_buffer();
188203
extern void __cdecl network_debug_print(const char* format, ...);
189204

0 commit comments

Comments
 (0)