|
6 | 6 | #include "cache/pc_texture_cache.hpp" |
7 | 7 | #include "cache/restricted_memory.hpp" |
8 | 8 | #include "cache/restricted_memory_regions.hpp" |
| 9 | +#include "config/version.hpp" |
9 | 10 | #include "cseries/async.hpp" |
10 | 11 | #include "cseries/async_helpers.hpp" |
11 | 12 | #include "cseries/async_xoverlapped.hpp" |
@@ -1845,12 +1846,12 @@ void __cdecl main_prepare_to_switch_zone_set_private() |
1845 | 1846 |
|
1846 | 1847 | void __cdecl main_print_version() |
1847 | 1848 | { |
1848 | | - INVOKE(0x00506AB0, main_print_version); |
| 1849 | + //INVOKE(0x00506AB0, main_print_version); |
1849 | 1850 |
|
1850 | | - //console_printf(shell_get_version()); |
1851 | | - //console_printf("minor version %d cache file language %s", |
1852 | | - // get_map_minor_version(), |
1853 | | - // get_language_display_name(get_map_language())); |
| 1851 | + console_printf(version_get_full_string() /*shell_get_version()*/); |
| 1852 | + console_printf("minor version %d cache file language %s", |
| 1853 | + get_map_minor_version(), |
| 1854 | + get_language_display_name(get_map_language())); |
1854 | 1855 | } |
1855 | 1856 |
|
1856 | 1857 | void __cdecl main_reload_active_zone_set_private() |
@@ -1901,14 +1902,15 @@ void __cdecl main_reset_zone_resources() |
1901 | 1902 | { |
1902 | 1903 | INVOKE(0x00506B70, main_reset_zone_resources); |
1903 | 1904 |
|
1904 | | - //if (!global_scenario_try_and_get()) |
| 1905 | + //if (global_scenario_try_and_get()) |
| 1906 | + //{ |
| 1907 | + // //main_trace_event_internal(__FUNCTION__); |
| 1908 | + // main_globals.reset_zone_resources = true; |
| 1909 | + //} |
| 1910 | + //else |
1905 | 1911 | //{ |
1906 | 1912 | // console_warning("tried to switch to a zone-set without a scenario loaded"); |
1907 | | - // return; |
1908 | 1913 | //} |
1909 | | - // |
1910 | | - ////main_trace_event_internal(__FUNCTION__); |
1911 | | - //main_globals.reset_zone_resources = true; |
1912 | 1914 | } |
1913 | 1915 |
|
1914 | 1916 | void __cdecl main_reset_zone_resources_private() |
|
0 commit comments