Documentation: add doc explaining VGUI2 support status, and how to enable it

.builds/alpine.yml

@@ -1,27 +0,0 @@
-image: alpine/latest
-packages:
-- build-base
-- sdl2-dev
-- freetype-dev
-- fontconfig-dev
-- opus-dev
-sources:
-- https://git.sr.ht/~a1batross/xash3d-fwgs
-tasks:
-- client: |
-    cd xash3d-fwgs
-    ./waf configure -8 --enable-tests --enable-engine-tests build install --destdir=bin
-- server: |
-    cd xash3d-fwgs
-    ./waf configure --reconfigure --dedicated build install --destdir=bin
-- run-tests: |
-    cd xash3d-fwgs/bin
-    export SDL_VIDEODRIVER=wayland
-    ./xash3d -runtests
-    ./xash -runtests
-    rm -rf valve/gameinfo.txt test_*
-- package: |
-    cd xash3d-fwgs/bin
-    tar -cjvf xash3d-fwgs-alpine-amd64.tar.bz2 *
-artifacts:
-- xash3d-fwgs/bin/xash3d-fwgs-alpine-amd64.tar.bz2

.builds/debian-arm64.yml

@@ -1,30 +0,0 @@
-image: debian/sid
-arch: amd64
-packages:
-- build-essential
-- python-is-python3
-- libsdl2-dev
-- libfreetype-dev
-- libfontconfig-dev
-- libopus-dev
-sources:
-- https://git.sr.ht/~a1batross/xash3d-fwgs
-tasks:
-- client: |
-    cd xash3d-fwgs
-    ./waf configure -8 --enable-tests --enable-engine-tests build install --destdir=bin
-- server: |
-    cd xash3d-fwgs
-    ./waf configure --reconfigure --dedicated build install --destdir=bin
-- run-tests: |
-    cd xash3d-fwgs/bin
-    export SDL_VIDEODRIVER=wayland
-    ./xash3d -runtests
-    ./xash -runtests
-    rm -rf valve/gameinfo.txt test_*
-- package: |
-    cd xash3d-fwgs/bin
-    tar -cjvf xash3d-fwgs-debian-arm64.tar.bz2 *
-artifacts:
-- xash3d-fwgs/bin/xash3d-fwgs-debian-arm64.tar.bz2
-

.builds/debian.yml

@@ -1,29 +0,0 @@
-image: debian/sid
-packages:
-- build-essential
-- python-is-python3
-- libsdl2-dev
-- libfreetype-dev
-- libfontconfig-dev
-- libopus-dev
-sources:
-- https://git.sr.ht/~a1batross/xash3d-fwgs
-tasks:
-- client: |
-    cd xash3d-fwgs
-    ./waf configure -8 --enable-tests --enable-engine-tests build install --destdir=bin
-- server: |
-    cd xash3d-fwgs
-    ./waf configure --reconfigure --dedicated build install --destdir=bin
-- run-tests: |
-    cd xash3d-fwgs/bin
-    export SDL_VIDEODRIVER=wayland
-    ./xash3d -runtests
-    ./xash -runtests
-    rm -rf valve/gameinfo.txt test_*
-- package: |
-    cd xash3d-fwgs/bin
-    tar -cjvf xash3d-fwgs-debian-amd64.tar.bz2 *
-artifacts:
-- xash3d-fwgs/bin/xash3d-fwgs-debian-amd64.tar.bz2
-

.builds/freebsd.yml

@@ -1,29 +0,0 @@
-image: freebsd/latest
-packages:
-- lang/python
-- devel/pkgconf
-- devel/sdl20
-- print/freetype2
-- x11-fonts/fontconfig
-- audio/opus
-sources:
-- https://git.sr.ht/~a1batross/xash3d-fwgs
-tasks:
-- client: |
-    cd xash3d-fwgs
-    ./waf configure --enable-tests --enable-engine-tests build install --destdir=bin
-- server: |
-    cd xash3d-fwgs
-    ./waf configure --reconfigure --dedicated build install --destdir=bin
-- run-tests: |
-    cd xash3d-fwgs/bin
-    export SDL_VIDEODRIVER=wayland
-    ./xash3d -runtests
-    ./xash -runtests
-    rm -rf valve/gameinfo.txt test_*
-- package: |
-    cd xash3d-fwgs/bin
-    tar -cjvf xash3d-fwgs-freebsd-amd64.tar.bz2 *
-artifacts:
-- xash3d-fwgs/bin/xash3d-fwgs-freebsd-amd64.tar.bz2
-

.builds/netbsd.yml

@@ -1,29 +0,0 @@
-image: netbsd/latest
-packages:
-- python311
-- SDL2
-- freetype2
-- fontconfig
-- libopus
-- pkgconf
-sources:
-- https://git.sr.ht/~a1batross/xash3d-fwgs
-tasks:
-- client: |
-    cd xash3d-fwgs
-    python3.11 waf configure --enable-tests --enable-engine-tests build install --destdir=bin
-- server: |
-    cd xash3d-fwgs
-    python3.11 waf configure --reconfigure --dedicated build install --destdir=bin
-- run-tests: |
-    cd xash3d-fwgs/bin
-    export SDL_VIDEODRIVER=wayland
-    ./xash3d -runtests
-    ./xash -runtests
-    rm -rf valve/gameinfo.txt test_*
-- package: |
-    cd xash3d-fwgs/bin
-    tar -cjvf xash3d-fwgs-netbsd-amd64.tar.bz2 *
-artifacts:
-- xash3d-fwgs/bin/xash3d-fwgs-netbsd-amd64.tar.bz2
-

.builds/openbsd.yml

@@ -1,26 +0,0 @@
-image: openbsd/latest
-packages:
-- python3
-- sdl2
-- opus
-sources:
-- https://git.sr.ht/~a1batross/xash3d-fwgs
-tasks:
-- client: |
-    cd xash3d-fwgs
-    python3 waf configure --enable-tests --enable-engine-tests build install --destdir=bin
-- server: |
-    cd xash3d-fwgs
-    python3 waf configure --reconfigure --dedicated build install --destdir=bin
-- run-tests: |
-    cd xash3d-fwgs/bin
-    export SDL_VIDEODRIVER=wayland
-    ./xash3d -runtests
-    ./xash -runtests
-    rm -rf valve/gameinfo.txt test_*
-- package: |
-    cd xash3d-fwgs/bin
-    tar -cjvf xash3d-fwgs-openbsd-amd64.tar.bz2 *
-artifacts:
-- xash3d-fwgs/bin/xash3d-fwgs-openbsd-amd64.tar.bz2
-

.cirrus.yml

@@ -1,22 +1,34 @@
 task:
-  name: freebsd-14-amd64
+  name: freebsd-12-amd64
   freebsd_instance:
-    image_family: freebsd-14-0
+    image_family: freebsd-12-3
   setup_script:
     - pkg update
-    - pkg install -y pkgconf git sdl2 python fontconfig opus
+    - pkg install -y git sdl2 python fontconfig
     - git submodule update --init --recursive
   test_script:
     - ./scripts/cirrus/build_freebsd.sh dedicated
     - ./scripts/cirrus/build_freebsd.sh full
 
 task:
-  name: freebsd-15-amd64
+  name: freebsd-13-amd64
   freebsd_instance:
-    image_family: freebsd-15-0-snap
+    image_family: freebsd-13-1
   setup_script:
     - pkg update
-    - pkg install -y pkgconf git sdl2 python fontconfig opus
+    - pkg install -y git sdl2 python fontconfig
+    - git submodule update --init --recursive
+  test_script:
+    - ./scripts/cirrus/build_freebsd.sh dedicated
+    - ./scripts/cirrus/build_freebsd.sh full
+
+task:
+  name: freebsd-14-amd64
+  freebsd_instance:
+    image_family: freebsd-14-0-snap
+  setup_script:
+    - pkg update
+    - pkg install -y git sdl2 python fontconfig
     - git submodule update --init --recursive
   test_script:
     - ./scripts/cirrus/build_freebsd.sh dedicated

.editorconfig

@@ -1,365 +1,9 @@
-# this file is just a suggestion, you might follow it, you might not
+# EditorConfig is awesome: https://EditorConfig.org
 root = true
 
 [*]
-charset = utf-8
+charset = latin1
 end_of_line = lf
 indent_style = tab
 insert_final_newline = true
 trim_trailing_whitespace = true
-ij_formatter_off_tag = @formatter:off
-ij_formatter_on_tag = @formatter:on
-
-[*.{c++,cc,cpp,cppm,cxx,h,h++,hh,hpp,hxx,inl,ipp,ixx,tlh,tli}]
-
-# Visual C++ Formatting settings
-cpp_indent_braces = false
-cpp_indent_multi_line_relative_to = innermost_parenthesis
-cpp_indent_within_parentheses = indent
-cpp_indent_preserve_within_parentheses = true
-cpp_indent_case_contents = true
-cpp_indent_case_labels = false
-cpp_indent_case_contents_when_block = false
-cpp_indent_lambda_braces_when_parameter = true
-cpp_indent_goto_labels = one_left
-cpp_indent_preprocessor = leftmost_column
-cpp_indent_access_specifiers = false
-cpp_indent_namespace_contents = true
-cpp_indent_preserve_comments = false
-cpp_new_line_before_open_brace_namespace = new_line
-cpp_new_line_before_open_brace_type = new_line
-cpp_new_line_before_open_brace_function = new_line
-cpp_new_line_before_open_brace_block = new_line
-cpp_new_line_before_open_brace_lambda = new_line
-cpp_new_line_scope_braces_on_separate_lines = true
-cpp_new_line_close_brace_same_line_empty_type = false
-cpp_new_line_close_brace_same_line_empty_function = false
-cpp_new_line_before_catch = true
-cpp_new_line_before_else = true
-cpp_new_line_before_while_in_do_while = false
-cpp_space_before_function_open_parenthesis = remove
-cpp_space_within_parameter_list_parentheses = true
-cpp_space_between_empty_parameter_list_parentheses = true
-cpp_space_after_keywords_in_control_flow_statements = false
-cpp_space_within_control_flow_statement_parentheses = true
-cpp_space_before_lambda_open_parenthesis = false
-cpp_space_within_cast_parentheses = false
-cpp_space_after_cast_close_parenthesis = false
-cpp_space_within_expression_parentheses = true
-cpp_space_before_block_open_brace = true
-cpp_space_between_empty_braces = true
-cpp_space_before_initializer_list_open_brace = false
-cpp_space_within_initializer_list_braces = true
-cpp_space_preserve_in_initializer_list = true
-cpp_space_before_open_square_bracket = false
-cpp_space_within_square_brackets = false
-cpp_space_before_empty_square_brackets = false
-cpp_space_between_empty_square_brackets = false
-cpp_space_group_square_brackets = true
-cpp_space_within_lambda_brackets = false
-cpp_space_between_empty_lambda_brackets = false
-cpp_space_before_comma = false
-cpp_space_after_comma = true
-cpp_space_remove_around_member_operators = true
-cpp_space_before_inheritance_colon = true
-cpp_space_before_constructor_colon = true
-cpp_space_remove_before_semicolon = true
-cpp_space_after_semicolon = true
-cpp_space_remove_around_unary_operator = true
-cpp_space_around_binary_operator = insert
-cpp_space_around_assignment_operator = insert
-cpp_space_pointer_reference_alignment = right
-cpp_space_around_ternary_operator = insert
-cpp_use_unreal_engine_macro_formatting = true
-cpp_wrap_preserve_blocks = one_liners
-
-# IDEA settings
-ij_c_add_brief_tag = false
-ij_c_add_getter_prefix = true
-ij_c_add_setter_prefix = true
-ij_c_align_dictionary_pair_values = false
-ij_c_align_group_field_declarations = false
-ij_c_align_init_list_in_columns = true
-ij_c_align_multiline_array_initializer_expression = false
-ij_c_align_multiline_assignment = false
-ij_c_align_multiline_binary_operation = false
-ij_c_align_multiline_chained_methods = false
-ij_c_align_multiline_for = true
-ij_c_align_multiline_ternary_operation = false
-ij_c_array_initializer_comma_on_next_line = false
-ij_c_array_initializer_new_line_after_left_brace = false
-ij_c_array_initializer_right_brace_on_new_line = false
-ij_c_array_initializer_wrap = off
-ij_c_assignment_wrap = off
-ij_c_binary_operation_sign_on_next_line = false
-ij_c_binary_operation_wrap = off
-ij_c_blank_lines_after_class_header = 0
-ij_c_blank_lines_after_imports = 1
-ij_c_blank_lines_around_class = 1
-ij_c_blank_lines_around_field = 0
-ij_c_blank_lines_around_field_in_interface = 0
-ij_c_blank_lines_around_method = 1
-ij_c_blank_lines_around_method_in_interface = 1
-ij_c_blank_lines_around_namespace = 0
-ij_c_blank_lines_around_properties_in_declaration = 0
-ij_c_blank_lines_around_properties_in_interface = 0
-ij_c_blank_lines_before_imports = 1
-ij_c_blank_lines_before_method_body = 0
-ij_c_block_brace_placement = next_line
-ij_c_block_brace_style = next_line
-ij_c_block_comment_at_first_column = true
-ij_c_catch_on_new_line = false
-ij_c_class_brace_style = next_line
-ij_c_class_constructor_init_list_align_multiline = true
-ij_c_class_constructor_init_list_comma_on_next_line = false
-ij_c_class_constructor_init_list_new_line_after_colon = never
-ij_c_class_constructor_init_list_new_line_before_colon = if_long
-ij_c_class_constructor_init_list_wrap = normal
-ij_c_copy_is_deep = false
-ij_c_create_interface_for_categories = true
-ij_c_declare_generated_methods = true
-ij_c_description_include_member_names = true
-ij_c_discharged_short_ternary_operator = false
-ij_c_do_not_add_breaks = false
-ij_c_do_while_brace_force = never
-ij_c_else_on_new_line = false
-ij_c_enum_constants_comma_on_next_line = false
-ij_c_enum_constants_wrap = off
-ij_c_for_brace_force = never
-ij_c_for_statement_new_line_after_left_paren = false
-ij_c_for_statement_right_paren_on_new_line = false
-ij_c_for_statement_wrap = off
-ij_c_function_brace_placement = next_line
-ij_c_function_call_arguments_align_multiline = true
-ij_c_function_call_arguments_align_multiline_pars = false
-ij_c_function_call_arguments_comma_on_next_line = false
-ij_c_function_call_arguments_new_line_after_lpar = false
-ij_c_function_call_arguments_new_line_before_rpar = false
-ij_c_function_call_arguments_wrap = normal
-ij_c_function_non_top_after_return_type_wrap = normal
-ij_c_function_parameters_align_multiline = true
-ij_c_function_parameters_align_multiline_pars = false
-ij_c_function_parameters_comma_on_next_line = false
-ij_c_function_parameters_new_line_after_lpar = false
-ij_c_function_parameters_new_line_before_rpar = false
-ij_c_function_parameters_wrap = normal
-ij_c_function_top_after_return_type_wrap = normal
-ij_c_generate_additional_eq_operators = true
-ij_c_generate_additional_rel_operators = true
-ij_c_generate_class_constructor = true
-ij_c_generate_comparison_operators_use_std_tie = false
-ij_c_generate_instance_variables_for_properties = ask
-ij_c_generate_operators_as_members = true
-ij_c_header_guard_style_pattern = ${PROJECT_NAME}_${FILE_NAME}_${EXT}
-ij_c_if_brace_force = never
-ij_c_in_line_short_ternary_operator = true
-ij_c_indent_block_comment = true
-ij_c_indent_c_struct_members = 4
-ij_c_indent_case_from_switch = true
-ij_c_indent_class_members = 4
-ij_c_indent_directive_as_code = false
-ij_c_indent_implementation_members = 0
-ij_c_indent_inside_code_block = 4
-ij_c_indent_interface_members = 0
-ij_c_indent_interface_members_except_ivars_block = false
-ij_c_indent_namespace_members = 4
-ij_c_indent_preprocessor_directive = 0
-ij_c_indent_visibility_keywords = 0
-ij_c_insert_override = true
-ij_c_insert_virtual_with_override = false
-ij_c_introduce_auto_consts = false
-ij_c_introduce_auto_vars = false
-ij_c_introduce_const_params = false
-ij_c_introduce_const_vars = false
-ij_c_introduce_constexpr_consts = false
-ij_c_introduce_generate_property = false
-ij_c_introduce_generate_synthesize = true
-ij_c_introduce_globals_to_header = true
-ij_c_introduce_prop_to_private_category = false
-ij_c_introduce_static_consts = true
-ij_c_introduce_use_ns_types = false
-ij_c_ivars_prefix = _
-ij_c_ivars_suffix =
-ij_c_keep_blank_lines_before_end = 2
-ij_c_keep_blank_lines_before_right_brace = 2
-ij_c_keep_blank_lines_in_code = 2
-ij_c_keep_blank_lines_in_declarations = 2
-ij_c_keep_case_expressions_in_one_line = false
-ij_c_keep_control_statement_in_one_line = false
-ij_c_keep_directive_at_first_column = true
-ij_c_keep_first_column_comment = false
-ij_c_keep_line_breaks = true
-ij_c_keep_nested_namespaces_in_one_line = false
-ij_c_keep_simple_blocks_in_one_line = false
-ij_c_keep_simple_methods_in_one_line = false
-ij_c_keep_structures_in_one_line = false
-ij_c_lambda_capture_list_align_multiline = false
-ij_c_lambda_capture_list_align_multiline_bracket = false
-ij_c_lambda_capture_list_comma_on_next_line = false
-ij_c_lambda_capture_list_new_line_after_lbracket = false
-ij_c_lambda_capture_list_new_line_before_rbracket = false
-ij_c_lambda_capture_list_wrap = off
-ij_c_line_comment_add_space = false
-ij_c_line_comment_at_first_column = true
-ij_c_method_brace_placement = end_of_line
-ij_c_method_call_arguments_align_by_colons = true
-ij_c_method_call_arguments_align_multiline = false
-ij_c_method_call_arguments_special_dictionary_pairs_treatment = true
-ij_c_method_call_arguments_wrap = off
-ij_c_method_call_chain_wrap = off
-ij_c_method_parameters_align_by_colons = true
-ij_c_method_parameters_align_multiline = false
-ij_c_method_parameters_wrap = off
-ij_c_namespace_brace_placement = next_line
-ij_c_parentheses_expression_new_line_after_left_paren = false
-ij_c_parentheses_expression_right_paren_on_new_line = false
-ij_c_place_assignment_sign_on_next_line = false
-ij_c_property_nonatomic = true
-ij_c_put_ivars_to_implementation = true
-ij_c_refactor_compatibility_aliases_and_classes = true
-ij_c_refactor_properties_and_ivars = true
-ij_c_release_style = ivar
-ij_c_retain_object_parameters_in_constructor = true
-ij_c_semicolon_after_method_signature = false
-ij_c_shift_operation_align_multiline = true
-ij_c_shift_operation_wrap = normal
-ij_c_show_non_virtual_functions = false
-ij_c_space_after_colon = true
-ij_c_space_after_colon_in_foreach = true
-ij_c_space_after_colon_in_selector = false
-ij_c_space_after_comma = true
-ij_c_space_after_cup_in_blocks = false
-ij_c_space_after_dictionary_literal_colon = true
-ij_c_space_after_for_semicolon = true
-ij_c_space_after_init_list_colon = true
-ij_c_space_after_method_parameter_type_parentheses = false
-ij_c_space_after_method_return_type_parentheses = false
-ij_c_space_after_pointer_in_declaration = false
-ij_c_space_after_quest = true
-ij_c_space_after_reference_in_declaration = false
-ij_c_space_after_reference_in_rvalue = false
-ij_c_space_after_structures_rbrace = true
-ij_c_space_after_superclass_colon = true
-ij_c_space_after_type_cast = false
-ij_c_space_after_visibility_sign_in_method_declaration = true
-ij_c_space_before_autorelease_pool_lbrace = true
-ij_c_space_before_catch_keyword = true
-ij_c_space_before_catch_left_brace = true
-ij_c_space_before_catch_parentheses = false
-ij_c_space_before_category_parentheses = true
-ij_c_space_before_chained_send_message = true
-ij_c_space_before_class_left_brace = true
-ij_c_space_before_colon = true
-ij_c_space_before_colon_in_foreach = true
-ij_c_space_before_comma = false
-ij_c_space_before_dictionary_literal_colon = true
-ij_c_space_before_do_left_brace = true
-ij_c_space_before_else_keyword = true
-ij_c_space_before_else_left_brace = true
-ij_c_space_before_export_lbrace = true
-ij_c_space_before_for_left_brace = true
-ij_c_space_before_for_parentheses = false
-ij_c_space_before_for_semicolon = false
-ij_c_space_before_if_left_brace = true
-ij_c_space_before_if_parentheses = false
-ij_c_space_before_init_list = false
-ij_c_space_before_init_list_colon = true
-ij_c_space_before_method_call_parentheses = false
-ij_c_space_before_method_left_brace = true
-ij_c_space_before_method_parentheses = false
-ij_c_space_before_namespace_lbrace = true
-ij_c_space_before_pointer_in_declaration = true
-ij_c_space_before_property_attributes_parentheses = false
-ij_c_space_before_protocols_brackets = true
-ij_c_space_before_quest = true
-ij_c_space_before_reference_in_declaration = true
-ij_c_space_before_superclass_colon = true
-ij_c_space_before_switch_left_brace = true
-ij_c_space_before_switch_parentheses = false
-ij_c_space_before_template_call_lt = false
-ij_c_space_before_template_declaration_lt = true
-ij_c_space_before_try_left_brace = true
-ij_c_space_before_while_keyword = true
-ij_c_space_before_while_left_brace = true
-ij_c_space_before_while_parentheses = false
-ij_c_space_between_adjacent_brackets = false
-ij_c_space_between_operator_and_punctuator = false
-ij_c_space_within_empty_array_initializer_braces = true
-ij_c_spaces_around_additive_operators = true
-ij_c_spaces_around_assignment_operators = true
-ij_c_spaces_around_bitwise_operators = true
-ij_c_spaces_around_equality_operators = true
-ij_c_spaces_around_lambda_arrow = true
-ij_c_spaces_around_logical_operators = true
-ij_c_spaces_around_multiplicative_operators = true
-ij_c_spaces_around_pm_operators = false
-ij_c_spaces_around_relational_operators = true
-ij_c_spaces_around_shift_operators = true
-ij_c_spaces_around_unary_operator = false
-ij_c_spaces_within_array_initializer_braces = true
-ij_c_spaces_within_braces = false
-ij_c_spaces_within_brackets = false
-ij_c_spaces_within_cast_parentheses = false
-ij_c_spaces_within_catch_parentheses = true
-ij_c_spaces_within_category_parentheses = false
-ij_c_spaces_within_empty_braces = false
-ij_c_spaces_within_empty_function_call_parentheses = true
-ij_c_spaces_within_empty_function_declaration_parentheses = true
-ij_c_spaces_within_empty_lambda_capture_list_bracket = false
-ij_c_spaces_within_empty_template_call_ltgt = false
-ij_c_spaces_within_empty_template_declaration_ltgt = false
-ij_c_spaces_within_for_parentheses = true
-ij_c_spaces_within_function_call_parentheses = true
-ij_c_spaces_within_function_declaration_parentheses = true
-ij_c_spaces_within_if_parentheses = true
-ij_c_spaces_within_lambda_capture_list_bracket = false
-ij_c_spaces_within_method_parameter_type_parentheses = false
-ij_c_spaces_within_method_return_type_parentheses = false
-ij_c_spaces_within_parentheses = true
-ij_c_spaces_within_property_attributes_parentheses = false
-ij_c_spaces_within_protocols_brackets = false
-ij_c_spaces_within_send_message_brackets = false
-ij_c_spaces_within_structured_binding_list_bracket = false
-ij_c_spaces_within_switch_parentheses = true
-ij_c_spaces_within_template_call_ltgt = false
-ij_c_spaces_within_template_declaration_ltgt = false
-ij_c_spaces_within_template_double_gt = false
-ij_c_spaces_within_while_parentheses = true
-ij_c_special_else_if_treatment = true
-ij_c_structured_binding_list_align_multiline = false
-ij_c_structured_binding_list_align_multiline_bracket = false
-ij_c_structured_binding_list_comma_on_next_line = false
-ij_c_structured_binding_list_new_line_after_lbracket = false
-ij_c_structured_binding_list_new_line_before_rbracket = false
-ij_c_structured_binding_list_wrap = off
-ij_c_superclass_list_after_colon = never
-ij_c_superclass_list_align_multiline = true
-ij_c_superclass_list_before_colon = if_long
-ij_c_superclass_list_comma_on_next_line = false
-ij_c_superclass_list_wrap = on_every_item
-ij_c_tag_prefix_of_block_comment = at
-ij_c_tag_prefix_of_line_comment = back_slash
-ij_c_template_call_arguments_align_multiline = false
-ij_c_template_call_arguments_align_multiline_pars = false
-ij_c_template_call_arguments_comma_on_next_line = false
-ij_c_template_call_arguments_new_line_after_lt = false
-ij_c_template_call_arguments_new_line_before_gt = false
-ij_c_template_call_arguments_wrap = off
-ij_c_template_declaration_function_body_indent = false
-ij_c_template_declaration_function_wrap = split_into_lines
-ij_c_template_declaration_struct_body_indent = false
-ij_c_template_declaration_struct_wrap = split_into_lines
-ij_c_template_parameters_align_multiline = false
-ij_c_template_parameters_align_multiline_pars = false
-ij_c_template_parameters_comma_on_next_line = false
-ij_c_template_parameters_new_line_after_lt = false
-ij_c_template_parameters_new_line_before_gt = false
-ij_c_template_parameters_wrap = off
-ij_c_ternary_operation_signs_on_next_line = false
-ij_c_ternary_operation_wrap = off
-ij_c_type_qualifiers_placement = before
-ij_c_use_modern_casts = true
-ij_c_use_setters_in_constructor = true
-ij_c_while_brace_force = never
-ij_c_while_on_new_line = false
-ij_c_wrap_property_declaration = off

.github/FUNDING.yml

@@ -1 +0,0 @@
-custom: https://github.com/FWGS/xash3d-fwgs/blob/master/Documentation/donate.md

.github/workflows/c-cpp.yml

@@ -13,8 +13,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # Linux build specifically want oldest Ubuntu as possible
-          # to be crossdistribution compatible, otherwise use ubuntu-latest
           - os: ubuntu-20.04
             targetos: linux
             targetarch: amd64
@@ -24,101 +22,105 @@ jobs:
 #          - os: ubuntu-aarch64-20.04
 #            targetos: linux
 #            targetarch: aarch64
-          - os: ubuntu-20.04
+
-            targetos: android
+#          - os: ubuntu-20.04
-            targetarch: multiarch
+#            targetos: android
+#            targetarch: 32
+#          - os: ubuntu-20.04
+#            targetos: android
+#            targetarch: 64
+
 #          - os: ubuntu-20.04
 #            targetos: motomagx
 #            targetarch: armv6
 
-          - os: ubuntu-latest
+          - os: ubuntu-20.04
             targetos: nswitch
             targetarch: arm64
-          - os: ubuntu-latest
+          - os: ubuntu-20.04
             targetos: psvita
             targetarch: armv7hf
           - os: windows-latest
             targetos: win32
             targetarch: amd64
-          - os: windows-2019 # always use the oldest possible for 32-bit because of older compilers, and better support of certain legacy OSes
+          - os: windows-latest
             targetos: win32
             targetarch: i386
-          - os: macos-14 # in GitHub documentation, it's an ARM64 machine
-            targetos: apple
-            targetarch: arm64
-          - os: macos-12 # in GitHub documentation, it's an x86 machine
-            targetos: apple
-            targetarch: amd64
     env:
-      SDL_VERSION: 2.30.3
+      SDL_VERSION: 2.26.2
       GH_CPU_ARCH: ${{ matrix.targetarch }}
+      ANDROID_SDK_TOOLS_VER: 4333796
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         submodules: recursive
     - name: Install dependencies
       run: bash scripts/gha/deps_${{ matrix.targetos }}.sh
     - name: Build engine
-      env:
-        FWGS_PFX_PASSWORD: ${{ secrets.FWGS_PFX_PASSWORD }}
       run: bash scripts/gha/build_${{ matrix.targetos }}.sh
     - name: Upload engine (artifacts)
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: artifact-${{ matrix.targetos }}-${{ matrix.targetarch }}
         path: artifacts/*
   flatpak:
+    name: "Flatpak"
     runs-on: ubuntu-latest
     strategy:
       matrix:
         include:
           - app: su.xash.Engine.Compat.i386
     container:
-      image: bilelmoussaoui/flatpak-github-actions:freedesktop-23.08
+      image: bilelmoussaoui/flatpak-github-actions:freedesktop-22.08
       options: --privileged
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         submodules: recursive
     - name: Build flatpak (Compat.i386)
-      uses: FWGS/flatpak-github-actions/flatpak-builder@v6.3
+      uses: FWGS/flatpak-github-actions/flatpak-builder@v5
       with:
         bundle: ${{ matrix.app }}.flatpak
         manifest-path: scripts/flatpak/${{ matrix.app }}.yml
+    - name: Upload engine (artifacts)
+      uses: actions/upload-artifact@v3
+      with:
+        name: artifact-${{ matrix.targetos }}-${{ matrix.targetarch }}
+        path: artifacts/*
   release:
     name: "Upload releases"
     runs-on: ubuntu-latest
     needs: [build, flatpak]
     if: ${{ github.event_name == 'push' }}
     steps:
-    - name: Remove old release, fetch artifacts, repackage binaries and upload new release
+    - name: Remove old release
-      env:
+      uses: FWGS/delete-tag-and-release@v0.2.1-dev
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
-        RELEASE_TAG: ${{ github.ref_name == 'master' && 'continuous' || format('continuous-{0}', github.ref_name) }}
+        tag_name: ${{ github.ref_name == 'master' && 'continuous' || format('continuous-{0}', github.ref_name) }}
+        delete_release: true
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+    - name: Fetch artifacts
+      uses: actions/download-artifact@v3.0.1
+      with:
+        path: artifacts/
+    - name: Repackage binaries and allow GitHub to process removed release for few seconds
       run: |
-        gh release delete "$RELEASE_TAG" \
+        cd artifacts/
-          --yes \
+        for i in artifact-* su.xash.Engine.*; do
-          --cleanup-tag \
-          --repo "$GITHUB_REPOSITORY" || true
-        sleep 20s
-        gh run download "$GITHUB_RUN_ID" \
-          --dir artifacts/ \
-          --repo "$GITHUB_REPOSITORY"
-        pushd artifacts/
-        echo "Found artifacts:"
-        ls
-        for i in $(find -mindepth 1 -maxdepth 1 -type d); do
           mv "$i"/* .
           rm -rf "$i"
         done
-        echo "Repackaged artifacts:"
+        ls -R .
-        ls -R
+        cd ../
-        popd
         sleep 20s
-        gh release create "$RELEASE_TAG" artifacts/* \
+    - name: Upload new release
-          --title "Xash3D FWGS Continuous ${{ github.ref_name }} Build" \
+      uses: FWGS/action-gh-release@v0.1.15
-          --target $GITHUB_SHA \
+      with:
-          --repo "$GITHUB_REPOSITORY" \
+        name: Xash3D FWGS Continuous ${{ github.ref_name }} Build
-          --prerelease
+        tag_name: ${{ github.ref_name == 'master' && 'continuous' || format('continuous-{0}', github.ref_name) }}
+        prerelease: true
+        token: ${{ secrets.GITHUB_TOKEN }}
+        files: artifacts/*
+        draft: false

.gitignore

@@ -54,18 +54,12 @@ CMakeFiles
 Makefile
 cmake_install.cmake
 install_manifest.txt
-CMakeLists.txt*
-CMakeScripts
-Testing
-compile_commands.json
-_deps
 # makedepend
 Makefile.dep
 *.bak
 ALL_BUILD.*
 INSTALL.*
 ZERO_CHECK.*
-CMakeLists.txt
 
 # Visual Studio
 *.obj
@@ -339,6 +333,3 @@ __pycache__
 .history/*
 .cache/*
 enc_temp_folder/
-
-# KDevelop4
-*.kdev4

.gitmodules

@@ -19,6 +19,3 @@
 [submodule "3rdparty/xash-extras"]
 	path = 3rdparty/extras/xash-extras
 	url = https://github.com/FWGS/xash-extras
-[submodule "3rdparty/bzip2/bzip2"]
-	path = 3rdparty/bzip2/bzip2
-	url = https://gitlab.com/bzip2/bzip2

3rdparty/MultiEmulator/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2017-2018 Alexander Belkin
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

3rdparty/MultiEmulator/README.md

@@ -1,25 +0,0 @@
-# MultiEmulator
-
-**MultiEmulator** - project for GoldSource Engine, which provides ability to generate tickets with a specific SteamID key, using all available emulators for this engine.
-
-Ticket is processed by the game server of Half-Life 1 and modifications using **DProto** or **ReUnion** modules. If the server does not have these modules, then MultiEmulator won't work.
-
-# Ticket generators
-
-Currently available ticket generators: 
-* OldRevEmu
-* AVSMP
-* Setti
-* SteamEmu
-* RevEmu
-* SC2009
-* RevEmu2013
-
-Currently under development generators:
-* SmartSteamEmu (SSE3)
-
-# How to use?
-Each file in the **MultiEmulator\Source\Emulators** folder contains a **Generate** function that writes a ticket to the **pDest** argument for the emulator of the same name as a header file. As a result of the function, the size of the written ticket is returned. If the generator can set an arbitrary SteamID, the function will have the **nSteamID** argument, in which the required SteamID is specified.
-
-# Examples
-As an example, the DLL was developed that searches InitiateGameConnection method in ISteamUser interface, which generates Steam ticket, and inserts in its place own generator, which creates RevEmu2013 ticket with SteamID equal to 3333333. You can find this project in **Example** folder, you just need to compile it and perform DLL injection in hl.exe process with any known injection method.

3rdparty/MultiEmulator/include/multi_emulator.h

@@ -1,37 +0,0 @@
-#ifndef MULTI_EMULATOR_H
-#define MULTI_EMULATOR_H
-
-#if defined( __GNUC__ )
-	#if defined( __i386__ )
-		#define ME_EXPORT         __attribute__(( visibility( "default" ), force_align_arg_pointer ))
-	#else
-		#define ME_EXPORT         __attribute__(( visibility ( "default" )))
-	#endif
-#else
-	#if defined( _MSC_VER )
-		#define ME_EXPORT         __declspec( dllexport )
-	#else
-		#define ME_EXPORT
-	#endif
-#endif
-
-#include <string.h>
-
-#if __cplusplus
-extern "C"
-{
-#endif
-
-int ME_EXPORT GenerateRevEmu2013( void *pDest, int nSteamID );
-int ME_EXPORT GenerateSC2009( void *pDest, int nSteamID );
-int ME_EXPORT GenerateOldRevEmu( void *pDest, int nSteamID );
-int ME_EXPORT GenerateSteamEmu( void *pDest, int nSteamID );
-int ME_EXPORT GenerateRevEmu( void *pDest, int nSteamID );
-int ME_EXPORT GenerateSetti( void *pDest );
-int ME_EXPORT GenerateAVSMP( void *pDest, int nSteamID, int bUniverse );
-
-#if __cplusplus
-}
-#endif
-
-#endif // MULTI_EMULATOR_H

3rdparty/MultiEmulator/src/AVSMP.cpp

@@ -1,13 +0,0 @@
-#include "multi_emulator.h"
-
-/* bUniverse param is "y" value in "STEAM_x:y:z" */
-int GenerateAVSMP(void *pDest, int nSteamID, int bUniverse)
-{
-	auto pTicket = (int *)pDest;
-
-	pTicket[0] = 0x14;                                    //  +0, header
-	pTicket[3] = (nSteamID << 1) | (bUniverse ? 1 : 0);   // +12, SteamId, Low part
-	pTicket[4] = 0x01100001;                              // +16, SteamId, High part
-
-	return 28;
-}

3rdparty/MultiEmulator/src/CRijndael.h

@@ -1,187 +0,0 @@
-#ifndef __RIJNDAEL_H__
-#define __RIJNDAEL_H__
-
-#include <exception>
-#include <stdexcept>
-#include <cstring>
-#include <string>
-
-using namespace std;
-
-//Rijndael (pronounced Reindaal) is a block cipher, designed by Joan Daemen and Vincent Rijmen as a candidate algorithm for the AES.
-//The cipher has a variable block length and key length. The authors currently specify how to use keys with a length
-//of 128, 192, or 256 bits to encrypt blocks with al length of 128, 192 or 256 bits (all nine combinations of
-//key length and block length are possible). Both block length and key length can be extended very easily to
-// multiples of 32 bits.
-//Rijndael can be implemented very efficiently on a wide range of processors and in hardware. 
-//This implementation is based on the Java Implementation used with the Cryptix toolkit found at:
-//http://www.esat.kuleuven.ac.be/~rijmen/rijndael/rijndael.zip
-//Java code authors: Raif S. Naffah, Paulo S. L. M. Barreto
-//This Implementation was tested against KAT test published by the authors of the method and the
-//results were identical.
-class CRijndael
-{
-public:
-	//Operation Modes
-	//The Electronic Code Book (ECB), Cipher Block Chaining (CBC) and Cipher Feedback Block (CFB) modes
-	//are implemented.
-	//In ECB mode if the same block is encrypted twice with the same key, the resulting
-	//ciphertext blocks are the same.
-	//In CBC Mode a ciphertext block is obtained by first xoring the
-	//plaintext block with the previous ciphertext block, and encrypting the resulting value.
-	//In CFB mode a ciphertext block is obtained by encrypting the previous ciphertext block
-	//and xoring the resulting value with the plaintext.
-	enum { ECB = 0, CBC = 1, CFB = 2 };
-
-private:
-	enum { DEFAULT_BLOCK_SIZE = 16 };
-	enum { MAX_BLOCK_SIZE = 32, MAX_ROUNDS = 14, MAX_KC = 8, MAX_BC = 8 };
-
-	//Auxiliary Functions
-	//Multiply two elements of GF(2^m)
-	static int Mul(int a, int b)
-	{
-		return (a != 0 && b != 0) ? sm_alog[(sm_log[a & 0xFF] + sm_log[b & 0xFF]) % 255] : 0;
-	}
-
-	//Convenience method used in generating Transposition Boxes
-	static int Mul4(int a, char b[])
-	{
-		if (a == 0)
-			return 0;
-		a = sm_log[a & 0xFF];
-		int a0 = (b[0] != 0) ? sm_alog[(a + sm_log[b[0] & 0xFF]) % 255] & 0xFF : 0;
-		int a1 = (b[1] != 0) ? sm_alog[(a + sm_log[b[1] & 0xFF]) % 255] & 0xFF : 0;
-		int a2 = (b[2] != 0) ? sm_alog[(a + sm_log[b[2] & 0xFF]) % 255] & 0xFF : 0;
-		int a3 = (b[3] != 0) ? sm_alog[(a + sm_log[b[3] & 0xFF]) % 255] & 0xFF : 0;
-		return a0 << 24 | a1 << 16 | a2 << 8 | a3;
-	}
-
-public:
-	//CONSTRUCTOR
-	CRijndael();
-
-	//DESTRUCTOR
-	virtual ~CRijndael();
-
-	//Expand a user-supplied key material into a session key.
-	// key        - The 128/192/256-bit user-key to use.
-	// chain      - initial chain block for CBC and CFB modes.
-	// keylength  - 16, 24 or 32 bytes
-	// blockSize  - The block size in bytes of this Rijndael (16, 24 or 32 bytes).
-	void MakeKey(char const* key, char const* chain, int keylength = DEFAULT_BLOCK_SIZE, int blockSize = DEFAULT_BLOCK_SIZE);
-
-private:
-	//Auxiliary Function
-	void Xor(char* buff, char const* chain)
-	{
-		if (false == m_bKeyInit)
-			throw runtime_error(sm_szErrorMsg1);
-		for (int i = 0; i<m_blockSize; i++)
-			*(buff++) ^= *(chain++);
-	}
-
-	//Convenience method to encrypt exactly one block of plaintext, assuming
-	//Rijndael's default block size (128-bit).
-	// in         - The plaintext
-	// result     - The ciphertext generated from a plaintext using the key
-	void DefEncryptBlock(char const* in, char* result);
-
-	//Convenience method to decrypt exactly one block of plaintext, assuming
-	//Rijndael's default block size (128-bit).
-	// in         - The ciphertext.
-	// result     - The plaintext generated from a ciphertext using the session key.
-	void DefDecryptBlock(char const* in, char* result);
-
-public:
-	//Encrypt exactly one block of plaintext.
-	// in           - The plaintext.
-	// result       - The ciphertext generated from a plaintext using the key.
-	void EncryptBlock(char const* in, char* result);
-
-	//Decrypt exactly one block of ciphertext.
-	// in         - The ciphertext.
-	// result     - The plaintext generated from a ciphertext using the session key.
-	void DecryptBlock(char const* in, char* result);
-
-	void Encrypt(char const* in, char* result, size_t n, int iMode = ECB);
-
-	void Decrypt(char const* in, char* result, size_t n, int iMode = ECB);
-
-	//Get Key Length
-	int GetKeyLength()
-	{
-		if (false == m_bKeyInit)
-			throw runtime_error(sm_szErrorMsg1);
-		return m_keylength;
-	}
-
-	//Block Size
-	int	GetBlockSize()
-	{
-		if (false == m_bKeyInit)
-			throw runtime_error(sm_szErrorMsg1);
-		return m_blockSize;
-	}
-
-	//Number of Rounds
-	int GetRounds()
-	{
-		if (false == m_bKeyInit)
-			throw runtime_error(sm_szErrorMsg1);
-		return m_iROUNDS;
-	}
-
-	void ResetChain()
-	{
-		memcpy(m_chain, m_chain0, m_blockSize);
-	}
-
-public:
-	//Null chain
-	static char const* sm_chain0;
-
-private:
-	static const int sm_alog[256];
-	static const int sm_log[256];
-	static const char sm_S[256];
-	static const char sm_Si[256];
-	static const int sm_T1[256];
-	static const int sm_T2[256];
-	static const int sm_T3[256];
-	static const int sm_T4[256];
-	static const int sm_T5[256];
-	static const int sm_T6[256];
-	static const int sm_T7[256];
-	static const int sm_T8[256];
-	static const int sm_U1[256];
-	static const int sm_U2[256];
-	static const int sm_U3[256];
-	static const int sm_U4[256];
-	static const char sm_rcon[30];
-	static const int sm_shifts[3][4][2];
-	//Error Messages
-	static char const* sm_szErrorMsg1;
-	static char const* sm_szErrorMsg2;
-	//Key Initialization Flag
-	bool m_bKeyInit;
-	//Encryption (m_Ke) round key
-	int m_Ke[MAX_ROUNDS + 1][MAX_BC];
-	//Decryption (m_Kd) round key
-	int m_Kd[MAX_ROUNDS + 1][MAX_BC];
-	//Key Length
-	int m_keylength;
-	//Block Size
-	int	m_blockSize;
-	//Number of Rounds
-	int m_iROUNDS;
-	//Chain Block
-	char m_chain0[MAX_BLOCK_SIZE];
-	char m_chain[MAX_BLOCK_SIZE];
-	//Auxiliary private use buffers
-	int tk[MAX_KC];
-	int a[MAX_BC];
-	int t[MAX_BC];
-};
-
-#endif // __RIJNDAEL_H__

3rdparty/MultiEmulator/src/DoubleBuffering.cpp

@@ -1,128 +0,0 @@
-//DoubleBuffering.cpp Source File
-
-#include "DoubleBuffering.h"
-#include <cassert>
-#include <exception>
-#include <string.h>
-
-using namespace std;
-
-CDoubleBuffering::CDoubleBuffering(ifstream& in, char* pcBuff, int iSize, int iDataLen) : m_rin(in),
-    m_iDataLen(iDataLen), m_bEOF(false), m_iSize(iSize), m_iSize2(iSize >> 1), m_pcBuff(pcBuff)
-{
-    //m_iSize should be even
-    if(m_iSize%2 != 0)
-        throw runtime_error("CDoubleBuffering: m_iSize should be Even Number!");
-    //Check file
-    if(!in.is_open() || in.bad())
-        throw runtime_error("CDoubleBuffering: Referenced File not Opened or in Bad State!");
-    //Check construction data
-    if(m_iDataLen<1 || m_iSize2<m_iDataLen)
-        throw runtime_error("CDoubleBuffering: Illegal Construction Data!");
-    in.read(m_pcBuff, m_iSize2);
-    m_iEnd = m_rin.gcount();
-    m_iCurPos = 0;
-    m_iBuf = 0;
-}
-
-int CDoubleBuffering::GetData(char* pszDataBuf, int iDataLen)
-{
-    if(-1 == iDataLen)
-        iDataLen = m_iDataLen;
-    if(iDataLen<1 || m_iSize2<iDataLen)
-        throw runtime_error("CDoubleBuffering::GetData(): Illegal iDataLen!");
-    if(true == m_bEOF)
-        return 0;
-    //Estimate the next position
-    int iCurPos = m_iCurPos + iDataLen;
-    if(0 == m_iBuf) //First Buffer
-    {
-        if(iCurPos >= m_iEnd)
-        {
-            //Read the next buffer
-            if(m_rin.eof())
-            {
-                m_bEOF = true;
-                //Take everything remained
-                int iRead = m_iEnd-m_iCurPos;
-                memcpy(pszDataBuf, m_pcBuff+m_iCurPos, iRead);
-                return iRead;
-            }
-            else
-            {
-                m_rin.read(m_pcBuff+m_iEnd, m_iSize2);
-                m_iEnd += m_rin.gcount();
-                if(iCurPos > m_iEnd) //Still greater, then EOF attained
-                {
-                    assert(m_rin.eof());
-                    m_bEOF = true;
-                    //Take everything remained
-                    int iRead = m_iEnd-m_iCurPos;
-                    memcpy(pszDataBuf, m_pcBuff+m_iCurPos, iRead);
-                    return iRead;
-                }
-                else
-                {
-                    memcpy(pszDataBuf, m_pcBuff+m_iCurPos, iDataLen);
-                    m_iCurPos = iCurPos;
-                    assert(m_iCurPos >= m_iSize2);
-                    m_iBuf = 1;
-                    return iDataLen;
-                }
-            }
-        }
-        else
-        {
-            memcpy(pszDataBuf, m_pcBuff+m_iCurPos, iDataLen);
-            m_iCurPos = iCurPos;
-            return iDataLen;
-        }
-    }
-    else //1 == m_iBuf, Second Buffer
-    {
-        if(iCurPos >= m_iEnd)
-        {
-            //Read the next buffer
-            if(m_rin.eof())
-            {
-                m_bEOF = true;
-                //Take everything remained
-                int iRead = m_iEnd-m_iCurPos;
-                memcpy(pszDataBuf, m_pcBuff+m_iCurPos, iRead);
-                return iRead;
-            }
-            else
-            {
-                m_rin.read(m_pcBuff, m_iSize2);
-                m_iEnd = m_rin.gcount();
-                iCurPos %= m_iSize;
-                if(iCurPos > m_iEnd) //Still greater, then EOF attained
-                {
-                    assert(m_rin.eof());
-                    m_bEOF = true;
-                    //Take everything remained
-                    int iRead = m_iSize-m_iCurPos;
-                    memcpy(pszDataBuf, m_pcBuff+m_iCurPos, iRead);
-                    memcpy(pszDataBuf+iRead, m_pcBuff, m_iEnd);
-                    return iRead + m_iEnd;
-                }
-                else
-                {
-                    int iRead = m_iSize-m_iCurPos;
-                    memcpy(pszDataBuf, m_pcBuff+m_iCurPos, iRead);
-                    memcpy(pszDataBuf+iRead, m_pcBuff, iDataLen-iRead);
-                    m_iCurPos = iCurPos;
-                    assert(m_iCurPos < m_iSize2);
-                    m_iBuf = 0;
-                    return iDataLen;
-                }
-            }
-        }
-        else
-        {
-            memcpy(pszDataBuf, m_pcBuff+m_iCurPos, iDataLen);
-            m_iCurPos = iCurPos;
-            return iDataLen;
-        }
-    }
-}

3rdparty/MultiEmulator/src/DoubleBuffering.h

@@ -1,40 +0,0 @@
-//DoubleBuffering.h Header File 
- 
-#ifndef __DOUBLEBUFFERING_H__ 
-#define __DOUBLEBUFFERING_H__ 
- 
-//Typical DISCLAIMER: 
-//The code in this project is Copyright (C) 2003 by George Anescu. You have the right to 
-//use and distribute the code in any way you see fit as long as this paragraph is included 
-//with the distribution. No warranties or claims are made as to the validity of the 
-//information and code contained herein, so use it at your own risk. 
- 
-#include <fstream> 
- 
-using namespace std; 
- 
-class CDoubleBuffering 
-{ 
-public: 
-	//Constructor 
-	CDoubleBuffering(ifstream& in, char* pcBuff, int iSize, int iDataLen); 
-	//Get Next Data Buffer 
-	int GetData(char* pszDataBuf, int iDataLen=-1); 
- 
-private: 
-	ifstream& m_rin; 
-	int m_iSize; 
-	int m_iSize2; //m_iSize/2 
-	int m_iDataLen; 
-	//Current Position 
-	int m_iCurPos; 
-	//End Position 
-	int m_iEnd; 
-	//Which Buffer 
-	int m_iBuf; 
-	char* m_pcBuff; 
-	//EOF attained 
-	bool m_bEOF; 
-}; 
- 
-#endif //__DOUBLEBUFFERING_H__ 

3rdparty/MultiEmulator/src/MessageDigest.cpp

@@ -1,38 +0,0 @@
-//MessageDigest.cpp   
-   
-#include "MessageDigest.h"   
-#include "DoubleBuffering.h"   
-   
-#include <exception>   
-#include <fstream>   
-#include <strstream>   
-   
-using namespace std;   
-   
-//Digesting a Full File   
-void IMessageDigest::DigestFile(string const& rostrFileIn, char* pcDigest)   
-{   
-    //Is the User's responsability to ensure that pcDigest is appropriately allocated   
-    //Open Input File   
-    ifstream in(rostrFileIn.c_str(), ios::binary);   
-    if(!in)   
-    {   
-        ostrstream ostr;   
-        ostr << "FileDigest ERROR: in IMessageDigest::DigestFile(): Cannot open File " << rostrFileIn << "!" << ends;   
-        string ostrMsg = ostr.str();   
-        ostr.freeze(false);   
-        throw runtime_error(ostrMsg);   
-    }   
-    //Resetting first   
-    Reset();   
-    //Reading from file   
-    char szLargeBuff[BUFF_LEN+1] = {0};   
-    char szBuff[DATA_LEN+1] = {0};   
-    CDoubleBuffering oDoubleBuffering(in, szLargeBuff, BUFF_LEN, DATA_LEN);   
-    int iRead;   
-    while((iRead=oDoubleBuffering.GetData(szBuff)) > 0)   
-        AddData(szBuff, iRead);   
-    in.close();   
-    //Final Step   
-    FinalDigest(pcDigest);   
-}   

3rdparty/MultiEmulator/src/MessageDigest.h

@@ -1,47 +0,0 @@
-//MessageDigest.h 
- 
-#ifndef __MESSAGEDIGEST_H__ 
-#define __MESSAGEDIGEST_H__ 
- 
-#include <string> 
- 
-using namespace std; 
- 
-//Typical DISCLAIMER: 
-//The code in this project is Copyright (C) 2003 by George Anescu. You have the right to 
-//use and distribute the code in any way you see fit as long as this paragraph is included 
-//with the distribution. No warranties or claims are made as to the validity of the 
-//information and code contained herein, so use it at your own risk. 
- 
-//General Message Digest Interface 
-class IMessageDigest 
-{ 
-public: 
-	//CONSTRUCTOR 
-	IMessageDigest() : m_bAddData(false) {} 
-	//DESTRUCTOR 
-	virtual ~IMessageDigest() {} 
-	//Update context to reflect the concatenation of another buffer of bytes 
-	virtual void AddData(char const* pcData, int iDataLength) = 0; 
-	//Final wrapup - pad to BLOCKSIZE-byte boundary with the bit pattern  
-	//10000...(64-bit count of bits processed, MSB-first) 
-	virtual void FinalDigest(char* pcDigest) = 0; 
-	//Reset current operation in order to prepare for a new one 
-	virtual void Reset() = 0; 
-	//Digesting a Full File 
-	void DigestFile(string const& rostrFileIn, char* pcDigest); 
- 
-protected: 
-	enum { BLOCKSIZE=64 }; 
-	//Control Flag 
-	bool m_bAddData; 
-	//The core of the MessageDigest algorithm, this alters an existing MessageDigest hash to 
-	//reflect the addition of 64 bytes of new data 
-	virtual void Transform() = 0; 
- 
-private: 
-	enum { DATA_LEN=384, BUFF_LEN=1024 }; 
-}; 
- 
-#endif // __MESSAGEDIGEST_H__ 
- 

3rdparty/MultiEmulator/src/OldRevEmu.cpp

@@ -1,13 +0,0 @@
-#include "multi_emulator.h"
-
-int GenerateOldRevEmu(void* pDest, int nSteamID)
-{
-	auto pTicket = (int*)pDest;
-	auto pbTicket = (unsigned char*)pDest;
-
-	pTicket[0] = 0xFFFF;                       // +0, header
-	pTicket[1] = (nSteamID ^ 0xC9710266) << 1; // +4, SteamId
-	*(short *)&pbTicket[8] = 0;                // +8, unknown, in original emulator must be 0
-
-	return 10;
-}

3rdparty/MultiEmulator/src/RevEmu.cpp

@@ -1,27 +0,0 @@
-#include "multi_emulator.h"
-#include "StrUtils.h"
-#include "RevSpoofer.h"
-
-int GenerateRevEmu(void *pDest, int nSteamID)
-{
-	char szhwid[64];
-
-	CreateRandomString(szhwid, 16);
-	if (!RevSpoofer::Spoof(szhwid, nSteamID))
-		return 0;
-
-	auto pTicket = (int *)pDest;
-	auto revHash = RevSpoofer::Hash(szhwid);
-
-	pTicket[0] = 'J';           //  +0, header
-	pTicket[1] = revHash;       //  +4, hash of string at +24 offset
-	pTicket[2] = 'r' << 16 | 'e' << 8 | 'v';//  +8, magic number
-	pTicket[3] = 0;             // +12, unknown number, must always be 0
-
-	pTicket[4] = revHash << 1;  // +16, SteamId, Low part
-	pTicket[5] = 0x01100001;    // +20, SteamId, High part
-
-	strcpy((char *)&pTicket[6], szhwid); // +24, string for hash
-
-	return 152;
-}

3rdparty/MultiEmulator/src/RevEmu2013.cpp

@@ -1,55 +0,0 @@
-#include "multi_emulator.h"
-#include "StrUtils.h"
-#include "RevSpoofer.h"
-#include "CRijndael.h"
-#include "SHA.h"
-#include <time.h>
-
-int GenerateRevEmu2013(void *pDest, int nSteamID)
-{
-	char szhwid[64];
-
-	CreateRandomString(szhwid, 32);
-	if (!RevSpoofer::Spoof(szhwid, nSteamID))
-		return 0;
-
-	auto pTicket = (int *)pDest;
-	auto pbTicket = (unsigned char *)pDest;
-
-	auto revHash = RevSpoofer::Hash(szhwid);
-
-	pTicket[0] = 'S';                      // +0
-	pTicket[1] = revHash;                  // +4
-	pTicket[2] = 'r' << 16 | 'e' << 8 | 'v';;// +8
-	pTicket[3] = 0;                        // +12
-	pTicket[4] = revHash << 1;             // +16
-	pTicket[5] = 0x01100001;               // +20
-	pTicket[6] = (int)time(0) + 90123;  // +24
-	pbTicket[27] = ~(pbTicket[27] + pbTicket[24]);
-	pTicket[7] = ~(int)time(0);         // +28
-	pTicket[8] = revHash * 2 >> 3;         // +32
-	pTicket[9] = 0;                        // +36
-
-	static const char c_szAESKeyRand[] = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
-
-	char szAESHashRand[32];
-	auto AESRand = CRijndael();
-	AESRand.MakeKey(c_szAESKeyRand, CRijndael::sm_chain0, 32, 32);
-	AESRand.EncryptBlock(szhwid, szAESHashRand);
-	memcpy(&pbTicket[40], szAESHashRand, 32);
-
-	static const char c_szAESKeyRev[] = "_YOU_SERIOUSLY_NEED_TO_GET_LAID_";
-	char AESHashRev[32];
-	auto AESRev = CRijndael();
-	AESRev.MakeKey(c_szAESKeyRev, CRijndael::sm_chain0, 32, 32);
-	AESRev.EncryptBlock(c_szAESKeyRand, AESHashRev);
-	memcpy(&pbTicket[72], AESHashRev, 32);
-
-	char szSHAHash[32];
-	auto sha = CSHA(CSHA::SHA256);
-	sha.AddData(szhwid, 32);
-	sha.FinalDigest(szSHAHash);
-	memcpy(&pbTicket[104], szSHAHash, 32);
-
-	return 194;
-}

3rdparty/MultiEmulator/src/RevSpoofer.cpp

@@ -1,96 +0,0 @@
-#include "RevSpoofer.h"
-#include <string.h>
-
-#define astrlen(x) sizeof(x) - 1
-
-static char s_szDictionary[] = { "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ" };
-
-static int iInputLen;
-static unsigned int uTreasure;
-
-bool ScanLast3(char *pszInput, unsigned int uPrevHash)
-{
-	unsigned int h1, h2, h3, hh;
-	for (int i1 = 0; i1 < astrlen(s_szDictionary); i1++)
-	{
-		h1 = uPrevHash ^ ((uPrevHash >> 2) + (uPrevHash << 5) + s_szDictionary[i1]);
-		hh = h1 ^ ((h1 >> 2) + (h1 << 5));
-		hh = hh ^ ((hh >> 2) + (hh << 5));
-
-		if ((hh ^ uTreasure) >> (8 + 5 + 3))
-			continue;
-
-		for (int i2 = 0; i2 < astrlen(s_szDictionary); i2++)
-		{
-			h2 = h1 ^ ((h1 >> 2) + (h1 << 5) + s_szDictionary[i2]);
-			hh = h2 ^ ((h2 >> 2) + (h2 << 5));
-			if ((hh ^ uTreasure) >> (8 + 3))
-				continue;
-
-			for (int i3 = 0; i3 < astrlen(s_szDictionary); i3++)
-			{
-				h3 = h2 ^ ((h2 >> 2) + (h2 << 5) + s_szDictionary[i3]);
-				if (h3 == uTreasure)
-				{
-					pszInput[iInputLen - 3] = s_szDictionary[i1];
-					pszInput[iInputLen - 2] = s_szDictionary[i2];
-					pszInput[iInputLen - 1] = s_szDictionary[i3];
-					return true;
-				}
-			}
-		}
-	}
-	return false;
-}
-
-bool ScanNext(char* pszInput, int uIndex, unsigned int uPrevHash)
-{
-	bool res;
-
-	for (int i = 0; i < astrlen(s_szDictionary); i++)
-	{
-		auto h = uPrevHash ^ ((uPrevHash >> 2) + (uPrevHash << 5) + s_szDictionary[i]);
-
-		if (uIndex + 1 < iInputLen - 3)
-			res = ScanNext(pszInput, uIndex + 1, h);
-		else
-			res = ScanLast3(pszInput, h);
-
-		if (res)
-		{
-			pszInput[uIndex] = s_szDictionary[i];
-			return true;
-		}
-	}
-	return false;
-}
-
-namespace RevSpoofer
-{
-	bool Spoof(char *pszDest, int uSID)
-	{
-		uTreasure = uSID;
-		iInputLen = strlen(pszDest);
-
-		auto i = iInputLen - 7;
-		i = (i < 0) ? 0 : i;
-		pszDest[i] = '\0';
-		auto h = Hash(pszDest);
-		return ScanNext(pszDest, i, h);
-	}
-
-	unsigned int Hash(char *pszString)
-	{
-		int i = 0;
-		unsigned int nHash = 0x4E67C6A7;
-		int c = pszString[i++];
-
-		while (c)
-		{
-			nHash = nHash ^ ((nHash >> 2) + (nHash << 5) + c);
-			c = pszString[i++];
-		}
-
-		return nHash;
-	}
-}

3rdparty/MultiEmulator/src/RevSpoofer.h

@@ -1,7 +0,0 @@
-#pragma once
-
-namespace RevSpoofer
-{
-	bool Spoof(char *pszDest, int uSID);
-	unsigned int Hash(char *pszString);
-}

3rdparty/MultiEmulator/src/SC2009.cpp

@@ -1,52 +0,0 @@
-#include "multi_emulator.h"
-#include "StrUtils.h"
-#include "RevSpoofer.h"
-#include "CRijndael.h"
-#include "SHA.h"
-
-int GenerateSC2009(void* pDest, int nSteamID)
-{
-	char hwid[64];
-
-	CreateRandomString(hwid, 32);
-	if (!RevSpoofer::Spoof(hwid, nSteamID))
-		return 0;
-
-	auto pTicket = (int*)pDest;
-	auto pbTicket = (unsigned char*)pDest;
-
-	auto revHash = RevSpoofer::Hash(hwid);
-
-	pTicket[0] = 'S';          // +0
-	pTicket[1] = revHash;      // +4
-	pTicket[2] = 'r' << 16 | 'e' << 8 | 'v';;// +8
-	pTicket[3] = 0;            // +12
-	pTicket[4] = revHash << 1; // +16
-	pTicket[5] = 0x01100001;   // +20
-
-	/* Encrypt HWID with AESKeyRand key and save it in the ticket. */
-	static const char AESKeyRand[] = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
-	char AESHashRand[32];
-	auto AESRand = CRijndael();
-	AESRand.MakeKey(AESKeyRand, CRijndael::sm_chain0, 32, 32);
-	AESRand.EncryptBlock(hwid, AESHashRand);
-	memcpy(&pbTicket[24], AESHashRand, 32);
-
-	/* Encrypt AESKeyRand with AESKeyRev key and save it in the ticket.
-	 * AESKeyRev key is identical to the key in dproto/reunion. */
-	static const char AESKeyRev[] = "_YOU_SERIOUSLY_NEED_TO_GET_LAID_";
-	char AESHashRev[32];
-	auto AESRev = CRijndael();
-	AESRev.MakeKey(AESKeyRev, CRijndael::sm_chain0, 32, 32);
-	AESRev.EncryptBlock(AESKeyRand, AESHashRev);
-	memcpy(&pbTicket[56], AESHashRev, 32);
-
-	/* Perform HWID hashing and save hash to the ticket. */
-	char SHAHash[32];
-	auto sha = CSHA(CSHA::SHA256);
-	sha.AddData(hwid, 32);
-	sha.FinalDigest(SHAHash);
-	memcpy(&pbTicket[88], SHAHash, 32);
-
-	return 178;
-}

3rdparty/MultiEmulator/src/SHA.cpp

@@ -1,734 +0,0 @@
-//SHA.cpp
-#include "SHA.h"
-#include <exception>
-#include <strstream>
-#include <string.h>
-
-using namespace std;
-
-const unsigned int CSHA::sm_K160[4] =
-{
-    0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xCA62C1D6
-};
-
-const unsigned int CSHA::sm_H160[SHA160LENGTH] =
-{
-    0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0
-};
-
-const unsigned int CSHA::sm_K256[64] =
-{
-    0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
-    0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
-    0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
-    0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
-    0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
-    0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
-    0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
-    0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
-};
-
-const unsigned int CSHA::sm_H256[SHA256LENGTH] =
-{
-    0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a,
-    0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19
-};
-
-const SUI64 CSHA::sm_H384[SHA512LENGTH] =
-{
-    {0xcbbb9d5d, 0xc1059ed8},
-    {0x629a292a, 0x367cd507},
-    {0x9159015a, 0x3070dd17},
-    {0x152fecd8, 0xf70e5939},
-    {0x67332667, 0xffc00b31},
-    {0x8eb44a87, 0x68581511},
-    {0xdb0c2e0d, 0x64f98fa7},
-    {0x47b5481d, 0xbefa4fa4}
-};
-
-const SUI64 CSHA::sm_K512[80] =
-{
-    {0x428a2f98, 0xd728ae22}, {0x71374491, 0x23ef65cd},
-    {0xb5c0fbcf, 0xec4d3b2f}, {0xe9b5dba5, 0x8189dbbc},
-    {0x3956c25b, 0xf348b538}, {0x59f111f1, 0xb605d019},
-    {0x923f82a4, 0xaf194f9b}, {0xab1c5ed5, 0xda6d8118},
-    {0xd807aa98, 0xa3030242}, {0x12835b01, 0x45706fbe},
-    {0x243185be, 0x4ee4b28c}, {0x550c7dc3, 0xd5ffb4e2},
-    {0x72be5d74, 0xf27b896f}, {0x80deb1fe, 0x3b1696b1},
-    {0x9bdc06a7, 0x25c71235}, {0xc19bf174, 0xcf692694},
-    {0xe49b69c1, 0x9ef14ad2}, {0xefbe4786, 0x384f25e3},
-    {0x0fc19dc6, 0x8b8cd5b5}, {0x240ca1cc, 0x77ac9c65},
-    {0x2de92c6f, 0x592b0275}, {0x4a7484aa, 0x6ea6e483},
-    {0x5cb0a9dc, 0xbd41fbd4}, {0x76f988da, 0x831153b5},
-    {0x983e5152, 0xee66dfab}, {0xa831c66d, 0x2db43210},
-    {0xb00327c8, 0x98fb213f}, {0xbf597fc7, 0xbeef0ee4},
-    {0xc6e00bf3, 0x3da88fc2}, {0xd5a79147, 0x930aa725},
-    {0x06ca6351, 0xe003826f}, {0x14292967, 0x0a0e6e70},
-    {0x27b70a85, 0x46d22ffc}, {0x2e1b2138, 0x5c26c926},
-    {0x4d2c6dfc, 0x5ac42aed}, {0x53380d13, 0x9d95b3df},
-    {0x650a7354, 0x8baf63de}, {0x766a0abb, 0x3c77b2a8},
-    {0x81c2c92e, 0x47edaee6}, {0x92722c85, 0x1482353b},
-    {0xa2bfe8a1, 0x4cf10364}, {0xa81a664b, 0xbc423001},
-    {0xc24b8b70, 0xd0f89791}, {0xc76c51a3, 0x0654be30},
-    {0xd192e819, 0xd6ef5218}, {0xd6990624, 0x5565a910},
-    {0xf40e3585, 0x5771202a}, {0x106aa070, 0x32bbd1b8},
-    {0x19a4c116, 0xb8d2d0c8}, {0x1e376c08, 0x5141ab53},
-    {0x2748774c, 0xdf8eeb99}, {0x34b0bcb5, 0xe19b48a8},
-    {0x391c0cb3, 0xc5c95a63}, {0x4ed8aa4a, 0xe3418acb},
-    {0x5b9cca4f, 0x7763e373}, {0x682e6ff3, 0xd6b2b8a3},
-    {0x748f82ee, 0x5defb2fc}, {0x78a5636f, 0x43172f60},
-    {0x84c87814, 0xa1f0ab72}, {0x8cc70208, 0x1a6439ec},
-    {0x90befffa, 0x23631e28}, {0xa4506ceb, 0xde82bde9},
-    {0xbef9a3f7, 0xb2c67915}, {0xc67178f2, 0xe372532b},
-    {0xca273ece, 0xea26619c}, {0xd186b8c7, 0x21c0c207},
-    {0xeada7dd6, 0xcde0eb1e}, {0xf57d4f7f, 0xee6ed178},
-    {0x06f067aa, 0x72176fba}, {0x0a637dc5, 0xa2c898a6},
-    {0x113f9804, 0xbef90dae}, {0x1b710b35, 0x131c471b},
-    {0x28db77f5, 0x23047d84}, {0x32caab7b, 0x40c72493},
-    {0x3c9ebe0a, 0x15c9bebc}, {0x431d67c4, 0x9c100d4c},
-    {0x4cc5d4be, 0xcb3e42b6}, {0x597f299c, 0xfc657e2a},
-    {0x5fcb6fab, 0x3ad6faec}, {0x6c44198c, 0x4a475817}
-};
-
-const SUI64 CSHA::sm_H512[SHA512LENGTH] =
-{
-    {0x6a09e667, 0xf3bcc908},
-    {0xbb67ae85, 0x84caa73b},
-    {0x3c6ef372, 0xfe94f82b},
-    {0xa54ff53a, 0x5f1d36f1},
-    {0x510e527f, 0xade682d1},
-    {0x9b05688c, 0x2b3e6c1f},
-    {0x1f83d9ab, 0xfb41bd6b},
-    {0x5be0cd19, 0x137e2179}
-};
-
-//CONSTRUCTOR
-CSHA::CSHA(int iMethod)
-{
-    //Check the method
-    switch(iMethod)
-    {
-        case SHA160:
-            {
-                for(int i=0; i<SHA160LENGTH; i++)
-                    m_auiBuf[i] = sm_H160[i];
-                m_auiBits[0] = 0;
-                m_auiBits[1] = 0;
-            }
-            break;
-
-        case SHA256:
-            {
-                for(int i=0; i<SHA256LENGTH; i++)
-                    m_auiBuf[i] = sm_H256[i];
-                m_auiBits[0] = 0;
-                m_auiBits[1] = 0;
-            }
-            break;
-
-        case SHA384:
-            {
-                for(int i=0; i<SHA512LENGTH; i++)
-                    m_aoui64Buf[i] = sm_H384[i];
-                m_aoui64Bits[0].m_uiLeft = 0;
-                m_aoui64Bits[0].m_uiRight = 0;
-                m_aoui64Bits[1].m_uiLeft = 0;
-                m_aoui64Bits[1].m_uiRight = 0;
-            }
-            break;
-
-        case SHA512:
-            {
-                for(int i=0; i<SHA512LENGTH; i++)
-                    m_aoui64Buf[i] = sm_H512[i];
-                m_aoui64Bits[0].m_uiLeft = 0;
-                m_aoui64Bits[0].m_uiRight = 0;
-                m_aoui64Bits[1].m_uiLeft = 0;
-                m_aoui64Bits[1].m_uiRight = 0;
-            }
-            break;
-
-        default:
-        {
-            ostrstream ostr;
-            ostr << "FileDigest ERROR: in CSHA() Constructor, Illegal Method " << iMethod << "!" << ends;
-            string ostrMsg = ostr.str();
-            ostr.freeze(false);
-            throw runtime_error(ostrMsg);
-        }
-    }
-    m_iMethod = iMethod;
-}
-
-//Update context to reflect the concatenation of another buffer of bytes.
-void CSHA::AddData(char const* pcData, int iDataLength)
-{
-    if(iDataLength < 0)
-        throw runtime_error(string("FileDigest ERROR: in CSHA::AddData(), Data Length should be >= 0!"));
-    unsigned int uiT;
-    switch(m_iMethod)
-    {
-        case SHA160:
-        case SHA256:
-            {
-                //Update bitcount
-                uiT = m_auiBits[0];
-                if((m_auiBits[0] = uiT + ((unsigned int)iDataLength << 3)) < uiT)
-                    m_auiBits[1]++; //Carry from low to high
-                m_auiBits[1] += iDataLength >> 29;
-                uiT = (uiT >> 3) & (BLOCKSIZE-1); //Bytes already
-                //Handle any leading odd-sized chunks
-                if(uiT != 0)
-                {
-                    unsigned char* puc = (unsigned char*)m_aucIn + uiT;
-                    uiT = BLOCKSIZE - uiT;
-                    if(iDataLength < uiT)
-                    {
-                        memcpy(puc, pcData, iDataLength);
-                        return;
-                    }
-                    memcpy(puc, pcData, uiT);
-                    Transform();
-                    pcData += uiT;
-                    iDataLength -= uiT;
-                }
-                //Process data in 64-byte chunks
-                while(iDataLength >= BLOCKSIZE)
-                {
-                    memcpy(m_aucIn, pcData, BLOCKSIZE);
-                    Transform();
-                    pcData += BLOCKSIZE;
-                    iDataLength -= BLOCKSIZE;
-                }
-                //Handle any remaining bytes of data
-                memcpy(m_aucIn, pcData, iDataLength);
-            }
-            break;
-
-        case SHA384:
-        case SHA512:
-            {
-                uiT = m_aoui64Bits[0].m_uiRight;
-                unsigned int uiU = m_aoui64Bits[0].m_uiLeft;
-                if((m_aoui64Bits[0].m_uiRight = uiT + ((unsigned int)iDataLength << 3)) < uiT)
-                    m_aoui64Bits[0].m_uiLeft++; //Carry from low to high
-                unsigned int uiV = m_aoui64Bits[1].m_uiRight;
-                if((m_aoui64Bits[0].m_uiLeft += iDataLength >> 29) < uiU)
-                    m_aoui64Bits[1].m_uiRight++;
-                if(m_aoui64Bits[1].m_uiRight < uiV)
-                    m_aoui64Bits[1].m_uiLeft++;
-                uiT = (uiT >> 3) & (BLOCKSIZE2-1); //Bytes already
-                //Handle any leading odd-sized chunks
-                if(uiT != 0)
-                {
-                    unsigned char* puc = (unsigned char*)m_aucIn + uiT;
-                    uiT = BLOCKSIZE2 - uiT;
-                    if(iDataLength < uiT)
-                    {
-                        memcpy(puc, pcData, iDataLength);
-                        return;
-                    }
-                    memcpy(puc, pcData, uiT);
-                    Transform();
-                    pcData += uiT;
-                    iDataLength -= uiT;
-                }
-                //Process data in 64-byte chunks
-                while(iDataLength >= BLOCKSIZE2)
-                {
-                    memcpy(m_aucIn, pcData, BLOCKSIZE2);
-                    Transform();
-                    pcData += BLOCKSIZE2;
-                    iDataLength -= BLOCKSIZE2;
-                }
-                //Handle any remaining bytes of data
-                memcpy(m_aucIn, pcData, iDataLength);
-            }
-            break;
-    }
-    //Set the flag
-    m_bAddData = true;
-}
-
-//Final wrapup - pad to 64-byte boundary with the bit pattern
-//1 0*(64-bit count of bits processed, MSB-first)
-void CSHA::FinalDigest(char* pcDigest)
-{
-    //Is the User's responsability to ensure that pcDigest is properly allocated 20, 32,
-    //48 or 64 bytes, depending on the method
-    if(false == m_bAddData)
-        throw runtime_error(string("FileDigest ERROR: in CSHA::FinalDigest(), No data Added before call!"));
-    switch(m_iMethod)
-    {
-        case SHA160:
-        case SHA256:
-            {
-                unsigned int uiCount;
-                unsigned char *puc;
-                //Compute number of bytes mod 64
-                uiCount = (m_auiBits[0] >> 3) & (BLOCKSIZE-1);
-                //Set the first char of padding to 0x80. This is safe since there is
-                //always at least one byte free
-                puc = m_aucIn + uiCount;
-                *puc++ = 0x80;
-                //Bytes of padding needed to make 64 bytes
-                uiCount = BLOCKSIZE - uiCount - 1;
-                //Pad out to 56 mod 64
-                if(uiCount < 8)
-                {
-                    //Two lots of padding: Pad the first block to 64 bytes
-                    memset(puc, 0, uiCount);
-                    Transform();
-                    //Now fill the next block with 56 bytes
-                    memset(m_aucIn, 0, BLOCKSIZE-8);
-                }
-                else
-                {
-                    //Pad block to 56 bytes
-                    memset(puc, 0, uiCount - 8);
-                }
-                //Append length in bits and transform
-                Word2Bytes(m_auiBits[1], &m_aucIn[BLOCKSIZE-8]);
-                Word2Bytes(m_auiBits[0], &m_aucIn[BLOCKSIZE-4]);
-                Transform();
-                switch(m_iMethod)
-                {
-                    case SHA160:
-                        {
-                            for(int i=0; i<SHA160LENGTH; i++,pcDigest+=4)
-                                Word2Bytes(m_auiBuf[i], reinterpret_cast<unsigned char*>(pcDigest));
-                        }
-                        break;
-
-                    case SHA256:
-                        {
-                            for(int i=0; i<SHA256LENGTH; i++,pcDigest+=4)
-                                Word2Bytes(m_auiBuf[i], reinterpret_cast<unsigned char*>(pcDigest));
-                        }
-                        break;
-                }
-            }
-            break;
-
-        case SHA384:
-        case SHA512:
-            {
-                unsigned char *puc;
-                //Compute number of bytes mod 128
-                unsigned int uiCount = (m_aoui64Bits[0].m_uiRight >> 3) & (BLOCKSIZE2-1);
-                //Set the first char of padding to 0x80. This is safe since there is
-                //always at least one byte free
-                puc = m_aucIn + uiCount;
-                *puc++ = 0x80;
-                //Bytes of padding needed to make 128 bytes
-                uiCount = BLOCKSIZE2 - uiCount - 1;
-                //Pad out to 112 mod 128
-                if(uiCount < 16)
-                {
-                    //Two lots of padding: Pad the first block to 128 bytes
-                    memset(puc, 0, uiCount);
-                    Transform();
-                    //Now fill the next block with 112 bytes
-                    memset(m_aucIn, 0, BLOCKSIZE2-16);
-                }
-                else
-                {
-                    //Pad block to 112 bytes
-                    memset(puc, 0, uiCount - 16);
-                }
-                //Append length in bits and transform
-                Word2Bytes(m_aoui64Bits[1], &m_aucIn[BLOCKSIZE2-16]);
-                Word2Bytes(m_aoui64Bits[0], &m_aucIn[BLOCKSIZE2-8]);
-                Transform();
-                switch(m_iMethod)
-                {
-                    case SHA384:
-                        {
-                            for(int i=0; i<SHA384LENGTH; i++,pcDigest+=8)
-                                Word2Bytes(m_aoui64Buf[i], reinterpret_cast<unsigned char*>(pcDigest));
-                        }
-                        break;
-
-                    case SHA512:
-                        {
-                            for(int i=0; i<SHA512LENGTH; i++,pcDigest+=8)
-                                Word2Bytes(m_aoui64Buf[i], reinterpret_cast<unsigned char*>(pcDigest));
-                        }
-                        break;
-                }
-            }
-            break;
-    }
-    //Reinitialize
-    Reset();
-}
-
-//Reset current operation in order to prepare a new one
-void CSHA::Reset()
-{
-    //Reinitialize
-    switch(m_iMethod)
-    {
-        case SHA160:
-            {
-                for(int i=0; i<SHA160LENGTH; i++)
-                    m_auiBuf[i] = sm_H160[i];
-                m_auiBits[0] = 0;
-                m_auiBits[1] = 0;
-            }
-            break;
-
-        case SHA256:
-            {
-                for(int i=0; i<SHA256LENGTH; i++)
-                    m_auiBuf[i] = sm_H256[i];
-                m_auiBits[0] = 0;
-                m_auiBits[1] = 0;
-            }
-            break;
-
-        case SHA384:
-            {
-                for(int i=0; i<SHA512LENGTH; i++)
-                    m_aoui64Buf[i] = sm_H384[i];
-                m_aoui64Bits[0].m_uiLeft = 0;
-                m_aoui64Bits[0].m_uiRight = 0;
-                m_aoui64Bits[1].m_uiLeft = 0;
-                m_aoui64Bits[1].m_uiRight = 0;
-            }
-            break;
-
-        case SHA512:
-            {
-                for(int i=0; i<SHA512LENGTH; i++)
-                    m_aoui64Buf[i] = sm_H512[i];
-                m_aoui64Bits[0].m_uiLeft = 0;
-                m_aoui64Bits[0].m_uiRight = 0;
-                m_aoui64Bits[1].m_uiLeft = 0;
-                m_aoui64Bits[1].m_uiRight = 0;
-            }
-    }
-    //Reset the flag
-    m_bAddData = false;
-}
-
-//The core of the SHA algorithm, this alters an existing SHA hash to
-//reflect the addition of 16 longwords of new data.
-void CSHA::Transform()
-{
-    switch(m_iMethod)
-    {
-        case SHA160:
-            {
-                //Expansion of m_aucIn
-                unsigned char* pucIn = m_aucIn;
-                unsigned int auiW[80];
-                int i;
-                for(i=0; i<16; i++,pucIn+=4)
-                    Bytes2Word(pucIn, auiW[i]);
-                for(i=16; i<80; i++)
-                    auiW[i] = CircularShift(1, auiW[i-3]^auiW[i-8]^auiW[i-14]^auiW[i-16]);
-                unsigned int temp;
-                unsigned int A, B, C, D, E;
-                A = m_auiBuf[0];
-                B = m_auiBuf[1];
-                C = m_auiBuf[2];
-                D = m_auiBuf[3];
-                E = m_auiBuf[4];
-                for(i=0; i<20; i++)
-                {
-                    temp = CircularShift(5, A) + ((B & C) | ((~B) & D)) + E + auiW[i] + sm_K160[0];
-                    E = D;
-                    D = C;
-                    C = CircularShift(30, B);
-                    B = A;
-                    A = temp;
-                }
-                for(i=20; i<40; i++)
-                {
-                    temp = CircularShift(5, A) + (B ^ C ^ D) + E + auiW[i] + sm_K160[1];
-                    E = D;
-                    D = C;
-                    C = CircularShift(30, B);
-                    B = A;
-                    A = temp;
-                }
-                for(i=40; i<60; i++)
-                {
-                    temp = CircularShift(5, A) + ((B & C) | (B & D) | (C & D)) + E + auiW[i] + sm_K160[2];
-                    E = D;
-                    D = C;
-                    C = CircularShift(30, B);
-                    B = A;
-                    A = temp;
-                }
-                for(i=60; i<80; i++)
-                {
-                    temp = CircularShift(5, A) + (B ^ C ^ D) + E + auiW[i] + sm_K160[3];
-                    E = D;
-                    D = C;
-                    C = CircularShift(30, B);
-                    B = A;
-                    A = temp;
-                }
-                m_auiBuf[0] += A;
-                m_auiBuf[1] += B;
-                m_auiBuf[2] += C;
-                m_auiBuf[3] += D;
-                m_auiBuf[4] += E;
-            }
-            break;
-
-        case SHA256:
-            {
-                //Expansion of m_aucIn
-                unsigned char* pucIn = m_aucIn;
-                unsigned int auiW[64];
-                int i;
-                for(i=0; i<16; i++,pucIn+=4)
-                    Bytes2Word(pucIn, auiW[i]);
-                for(i=16; i<64; i++)
-                    auiW[i] = sig1(auiW[i-2]) + auiW[i-7] + sig0(auiW[i-15]) + auiW[i-16];
-                //OR
-                //for(i=0; i<48; i++)
-                //  auiW[i+16] = sig1(auiW[i+14]) + auiW[i+9] + sig0(auiW[i+1]) + auiW[i];
-                unsigned int a, b, c, d, e, f, g, h, t;
-                a = m_auiBuf[0];
-                b = m_auiBuf[1];
-                c = m_auiBuf[2];
-                d = m_auiBuf[3];
-                e = m_auiBuf[4];
-                f = m_auiBuf[5];
-                g = m_auiBuf[6];
-                h = m_auiBuf[7];
-                t = h + SIG1(e) + CH(e, f, g) + sm_K256[0] + auiW[0]; h = t + SIG0(a) + MAJ(a, b, c); d += t;
-                t = g + SIG1(d) + CH(d, e, f) + sm_K256[1] + auiW[1]; g = t + SIG0(h) + MAJ(h, a, b); c += t;
-                t = f + SIG1(c) + CH(c, d, e) + sm_K256[2] + auiW[2]; f = t + SIG0(g) + MAJ(g, h, a); b += t;
-                t = e + SIG1(b) + CH(b, c, d) + sm_K256[3] + auiW[3]; e = t + SIG0(f) + MAJ(f, g, h); a += t;
-                t = d + SIG1(a) + CH(a, b, c) + sm_K256[4] + auiW[4]; d = t + SIG0(e) + MAJ(e, f, g); h += t;
-                t = c + SIG1(h) + CH(h, a, b) + sm_K256[5] + auiW[5]; c = t + SIG0(d) + MAJ(d, e, f); g += t;
-                t = b + SIG1(g) + CH(g, h, a) + sm_K256[6] + auiW[6]; b = t + SIG0(c) + MAJ(c, d, e); f += t;
-                t = a + SIG1(f) + CH(f, g, h) + sm_K256[7] + auiW[7]; a = t + SIG0(b) + MAJ(b, c, d); e += t;
-                //
-                t = h + SIG1(e) + CH(e, f, g) + sm_K256[8] + auiW[8]; h = t + SIG0(a) + MAJ(a, b, c); d += t;
-                t = g + SIG1(d) + CH(d, e, f) + sm_K256[9] + auiW[9]; g = t + SIG0(h) + MAJ(h, a, b); c += t;
-                t = f + SIG1(c) + CH(c, d, e) + sm_K256[10] + auiW[10]; f = t + SIG0(g) + MAJ(g, h, a); b += t;
-                t = e + SIG1(b) + CH(b, c, d) + sm_K256[11] + auiW[11]; e = t + SIG0(f) + MAJ(f, g, h); a += t;
-                t = d + SIG1(a) + CH(a, b, c) + sm_K256[12] + auiW[12]; d = t + SIG0(e) + MAJ(e, f, g); h += t;
-                t = c + SIG1(h) + CH(h, a, b) + sm_K256[13] + auiW[13]; c = t + SIG0(d) + MAJ(d, e, f); g += t;
-                t = b + SIG1(g) + CH(g, h, a) + sm_K256[14] + auiW[14]; b = t + SIG0(c) + MAJ(c, d, e); f += t;
-                t = a + SIG1(f) + CH(f, g, h) + sm_K256[15] + auiW[15]; a = t + SIG0(b) + MAJ(b, c, d); e += t;
-                //
-                t = h + SIG1(e) + CH(e, f, g) + sm_K256[16] + auiW[16]; h = t + SIG0(a) + MAJ(a, b, c); d += t;
-                t = g + SIG1(d) + CH(d, e, f) + sm_K256[17] + auiW[17]; g = t + SIG0(h) + MAJ(h, a, b); c += t;
-                t = f + SIG1(c) + CH(c, d, e) + sm_K256[18] + auiW[18]; f = t + SIG0(g) + MAJ(g, h, a); b += t;
-                t = e + SIG1(b) + CH(b, c, d) + sm_K256[19] + auiW[19]; e = t + SIG0(f) + MAJ(f, g, h); a += t;
-                t = d + SIG1(a) + CH(a, b, c) + sm_K256[20] + auiW[20]; d = t + SIG0(e) + MAJ(e, f, g); h += t;
-                t = c + SIG1(h) + CH(h, a, b) + sm_K256[21] + auiW[21]; c = t + SIG0(d) + MAJ(d, e, f); g += t;
-                t = b + SIG1(g) + CH(g, h, a) + sm_K256[22] + auiW[22]; b = t + SIG0(c) + MAJ(c, d, e); f += t;
-                t = a + SIG1(f) + CH(f, g, h) + sm_K256[23] + auiW[23]; a = t + SIG0(b) + MAJ(b, c, d); e += t;
-                //
-                t = h + SIG1(e) + CH(e, f, g) + sm_K256[24] + auiW[24]; h = t + SIG0(a) + MAJ(a, b, c); d += t;
-                t = g + SIG1(d) + CH(d, e, f) + sm_K256[25] + auiW[25]; g = t + SIG0(h) + MAJ(h, a, b); c += t;
-                t = f + SIG1(c) + CH(c, d, e) + sm_K256[26] + auiW[26]; f = t + SIG0(g) + MAJ(g, h, a); b += t;
-                t = e + SIG1(b) + CH(b, c, d) + sm_K256[27] + auiW[27]; e = t + SIG0(f) + MAJ(f, g, h); a += t;
-                t = d + SIG1(a) + CH(a, b, c) + sm_K256[28] + auiW[28]; d = t + SIG0(e) + MAJ(e, f, g); h += t;
-                t = c + SIG1(h) + CH(h, a, b) + sm_K256[29] + auiW[29]; c = t + SIG0(d) + MAJ(d, e, f); g += t;
-                t = b + SIG1(g) + CH(g, h, a) + sm_K256[30] + auiW[30]; b = t + SIG0(c) + MAJ(c, d, e); f += t;
-                t = a + SIG1(f) + CH(f, g, h) + sm_K256[31] + auiW[31]; a = t + SIG0(b) + MAJ(b, c, d); e += t;
-                //
-                t = h + SIG1(e) + CH(e, f, g) + sm_K256[32] + auiW[32]; h = t + SIG0(a) + MAJ(a, b, c); d += t;
-                t = g + SIG1(d) + CH(d, e, f) + sm_K256[33] + auiW[33]; g = t + SIG0(h) + MAJ(h, a, b); c += t;
-                t = f + SIG1(c) + CH(c, d, e) + sm_K256[34] + auiW[34]; f = t + SIG0(g) + MAJ(g, h, a); b += t;
-                t = e + SIG1(b) + CH(b, c, d) + sm_K256[35] + auiW[35]; e = t + SIG0(f) + MAJ(f, g, h); a += t;
-                t = d + SIG1(a) + CH(a, b, c) + sm_K256[36] + auiW[36]; d = t + SIG0(e) + MAJ(e, f, g); h += t;
-                t = c + SIG1(h) + CH(h, a, b) + sm_K256[37] + auiW[37]; c = t + SIG0(d) + MAJ(d, e, f); g += t;
-                t = b + SIG1(g) + CH(g, h, a) + sm_K256[38] + auiW[38]; b = t + SIG0(c) + MAJ(c, d, e); f += t;
-                t = a + SIG1(f) + CH(f, g, h) + sm_K256[39] + auiW[39]; a = t + SIG0(b) + MAJ(b, c, d); e += t;
-                //
-                t = h + SIG1(e) + CH(e, f, g) + sm_K256[40] + auiW[40]; h = t + SIG0(a) + MAJ(a, b, c); d += t;
-                t = g + SIG1(d) + CH(d, e, f) + sm_K256[41] + auiW[41]; g = t + SIG0(h) + MAJ(h, a, b); c += t;
-                t = f + SIG1(c) + CH(c, d, e) + sm_K256[42] + auiW[42]; f = t + SIG0(g) + MAJ(g, h, a); b += t;
-                t = e + SIG1(b) + CH(b, c, d) + sm_K256[43] + auiW[43]; e = t + SIG0(f) + MAJ(f, g, h); a += t;
-                t = d + SIG1(a) + CH(a, b, c) + sm_K256[44] + auiW[44]; d = t + SIG0(e) + MAJ(e, f, g); h += t;
-                t = c + SIG1(h) + CH(h, a, b) + sm_K256[45] + auiW[45]; c = t + SIG0(d) + MAJ(d, e, f); g += t;
-                t = b + SIG1(g) + CH(g, h, a) + sm_K256[46] + auiW[46]; b = t + SIG0(c) + MAJ(c, d, e); f += t;
-                t = a + SIG1(f) + CH(f, g, h) + sm_K256[47] + auiW[47]; a = t + SIG0(b) + MAJ(b, c, d); e += t;
-                //
-                t = h + SIG1(e) + CH(e, f, g) + sm_K256[48] + auiW[48]; h = t + SIG0(a) + MAJ(a, b, c); d += t;
-                t = g + SIG1(d) + CH(d, e, f) + sm_K256[49] + auiW[49]; g = t + SIG0(h) + MAJ(h, a, b); c += t;
-                t = f + SIG1(c) + CH(c, d, e) + sm_K256[50] + auiW[50]; f = t + SIG0(g) + MAJ(g, h, a); b += t;
-                t = e + SIG1(b) + CH(b, c, d) + sm_K256[51] + auiW[51]; e = t + SIG0(f) + MAJ(f, g, h); a += t;
-                t = d + SIG1(a) + CH(a, b, c) + sm_K256[52] + auiW[52]; d = t + SIG0(e) + MAJ(e, f, g); h += t;
-                t = c + SIG1(h) + CH(h, a, b) + sm_K256[53] + auiW[53]; c = t + SIG0(d) + MAJ(d, e, f); g += t;
-                t = b + SIG1(g) + CH(g, h, a) + sm_K256[54] + auiW[54]; b = t + SIG0(c) + MAJ(c, d, e); f += t;
-                t = a + SIG1(f) + CH(f, g, h) + sm_K256[55] + auiW[55]; a = t + SIG0(b) + MAJ(b, c, d); e += t;
-                //
-                t = h + SIG1(e) + CH(e, f, g) + sm_K256[56] + auiW[56]; h = t + SIG0(a) + MAJ(a, b, c); d += t;
-                t = g + SIG1(d) + CH(d, e, f) + sm_K256[57] + auiW[57]; g = t + SIG0(h) + MAJ(h, a, b); c += t;
-                t = f + SIG1(c) + CH(c, d, e) + sm_K256[58] + auiW[58]; f = t + SIG0(g) + MAJ(g, h, a); b += t;
-                t = e + SIG1(b) + CH(b, c, d) + sm_K256[59] + auiW[59]; e = t + SIG0(f) + MAJ(f, g, h); a += t;
-                t = d + SIG1(a) + CH(a, b, c) + sm_K256[60] + auiW[60]; d = t + SIG0(e) + MAJ(e, f, g); h += t;
-                t = c + SIG1(h) + CH(h, a, b) + sm_K256[61] + auiW[61]; c = t + SIG0(d) + MAJ(d, e, f); g += t;
-                t = b + SIG1(g) + CH(g, h, a) + sm_K256[62] + auiW[62]; b = t + SIG0(c) + MAJ(c, d, e); f += t;
-                t = a + SIG1(f) + CH(f, g, h) + sm_K256[63] + auiW[63]; a = t + SIG0(b) + MAJ(b, c, d); e += t;
-                //
-                //OR
-                /*
-                unsigned int a, b, c, d, e, f, g, h, t1, t2;
-                a = m_auiBuf[0];
-                b = m_auiBuf[1];
-                c = m_auiBuf[2];
-                d = m_auiBuf[3];
-                e = m_auiBuf[4];
-                f = m_auiBuf[5];
-                g = m_auiBuf[6];
-                h = m_auiBuf[7];
-                //
-                for(i=0; i<64; i++)
-                {
-                    t1 = h + SIG1(e) + CH(e, f, g) + sm_K256[i] + auiW[i];
-                    t2 = SIG0(a) + MAJ(a, b, c);
-                    h = g;
-                    g = f;
-                    f = e;
-                    e = d+t1;
-                    d = c;
-                    c = b;
-                    b = a;
-                    a = t1 + t2;
-                }
-                */
-                m_auiBuf[0] += a;
-                m_auiBuf[1] += b;
-                m_auiBuf[2] += c;
-                m_auiBuf[3] += d;
-                m_auiBuf[4] += e;
-                m_auiBuf[5] += f;
-                m_auiBuf[6] += g;
-                m_auiBuf[7] += h;
-            }
-            break;
-
-            case SHA384:
-            case SHA512:
-            {
-                //Expansion of m_aucIn
-                unsigned char* pucIn = m_aucIn;
-                SUI64 aoui64W[80];
-                int i;
-                for(i=0; i<16; i++,pucIn+=8)
-                    Bytes2Word(pucIn, aoui64W[i]);
-                for(i=16; i<80; i++)
-                    aoui64W[i] = sig1(aoui64W[i-2]) + aoui64W[i-7] + sig0(aoui64W[i-15]) + aoui64W[i-16];
-                SUI64 a, b, c, d, e, f, g, h, t;
-                a = m_aoui64Buf[0];
-                b = m_aoui64Buf[1];
-                c = m_aoui64Buf[2];
-                d = m_aoui64Buf[3];
-                e = m_aoui64Buf[4];
-                f = m_aoui64Buf[5];
-                g = m_aoui64Buf[6];
-                h = m_aoui64Buf[7];
-                t = h + SIG1(e) + CH(e, f, g) + sm_K512[0] + aoui64W[0]; h = t + SIG0(a) + MAJ(a, b, c); d += t;
-                t = g + SIG1(d) + CH(d, e, f) + sm_K512[1] + aoui64W[1]; g = t + SIG0(h) + MAJ(h, a, b); c += t;
-                t = f + SIG1(c) + CH(c, d, e) + sm_K512[2] + aoui64W[2]; f = t + SIG0(g) + MAJ(g, h, a); b += t;
-                t = e + SIG1(b) + CH(b, c, d) + sm_K512[3] + aoui64W[3]; e = t + SIG0(f) + MAJ(f, g, h); a += t;
-                t = d + SIG1(a) + CH(a, b, c) + sm_K512[4] + aoui64W[4]; d = t + SIG0(e) + MAJ(e, f, g); h += t;
-                t = c + SIG1(h) + CH(h, a, b) + sm_K512[5] + aoui64W[5]; c = t + SIG0(d) + MAJ(d, e, f); g += t;
-                t = b + SIG1(g) + CH(g, h, a) + sm_K512[6] + aoui64W[6]; b = t + SIG0(c) + MAJ(c, d, e); f += t;
-                t = a + SIG1(f) + CH(f, g, h) + sm_K512[7] + aoui64W[7]; a = t + SIG0(b) + MAJ(b, c, d); e += t;
-                //
-                t = h + SIG1(e) + CH(e, f, g) + sm_K512[8] + aoui64W[8]; h = t + SIG0(a) + MAJ(a, b, c); d += t;
-                t = g + SIG1(d) + CH(d, e, f) + sm_K512[9] + aoui64W[9]; g = t + SIG0(h) + MAJ(h, a, b); c += t;
-                t = f + SIG1(c) + CH(c, d, e) + sm_K512[10] + aoui64W[10]; f = t + SIG0(g) + MAJ(g, h, a); b += t;
-                t = e + SIG1(b) + CH(b, c, d) + sm_K512[11] + aoui64W[11]; e = t + SIG0(f) + MAJ(f, g, h); a += t;
-                t = d + SIG1(a) + CH(a, b, c) + sm_K512[12] + aoui64W[12]; d = t + SIG0(e) + MAJ(e, f, g); h += t;
-                t = c + SIG1(h) + CH(h, a, b) + sm_K512[13] + aoui64W[13]; c = t + SIG0(d) + MAJ(d, e, f); g += t;
-                t = b + SIG1(g) + CH(g, h, a) + sm_K512[14] + aoui64W[14]; b = t + SIG0(c) + MAJ(c, d, e); f += t;
-                t = a + SIG1(f) + CH(f, g, h) + sm_K512[15] + aoui64W[15]; a = t + SIG0(b) + MAJ(b, c, d); e += t;
-                //
-                t = h + SIG1(e) + CH(e, f, g) + sm_K512[16] + aoui64W[16]; h = t + SIG0(a) + MAJ(a, b, c); d += t;
-                t = g + SIG1(d) + CH(d, e, f) + sm_K512[17] + aoui64W[17]; g = t + SIG0(h) + MAJ(h, a, b); c += t;
-                t = f + SIG1(c) + CH(c, d, e) + sm_K512[18] + aoui64W[18]; f = t + SIG0(g) + MAJ(g, h, a); b += t;
-                t = e + SIG1(b) + CH(b, c, d) + sm_K512[19] + aoui64W[19]; e = t + SIG0(f) + MAJ(f, g, h); a += t;
-                t = d + SIG1(a) + CH(a, b, c) + sm_K512[20] + aoui64W[20]; d = t + SIG0(e) + MAJ(e, f, g); h += t;
-                t = c + SIG1(h) + CH(h, a, b) + sm_K512[21] + aoui64W[21]; c = t + SIG0(d) + MAJ(d, e, f); g += t;
-                t = b + SIG1(g) + CH(g, h, a) + sm_K512[22] + aoui64W[22]; b = t + SIG0(c) + MAJ(c, d, e); f += t;
-                t = a + SIG1(f) + CH(f, g, h) + sm_K512[23] + aoui64W[23]; a = t + SIG0(b) + MAJ(b, c, d); e += t;
-                //
-                t = h + SIG1(e) + CH(e, f, g) + sm_K512[24] + aoui64W[24]; h = t + SIG0(a) + MAJ(a, b, c); d += t;
-                t = g + SIG1(d) + CH(d, e, f) + sm_K512[25] + aoui64W[25]; g = t + SIG0(h) + MAJ(h, a, b); c += t;
-                t = f + SIG1(c) + CH(c, d, e) + sm_K512[26] + aoui64W[26]; f = t + SIG0(g) + MAJ(g, h, a); b += t;
-                t = e + SIG1(b) + CH(b, c, d) + sm_K512[27] + aoui64W[27]; e = t + SIG0(f) + MAJ(f, g, h); a += t;
-                t = d + SIG1(a) + CH(a, b, c) + sm_K512[28] + aoui64W[28]; d = t + SIG0(e) + MAJ(e, f, g); h += t;
-                t = c + SIG1(h) + CH(h, a, b) + sm_K512[29] + aoui64W[29]; c = t + SIG0(d) + MAJ(d, e, f); g += t;
-                t = b + SIG1(g) + CH(g, h, a) + sm_K512[30] + aoui64W[30]; b = t + SIG0(c) + MAJ(c, d, e); f += t;
-                t = a + SIG1(f) + CH(f, g, h) + sm_K512[31] + aoui64W[31]; a = t + SIG0(b) + MAJ(b, c, d); e += t;
-                //
-                t = h + SIG1(e) + CH(e, f, g) + sm_K512[32] + aoui64W[32]; h = t + SIG0(a) + MAJ(a, b, c); d += t;
-                t = g + SIG1(d) + CH(d, e, f) + sm_K512[33] + aoui64W[33]; g = t + SIG0(h) + MAJ(h, a, b); c += t;
-                t = f + SIG1(c) + CH(c, d, e) + sm_K512[34] + aoui64W[34]; f = t + SIG0(g) + MAJ(g, h, a); b += t;
-                t = e + SIG1(b) + CH(b, c, d) + sm_K512[35] + aoui64W[35]; e = t + SIG0(f) + MAJ(f, g, h); a += t;
-                t = d + SIG1(a) + CH(a, b, c) + sm_K512[36] + aoui64W[36]; d = t + SIG0(e) + MAJ(e, f, g); h += t;
-                t = c + SIG1(h) + CH(h, a, b) + sm_K512[37] + aoui64W[37]; c = t + SIG0(d) + MAJ(d, e, f); g += t;
-                t = b + SIG1(g) + CH(g, h, a) + sm_K512[38] + aoui64W[38]; b = t + SIG0(c) + MAJ(c, d, e); f += t;
-                t = a + SIG1(f) + CH(f, g, h) + sm_K512[39] + aoui64W[39]; a = t + SIG0(b) + MAJ(b, c, d); e += t;
-                //
-                t = h + SIG1(e) + CH(e, f, g) + sm_K512[40] + aoui64W[40]; h = t + SIG0(a) + MAJ(a, b, c); d += t;
-                t = g + SIG1(d) + CH(d, e, f) + sm_K512[41] + aoui64W[41]; g = t + SIG0(h) + MAJ(h, a, b); c += t;
-                t = f + SIG1(c) + CH(c, d, e) + sm_K512[42] + aoui64W[42]; f = t + SIG0(g) + MAJ(g, h, a); b += t;
-                t = e + SIG1(b) + CH(b, c, d) + sm_K512[43] + aoui64W[43]; e = t + SIG0(f) + MAJ(f, g, h); a += t;
-                t = d + SIG1(a) + CH(a, b, c) + sm_K512[44] + aoui64W[44]; d = t + SIG0(e) + MAJ(e, f, g); h += t;
-                t = c + SIG1(h) + CH(h, a, b) + sm_K512[45] + aoui64W[45]; c = t + SIG0(d) + MAJ(d, e, f); g += t;
-                t = b + SIG1(g) + CH(g, h, a) + sm_K512[46] + aoui64W[46]; b = t + SIG0(c) + MAJ(c, d, e); f += t;
-                t = a + SIG1(f) + CH(f, g, h) + sm_K512[47] + aoui64W[47]; a = t + SIG0(b) + MAJ(b, c, d); e += t;
-                //
-                t = h + SIG1(e) + CH(e, f, g) + sm_K512[48] + aoui64W[48]; h = t + SIG0(a) + MAJ(a, b, c); d += t;
-                t = g + SIG1(d) + CH(d, e, f) + sm_K512[49] + aoui64W[49]; g = t + SIG0(h) + MAJ(h, a, b); c += t;
-                t = f + SIG1(c) + CH(c, d, e) + sm_K512[50] + aoui64W[50]; f = t + SIG0(g) + MAJ(g, h, a); b += t;
-                t = e + SIG1(b) + CH(b, c, d) + sm_K512[51] + aoui64W[51]; e = t + SIG0(f) + MAJ(f, g, h); a += t;
-                t = d + SIG1(a) + CH(a, b, c) + sm_K512[52] + aoui64W[52]; d = t + SIG0(e) + MAJ(e, f, g); h += t;
-                t = c + SIG1(h) + CH(h, a, b) + sm_K512[53] + aoui64W[53]; c = t + SIG0(d) + MAJ(d, e, f); g += t;
-                t = b + SIG1(g) + CH(g, h, a) + sm_K512[54] + aoui64W[54]; b = t + SIG0(c) + MAJ(c, d, e); f += t;
-                t = a + SIG1(f) + CH(f, g, h) + sm_K512[55] + aoui64W[55]; a = t + SIG0(b) + MAJ(b, c, d); e += t;
-                //
-                t = h + SIG1(e) + CH(e, f, g) + sm_K512[56] + aoui64W[56]; h = t + SIG0(a) + MAJ(a, b, c); d += t;
-                t = g + SIG1(d) + CH(d, e, f) + sm_K512[57] + aoui64W[57]; g = t + SIG0(h) + MAJ(h, a, b); c += t;
-                t = f + SIG1(c) + CH(c, d, e) + sm_K512[58] + aoui64W[58]; f = t + SIG0(g) + MAJ(g, h, a); b += t;
-                t = e + SIG1(b) + CH(b, c, d) + sm_K512[59] + aoui64W[59]; e = t + SIG0(f) + MAJ(f, g, h); a += t;
-                t = d + SIG1(a) + CH(a, b, c) + sm_K512[60] + aoui64W[60]; d = t + SIG0(e) + MAJ(e, f, g); h += t;
-                t = c + SIG1(h) + CH(h, a, b) + sm_K512[61] + aoui64W[61]; c = t + SIG0(d) + MAJ(d, e, f); g += t;
-                t = b + SIG1(g) + CH(g, h, a) + sm_K512[62] + aoui64W[62]; b = t + SIG0(c) + MAJ(c, d, e); f += t;
-                t = a + SIG1(f) + CH(f, g, h) + sm_K512[63] + aoui64W[63]; a = t + SIG0(b) + MAJ(b, c, d); e += t;
-                //
-                t = h + SIG1(e) + CH(e, f, g) + sm_K512[64] + aoui64W[64]; h = t + SIG0(a) + MAJ(a, b, c); d += t;
-                t = g + SIG1(d) + CH(d, e, f) + sm_K512[65] + aoui64W[65]; g = t + SIG0(h) + MAJ(h, a, b); c += t;
-                t = f + SIG1(c) + CH(c, d, e) + sm_K512[66] + aoui64W[66]; f = t + SIG0(g) + MAJ(g, h, a); b += t;
-                t = e + SIG1(b) + CH(b, c, d) + sm_K512[67] + aoui64W[67]; e = t + SIG0(f) + MAJ(f, g, h); a += t;
-                t = d + SIG1(a) + CH(a, b, c) + sm_K512[68] + aoui64W[68]; d = t + SIG0(e) + MAJ(e, f, g); h += t;
-                t = c + SIG1(h) + CH(h, a, b) + sm_K512[69] + aoui64W[69]; c = t + SIG0(d) + MAJ(d, e, f); g += t;
-                t = b + SIG1(g) + CH(g, h, a) + sm_K512[70] + aoui64W[70]; b = t + SIG0(c) + MAJ(c, d, e); f += t;
-                t = a + SIG1(f) + CH(f, g, h) + sm_K512[71] + aoui64W[71]; a = t + SIG0(b) + MAJ(b, c, d); e += t;
-                //
-                t = h + SIG1(e) + CH(e, f, g) + sm_K512[72] + aoui64W[72]; h = t + SIG0(a) + MAJ(a, b, c); d += t;
-                t = g + SIG1(d) + CH(d, e, f) + sm_K512[73] + aoui64W[73]; g = t + SIG0(h) + MAJ(h, a, b); c += t;
-                t = f + SIG1(c) + CH(c, d, e) + sm_K512[74] + aoui64W[74]; f = t + SIG0(g) + MAJ(g, h, a); b += t;
-                t = e + SIG1(b) + CH(b, c, d) + sm_K512[75] + aoui64W[75]; e = t + SIG0(f) + MAJ(f, g, h); a += t;
-                t = d + SIG1(a) + CH(a, b, c) + sm_K512[76] + aoui64W[76]; d = t + SIG0(e) + MAJ(e, f, g); h += t;
-                t = c + SIG1(h) + CH(h, a, b) + sm_K512[77] + aoui64W[77]; c = t + SIG0(d) + MAJ(d, e, f); g += t;
-                t = b + SIG1(g) + CH(g, h, a) + sm_K512[78] + aoui64W[78]; b = t + SIG0(c) + MAJ(c, d, e); f += t;
-                t = a + SIG1(f) + CH(f, g, h) + sm_K512[79] + aoui64W[79]; a = t + SIG0(b) + MAJ(b, c, d); e += t;
-                //
-                m_aoui64Buf[0] += a;
-                m_aoui64Buf[1] += b;
-                m_aoui64Buf[2] += c;
-                m_aoui64Buf[3] += d;
-                m_aoui64Buf[4] += e;
-                m_aoui64Buf[5] += f;
-                m_aoui64Buf[6] += g;
-                m_aoui64Buf[7] += h;
-            }
-            break;
-    }
-}

3rdparty/MultiEmulator/src/SHA.h

@@ -1,379 +0,0 @@
-//SHA.h 
- 
-#ifndef __SHA_H__ 
-#define __SHA_H__ 
- 
-#include "MessageDigest.h" 
- 
-//Typical DISCLAIMER: 
-//The code in this project is Copyright (C) 2003 by George Anescu. You have the right to 
-//use and distribute the code in any way you see fit as long as this paragraph is included 
-//with the distribution. No warranties or claims are made as to the validity of the 
-//information and code contained herein, so use it at your own risk. 
- 
-//Structure for representing an Unsigned Integer on 64 bits 
-struct SUI64 
-{ 
-	//Data 
-	unsigned int m_uiLeft; 
-	unsigned int m_uiRight; 
- 
-	//Operators 
-	SUI64& operator++() 
-	{ 
-		unsigned int uiTemp = m_uiRight; 
-		m_uiRight++; 
-		if(m_uiRight < uiTemp) 
-			m_uiLeft++; 
-		return *this; 
-	} 
- 
-	SUI64& operator--() 
-	{ 
-		unsigned int uiTemp = m_uiRight; 
-		m_uiRight--; 
-		if(m_uiRight > uiTemp) 
-			m_uiLeft--; 
-		return *this; 
-	} 
- 
-	SUI64& operator+=(SUI64 const& roUI64) 
-	{ 
-		m_uiRight += roUI64.m_uiRight; 
-		if(m_uiRight < roUI64.m_uiRight) 
-			m_uiLeft++; 
-		m_uiLeft += roUI64.m_uiLeft; 
-		return *this; 
-	} 
- 
-	SUI64& operator|=(SUI64 const& roUI64) 
-	{ 
-		m_uiRight |= roUI64.m_uiRight; 
-		m_uiLeft |= roUI64.m_uiLeft; 
-		return *this; 
-	} 
- 
-	SUI64& operator&=(SUI64 const& roUI64) 
-	{ 
-		m_uiRight &= roUI64.m_uiRight; 
-		m_uiLeft &= roUI64.m_uiLeft; 
-		return *this; 
-	} 
- 
-	SUI64& operator^=(SUI64 const& roUI64) 
-	{ 
-		m_uiRight ^= roUI64.m_uiRight; 
-		m_uiLeft ^= roUI64.m_uiLeft; 
-		return *this; 
-	} 
- 
-	SUI64& operator<<=(unsigned int uiBits) 
-	{ 
-		if(uiBits < 32) 
-		{ 
-			(m_uiLeft <<= uiBits) |= (m_uiRight >> (32-uiBits)); 
-			m_uiRight <<= uiBits; 
-			 
-		} 
-		else 
-		{ 
-			m_uiLeft = m_uiRight << (uiBits-32); 
-			m_uiRight = 0; 
-		} 
-		return *this; 
-	} 
- 
-	SUI64& operator>>=(unsigned int uiBits) 
-	{ 
-		if(uiBits < 32) 
-		{ 
-			(m_uiRight >>= uiBits) |= (m_uiLeft << (32-uiBits)); 
-			m_uiLeft >>= uiBits; 
-		} 
-		else 
-		{ 
-			m_uiRight = m_uiLeft >> (uiBits-32); 
-			m_uiLeft = 0; 
-		} 
-		return *this; 
-	} 
- 
-	bool operator>(SUI64 const& roUI64) const 
-	{ 
-		if(m_uiLeft == roUI64.m_uiLeft) 
-			return m_uiRight > roUI64.m_uiRight; 
-		else 
-			return m_uiLeft > roUI64.m_uiLeft; 
-	} 
- 
-	bool operator<(SUI64 const& roUI64) const 
-	{ 
-		if(m_uiLeft == roUI64.m_uiLeft) 
-			return m_uiRight < roUI64.m_uiRight; 
-		else 
-			return m_uiLeft < roUI64.m_uiLeft; 
-	} 
-}; 
- 
-inline SUI64 operator+(SUI64 const& roUI64_1, SUI64 const& roUI64_2) 
-{ 
-	SUI64 temp = roUI64_1; 
-	temp += roUI64_2; 
-	return temp; 
-} 
- 
-inline SUI64 operator|(SUI64 const& roUI64_1, SUI64 const& roUI64_2) 
-{ 
-	SUI64 temp = roUI64_1; 
-	temp |= roUI64_2; 
-	return temp; 
-} 
- 
-inline SUI64 operator&(SUI64 const& roUI64_1, SUI64 const& roUI64_2) 
-{ 
-	SUI64 temp = roUI64_1; 
-	temp &= roUI64_2; 
-	return temp; 
-} 
- 
-inline SUI64 operator^(SUI64 const& roUI64_1, SUI64 const& roUI64_2) 
-{ 
-	SUI64 temp = roUI64_1; 
-	temp ^= roUI64_2; 
-	return temp; 
-} 
- 
-inline SUI64 operator<<(SUI64 const& roUI64, unsigned int uiBits) 
-{ 
-	SUI64 temp = roUI64; 
-	temp <<= uiBits; 
-	return temp; 
-} 
- 
-inline SUI64 operator>>(SUI64 const& roUI64, unsigned int uiBits) 
-{ 
-	SUI64 temp = roUI64; 
-	temp >>= uiBits; 
-	return temp; 
-} 
- 
-inline bool operator>(SUI64 const& roUI64_1, SUI64 const& roUI64_2) 
-{ 
-	return roUI64_1.operator>(roUI64_2); 
-} 
- 
-inline bool operator<(SUI64 const& roUI64_1, SUI64 const& roUI64_2) 
-{ 
-	return roUI64_1.operator<(roUI64_2); 
-} 
- 
-//SHA Message Digest algorithm 
-//SHA160 TEST VALUES: 
-//1)"abc" 
-//"A9993E364706816ABA3E25717850C26C9CD0D89D" 
-// 
-//2)"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" 
-//"84983E441C3BD26EBAAE4AA1F95129E5E54670F1" 
-// 
-//3)1,000,000 repetitions of "a".  
-//"34AA973CD4C4DAA4F61EEB2BDBAD27316534016F" 
-// 
-//SHA256 TEST VALUES: 
-//1)One-Block Message "abc" 
-//"ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad" 
-// 
-//2)"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" 
-//"248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1" 
-// 
-//3)Multi-Block Message "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu" 
-//"CF5B16A778AF8380036CE59E7B0492370B249B11E8F07A51AFAC45037AFEE9D1" 
-// 
-//4)Long Message "a" 1,000,000 times 
-//"cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0" 
-// 
-//SHA384 TEST VALUES: 
-//1)One-Block Message "abc" 
-//"cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7" 
-// 
-//2)Multi-Block Message "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu" 
-//"09330C33F71147E83D192FC782CD1B4753111B173B3B05D22FA08086E3B0F712FCC7C71A557E2DB966C3E9FA91746039" 
-// 
-//3)Long Message "a" 1,000,000 times 
-//"9d0e1809716474cb086e834e310a4a1ced149e9c00f248527972cec5704c2a5b07b8b3dc38ecc4ebae97ddd87f3d8985" 
-// 
-//SHA512 TEST VALUES: 
-//1)One-Block Message "abc" 
-//"ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a8 
-//36ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f" 
-// 
-//2)"abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu" 
-//"8e959b75dae313da8cf4f72814fc143f8f7779c6eb9f7fa17299aeadb6889018501d289e4900f7e4 
-//331b99dec4b5433ac7d329eeb6dd26545e96e55b874be909" 
-// 
-//3)"" 
-//"CF83E1357EEFB8BDF1542850D66D8007D620E4050B5715DC83F4A921D36CE9CE47D0D13C5D85F2B0 
-//FF8318D2877EEC2F63B931BD47417A81A538327AF927DA3E" 
-// 
-//4)Long Message "a" 1,000,000 times 
-//"E718483D0CE769644E2E42C7BC15B4638E1F98B13B2044285632A803AFA973EBDE0FF244877EA60A 
-//4CB0432CE577C31BEB009C5C2C49AA2E4EADB217AD8CC09B" 
- 
-class CSHA : public IMessageDigest 
-{ 
-public: 
-	enum { SHA160=0, SHA256=1, SHA384=2, SHA512=3 }; 
-	//CONSTRUCTOR 
-	CSHA(int iMethod=SHA160); 
-	//Update context to reflect the concatenation of another buffer of bytes. 
-	void AddData(char const* pcData, int iDataLength); 
-	//Final wrapup - pad to 64-byte boundary with the bit pattern  
-	//1 0*(64-bit count of bits processed, MSB-first) 
-	void FinalDigest(char* pcDigest); 
-	//Reset current operation in order to prepare a new one 
-	void Reset(); 
- 
-private: 
-	//Transformation Function 
-	void Transform(); 
-	//The Method 
-	int m_iMethod; 
-	enum { BLOCKSIZE2 = BLOCKSIZE<<1 }; 
-	//For 32 bits Integers 
-	enum { SHA160LENGTH=5, SHA256LENGTH=8 }; 
-	//Context Variables 
-	unsigned int m_auiBuf[SHA256LENGTH]; //Maximum for SHA256 
-	unsigned int m_auiBits[2]; 
-	unsigned char m_aucIn[BLOCKSIZE2]; //128 bytes for SHA384, SHA512 
-	//Internal auxiliary static functions 
-	static unsigned int CircularShift(unsigned int uiBits, unsigned int uiWord); 
-	static unsigned int CH(unsigned int x, unsigned int y, unsigned int z); 
-	static unsigned int MAJ(unsigned int x, unsigned int y, unsigned int z); 
-	static unsigned int SIG0(unsigned int x); 
-	static unsigned int SIG1(unsigned int x); 
-	static unsigned int sig0(unsigned int x); 
-	static unsigned int sig1(unsigned int x); 
-	static void Bytes2Word(unsigned char const* pcBytes, unsigned int& ruiWord); 
-	static void Word2Bytes(unsigned int const& ruiWord, unsigned char* pcBytes); 
-	static const unsigned int sm_K160[4]; 
-	static const unsigned int sm_H160[SHA160LENGTH]; 
-	static const unsigned int sm_K256[64]; 
-	static const unsigned int sm_H256[SHA256LENGTH]; 
- 
-	//For 64 bits Integers 
-	enum { SHA384LENGTH=6, SHA512LENGTH=8 }; 
-	//Context Variables 
-	SUI64 m_aoui64Buf[SHA512LENGTH]; //Maximum for SHA512 
-	SUI64 m_aoui64Bits[2]; 
-	//Internal auxiliary static functions 
-	static SUI64 CircularShift(unsigned int uiBits, SUI64 const& roui64Word); 
-	static SUI64 CH(SUI64 const& x, SUI64 const& y, SUI64 const& z); 
-	static SUI64 MAJ(SUI64 const& x, SUI64 const& y, SUI64 const& z); 
-	static SUI64 SIG0(SUI64 const& x); 
-	static SUI64 SIG1(SUI64 const& x); 
-	static SUI64 sig0(SUI64 const& x); 
-	static SUI64 sig1(SUI64 const& x); 
-	static void Bytes2Word(unsigned char const* pcBytes, SUI64& ruiWord); 
-	static void Word2Bytes(SUI64 const& ruiWord, unsigned char* pcBytes); 
-	static const SUI64 sm_H384[SHA512LENGTH]; //Dim is as 512 
-	static const SUI64 sm_K512[80]; 
-	static const SUI64 sm_H512[SHA512LENGTH]; 
-}; 
- 
-inline unsigned int CSHA::CircularShift(unsigned int uiBits, unsigned int uiWord) 
-{ 
-	return (uiWord << uiBits) | (uiWord >> (32-uiBits)); 
-} 
- 
-inline unsigned int CSHA::CH(unsigned int x, unsigned int y, unsigned int z) 
-{ 
-	return ((x&(y^z))^z); 
-} 
- 
-inline unsigned int CSHA::MAJ(unsigned int x, unsigned int y, unsigned int z) 
-{ 
-	return (((x|y)&z)|(x&y)); 
-} 
- 
-inline unsigned int CSHA::SIG0(unsigned int x) 
-{ 
-	return ((x >> 2)|(x << 30)) ^ ((x >> 13)|(x << 19)) ^ ((x >> 22)|(x << 10)); 
-} 
- 
-inline unsigned int CSHA::SIG1(unsigned int x) 
-{ 
-	return ((x >> 6)|(x << 26)) ^ ((x >> 11)|(x << 21)) ^ ((x >> 25)|(x << 7)); 
-} 
- 
-inline unsigned int CSHA::sig0(unsigned int x) 
-{ 
-	return ((x >> 7)|(x << 25)) ^ ((x >> 18)|(x << 14)) ^ (x >> 3); 
-} 
- 
-inline unsigned int CSHA::sig1(unsigned int x) 
-{ 
-	return ((x >> 17)|(x << 15)) ^ ((x >> 19)|(x << 13)) ^ (x >> 10); 
-} 
- 
-inline void CSHA::Bytes2Word(unsigned char const* pcBytes, unsigned int& ruiWord) 
-{ 
-	ruiWord = (unsigned int)*(pcBytes+3) | (unsigned int)(*(pcBytes+2)<<8) | 
-		(unsigned int)(*(pcBytes+1)<<16) | (unsigned int)(*pcBytes<<24); 
-} 
- 
-inline void CSHA::Word2Bytes(unsigned int const& ruiWord, unsigned char* pcBytes) 
-{ 
-	pcBytes += 3; 
-	*pcBytes = ruiWord & 0xff; 
-	*--pcBytes = (ruiWord>>8) & 0xff; 
-	*--pcBytes = (ruiWord>>16) & 0xff; 
-	*--pcBytes = (ruiWord>>24) & 0xff; 
-} 
- 
-inline SUI64 CSHA::CircularShift(unsigned int uiBits, SUI64 const& roui64Word) 
-{ 
-	return (roui64Word << uiBits) | (roui64Word >> (64-uiBits)); 
-} 
- 
-inline SUI64 CSHA::CH(SUI64 const& x, SUI64 const& y, SUI64 const& z) 
-{ 
-	return ((x&(y^z))^z); 
-} 
- 
-inline SUI64 CSHA::MAJ(SUI64 const& x, SUI64 const& y, SUI64 const& z) 
-{ 
-	return (((x|y)&z)|(x&y)); 
-} 
- 
-inline SUI64 CSHA::SIG0(SUI64 const& x) 
-{ 
-	return ((x >> 28)|(x << 36)) ^ ((x >> 34)|(x << 30)) ^ ((x >> 39)|(x << 25)); 
-} 
- 
-inline SUI64 CSHA::SIG1(SUI64 const& x) 
-{ 
-	return ((x >> 14)|(x << 50)) ^ ((x >> 18)|(x << 46)) ^ ((x >> 41)|(x << 23)); 
-} 
- 
-inline SUI64 CSHA::sig0(SUI64 const& x) 
-{ 
-	return ((x >> 1)|(x << 63)) ^ ((x >> 8)|(x << 56)) ^ (x >> 7); 
-} 
- 
-inline SUI64 CSHA::sig1(SUI64 const& x) 
-{ 
-	return ((x >> 19)|(x << 45)) ^ ((x >> 61)|(x << 3)) ^ (x >> 6); 
-} 
- 
-inline void CSHA::Bytes2Word(unsigned char const* pcBytes, SUI64& ruiWord) 
-{ 
-	Bytes2Word(pcBytes+4, ruiWord.m_uiRight); 
-	Bytes2Word(pcBytes, ruiWord.m_uiLeft); 
-} 
- 
-inline void CSHA::Word2Bytes(SUI64 const& ruiWord, unsigned char* pcBytes) 
-{ 
-	Word2Bytes(ruiWord.m_uiRight, pcBytes+4); 
-	Word2Bytes(ruiWord.m_uiLeft, pcBytes); 
-} 
- 
-#endif // __SHA_H__ 

3rdparty/MultiEmulator/src/Setti.cpp

@@ -1,13 +0,0 @@
-#include "multi_emulator.h"
-
-int GenerateSetti(void *pDest)
-{
-	auto pTicket = (int *)pDest;
-
-	pTicket[0] = 0xD4CA7F7B;
-	pTicket[1] = 0xC7DB6023;
-	pTicket[2] = 0x6D6A2E1F;
-	pTicket[5] = 0xB4C43105;
-
-	return 768;
-}

3rdparty/MultiEmulator/src/SteamEmu.cpp

@@ -1,18 +0,0 @@
-#include "multi_emulator.h"
-int GenerateSteamEmu(void *pDest, int nSteamID)
-{
-	auto pTicket = (int *)pDest;
-
-	pTicket[20] = -1;        // +80, dproto/reunion wants this value to be -1, but if this value
-	                         //      does not match -1, then instead of SteamID in [21] cell
-	                         //      client IP address that xored with 0x25730981 number should
-	                         //      be used. But dproto/reunion will just skip ticket validation
-	                         //      in that case.
-
-	pTicket[21] = nSteamID;  // +84, SteamId, low part. Actually, this is just system volume serial
-	                         //      number, which comes from GetVolumeInformationA() function. If
-	                         //      function failed (returned 0), then instead of volume serial number
-	                         //      777 number will be written to the ticket.
-
-	return 768;
-}

3rdparty/MultiEmulator/src/StrUtils.cpp

@@ -1,12 +0,0 @@
-#include "StrUtils.h"
-#include <stdlib.h>
-
-void CreateRandomString(char *pszDest, int nLength)
-{
-	static const char c_szAlphaNum[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
-	for (int i = 0; i < nLength; ++i)
-		pszDest[i] = c_szAlphaNum[rand() % (sizeof(c_szAlphaNum) - 1)];
-
-	pszDest[nLength] = '\0';
-}

3rdparty/MultiEmulator/src/StrUtils.h

@@ -1,3 +0,0 @@
-#pragma once
-
-void CreateRandomString(char *pszDest, int nLength);

3rdparty/MultiEmulator/wscript

@@ -1,24 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-# mittorn, 2018
-
-from waflib import Logs
-import os
-
-top = '.'
-
-def options(opt):
-	return
-
-def configure(conf):
-	return
-
-def build(bld):
-	bld.stlib(
-		source   = bld.path.ant_glob(['src/*.cpp']),
-		target   = 'MultiEmulator',
-		features = 'cxx',
-		includes = ['include/', 'src/'],
-		export_includes = ['include/'],
-		subsystem = bld.env.MSVC_SUBSYSTEM
-	)

3rdparty/bzip2/bz_version.h

@@ -1 +0,0 @@
-#define BZ_VERSION "1.1.0-fwgs"

3rdparty/bzip2/wscript

@@ -1,34 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-
-def options(opt):
-	pass
-
-def configure(conf):
-	conf.define('_GNU_SOURCE', 1)
-	conf.define('BZ_NO_STDIO', 1)
-
-	if conf.env.DEST_OS == 'win32':
-		conf.define('BZ_LCCWIN32', 1)
-	else:
-		conf.define('BZ_UNIX', 1)
-
-def build(bld):
-#	bld(
-#		features = 'subst',
-#		source = 'bzip2/bz_version.h.in',
-#		target = 'bz_version.h',
-#		BZ_VERSION='1.1.0-fwgs'
-#	)
-
-	bz_sources = ['bzip2/blocksort.c', 'bzip2/huffman.c', 'bzip2/crctable.c', 'bzip2/randtable.c', 'bzip2/compress.c', 'bzip2/decompress.c', 'bzip2/bzlib.c']
-
-	bld.stlib(
-		source = bz_sources,
-		target = 'bzip2',
-#		use = 'bz_version.h',
-		features = 'c',
-		includes = ['.', 'bzip2/'],
-		subsystem = bld.env.MSVC_SUBSYSTEM,
-		export_includes = ['bzip2/']
-	)

3rdparty/gl4es/wscript

@@ -18,7 +18,7 @@ def build(bld):
 		target   = 'gl4es',
 		features = 'c',
 		includes = ['gl4es/src', 'gl4es/src/gl', 'gl4es/src/glx', 'gl4es/include'],
-		defines  = ['NOX11', 'NO_GBM', 'NO_INIT_CONSTRUCTOR', 'DEFAULT_ES=2', 'NOEGL', 'NO_LOADER', 'STATICLIB'],
+		defines  = ['NOX11', 'NO_GBM', 'NO_INIT_CONSTRUCTOR', 'DEFAULT_ES=2', 'NOEGL', 'EXTERNAL_GETPROCADDRESS=GL4ES_GetProcAddress', 'NO_LOADER', 'STATICLIB'],
 		cflags   = ['-w', '-fvisibility=hidden', '-std=gnu99'],
 		subsystem = bld.env.MSVC_SUBSYSTEM,
 		export_includes = '.')

Documentation/bug-compatibility.md

@@ -1,17 +1,17 @@
 # Bug-compatibility in Xash3D FWGS
 
-Xash3D FWGS has special mode for games that rely on original engine bugs. In this mode, we emulate the behaviour of selected functions that may help running mods relying on engine bugs, but enabling them by default may break majority of other games.
+Xash3D FWGS has special mode for games that rely on original engine bugs.
+
+In this mode, we emulate the behaviour of selected functions that may help running mods relying on engine bugs, but enabling them by default may break majority of other games.
 
 At this time, we only have implemented GoldSrc bug-compatibility. It can be enabled with `-bugcomp` command line switch.
 
-When `-bugcomp` is specified without argument, it enables everything. This behavior might be changed or removed in future versions.
-
-When `-bugcomp` is specified with argument, it interpreted as flags separated with `+`. This way it's possible to combine multiple levels of bug-compatibility.
-
 ## GoldSrc bug-compatibility
 
-| Flag    | Description | Games that require this flag |
+### Emulated bugs
-| ------- | ----------- | ---------------------------- |
+
-| `peoei` | Reverts `pfnPEntityOfEntIndex` behavior to GoldSrc, where it returns NULL for last player due to incorrect player index comparison | * Counter-Strike: Condition Zero - Deleted Scenes |
+* `pfnPEntityOfEntIndex` in GoldSrc returns NULL for last player due to incorrect player index comparison
-| `gsmrf` | Rewrites message at the moment when Game DLL attempts to write an internal engine message, usually specific to GoldSrc protocol. Right now only supports `svc_spawnstaticsound`, more messages added by request. | * MetaMod/AMXModX based mods |
+
-| `sp_attn_none` | Makes sounds with attenuation zero spatialized, i.e. have a stereo effect. | Possibly, every game that was made for GoldSrc. |
+### Games and mods that require this
+
+* Counter-Strike: Condition Zero - Deleted Scenes

Documentation/donate.md

@@ -1,24 +0,0 @@
-# Developers donation page
-
-On this page you can find links where you can support each developer individually, who has provided public sponsorship information.
-
-### [a1batross](https://github.com/a1batross)
-
-* Initial Xash3D SDL2/Linux port author, Xash3D FWGS engine maintainer, creator of non-commercial Flying With Gauss organization.
-* Boosty page: https://boosty.to/a1ba
-
-### [nekonomicon](https://github.com/nekonomicon)
-
-* [hlsdk-portable](https://github.com/FWGS/hlsdk-portable), [mdldec](../utils/mdldec), [opensource-mods.md](opensource-mods.md) maintainer and Xash3D FWGS [contributor](https://github.com/FWGS/xash3d-fwgs/commits?author=nekonomicon) (*BSD/clang port, PNG support, etc).
-* Boosty page: https://boosty.to/nekonomicon
-
-### [Velaron](https://github.com/Velaron)
-* [cs16-client](https://github.com/Velaron/cs16-client) & [tf15-client](https://github.com/Velaron/tf15-client) maintainer and Xash3D FWGS [contributor](https://github.com/FWGS/xash3d-fwgs/commits?author=Velaron) (Android port, voice chat, etc).
-* BuyMeACoffee page: https://www.buymeacoffee.com/velaron
-
-### [SNMetamorph](https://github.com/SNMetamorph)
-* [PrimeXT](https://github.com/SNMetamorph/PrimeXT) & [GoldSrc Monitor](https://github.com/SNMetamorph/goldsrc-monitor) maintainer and Xash3D FWGS [contributor](https://github.com/FWGS/xash3d-fwgs/commits?author=SNMetamorph) (Windows port, voice chat, etc).
-* BTC: `16GAzK3qei5AwBW7sggXp3yNcFHBtdpxXj`
-* ETH (ERC20): `0xb580eeca9756e3881f9d6d026e28db28eb72a383`
-* USDT (ERC20): `0xb580eeca9756e3881f9d6d026e28db28eb72a383`
-* USDC (ERC20): `0xb580eeca9756e3881f9d6d026e28db28eb72a383`

Documentation/environment-variables.md

@@ -1,21 +0,0 @@
-## Environment variables
-
-#### Xash3D FWGS
-
-The engine respects these environment variables:
-
-| Variable              | Type       | Description |
-| --------------------- | ---------- | ----------- |
-| `XASH3D_GAME`         | _string_   | Overrides default game directory. Ignored if `-game` command line argument is set |
-| `XASH3D_BASEDIR`      | _string_   | Sets path to base (root) directory, instead of current working directory |
-| `XASH3D_RODIR`        | _string_   | Sets path to read-only base (root) directory. Ignored if `-rodir` command line argument is set |
-| `XASH3D_EXTRAS_PAK1`  | _string_   | Archive file from specified path will be added to virtual filesystem search path in the lowest possible priority |
-| `XASH3D_EXTRAS_PAK2`  | _string_   | Similar to `XASH3D_EXTRAS_PAK1` but next to it in priority list |
-
-Environment variables NOT listed in the table above are used internally, and aren't considered as stable interface.
-
-#### mdldec
-
-| Variable              | Type       | Description |
-| --------------------- | ---------- | ----------- |
-| `MDLDEC_ACT_PATH`     | _string_   | If set, will read activities list from this path |

Documentation/extensions/native-object.md

@@ -1,25 +0,0 @@
-# GetNativeObject API
-
-To be able to use platform-specific features or get optional engine interfaces, we've added a simple call to MobilityAPI on client DLL and PhysicsAPI for server DLL and extended MenuAPI for menu DLL.
-
-It's defined like this:
-
-```
-void *pfnGetNativeObject( const char *name );
-```
-
-#### Cross-platform objects
-
-Only these objects are guaranteed to be available on all targets.
-
-| Object name | Interface |
-|-------------|-----------|
-| `VFileSystem009` | Provides C++ interface to filesystem, binary-compatible with Valve's VFileSystem009. |
-| `XashFileSystemXXX` | Provides C interface to filesystem. This interface is unstable and not recommended for generic use, outside of engine internals. For more info about current version look into `filesystem.h`. |
-
-#### Android-specific objects
-
-| Object name | Interface |
-|-------------|-----------|
-| `JNIEnv`    | Allows interfacing with Java Native Interface. |
-| `ActivityClass` | Returns JNI object for engine Android activity class. |

Documentation/extensions/sounds.lst.md

@@ -1,65 +0,0 @@
-# sounds.lst.md
-
-Using sounds.lst located in scripts folder, modder can override some of the hardcoded sounds in temp entities and server physics.
-
-File format:
-```
-<group name>
-{
-	<path1>
-	<path2>
-	<path3>
-}
-
-<group2 name> <path with %d> <min number> <max number>
-```
-
-* Sounds can use any supported sound format (WAV or MP3).
-* The path must be relative to the sounds/ folder in the game or base directory root, addon folder, or archive root.
-* Groups can be empty or omitted from the file to load no sound.
-* Groups can either list a set of files or specify a format string and a range.
-* Anything after // will be considered a comment and ignored.
-* Behavior is undefined if the group was listed multiple times.
-
-Currently supported groups are:
-|Group name|Usage|
-|----------|-----|
-|`BouncePlayerShell`|Used for BOUNCE_SHELL tempentity hitsound|
-|`BounceWeaponShell`|Used for BOUCNE_SHOTSHELL tempentity hitsound|
-|`BounceConcrete`|Used for BOUNCE_CONCRETE tempentity hitsound|
-|`BounceGlass`|Used for BOUCNE_GLASS|
-|`BounceMetal`|Used for BOUNCE_METAL|
-|`BounceFlesh`|Used for BOUNCE_FLESH|
-|`BounceWood`|Used for BOUNCE_WOOD|
-|`Ricochet`|Used for BOUNCE_SHRAP and ricochet tempentities|
-|`Explode`|Used for tempentity explosions|
-|`EntityWaterEnter`|Used for entity entering water|
-|`EntityWaterExit`|Used for entity exiting water|
-|`PlayerWaterEnter`|Used for player entering water|
-|`PlayerWaterExit`|Used for player exiting water|
-
-## Example
-
-This example is based on defaults sounds used in Half-Life:
-
-```
-BouncePlayerShell "player/pl_shell%d.wav" 1 3
-BounceWeaponShell "weapons/sshell%d.wav" 1 3
-BounceConcrete "debris/concrete%d.wav" 1 3
-BounceGlass "debris/glass%d.wav" 1 4
-BounceMetal "debris/metal%d.wav" 1 6
-BounceFlesh "debris/flesh%d.wav" 1 7
-BounceWood "debris/wood%d.wav" 1 4
-Ricochet "weapons/ric%d.wav" 1 5
-Explode "weapons/explode%d.wav" 3 5
-EntityWaterEnter "player/pl_wade%d.wav" 1 4
-EntityWaterExit "player/pl_wade%d.wav" 1 4
-PlayerWaterEnter
-{
-	"player/pl_wade1.wav"
-}
-PlayerWaterExit
-{
-	"player/pl_wade2.wav"
-}
-```

Documentation/gameinfo.md

@@ -1,117 +0,0 @@
-# Game definition and information file
-
-gameinfo.txt is an essential part of any Xash3D based game. It allows basic customization for games creators, like setting game title, DLL paths, etc.
-
-This document defines gameinfo.txt syntax, supported keys and liblist.gam conversion rules for the latest version of the engine. Note for engine developers, keep this document in sync with an implementation.
-
-## gameinfo.txt syntax
-
-* gameinfo.txt is a simple list of keys and values, separated by newline.
-* You can add single line comments using double slashes (//).
-* Keys can accept integer, float, string or boolean values.
-* Boolean keys use 0 as false and 1 as true value.
-* To have spaces in string values, you must enclose them in double quotes. Then, to have double quotes, you must escape it with backslash, and to have a backslash you need to use double backslashes.
-
-The example:
-```
-// this is a comment :)
-// this is another comment
-some_integer_key 123
-
-this_is_float_key 13.37 // optional comment
-
-enable_feature 1 // boolean, 1 to enable, 0 to disable
-
-example_string_key string_value
-example_spaces "string with spaces"
-example_title "Fate\\Stay Night" // engine will parse it as Fate\Stay Night
-```
-
-## gameinfo.txt keys
-
-This is a list of all gameinfo.txt keys supported by the engine. Be aware that the engine will silently skip all unrecognized keys.
-
-| Key              | Type       | Default value   | Description |
-| ---------------- | ---------- | --------------- | ----------- |
-| `ambient0`       | string     | Empty string    | Automatic ambient sound |
-| `ambient1`       | string     | Empty string    | Automatic ambient sound |
-| `ambient2`       | string     | Empty string    | Automatic ambient sound |
-| `ambient3`       | string     | Empty string    | Automatic ambient sound |
-| `basedir`        | string     | `valve`         | Game base directory, used to share assets between games |
-| `date`           | string     | Empty string    | Game release date. Unused. |
-| `dllpath`        | string     | `cl_dlls`       | Game DLL path. Engine will search custom DLLs (client or menu, for example) in this directory, except `gamedll`, see below. |
-| `fallback_dir`   | string     | Empty string    | Additional game base directory |
-| `gamedir`        | string     | Current gamedir | Game directory, ignored in FWGS, as game directory is defined by the game directory name |
-| `gamedll`        | string     | `dlls/hl.dll`   | Game server DLL for 32-bit x86 Windows (see LibraryNaming.md for details) |
-| `gamemode`       | string     | Empty string    | Game type. When set to `singleplayer_only` or `multiplayer_only` marks the game as SP or MP only respectively, hiding the option in game UI. Omitting this key or using custom values mark the game as both MP and SP compatible. |
-| `icon`           | string     | `game.ico`      | Game icon. Engine will automatically append .ico and may automatically switch to .tga icon as well |
-| `max_beams`      | integer    | 128             | Beams limit, 64 min, 512 max |
-| `max_edicts`     | integer    | 900             | Entities limit, 600 min, 8192 max (protocol limit). In FWGS, minimum is 64. |
-| `max_particles`  | integer    | 4096            | Particles limit, 1024 min, 131072 max |
-| `max_tempents`   | integer    | 500             | Temporary entities limit. 300 min, 2048 max |
-| `mp_entity`      | string     | `info_player_deathmatch` | Entity used to mark maps as multiplayer |
-| `mp_filter`      | string     | Empty string    | When set, used to filter multiplayer maps instead of `mp_entity`.<br>If the map name starts with the same characters as this filter, it's considered a multiplayer map |
-| `nomodels`       | boolean    | 0               | When set to 1, disallows changing player model in UI |
-| `noskills`       | boolean    | 0               | When set to 1, disallows selection of game difficulty |
-| `secure`         | boolean    | 0               | When set to 1, original Unkle Mike's engine will completely disable developer mode. FWGS ignores but preserves this value for compatibility. |
-| `size`           | integer    | 0               | Game directory size in bytes, used in Change Game dialog only |
-| `startmap`       | string     | `c0a0`          | The name of the map used in new game |
-| `sp_entity`      | string     | `info_player_start` | Entity used to mark map as single player. Used in map validation |
-| `title`          | string     | `New Game`      | Game title, used in window title, default server name, etc. |
-| `trainmap`       | string     | `t0a0`          | The name of the training map (Hazard Course) |
-| `type`           | string     | Empty string    | Game type, used in Change Game UI. |
-| `url_info`       | string     | Empty string    | Game homepage URL, used in Change Game UI |
-| `url_update`     | string     | Empty string    | Game updates URL, used in Settings UI |
-| `version`        | float      | 1.0             | Game version, used in Change Game dialog and in server info |
-
-## FWGS-specific gameinfo.txt keys
-
-These strings are specific to Xash3D FWGS.
-
-| Key                     | Type       | Default value            | Description |
-| ----------------------- | ---------- | ------------------------ | ----------- |
-| `animated_title`        | boolean    | 0                        | Use animated title in main menu (WON Half-Life logo.avi imitation from Half-Life 25-th anniversary update)
-| `autosave_aged_count`   | integer    | 2                        | Auto saves limit used in saves rotation |
-| `gamedll_linux`         | string     | Generated from `gamedll` | Game server DLL for 32-bit x86 Linux (see LibraryNaming.md for details) |
-| `gamedll_osx`           | string     | Generated from `gamedll` | Game server DLL for 32-bit x86 macOS (see LibraryNaming.md for details) |
-| `hd_background`         | boolean    | 0                        | Use HD background for main menu (Half-Life 25-th anniversary update) |
-| `internal_vgui_support` | boolean    | 0                        | Only for programmers! Required to be set as 1 for PrimeXT!<br>When set to 1, the engine will not load vgui_support DLL, as VGUI support is done (or intentionally ignored) on the game side. |
-| `render_picbutton_text` | boolean    | 0                        | When set to 1, the UI will not use prerendered `btns_main.bmp` and dynamically render them instead |
-| `quicksave_aged_count`  | integer    | 2                        | Quick saves limit used in saves rotation |
-| `demomap`               | string     | Empty string             | The name of the demo chapter map (Half-Life Uplink) |
-
-## Note on GoldSrc liblist.gam support
-
-As Xash3D accidentally supports GoldSrc games, it also supports parsing liblist.gam.\
-Xash3D will use this file if gameinfo.txt is absent, or if its modification timestamp is older than liblist.gam.
-
-For game creators who plan supporting only Xash3D, using this file is not recommended.
-
-The table below defines conversion rules from liblist.gam to gameinfo.txt. Some keys' interpretation does differ from `gameinfo.txt`, in this case a note will be left. If `liblist.gam` key isn't present in this table, it's ignored.
-
-| `liblist.gam` key | `gameinfo.txt` key | Note |
-| ----------------- | ------------------ | ---- |
-| `animated_title`  | `animated_title`   |      |
-| `edicts`          | `max_edicts`       |      |
-| `fallback_dir`    | `fallback_dir`     |      |
-| `game`            | `title`            |      |
-| `gamedir`         | `gamedir`          |      |
-| `gamedll`         | `gamedll`          |      |
-| `gamedll_linux`   | `gamedll_linux`    |      |
-| `gamedll_osx`     | `gamedll_osx`      |      |
-| `hd_background`   | `hd_background`    |      |
-| `icon`            | `icon`             |      |
-| `mpentity`        | `mp_entity`        |      |
-| `mpfilter`        | `mp_filter`        |      |
-| `nomodels`        | `nomodels`         |      |
-| `secure`          | `secure`           | In GoldSrc it's used to mark the multiplayer game as anti-cheat enabled.<br>Original Xash3D misinterprets its value for disallowing console and developer mode.<br>FWGS ignores this key but preserves for compatibility. |
-| `startmap`        | `startmap`         |      |
-| `size`            | `size`             |      |
-| `trainingmap`     | `trainmap`         |      |
-| `trainmap`        | `trainmap`         |      |
-| `type`            | `type` & `gamemode`| In `liblist.gam` this key works as both `type` and `gamemode`.<br>If value is `singleplayer_only` or `multiplayer_only` the game is marked as SP or MP only, and `gameinfo.txt` type set to `Single` or `Multiplayer`.<br>Any custom value will mark the game as both SP and MP compatible, and type is set to whatever custom value. |
-| `url_dl`          | `url_update`       |      |
-| `url_info`        | `url_info`         |      |
-| `version`         | `version`          |      |
-
-

Documentation/goldsrc-protocol-support.md

@@ -1,14 +0,0 @@
-# Support for GoldSrc network protocol
-This feature is still work-in-progress, but for now it's available for all users, and we appreciate any bug-reports and contributions around it.
-
-For connecting to GoldSrc-based servers, use this command:
-```
-connect ip:port gs
-```
-
-But keep in mind, there are requirement for server to be able to accept connections from Xash3D-based clients: it should accept HLTV connections.
-Without this requirement, you will just get "Steam validation rejected" error on connecting.
-
-That is because proper authorization with Steam API is not implemented in engine yet (but we have plans on it).
-
-In case of ReHLDS with Reunion plugin, by default it rejects HLTV clients. But connections from HLTV can be easily enabled in `reunion.cfg` file.

Documentation/hd-textures.md

@@ -1,40 +0,0 @@
-### HD (external) textures support
-
-Xash3D supports loading texture replacements in TGA format for almost all types of models in the game, except alias models at this time.
-
-Textures are expected to be located at:
-* `modfolder/materials/<mapname>` - for a specific map
-* `modfolder/materials/common` - common for all maps
-* `modfolder/materials/decals` - for decals
-* `modfolder/materials/models/<model>` - for models (texture name must match the internal texture name in the model)
-
-Support for high-resolution textures is enabled setting `host_allow_materials` cvar to `1` or in the menu, in "Video options" section.
-
-#### Xash3D FWGS additions
-
-In addition to paths above, Xash3D FWGS checks following paths:
-
-* `modfolder/materials/sprites/<sprite>` - for sprites, except HUD sprites
-
-Also, to check which texture replacements are loaded successfully, failed or weren't found, a mod developer can set `host_allow_materials` cvar value to `2`. The engine will spew log at any developer level in the following format:
-
-```
-Looking for <replacement> replacement... <status code> (<path relative to mod directory>)
-```
-
-Status codes:
-* `OK` - texture replacement file was found and loaded into GPU memory successfully
-* `FAIL` - texture file was found but hasn't been parsed or loaded successfully. Refer to engine log for more details.
-* `MISS` - texture file wasn't found
-
-Example:
-```
-Looking for maps/bounce.bsp:!waterblue tex replacement...OK (materials/common/!waterblue.tga)
-Looking for maps/bounce.bsp:!waterblue_luma tex replacement...MISS (not found)
-Looking for {shot2 decal replacement...MISS (materials/decals/{shot2.tga)
-Looking for {shot4 decal replacement...MISS (materials/decals/{shot4.tga)
-Looking for {shot3 decal replacement...MISS (materials/decals/{shot3.tga)
-Looking for models/gman tex replacement...FAIL (materials/models/gman/GMan_Case1.tga)
-Looking for models/gman tex replacement...FAIL (materials/models/gman/inside_1.tga)
-```
-

Documentation/musl.md

@@ -1,15 +0,0 @@
-# Xash3D FWGS on `musl`
-
-Xash3D FWGS works on `musl` out of the box. However, the engine doesn't try to differentiate glibc and musl anymore. If you see error similar to:
-
-```
-Host_InitError: can't initialize cl_dlls/client.so: Error relocating valve/cl_dlls/client.so: __sprintf_chk: symbol not found
-```
-
-... or you know that the game you're running is linked against glibc, you can try using `libgcompat`, like this:
-
-```
-$ LD_PRELOAD=/lib/libgcompat.so.0 ./xash3d ...
-```
-
-It will automatically add the missing symbols that glibc binaries usually need. In the future we might automatically link engine against `libgcompat` for better compatibility with prebuilt or closed-source games, if there will be any use for this.

Documentation/opensource-mods.md

@@ -17,7 +17,7 @@ Mirrored on github - https://github.com/JoelTroch/am_src_rebirth
 Mirrored on github - https://github.com/nekonomicon/BattleGrounds
 
 ## Bubblemod
-Download page on official site(WM snapshot) - [http://www.bubblemod.org/dl_default.php](https://web.archive.org/web/20130717133158/http://www.bubblemod.org/dl_default.php)
+Download page on official site - http://www.bubblemod.org/dl_default.php (dead link!)
 
 Mirrored on github - https://github.com/HLSources/BubbleMod
 
@@ -85,9 +85,6 @@ Official gitlab repository - https://gitlab.com/Sockman/hltopdown
 ## Half-Life: Update
 Official github repository - https://github.com/Fograin/hl-subsmod-ex
 
-## Half-Life: Rally
-Official gitlab repository - https://gitlab.com/hlrally/src
-
 ## Half-Life: Weapon Edition
 Available on ModDB - https://www.moddb.com/mods/half-life-weapon-edition/downloads/half-life-weapon-edition-1508-alpha-open-src
 
@@ -133,8 +130,22 @@ Available in mod archive on ModDB - https://www.moddb.com/mods/overturn
 ## Oz Deathmatch
 Mirrored on github - https://github.com/nekonomicon/OZDM
 
+## Spirit of Half-Life
+[Logic&Trick's](https://github.com/LogicAndTrick) mirror - https://files.logic-and-trick.com/#/Half-Life/Mods/Spirit%20of%20Half-Life
+
+## Threewave CTF
+*Unfinished mod by Valve Software*
+
+Available in Valve's Half-Life repository with Deathmatch Classic sources - https://github.com/ValveSoftware/halflife/tree/master/dmc
+
+## Trinity Render
+Available on ModDB: https://www.moddb.com/mods/half-life-episode-two/downloads/trinity-rendering-engine-v308f
+
+## Tyrian: Ground Assault
+Available on ModDB: https://www.moddb.com/mods/tyriangroundassault/downloads/tyrianga-v1-0-src
+
 ## Paranoia
-Available on ModDB - https://www.moddb.com/mods/paranoia/downloads/paranoia-toolkit
+Available on ModDB: https://www.moddb.com/mods/paranoia/downloads/paranoia-toolkit
 
 ## Paranoia 2: The Savior
 Prealpha, mirrored on github - https://github.com/a1batross/Paranoia2_ancient
@@ -149,37 +160,12 @@ Was found on HLFX - http://hlfx.ru/forum/showthread.php?s=2c892dfc52f72be52a89c3
 ## Ricochet
 Available in Valve's Half-Life repository - https://github.com/ValveSoftware/halflife/tree/master/ricochet
 
-## Spirit of Half-Life
-[Logic&Trick's](https://github.com/LogicAndTrick) mirror - https://files.logic-and-trick.com/#/Half-Life/Mods/Spirit%20of%20Half-Life
-
-## The Wastes
-Version 1.5: mirrored on code.idtech.space - https://code.idtech.space/vera/halflife-thewastes-sdk
-
-## Threewave CTF
-*Unfinished mod by Valve Software*
-
-Available in Valve's Half-Life repository with Deathmatch Classic sources - https://github.com/ValveSoftware/halflife/tree/master/dmc
-
-## Trinity Render
-Available on ModDB - https://www.moddb.com/mods/half-life-episode-two/downloads/trinity-rendering-engine-v308f
-
-## Tyrian: Ground Assault
-Available on ModDB - https://www.moddb.com/mods/tyriangroundassault/downloads/tyrianga-v1-0-src
-
-## Wasteland
-Mirrored on code.idtech.space - https://code.idtech.space/vera/halflife-wasteland-sdk
-
 ## Wizard Wars
 Download page on official site - http://www.thothie.com/ww/
 
 ## XashXT
 Mirrored on github - https://github.com/a1batross/XashXT_original
 
-## Xen-Warrior
-*Source code is a part of Spirit of Half-Life 1.0-1.2 under XENWARRIOR macro*
-
-[Logic&Trick's](https://github.com/LogicAndTrick) mirror - https://files.logic-and-trick.com/#/Half-Life/Mods/Spirit%20of%20Half-Life
-
 ## Zombie-X
 Available in mod archive on ModDB - https://www.moddb.com/mods/zombie-x-10-final/downloads/zombie-x-10-dle-beta6-last-version
 
@@ -201,12 +187,12 @@ malortie's recreation - https://github.com/malortie/hl-aom
 Branch **aom** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/aom
 
 ## Afraid of Monsters: Director's cut
-Reverse-engineered code: branch **aomdc** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/aomdc
+Reverse-engineered code, branch **aomdc** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/aomdc
 
 ## Azure Sheep
 malortie's recreation - https://github.com/malortie/hl-asheep
 
-Reverse-engineered code: branch **asheep** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/asheep
+Reverse-engineered code, branch **asheep** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/asheep
 
 ## Big Lolly
 malortie's recreation - https://github.com/malortie/hl-biglolly
@@ -228,7 +214,7 @@ Branch **caseclosed** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable
 Branch **CAd** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/CAd
 
 ## Counter Strike
-Reverse-engineered code of client part by a1batross - https://github.com/Velaron/cs16-client
+Reverse-engineered code of client part by a1batross - https://github.com/FWGS/cs16-client/tree/v1.32
 
 Reverse-engineered code of server part by nagist - https://github.com/nagist/cs16nd
 
@@ -240,22 +226,15 @@ CSO-like Xash3D-based mod, CSMoE - https://github.com/MoeMod/CSMoE
 ## Crack-Life: Campaign Mode
 Recreation by lostgamer aka nillerusr - https://github.com/LostGamerHL/crack_life
 
-Reverse-engineered code: branch **clcampaign** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/clcampaign
-
 ## Escape from the Darkness
 malortie's recreation - https://github.com/malortie/hl-eftd
 
-Reverse-engineered code: branch **eftd** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/eftd
+Reverse-engineered code, branch **eftd** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/eftd
-
-## Half-Life: Black Guard
-*This mod uses dlls from Cleaner's Adventures*
-
-Branch **CAd** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/CAd
 
 ## Half-Life: Blue Shift
 Unkle Mike's recreation - https://hlfx.ru/forum/showthread.php?s=&threadid=5253
 
-Reverse-engineered code: branch **bshift** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/bshift
+Reverse-engineered code, branch **bshift** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/bshift
 
 ## Half-Life: Induction
 Branch **induction** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/induction
@@ -263,12 +242,12 @@ Branch **induction** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/
 ## Half-Life: Opposing Force
 Recreation by lostgamer aka nillerusr - https://github.com/LostGamerHL/hlsdk-xash3d
 
-Reverse-engineered code: clean branch **opfor** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/opfor
+Reverse-engineered code, clean branch **opfor** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/opfor
 
 Spirit of Half Life: Opposing-Force Edition - https://github.com/Hammermaps-DEV/SOHL-V1.9-Opposing-Force-Edition
 
 ## Half-Life: Rebellion
-Reverse-engineered code: branch **rebellion** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/rebellion
+Reverse-engineered code, branch **rebellion** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/rebellion
 
 ## Half-Life: Urbicide
 Branch **hl_urbicide** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/hl_urbicide
@@ -276,7 +255,7 @@ Branch **hl_urbicide** in hlsdk-portable - https://github.com/FWGS/hlsdk-portabl
 ## Half-Life: Visitors
 malortie's recreation - https://github.com/malortie/hl-visitors
 
-Reverse-engineered code: branch **visitors** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/visitors
+Reverse-engineered code, branch **visitors** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/visitors
 
 ## Half-Secret
 Branch **half-secret** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/half-secret
@@ -289,18 +268,18 @@ Branch **noffice** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tr
 ## Poke 646
 malortie's recreation - https://github.com/malortie/hl-poke646
 
-Reverse-engineered code: branch **poke646** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/poke646
+Reverse-engineered code, branch **poke646** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/poke646
 
 ## Poke 646: Vendetta
 malortie's recreation - https://github.com/malortie/hl-poke646-vendetta
 
-Reverse-engineered code: branch **poke646_vendetta** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/poke646_vendetta
+Reverse-engineered code, branch **poke646_vendetta** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/poke646_vendetta
 
 ## Residual Life
-Reverse-engineered code: branch **residual_point** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/residual_point
+Reverse-engineered code, branch **residual_point** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/residual_point
 
 ## Residual Point
-Reverse-engineered code: branch **residual_point** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/residual_point
+Reverse-engineered code, branch **residual_point** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/residual_point
 
 ## Sewer Beta
 Branch **sewer_beta** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/sewer_beta
@@ -311,12 +290,12 @@ Reverse-engineered code by Velaron - https://github.com/Velaron/tf15-client
 ## The Gate
 malortie's recreation - https://github.com/malortie/hl-thegate
 
-Reverse-engineered code: branch **thegate** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/thegate
+Reverse-engineered code, branch **thegate** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/thegate
 
 ## They Hunger
 malortie's recreation - https://github.com/malortie/hl-theyhunger
 
-Reverse-engineered code: branch **theyhunger** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/theyhunger
+Reverse-engineered code, branch **theyhunger** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/theyhunger
 
 They Hunger: Tactical - https://www.moddb.com/mods/they-hunger-tactical/downloads/tht-source-code-documentation
 
@@ -359,22 +338,16 @@ Branch **half-screwed** in hlsdk-portable - https://github.com/FWGS/hlsdk-portab
 Port to Linux - https://github.com/fmoraw/NS
 
 ## Spirit of Half-Life
-Version 1.2: branch **sohl1.2** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/sohl1.2
+Version 1.2, branch **sohl1.2** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/sohl1.2
 
 ## Swiss Cheese Halloween 2002
 Just more playable version by malortie - https://github.com/malortie/hl-shall
 
 Branch **halloween** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/halloween
 
-## The Wastes
-Version 1.5: Port to Linux - https://git.mentality.rip/a1batross/halflife-thewastes-sdk
-
 ## Threewave CTF
 Branch **dmc** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/dmc
 
-## Xen-Warrior
-Branch **sohl1.2** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/sohl1.2
-
 ## Zombie-X
 Branch **zombie-x** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/zombie-x
 

Documentation/ports.md

@@ -2,32 +2,38 @@ Xash3D FWGS is intended to be easily ported to specific platform, however main i
 
 This page is about merged ports to main source tree and responsible for it developers.
 
-For porting guidelines, look engine-porting-guide.md.
+For porting guidelines, look here(TODO!)
 
 Status: 
-* **Supported**: active, was confirmed to be fully functional.
+* **Supported**: active, confirmed to be fully functional.
 * **In progress**: active, under development.
+* **Incomplete**:  not active, but some work was accepted to main repository before
 * **Old Engine**: port was for old engine fork
 * **Not maintained**: lack of human resources
+* **Not merged**: was done in third-party fork, real status unknown
 * **Deprecated**: not supported anymore
 
-Table is sorted by status and platform.
+Table is sorted by status.
 
 | Platform        | Status                     | Maintainer               | Note
 | --------        | ------                     | ----------               | ----
-| Android         | Supported                  | @Velaron                 |
+| Windows         | Supported                  | @a1batross, @SNMetamorph |
 | *BSD            | Supported                  | @nekonomicon             |
-| DOS4GW          | Supported                  | @mittorn                 |
+| GNU/Linux(x86, amd64, arm) | Supported       | @a1batross, @mittorn     |
-| GNU/Linux       | Supported                  | @a1batross, @mittorn     |
+| Android         | Supported                  | @a1batross, @mittorn     |
-| Haiku           | Supported                  | not maintained           | Was added by #478 and #483
-| macOS           | Supported                  | @sofakng                 | 
 | MotoMAGX        | Supported                  | @a1batross               |
+| GNU/Linux(elbrus) | Supported                | @a1batross, @mittorn     | Rare and eventual access to e2k machine
+| Haiku           | Supported                  | not maintained           | Was added by #478 and #483
+| DOS4GW          | Supported                  | @mittorn                 |
+| GNU/Linux(mipsel) | Supported                | @mittorn                 |
 | PSVita          | Supported                  | @fgsfdsfgs               |
 | Switch          | Supported                  | @fgsfdsfgs               |
-| Windows         | Supported                  | @a1batross, @SNMetamorph |
+| Wii             | In progress                | Collaborative effort     | [GitHub Repository](https://github.com/saucesaft/xash3d-wii) 
 | PSP             | In progress                | @Crow_bar, @Velaron      | [GitHub Repository](https://github.com/Crow-bar/xash3d-fwgs)
-| Wii             | In progress                | Collaborative effort     | [GitHub Repository](https://github.com/saucesaft/xash3d-wii)
 | Emscripten      | Old Engine                 | not maintained           | 
-| 3DS             | Old Engine fork            | not maintained           | [GitHub Repository](https://github.com/masterfeizz/Xash3DS)
 | Oculus Quest    | Old Engine fork            | @DrBeef                  | [GitHub Repository](https://github.com/DrBeef/Lambda1VR)
+| PSVita          | Old Engine fork            | not maintained           | [GitHub Repository](https://github.com/fgsfdsfgs/vitaXash3D)
+| Switch          | Old Engine fork            | not maintained           | [GitHub Repository](https://github.com/switchports/xash3d-switch)
+| 3DS             | Old Engine fork            | not maintained           | [GitHub Repository](https://github.com/masterfeizz/Xash3DS)
+| macOS           | Deprecated                 | not maintained           | See GitHub issue #61
 | iOS             | Deprecated                 | not maintained           | See GitHub issue #61

Documentation/supported-mod-list.md

@@ -19,22 +19,7 @@
    - [List of XashXT-based mods](#list-of-xashxt-based-mods)
    - [List of maps for They Hunger](#list-of-maps-for-they-hunger)
    - [List of games and mods with custom gamedll](#list-of-games-and-mods-with-custom-gamedll)
-   - [List of mods for Counter Strike](#list-of-mods-for-counter-strike)
+   - [List of mods for Counter Strike(Android only)](#list-of-mods-for-counter-strike)
-   - [List of supported mods from mobile_hacks branch of HLSDK Portable by FWGS](#list-of-supported-mods-from-mobile_hacks-branch-of-hlsdk-portable-by-fwgs)
-
-# List of supported mods from mobile_hacks branch of HLSDK Portable by FWGS
-1. [Afraid of Monsters](https://www.moddb.com/mods/afraid-of-monsters/downloads/afraid-of-monsters-v1)
-2. [Big Lolly](https://www.moddb.com/mods/big-lolly)
-3. [Half-Life: Blue Shift](https://store.steampowered.com/app/130/HalfLife_Blue_Shift/)
-4. [Half-Secret](https://www.moddb.com/mods/half-secret)
-5. [Case Closed](https://www.moddb.com/mods/caseclosed)
-6. [Bloody Pizza - Vendetta](https://www.moddb.com/games/half-life/addons/bloody-pizza-vendetta)
-7. [Borderlands](https://www.moddb.com/games/half-life/addons/borderlands-v04)
-8. [Half-Life: Induction](https://www.moddb.com/mods/half-life-induction/downloads/half-life-induction-12)
-9. [Redemption/Absolute Redemption](https://www.moddb.com/mods/absolute-redemption)
-10. [Sewer beta](https://www.moddb.com/games/half-life/addons/sewer-beta)
-11. [Times of Troubles](https://www.moddb.com/mods/times-of-troubles)
-12. [Half-Life: Urbicide](https://www.moddb.com/mods/half-life-urbicide)
 
 # List of Half-Life-based mods
 Originally this list was written by *Qwertyus*(*Qortez*)
@@ -191,7 +176,7 @@ For mappacks - place *.bsp files to **valve/maps** folder, *.wad files to **valv
 143. [Operation: Nova](http://www.moddb.com/mods/half-life-operation-nova) (there is an inner bug with an M60 machinegun on a map with Osprey: it can be activated and used if you are staying in front of it, not behind it)
 144. [Optimum Fear](https://www.fileplanet.com/7472/0/fileinfo/Optimum-Fear)
 145. [Outrun](http://www.moddb.com/mods/outrun)
-146. [Outwards (Day One)](https://web.archive.org/web/20161026104825/http://visgi.info/maps/)
+146. [Outwards (Day One)](https://drive.google.com/file/d/1mjQ8wUazYbwTq9Ocg0Vs0raq4avbTRne/view?usp=sharing)
 147. [Overhaul Pack](http://www.moddb.com/mods/half-life-overhaul-pack) (Just HD pack for Half-Life)
 148. [P.I.Z.D.E.C.](https://www.runthinkshootlive.com/posts/pizdec/)
 149. [pagoda](http://www.moddb.com/mods/pagoda1)
@@ -297,7 +282,7 @@ For mappacks - place *.bsp files to **valve/maps** folder, *.wad files to **valv
 6. [Catacombs: Part 1](https://www.runthinkshootlive.com/posts/catacombs/)
 7. [Cro-man's Office Mappack](http://twhl.info/vault.php?map=5547)
 8. [Half-Life Episode Two Demo Alpha v1.0](http://hl.loess.ru/?mod=451)
-9. [Hazardous-Course (first version of Hazardous-Course 2)](https://web.archive.org/web/20110512012317/http://www.richmans-maps.ch.vu/)
+9. [Hazardous-Course (first version of Hazardous-Course 2)](https://drive.google.com/file/d/16djJZSpNWKyScSxSyMqX-u_S-2i400rl/view?usp=sharing)
 10. [High Tech v0.2](http://hl.loess.ru/?mod=499)
 11. [HL Shadows, Part 1](https://www.fileplanet.com/7466/0/fileinfo/'HL-Shadows',-Part-1)
 12. [HLNewEnd](http://twhl.info/vault.php?map=2275)
@@ -320,11 +305,11 @@ For mappacks - place *.bsp files to **valve/maps** folder, *.wad files to **valv
 29. [Shortcut v1.0 Beta](https://www.runthinkshootlive.com/posts/shortcut/)
 30. [Stoka](https://www.ceskemody.cz/mapy.php?lng=1&clanek=222&razeni_hra=1&pn=stoka)
 31. [Striker's Compo 26](http://twhl.info/vault.php?map=5190) (buggy)
-32. [Technology Test 2](https://web.archive.org/web/20110512012317/http://www.richmans-maps.ch.vu/)
+32. [Technology Test 2](https://drive.google.com/file/d/1LfldzsMIN5j07bgtNkfY5v0Xl0S9de_G/view?usp=sharing)
 33. [The Gate Playable Demo](https://www.fileplanet.com/116347/110000/fileinfo/The-Gate-Playable-Demo)
 34. [They are Back](https://www.runthinkshootlive.com/posts/they-are-back/)
 35. [Tiefseelabor( Deep Sea Laboratory )](https://www.runthinkshootlive.com/posts/deep-sea-laboratory/)
-36. [Time-Shift](https://web.archive.org/web/20110512012317/http://www.richmans-maps.ch.vu/)
+36. [Time-Shift](https://drive.google.com/file/d/1pK1s-2SIlSMQHVRPMLdC_94wTa__8_DX/view?usp=sharing)
 37. [Train Single Beta](https://cs-mapping.com.ua/forum/showthread.php?t=36394) (Remove **gfx.wad** from **TrainSingle** folder)
 38. [WAR: The Killer Beta 0.1](http://www.moddb.com/mods/war)
 39. [White Force Beta( Residual Point prototype )](http://www.moddb.com/mods/hl-residual-point/downloads/white-force-beta-2002)
@@ -394,7 +379,7 @@ Mods:
 5. [Half-Life Baby v1.4](http://www.moddb.com/games/half-life/addons/half-life-baby) (it's an unfinished but playable mod; after installing of the mod open **liblist.gam** or **gameinfo.txt** file in the mod's folder and correct the line **gamedll "..\hlbaby\dlls\hl.dll"** for **gamedll "dlls\hl.dll"**, otherwise you'll not be able to start a game)
 6. [Half-Secret](http://www.moddb.com/mods/half-secret) (this mod has custom **weapon_snark** code)
 7. [Induction](http://www.moddb.com/mods/half-life-induction) (this mod has new item - **item_flashlight**)
-8. [Lost in Black Mesa(first version without HLFX)](https://web.archive.org/web/20160407041812/http://half-life.ru/forum/showthread.php?threadid=13959) (download links dead!)
+8. [Lost in Black Mesa(first version without HLFX)](https://drive.google.com/file/d/1bEnm_AxJs-ly8hTEZIQBw_v2BsXdSiGa/view?usp=sharing)
 9. [Soldier](http://www.moddb.com/mods/half-life-soldier)
 10. [Solo Operations](http://www.moddb.com/mods/solo-operations)
 11. [The Blood v1.1](http://hl.loess.ru/?mods=&search=The+Blood) (there are some inner bugs in the mod, but they don't interfere with a game progress)
@@ -455,7 +440,7 @@ Mods:
 51. [Data-base](https://www.runthinkshootlive.com/posts/database/)
 52. [de_dust2_azabetfeN](https://cs-mapping.com.ua/forum/showthread.php?t=36394) (remove **cl_dlls** & **dlls** folders from inside of mod's directory before you start the game)
 53. [De-railed](http://twhl.info/competitions.php?results=7)
-54. [Dead Shift Beta](http://www.moddb.com/mods/dead-shift) - [Demo 1](https://www.gamewatcher.com/mods/half-life-mod/dead-shift-1-0-beta) & [Demo 2](https://web.archive.org/web/20151030005310/http://www.gamefront.com/files/13532512)
+54. [Dead Shift Beta](http://www.moddb.com/mods/dead-shift) - [Demo 1](https://www.gamewatcher.com/mods/half-life-mod/dead-shift-1-0-beta) & [Demo 2](https://drive.google.com/file/d/1uHvr8xONogTTNOy-8X6G4ehFV6Eawvbq/view?usp=sharing)
 55. [Deep](http://twhl.info/vault.php?map=1669)
 56. [Desert Attack](http://fyzzer.narod.ru/index.html)
 57. [Desert Combat Demo](https://www.fileplanet.com/190487/190000/fileinfo/Half-Life---Desert-Combat-Mod) (despite a big file size there's only one small unfinished map)
@@ -513,8 +498,8 @@ Mods:
 109. [Hospital](https://gamebanana.com/maps/167446) (you need to edit **liblist.gam** file in the mod's folder - delete *gamedll & type* strings from it before you start to play)
 110. [Hostage](https://www.runthinkshootlive.com/posts/hostage-2/)
 111. [House](http://www.artpeter.net/Data/HalfLife/Hl.php)
-112. [Impulse 101 Fun - The Train](http://web.archive.org/web/20070305075816/http://www.twhl.co.za/mapvault/2817.zip) (map from *TWHL* by *Archie* aka *The Hunter*)
+112. [Impulse 101 Fun - The Train](https://drive.google.com/file/d/1jAuMCCmREH0mfAEAscqaG8FQGa2uNknb/view?usp=sharing) (map from *TWHL* by *Archie* aka *The Hunter*)
-113. [In America](https://web.archive.org/web/20170221213409/http://www.lambda-force.org/load/half_life/karty/half_life_in_america/18-1-0-476)
+113. [In America](https://drive.google.com/file/d/1gOC8zfnUvBxRy8Rr8juNiUNbLYjoZpnn/view?usp=sharing)
 114. [In the Kitchen](http://twhl.info/vault.php?map=4314)
 115. [Infiltration](https://www.fileplanet.com/7467/0/fileinfo/Infiltration)
 116. [Interactivity & Lots of Entities](http://twhl.info/vault.php?map=5744) (link dead!)

Documentation/vgui2-support.md

@@ -0,0 +1,41 @@
+# Experimental VGUI2 Support
+
+Thanks to @kungfulon contributions, Xash3D FWGS now supports VGUI2.
+
+VGUI2 is undocumented UI system from Source Engine that GoldSrc used in some games and it's main menu.
+
+## Support status
+
+Doesn't draw anything, doesn't take any input.
+
+## List of games that require VGUI2 support
+
+- Counter-Strike 1.6
+- Counter-Strike: Condition Zero
+- Counter-Strike: Condition Zero Deleted Scenes
+- Day of Defeat
+- Half-Life: Blue Shift
+
+## How to enable VGUI2 support
+
+By default, engine doesn't initialize VGUI2 to not confuse existing games and mods that use or do not use VGUI1. This support also relies on a number of proprietary libraries, that we better not redistribute, so you have to supply them yourself. Keep in mind, that these libraries are compiled only for 32-bit Windows, Linux and OSX, you shouldn't expect them running anywhere else.
+
+1. Download latest Half-Life from Steam.
+2. Open local files.
+3. Copy libraries in the list below according to your platform, to folder where Xash3D searches it's libraries (usually in same folder where executable is located)
+
+| Linux    | Windows
+| -------- | --------
+| `chromehtml.so` | `chromehtml.dll`
+| `vgui2.so` | `vgui2.dll`
+| `libcef.so` | `libcef.dll`
+| `libtier0.so` | `tier0.dll`
+| `libvstdlib.so` | `vstdlib.dll`
+| `libsteam_api.so` | `steam_api.dll`
+
+Some files must also be copied:
+- `cef_gtk.pak`
+
+Additionally, on Linux other libraries must be provided. Use `ldd` tool to figure out which libraries you miss. Many of them can be pulled from Steam Runtime.
+
+Do not recommend using RoDir with VGUI2 games. Many of them are broken. Steam API will crash without `steam_appid.txt` in Xash root directory.

README.md

@@ -1,55 +1,62 @@
-# Xash3D FWGS Engine <img align="right" width="128" height="128" src="https://github.com/FWGS/xash3d-fwgs/raw/master/game_launch/icon-xash-material.png" alt="Xash3D FWGS icon" />
+# Xash3D FWGS Engine
-[![builds.sr.ht status](https://builds.sr.ht/~a1batross/xash3d-fwgs.svg)](https://builds.sr.ht/~a1batross/xash3d-fwgs?) [![GitHub Actions Status](https://github.com/FWGS/xash3d-fwgs/actions/workflows/c-cpp.yml/badge.svg)](https://github.com/FWGS/xash3d-fwgs/actions/workflows/c-cpp.yml) [![FreeBSD Build Status](https://img.shields.io/cirrus/github/FWGS/xash3d-fwgs?label=freebsd%20build)](https://cirrus-ci.com/github/FWGS/xash3d-fwgs) [![Discord Server](https://img.shields.io/discord/355697768582610945.svg)](http://fwgsdiscord.mentality.rip/) \
+[![GitHub Actions Status](https://github.com/FWGS/xash3d-fwgs/actions/workflows/c-cpp.yml/badge.svg)](https://github.com/FWGS/xash3d-fwgs/actions/workflows/c-cpp.yml) [![FreeBSD Build Status](https://img.shields.io/cirrus/github/FWGS/xash3d-fwgs?label=freebsd%20build)](https://cirrus-ci.com/github/FWGS/xash3d-fwgs) [![Discord Server](https://img.shields.io/discord/355697768582610945.svg)](http://fwgsdiscord.mentality.rip/) \
-[![Download Stable](https://img.shields.io/badge/download-stable-yellow)](https://github.com/FWGS/xash3d-fwgs/releases/latest) [![Download Testing](https://img.shields.io/badge/downloads-testing-orange)](https://github.com/FWGS/xash3d-fwgs/releases/tag/continuous)
+[![Download Stable](https://img.shields.io/badge/download-stable-yellow)](https://github.com/FWGS/xash3d-fwgs/releases/latest) [![Download Testing](https://img.shields.io/badge/downloads-testing-orange)](https://github.com/FWGS/xash3d-fwgs/releases/tag/continuous) 
 
-Xash3D (pronounced `[ksɑʂ]`) FWGS is a game engine, aimed to provide compatibility with Half-Life Engine and extend it, as well as to give game developers well known workflow.
+Xash3D FWGS is a fork of Xash3D Engine by Unkle Mike with extended features and crossplatform.
 
-Xash3D FWGS is a heavily modified fork of an original [Xash3D Engine](https://www.moddb.com/engines/xash3d-engine) by Unkle Mike.
+```
-
+Xash3D is a game engine, aimed to provide compatibility with Half-Life Engine, 
-## Donate
+as well as to give game developers well known workflow and extend it.
-[![Donate to FWGS button](https://img.shields.io/badge/Donate_to_FWGS-%3C3-magenta)](Documentation/donate.md) \
+Read more about Xash3D on ModDB: https://www.moddb.com/engines/xash3d-engine
-If you like Xash3D FWGS, consider supporting individual engine maintainers. By supporting us, you help to continue developing this game engine further. The sponsorship links are available in [documentation](Documentation/donate.md).
+```
 
 ## Fork features
-* Steam Half-Life (HLSDK 2.5) support.
+* HLSDK 2.4 support.
-* Crossplatform and modern compilers support: supports Windows, Linux, BSD & Android on x86 & ARM and [many more](Documentation/ports.md).
+* Crossplatform: supported x86 and ARM on Windows/Linux/BSD/Android. ([see docs for more info](Documentation/ports.md))
-* Better multiplayer: multiple master servers, headless dedicated server, voice chat, [GoldSrc protocol support](Documentation/goldsrc-protocol-support.md) and IPv6 support.
+* Modern compilers support: say no more to MSVC6.
-* Multiple renderers support: OpenGL, GLESv1, GLESv2 and Software.
+* Better multiplayer support: multiple master servers, headless dedicated server.
-* Advanced virtual filesystem: `.pk3` and `.pk3dir` support, compatibility with GoldSrc FS module, fast case-insensitivity emulation for crossplatform.
+* Mobility API: allows better game integration on mobile devices(vibration, touch controls)
-* Mobility API: better game integration on mobile devices (vibration, touch controls).
+* Different input methods: touch, gamepad and classic mouse & keyboard.
-* Different input methods: touch and gamepad in addition to mouse & keyboard.
 * TrueType font rendering, as a part of mainui_cpp.
-* External VGUI support module.
+* Multiple renderers support: OpenGL, GLESv1, GLESv2, Software.
-* PNG & KTX2 image format support.
+* Voice support.
-* [A set of small improvements](Documentation/), without broken compatibility.
+* External filesystem module like in GoldSrc engine.
+* External vgui support module.
+* PNG image format support.
+* A set of small improvements, without broken compatibility.
+
+## Planned fork features
+* Virtual Reality support and game API.
+* Vulkan renderer.
 
 ## Installation & Running
 0) Get Xash3D FWGS binaries: you can use [testing](https://github.com/FWGS/xash3d-fwgs/releases/tag/continuous) build or you can compile engine from source code.
 1) Copy engine binaries to some directory.
 2) Copy `valve` directory from [Half-Life](https://store.steampowered.com/app/70/HalfLife/) to directory with engine binaries.
 If your CPU is NOT x86 compatible or you're running 64-bit version of the engine, you may want to compile [Half-Life SDK](https://github.com/FWGS/hlsdk-portable).
-This repository contains our fork of HLSDK and restored source code for Half-Life expansions and some mods.
+This repository contains our fork of HLSDK and restored source code for some of the mods. Not all of them, of course.
 You still needed to copy `valve` directory as all game resources located there.
 3) Run the main executable (`xash3d.exe` or AppImage).
 
 For additional info, run Xash3D with `-help` command line key.
 
 ## Contributing
-* Before sending an issue, check if someone already reported your issue. Make sure you're following "How To Ask Questions The Smart Way" guide by Eric Steven Raymond. Read more: http://www.catb.org/~esr/faqs/smart-questions.html.
+* Before sending an issue, check if someone already reported your issue. Make sure you're following "How To Ask Questions The Smart Way" guide by Eric Steven Raymond. Read more: http://www.catb.org/~esr/faqs/smart-questions.html
-* Issues are accepted in both English and Russian.
+* Issues are accepted in both English and Russian
 * Before sending a PR, check if you followed our contribution guide in CONTRIBUTING.md file.
 
 ## Build instructions
-We are using Waf build system. If you have some Waf-related questions, I recommend you to read [Waf Book](https://waf.io/book/).
+We are using Waf build system. If you have some Waf-related questions, I recommend you to read https://waf.io/book/
 
 NOTE: NEVER USE GitHub's ZIP ARCHIVES. GitHub doesn't include external dependencies we're using!
 
 ### Prerequisites
-If your CPU is x86 compatible and you're on Windows or Linux, we are building 32-bit code by default. This was done to maintain compatibility with Steam releases of Half-Life and based on it's engine games.
+
+If your CPU is x86 compatible, we are building 32-bit code by default. This was done to maintain compatibility with Steam releases of Half-Life and based on it's engine games.
 Even if Xash3D FWGS does support targetting 64-bit, you can't load games without recompiling them from source code!
 
 If your CPU is NOT x86 compatible or you decided build 64-bit version of engine, you may want to compile [Half-Life SDK](https://github.com/FWGS/hlsdk-portable).
-This repository contains our fork of HLSDK and restored source code for Half-Life expansions and some mods.
+This repository contains our fork of HLSDK and restored source code for some of the mods. Not all of them, of course.
 
 #### Windows (Visual Studio)
 * Install Visual Studio.
@@ -61,39 +68,31 @@ This repository contains our fork of HLSDK and restored source code for Half-Lif
 
 #### GNU/Linux
 ##### Debian/Ubuntu
-* For 32-bit engine on 64-bit x86 operating system:
+* Enable i386 on your system, if you're compiling 32-bit engine on amd64. If not, skip this
-  * Enable i386 on your system: `$ sudo dpkg --add-architecture i386`.
-  * Install development tools: `$ sudo apt install build-essential gcc-multilib g++-multilib python libsdl2-dev:i386 libfontconfig-dev:i386 libfreetype6-dev:i386 libopus-dev:i386 libbz2-dev:i386`.
-  * Set PKG_CONFIG_PATH environment variable to point at 32-bit libraries: `$ export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig`.
 
-* For non-x86 systems:
+`$ sudo dpkg --add-architecture i386`
-  * Install development tools: `$ sudo apt install build-essential python libsdl2-dev libfontconfig-dev libfreetype6-dev libopus-dev libbz2-dev`.
+* Install development tools
-
+  * For 32-bit engine on amd64: \
-* Clone this repostory: `$ git clone --recursive https://github.com/FWGS/xash3d-fwgs`.
+    `$ sudo apt install build-essential gcc-multilib g++-multilib python libsdl2-dev:i386 libfontconfig-dev:i386 libfreetype6-dev:i386`
-
+  * For everything else: \
-##### RedHat/Fedora
+    `$ sudo apt install build-essential python libsdl2-dev libfontconfig-dev libfreetype6-dev`
-* For 32-bit engine on 64-bit x86 operating system:
+* Clone this repostory:
-  * Install development tools: `$ sudo dnf install gcc gcc-c++ glibc-devel.i686 SDL2-devel.i686 opus-devel.i686 fontconfig-devel.i686 freetype-devel.i686 bzip2-devel.i686`.
+`$ git clone --recursive https://github.com/FWGS/xash3d-fwgs`
-  * Set PKG_CONFIG_PATH environment variable to point at 32-bit libraries: `$ export PKG_CONFIG_PATH=/usr/lib/pkgconfig`.
-
-* For non-x86 systems:
-  * Install development tools: `$ sudo dnf install gcc gcc-c++ SDL2-devel opus-devel fontconfig-devel freetype-devel bzip2-devel`.
-
-* Clone this repostory: `$ git clone --recursive https://github.com/FWGS/xash3d-fwgs`.
 
 ### Building
 #### Windows (Visual Studio)
-0) Open command line.
+0) Open command line
 1) Navigate to `xash3d-fwgs` directory.
-2) (optional) Examine which build options are available: `waf --help`.
+2) Carefully examine which build options are available: `waf --help`
-3) Configure build: `waf configure --sdl2=c:/path/to/SDL2`.
+3) Configure build: `waf configure -T release --sdl2=c:/path/to/SDL2`
-4) Compile: `waf build`.
+4) Compile: `waf build`
-5) Install: `waf install --destdir=c:/path/to/any/output/directory`.
+5) Install: `waf install --destdir=c:/path/to/any/output/directory`
 
 #### Linux
-If compiling 32-bit on amd64, make sure `PKG_CONFIG_PATH` from the previous step is set correctly, prior to running configure.
+If compiling 32-bit on amd64, you may need to supply `export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig` prior to running configure.
 
-0) (optional) Examine which build options are available: `./waf --help`.
+0) Examine which build options are available: `./waf --help`
-1) Configure build: `./waf configure` (you need to pass `-8` to compile 64-bit engine on 64-bit x86 processor).
+1) Configure build: `./waf configure -T release`
-2) Compile: `./waf build`.
+(You need to pass `-8` to compile 64-bit engine on 64-bit x86 processor)
-3) Install: `./waf install --destdir=/path/to/any/output/directory`.
+2) Compile: `./waf build`
+3) Install(optional): `./waf install --destdir=/path/to/any/output/directory`

common/backends.h

@@ -18,17 +18,21 @@ GNU General Public License for more details.
 // video backends (XASH_VIDEO)
 #define VIDEO_NULL    0
 #define VIDEO_SDL     1
+#define VIDEO_ANDROID 2
 #define VIDEO_FBDEV   3
 #define VIDEO_DOS     4
 
+
 // audio backends (XASH_SOUND)
 #define SOUND_NULL     0
 #define SOUND_SDL      1
+#define SOUND_OPENSLES 2
 #define SOUND_ALSA     3
 
 // input (XASH_INPUT)
 #define INPUT_NULL    0
 #define INPUT_SDL     1
+#define INPUT_ANDROID 2
 #define INPUT_EVDEV   3
 
 // timer (XASH_TIMER)
@@ -41,13 +45,16 @@ GNU General Public License for more details.
 // messageboxes (XASH_MESSAGEBOX)
 #define MSGBOX_STDERR  0
 #define MSGBOX_SDL     1
+#define MSGBOX_ANDROID 2
 #define MSGBOX_WIN32   3
 #define MSGBOX_NSWITCH 4
 
+
 // library loading (XASH_LIB)
 #define LIB_NULL 0
 #define LIB_POSIX 1
 #define LIB_WIN32 2
 #define LIB_STATIC 3
 
+
 #endif /* BACKENDS_H */

common/boneinfo.h

@@ -1,6 +1,6 @@
 /*
-vgl_shim.h - vitaGL custom immediate mode shim
+boneinfo.h - structure that send delta-compressed bones across network
-Copyright (C) 2023 fgsfds
+Copyright (C) 2018 Uncle Mike
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -13,12 +13,13 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 */
 
-#pragma once
+#ifndef BONEINFO_H
+#define BONEINFO_H
 
-// max verts in a single frame
+typedef struct
-#define GL2_MAX_VERTS 32768
+{
+	vec3_t	angles;
+	vec3_t	origin;
+} boneinfo_t;
 
-int GL2_ShimInit( void );
+#endif//BONEINFO_H
-void GL2_ShimInstall( void );
-void GL2_ShimShutdown( void );
-void GL2_ShimEndFrame( void );

common/com_image.h

@@ -9,20 +9,7 @@ NOTE: number at end of pixelformat name it's a total bitscount e.g. PF_RGB_24 ==
 ========================================================================
 */
 #define ImageRAW( type )	(type == PF_RGBA_32 || type == PF_BGRA_32 || type == PF_RGB_24 || type == PF_BGR_24 || type == PF_LUMINANCE)
-#define ImageCompressed( type ) \
+#define ImageDXT( type )	(type == PF_DXT1 || type == PF_DXT3 || type == PF_DXT5 || type == PF_ATI2 || type == PF_BC6H_SIGNED || type == PF_BC6H_UNSIGNED || type == PF_BC7)
-	(  type == PF_DXT1 \
-	|| type == PF_DXT3 \
-	|| type == PF_DXT5 \
-	|| type == PF_ATI2 \
-	|| type == PF_BC4_SIGNED \
-	|| type == PF_BC4_UNSIGNED \
-	|| type == PF_BC5_SIGNED \
-	|| type == PF_BC5_UNSIGNED \
-	|| type == PF_BC6H_SIGNED \
-	|| type == PF_BC6H_UNSIGNED \
-	|| type == PF_BC7_UNORM \
-	|| type == PF_BC7_SRGB \
-	|| type == PF_KTX2_RAW )
 
 typedef enum
 {
@@ -38,15 +25,9 @@ typedef enum
 	PF_DXT3,		// s3tc DXT3/BC2 format
 	PF_DXT5,		// s3tc DXT5/BC3 format
 	PF_ATI2,		// latc ATI2N/BC5 format
-	PF_BC4_SIGNED,
-	PF_BC4_UNSIGNED,
-	PF_BC5_SIGNED,
-	PF_BC5_UNSIGNED,
 	PF_BC6H_SIGNED,	// bptc BC6H signed FP16 format
 	PF_BC6H_UNSIGNED, // bptc BC6H unsigned FP16 format
-	PF_BC7_UNORM,			// bptc BC7 format
+	PF_BC7,			// bptc BC7 format
-	PF_BC7_SRGB,
-	PF_KTX2_RAW, // Raw KTX2 data, used for yet unsupported KTX2 subformats
 	PF_TOTALCOUNT,	// must be last
 } pixformat_t;
 
@@ -69,7 +50,6 @@ typedef enum
 	IL_LOAD_DECAL	= BIT(5),	// special mode for load gradient decals
 	IL_OVERVIEW	= BIT(6),	// overview required some unque operations
 	IL_LOAD_PLAYER_DECAL = BIT(7), // special mode for player decals
-	IL_KTX2_RAW = BIT(8), // renderer can consume raw KTX2 files (e.g. ref_vk)
 } ilFlags_t;
 
 // goes into rgbdata_t->encode

common/com_model.h

@@ -127,23 +127,14 @@ typedef struct
 	int		flags;		// sky or slime, no lightmap or 256 subdivision
 } mtexinfo_t;
 
-// a1ba: changed size to avoid undefined behavior. Check your allocations if you take this header!
+typedef struct glpoly_s
-// For example:
-//  before: malloc( sizeof( glpoly_t ) + ( numverts - 4 ) * VERTEXSIZE * sizeof( float ))
-//  after (C): malloc( sizeof( glpoly_t ) + numverts * VERTEXSIZE * sizeof( float ))
-//  after (C++): malloc( sizeof( glpoly_t ) + ( numverts - 1 ) * VERTEXSIZE * sizeof( float ))
-typedef struct glpoly2_s
 {
-	struct glpoly2_s	*next;
+	struct glpoly_s	*next;
-	struct glpoly2_s	*chain;
+	struct glpoly_s	*chain;
 	int		numverts;
 	int		flags;          		// for SURF_UNDERWATER
-#ifdef __cplusplus
+	float		verts[4][VERTEXSIZE];	// variable sized (xyz s1t1 s2t2)
-	float	verts[1][VERTEXSIZE]; // variable sized (xyz s1t1 s2t2)
+} glpoly_t;
-#else
-	float	verts[][VERTEXSIZE]; // variable sized (xyz s1t1 s2t2)
-#endif
-} glpoly2_t;
 
 typedef struct mnode_s
 {
@@ -182,7 +173,7 @@ struct decal_s
 	short		entityIndex;	// Entity this is attached to
 // Xash3D specific
 	vec3_t		position;		// location of the decal center in world space.
-	glpoly2_t	*polys;		// precomputed decal vertices
+	glpoly_t	*polys;		// precomputed decal vertices
 	intptr_t	reserved[4];	// just for future expansions or mod-makers
 };
 
@@ -255,7 +246,7 @@ struct msurface_s
 
 	int		light_s, light_t;	// gl lightmap coordinates
 
-	glpoly2_t		*polys;		// multiple if warped
+	glpoly_t		*polys;		// multiple if warped
 	struct msurface_s	*texturechain;
 
 	mtexinfo_t	*texinfo;
@@ -497,8 +488,7 @@ typedef struct
 	int		flags;
 	float		size;
 
-	const trivertex_t **pposeverts; // only valid during loading, used to build GL mesh
+	int		reserved[8];		// VBO offsets
-	intptr_t	reserved[7];		// VBO offsets
 
 	int		numposes;
 	int		poseverts;
@@ -541,10 +531,8 @@ typedef struct
 #define MAX_MOVIES		8
 #define MAX_CDTRACKS	32
 #define MAX_CLIENT_SPRITES	512	// SpriteTextures (0-256 hud, 256-512 client)
+#define MAX_EFRAGS		8192	// Arcane Dimensions required
 #define MAX_REQUESTS	64
 
-STATIC_CHECK_SIZEOF( mextrasurf_t, 324, 496 );
-STATIC_CHECK_SIZEOF( decal_t, 60, 88 );
-STATIC_CHECK_SIZEOF( mfaceinfo_t, 176, 304 );
 
 #endif//COM_MODEL_H

common/const.h

@@ -717,7 +717,6 @@ enum
 	kRenderFxExplode,			// Scale up really big!
 	kRenderFxGlowShell,			// Glowing Shell
 	kRenderFxClampMinScale,		// Keep this sprite from getting very small (SPRITES only!)
-	kRenderFxLightMultiplier,
 };
 
 typedef int		func_t;

common/cvardef.h

@@ -1,122 +1,49 @@
-/*
+/***
-cvardef.h - quake cvar definition
+*
-Copyright (C) 1997-2001 Id Software, Inc.
+*	Copyright (c) 1996-2002, Valve LLC. All rights reserved.
-Copyright (C) 2024 Alibek Omarov
+*
+*	This product contains software technology licensed from Id
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc.
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef CVARDEF_H
+#define CVARDEF_H
 
-This program is free software; you can redistribute it and/or
+#define FCVAR_ARCHIVE		(1<<0)	// set to cause it to be saved to vars.rc
-modify it under the terms of the GNU General Public License
+#define FCVAR_USERINFO		(1<<1)	// changes the client's info string
-as published by the Free Software Foundation; either version 2
+#define FCVAR_SERVER		(1<<2)	// notifies players when changed
-of the License, or (at your option) any later version.
+#define FCVAR_EXTDLL		(1<<3)	// defined by external DLL
+#define FCVAR_CLIENTDLL		(1<<4)	// defined by the client dll
+#define FCVAR_PROTECTED		(1<<5)	// It's a server cvar, but we don't send the data since it's a password, etc.  Sends 1 if it's not bland/zero, 0 otherwise as value
+#define FCVAR_SPONLY		(1<<6)	// This cvar cannot be changed by clients connected to a multiplayer server.
+#define FCVAR_PRINTABLEONLY		(1<<7)	// This cvar's string cannot contain unprintable characters ( e.g., used for player name etc ).
+#define FCVAR_UNLOGGED		(1<<8)	// If this is a FCVAR_SERVER, don't log changes to the log file / console if we are creating a log
+#define FCVAR_NOEXTRAWHITEPACE	(1<<9)	// strip trailing/leading white space from this cvar
+#define FCVAR_PRIVILEGED	(1<<10) // only available in privileged mode
+#define FCVAR_FILTERABLE	(1<<11) // filtered in unprivileged mode if cl_filterstuffcmd is 1
 
-This program is distributed in the hope that it will be useful,
+// Xash3D extensions
-but WITHOUT ANY WARRANTY; without even the implied warranty of
+#define FCVAR_GLCONFIG		(1<<12)	// write it into <renderer>.cfg(see RefAPI)
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#define FCVAR_CHANGED		(1<<13)	// set each time the cvar is changed
+#define FCVAR_GAMEUIDLL		(1<<14)	// defined by the menu DLL
+#define FCVAR_CHEAT			(1<<15)	// can not be changed if cheats are disabled
 
-See the GNU General Public License for more details.
+// a1ba: let's reuse higher bits for flags extensions from now on
+#define FCVAR_LATCH			(1<<30)	// notify client what this cvar will be applied only after server restart (but don't does more nothing)
 
-You should have received a copy of the GNU General Public License
+typedef struct cvar_s
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-#ifndef CVAR
-#define CVAR
-
-#include STDINT_H
-#include "xash3d_types.h"
-
-/*
-
-cvar_t variables are used to hold scalar or string variables that can be changed
-or displayed at the console or prog code as well as accessed directly
-in C code.
-
-The user can access cvars from the console in three ways:
-r_draworder             prints the current value
-r_draworder 0           sets the current value to 0
-set r_draworder 0       as above, but creates the cvar if not present
-
-Cvars are restricted from having the same names as commands to keep this
-interface from being ambiguous.
-
-The are also occasionally used to communicated information between different
-modules of the program.
-
-*/
-
-enum
 {
-	// GoldSrc compatibility flags
+	char		*name;
-	FCVAR_ARCHIVE           = 1 << 0,  // set to cause it to be saved to vars.rc
+	char		*string;
-	FCVAR_USERINFO          = 1 << 1,  // added to userinfo when changed
+	int		flags;
-	FCVAR_SERVER            = 1 << 2,  // added to serverinfo when changed, will notify clients by default
+	float		value;
-	FCVAR_EXTDLL            = 1 << 3,  // defined by server.dll
+	struct cvar_s	*next;
-	FCVAR_CLIENTDLL         = 1 << 4,  // defined by client.dll
+} cvar_t;
-	FCVAR_PROTECTED         = 1 << 5,  // private server cvar
-	FCVAR_SPONLY            = 1 << 6,  // can be set only in singleplayer
-	FCVAR_PRINTABLEONLY     = 1 << 7,  // only allows printable characters
-	FCVAR_UNLOGGED          = 1 << 8,  // disables notifying client about server cvar change
-	FCVAR_NOEXTRAWHITESPACE = 1 << 9,  // removes space characters from the beginning and the end of the string
-	FCVAR_PRIVILEGED        = 1 << 10, // only available in privileged mode
-	FCVAR_FILTERABLE        = 1 << 11, // treated as privileged if cl_filterstuffcmd is 1, otherwise ignored
 
-	// Xash3D public flags
+#endif//CVARDEF_H
-	// FCVAR_LATCH         = 1 << 11, // deprecated Xash3D flag, conflicts with FCVAR_FILTERABLE. Use another FCVAR_LATCH!
-	FCVAR_GLCONFIG         = 1 << 12, // set to cause it to be saved to <renderer>.cfg (see RefAPI)
-	FCVAR_CHANGED          = 1 << 13, // set each time the cvar changed
-	FCVAR_GAMEUIDLL        = 1 << 14, // defined by menu.dll
-	FCVAR_CHEAT            = 1 << 15, // cannot be changed if sv_cheats is 0
-
-#if REF_DLL || ENGINE_DLL // Xash3D internal flags, MUST NOT be used outside of engine
-	FCVAR_RENDERINFO   = 1 << 16, // set to cause it to be saved to video.cfg
-	FCVAR_READ_ONLY    = 1 << 17, // display only, cannot be set by user at all
-	FCVAR_EXTENDED     = 1 << 18, // extended cvar structure
-	FCVAR_ALLOCATED    = 1 << 19, // allocated by the engine, must be freed with Mem_Free
-	FCVAR_VIDRESTART   = 1 << 20, // triggers video subsystem to recreate/modify window parameters
-	FCVAR_TEMPORARY    = 1 << 21, // only used to temporarly hold some value, can be unlinked
-	FCVAR_MOVEVARS     = 1 << 22, // access to movevars_t structure, synchornized between client and server
-	FCVAR_USER_CREATED = 1 << 23, // created by a set command
-
-	FCVAR_REFDLL     = 1 << 29, // (Xash3D FWGS internal flag) defined by the renderer DLL
-#endif // REF_DLL || ENGINE_DLL
-
-	FCVAR_LATCH      = 1 << 30, // (Xash3D FWGS public flag, was FCVAR_FILTERABLE in Xash3D) save changes until server restart
-};
-
-struct cvar_s {
-	char     *name;
-	char     *string;
-	uint32_t  flags;
-	float     value;
-	struct cvar_s *next;
-};
-typedef struct cvar_s cvar_t;
-
-STATIC_CHECK_SIZEOF( struct cvar_s, 20, 32 );
-
-#if REF_DLL || ENGINE_DLL // Xash3D internal cvar format, MUST NOT be used outside of engine
-struct convar_s {
-	char     *name;
-	char     *string;
-	uint32_t  flags;
-	float     value;
-	struct convar_s *next;
-	char     *desc;
-	char     *def_string;
-};
-typedef struct convar_s convar_t;
-
-#if XASH_64BIT
-#define CVAR_SENTINEL (uintptr_t)0xDEADBEEFDEADBEEF
-#else
-#define CVAR_SENTINEL (uintptr_t)0xDEADBEEF
-#endif
-
-#define CVAR_CHECK_SENTINEL( cv )	((uintptr_t)(cv)->next == CVAR_SENTINEL)
-
-#define CVAR_DEFINE( cv, cvname, cvstr, cvflags, cvdesc ) \
-	convar_t cv = { (char*)cvname, (char*)cvstr, cvflags, 0.0f, (void *)CVAR_SENTINEL, (char*)cvdesc, NULL }
-
-#define CVAR_DEFINE_AUTO( cv, cvstr, cvflags, cvdesc ) CVAR_DEFINE( cv, #cv, cvstr, cvflags, cvdesc )
-#endif // REF_DLL || ENGINE_DLL
-
-#endif // CVAR

common/defaults.h

@@ -52,6 +52,26 @@ SETUP BACKENDS DEFINITIONS
 				#endif
 			#endif // XASH_MESSAGEBOX
 		#endif
+	#elif XASH_ANDROID
+		// we are building for Android platform, use Android APIs
+		#ifndef XASH_VIDEO
+			#define XASH_VIDEO VIDEO_ANDROID
+		#endif // XASH_VIDEO
+
+		#ifndef XASH_INPUT
+			#define XASH_INPUT INPUT_ANDROID
+		#endif // XASH_INPUT
+
+		#ifndef XASH_SOUND
+			#define XASH_SOUND SOUND_OPENSLES
+		#endif // XASH_SOUND
+
+		#ifndef XASH_MESSAGEBOX
+			#define XASH_MESSAGEBOX MSGBOX_ANDROID
+		#endif // XASH_MESSAGEBOX
+
+		#define XASH_USE_EVDEV 1
+		#define XASH_DYNAMIC_DLADDR
 	#elif XASH_LINUX
 		// we are building for Linux without SDL2, can draw only to framebuffer yet
 		#ifndef XASH_VIDEO
@@ -151,8 +171,6 @@ Default build-depended cvar and constant values
 	#define DEFAULT_MODE_WIDTH   960
 	#define DEFAULT_MODE_HEIGHT  544
 	#define DEFAULT_ALLOWCONSOLE 1
-#elif XASH_ANDROID
-	#define DEFAULT_TOUCH_ENABLE "1"
 #elif XASH_MOBILE_PLATFORM
 	#define DEFAULT_TOUCH_ENABLE "1"
 	#define DEFAULT_M_IGNORE     "1"
@@ -186,11 +204,7 @@ Default build-depended cvar and constant values
 #endif // DEFAULT_ALLOWCONSOLE
 
 #ifndef DEFAULT_FULLSCREEN
-	#define DEFAULT_FULLSCREEN "1" // must be a string
+	#define DEFAULT_FULLSCREEN 1
 #endif // DEFAULT_FULLSCREEN
 
-#ifndef DEFAULT_MAX_EDICTS
-	#define DEFAULT_MAX_EDICTS 1200 // was 900 before HL25
-#endif // DEFAULT_MAX_EDICTS
-
 #endif // DEFAULTS_H

common/enginefeatures.h

@@ -1,5 +1,5 @@
 /*
-enginefeatures.h - engine features that can be enabled by mod-maker request
+features.h - engine features that can be enabled by mod-maker request
 Copyright (C) 2012 Uncle Mike
 
 This program is free software: you can redistribute it and/or modify
@@ -27,20 +27,4 @@ GNU General Public License for more details.
 #define ENGINE_COMPUTE_STUDIO_LERP	(1<<7)	// enable MOVETYPE_STEP lerping back in engine
 #define ENGINE_LINEAR_GAMMA_SPACE	(1<<8)	// disable influence of gamma/brightness cvars to textures/lightmaps, for mods with custom renderer
 
-#define ENGINE_DISABLE_HDTEXTURES   (1U<<30) // disable support of HD-textures in case custom renderer have separate way to load them
-#define ENGINE_STEP_POSHISTORY_LERP (1U<<31) // enable MOVETYPE_STEP interpolation based on position history. Incompatible with ENGINE_COMPUTE_STUDIO_LERP!
-
-// adjust the mask when features will be added or removed
-#define ENGINE_FEATURES_MASK      \
-	( ENGINE_WRITE_LARGE_COORD    \
-	| ENGINE_QUAKE_COMPATIBLE     \
-	| ENGINE_LOAD_DELUXEDATA      \
-	| ENGINE_PHYSICS_PUSHER_EXT   \
-	| ENGINE_LARGE_LIGHTMAPS      \
-	| ENGINE_COMPENSATE_QUAKE_BUG \
-	| ENGINE_IMPROVED_LINETRACE   \
-	| ENGINE_COMPUTE_STUDIO_LERP  \
-	| ENGINE_LINEAR_GAMMA_SPACE   \
-	| ENGINE_STEP_POSHISTORY_LERP )
-
 #endif//FEATURES_H

common/gameinfo.h

@@ -19,8 +19,6 @@ GNU General Public License for more details.
 #define GFL_NOMODELS	(1<<0)
 #define GFL_NOSKILLS	(1<<1)
 #define GFL_RENDER_PICBUTTON_TEXT   (1<<2)
-#define GFL_HD_BACKGROUND (1<<3)
-#define GFL_ANIMATED_TITLE (1<<4)
 
 /*
 ========================================================================
@@ -30,7 +28,7 @@ GAMEINFO stuff
 internal shared gameinfo structure (readonly for engine parts)
 ========================================================================
 */
-typedef struct GAMEINFO_s
+typedef struct
 {
 	// filesystem info
 	char		gamefolder[64];	// used for change game '-game x'
@@ -50,48 +48,4 @@ typedef struct GAMEINFO_s
 	int		gamemode;
 } GAMEINFO;
 
-/*
-========================================================================
-
-Extended GameInfo struct introduced in Xash3D FWGS
-
-GAMEINFO can't be reliably extended, as nor engine, nor menu can't be
-sure about struct size. By adding struct versioning, we can check the
-presense for extra fields.
-========================================================================
-*/
-
-#define GAMEINFO_VERSION 2
-
-typedef enum gametype_e
-{
-	GAME_NORMAL,
-	GAME_SINGLEPLAYER_ONLY,
-	GAME_MULTIPLAYER_ONLY,
-} gametype_t;
-
-typedef struct gameinfo2_s
-{
-	int gi_version; // should be set to desired struct version, e.g. GAMEINFO_VERSION
-
-	// filesystem info
-	char     gamefolder[64]; // used for change game
-	char     startmap[64];   // map to start singleplayer game from
-	char     trainmap[64];   // map to start hazardous course from (if specified)
-	char     demomap[64];    // map to start demo chapter from (if specified)
-	char     title[64];      // game title
-	char     iconpath[64];   // path to game icon
-	char     version[16];    // game version (optional)
-	uint32_t flags;          // gameinfo flags, extended to fit more flags
-
-	// mod info
-	char     game_url[256];   // link to a developer's site
-	char     update_url[256]; // link to updates page
-	char     type[64];        // single, toolkit, multiplayer, etc
-	char     date[64];        // release date
-	uint64_t size;            // size in bytes
-
-	gametype_t gamemode;
-} gameinfo2_t;
-
 #endif//GAMEINFO_H

common/kbutton.h

@@ -1,35 +1,18 @@
-/*
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
-Copyright (C) 1996-1997 Id Software, Inc.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-#ifndef KBUTTON_H
-#define KBUTTON_H
-
-// a1ba: copied from WinQuake/client.h
 //
-// cl_input
+// Purpose:
 //
-typedef struct
+// $NoKeywords: $
+//=============================================================================
+
+#if !defined( KBUTTONH )
+#define KBUTTONH
+#pragma once
+
+typedef struct kbutton_s
 {
 	int		down[2];		// key nums holding it down
 	int		state;			// low bit is down state
 } kbutton_t;
 
-STATIC_CHECK_SIZEOF( kbutton_t, 12, 12 );
+#endif // !KBUTTONH
-
-#endif // KBUTTON_H

common/net_api.h

@@ -27,7 +27,6 @@
 // Set this flag for things like broadcast requests, etc. where the engine should not
 // kill the request hook after receiving the first response
 #define FNETAPI_MULTIPLE_RESPONSE		( 1<<0 )
-#define FNETAPI_LEGACY_PROTOCOL			( 1<<1 ) // xash3d-fwgs extension
 
 struct net_response_s;
 typedef void (*net_api_response_func_t) ( struct net_response_s *response );
@@ -36,7 +35,6 @@ typedef void (*net_api_response_func_t) ( struct net_response_s *response );
 #define NET_ERROR_TIMEOUT			( 1<<0 )
 #define NET_ERROR_PROTO_UNSUPPORTED		( 1<<1 )
 #define NET_ERROR_UNDEFINED			( 1<<2 )
-#define NET_ERROR_FORBIDDEN			( 1<<3 ) // xash3d-fwgs extension
 
 typedef struct net_adrlist_s
 {

common/netadr.h

@@ -1,74 +1,76 @@
-/*
+/***
-Copyright (C) 1997-2001 Id Software, Inc.
+*
+*	Copyright (c) 1996-2002, Valve LLC. All rights reserved.
+*
+*	This product contains software technology licensed from Id
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc.
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
 
-This program is free software; you can redistribute it and/or
+#ifndef NETADR_H
-modify it under the terms of the GNU General Public License
+#define NETADR_H
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-
-#ifndef NET_ADR_H
-#define NET_ADR_H
 
+#include "build.h"
 #include STDINT_H
 
-// net.h -- quake's interface to the networking layer
+typedef enum
-// a1ba: copied from Quake-2/qcommon/qcommon.h and modified to support IPv6
-
-#define	PORT_ANY	-1
-
-typedef enum {NA_LOOPBACK = 1, NA_BROADCAST, NA_IP, NA_IPX, NA_BROADCAST_IPX, NA_IP6, NA_MULTICAST_IP6} netadrtype_t;
-
-/*
-Original Quake-2 structure:
-typedef struct
 {
-	netadrtype_t	type;
+	NA_UNUSED = 0,
+	NA_LOOPBACK,
+	NA_BROADCAST,
+	NA_IP,
+	NA_IPX,
+	NA_BROADCAST_IPX,
+	NA_IP6,
+	NA_MULTICAST_IP6, // all nodes multicast
+} netadrtype_t;
 
-	byte	ip[4];
+// Original structure:
-	byte	ipx[10];
+// typedef struct netadr_s
-
+// {
-	unsigned short	port;
+// 	netadrtype_t	type;
-} netadr_t;
+// 	unsigned char	ip[4];
-*/
+// 	unsigned char	ipx[10];
+// 	unsigned short	port;
+// } netadr_t;
 
 #pragma pack( push, 1 )
 typedef struct netadr_s
 {
 	union
 	{
-		// IPv6 struct
 		struct
 		{
-			uint16_t	type6;
+			uint32_t type;
-			uint8_t	ip6[16];
-		};
-		struct
-		{
-			uint32_t	type; // must be netadrtype_t but will break with short enums
 			union
 			{
-				uint8_t	ip[4];
+				uint8_t   ip[4];
-				uint32_t	ip4; // for easier conversions
+				uint32_t  ip4;
 			};
-			uint8_t	ipx[10];
+			uint8_t  ipx[10];
+		};
+		struct
+		{
+#if XASH_LITTLE_ENDIAN
+			uint16_t type6;
+			uint8_t ip6[16];
+#elif XASH_BIG_ENDIAN
+			uint8_t ip6_0[2];
+			uint16_t type6;
+			uint8_t ip6_2[14];
+#endif
 		};
 	};
-	uint16_t	port;
+	uint16_t port;
 } netadr_t;
 #pragma pack( pop )
 
-STATIC_CHECK_SIZEOF( netadr_t, 20, 20 );
+STATIC_ASSERT( sizeof( netadr_t ) == 20, "invalid netadr_t size" );
 
-#endif // NET_ADR_H
+#endif//NETADR_H

common/port.h

@@ -35,6 +35,7 @@ GNU General Public License for more details.
 	#define __cdecl
 	#define __stdcall
 	#define _inline	static inline
+	#define FORCEINLINE inline __attribute__((always_inline))
 
 	#if XASH_POSIX
 		#include <unistd.h>
@@ -62,6 +63,13 @@ GNU General Public License for more details.
 		int x, y;
 	} POINT;
 #else // WIN32
+	#ifdef __MINGW32__
+		#define _inline static inline
+		#define FORCEINLINE inline __attribute__((always_inline))
+	#else
+		#define FORCEINLINE __forceinline
+	#endif
+
 	#define open _open
 	#define read _read
 	#define alloca _alloca

common/r_efx.h

@@ -56,8 +56,6 @@ color24 gTracerColors[] =
 };
 */
 
-#define TRACER_COLORINDEX_DEFAULT 4
-
 // Temporary entity array
 #define TENTPRIORITY_LOW	0
 #define TENTPRIORITY_HIGH	1

common/render_api.h

@@ -107,8 +107,7 @@ typedef enum
 	TF_ARB_FLOAT	= (1<<26),	// float textures
 	TF_NOCOMPARE	= (1<<27),	// disable comparing for depth textures
 	TF_ARB_16BIT	= (1<<28),	// keep image as 16-bit (not 24)
-	TF_MULTISAMPLE	= (1<<29),	// multisampling texture
+	TF_MULTISAMPLE	= (1<<29)	// multisampling texture
-	TF_ALLOW_NEAREST = (1<<30),	// allows toggling nearest filtering for TF_NOMIPMAP textures
 } texFlags_t;
 
 typedef enum
@@ -230,7 +229,7 @@ typedef struct render_api_s
 	void		(*R_Reserved0)( void );
 
 	// static allocations
-	void		*(*pfnMemAlloc)( size_t cb, const char *filename, const int fileline ) ALLOC_CHECK( 1 );
+	void		*(*pfnMemAlloc)( size_t cb, const char *filename, const int fileline );
 	void		(*pfnMemFree)( void *mem, const char *filename, const int fileline );
 
  	// engine utils (not related with render API but placed here)

common/xash3d_types.h

@@ -28,7 +28,11 @@ typedef byte		rgb_t[3];		// unsigned byte colorpack
 typedef vec_t		matrix3x4[3][4];
 typedef vec_t		matrix4x4[4][4];
 
+#if XASH_64BIT
 typedef uint32_t        poolhandle_t;
+#else
+typedef void*           poolhandle_t;
+#endif
 
 #undef true
 #undef false
@@ -53,7 +57,9 @@ typedef uint64_t longtime_t;
 #define MAX_USERMSG_LENGTH	2048	// don't modify it's relies on a client-side definitions
 
 #define BIT( n )		( 1U << ( n ))
-#define BIT64( n )		( 1ULL << ( n ))
+#define GAMMA		( 2.2f )		// Valve Software gamma
+#define INVGAMMA		( 1.0f / 2.2f )	// back to 1.0
+#define TEXGAMMA		( 0.9f )		// compensate dim textures
 #define SetBits( iBitVector, bits )	((iBitVector) = (iBitVector) | (bits))
 #define ClearBits( iBitVector, bits )	((iBitVector) = (iBitVector) & ~(bits))
 #define FBitSet( iBitVector, bit )	((iBitVector) & (bit))
@@ -70,95 +76,48 @@ typedef uint64_t longtime_t;
 #define IsColorString( p )	( p && *( p ) == '^' && *(( p ) + 1) && *(( p ) + 1) >= '0' && *(( p ) + 1 ) <= '9' )
 #define ColorIndex( c )	((( c ) - '0' ) & 7 )
 
-#if defined( __GNUC__ )
+#if defined(__GNUC__)
-	#if defined( __i386__ )
+	#ifdef __i386__
-		#define EXPORT         __attribute__(( visibility( "default" ), force_align_arg_pointer ))
+		#define EXPORT __attribute__ ((visibility ("default"),force_align_arg_pointer))
-		#define GAME_EXPORT    __attribute(( force_align_arg_pointer ))
+		#define GAME_EXPORT __attribute((force_align_arg_pointer))
 	#else
-		#define EXPORT         __attribute__(( visibility ( "default" )))
+		#define EXPORT __attribute__ ((visibility ("default")))
 		#define GAME_EXPORT
 	#endif
-
+	#define _format(x) __attribute__((format(printf, x, x+1)))
-	#define MALLOC __attribute__(( malloc ))
+	#define NORETURN __attribute__((noreturn))
-
+#elif defined(_MSC_VER)
-	// added in GCC 11
+	#define EXPORT          __declspec( dllexport )
-	#if __GNUC__ >= 11
-		// might want to set noclone due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116893
-		// but it's easier to not force mismatched-dealloc to error yet
-		#define MALLOC_LIKE( x, y ) __attribute__(( malloc( x, y )))
-	#else
-		#define MALLOC_LIKE( x, y ) MALLOC
-	#endif
-	#define NORETURN           __attribute__(( noreturn ))
-	#define NONNULL            __attribute__(( nonnull ))
-	#define _format( x )       __attribute__(( format( printf, x, x + 1 )))
-	#define ALLOC_CHECK( x )   __attribute__(( alloc_size( x )))
-	#define NO_ASAN            __attribute__(( no_sanitize( "address" )))
-	#define WARN_UNUSED_RESULT __attribute__(( warn_unused_result ))
-	#define RENAME_SYMBOL( x ) asm( x )
-#else
-	#if defined( _MSC_VER )
-		#define EXPORT         __declspec( dllexport )
-		#define NO_ASAN        __declspec( no_sanitize_address )
-	#else
-		#define EXPORT
-		#define NO_ASAN
-	#endif
 	#define GAME_EXPORT
+	#define _format(x)
+	#define NORETURN
+#else
+	#define EXPORT
+	#define GAME_EXPORT
+	#define _format(x)
 	#define NORETURN
-	#define NONNULL
-	#define _format( x )
-	#define ALLOC_CHECK( x )
-	#define RENAME_SYMBOL( x )
-	#define MALLOC
-	#define MALLOC_LIKE( x, y )
-	#define WARN_UNUSED_RESULT
 #endif
 
-#if __GNUC__ >= 3
+#if ( __GNUC__ >= 3 )
-	#define unlikely( x )     __builtin_expect( x, 0 )
+	#define unlikely(x) __builtin_expect(x, 0)
-	#define likely( x )       __builtin_expect( x, 1 )
+	#define likely(x)   __builtin_expect(x, 1)
 #elif defined( __has_builtin )
-	#if __has_builtin( __builtin_expect ) // this must be after defined() check
+	#if __has_builtin( __builtin_expect )
-		#define unlikely( x )     __builtin_expect( x, 0 )
+		#define unlikely(x) __builtin_expect(x, 0)
-		#define likely( x )       __builtin_expect( x, 1 )
+		#define likely(x)   __builtin_expect(x, 1)
+	#else
+		#define unlikely(x) (x)
+		#define likely(x)   (x)
 	#endif
-#endif
-
-#if !defined( unlikely ) || !defined( likely )
-	#define unlikely( x ) ( x )
-	#define likely( x )   ( x )
-#endif
-
-#if __STDC_VERSION__ >= 202311L || __cplusplus >= 201103L // C23 or C++ static_assert is a keyword
-	#define STATIC_ASSERT_( ignore, x, y ) static_assert( x, y )
-	#define STATIC_ASSERT  static_assert
-#elif __STDC_VERSION__ >= 201112L // in C11 it's _Static_assert
-	#define STATIC_ASSERT_( ignore, x, y ) _Static_assert( x, y )
-	#define STATIC_ASSERT  _Static_assert
 #else
-	#define STATIC_ASSERT_( id, x, y ) extern int id[( x ) ? 1 : -1]
+	#define unlikely(x) (x)
-	// need these to correctly expand the line macro
+	#define likely(x)   (x)
-	#define STATIC_ASSERT_3( line, x, y ) STATIC_ASSERT_( static_assert_ ## line, x, y )
-	#define STATIC_ASSERT_2( line, x, y ) STATIC_ASSERT_3( line, x, y )
-	#define STATIC_ASSERT( x, y ) STATIC_ASSERT_2( __LINE__, x, y )
 #endif
 
-// at least, statically check size of some public structures
+#if defined( static_assert ) // C11 static_assert
-#if XASH_64BIT
+#define STATIC_ASSERT static_assert
-#define STATIC_CHECK_SIZEOF( type, size32, size64 ) \
-	STATIC_ASSERT( sizeof( type ) == size64, #type " unexpected size" )
 #else
-#define STATIC_CHECK_SIZEOF( type, size32, size64 ) \
+#define STATIC_ASSERT( x, y ) extern int _static_assert_##__LINE__[( x ) ? 1 : -1]
-	STATIC_ASSERT( sizeof( type ) == size32, #type " unexpected size" )
-#endif
-
-#if !defined( __cplusplus ) && __STDC_VERSION__ >= 199101L // not C++ and C99 or newer
-	#define XASH_RESTRICT restrict
-#elif _MSC_VER || __GNUC__ || __clang__ // compiler-specific extensions
-	#define XASH_RESTRICT __restrict
-#else
-	#define XASH_RESTRICT // nothing
 #endif
 
 #ifdef XASH_BIG_ENDIAN
@@ -191,9 +150,8 @@ _inline float LittleFloat( float f )
 #endif
 
 
-typedef unsigned int  dword;
+typedef unsigned int	dword;
-typedef unsigned int  uint;
+typedef unsigned int	uint;
-typedef unsigned long ulong;
 typedef char		string[MAX_STRING];
 typedef struct file_s	file_t;		// normal file
 typedef struct stream_s	stream_t;		// sound stream for background music playing
@@ -219,7 +177,6 @@ typedef struct dll_info_s
 } dll_info_t;
 
 typedef void (*setpair_t)( const char *key, const void *value, const void *buffer, void *numpairs );
-typedef void *(*pfnCreateInterface_t)( const char *, int * );
 
 // config strings are a general means of communication from
 // the server to all connected clients.

contrib/mittorn/Makefile.linux

@@ -0,0 +1,206 @@
+#############################################
+# Makefile.linux - linux makefile
+# Copyright (C) 2017 mittorn
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+##############################################
+
+# Default options - optimized to debug on local machine
+CC ?= gcc
+CXX ?= g++
+CFLAGS ?= -g -O1 -fsigned-char -Wall -Wextra -Wsign-compare -Wno-unknown-pragmas -Wno-missing-field-initializers -Wno-unused-parameter -Wno-unused-but-set-variable
+LDFLAGS =
+LBITS := $(shell getconf LONG_BIT)
+DEPS :=
+
+XASH_COMMIT := $(firstword $(shell git rev-parse --short=6 HEAD) unknown)
+
+ifeq ($(XASH_COMMIT),unknown)
+$(warning You seems to build xash3d without git)
+$(warning Please use git if you are going to publish your build)
+endif
+
+# Pass 64BIT=1 to make arguments to allow amd64 builds
+ifneq ($(64BIT),1)
+	ifeq ($(LBITS),64)
+		LDFLAGS += -m32
+		CFLAGS += -m32
+	endif
+endif
+
+TOPDIR = $(PWD)/..
+INCLUDES :=
+XASH_SINGLE_BINARY ?= 1
+INSTALL_DIR ?= ./install/
+ifeq ($(NANOGL),1)
+INCLUDES += -Inanogl -Inanogl/GL
+endif
+INCLUDES += -I/usr/include/SDL2 -Icommon -I../common -I. -I../pm_shared -Iclient -Iserver -Iclient/vgui -Icommon/sdl
+
+#############################
+# Preprocessor defines:
+#############################
+DEFINES = 
+
+# Specify commit hash in version string
+DEFINES += -DXASH_BUILD_COMMIT=\"$(XASH_COMMIT)\"
+
+
+# Only SDL backend exists on linux
+ifeq ($(XASH_DEDICATED),1)
+   DEFINES += -DXASH_DEDICATED
+else
+   DEFINES += -DXASH_SDL
+   LIBS += -lSDL2
+endif
+
+#############################################
+# GL/GLES translators.
+# You need clone it to engine folder to use
+# Only one translator should be enabled
+#############################################
+ifeq ($(NANOGL),1)
+DEFINES += -DXASH_NANOGL -D__MULTITEXTURE_SUPPORT__  -DEGL_LIB=\"libEGL.so\"
+endif
+
+ifeq ($(WES),1)
+DEFINES += -DXASH_WES -D__MULTITEXTURE_SUPPORT__  -DEGL_LIB=\"libEGL.so\"
+endif
+
+ifeq ($(REGAL),1)
+DEFINES += -DXASH_REGAL -D__MULTITEXTURE_SUPPORT__  -DEGL_LIB=\"regal/lib/linux-32/libRegal.so\"
+LIBS += regal/lib/linux-32/libRegal.so
+endif
+
+# Some libc implementations cannot use libdl in static builds, so disable it by default
+ifeq ($(XASH_STATIC),1)
+
+    ifneq ($(XASH_STATIC_LIBDL),1)
+	DEFINES += -DNO_LIBDL
+    endif
+
+    XASH_SINGLE_BINARY := 1
+endif
+
+ifneq ($(XASH_STATIC),1)
+    LIBS += -ldl
+endif
+
+ifeq ($(XASH_STATIC_LIBDL),1)
+    LIBS += -ldl
+endif
+
+LIBS += -lm -pthread
+
+
+ifeq ($(XASH_SINGLE_BINARY),1)
+    DEFINES += -DSINGLE_BINARY
+endif
+
+# Collect files
+SRCS_CPP =
+SRCS = $(wildcard server/*.c) $(wildcard client/vgui/*.c) $(wildcard client/avi/*.c) $(wildcard common/*.c) $(wildcard common/imagelib/*.c) $(wildcard common/soundlib/*.c) $(wildcard common/soundlib/libmpg/*.c)
+ifneq ($(XASH_DEDICATED),1)
+	SRCS += $(wildcard client/*.c)
+	SRCS += $(wildcard platform/sdl/*.c)
+	ifeq ($(WES),1)
+		SRCS += $(wildcard gl-wes-v2/src/*.c)
+	endif
+	ifeq ($(NANOGL),1)
+		SRCS_CPP += $(wildcard nanogl/*.cpp)
+	endif
+endif
+OBJS = $(patsubst %.c,obj/%.o,$(SRCS))
+OBJS_CPP = $(patsubst %.cpp,obj/%.o,$(SRCS_CPP))
+
+#################################
+# Windows DLL loader
+# Should be enabled only on i386 builds
+#################################
+LOADER :=
+ifeq ($(XASH_DLL_LOADER),1)
+	DEFINES += -DDLL_LOADER
+	ifeq ($(XASH_SINGLE_BINARY),1)
+		LOADER = libloader.a
+	else
+		LOADER = libloader.so
+	endif
+	DEPS += $(LOADER)
+	LIBS += $(LOADER)
+endif
+
+# Rules for binaries
+ifeq ($(XASH_SINGLE_BINARY),0)
+	BINARIES = libxash.so
+libxash.so : $(OBJS) $(OBJS_CPP) $(DEPS)
+		$(CC) -fvisibility=hidden -o libxash.so $(LDFLAGS) -shared $(OBJS) $(OBJS_CPP) $(LIBS)
+
+else
+BINARIES = xash
+xash: $(OBJS) $(OBJS_CPP) $(DEPS)
+ifeq ($(XASH_STATIC),1)
+		$(CC) -o xash -static $(LDFLAGS) $(OBJS) $(OBJS_CPP) $(LIBS)
+else
+		$(CC) -o xash -fvisibility=hidden $(LDFLAGS) $(OBJS) $(OBJS_CPP) $(LIBS)
+endif
+
+endif
+
+ifeq ($(XASH_DLL_LOADER),1)
+$(LOADER):
+	$(MAKE) -f ../loader/Makefile.linux -C ../loader $(LOADER)
+	cp ../loader/$(LOADER) .
+endif
+
+# Create dirs for object files
+DIRS := obj obj/server obj/client/avi obj/client/vgui obj/common/sdl obj/common/imagelib obj/common/soundlib/libmpg obj/platform/sdl obj/nanogl
+$(OBJS): | $(DIRS)
+
+$(DIRS) :
+	mkdir -p $(DIRS)
+
+# Object rules
+obj/%.o : %.c
+	$(CC) $(CFLAGS) $(INCLUDES) $(DEFINES) -c "$<" -o "$@"  -Wno-unused-result -fvisibility=hidden
+
+obj/%.o : %.cpp
+	$(CXX) $(CFLAGS) $(INCLUDES) $(DEFINES) -c "$<" -o "$@"
+
+
+default: $(BINARIES)
+
+.PHONY: depend clean list install
+
+clean:
+	$(RM) $(OBJS) $(OBJS_CPP) $(BINARIES) ../loader/*.o ../loader/*.a ../loader/*.so $(LOADER)
+
+list:
+	@echo Sources:
+	@echo $(SRCS)
+	@echo C++ Sources:
+	@echo $(SRCS_CPP)
+	@echo Objects:
+	@echo $(OBJS) $(OBJS_CPP)
+	@echo Dirs:
+	@echo $(DIRS)
+	@echo Dependencies:
+	@echo $(DEPS)
+
+# Simple install rule
+install: $(BINARIES)
+	mkdir -p $(INSTALL_DIR)
+
+ifeq ($(XASH_SINGLE_BINARY),1)
+	cp xash $(INSTALL_DIR)/xash_bin
+else
+	cp libxash.so $(INSTALL_DIR)/
+	cp libloader.so $(INSTALL_DIR)/
+endif

contrib/mittorn/README.md

@@ -0,0 +1,269 @@
+**Table of Contents**  *generated with [DocToc](http://doctoc.herokuapp.com/)*
+
+- [Building](#building)
+        - [Manual build (without CMake)](#manual-build-without-cmake)
+                - [Building Engine](#building-engine)
+                - [Building launch binary](#building-launch-binary)
+        - [Building on Windows](#building-on-windows)
+                - [Visual Studio 2013 (recommended for Windows)](#visual-studio-2013-recommended-for-windows)
+                - [Visual Studio 6](#visual-studio-6)
+                - [MinGW](#mingw)
+        - [Building Game mods](#building-game-mods)
+                - [Linux](#linux)
+                        - [microndk](#microndk)
+                        - [Makefile.linux](#makefile-linux)
+                - [Windows](#windows)
+- [Running](#running)
+        - [Manual running](#manual-running)
+        - [Running with GDB](#running-with-gdb)
+        - [Using DLL Loader](#using-dll-loader)
+        - [Running MinGW builds](#running-mingw-builds)
+                - [Running MinGW builds under GDB](#running-mingw-builds-under-gdb)
+
+# Building
+
+## Manual build (without CMake)
+
+### Building engine
+
+Clone Xash3D repository using git:
+
+    git clone https://github.com/FWGS/xash3d
+
+Move to the Xash3D folder:
+
+    cd xash3d/engine
+
+    make -f Makefile.linux XASH_VGUI=1
+
+or same for dedicated
+
+    make -f Makefile.linux XASH_DEDICATED=1
+
+To enable dll support on linux, build loader library:
+
+    cd ../loader
+    make -f Makefile.linux libloader.so libloader.a
+    cp libloader.so libloader.a ../engine/
+
+And built engine with XASH_DLL_LOADER=1:
+
+    cd ../engine
+    make -f Makefile.linux XASH_VGUI=1 XASH_SDL=1 XASH_DLL_LOADER=1
+
+or same for dedicated server
+
+    cd ../engine
+    make -f Makefile.linux XASH_DEDICATED=1 XASH_DLL_LOADER=1
+
+### Building engine in separate library
+
+Some old distros does not support hidden symbol visibility
+This results in crash when loading server library
+
+Building launch binary
+
+    cd (xash3d)/game_launch
+    gcc xash.c -o xash -ldl -lrt -lm
+
+Building engine library:
+
+    make -f Makefile.linux XASH_SINGLE_BINARY=0
+
+## Building on Windows
+
+### Visual Studio 2013 (recommended for Windows)
+
+Download latest prebuilt SDL2 from
+
+https://www.libsdl.org/release/SDL2-devel-2.0.4-VC.zip
+
+Unzip and rename `SDL2-2.0.4` folder to `SDL2` and put it next to xash3d project folder.
+
+    ..\xash3d\
+    ..\SDL2\
+
+Open `xash.sln` with Visual Studio 2013 and make a build. After building, copy contents of `Debug` or
+`Release` folder to directory you choose. Copy `valve` folder and `vgui.dll` from your Half Life game
+installation folder and `SDL2.dll` form `\SDL2\lib\x86\` to it.
+Move `vgui_support.dll` into `valve` folder.
+
+    ..\valve\
+    ..\valve\vgui_support.dll
+    ..\menu.dll
+    ..\SDL2.dll
+    ..\vgui.dll
+    ..\xash.dll
+    ..\xash.exe
+
+Now you good to go, just run `xash.exe`.
+
+### Visual Studio 6
+
+This is legacy configuration, but msvc6 seems to generate more stable and more effective code
+
+Setup your msvc6 enviroment, unpack SDL2-2.0.4 to xash3d folder and do:
+
+    cd (xash3d)\engine
+    ..\msvc6\build.bat
+    cd (xash3d)\game_launch
+    ..\msvc6\build_launch.bat
+
+### MinGW
+
+The most effective configuration, but maybe unstable.
+Setup your MinGW environment and run:
+
+    cd (xash3d)\engine\
+    CC=gcc mingw32-make -f Makefile.mingw
+
+    engine will be built to single exe binary
+
+## Building game mods
+
+### Linux
+
+#### microndk
+
+All mods that ported to android may be build to linux using Android.mk with microndk:
+
+[https://github.com/SDLash3D/microndk]
+
+Clone microndk repo somewhere, change xash3d_config to preffered configuration (change arch to x86
+for example)
+
+Go to dlls folder if you are building server or cl_dlls if you are building client and do:
+
+    make -f /path/to/microndk/microndk.mk -j4
+
+Do:
+
+    make -f /path/to/microndk/microndk.mk -j4 clean
+
+every time when you build client after building server
+
+#### Makefile.linux
+
+### Windows
+
+On windows common way is using Visual Studio as many mods does not correctly work with mingw.
+
+Just open project and build it.
+
+Other is using mingw and microndk, but it was not tested yet.
+
+hlsdk-xash3d based mods may work fine with mingw.
+
+You may use microndk to build it. Build process is very similar to linux one.
+
+After setting up MinGW enviroment, do:<br>
+`mingw32-make -f \path\to\microndk\Microndk.mk`
+
+to build 64-bit library, use:<br>
+`mingw32-make -f \path\to\microndk\Microndk.mk 64BIT=1`
+
+Edit xash3d_config.mk to set optimal CFLAGS if you are running server
+
+# Running
+
+Copy **valve** folder from Half-Life:
+
+    cp -r $HOME/.steam/steam/steamapps/common/Half-Life/valve $HOME/Games/Xash3D
+
+**NOTE**: If you build with CMake, you can now use `make install`. It will install binaries where
+they must be located. So just run `xash3d` from command line in directory where is gamedata is located.
+For additional info look to the CMakeLists.txt in repo root and xash3d.sh script.
+
+After a successful build, copy the next files to some other directory where you want to run Xash3D:
+
+    cp engine/libxash.so game_launch/xash3d mainui/libxashmenu.so $HOME/Games/Xash3D
+
+If you built it with XASH_VGUI, also copy vgui.so:
+
+    cp ../hlsdk/linux/vgui.so vgui_support/libvgui_support.so $HOME/Games/Xash3D
+
+Copy script:
+
+    cp ../xash3d.sh $HOME/Games/Xash3D
+
+Run:
+
+    cd $HOME/Games/Xash3D
+    ./xash3d.sh
+
+## Manual running
+
+Put xash3d binaries and vgui(optionally) to you game data directory and run:
+
+    LD_LIBRARY_PATH=. ./xash -dev 5
+
+## Running under GDB
+
+    LD_LIBRARY_PATH=. gdb --args ./xash -dev 5
+
+## Using DLL Loader
+
+Put vgui_support.dll from windows build to your game data folder and run:
+
+    LD_LIBRARY_PATH=. ./xash -dev 5 -vguilib vgui.dll -clientlib valve/cl_dlls/client.dll -dll dlls/hl.dll
+
+## Running MinGW builds
+
+Put exe file to your game data directory
+
+    cd (game)\
+    xash_bin -dev 5
+
+### Running MinGW builds under GDB
+
+    gdb --args ./xash_bin.exe -dev 5
+
+# Useful GDB commands
+
+Start or restart process:
+
+    (gdb) r
+
+Show backtrace:
+
+    (gdb) bt
+
+Full backtrace:
+
+    (gdb) bt full
+
+Continue execution:
+
+    (gdb) c
+
+Recover from segmentation fault:
+
+Skipping function:
+
+    (gdb) handle SIGSEGV nopass
+    (gdb) ret
+    (gdb) c
+
+Restart frame for beginning:
+
+    (gdb) handle SIGSEGV nopass
+    (gdb) jump *Host_AbortCurrentFrame
+Anti-Crash script (useful for scripting servers):
+```
+cd /path/to/rootdir
+file xash
+set args xash -dev 5 -nowcon
+handle SIGSEGV nopass
+catch signal SIGSEGV
+set $crashes=0
+commands
+print $crashes++
+if $crashes > 500
+set $crashes=0
+run
+else
+jump *Host_AbortCurrentFrame
+end
+end
+run
+```

contrib/mittorn/setup.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+SCRIPTDIR=$(dirname "$0")
+TOPDIR=$SCRIPTDIR/../../
+cp $SCRIPTDIR/Makefile.dllloader $TOPDIR/loader/
+cp $SCRIPTDIR/Makefile.emscripten $TOPDIR/engine/
+cp $SCRIPTDIR/Makefile.linux $TOPDIR/engine/
+cp $SCRIPTDIR/wscript $TOPDIR/engine/

contrib/mittorn/wscript

@@ -0,0 +1,73 @@
+#! /usr/bin/env python
+# encoding: utf-8
+# mittorn, 2018
+
+VERSION='0.99'
+APPNAME='xash3d-fwgs'
+
+top = '.'
+
+def options(opt):
+	opt.load('compiler_c')
+#	opt.load('msvs')
+	opt.add_option('--dedicated', action = 'store_true', help = 'build dedicated server only' )
+	opt.add_option('--64bits', dest = 'amd64', action = 'store_true', help = 'build 64-bit engine on x86_64' )
+
+
+        
+def configure(conf):
+	conf.load('compiler_c')
+	conf.env.append_unique('CFLAGS', '-O2')
+	conf.env.append_unique('DEFINES', 'SINGLE_BINARY')
+	conf.env.append_value('LINKFLAGS', '-ldl')
+	conf.env.append_value('LINKFLAGS', '-lm')
+	conf.env.append_value('LINKFLAGS', '-pthread')
+
+	# check for 64-bit builds
+	# TODO: check 32-bit toolchain and dependencies
+	if conf.env.DEST_CPU == 'x86_64' and not conf.options.amd64:
+		conf.env.append_value('LINKFLAGS', '-m32')
+		conf.env.append_value('CFLAGS', '-m32')
+		print('NOTE: will build engine with 64-bit toolchain using -m32')
+	else:
+		print('Warning: 64bit engine may be unstable')
+
+	# check for dedicated server build
+	if conf.options.dedicated:
+		conf.env.append_unique('DEFINES', 'XASH_DEDICATED')
+		conf.env.dedicated = True
+	else:
+		# TODO: add way to specify SDL2 path, move to separate function
+		try:
+			conf.check_cfg(path='sdl2-config', args='--cflags --libs', package='', msg='Checking for SDL2', uselib_store='SDL2')
+		except conf.errors.ConfigurationError:
+			conf.fatal('SDL2 not availiable! If you want to build dedicated server, specify --dedicated')
+		conf.env.append_unique('DEFINES', 'XASH_SDL')
+
+def build(bld):
+	# basic build: dedicated only, no dependencies
+	use = [];
+	source = bld.path.ant_glob([
+		'common/*.c',
+		'common/imagelib/*.c',
+		'common/soundlib/*.c',
+		'common/soundlib/libmpg/*.c',
+		'server/*.c'])
+
+	# add client files and sdl2 library
+	if not bld.env.dedicated:
+		use += ['SDL2']
+		source += bld.path.ant_glob([
+			'client/*.c',
+			'client/vgui/*.c',
+			'client/avi/*.c',
+			'platform/sdl/*.c'])
+
+
+	bld(
+		target = 'xash',
+		features = 'c cprogram',
+		includes = ['../common', '../pm_shared', 'common', 'server', 'client', 'client/vgui', '.' ],
+		source = source,
+		use = use
+	)

engine/alias.h

@@ -74,7 +74,7 @@ typedef struct
 	float		size;
 } daliashdr_t;
 
-STATIC_CHECK_SIZEOF( daliashdr_t, 84, 84 );
+STATIC_ASSERT( sizeof( daliashdr_t ) == 84, "invalid daliashdr_t size" );
 
 typedef struct
 {
@@ -83,7 +83,7 @@ typedef struct
 	int32_t		t;
 } stvert_t;
 
-STATIC_CHECK_SIZEOF( stvert_t, 12, 12 );
+STATIC_ASSERT( sizeof( stvert_t ) == 12, "invalid stvert_t size" );
 
 typedef struct dtriangle_s
 {
@@ -91,7 +91,7 @@ typedef struct dtriangle_s
 	int32_t		vertindex[3];
 } dtriangle_t;
 
-STATIC_CHECK_SIZEOF( dtriangle_t, 16, 16 );
+STATIC_ASSERT( sizeof( dtriangle_t ) == 16, "invalid dtriangle_t size" );
 
 #define DT_FACES_FRONT	0x0010
 #define ALIAS_ONSEAM	0x0020
@@ -103,7 +103,7 @@ typedef struct
 	char		name[16];	// frame name from grabbing
 } daliasframe_t;
 
-STATIC_CHECK_SIZEOF( daliasframe_t, 24, 24 );
+STATIC_ASSERT( sizeof( daliasframe_t ) == 24, "invalid daliasframe_t size" );
 
 typedef struct
 {
@@ -112,41 +112,41 @@ typedef struct
 	trivertex_t	bboxmax;	// lightnormal isn't used
 } daliasgroup_t;
 
-STATIC_CHECK_SIZEOF( daliasgroup_t, 12, 12 );
+STATIC_ASSERT( sizeof( daliasgroup_t ) == 12, "invalid daliasgrou_t size" );
 
 typedef struct
 {
 	int32_t		numskins;
 } daliasskingroup_t;
 
-STATIC_CHECK_SIZEOF( daliasskingroup_t, 4, 4 );
+STATIC_ASSERT( sizeof( daliasskingroup_t ) == 4, "invalid daliasskingroup_t size" );
 
 typedef struct
 {
 	float		interval;
 } daliasinterval_t;
 
-STATIC_CHECK_SIZEOF( daliasinterval_t, 4, 4 );
+STATIC_ASSERT( sizeof( daliasinterval_t ) == 4, "invalid daliasinterval_t size" );
 
 typedef struct
 {
 	float		interval;
 } daliasskininterval_t;
 
-STATIC_CHECK_SIZEOF( daliasskininterval_t, 4, 4 );
+STATIC_ASSERT( sizeof( daliasskininterval_t ) == 4, "invalid daliasskininterval_t size" );
 
 typedef struct
 {
 	uint32_t	type; // was aliasframetype_t
 } daliasframetype_t;
 
-STATIC_CHECK_SIZEOF( daliasframetype_t, 4, 4 );
+STATIC_ASSERT( sizeof( daliasframetype_t ) == 4, "invalid daliasframetype_t size" );
 
 typedef struct
 {
 	uint32_t	type; // was aliasskintype_t
 } daliasskintype_t;
 
-STATIC_CHECK_SIZEOF( daliasskintype_t, 4, 4 );
+STATIC_ASSERT( sizeof( daliasskintype_t ) == 4, "invalid daliasskintype_t size" );
 
 #endif//ALIAS_H

engine/anorms.h

@@ -1,181 +1,177 @@
-/*
+/***
-Copyright (C) 1996-1997 Id Software, Inc.
+*
+*	Copyright (c) 1996-2002, Valve LLC. All rights reserved.
+*
+*	This product contains software technology licensed from Id
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc.
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
 
-This program is free software; you can redistribute it and/or
+{-0.525731, 0.000000, 0.850651},
-modify it under the terms of the GNU General Public License
+{-0.442863, 0.238856, 0.864188},
-as published by the Free Software Foundation; either version 2
+{-0.295242, 0.000000, 0.955423},
-of the License, or (at your option) any later version.
+{-0.309017, 0.500000, 0.809017},
-
+{-0.162460, 0.262866, 0.951056},
-This program is distributed in the hope that it will be useful,
+{0.000000, 0.000000, 1.000000},
-but WITHOUT ANY WARRANTY; without even the implied warranty of
+{0.000000, 0.850651, 0.525731},
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+{-0.147621, 0.716567, 0.681718},
-
+{0.147621, 0.716567, 0.681718},
-See the GNU General Public License for more details.
+{0.000000, 0.525731, 0.850651},
-
+{0.309017, 0.500000, 0.809017},
-You should have received a copy of the GNU General Public License
+{0.525731, 0.000000, 0.850651},
-along with this program; if not, write to the Free Software
+{0.295242, 0.000000, 0.955423},
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+{0.442863, 0.238856, 0.864188},
-
+{0.162460, 0.262866, 0.951056},
-*/
+{-0.681718, 0.147621, 0.716567},
-{-0.525731, 0.000000, 0.850651}, 
+{-0.809017, 0.309017, 0.500000},
-{-0.442863, 0.238856, 0.864188}, 
+{-0.587785, 0.425325, 0.688191},
-{-0.295242, 0.000000, 0.955423}, 
+{-0.850651, 0.525731, 0.000000},
-{-0.309017, 0.500000, 0.809017}, 
+{-0.864188, 0.442863, 0.238856},
-{-0.162460, 0.262866, 0.951056}, 
+{-0.716567, 0.681718, 0.147621},
-{0.000000, 0.000000, 1.000000}, 
+{-0.688191, 0.587785, 0.425325},
-{0.000000, 0.850651, 0.525731}, 
+{-0.500000, 0.809017, 0.309017},
-{-0.147621, 0.716567, 0.681718}, 
+{-0.238856, 0.864188, 0.442863},
-{0.147621, 0.716567, 0.681718}, 
+{-0.425325, 0.688191, 0.587785},
-{0.000000, 0.525731, 0.850651}, 
+{-0.716567, 0.681718, -0.147621},
-{0.309017, 0.500000, 0.809017}, 
+{-0.500000, 0.809017, -0.309017},
-{0.525731, 0.000000, 0.850651}, 
+{-0.525731, 0.850651, 0.000000},
-{0.295242, 0.000000, 0.955423}, 
+{0.000000, 0.850651, -0.525731},
-{0.442863, 0.238856, 0.864188}, 
+{-0.238856, 0.864188, -0.442863},
-{0.162460, 0.262866, 0.951056}, 
+{0.000000, 0.955423, -0.295242},
-{-0.681718, 0.147621, 0.716567}, 
+{-0.262866, 0.951056, -0.162460},
-{-0.809017, 0.309017, 0.500000}, 
+{0.000000, 1.000000, 0.000000},
-{-0.587785, 0.425325, 0.688191}, 
+{0.000000, 0.955423, 0.295242},
-{-0.850651, 0.525731, 0.000000}, 
+{-0.262866, 0.951056, 0.162460},
-{-0.864188, 0.442863, 0.238856}, 
+{0.238856, 0.864188, 0.442863},
-{-0.716567, 0.681718, 0.147621}, 
+{0.262866, 0.951056, 0.162460},
-{-0.688191, 0.587785, 0.425325}, 
+{0.500000, 0.809017, 0.309017},
-{-0.500000, 0.809017, 0.309017}, 
+{0.238856, 0.864188, -0.442863},
-{-0.238856, 0.864188, 0.442863}, 
+{0.262866, 0.951056, -0.162460},
-{-0.425325, 0.688191, 0.587785}, 
+{0.500000, 0.809017, -0.309017},
-{-0.716567, 0.681718, -0.147621}, 
+{0.850651, 0.525731, 0.000000},
-{-0.500000, 0.809017, -0.309017}, 
+{0.716567, 0.681718, 0.147621},
-{-0.525731, 0.850651, 0.000000}, 
+{0.716567, 0.681718, -0.147621},
-{0.000000, 0.850651, -0.525731}, 
+{0.525731, 0.850651, 0.000000},
-{-0.238856, 0.864188, -0.442863}, 
+{0.425325, 0.688191, 0.587785},
-{0.000000, 0.955423, -0.295242}, 
+{0.864188, 0.442863, 0.238856},
-{-0.262866, 0.951056, -0.162460}, 
+{0.688191, 0.587785, 0.425325},
-{0.000000, 1.000000, 0.000000}, 
+{0.809017, 0.309017, 0.500000},
-{0.000000, 0.955423, 0.295242}, 
+{0.681718, 0.147621, 0.716567},
-{-0.262866, 0.951056, 0.162460}, 
+{0.587785, 0.425325, 0.688191},
-{0.238856, 0.864188, 0.442863}, 
+{0.955423, 0.295242, 0.000000},
-{0.262866, 0.951056, 0.162460}, 
+{1.000000, 0.000000, 0.000000},
-{0.500000, 0.809017, 0.309017}, 
+{0.951056, 0.162460, 0.262866},
-{0.238856, 0.864188, -0.442863}, 
+{0.850651, -0.525731, 0.000000},
-{0.262866, 0.951056, -0.162460}, 
+{0.955423, -0.295242, 0.000000},
-{0.500000, 0.809017, -0.309017}, 
+{0.864188, -0.442863, 0.238856},
-{0.850651, 0.525731, 0.000000}, 
+{0.951056, -0.162460, 0.262866},
-{0.716567, 0.681718, 0.147621}, 
+{0.809017, -0.309017, 0.500000},
-{0.716567, 0.681718, -0.147621}, 
+{0.681718, -0.147621, 0.716567},
-{0.525731, 0.850651, 0.000000}, 
+{0.850651, 0.000000, 0.525731},
-{0.425325, 0.688191, 0.587785}, 
+{0.864188, 0.442863, -0.238856},
-{0.864188, 0.442863, 0.238856}, 
+{0.809017, 0.309017, -0.500000},
-{0.688191, 0.587785, 0.425325}, 
+{0.951056, 0.162460, -0.262866},
-{0.809017, 0.309017, 0.500000}, 
+{0.525731, 0.000000, -0.850651},
-{0.681718, 0.147621, 0.716567}, 
+{0.681718, 0.147621, -0.716567},
-{0.587785, 0.425325, 0.688191}, 
+{0.681718, -0.147621, -0.716567},
-{0.955423, 0.295242, 0.000000}, 
+{0.850651, 0.000000, -0.525731},
-{1.000000, 0.000000, 0.000000}, 
+{0.809017, -0.309017, -0.500000},
-{0.951056, 0.162460, 0.262866}, 
+{0.864188, -0.442863, -0.238856},
-{0.850651, -0.525731, 0.000000}, 
+{0.951056, -0.162460, -0.262866},
-{0.955423, -0.295242, 0.000000}, 
+{0.147621, 0.716567, -0.681718},
-{0.864188, -0.442863, 0.238856}, 
+{0.309017, 0.500000, -0.809017},
-{0.951056, -0.162460, 0.262866}, 
+{0.425325, 0.688191, -0.587785},
-{0.809017, -0.309017, 0.500000}, 
+{0.442863, 0.238856, -0.864188},
-{0.681718, -0.147621, 0.716567}, 
+{0.587785, 0.425325, -0.688191},
-{0.850651, 0.000000, 0.525731}, 
+{0.688191, 0.587785, -0.425325},
-{0.864188, 0.442863, -0.238856}, 
+{-0.147621, 0.716567, -0.681718},
-{0.809017, 0.309017, -0.500000}, 
+{-0.309017, 0.500000, -0.809017},
-{0.951056, 0.162460, -0.262866}, 
+{0.000000, 0.525731, -0.850651},
-{0.525731, 0.000000, -0.850651}, 
+{-0.525731, 0.000000, -0.850651},
-{0.681718, 0.147621, -0.716567}, 
+{-0.442863, 0.238856, -0.864188},
-{0.681718, -0.147621, -0.716567}, 
+{-0.295242, 0.000000, -0.955423},
-{0.850651, 0.000000, -0.525731}, 
+{-0.162460, 0.262866, -0.951056},
-{0.809017, -0.309017, -0.500000}, 
+{0.000000, 0.000000, -1.000000},
-{0.864188, -0.442863, -0.238856}, 
+{0.295242, 0.000000, -0.955423},
-{0.951056, -0.162460, -0.262866}, 
+{0.162460, 0.262866, -0.951056},
-{0.147621, 0.716567, -0.681718}, 
+{-0.442863, -0.238856, -0.864188},
-{0.309017, 0.500000, -0.809017}, 
+{-0.309017, -0.500000, -0.809017},
-{0.425325, 0.688191, -0.587785}, 
+{-0.162460, -0.262866, -0.951056},
-{0.442863, 0.238856, -0.864188}, 
+{0.000000, -0.850651, -0.525731},
-{0.587785, 0.425325, -0.688191}, 
+{-0.147621, -0.716567, -0.681718},
-{0.688191, 0.587785, -0.425325}, 
+{0.147621, -0.716567, -0.681718},
-{-0.147621, 0.716567, -0.681718}, 
+{0.000000, -0.525731, -0.850651},
-{-0.309017, 0.500000, -0.809017}, 
+{0.309017, -0.500000, -0.809017},
-{0.000000, 0.525731, -0.850651}, 
+{0.442863, -0.238856, -0.864188},
-{-0.525731, 0.000000, -0.850651}, 
+{0.162460, -0.262866, -0.951056},
-{-0.442863, 0.238856, -0.864188}, 
+{0.238856, -0.864188, -0.442863},
-{-0.295242, 0.000000, -0.955423}, 
+{0.500000, -0.809017, -0.309017},
-{-0.162460, 0.262866, -0.951056}, 
+{0.425325, -0.688191, -0.587785},
-{0.000000, 0.000000, -1.000000}, 
+{0.716567, -0.681718, -0.147621},
-{0.295242, 0.000000, -0.955423}, 
+{0.688191, -0.587785, -0.425325},
-{0.162460, 0.262866, -0.951056}, 
+{0.587785, -0.425325, -0.688191},
-{-0.442863, -0.238856, -0.864188}, 
+{0.000000, -0.955423, -0.295242},
-{-0.309017, -0.500000, -0.809017}, 
+{0.000000, -1.000000, 0.000000},
-{-0.162460, -0.262866, -0.951056}, 
+{0.262866, -0.951056, -0.162460},
-{0.000000, -0.850651, -0.525731}, 
+{0.000000, -0.850651, 0.525731},
-{-0.147621, -0.716567, -0.681718}, 
+{0.000000, -0.955423, 0.295242},
-{0.147621, -0.716567, -0.681718}, 
+{0.238856, -0.864188, 0.442863},
-{0.000000, -0.525731, -0.850651}, 
+{0.262866, -0.951056, 0.162460},
-{0.309017, -0.500000, -0.809017}, 
+{0.500000, -0.809017, 0.309017},
-{0.442863, -0.238856, -0.864188}, 
+{0.716567, -0.681718, 0.147621},
-{0.162460, -0.262866, -0.951056}, 
+{0.525731, -0.850651, 0.000000},
-{0.238856, -0.864188, -0.442863}, 
+{-0.238856, -0.864188, -0.442863},
-{0.500000, -0.809017, -0.309017}, 
+{-0.500000, -0.809017, -0.309017},
-{0.425325, -0.688191, -0.587785}, 
+{-0.262866, -0.951056, -0.162460},
-{0.716567, -0.681718, -0.147621}, 
+{-0.850651, -0.525731, 0.000000},
-{0.688191, -0.587785, -0.425325}, 
+{-0.716567, -0.681718, -0.147621},
-{0.587785, -0.425325, -0.688191}, 
+{-0.716567, -0.681718, 0.147621},
-{0.000000, -0.955423, -0.295242}, 
+{-0.525731, -0.850651, 0.000000},
-{0.000000, -1.000000, 0.000000}, 
+{-0.500000, -0.809017, 0.309017},
-{0.262866, -0.951056, -0.162460}, 
+{-0.238856, -0.864188, 0.442863},
-{0.000000, -0.850651, 0.525731}, 
+{-0.262866, -0.951056, 0.162460},
-{0.000000, -0.955423, 0.295242}, 
+{-0.864188, -0.442863, 0.238856},
-{0.238856, -0.864188, 0.442863}, 
+{-0.809017, -0.309017, 0.500000},
-{0.262866, -0.951056, 0.162460}, 
+{-0.688191, -0.587785, 0.425325},
-{0.500000, -0.809017, 0.309017}, 
+{-0.681718, -0.147621, 0.716567},
-{0.716567, -0.681718, 0.147621}, 
+{-0.442863, -0.238856, 0.864188},
-{0.525731, -0.850651, 0.000000}, 
+{-0.587785, -0.425325, 0.688191},
-{-0.238856, -0.864188, -0.442863}, 
+{-0.309017, -0.500000, 0.809017},
-{-0.500000, -0.809017, -0.309017}, 
+{-0.147621, -0.716567, 0.681718},
-{-0.262866, -0.951056, -0.162460}, 
+{-0.425325, -0.688191, 0.587785},
-{-0.850651, -0.525731, 0.000000}, 
+{-0.162460, -0.262866, 0.951056},
-{-0.716567, -0.681718, -0.147621}, 
+{0.442863, -0.238856, 0.864188},
-{-0.716567, -0.681718, 0.147621}, 
+{0.162460, -0.262866, 0.951056},
-{-0.525731, -0.850651, 0.000000}, 
+{0.309017, -0.500000, 0.809017},
-{-0.500000, -0.809017, 0.309017}, 
+{0.147621, -0.716567, 0.681718},
-{-0.238856, -0.864188, 0.442863}, 
+{0.000000, -0.525731, 0.850651},
-{-0.262866, -0.951056, 0.162460}, 
+{0.425325, -0.688191, 0.587785},
-{-0.864188, -0.442863, 0.238856}, 
+{0.587785, -0.425325, 0.688191},
-{-0.809017, -0.309017, 0.500000}, 
+{0.688191, -0.587785, 0.425325},
-{-0.688191, -0.587785, 0.425325}, 
+{-0.955423, 0.295242, 0.000000},
-{-0.681718, -0.147621, 0.716567}, 
+{-0.951056, 0.162460, 0.262866},
-{-0.442863, -0.238856, 0.864188}, 
+{-1.000000, 0.000000, 0.000000},
-{-0.587785, -0.425325, 0.688191}, 
+{-0.850651, 0.000000, 0.525731},
-{-0.309017, -0.500000, 0.809017}, 
+{-0.955423, -0.295242, 0.000000},
-{-0.147621, -0.716567, 0.681718}, 
+{-0.951056, -0.162460, 0.262866},
-{-0.425325, -0.688191, 0.587785}, 
+{-0.864188, 0.442863, -0.238856},
-{-0.162460, -0.262866, 0.951056}, 
+{-0.951056, 0.162460, -0.262866},
-{0.442863, -0.238856, 0.864188}, 
+{-0.809017, 0.309017, -0.500000},
-{0.162460, -0.262866, 0.951056}, 
+{-0.864188, -0.442863, -0.238856},
-{0.309017, -0.500000, 0.809017}, 
+{-0.951056, -0.162460, -0.262866},
-{0.147621, -0.716567, 0.681718}, 
+{-0.809017, -0.309017, -0.500000},
-{0.000000, -0.525731, 0.850651}, 
+{-0.681718, 0.147621, -0.716567},
-{0.425325, -0.688191, 0.587785}, 
+{-0.681718, -0.147621, -0.716567},
-{0.587785, -0.425325, 0.688191}, 
+{-0.850651, 0.000000, -0.525731},
-{0.688191, -0.587785, 0.425325}, 
+{-0.688191, 0.587785, -0.425325},
-{-0.955423, 0.295242, 0.000000}, 
+{-0.587785, 0.425325, -0.688191},
-{-0.951056, 0.162460, 0.262866}, 
+{-0.425325, 0.688191, -0.587785},
-{-1.000000, 0.000000, 0.000000}, 
+{-0.425325, -0.688191, -0.587785},
-{-0.850651, 0.000000, 0.525731}, 
+{-0.587785, -0.425325, -0.688191},
-{-0.955423, -0.295242, 0.000000}, 
+{-0.688191, -0.587785, -0.425325},
-{-0.951056, -0.162460, 0.262866}, 
-{-0.864188, 0.442863, -0.238856}, 
-{-0.951056, 0.162460, -0.262866}, 
-{-0.809017, 0.309017, -0.500000}, 
-{-0.864188, -0.442863, -0.238856}, 
-{-0.951056, -0.162460, -0.262866}, 
-{-0.809017, -0.309017, -0.500000}, 
-{-0.681718, 0.147621, -0.716567}, 
-{-0.681718, -0.147621, -0.716567}, 
-{-0.850651, 0.000000, -0.525731}, 
-{-0.688191, 0.587785, -0.425325}, 
-{-0.587785, 0.425325, -0.688191}, 
-{-0.425325, 0.688191, -0.587785}, 
-{-0.425325, -0.688191, -0.587785}, 
-{-0.587785, -0.425325, -0.688191}, 
-{-0.688191, -0.587785, -0.425325}, 

engine/client/cl_cmds.c

@@ -85,12 +85,6 @@ void CL_PlayCDTrack_f( void )
 		paused = false;
 		looped = false;
 	}
-	else if( !Q_stricmp( command, "playfile" ))
-	{
-		S_StartBackgroundTrack( pszTrack, NULL, 0, true );
-		paused = false;
-		looped = false;
-	}
 	else if( !Q_stricmp( command, "loop" ))
 	{
 		if( Q_isdigit( pszTrack ))
@@ -102,12 +96,6 @@ void CL_PlayCDTrack_f( void )
 		paused = false;
 		looped = true;
 	}
-	else if( !Q_stricmp( command, "loopfile" ))
-	{
-		S_StartBackgroundTrack( pszTrack, pszTrack, 0, true );
-		paused = false;
-		looped = true;
-	}
 	else if( !Q_stricmp( command, "pause" ))
 	{
 		S_StreamSetPause( true );
@@ -157,12 +145,32 @@ void CL_PlayCDTrack_f( void )
 CL_ScreenshotGetName
 ==================
 */
-static qboolean CL_ScreenshotGetName( const char *fmt, int lastnum, char *filename, size_t size )
+static qboolean CL_ScreenshotGetName( int lastnum, char *filename, size_t size )
 {
 	if( lastnum < 0 || lastnum > 9999 )
+	{
+		Con_Printf( S_ERROR "unable to write screenshot\n" );
 		return false;
+	}
 
-	return Q_snprintf( filename, size, fmt, clgame.mapname, lastnum ) > 0;
+	return Q_snprintf( filename, size, "scrshots/%s_shot%04d.png", clgame.mapname, lastnum ) > 0;
+}
+
+/*
+==================
+CL_SnapshotGetName
+==================
+*/
+static qboolean CL_SnapshotGetName( int lastnum, char *filename, size_t size )
+{
+	if( lastnum < 0 || lastnum > 9999 )
+	{
+		Con_Printf( S_ERROR "unable to write snapshot\n" );
+		FS_AllowDirectPaths( false );
+		return false;
+	}
+
+	return Q_snprintf( filename, size, "../%s_%04d.png", clgame.mapname, lastnum ) > 0;
 }
 
 /*
@@ -172,6 +180,127 @@ static qboolean CL_ScreenshotGetName( const char *fmt, int lastnum, char *filena
 
 ==============================================================================
 */
+/*
+==================
+CL_ScreenShot_f
+
+normal screenshot
+==================
+*/
+void CL_ScreenShot_f( void )
+{
+	int	i;
+	string	checkname;
+
+	if( CL_IsDevOverviewMode() == 1 )
+	{
+		// special case for write overview image and script file
+		Q_snprintf( cls.shotname, sizeof( cls.shotname ), "overviews/%s.bmp", clgame.mapname );
+		cls.scrshot_action = scrshot_mapshot; // build new frame for mapshot
+	}
+	else
+	{
+		// scan for a free filename
+		for( i = 0; i < 9999; i++ )
+		{
+			if( !CL_ScreenshotGetName( i, checkname, sizeof( checkname )))
+				return;	// no namespace
+
+			if( !FS_FileExists( checkname, false ))
+				break;
+		}
+
+		Q_strncpy( cls.shotname, checkname, sizeof( cls.shotname ));
+		cls.scrshot_action = scrshot_normal; // build new frame for screenshot
+	}
+
+	cls.envshot_vieworg = NULL; // no custom view
+	cls.envshot_viewsize = 0;
+}
+
+/*
+==================
+CL_SnapShot_f
+
+save screenshots into root dir
+==================
+*/
+void CL_SnapShot_f( void )
+{
+	int	i;
+	string	checkname;
+
+	if( CL_IsDevOverviewMode() == 1 )
+	{
+		// special case for write overview image and script file
+		Q_snprintf( cls.shotname, sizeof( cls.shotname ), "overviews/%s.bmp", clgame.mapname );
+		cls.scrshot_action = scrshot_mapshot; // build new frame for mapshot
+	}
+	else
+	{
+		FS_AllowDirectPaths( true );
+
+		// scan for a free filename
+		for( i = 0; i < 9999; i++ )
+		{
+			if( !CL_SnapshotGetName( i, checkname, sizeof( checkname )))
+				return;	// no namespace
+
+			if( !FS_FileExists( checkname, false ))
+				break;
+		}
+
+		FS_AllowDirectPaths( false );
+		Q_strncpy( cls.shotname, checkname, sizeof( cls.shotname ));
+		cls.scrshot_action = scrshot_snapshot; // build new frame for screenshot
+	}
+
+	cls.envshot_vieworg = NULL; // no custom view
+	cls.envshot_viewsize = 0;
+}
+
+/*
+==================
+CL_EnvShot_f
+
+cubemap view
+==================
+*/
+void CL_EnvShot_f( void )
+{
+	if( Cmd_Argc() < 2 )
+	{
+		Con_Printf( S_USAGE "envshot <shotname>\n" );
+		return;
+	}
+
+	Q_snprintf( cls.shotname, sizeof( cls.shotname ), "gfx/env/%s", Cmd_Argv( 1 ));
+	cls.scrshot_action = scrshot_envshot;	// build new frame for envshot
+	cls.envshot_vieworg = NULL; // no custom view
+	cls.envshot_viewsize = 0;
+}
+
+/*
+==================
+CL_SkyShot_f
+
+skybox view
+==================
+*/
+void CL_SkyShot_f( void )
+{
+	if( Cmd_Argc() < 2 )
+	{
+		Con_Printf( S_USAGE "skyshot <shotname>\n" );
+		return;
+	}
+
+	Q_snprintf( cls.shotname, sizeof( cls.shotname ),"gfx/env/%s", Cmd_Argv( 1 ));
+	cls.scrshot_action = scrshot_skyshot;	// build new frame for skyshot
+	cls.envshot_vieworg = NULL; // no custom view
+	cls.envshot_viewsize = 0;
+}
+
 /*
 ==================
 CL_LevelShot_f
@@ -214,107 +343,23 @@ void CL_LevelShot_f( void )
 	else cls.scrshot_action = scrshot_inactive;	// disable - not needs
 }
 
-static scrshot_t CL_GetScreenshotTypeFromString( const char *string )
+/*
+==================
+CL_SaveShot_f
+
+mini-pic in loadgame menu
+==================
+*/
+void CL_SaveShot_f( void )
 {
-	if( !Q_stricmp( string, "snapshot" ))
+	if( Cmd_Argc() < 2 )
-		return scrshot_snapshot;
-
-	if( !Q_stricmp( string, "screenshot" ))
-		return scrshot_normal;
-
-	if( !Q_stricmp( string, "saveshot" ))
-		return scrshot_savegame;
-
-	if( !Q_stricmp( string, "envshot" ))
-		return scrshot_envshot;
-
-	if( !Q_stricmp( string, "skyshot" ))
-		return scrshot_skyshot;
-
-	return scrshot_inactive;
-}
-
-void CL_GenericShot_f( void )
-{
-	const char *argv0 = Cmd_Argv( 0 );
-	scrshot_t type;
-
-	type = CL_GetScreenshotTypeFromString( argv0 );
-
-	if( type == scrshot_normal || type == scrshot_snapshot )
 	{
-		if( CL_IsDevOverviewMode() == 1 )
+		Con_Printf( S_USAGE "saveshot <savename>\n" );
-			type = scrshot_mapshot;
+		return;
-	}
-	else
-	{
-		if( Cmd_Argc() < 2 )
-		{
-			Con_Printf( S_USAGE "%s <shotname>\n", argv0 );
-			return;
-		}
 	}
 
-	switch( type )
+	Q_snprintf( cls.shotname, sizeof( cls.shotname ), DEFAULT_SAVE_DIRECTORY "%s.bmp", Cmd_Argv( 1 ));
-	{
+	cls.scrshot_action = scrshot_savegame;	// build new frame for saveshot
-	case scrshot_envshot:
-	case scrshot_skyshot:
-		Q_snprintf( cls.shotname, sizeof( cls.shotname ), "gfx/env/%s", Cmd_Argv( 1 ));
-		break;
-	case scrshot_savegame:
-		Q_snprintf( cls.shotname, sizeof( cls.shotname ), DEFAULT_SAVE_DIRECTORY "%s.bmp", Cmd_Argv( 1 ));
-		break;
-	case scrshot_mapshot:
-		Q_snprintf( cls.shotname, sizeof( cls.shotname ), "overviews/%s.bmp", clgame.mapname );
-		break;
-	case scrshot_normal:
-	case scrshot_snapshot:
-	{
-		const char *fmt;
-		string checkname;
-		int i;
-
-		// allow overriding screenshot by users request
-		if( Cmd_Argc() > 1 )
-		{
-			Q_strncpy( cls.shotname, Cmd_Argv( 1 ), sizeof( cls.shotname ));
-			break;
-		}
-
-		if( type == scrshot_snapshot )
-		{
-			fmt = "../%s_%04d.png";
-			FS_AllowDirectPaths( true );
-		}
-		else fmt = "scrshots/%s_shot%04d.png";
-
-		for( i = 0; i < 9999; i++ )
-		{
-			if( !CL_ScreenshotGetName( fmt, i, checkname, sizeof( checkname )))
-			{
-				Con_Printf( S_ERROR "unable to write %s\n", argv0 );
-				FS_AllowDirectPaths( false );
-				return;
-			}
-
-			if( !FS_FileExists( checkname, true ))
-				break;
-		}
-
-		FS_AllowDirectPaths( false );
-
-		Q_strncpy( cls.shotname, checkname, sizeof( cls.shotname ));
-		break;
-	}
-	case scrshot_inactive:
-	case scrshot_plaque:
-	default:
-		return; // shouldn't happen
-	}
-
-	cls.scrshot_action = type; // build new frame for saveshot
-	cls.envshot_vieworg = NULL;
-	cls.envshot_viewsize = 0;
 }
 
 /*
@@ -356,7 +401,7 @@ void CL_SetSky_f( void )
 		return;
 	}
 
-	R_SetupSky( Cmd_Argv( 1 ));
+	ref.dllFuncs.R_SetupSky( Cmd_Argv( 1 ));
 }
 
 /*

engine/client/cl_custom.c

@@ -70,17 +70,16 @@ qboolean CL_CheckFile( sizebuf_t *msg, resource_t *pResource )
 		return true;
 	}
 
-	host.downloadcount++;
+	if( cl.downloadUrl[0] )
-
-	if( cl.http_download )
 	{
 		HTTP_AddDownload( filepath, pResource->nDownloadSize, true );
+		host.downloadcount++;
+		return false;
 	}
-	else
+
-	{
+	MSG_BeginClientCmd( msg, clc_stringcmd );
-		MSG_BeginClientCmd( msg, clc_stringcmd );
+	MSG_WriteStringf( msg, "dlfile %s", filepath );
-		MSG_WriteStringf( msg, "dlfile %s", filepath );
+	host.downloadcount++;
-	}
 
 	return false;
 }
@@ -105,7 +104,7 @@ void CL_AddToResourceList( resource_t *pResource, resource_t *pList )
 void CL_RemoveFromResourceList( resource_t *pResource )
 {
 	if( pResource->pPrev == NULL || pResource->pNext == NULL )
-		Host_Error( "mislinked resource in %s\n", __func__ );
+		Host_Error( "mislinked resource in CL_RemoveFromResourceList\n" );
 
 	if( pResource->pNext == pResource || pResource->pPrev == pResource )
 		Host_Error( "attempt to free last entry in list.\n" );
@@ -120,7 +119,7 @@ void CL_MoveToOnHandList( resource_t *pResource )
 {
 	if( !pResource )
 	{
-		Con_Reportf( "Null resource passed to %s\n", __func__ );
+		Con_Reportf( "Null resource passed to CL_MoveToOnHandList\n" );
 		return;
 	}
 
@@ -128,7 +127,7 @@ void CL_MoveToOnHandList( resource_t *pResource )
 	CL_AddToResourceList( pResource, &cl.resourcesonhand );
 }
 
-static void CL_ClearResourceList( resource_t *pList )
+void CL_ClearResourceList( resource_t *pList )
 {
 	resource_t	*p, *n;
 

engine/client/cl_debug.c

@@ -50,29 +50,7 @@ const char *CL_MsgInfo( int cmd )
 	if( cmd >= 0 && cmd <= svc_lastmsg )
 	{
 		// get engine message name
-		const char *svc_string = NULL;
+		Q_strncpy( sz, svc_strings[cmd], sizeof( sz ));
-
-		switch( cls.legacymode )
-		{
-		case PROTO_CURRENT:
-			svc_string = svc_strings[cmd];
-			break;
-		case PROTO_LEGACY:
-			svc_string = svc_legacy_strings[cmd];
-			break;
-		case PROTO_QUAKE:
-			svc_string = svc_quake_strings[cmd];
-			break;
-		case PROTO_GOLDSRC:
-			svc_string = svc_goldsrc_strings[cmd];
-			break;
-		}
-
-		// fall back to current protocol strings
-		if( !svc_string )
-			svc_string = svc_strings[cmd];
-
-		Q_strncpy( sz, svc_string, sizeof( sz ));
 	}
 	else if( cmd > svc_lastmsg && cmd <= ( svc_lastmsg + MAX_USER_MESSAGES ))
 	{

engine/client/cl_demo.c

@@ -40,8 +40,6 @@ GNU General Public License for more details.
 #define IDEMOHEADER		(('M'<<24)+('E'<<16)+('D'<<8)+'I') // little-endian "IDEM"
 #define DEMO_PROTOCOL	3
 
-#define PROTOCOL_GOLDSRC_VERSION_DEMO (PROTOCOL_GOLDSRC_VERSION | (BIT( 7 ))) // should be 48, only to differentiate it from PROTOCOL_LEGACY_VERSION
-
 const char *demo_cmd[dem_lastcmd+1] =
 {
 	"dem_unknown",
@@ -81,7 +79,7 @@ typedef struct
 typedef struct
 {
 	demoentry_t	*entries;		// track entry info
-	int32_t		numentries;	// number of tracks
+	int		numentries;	// number of tracks
 } demodirectory_t;
 
 // add angles
@@ -109,42 +107,6 @@ struct
 	int		angle_position;
 } demo;
 
-static qboolean CL_NextDemo( void );
-
-static int CL_GetDemoNetProtocol( connprotocol_t proto )
-{
-	switch( proto )
-	{
-	case PROTO_CURRENT:
-		return PROTOCOL_VERSION;
-	case PROTO_LEGACY:
-		return PROTOCOL_LEGACY_VERSION;
-	case PROTO_QUAKE:
-		return PROTOCOL_VERSION_QUAKE;
-	case PROTO_GOLDSRC:
-		return PROTOCOL_GOLDSRC_VERSION_DEMO;
-	}
-
-	return PROTOCOL_VERSION;
-}
-
-static connprotocol_t CL_GetProtocolFromDemo( int net_protocol )
-{
-	switch( net_protocol )
-	{
-	case PROTOCOL_VERSION:
-		return PROTO_CURRENT;
-	case PROTOCOL_LEGACY_VERSION:
-		return PROTO_LEGACY;
-	case PROTOCOL_VERSION_QUAKE:
-		return PROTO_QUAKE;
-	case PROTOCOL_GOLDSRC_VERSION_DEMO:
-		return PROTO_GOLDSRC;
-	}
-
-	return PROTO_CURRENT;
-}
-
 /*
 ====================
 CL_StartupDemoHeader
@@ -155,8 +117,12 @@ we record a demo on this level
 */
 void CL_StartupDemoHeader( void )
 {
-	CL_CloseDemoHeader();
+	if( cls.demoheader )
+	{
+		FS_Close( cls.demoheader );
+	}
 
+	// Note: this is replacing tmpfile()
 	cls.demoheader = FS_Open( "demoheader.tmp", "w+b", true );
 
 	if( !cls.demoheader )
@@ -190,7 +156,7 @@ CL_GetDemoRecordClock
 write time while demo is recording
 ====================
 */
-static float CL_GetDemoRecordClock( void )
+float CL_GetDemoRecordClock( void )
 {
 	return cl.mtime[0];
 }
@@ -202,7 +168,7 @@ CL_GetDemoPlaybackClock
 overwrite host.realtime
 ====================
 */
-static float CL_GetDemoPlaybackClock( void )
+float CL_GetDemoPlaybackClock( void )
 {
 	return host.realtime + host.frametime;
 }
@@ -228,7 +194,7 @@ CL_WriteDemoCmdHeader
 Writes the demo command header and time-delta
 ====================
 */
-static void CL_WriteDemoCmdHeader( byte cmd, file_t *file )
+void CL_WriteDemoCmdHeader( byte cmd, file_t *file )
 {
 	float	dt;
 
@@ -301,7 +267,7 @@ Save state of cls.netchan sequences
 so that we can play the demo correctly.
 ====================
 */
-static void CL_WriteDemoSequence( file_t *file )
+void CL_WriteDemoSequence( file_t *file )
 {
 	Assert( file != NULL );
 
@@ -329,6 +295,10 @@ void CL_WriteDemoMessage( qboolean startup, int start, sizebuf_t *msg )
 
 	if( !file ) return;
 
+	// past the start but not recording a demo.
+	if( !startup && !cls.demorecording )
+		return;
+
 	swlen = MSG_GetNumBytesWritten( msg ) - start;
 	if( swlen <= 0 ) return;
 
@@ -378,7 +348,7 @@ CL_WriteDemoHeader
 Write demo header
 ====================
 */
-static void CL_WriteDemoHeader( const char *name )
+void CL_WriteDemoHeader( const char *name )
 {
 	int	copysize;
 	int	savepos;
@@ -401,8 +371,8 @@ static void CL_WriteDemoHeader( const char *name )
 
 	demo.header.id = IDEMOHEADER;
 	demo.header.dem_protocol = DEMO_PROTOCOL;
-	demo.header.net_protocol = CL_GetDemoNetProtocol( cls.legacymode );
+	demo.header.net_protocol = cls.legacymode ? PROTOCOL_LEGACY_VERSION : PROTOCOL_VERSION;
-	demo.header.host_fps = host_maxfps.value ? bound( MIN_FPS, host_maxfps.value, MAX_FPS ) : MAX_FPS;
+	demo.header.host_fps = bound( MIN_FPS, host_maxfps->value, MAX_FPS );
 	Q_strncpy( demo.header.mapname, clgame.mapname, sizeof( demo.header.mapname ));
 	Q_strncpy( demo.header.comment, clgame.maptitle, sizeof( demo.header.comment ));
 	Q_strncpy( demo.header.gamedir, FS_Gamedir(), sizeof( demo.header.gamedir ));
@@ -421,7 +391,6 @@ static void CL_WriteDemoHeader( const char *name )
 
 	// finish off the startup info.
 	CL_WriteDemoCmdHeader( dem_stop, cls.demoheader );
-	FS_Flush( cls.demoheader );
 
 	// now copy the stuff we cached from the server.
 	copysize = savepos = FS_Tell( cls.demoheader );
@@ -467,7 +436,7 @@ CL_StopRecord
 finish recording demo
 =================
 */
-static void CL_StopRecord( void )
+void CL_StopRecord( void )
 {
 	int	i, curpos;
 	float	stoptime;
@@ -549,7 +518,7 @@ CL_ReadDemoCmdHeader
 read the demo command
 =================
 */
-static qboolean CL_ReadDemoCmdHeader( byte *cmd, float *dt )
+qboolean CL_ReadDemoCmdHeader( byte *cmd, float *dt )
 {
 	// read the command
 	// HACKHACK: skip NOPs
@@ -579,7 +548,7 @@ read the demo usercmd for predicting
 and smooth movement during playback the demo
 =================
 */
-static void CL_ReadDemoUserCmd( qboolean discard )
+void CL_ReadDemoUserCmd( qboolean discard )
 {
 	byte	data[1024];
 	int	cmdnumber;
@@ -601,9 +570,6 @@ static void CL_ReadDemoUserCmd( qboolean discard )
 		memset( &nullcmd, 0, sizeof( nullcmd ));
 		MSG_Init( &buf, "UserCmd", data, sizeof( data ));
 
-		// a1ba: I have no proper explanation why
-		cmdnumber++;
-
 		pcmd = &cl.commands[cmdnumber & CL_UPDATE_MASK];
 		pcmd->processedfuncs = false;
 		pcmd->senttime = 0.0f;
@@ -644,7 +610,7 @@ CL_ReadDemoSequence
 read netchan sequences
 =================
 */
-static void CL_ReadDemoSequence( qboolean discard )
+void CL_ReadDemoSequence( qboolean discard )
 {
 	int	incoming_sequence;
 	int	incoming_acknowledged;
@@ -678,17 +644,15 @@ static void CL_ReadDemoSequence( qboolean discard )
 CL_DemoStartPlayback
 =================
 */
-static void CL_DemoStartPlayback( int mode )
+void CL_DemoStartPlayback( int mode )
 {
 	if( cls.changedemo )
 	{
-		int maxclients = cl.maxclients;
-
 		S_StopAllSounds( true );
 		SCR_BeginLoadingPlaque( false );
 
-		CL_ClearState( );
+		CL_ClearState ();
-		CL_InitEdicts( maxclients ); // re-arrange edicts
+		CL_InitEdicts (); // re-arrange edicts
 	}
 	else
 	{
@@ -708,7 +672,7 @@ static void CL_DemoStartPlayback( int mode )
 
 	demo.starttime = CL_GetDemoPlaybackClock(); // for determining whether to read another message
 
-	Netchan_Setup( NS_CLIENT, &cls.netchan, net_from, Cvar_VariableInteger( "net_qport" ), NULL, CL_GetFragmentSize, 0 );
+	Netchan_Setup( NS_CLIENT, &cls.netchan, net_from, Cvar_VariableInteger( "net_qport" ), NULL, CL_GetFragmentSize );
 
 	memset( demo.cmds, 0, sizeof( demo.cmds ));
 	demo.angle_position = 1;
@@ -723,7 +687,7 @@ static void CL_DemoStartPlayback( int mode )
 CL_DemoAborted
 =================
 */
-static void CL_DemoAborted( void )
+void CL_DemoAborted( void )
 {
 	if( cls.demofile )
 		FS_Close( cls.demofile );
@@ -734,7 +698,7 @@ static void CL_DemoAborted( void )
 	cls.demofile = NULL;
 	cls.demonum = -1;
 
-	Cvar_DirectSet( &v_dark, "0" );
+	Cvar_SetValue( "v_dark", 0.0f );
 }
 
 /*
@@ -752,7 +716,7 @@ void CL_DemoCompleted( void )
 	if( !CL_NextDemo() && !cls.changedemo )
 		UI_SetActiveMenu( true );
 
-	Cvar_DirectSet( &v_dark, "0" );
+	Cvar_SetValue( "v_dark", 0.0f );
 }
 
 /*
@@ -763,7 +727,7 @@ returns true on success, false on failure
 g-cont. probably captain obvious mode is ON
 =================
 */
-static qboolean CL_DemoMoveToNextSection( void )
+qboolean CL_DemoMoveToNextSection( void )
 {
 	if( ++demo.entryIndex >= demo.directory.numentries )
 	{
@@ -785,7 +749,7 @@ static qboolean CL_DemoMoveToNextSection( void )
 	return true;
 }
 
-static qboolean CL_ReadRawNetworkData( byte *buffer, size_t *length )
+qboolean CL_ReadRawNetworkData( byte *buffer, size_t *length )
 {
 	int	msglen = 0;
 
@@ -836,7 +800,7 @@ CL_DemoReadMessageQuake
 reads demo data and write it to client
 =================
 */
-static qboolean CL_DemoReadMessageQuake( byte *buffer, size_t *length )
+qboolean CL_DemoReadMessageQuake( byte *buffer, size_t *length )
 {
 	vec3_t		viewangles;
 	int		msglen = 0;
@@ -1051,7 +1015,7 @@ qboolean CL_DemoReadMessage( byte *buffer, size_t *length )
 	return CL_ReadRawNetworkData( buffer, length );
 }
 
-static void CL_DemoFindInterpolatedViewAngles( float t, float *frac, demoangle_t **prev, demoangle_t **next )
+void CL_DemoFindInterpolatedViewAngles( float t, float *frac, demoangle_t **prev, demoangle_t **next )
 {
 	int	i, i0, i1, imod;
 	float	at;
@@ -1146,9 +1110,8 @@ CL_FinishTimeDemo
 show stats
 ==============
 */
-static void CL_FinishTimeDemo( void )
+void CL_FinishTimeDemo( void )
 {
-	qboolean temp = host.allow_console;
 	int	frames;
 	double	time;
 
@@ -1159,12 +1122,7 @@ static void CL_FinishTimeDemo( void )
 	time = host.realtime - cls.td_starttime;
 	if( !time ) time = 1.0;
 
-	host.allow_console = true;
+	Con_Printf( "%i frames %5.3f seconds %5.3f fps\n", frames, time, frames / time );
-	Con_Printf( "timedemo result: %i frames %5.3f seconds %5.3f fps\n", frames, time, frames / time );
-	host.allow_console = temp;
-
-	if( Sys_CheckParm( "-timedemo" ))
-		CL_Quit_f();
 }
 
 /*
@@ -1298,7 +1256,7 @@ CL_NextDemo
 Called when a demo finishes
 ==================
 */
-static qboolean CL_NextDemo( void )
+qboolean CL_NextDemo( void )
 {
 	char	str[MAX_QPATH];
 
@@ -1348,7 +1306,7 @@ void CL_CheckStartupDemos( void )
 	}
 
 	// run demos loop in background mode
-	Cvar_DirectSet( &v_dark, "1" );
+	Cvar_SetValue( "v_dark", 1.0f );
 	cls.demos_pending = false;
 	cls.demonum = 0;
 	CL_NextDemo ();
@@ -1364,11 +1322,11 @@ static void CL_DemoGetName( int lastnum, char *filename, size_t size )
 	if( lastnum < 0 || lastnum > 9999 )
 	{
 		// bound
-		Q_strncpy( filename, "demo9999", size );
+		Q_strncpy( filename, "demo9999.dem", size );
 		return;
 	}
 
-	Q_snprintf( filename, size, "demo%04d", lastnum );
+	Q_snprintf( filename, size, "demo%04d.dem", lastnum );
 }
 
 /*
@@ -1423,9 +1381,7 @@ void CL_Record_f( void )
 		for( n = 0; n < 10000; n++ )
 		{
 			CL_DemoGetName( n, demoname, sizeof( demoname ));
-			Q_snprintf( demopath, sizeof( demopath ), "%s.dem", demoname );
+			if( !FS_FileExists( demoname, true ))
-
-			if( !FS_FileExists( demopath, true ))
 				break;
 		}
 
@@ -1450,51 +1406,6 @@ void CL_Record_f( void )
 	CL_WriteDemoHeader( demopath );
 }
 
-static qboolean CL_ParseDemoHeader( const char *callee, const char *filename, file_t *f, demoheader_t *hdr, int32_t *numentries )
-{
-	if( FS_Read( f, hdr, sizeof( *hdr )) != sizeof( *hdr ) || hdr->id != IDEMOHEADER )
-	{
-		Con_Printf( S_ERROR "%s: %s is not in supported format or not a demo file\n", callee, filename );
-		return false;
-	}
-
-	// force null terminate strings
-	hdr->mapname[sizeof( hdr->mapname ) - 1] = 0;
-	hdr->comment[sizeof( hdr->comment ) - 1] = 0;
-	hdr->gamedir[sizeof( hdr->gamedir ) - 1] = 0;
-
-	if( hdr->dem_protocol != DEMO_PROTOCOL )
-	{
-		Con_Printf( S_ERROR "%s: demo protocol outdated (%i should be %i)\n",
-			callee, hdr->net_protocol, DEMO_PROTOCOL );
-		return false;
-	}
-
-	if( hdr->net_protocol != PROTOCOL_VERSION && hdr->net_protocol != PROTOCOL_LEGACY_VERSION )
-	{
-		Con_Printf( S_ERROR "%s: net protocol outdated (%i should be %i or %i)\n",
-			callee, hdr->net_protocol, PROTOCOL_VERSION, PROTOCOL_LEGACY_VERSION );
-		return false;
-	}
-
-	if( FS_Seek( f, hdr->directory_offset, SEEK_SET ) < 0
-		|| FS_Read( f, numentries, sizeof( *numentries )) != sizeof( *numentries ))
-	{
-		Con_Printf( S_ERROR "%s: can't find directory offset in %s, demo file corrupted\n",
-			callee, filename );
-		return false;
-	}
-
-	if(( *numentries < 1 ) || ( *numentries > 1024 ))
-	{
-		Con_Printf( S_ERROR "%s: demo have bogus # of directory entries: %i\n",
-			callee, *numentries );
-		return false;
-	}
-
-	return true;
-}
-
 /*
 ====================
 CL_PlayDemo_f
@@ -1515,7 +1426,9 @@ void CL_PlayDemo_f( void )
 	}
 
 	if( cls.demoplayback )
+	{
 		CL_StopPlayback();
+	}
 
 	if( cls.demorecording )
 	{
@@ -1555,7 +1468,7 @@ void CL_PlayDemo_f( void )
 	{
 		int	c, neg = false;
 
-		demo.header.host_fps = host_maxfps.value;
+		demo.header.host_fps = host_maxfps->value;
 
 		while(( c = FS_Getc( cls.demofile )) != '\n' )
 		{
@@ -1565,32 +1478,51 @@ void CL_PlayDemo_f( void )
 
 		if( neg ) cls.forcetrack = -cls.forcetrack;
 		CL_DemoStartPlayback( DEMO_QUAKE1 );
-		cls.legacymode = PROTO_QUAKE;
 		return; // quake demo is started
 	}
 
 	// read in the demo header
-	if( !CL_ParseDemoHeader( Cmd_Argv( 0 ), filename, cls.demofile, &demo.header, &demo.directory.numentries ))
+	FS_Read( cls.demofile, &demo.header, sizeof( demoheader_t ));
+
+	if( demo.header.id != IDEMOHEADER )
 	{
+		Con_Printf( S_ERROR "%s is not a demo file\n", demoname );
+		CL_DemoAborted();
+		return;
+	}
+
+	if( demo.header.dem_protocol != DEMO_PROTOCOL )
+	{
+		Con_Printf( S_ERROR "playdemo: demo protocol outdated (%i should be %i)\n", demo.header.dem_protocol, DEMO_PROTOCOL );
+		CL_DemoAborted();
+		return;
+	}
+
+	if( demo.header.net_protocol != PROTOCOL_VERSION &&
+		demo.header.net_protocol != PROTOCOL_LEGACY_VERSION )
+	{
+		Con_Printf( S_ERROR "playdemo: net protocol outdated (%i should be %i)\n", demo.header.net_protocol, PROTOCOL_VERSION );
+		CL_DemoAborted();
+		return;
+	}
+
+	// now read in the directory structure.
+	FS_Seek( cls.demofile, demo.header.directory_offset, SEEK_SET );
+	FS_Read( cls.demofile, &demo.directory.numentries, sizeof( int ));
+
+	if( demo.directory.numentries < 1 || demo.directory.numentries > 1024 )
+	{
+		Con_Printf( S_ERROR "demo had bogus # of directory entries: %i\n", demo.directory.numentries );
 		CL_DemoAborted();
 		return;
 	}
 
 	// allocate demo entries
-	demo.directory.entries = Mem_Malloc( cls.mempool, sizeof( *demo.directory.entries ) * demo.directory.numentries );
+	demo.directory.entries = Mem_Malloc( cls.mempool, sizeof( demoentry_t ) * demo.directory.numentries );
 
 	for( i = 0; i < demo.directory.numentries; i++ )
 	{
-		demoentry_t *entry = &demo.directory.entries[i];
+		FS_Read( cls.demofile, &demo.directory.entries[i], sizeof( demoentry_t ));
-
-		if( FS_Read( cls.demofile, entry, sizeof( *entry )) != sizeof( *entry ))
-		{
-			Con_Printf( S_ERROR "%s: demo entry %i of %s corrupted", Cmd_Argv( 0 ), i, filename );
-			CL_DemoAborted();
-			return;
-		}
-
-		entry->description[sizeof( entry->description ) - 1] = 0;
 	}
 
 	demo.entryIndex = 0;
@@ -1600,11 +1532,9 @@ void CL_PlayDemo_f( void )
 
 	CL_DemoStartPlayback( DEMO_XASH3D );
 
-	// must be after DemoStartPlayback, as CL_Disconnect_f resets the protocol
-	cls.legacymode = CL_GetProtocolFromDemo( demo.header.net_protocol );
-
 	// g-cont. is this need?
 	Q_strncpy( cls.servername, demoname, sizeof( cls.servername ));
+	cls.legacymode = demo.header.net_protocol == PROTOCOL_LEGACY_VERSION;
 
 	// begin a playback demo
 }
@@ -1646,7 +1576,7 @@ void CL_StartDemos_f( void )
 	c = Cmd_Argc() - 1;
 	if( c > MAX_DEMOS )
 	{
-		Con_DPrintf( S_WARN "%s: max %i demos in demoloop\n", __func__, MAX_DEMOS );
+		Con_DPrintf( S_WARN "Host_StartDemos: max %i demos in demoloop\n", MAX_DEMOS );
 		c = MAX_DEMOS;
 	}
 
@@ -1704,78 +1634,3 @@ void CL_Stop_f( void )
 		S_StopBackgroundTrack();
 	}
 }
-
-void CL_ListDemo_f( void )
-{
-	demoheader_t hdr;
-	int32_t num_entries;
-	file_t *f;
-	char filename[MAX_QPATH];
-	char demoname[MAX_QPATH];
-	int i;
-
-	if( Cmd_Argc() < 2 )
-	{
-		Con_Printf( S_USAGE "%s <demoname>\n", Cmd_Argv( 0 ));
-		return;
-	}
-
-	Q_strncpy( demoname, Cmd_Argv( 1 ), sizeof( demoname ));
-	COM_StripExtension( demoname );
-	Q_snprintf( filename, sizeof( filename ), "%s.dem", demoname );
-
-	f = FS_Open( filename, "rb", true );
-	if( !f )
-	{
-		Con_Printf( S_ERROR "couldn't open %s\n", filename );
-		return;
-	}
-
-	if( !CL_ParseDemoHeader( Cmd_Argv( 0 ), filename, f, &hdr, &num_entries ))
-	{
-		FS_Close( f );
-		return;
-	}
-
-	Con_Printf( "Demo contents for %s:\n"
-		"\tProtocol: %i net/%i demo\n"
-		"\tFPS: %g\n"
-		"\tMap: %s\n"
-		"\tComment: %s\n"
-		"\tGame: %s\n",
-		filename, hdr.net_protocol, hdr.dem_protocol, hdr.host_fps, hdr.mapname,
-		hdr.comment, hdr.gamedir );
-
-	for( i = 0; i < num_entries; i++ )
-	{
-		demoentry_t entry;
-
-		Con_Printf( "Demo entry #%i:\n", i );
-
-		if( FS_Read( f, &entry, sizeof( entry )) != sizeof( entry ))
-		{
-			Con_Printf( S_ERROR "can't read demo entry\n" );
-			FS_Close( f );
-			return;
-		}
-
-		entry.description[sizeof( entry.description ) - 1] = 0;
-
-		if( entry.entrytype == DEMO_STARTUP )
-		{
-			// startup entries don't have anything useful
-			Con_Printf( "\tEntry type: " S_YELLOW "startup" S_DEFAULT "\n" );
-		}
-		else
-		{
-			Con_Printf( "\tEntry type: " S_GREEN "normal" S_DEFAULT " (%i)\n"
-				"\tEntry playback time/frames: %.2f seconds/%i frames\n"
-				"\tEntry flags: 0x%x\n"
-				"\tEntry description: %s\n",
-				entry.entrytype, entry.playback_time, entry.playback_frames,
-				entry.flags, entry.description );
-		}
-	}
-
-	FS_Close( f );
-}

engine/client/cl_efrag.c

@@ -28,51 +28,10 @@ GNU General Public License for more details.
 ===============================================================================
 */
 
-#define NUM_EFRAGS_ALLOC 64 // alloc 64 efrags (1-2kb each alloc)
-
 static efrag_t	**lastlink;
 static mnode_t	*r_pefragtopnode;
 static vec3_t	r_emins, r_emaxs;
 static cl_entity_t	*r_addent;
-static int cl_efrags_num;
-static efrag_t *cl_efrags;
-
-static efrag_t *CL_AllocEfrags( int num )
-{
-	int i;
-	efrag_t *efrags;
-
-	if( !cl.worldmodel )
-	{
-		Host_Error( "%s: called with NULL world\n", __func__ );
-		return NULL;
-	}
-
-	if( num == 0 )
-		return NULL;
-
-	// set world to be the owner, so it will get automatically cleaned up
-	efrags = Mem_Calloc( cl.worldmodel->mempool, sizeof( *efrags ) * num );
-
-	// initialize linked list
-	for( i = 0; i < num - 1; i++ )
-		efrags[i].entnext = &efrags[i + 1];
-
-	cl_efrags_num += num;
-
-	return efrags;
-}
-
-/*
-==============
-CL_ClearEfrags
-==============
-*/
-void CL_ClearEfrags( void )
-{
-	cl_efrags_num = 0;
-	cl_efrags = NULL;
-}
 
 /*
 ===================
@@ -97,11 +56,14 @@ static void R_SplitEntityOnNode( mnode_t *node )
 		leaf = (mleaf_t *)node;
 
 		// grab an efrag off the free list
-		ef = cl_efrags;
+		ef = clgame.free_efrags;
 		if( !ef )
-			ef = CL_AllocEfrags( NUM_EFRAGS_ALLOC );
+		{
+			Con_Printf( S_ERROR "too many efrags!\n" );
+			return; // no free fragments...
+		}
 
-		cl_efrags = ef->entnext;
+		clgame.free_efrags = ef->entnext;
 		ef->entity = r_addent;
 
 		// add the entity link
@@ -171,29 +133,35 @@ R_StoreEfrags
 */
 void R_StoreEfrags( efrag_t **ppefrag, int framecount )
 {
-	efrag_t *pefrag;
+	cl_entity_t	*pent;
-	cl_entity_t *pent;
+	model_t		*clmodel;
-	model_t *clmodel;
+	efrag_t		*pefrag;
 
 	while(( pefrag = *ppefrag ) != NULL )
 	{
 		pent = pefrag->entity;
 		clmodel = pent->model;
 
-		// how this could happen?
+		switch( clmodel->type )
-		if( unlikely( clmodel->type < mod_brush || clmodel->type > mod_studio ))
-			continue;
-
-		if( pent->visframe != framecount )
 		{
-			if( CL_AddVisibleEntity( pent, ET_FRAGMENTED ))
+		case mod_alias:
+		case mod_brush:
+		case mod_studio:
+		case mod_sprite:
+			if( pent->visframe != framecount )
 			{
-				// mark that we've recorded this entity for this frame
+				if( CL_AddVisibleEntity( pent, ET_FRAGMENTED ))
-				pent->curstate.messagenum = cl.parsecount;
+				{
-				pent->visframe = framecount;
+					// mark that we've recorded this entity for this frame
+					pent->curstate.messagenum = cl.parsecount;
+					pent->visframe = framecount;
+				}
 			}
-		}
 
-		ppefrag = &pefrag->leafnext;
+			ppefrag = &pefrag->leafnext;
+			break;
+		default:
+			break;
+		}
 	}
 }

engine/client/cl_efx.c

@@ -6,7 +6,7 @@
 #include "r_efx.h"
 #include "cl_tent.h"
 #include "pm_local.h"
-#define PART_SIZE	Q_max( 0.5f, cl_draw_particles.value )
+#define PART_SIZE	Q_max( 0.5f, cl_draw_particles->value )
 
 /*
 ==============================================================
@@ -21,20 +21,17 @@ static int ramp2[8] = { 0x6f, 0x6e, 0x6d, 0x6c, 0x6b, 0x6a, 0x68, 0x66 };
 static int ramp3[6] = { 0x6d, 0x6b, 6, 5, 4, 3 };
 static int gSparkRamp[9] = { 0xfe, 0xfd, 0xfc, 0x6f, 0x6e, 0x6d, 0x6c, 0x67, 0x60 };
 
-static CVAR_DEFINE_AUTO( tracerspeed, "6000", 0, "tracer speed" );
+convar_t		*tracerspeed;
-static CVAR_DEFINE_AUTO( tracerlength, "0.8", 0, "tracer length factor" );
+convar_t		*tracerlength;
-static CVAR_DEFINE_AUTO( traceroffset, "30", 0, "tracer starting offset" );
+convar_t		*traceroffset;
 
-static particle_t	*cl_active_particles;
+particle_t	*cl_active_particles;
-static particle_t	*cl_active_tracers;
+particle_t	*cl_active_tracers;
-static particle_t	*cl_free_particles;
+particle_t	*cl_free_particles;
-static particle_t	*cl_particles = NULL;	// particle pool
+particle_t	*cl_particles = NULL;	// particle pool
 static vec3_t	cl_avelocities[NUMVERTEXNORMALS];
 static float	cl_lasttimewarn = 0.0f;
 
-// expand debugging BBOX particle hulls by this many units.
-#define BOX_GAP	0.0f
-
 /*
 ================
 R_LookupColor
@@ -103,9 +100,9 @@ void CL_InitParticles( void )
 		cl_avelocities[i][2] = COM_RandomFloat( 0.0f, 2.55f );
 	}
 
-	Cvar_RegisterVariable( &tracerspeed );
+	tracerspeed = Cvar_Get( "tracerspeed", "6000", 0, "tracer speed" );
-	Cvar_RegisterVariable( &tracerlength );
+	tracerlength = Cvar_Get( "tracerlength", "0.8", 0, "tracer length factor" );
-	Cvar_RegisterVariable( &traceroffset );
+	traceroffset = Cvar_Get( "traceroffset", "30", 0, "tracer starting offset" );
 }
 
 /*
@@ -174,11 +171,11 @@ particle_t * GAME_EXPORT R_AllocParticle( void (*callback)( particle_t*, float )
 {
 	particle_t	*p;
 
-	if( !cl_draw_particles.value )
+	if( !cl_draw_particles->value )
 		return NULL;
 
 	// never alloc particles when we not in game
-	if( cl_clientframetime() == 0.0 ) return NULL;
+//	if( tr.frametime == 0.0 ) return NULL;
 
 	if( !cl_free_particles )
 	{
@@ -221,15 +218,15 @@ R_AllocTracer
 can return NULL if particles is out
 ================
 */
-static particle_t *R_AllocTracer( const vec3_t org, const vec3_t vel, float life )
+particle_t *R_AllocTracer( const vec3_t org, const vec3_t vel, float life )
 {
 	particle_t	*p;
 
-	if( !cl_draw_tracers.value )
+	if( !cl_draw_tracers->value )
 		return NULL;
 
 	// never alloc particles when we not in game
-	if( cl_clientframetime() == 0.0 ) return NULL;
+	//if( tr.frametime == 0.0 ) return NULL;
 
 	if( !cl_free_particles )
 	{
@@ -252,8 +249,8 @@ static particle_t *R_AllocTracer( const vec3_t org, const vec3_t vel, float life
 	VectorCopy( org, p->org );
 	VectorCopy( vel, p->vel );
 	p->die = cl.time + life;
-	p->ramp = tracerlength.value;
+	p->ramp = tracerlength->value;
-	p->color = TRACER_COLORINDEX_DEFAULT; // select custom color
+	p->color = 4; // select custom color
 	p->packedColor = 255; // alpha
 
 	return p;
@@ -265,9 +262,9 @@ VIEWBEAMS MANAGEMENT
 
 ==============================================================
 */
-static BEAM		*cl_active_beams;
+BEAM		*cl_active_beams;
-static BEAM		*cl_free_beams;
+BEAM		*cl_free_beams;
-static BEAM		*cl_viewbeams = NULL;		// beams pool
+BEAM		*cl_viewbeams = NULL;		// beams pool
 
 
 /*
@@ -303,7 +300,7 @@ R_BeamAlloc
 
 ==============
 */
-static BEAM *R_BeamAlloc( void )
+BEAM *R_BeamAlloc( void )
 {
 	BEAM	*pBeam;
 
@@ -326,7 +323,7 @@ R_BeamFree
 
 ==============
 */
-static void R_BeamFree( BEAM *pBeam )
+void R_BeamFree( BEAM *pBeam )
 {
 	// free particles that have died off.
 	R_FreeDeadParticles( &pBeam->particles );
@@ -608,7 +605,7 @@ CL_BeamAttemptToDie
 Check for expired beams
 ==============
 */
-static qboolean CL_BeamAttemptToDie( BEAM *pBeam )
+qboolean CL_BeamAttemptToDie( BEAM *pBeam )
 {
 	Assert( pBeam != NULL );
 
@@ -639,24 +636,12 @@ and all particle trails (if this is a beamfollow)
 */
 void GAME_EXPORT R_BeamKill( int deadEntity )
 {
-	BEAM *beam;
+	cl_entity_t	*pDeadEntity;
 
-	for( beam = cl_active_beams; beam; beam = beam->next )
+	pDeadEntity = R_BeamGetEntity( deadEntity );
-	{
+	if( !pDeadEntity ) return;
-		if( FBitSet( beam->flags, FBEAM_STARTENTITY ) && beam->startEntity == deadEntity )
-		{
-			if( beam->type != TE_BEAMFOLLOW )
-				beam->die = cl.time;
 
-			ClearBits( beam->flags, FBEAM_STARTENTITY );
+	CL_KillDeadBeams( pDeadEntity );
-		}
-
-		if( FBitSet( beam->flags, FBEAM_ENDENTITY ) && beam->endEntity == deadEntity )
-		{
-			beam->die = cl.time;
-			ClearBits( beam->flags, FBEAM_ENDENTITY );
-		}
-	}
 }
 
 /*
@@ -1109,7 +1094,9 @@ void GAME_EXPORT R_ParticleExplosion2( const vec3_t org, int colorStart, int col
 	int		colorMod = 0, packedColor;
 	particle_t	*p;
 
-	packedColor = Host_IsQuakeCompatible( ) ? 255 : 0; // use old code for blob particles
+	if( FBitSet( host.features, ENGINE_QUAKE_COMPATIBLE ))
+		packedColor = 255; // use old code for blob particles
+	else packedColor = 0;
 
 	for( i = 0; i < 512; i++ )
 	{
@@ -1142,7 +1129,9 @@ void GAME_EXPORT R_BlobExplosion( const vec3_t org )
 	particle_t	*p;
 	int		i, j, packedColor;
 
-	packedColor = Host_IsQuakeCompatible( ) ? 255 : 0; // use old code for blob particles
+	if( FBitSet( host.features, ENGINE_QUAKE_COMPATIBLE ))
+		packedColor = 255; // use old code for blob particles
+	else packedColor = 0;
 
 	for( i = 0; i < 1024; i++ )
 	{
@@ -1247,15 +1236,12 @@ R_BloodStream
 particle spray 2
 ===============
 */
-void GAME_EXPORT R_BloodStream( const vec3_t org, const vec3_t ndir, int pcolor, int speed )
+void GAME_EXPORT R_BloodStream( const vec3_t org, const vec3_t dir, int pcolor, int speed )
 {
 	particle_t	*p;
 	int		i, j;
 	float		arc;
 	int		accel = speed; // must be integer due to bug in GoldSrc
-	vec3_t dir;
-
-	VectorNormalize2( ndir, dir );
 
 	for( arc = 0.05f, i = 0; i < 100; i++ )
 	{
@@ -1604,73 +1590,6 @@ void GAME_EXPORT R_RocketTrail( vec3_t start, vec3_t end, int type )
 	}
 }
 
-/*
-===============
-PM_ParticleLine
-
-draw line from particles
-================
-*/
-static void PM_ParticleLine( const vec3_t start, const vec3_t end, int pcolor, float life, float zvel )
-{
-	float	len, curdist;
-	vec3_t	diff, pos;
-
-	// determine distance
-	VectorSubtract( end, start, diff );
-	len = VectorNormalizeLength( diff );
-	curdist = 0;
-
-	while( curdist <= len )
-	{
-		VectorMA( start, curdist, diff, pos );
-		CL_Particle( pos, pcolor, life, 0, zvel );
-		curdist += 2.0f;
-	}
-}
-
-/*
-================
-PM_DrawRectangle
-
-================
-*/
-static void PM_DrawRectangle( const vec3_t tl, const vec3_t bl, const vec3_t tr, const vec3_t br, int pcolor, float life )
-{
-	PM_ParticleLine( tl, bl, pcolor, life, 0 );
-	PM_ParticleLine( bl, br, pcolor, life, 0 );
-	PM_ParticleLine( br, tr, pcolor, life, 0 );
-	PM_ParticleLine( tr, tl, pcolor, life, 0 );
-}
-
-/*
-================
-PM_DrawBBox
-
-================
-*/
-static void PM_DrawBBox( const vec3_t mins, const vec3_t maxs, const vec3_t origin, int pcolor, float life )
-{
-	vec3_t	p[8], tmp;
-	float	gap = BOX_GAP;
-	int	i;
-
-	for( i = 0; i < 8; i++ )
-	{
-		tmp[0] = (i & 1) ? mins[0] - gap : maxs[0] + gap;
-		tmp[1] = (i & 2) ? mins[1] - gap : maxs[1] + gap ;
-		tmp[2] = (i & 4) ? mins[2] - gap : maxs[2] + gap ;
-
-		VectorAdd( tmp, origin, tmp );
-		VectorCopy( tmp, p[i] );
-	}
-
-	for( i = 0; i < 6; i++ )
-	{
-		PM_DrawRectangle( p[boxpnt[i][1]], p[boxpnt[i][0]], p[boxpnt[i][2]], p[boxpnt[i][3]], pcolor, life );
-	}
-}
-
 /*
 ================
 R_ParticleLine
@@ -1834,6 +1753,25 @@ void GAME_EXPORT R_StreakSplash( const vec3_t pos, const vec3_t dir, int color,
 	}
 }
 
+/*
+===============
+R_DebugParticle
+
+just for debug purposes
+===============
+*/
+void R_DebugParticle( const vec3_t pos, byte r, byte g, byte b )
+{
+	particle_t	*p;
+
+	p = R_AllocParticle( NULL );
+	if( !p ) return;
+
+	VectorCopy( pos, p->org );
+	p->color = R_LookupColor( r, g, b );
+	p->die = cl.time + 0.01f;
+}
+
 /*
 ===============
 CL_Particle
@@ -1866,14 +1804,14 @@ void GAME_EXPORT R_TracerEffect( const vec3_t start, const vec3_t end )
 	float	len, speed;
 	float	offset;
 
-	speed = Q_max( tracerspeed.value, 3.0f );
+	speed = Q_max( tracerspeed->value, 3.0f );
 
 	VectorSubtract( end, start, dir );
 	len = VectorLength( dir );
 	if( len == 0.0f ) return;
 
 	VectorScale( dir, 1.0f / len, dir ); // normalize
-	offset = COM_RandomFloat( -10.0f, 9.0f ) + traceroffset.value;
+	offset = COM_RandomFloat( -10.0f, 9.0f ) + traceroffset->value;
 	VectorScale( dir, offset, vel );
 	VectorAdd( start, vel, pos );
 	VectorScale( dir, speed, vel );
@@ -2099,7 +2037,7 @@ void CL_ReadPointFile_f( void )
 	else Con_Printf( "map %s has no leaks!\n", clgame.mapname );
 }
 
-static void CL_FreeDeadBeams( void )
+void CL_FreeDeadBeams( void )
 {
 	BEAM *pBeam, *pNext, *pPrev = NULL;
 	// draw temporary entity beams
@@ -2129,16 +2067,16 @@ static void CL_FreeDeadBeams( void )
 void CL_DrawEFX( float time, qboolean fTrans )
 {
 	CL_FreeDeadBeams();
-	if( cl_draw_beams.value )
+	if( CVAR_TO_BOOL( cl_draw_beams ))
 		ref.dllFuncs.CL_DrawBeams( fTrans, cl_active_beams );
 
 	if( fTrans )
 	{
 		R_FreeDeadParticles( &cl_active_particles );
-		if( cl_draw_particles.value )
+		if( CVAR_TO_BOOL( cl_draw_particles ))
 			ref.dllFuncs.CL_DrawParticles( time, cl_active_particles, PART_SIZE );
 		R_FreeDeadParticles( &cl_active_tracers );
-		if( cl_draw_tracers.value )
+		if( CVAR_TO_BOOL( cl_draw_tracers ))
 			ref.dllFuncs.CL_DrawTracers( time, cl_active_tracers );
 	}
 }

engine/client/cl_events.c

@@ -40,7 +40,7 @@ CL_CalcPlayerVelocity
 compute velocity for a given client
 =============
 */
-static void CL_CalcPlayerVelocity( int idx, vec3_t velocity )
+void CL_CalcPlayerVelocity( int idx, vec3_t velocity )
 {
 	clientdata_t	*pcd;
 	vec3_t		delta;
@@ -78,13 +78,13 @@ CL_DescribeEvent
 
 =============
 */
-static void CL_DescribeEvent( event_info_t *ei, int slot )
+void CL_DescribeEvent( event_info_t *ei, int slot )
 {
 	int		idx = (slot & 63) * 2;
 	con_nprint_t	info;
 	string origin_str = { 0 }; //, angles_str = { 0 };
 
-	if( !cl_showevents.value )
+	if( !cl_showevents->value )
 		return;
 
 	info.time_to_live = 1.0f;
@@ -192,7 +192,7 @@ void CL_RegisterEvent( int lastnum, const char *szEvName, pfnEventHook func )
 	ev = clgame.events[lastnum];
 
 	// NOTE: ev->index will be set later
-	Q_strncpy( ev->name, szEvName, sizeof( ev->name ));
+	Q_strncpy( ev->name, szEvName, MAX_QPATH );
 	ev->func = func;
 }
 
@@ -202,7 +202,7 @@ CL_FireEvent
 
 =============
 */
-static qboolean CL_FireEvent( event_info_t *ei, int slot )
+qboolean CL_FireEvent( event_info_t *ei, int slot )
 {
 	cl_user_event_t	*ev;
 	const char	*name;
@@ -219,24 +219,12 @@ static qboolean CL_FireEvent( event_info_t *ei, int slot )
 		if( !ev )
 		{
 			idx = bound( 1, ei->index, ( MAX_EVENTS - 1 ));
-			Con_Reportf( S_ERROR "%s: %s not precached\n", __func__, cl.event_precache[idx] );
+			Con_Reportf( S_ERROR "CL_FireEvent: %s not precached\n", cl.event_precache[idx] );
 			break;
 		}
 
 		if( ev->index == ei->index )
 		{
-			name = cl.event_precache[ei->index];
-
-			if( cl_trace_events.value )
-			{
-				Con_Printf( "^3EVENT %s AT %.2f %.2f %.2f\n"    // event name
-					"\t%.2f %.2f %i %i %s %s\n", // bool params
-					name, ei->args.origin[0], ei->args.origin[1], ei->args.origin[2],
-					ei->args.fparam1, ei->args.fparam2,
-					ei->args.iparam1, ei->args.iparam2,
-					ei->args.bparam1 ? "TRUE" : "FALSE", ei->args.bparam2 ? "TRUE" : "FALSE" );
-			}
-
 			if( ev->func )
 			{
 				CL_DescribeEvent( ei, slot );
@@ -244,7 +232,8 @@ static qboolean CL_FireEvent( event_info_t *ei, int slot )
 				return true;
 			}
 
-			Con_Reportf( S_ERROR "%s: %s not hooked\n", __func__, name );
+			name = cl.event_precache[ei->index];
+			Con_Reportf( S_ERROR "CL_FireEvent: %s not hooked\n", name );
 			break;
 		}
 	}
@@ -292,7 +281,7 @@ CL_FindEvent
 find first empty event
 =============
 */
-static event_info_t *CL_FindEmptyEvent( void )
+event_info_t *CL_FindEmptyEvent( void )
 {
 	int		i;
 	event_state_t	*es;
@@ -320,7 +309,7 @@ CL_FindEvent
 replace only unreliable events
 =============
 */
-static event_info_t *CL_FindUnreliableEvent( void )
+event_info_t *CL_FindUnreliableEvent( void )
 {
 	event_state_t	*es;
 	event_info_t	*ei;
@@ -350,7 +339,7 @@ CL_QueueEvent
 
 =============
 */
-static void CL_QueueEvent( int flags, int index, float delay, event_args_t *args )
+void CL_QueueEvent( int flags, int index, float delay, event_args_t *args )
 {
 	event_info_t	*ei;
 
@@ -380,7 +369,7 @@ CL_ParseReliableEvent
 
 =============
 */
-void CL_ParseReliableEvent( sizebuf_t *msg, connprotocol_t proto )
+void CL_ParseReliableEvent( sizebuf_t *msg )
 {
 	int		event_index;
 	event_args_t	nullargs, args;
@@ -390,19 +379,11 @@ void CL_ParseReliableEvent( sizebuf_t *msg, connprotocol_t proto )
 
 	event_index = MSG_ReadUBitLong( msg, MAX_EVENT_BITS );
 
+	if( MSG_ReadOneBit( msg ))
+		delay = (float)MSG_ReadWord( msg ) * (1.0f / 100.0f);
+
 	// reliable events not use delta-compression just null-compression
-	if( proto == PROTO_GOLDSRC )
+	MSG_ReadDeltaEvent( msg, &nullargs, &args );
-	{
-		Delta_ReadGSFields( msg, DT_EVENT_T, &nullargs, &args, 0.0f );
-		if( MSG_ReadOneBit( msg ))
-			delay = (float)MSG_ReadWord( msg ) * (1.0f / 100.0f);
-	}
-	else
-	{
-		if( MSG_ReadOneBit( msg ))
-			delay = (float)MSG_ReadWord( msg ) * (1.0f / 100.0f);
-		MSG_ReadDeltaEvent( msg, &nullargs, &args );
-	}
 
 	if( args.entindex > 0 && args.entindex <= cl.maxclients )
 		args.angles[PITCH] *= -3.0f;
@@ -417,43 +398,34 @@ CL_ParseEvent
 
 =============
 */
-void CL_ParseEvent( sizebuf_t *msg, connprotocol_t proto )
+void CL_ParseEvent( sizebuf_t *msg )
 {
 	int		event_index;
 	int		i, num_events;
 	int		packet_index;
-	const event_args_t nullargs = { 0 };
+	event_args_t	nullargs, args;
-	event_args_t args = { 0 };
 	entity_state_t	*state;
 	float		delay;
-	int		entity_bits;
+
+	memset( &nullargs, 0, sizeof( nullargs ));
+	memset( &args, 0, sizeof( args ));
 
 	num_events = MSG_ReadUBitLong( msg, 5 );
 
-	if( proto == PROTO_GOLDSRC )
-		entity_bits = MAX_GOLDSRC_ENTITY_BITS;
-	else if( proto == PROTO_LEGACY )
-		entity_bits = MAX_LEGACY_ENTITY_BITS;
-	else entity_bits = MAX_ENTITY_BITS;
-
 	// parse events queue
 	for( i = 0 ; i < num_events; i++ )
 	{
 		event_index = MSG_ReadUBitLong( msg, MAX_EVENT_BITS );
 
 		if( MSG_ReadOneBit( msg ))
-		{
+			packet_index = MSG_ReadUBitLong( msg, cls.legacymode ? MAX_LEGACY_ENTITY_BITS : MAX_ENTITY_BITS );
-			packet_index = MSG_ReadUBitLong( msg, entity_bits );
-
-			if( MSG_ReadOneBit( msg ))
-			{
-				if( proto == PROTO_GOLDSRC )
-					Delta_ReadGSFields( msg, DT_EVENT_T, &nullargs, &args, 0.0f );
-				else MSG_ReadDeltaEvent( msg, &nullargs, &args );
-			}
-		}
 		else packet_index = -1;
 
+		if( MSG_ReadOneBit( msg ))
+		{
+			MSG_ReadDeltaEvent( msg, &nullargs, &args );
+		}
+
 		if( MSG_ReadOneBit( msg ))
 			delay = (float)MSG_ReadWord( msg ) * (1.0f / 100.0f);
 		else delay = 0.0f;
@@ -514,14 +486,14 @@ void GAME_EXPORT CL_PlaybackEvent( int flags, const edict_t *pInvoker, word even
 	// first check event for out of bounds
 	if( eventindex < 1 || eventindex >= MAX_EVENTS )
 	{
-		Con_DPrintf( S_ERROR "%s: invalid eventindex %i\n", __func__, eventindex );
+		Con_DPrintf( S_ERROR "CL_PlaybackEvent: invalid eventindex %i\n", eventindex );
 		return;
 	}
 
 	// check event for precached
 	if( !CL_EventIndex( cl.event_precache[eventindex] ))
 	{
-		Con_DPrintf( S_ERROR "%s: event %i was not precached\n", __func__, eventindex );
+		Con_DPrintf( S_ERROR "CL_PlaybackEvent: event %i was not precached\n", eventindex );
 		return;
 	}
 

engine/client/cl_font.c

@@ -46,35 +46,10 @@ static int CL_LoadFontTexture( const char *fontname, uint texFlags, int *width )
 	return tex;
 }
 
-static int CL_FontRenderMode( convar_t *fontrender )
+qboolean Con_LoadFixedWidthFont( const char *fontname, cl_font_t *font, float scale, int rendermode, uint texFlags )
-{
-	switch((int)fontrender->value )
-	{
-	case 0:
-		return kRenderTransAdd;
-	case 1:
-		return kRenderTransAlpha;
-	case 2:
-		return kRenderTransTexture;
-	default:
-		Cvar_DirectSet( fontrender, fontrender->def_string );
-	}
-
-	return kRenderTransTexture;
-}
-
-void CL_SetFontRendermode( cl_font_t *font )
-{
-	ref.dllFuncs.GL_SetRenderMode( CL_FontRenderMode( font->rendermode ));
-}
-
-qboolean Con_LoadFixedWidthFont( const char *fontname, cl_font_t *font, float scale, convar_t *rendermode, uint texFlags )
 {
 	int font_width, i;
 
-	if( !rendermode )
-		return false;
-
 	if( font->valid )
 		return true; // already loaded
 
@@ -85,6 +60,7 @@ qboolean Con_LoadFixedWidthFont( const char *fontname, cl_font_t *font, float sc
 	font->type = FONT_FIXED;
 	font->valid = true;
 	font->scale = scale;
+	font->nearest = FBitSet( texFlags, TF_NEAREST );
 	font->rendermode = rendermode;
 	font->charHeight = Q_rint( font_width / 16 * scale );
 
@@ -101,16 +77,13 @@ qboolean Con_LoadFixedWidthFont( const char *fontname, cl_font_t *font, float sc
 	return true;
 }
 
-qboolean Con_LoadVariableWidthFont( const char *fontname, cl_font_t *font, float scale, convar_t *rendermode, uint texFlags )
+qboolean Con_LoadVariableWidthFont( const char *fontname, cl_font_t *font, float scale, int rendermode, uint texFlags )
 {
 	fs_offset_t length;
 	qfont_t src;
 	byte *pfile;
 	int font_width, i;
 
-	if( !rendermode )
-		return false;
-
 	if( font->valid )
 		return true;
 
@@ -133,7 +106,8 @@ qboolean Con_LoadVariableWidthFont( const char *fontname, cl_font_t *font, float
 
 	font->type = FONT_VARIABLE;
 	font->valid = true;
-	font->scale = scale ? scale : 1.0f;
+	font->scale = scale;
+	font->nearest = FBitSet( texFlags, TF_NEAREST );
 	font->rendermode = rendermode;
 	font->charHeight = Q_rint( src.rowheight * scale );
 
@@ -205,8 +179,7 @@ int CL_DrawCharacter( float x, float y, int number, rgba_t color, cl_font_t *fon
 		return font->charWidths[number];
 
 	rc = &font->fontRc[number];
-
+	if( font->nearest || font->scale <= 1.0f )
-	if( font->scale <= 1.f || !REF_GET_PARM( PARM_TEX_FILTERING, font->hFontTexture ))
 		half = 0;
 
 	s1 = ((float)rc->left + half ) / texw;
@@ -220,7 +193,7 @@ int CL_DrawCharacter( float x, float y, int number, rgba_t color, cl_font_t *fon
 		SPR_AdjustSize( &x, &y, &w, &h );
 
 	if( !FBitSet( flags, FONT_DRAW_NORENDERMODE ))
-		CL_SetFontRendermode( font );
+		ref.dllFuncs.GL_SetRenderMode( font->rendermode );
 
 	// don't apply color to fixed fonts it's already colored
 	if( font->type != FONT_FIXED || REF_GET_PARM( PARM_TEX_GLFORMAT, font->hFontTexture ) == 0x8045 ) // GL_LUMINANCE8_ALPHA8
@@ -243,7 +216,7 @@ int CL_DrawString( float x, float y, const char *s, rgba_t color, cl_font_t *fon
 		Con_UtfProcessChar( 0 ); // clear utf state
 
 	if( !FBitSet( flags, FONT_DRAW_NORENDERMODE ))
-		CL_SetFontRendermode( font );
+		ref.dllFuncs.GL_SetRenderMode( font->rendermode );
 
 	Vector4Copy( color, current_color );
 

engine/client/cl_frame.c

@@ -24,7 +24,7 @@ GNU General Public License for more details.
 #include "sound.h"
 #include "input.h"
 
-// #define STUDIO_INTERPOLATION_FIX
+#define STUDIO_INTERPOLATION_FIX
 
 /*
 ==================
@@ -52,30 +52,19 @@ CL_UpdatePositions
 Store another position into interpolation circular buffer
 ==================
 */
-static void CL_UpdatePositions( cl_entity_t *ent )
+void CL_UpdatePositions( cl_entity_t *ent )
 {
-	position_history_t	*ph, *prev;
+	position_history_t	*ph;
-
-	prev = &ent->ph[ent->current_position];
 
 	ent->current_position = (ent->current_position + 1) & HISTORY_MASK;
 	ph = &ent->ph[ent->current_position];
 	VectorCopy( ent->curstate.origin, ph->origin );
 	VectorCopy( ent->curstate.angles, ph->angles );
 
-	ph->animtime = ent->curstate.animtime;
+	if( ent->model && ent->model->type == mod_brush )
-
+		ph->animtime = ent->curstate.animtime;
-	// a1ba: for some reason, this sometimes still may happen
+	else
-	// at this time, I'm not sure whether this bug happens in delta readwrite code
+		ph->animtime = cl.time;
-	// or server just decides to go backwards and really sends these values
-	if( ph->animtime < prev->animtime )
-	{
-		// try to deduce real animtime by looking up the difference between
-		// server messages (cl.mtime is never modified ny the interpolation code)
-		float diff = Q_max( 0, ent->curstate.msg_time - ent->prevstate.msg_time );
-
-		ph->animtime = prev->animtime + diff;
-	}
 }
 
 /*
@@ -85,7 +74,7 @@ CL_ResetPositions
 Interpolation init or reset after teleporting
 ==================
 */
-static void CL_ResetPositions( cl_entity_t *ent )
+void CL_ResetPositions( cl_entity_t *ent )
 {
 	position_history_t	store;
 
@@ -95,7 +84,8 @@ static void CL_ResetPositions( cl_entity_t *ent )
 	ent->current_position = 1;
 
 	memset( ent->ph, 0, sizeof( position_history_t ) * HISTORY_MAX );
-	ent->ph[1] = ent->ph[0] = store;
+	memcpy( &ent->ph[1], &store, sizeof( position_history_t ));
+	memcpy( &ent->ph[0], &store, sizeof( position_history_t ));
 }
 
 /*
@@ -106,7 +96,7 @@ check for instant movement in case
 we don't want interpolate this
 ==================
 */
-static qboolean CL_EntityTeleported( cl_entity_t *ent )
+qboolean CL_EntityTeleported( cl_entity_t *ent )
 {
 	float	len, maxlen;
 	vec3_t	delta;
@@ -127,7 +117,7 @@ CL_CompareTimestamps
 round-off floating errors
 ==================
 */
-static qboolean CL_CompareTimestamps( float t1, float t2 )
+qboolean CL_CompareTimestamps( float t1, float t2 )
 {
 	int	iTime1 = t1 * 1000;
 	int	iTime2 = t2 * 1000;
@@ -142,9 +132,9 @@ CL_EntityIgnoreLerp
 some ents will be ignore lerping
 ==================
 */
-static qboolean CL_EntityIgnoreLerp( cl_entity_t *e )
+qboolean CL_EntityIgnoreLerp( cl_entity_t *e )
 {
-	if( cl_nointerp.value > 0.f )
+	if( cl_nointerp->value > 0.f )
 		return true;
 
 	if( e->model && e->model->type == mod_alias )
@@ -159,7 +149,7 @@ CL_EntityCustomLerp
 
 ==================
 */
-static qboolean CL_EntityCustomLerp( cl_entity_t *e )
+qboolean CL_EntityCustomLerp( cl_entity_t *e )
 {
 	switch( e->curstate.movetype )
 	{
@@ -169,13 +159,6 @@ static qboolean CL_EntityCustomLerp( cl_entity_t *e )
 	case MOVETYPE_FLY:
 	case MOVETYPE_COMPOUND:
 		return false;
-
-	// ABSOLUTELY STUPID HACK TO ALLOW MONSTERS
-	// INTERPOLATION IN GRAVGUNMOD COOP
-	// MUST BE REMOVED ONCE WE REMOVE 48 PROTO SUPPORT
-	case MOVETYPE_TOSS:
-		if( cls.legacymode == PROTO_LEGACY && e->model && e->model->type == mod_studio )
-			return false;
 	}
 
 	return true;
@@ -188,7 +171,7 @@ CL_ParametricMove
 check for parametrical moved entities
 ==================
 */
-static qboolean CL_ParametricMove( cl_entity_t *ent )
+qboolean CL_ParametricMove( cl_entity_t *ent )
 {
 	float	frac, dt, t;
 	vec3_t	delta;
@@ -225,7 +208,7 @@ CL_UpdateLatchedVars
 
 ====================
 */
-static void CL_UpdateLatchedVars( cl_entity_t *ent )
+void CL_UpdateLatchedVars( cl_entity_t *ent )
 {
 	if( !ent->model || ( ent->model->type != mod_alias && ent->model->type != mod_studio ))
 		return; // below fields used only for alias and studio interpolation
@@ -320,7 +303,7 @@ CL_ProcessEntityUpdate
 apply changes since new frame received
 ==================
 */
-static void CL_ProcessEntityUpdate( cl_entity_t *ent )
+void CL_ProcessEntityUpdate( cl_entity_t *ent )
 {
 	qboolean	parametric;
 
@@ -366,10 +349,11 @@ CL_FindInterpolationUpdates
 find two timestamps
 ==================
 */
-static qboolean CL_FindInterpolationUpdates( cl_entity_t *ent, double targettime, position_history_t **ph0, position_history_t **ph1 )
+qboolean CL_FindInterpolationUpdates( cl_entity_t *ent, float targettime, position_history_t **ph0, position_history_t **ph1 )
 {
 	qboolean	extrapolate = true;
 	uint		i, i0, i1, imod;
+	float	at;
 
 	imod = ent->current_position;
 	i0 = (imod - 0) & HISTORY_MASK;	// curpos (lerp end)
@@ -377,10 +361,8 @@ static qboolean CL_FindInterpolationUpdates( cl_entity_t *ent, double targettime
 
 	for( i = 1; i < HISTORY_MAX - 1; i++ )
 	{
-		double at = ent->ph[( imod - i ) & HISTORY_MASK].animtime;
+		at = ent->ph[( imod - i ) & HISTORY_MASK].animtime;
-
+		if( at == 0.0f ) break;
-		if( at == 0.0f )
-			break;
 
 		if( targettime > at )
 		{
@@ -405,14 +387,15 @@ CL_PureOrigin
 non-local players interpolation
 ==================
 */
-static void CL_PureOrigin( cl_entity_t *ent, double t, vec3_t outorigin, vec3_t outangles )
+void CL_PureOrigin( cl_entity_t *ent, float t, vec3_t outorigin, vec3_t outangles )
 {
-	double		t1, t0, frac;
+	qboolean		extrapolate;
+	float		t1, t0, frac;
 	position_history_t	*ph0, *ph1;
 	vec3_t		delta;
 
 	// NOTE: ph0 is next, ph1 is a prev
-	CL_FindInterpolationUpdates( ent, t, &ph0, &ph1 );
+	extrapolate = CL_FindInterpolationUpdates( ent, t, &ph0, &ph1 );
 
 	if ( !ph0 || !ph1 )
 		return;
@@ -420,7 +403,7 @@ static void CL_PureOrigin( cl_entity_t *ent, double t, vec3_t outorigin, vec3_t
 	t0 = ph0->animtime;
 	t1 = ph1->animtime;
 
-	if( t0 != 0.0 )
+	if( t0 != 0.0f )
 	{
 		vec4_t	q, q1, q2;
 
@@ -428,9 +411,9 @@ static void CL_PureOrigin( cl_entity_t *ent, double t, vec3_t outorigin, vec3_t
 
 		if( !Q_equal( t0, t1 ))
 			frac = ( t - t1 ) / ( t0 - t1 );
-		else frac = 1.0;
+		else frac = 1.0f;
 
-		frac = bound( 0.0, frac, 1.2 );
+		frac = bound( 0.0f, frac, 1.2f );
 
 		VectorMA( ph1->origin, frac, delta, outorigin );
 
@@ -454,11 +437,11 @@ CL_InterpolateModel
 non-players interpolation
 ==================
 */
-static int CL_InterpolateModel( cl_entity_t *e )
+int CL_InterpolateModel( cl_entity_t *e )
 {
 	position_history_t  *ph0 = NULL, *ph1 = NULL;
 	vec3_t		origin, angles, delta;
-	double		t, t1, t2, frac;
+	float		t, t1, t2, frac;
 	vec4_t		q, q1, q2;
 
 	VectorCopy( e->curstate.origin, e->origin );
@@ -481,13 +464,13 @@ static int CL_InterpolateModel( cl_entity_t *e )
 	if( cl.maxclients <= 1 )
 		return 1;
 
-	if( e->model->type == mod_brush && !cl_bmodelinterp.value )
+	if( e->model->type == mod_brush && !cl_bmodelinterp->value )
 		return 1;
 
 	if( cl.local.moving && cl.local.onground == e->index )
 		return 1;
 
-	t = cl.time - cl_interp.value;
+	t = cl.time - cl_interp->value;
 	CL_FindInterpolationUpdates( e, t, &ph0, &ph1 );
 
 	if( ph0 == NULL || ph1 == NULL )
@@ -506,7 +489,9 @@ static int CL_InterpolateModel( cl_entity_t *e )
 		return 0;
 	}
 
-	if( Q_equal( t2, t1 ))
+	// HACKHACK: workaround buggy position history animtime
+	// going backward sometimes
+	if( Q_equal( t2, t1 ) || t2 < t1 )
 	{
 		VectorCopy( ph0->origin, e->origin );
 		VectorCopy( ph0->angles, e->angles );
@@ -544,7 +529,7 @@ interpolate non-local clients
 */
 void CL_ComputePlayerOrigin( cl_entity_t *ent )
 {
-	double	targettime;
+	float	targettime;
 	vec4_t	q, q1, q2;
 	vec3_t	origin;
 	vec3_t	angles;
@@ -552,7 +537,7 @@ void CL_ComputePlayerOrigin( cl_entity_t *ent )
 	if( !ent->player )
 		return;
 
-	if( cl_nointerp.value > 0.f )
+	if( cl_nointerp->value > 0.f )
 	{
 		VectorCopy( ent->curstate.angles, ent->angles );
 		VectorCopy( ent->curstate.origin, ent->origin );
@@ -570,7 +555,7 @@ void CL_ComputePlayerOrigin( cl_entity_t *ent )
 		return;
 	}
 
-	targettime = cl.time - cl_interp.value;
+	targettime = cl.time - cl_interp->value;
 	CL_PureOrigin( ent, targettime, origin, angles );
 
 	VectorCopy( angles, ent->angles );
@@ -584,7 +569,7 @@ CL_ProcessPlayerState
 process player states after the new packet has received
 =================
 */
-static void CL_ProcessPlayerState( int playerindex, entity_state_t *state )
+void CL_ProcessPlayerState( int playerindex, entity_state_t *state )
 {
 	entity_state_t	*ps;
 
@@ -604,7 +589,7 @@ reset latched state if this frame entity was teleported
 or just EF_NOINTERP was set
 =================
 */
-static void CL_ResetLatchedState( int pnum, frame_t *frame, cl_entity_t *ent )
+void CL_ResetLatchedState( int pnum, frame_t *frame, cl_entity_t *ent )
 {
 	if( CHECKVISBIT( frame->flags, pnum ))
 	{
@@ -669,9 +654,9 @@ FRAME PARSING
 
 =========================================================================
 */
-static qboolean CL_ParseEntityNumFromPacket( sizebuf_t *msg, int *newnum, connprotocol_t proto )
+static qboolean CL_ParseEntityNumFromPacket( sizebuf_t *msg, int *newnum )
 {
-	if( proto == PROTO_LEGACY )
+	if( cls.legacymode )
 	{
 		*newnum = MSG_ReadWord( msg );
 		if( *newnum == 0 )
@@ -694,7 +679,7 @@ CL_FlushEntityPacket
 Read and ignore whole entity packet.
 =================
 */
-static void CL_FlushEntityPacket( sizebuf_t *msg, connprotocol_t proto )
+void CL_FlushEntityPacket( sizebuf_t *msg )
 {
 	int		newnum;
 	entity_state_t	from, to;
@@ -707,57 +692,16 @@ static void CL_FlushEntityPacket( sizebuf_t *msg, connprotocol_t proto )
 	// read it all, but ignore it
 	while( 1 )
 	{
-		if( !CL_ParseEntityNumFromPacket( msg, &newnum, proto ))
+		if( !CL_ParseEntityNumFromPacket( msg, &newnum ))
 			break; // done
 
 		if( MSG_CheckOverflow( msg ))
-			Host_Error( "%s: overflow\n", __func__ );
+			Host_Error( "CL_FlushEntityPacket: overflow\n" );
 
 		MSG_ReadDeltaEntity( msg, &from, &to, newnum, CL_IsPlayerIndex( newnum ) ? DELTA_PLAYER : DELTA_ENTITY, cl.mtime[0] );
 	}
 }
 
-qboolean CL_ValidateDeltaPacket( uint oldpacket, frame_t *oldframe )
-{
-	int subtracted = ( cls.netchan.incoming_sequence - oldpacket ) & 0xFF;
-
-	if( subtracted == 0 )
-	{
-		Con_NPrintf( 2, "^3Warning:^1 update too old\n^7\n" );
-		return false;
-	}
-
-	if( subtracted >= CL_UPDATE_MASK )
-	{
-		// we can't use this, it is too old
-		Con_NPrintf( 2, "^3Warning:^1 delta frame is too old^7\n" );
-		return false;
-	}
-
-	if(( cls.next_client_entities - oldframe->first_entity ) > ( cls.num_client_entities - NUM_PACKET_ENTITIES ))
-	{
-		Con_NPrintf( 2, "^3Warning:^1 delta frame is too old^7\n" );
-		return false;
-	}
-
-	return true;
-}
-
-int CL_UpdateOldEntNum( int oldindex, frame_t *oldframe, entity_state_t **oldent )
-{
-	if( !oldframe )
-	{
-		*oldent = NULL;
-		return MAX_ENTNUMBER;
-	}
-
-	if( oldindex >= oldframe->num_entities )
-		return MAX_ENTNUMBER;
-
-	*oldent = &cls.packet_entities[(oldframe->first_entity + oldindex) % cls.num_client_entities];
-	return (*oldent)->number;
-}
-
 /*
 =================
 CL_DeltaEntity
@@ -765,7 +709,7 @@ CL_DeltaEntity
 processing delta update
 =================
 */
-static void CL_DeltaEntity( sizebuf_t *msg, frame_t *frame, int newnum, entity_state_t *old, qboolean has_update )
+void CL_DeltaEntity( sizebuf_t *msg, frame_t *frame, int newnum, entity_state_t *old, qboolean has_update )
 {
 	cl_entity_t	*ent;
 	entity_state_t	*state;
@@ -780,7 +724,7 @@ static void CL_DeltaEntity( sizebuf_t *msg, frame_t *frame, int newnum, entity_s
 
 	if(( newnum < 0 ) || ( newnum >= clgame.maxEntities ))
 	{
-		Con_DPrintf( S_ERROR "%s: invalid newnum: %d\n", __func__, newnum );
+		Con_DPrintf( S_ERROR "CL_DeltaEntity: invalid newnum: %d\n", newnum );
 		if( has_update )
 			MSG_ReadDeltaEntity( msg, old, state, newnum, delta_type, cl.mtime[0] );
 		return;
@@ -792,7 +736,7 @@ static void CL_DeltaEntity( sizebuf_t *msg, frame_t *frame, int newnum, entity_s
 
 	if( has_update )
 		alive = MSG_ReadDeltaEntity( msg, old, state, newnum, delta_type, cl.mtime[0] );
-	else *state = *old;
+	else memcpy( state, old, sizeof( entity_state_t ));
 
 	if( !alive )
 	{
@@ -828,7 +772,7 @@ An svc_packetentities has just been parsed, deal with the
 rest of the data stream.
 ==================
 */
-int CL_ParsePacketEntities( sizebuf_t *msg, qboolean delta, connprotocol_t proto )
+int CL_ParsePacketEntities( sizebuf_t *msg, qboolean delta )
 {
 	frame_t		*newframe, *oldframe;
 	int		oldindex, newnum, oldnum;
@@ -844,7 +788,7 @@ int CL_ParsePacketEntities( sizebuf_t *msg, qboolean delta, connprotocol_t proto
 		CL_WriteDemoJumpTime();
 
 	// sentinel count. save it for debug checking
-	if( proto == PROTO_LEGACY )
+	if( cls.legacymode )
 		count = MSG_ReadWord( msg );
 	else count = MSG_ReadUBitLong( msg, MAX_VISIBLE_PACKET_BITS ) + 1;
 
@@ -858,12 +802,32 @@ int CL_ParsePacketEntities( sizebuf_t *msg, qboolean delta, connprotocol_t proto
 
 	if( delta )
 	{
-		uint oldpacket = MSG_ReadByte( msg );
+		int	subtracted;
+
+		oldpacket = MSG_ReadByte( msg );
+		subtracted = ( cls.netchan.incoming_sequence - oldpacket ) & 0xFF;
+
+		if( subtracted == 0 )
+		{
+			Con_NPrintf( 2, "^3Warning:^1 update too old\n^7\n" );
+			CL_FlushEntityPacket( msg );
+			return playerbytes;
+		}
+
+		if( subtracted >= CL_UPDATE_MASK )
+		{
+			// we can't use this, it is too old
+			Con_NPrintf( 2, "^3Warning:^1 delta frame is too old^7\n" );
+			CL_FlushEntityPacket( msg );
+			return playerbytes;
+		}
+
 		oldframe = &cl.frames[oldpacket & CL_UPDATE_MASK];
 
-		if( !CL_ValidateDeltaPacket( oldpacket, oldframe ))
+		if(( cls.next_client_entities - oldframe->first_entity ) > ( cls.num_client_entities - NUM_PACKET_ENTITIES ))
 		{
-			CL_FlushEntityPacket( msg, proto );
+			Con_NPrintf( 2, "^3Warning:^1 delta frame is too old^7\n" );
+			CL_FlushEntityPacket( msg );
 			return playerbytes;
 		}
 	}
@@ -881,15 +845,31 @@ int CL_ParsePacketEntities( sizebuf_t *msg, qboolean delta, connprotocol_t proto
 
 	oldent = NULL;
 	oldindex = 0;
-	oldnum = CL_UpdateOldEntNum( oldindex, oldframe, &oldent );
+
+	if( !oldframe )
+	{
+		oldnum = MAX_ENTNUMBER;
+	}
+	else
+	{
+		if( oldindex >= oldframe->num_entities )
+		{
+			oldnum = MAX_ENTNUMBER;
+		}
+		else
+		{
+			oldent = &cls.packet_entities[(oldframe->first_entity+oldindex) % cls.num_client_entities];
+			oldnum = oldent->number;
+		}
+	}
 
 	while( 1 )
 	{
-		if( !CL_ParseEntityNumFromPacket( msg, &newnum, proto ))
+		if( !CL_ParseEntityNumFromPacket( msg, &newnum ))
 			break; // done
 
 		if( MSG_CheckOverflow( msg ))
-			Host_Error( "%s: overflow\n", __func__ );
+			Host_Error( "CL_ParsePacketEntities: overflow\n" );
 
 		player = CL_IsPlayerIndex( newnum );
 
@@ -897,7 +877,17 @@ int CL_ParsePacketEntities( sizebuf_t *msg, qboolean delta, connprotocol_t proto
 		{
 			// one or more entities from the old packet are unchanged
 			CL_DeltaEntity( msg, newframe, oldnum, oldent, false );
-			oldnum = CL_UpdateOldEntNum( ++oldindex, oldframe, &oldent );
+			oldindex++;
+
+			if( oldindex >= oldframe->num_entities )
+			{
+				oldnum = MAX_ENTNUMBER;
+			}
+			else
+			{
+				oldent = &cls.packet_entities[(oldframe->first_entity+oldindex) % cls.num_client_entities];
+				oldnum = oldent->number;
+			}
 		}
 
 		if( oldnum == newnum )
@@ -906,7 +896,17 @@ int CL_ParsePacketEntities( sizebuf_t *msg, qboolean delta, connprotocol_t proto
 			bufStart = MSG_GetNumBytesRead( msg );
 			CL_DeltaEntity( msg, newframe, newnum, oldent, true );
 			if( player ) playerbytes += MSG_GetNumBytesRead( msg ) - bufStart;
-			oldnum = CL_UpdateOldEntNum( ++oldindex, oldframe, &oldent );
+			oldindex++;
+
+			if( oldindex >= oldframe->num_entities )
+			{
+				oldnum = MAX_ENTNUMBER;
+			}
+			else
+			{
+				oldent = &cls.packet_entities[(oldframe->first_entity+oldindex) % cls.num_client_entities];
+				oldnum = oldent->number;
+			}
 			continue;
 		}
 
@@ -925,11 +925,21 @@ int CL_ParsePacketEntities( sizebuf_t *msg, qboolean delta, connprotocol_t proto
 	{
 		// one or more entities from the old packet are unchanged
 		CL_DeltaEntity( msg, newframe, oldnum, oldent, false );
-		oldnum = CL_UpdateOldEntNum( ++oldindex, oldframe, &oldent );
+		oldindex++;
+
+		if( oldindex >= oldframe->num_entities )
+		{
+			oldnum = MAX_ENTNUMBER;
+		}
+		else
+		{
+			oldent = &cls.packet_entities[(oldframe->first_entity+oldindex) % cls.num_client_entities];
+			oldnum = oldent->number;
+		}
 	}
 
 	if( newframe->num_entities != count && newframe->num_entities != 0 )
-		Con_Reportf( S_WARN "%s%s: (%i should be %i)\n", __func__, delta ? "Delta" : "", newframe->num_entities, count );
+		Con_Reportf( S_WARN "CL_Parse%sPacketEntities: (%i should be %i)\n", delta ? "Delta" : "", newframe->num_entities, count );
 
 	if( !newframe->valid )
 		return playerbytes; // frame is not valid but message was parsed
@@ -947,7 +957,7 @@ int CL_ParsePacketEntities( sizebuf_t *msg, qboolean delta, connprotocol_t proto
 		cls.signon = SIGNONS;
 
 		// Clear loading plaque.
-		CL_SignonReply( proto );
+		CL_SignonReply ();
 	}
 
 	return playerbytes;
@@ -1031,7 +1041,7 @@ CL_LinkCustomEntity
 Add server beam to draw list
 =============
 */
-static void CL_LinkCustomEntity( cl_entity_t *ent, entity_state_t *state )
+void CL_LinkCustomEntity( cl_entity_t *ent, entity_state_t *state )
 {
 	ent->curstate.movetype = state->modelindex; // !!!
 
@@ -1054,7 +1064,7 @@ Create visible entities in the correct position
 for all current players
 =============
 */
-static void CL_LinkPlayers( frame_t *frame )
+void CL_LinkPlayers( frame_t *frame )
 {
 	entity_state_t	*state;
 	cl_entity_t	*ent;
@@ -1137,7 +1147,7 @@ CL_LinkPacketEntities
 
 ===============
 */
-static void CL_LinkPacketEntities( frame_t *frame )
+void CL_LinkPacketEntities( frame_t *frame )
 {
 	cl_entity_t	*ent;
 	entity_state_t	*state;
@@ -1161,7 +1171,7 @@ static void CL_LinkPacketEntities( frame_t *frame )
 
 		if( !ent )
 		{
-			Con_Reportf( S_ERROR "%s: bad entity %i\n", __func__, state->number );
+			Con_Reportf( S_ERROR "CL_LinkPacketEntity: bad entity %i\n", state->number );
 			continue;
 		}
 
@@ -1202,33 +1212,17 @@ static void CL_LinkPacketEntities( frame_t *frame )
 #else
 					if( ent->lastmove >= cl.time )
 					{
-						float at = ent->curstate.animtime;
-
 						CL_ResetLatchedVars( ent, true );
-
-						if( cl_fixmodelinterpolationartifacts.value )
-							ent->latched.prevanimtime = ent->curstate.animtime = at;
-
 						VectorCopy( ent->curstate.origin, ent->latched.prevorigin );
 						VectorCopy( ent->curstate.angles, ent->latched.prevangles );
 
-						if( !FBitSet( host.features, ENGINE_COMPUTE_STUDIO_LERP ))
+						// disable step interpolation in client.dll
-						{
+						ent->curstate.movetype = MOVETYPE_NONE;
-							// disable step interpolation in client.dll
-							ent->curstate.movetype = MOVETYPE_NONE;
-						}
 					}
 					else
 					{
-						if( FBitSet( host.features, ENGINE_COMPUTE_STUDIO_LERP ))
+						// restore step interpolation in client.dll
-						{
+						ent->curstate.movetype = MOVETYPE_STEP;
-							interpolate = true;
-						}
-						else
-						{
-							// restore step interpolation in client.dll
-							ent->curstate.movetype = MOVETYPE_STEP;
-						}
 					}
 #endif
 				}
@@ -1253,24 +1247,11 @@ static void CL_LinkPacketEntities( frame_t *frame )
 				if ( !CL_InterpolateModel( ent ))
 					continue;
 			}
-			// a1ba: in GoldSrc this is done for cstrike and czero
+			else if( ent->curstate.movetype == MOVETYPE_STEP && !NET_IsLocalAddress( cls.netchan.remote_address ))
-			// but let modders use this as an engine feature
-			else if( FBitSet( host.features, ENGINE_STEP_POSHISTORY_LERP ) &&
-				ent->curstate.movetype == MOVETYPE_STEP && !NET_IsLocalAddress( cls.netchan.remote_address ))
 			{
 				if( !CL_InterpolateModel( ent ))
 					continue;
 			}
-#if 0
-			// ABSOLUTELY STUPID HACK TO ALLOW MONSTERS
-			// INTERPOLATION IN GRAVGUNMOD COOP
-			// MUST BE REMOVED ONCE WE REMOVE 48 PROTO SUPPORT
-			else if( cls.legacymode == PROTO_LEGACY && ent->model->type == mod_studio && ent->curstate.movetype == MOVETYPE_TOSS )
-			{
-				if( !CL_InterpolateModel( ent ))
-					continue;
-			}
-#endif
 			else
 			{
 				// no interpolation right now
@@ -1466,3 +1447,9 @@ qboolean CL_GetMovieSpatialization( rawchan_t *ch )
 
 	return true;
 }
+
+void CL_ExtraUpdate( void )
+{
+	clgame.dllFuncs.IN_Accumulate();
+	S_ExtraUpdate();
+}

engine/client/cl_gameui.c

@@ -25,14 +25,6 @@ static void 	UI_UpdateUserinfo( void );
 
 gameui_static_t	gameui;
 
-static void UI_ToggleAllowConsole_f( void )
-{
-	host.allow_console = host.allow_console_init = true;
-
-	if( gameui.globals )
-		gameui.globals->developer = true;
-}
-
 void UI_UpdateMenu( float realtime )
 {
 	if( !gameui.hInstance ) return;
@@ -224,14 +216,12 @@ UI_ShowConnectionWarning
 show message box
 =================
 */
-qboolean UI_ShowMessageBox( const char *text )
+void UI_ShowMessageBox( const char *text )
 {
 	if( gameui.dllFuncs2.pfnShowMessageBox )
 	{
 		gameui.dllFuncs2.pfnShowMessageBox( text );
-		return true;
 	}
-	return false;
 }
 
 void UI_ConnectionProgress_Disconnect( void )
@@ -407,61 +397,28 @@ void Host_Credits( void )
 	gameui.dllFuncs.pfnFinalCredits();
 }
 
-static void UI_ConvertGameInfo( gameinfo2_t *out, const gameinfo_t *in )
+static void UI_ConvertGameInfo( GAMEINFO *out, gameinfo_t *in )
 {
-	out->gi_version = GAMEINFO_VERSION;
-
 	Q_strncpy( out->gamefolder, in->gamefolder, sizeof( out->gamefolder ));
 	Q_strncpy( out->startmap, in->startmap, sizeof( out->startmap ));
 	Q_strncpy( out->trainmap, in->trainmap, sizeof( out->trainmap ));
-	Q_strncpy( out->demomap, in->demomap, sizeof( out->demomap ));
 	Q_strncpy( out->title, in->title, sizeof( out->title ));
 	Q_snprintf( out->version, sizeof( out->version ), "%g", in->version );
-	Q_strncpy( out->iconpath, in->iconpath, sizeof( out->iconpath ));
 
 	Q_strncpy( out->game_url, in->game_url, sizeof( out->game_url ));
 	Q_strncpy( out->update_url, in->update_url, sizeof( out->update_url ));
-	out->size = in->size;
+	Q_strncpy( out->size, Q_pretifymem( in->size, 0 ), sizeof( out->size ));
 	Q_strncpy( out->type, in->type, sizeof( out->type ));
 	Q_strncpy( out->date, in->date, sizeof( out->date ));
 
 	out->gamemode = in->gamemode;
 
 	if( in->nomodels )
-		SetBits( out->flags, GFL_NOMODELS );
+		out->flags |= GFL_NOMODELS;
 	if( in->noskills )
-		SetBits( out->flags, GFL_NOSKILLS );
+		out->flags |= GFL_NOSKILLS;
 	if( in->render_picbutton_text )
-		SetBits( out->flags, GFL_RENDER_PICBUTTON_TEXT );
+		out->flags |= GFL_RENDER_PICBUTTON_TEXT;
-	if( in->hd_background )
-		SetBits( out->flags, GFL_HD_BACKGROUND );
-	if( in->animated_title )
-		SetBits( out->flags, GFL_ANIMATED_TITLE );
-}
-
-static void UI_ToOldGameInfo( GAMEINFO *out, const gameinfo2_t *in )
-{
-	Q_strncpy( out->gamefolder, in->gamefolder, sizeof( out->gamefolder ));
-	Q_strncpy( out->startmap, in->startmap, sizeof( out->startmap ));
-	Q_strncpy( out->trainmap, in->trainmap, sizeof( out->trainmap ));
-	Q_strncpy( out->title, in->title, sizeof( out->title ));
-	Q_strncpy( out->version, in->version, sizeof( out->version ));
-	out->flags = in->flags & 0xFFFF;
-	Q_strncpy( out->game_url, in->game_url, sizeof( out->game_url ));
-	Q_strncpy( out->update_url, in->update_url, sizeof( out->update_url ));
-	Q_strncpy( out->size, Q_memprint( in->size ), sizeof( out->size ));
-	Q_strncpy( out->type, in->type, sizeof( out->type ));
-	Q_strncpy( out->date, in->date, sizeof( out->date ));
-	out->gamemode = in->gamemode;
-}
-
-static void UI_GetModsInfo( void )
-{
-	int i;
-
-	gameui.modsInfo = Mem_Calloc( gameui.mempool, sizeof( *gameui.modsInfo ) * FI->numgames );
-	for( i = 0; i < FI->numgames; i++ )
-		UI_ConvertGameInfo( &gameui.modsInfo[i], FI->games[i] );
 }
 
 /*
@@ -531,7 +488,7 @@ static HIMAGE GAME_EXPORT pfnPIC_Load( const char *szPicName, const byte *image_
 
 	if( !COM_CheckString( szPicName ))
 	{
-		Con_Reportf( S_ERROR "%s: refusing to load image with empty name\n", __func__ );
+		Con_Reportf( S_ERROR "CL_LoadImage: refusing to load image with empty name\n" );
 		return 0;
 	}
 
@@ -581,7 +538,7 @@ pfnPIC_Set
 
 =========
 */
-static void GAME_EXPORT pfnPIC_Set( HIMAGE hPic, int r, int g, int b, int a )
+void GAME_EXPORT pfnPIC_Set( HIMAGE hPic, int r, int g, int b, int a )
 {
 	gameui.ds.gl_texturenum = hPic;
 	r = bound( 0, r, 255 );
@@ -597,7 +554,7 @@ pfnPIC_Draw
 
 =========
 */
-static void GAME_EXPORT pfnPIC_Draw( int x, int y, int width, int height, const wrect_t *prc )
+void GAME_EXPORT pfnPIC_Draw( int x, int y, int width, int height, const wrect_t *prc )
 {
 	ref.dllFuncs.GL_SetRenderMode( kRenderNormal );
 	PIC_DrawGeneric( x, y, width, height, prc );
@@ -609,7 +566,7 @@ pfnPIC_DrawTrans
 
 =========
 */
-static void GAME_EXPORT pfnPIC_DrawTrans( int x, int y, int width, int height, const wrect_t *prc )
+void GAME_EXPORT pfnPIC_DrawTrans( int x, int y, int width, int height, const wrect_t *prc )
 {
 	ref.dllFuncs.GL_SetRenderMode( kRenderTransTexture );
 	PIC_DrawGeneric( x, y, width, height, prc );
@@ -621,7 +578,7 @@ pfnPIC_DrawHoles
 
 =========
 */
-static void GAME_EXPORT pfnPIC_DrawHoles( int x, int y, int width, int height, const wrect_t *prc )
+void GAME_EXPORT pfnPIC_DrawHoles( int x, int y, int width, int height, const wrect_t *prc )
 {
 	ref.dllFuncs.GL_SetRenderMode( kRenderTransAlpha );
 	PIC_DrawGeneric( x, y, width, height, prc );
@@ -633,7 +590,7 @@ pfnPIC_DrawAdditive
 
 =========
 */
-static void GAME_EXPORT pfnPIC_DrawAdditive( int x, int y, int width, int height, const wrect_t *prc )
+void GAME_EXPORT pfnPIC_DrawAdditive( int x, int y, int width, int height, const wrect_t *prc )
 {
 	ref.dllFuncs.GL_SetRenderMode( kRenderTransAdd );
 	PIC_DrawGeneric( x, y, width, height, prc );
@@ -685,17 +642,6 @@ static void GAME_EXPORT pfnFillRGBA( int x, int y, int width, int height, int r,
 	ref.dllFuncs.Color4ub( 255, 255, 255, 255 );
 }
 
-/*
-=============
-pfnCvar_RegisterVariable
-
-=============
-*/
-static cvar_t *GAME_EXPORT pfnCvar_RegisterGameUIVariable( const char *szName, const char *szValue, int flags )
-{
-	return (cvar_t *)Cvar_Get( szName, szValue, flags|FCVAR_GAMEUIDLL, Cvar_BuildAutoDescription( szName, flags|FCVAR_GAMEUIDLL ));
-}
-
 /*
 =============
 pfnClientCmd
@@ -961,12 +907,11 @@ pfnGetGameInfo
 
 =========
 */
-static int GAME_EXPORT pfnGetOldGameInfo( GAMEINFO *pgameinfo )
+static int GAME_EXPORT pfnGetGameInfo( GAMEINFO *pgameinfo )
 {
-	if( !pgameinfo )
+	if( !pgameinfo ) return 0;
-		return 0;
 
-	UI_ToOldGameInfo( pgameinfo, &gameui.gameInfo );
+	*pgameinfo = gameui.gameInfo;
 	return 1;
 }
 
@@ -978,26 +923,8 @@ pfnGetGamesList
 */
 static GAMEINFO ** GAME_EXPORT pfnGetGamesList( int *numGames )
 {
-	if( numGames )
+	if( numGames ) *numGames = FI->numgames;
-		*numGames = FI->numgames;
+	return gameui.modsInfo;
-
-	if( !gameui.oldModsInfo )
-	{
-		int i;
-
-		if( !gameui.modsInfo )
-			UI_GetModsInfo();
-
-		// first allocate array of pointers
-		gameui.oldModsInfo = Mem_Calloc( gameui.mempool, sizeof( *gameui.oldModsInfo ) * FI->numgames );
-		for( i = 0; i < FI->numgames; i++ )
-		{
-			gameui.oldModsInfo[i] = Mem_Calloc( gameui.mempool, sizeof( *gameui.oldModsInfo[i] ));
-			UI_ToOldGameInfo( gameui.oldModsInfo[i], &gameui.modsInfo[i] );
-		}
-	}
-
-	return gameui.oldModsInfo;
 }
 
 /*
@@ -1042,23 +969,30 @@ pfnCheckGameDll
 
 =========
 */
-static int GAME_EXPORT pfnCheckGameDll( void )
+int GAME_EXPORT pfnCheckGameDll( void )
 {
-#ifdef XASH_INTERNAL_GAMELIBS
-	return true;
-#else
 	string dllpath;
+	void	*hInst;
+
+#if TARGET_OS_IPHONE
+	// loading server library drains too many ram
+	// so 512MB iPod Touch cannot even connect to
+	// to servers in cstrike
+	return true;
+#endif
 
 	if( svgame.hInstance )
 		return true;
 
 	COM_GetCommonLibraryPath( LIBRARY_SERVER, dllpath, sizeof( dllpath ));
 
-	if( FS_FileExists( dllpath, false ))
+	if(( hInst = COM_LoadLibrary( dllpath, true, false )) != NULL )
+	{
+		COM_FreeLibrary( hInst ); // don't increase linker's reference counter
 		return true;
-
+	}
+	Con_Reportf( S_WARN "Could not load server library: %s\n", COM_GetLibraryError() );
 	return false;
-#endif
 }
 
 /*
@@ -1069,7 +1003,7 @@ pfnChangeInstance
 */
 static void GAME_EXPORT pfnChangeInstance( const char *newInstance, const char *szFinalMessage )
 {
-	Con_Reportf( S_ERROR "%s menu call is deprecated!\n", __func__ );
+	Con_Reportf( S_ERROR "ChangeInstance menu call is deprecated!\n" );
 }
 
 /*
@@ -1150,27 +1084,8 @@ static int pfnDelete( const char *path )
 	return FS_Delete( path );
 }
 
-static void GAME_EXPORT pfnCon_DefaultColor( int r, int g, int b )
-{
-	Con_DefaultColor( r, g, b, true );
-}
-
-static void GAME_EXPORT pfnSetCursor( void *hCursor )
-{
-	uintptr_t cursor;
-
-	if( !gameui.use_extended_api )
-		return; // ignore original Xash menus
-
-	cursor = (uintptr_t)hCursor;
-	if( cursor < dc_user || cursor > dc_last )
-		return;
-
-	Platform_SetCursorType( cursor );
-}
-
 // engine callbacks
-static const ui_enginefuncs_t gEngfuncs =
+static ui_enginefuncs_t gEngfuncs =
 {
 	pfnPIC_Load,
 	GL_FreeImage,
@@ -1208,7 +1123,7 @@ static const ui_enginefuncs_t gEngfuncs =
 	UI_DrawConsoleString,
 	UI_DrawSetTextColor,
 	Con_DrawStringLen,
-	pfnCon_DefaultColor,
+	Con_DefaultColor,
 	pfnGetPlayerModel,
 	pfnSetPlayerModel,
 	pfnClearScene,
@@ -1234,7 +1149,7 @@ static const ui_enginefuncs_t gEngfuncs =
 	pfnKeyGetState,
 	pfnMemAlloc,
 	pfnMemFree,
-	pfnGetOldGameInfo,
+	pfnGetGameInfo,
 	pfnGetGamesList,
 	pfnGetFilesList,
 	SV_GetSaveComment,
@@ -1248,7 +1163,7 @@ static const ui_enginefuncs_t gEngfuncs =
 	pfnHostEndGame,
 	COM_RandomFloat,
 	COM_RandomLong,
-	pfnSetCursor,
+	IN_SetCursor,
 	pfnIsMapValid,
 	GL_ProcessTexture,
 	COM_CompareFileTime,
@@ -1281,28 +1196,6 @@ static char *pfnParseFileSafe( char *data, char *buf, const int size, unsigned i
 	return COM_ParseFileSafe( data, buf, size, flags, len, NULL );
 }
 
-static gameinfo2_t *pfnGetGameInfo( int gi_version )
-{
-	if( gi_version != gameui.gameInfo.gi_version )
-		return NULL;
-
-	return &gameui.gameInfo;
-}
-
-static gameinfo2_t *pfnGetModInfo( int gi_version, int i )
-{
-	if( i < 0 || i >= FI->numgames )
-		return NULL;
-
-	if( !gameui.modsInfo )
-		UI_GetModsInfo();
-
-	if( gi_version != gameui.modsInfo[i].gi_version )
-		return NULL;
-
-	return &gameui.modsInfo[i];
-}
-
 static ui_extendedfuncs_t gExtendedfuncs =
 {
 	pfnEnableTextInput,
@@ -1314,10 +1207,6 @@ static ui_extendedfuncs_t gExtendedfuncs =
 	pfnParseFileSafe,
 	NET_AdrToString,
 	NET_CompareAdrSort,
-	Sys_GetNativeObject,
-	&gNetApi,
-	pfnGetGameInfo,
-	pfnGetModInfo,
 };
 
 void UI_UnloadProgs( void )
@@ -1327,15 +1216,14 @@ void UI_UnloadProgs( void )
 	// deinitialize game
 	gameui.dllFuncs.pfnShutdown();
 
-	Cmd_RemoveCommand( "ui_allowconsole" );
 	Cvar_FullSet( "host_gameuiloaded", "0", FCVAR_READ_ONLY );
 
-	Cvar_Unlink( FCVAR_GAMEUIDLL );
-	Cmd_Unlink( CMD_GAMEUIDLL );
-
 	COM_FreeLibrary( gameui.hInstance );
 	Mem_FreePool( &gameui.mempool );
 	memset( &gameui, 0, sizeof( gameui ));
+
+	Cvar_Unlink( FCVAR_GAMEUIDLL );
+	Cmd_Unlink( CMD_GAMEUIDLL );
 }
 
 qboolean UI_LoadProgs( void )
@@ -1378,65 +1266,71 @@ qboolean UI_LoadProgs( void )
 	if(( GetMenuAPI = (MENUAPI)COM_GetProcAddress( gameui.hInstance, "GetMenuAPI" )) == NULL )
 	{
 		COM_FreeLibrary( gameui.hInstance );
-		Con_Reportf( "%s: can't init menu API\n", __func__ );
+		Con_Reportf( "UI_LoadProgs: can't init menu API\n" );
 		gameui.hInstance = NULL;
 		return false;
 	}
 
 
-	gameui.use_extended_api = false;
+	gameui.use_text_api = false;
 
 	// make local copy of engfuncs to prevent overwrite it with user dll
-	gpEngfuncs = gEngfuncs;
+	memcpy( &gpEngfuncs, &gEngfuncs, sizeof( gpEngfuncs ));
 
 	gameui.mempool = Mem_AllocPool( "Menu Pool" );
 
 	if( !GetMenuAPI( &gameui.dllFuncs, &gpEngfuncs, gameui.globals ))
 	{
 		COM_FreeLibrary( gameui.hInstance );
-		Con_Reportf( "%s: can't init menu API\n", __func__ );
+		Con_Reportf( "UI_LoadProgs: can't init menu API\n" );
 		Mem_FreePool( &gameui.mempool );
 		gameui.hInstance = NULL;
 		return false;
 	}
 
 	// make local copy of engfuncs to prevent overwrite it with user dll
-	gpExtendedfuncs = gExtendedfuncs;
+	memcpy( &gpExtendedfuncs, &gExtendedfuncs, sizeof( gExtendedfuncs ));
 	memset( &gameui.dllFuncs2, 0, sizeof( gameui.dllFuncs2 ));
 
 	// try to initialize new extended API
 	if( ( GetExtAPI = (UIEXTENEDEDAPI)COM_GetProcAddress( gameui.hInstance, "GetExtAPI" ) ) )
 	{
-		Con_Reportf( "%s: extended Menu API found\n", __func__ );
+		Con_Reportf( "UI_LoadProgs: extended Menu API found\n" );
 		if( GetExtAPI( MENU_EXTENDED_API_VERSION, &gameui.dllFuncs2, &gpExtendedfuncs ) )
 		{
-			Con_Reportf( "%s: extended Menu API initialized\n", __func__ );
+			Con_Reportf( "UI_LoadProgs: extended Menu API initialized\n" );
-			gameui.use_extended_api = true;
+			gameui.use_text_api = true;
 		}
 	}
 	else // otherwise, fallback to old and deprecated extensions
 	{
 		if( ( GiveTextApi = (UITEXTAPI)COM_GetProcAddress( gameui.hInstance, "GiveTextAPI" ) ) )
 		{
-			Con_Reportf( "%s: extended text API found\n", __func__ );
+			Con_Reportf( "UI_LoadProgs: extended text API found\n" );
 			Con_Reportf( S_WARN "Text API is deprecated! If you are mod developer, consider moving to Extended Menu API!\n" );
 			if( GiveTextApi( &gpExtendedfuncs ) ) // they are binary compatible, so we can just pass extended funcs API to menu
 			{
-				Con_Reportf( "%s: extended text API initialized\n", __func__ );
+				Con_Reportf( "UI_LoadProgs: extended text API initialized\n" );
-				gameui.use_extended_api = true;
+				gameui.use_text_api = true;
 			}
 		}
 
 		gameui.dllFuncs2.pfnAddTouchButtonToList = (ADDTOUCHBUTTONTOLIST)COM_GetProcAddress( gameui.hInstance, "AddTouchButtonToList" );
 		if( gameui.dllFuncs2.pfnAddTouchButtonToList )
 		{
-			Con_Reportf( "%s: AddTouchButtonToList call found\n", __func__ );
+			Con_Reportf( "UI_LoadProgs: AddTouchButtonToList call found\n" );
 			Con_Reportf( S_WARN "AddTouchButtonToList is deprecated! If you are mod developer, consider moving to Extended Menu API!\n" );
 		}
 	}
 
 	Cvar_FullSet( "host_gameuiloaded", "1", FCVAR_READ_ONLY );
-	Cmd_AddRestrictedCommand( "ui_allowconsole", UI_ToggleAllowConsole_f, "unlocks developer console" );
+
+	// setup gameinfo
+	for( i = 0; i < FI->numgames; i++ )
+	{
+		gameui.modsInfo[i] = Mem_Calloc( gameui.mempool, sizeof( GAMEINFO ));
+		UI_ConvertGameInfo( gameui.modsInfo[i], FI->games[i] );
+	}
 
 	UI_ConvertGameInfo( &gameui.gameInfo, FI->GameInfo ); // current gameinfo
 

engine/client/cl_mobile.c

@@ -20,19 +20,29 @@ GNU General Public License for more details.
 #include "input.h"
 #include "platform/platform.h"
 
-static CVAR_DEFINE_AUTO( vibration_length, "1.0", FCVAR_ARCHIVE | FCVAR_PRIVILEGED, "vibration length" );
+mobile_engfuncs_t *gMobileEngfuncs;
-static CVAR_DEFINE_AUTO( vibration_enable, "1", FCVAR_ARCHIVE | FCVAR_PRIVILEGED, "enable vibration" );
+
+convar_t *vibration_length;
+convar_t *vibration_enable;
 
 static cl_font_t g_scaled_font;
 static float g_font_scale;
 
 static void pfnVibrate( float life, char flags )
 {
-	if( !vibration_enable.value || life < 0.0f )
+	if( !vibration_enable->value )
 		return;
 
+	if( life < 0.0f )
+	{
+		Con_Reportf( S_WARN "Negative vibrate time: %f\n", life );
+		return;
+	}
+
+	//Con_Reportf( "Vibrate: %f %d\n", life, flags );
+
 	// here goes platform-specific backends
-	Platform_Vibrate( life * vibration_length.value, flags );
+	Platform_Vibrate( life * vibration_length->value, flags );
 }
 
 static void Vibrate_f( void )
@@ -43,7 +53,7 @@ static void Vibrate_f( void )
 		return;
 	}
 
-	pfnVibrate( Q_atof( Cmd_Argv( 1 )), VIBRATE_NORMAL );
+	pfnVibrate( Q_atof( Cmd_Argv(1) ), VIBRATE_NORMAL );
 }
 
 static void pfnEnableTextInput( int enable )
@@ -57,7 +67,7 @@ static int pfnDrawScaledCharacter( int x, int y, int number, int r, int g, int b
 	rgba_t color = { r, g, b, 255 };
 	int flags = FONT_DRAW_HUD;
 
-	if( hud_utf8.value )
+	if( hud_utf8->value )
 		SetBits( flags, FONT_DRAW_UTF8 );
 
 	if( fabs( g_font_scale - scale ) > 0.1f ||
@@ -77,6 +87,15 @@ static int pfnDrawScaledCharacter( int x, int y, int number, int r, int g, int b
 	return CL_DrawCharacter( x, y, number, color, &g_scaled_font, flags );
 }
 
+static void *pfnGetNativeObject( const char *obj )
+{
+	if( !obj )
+		return NULL;
+
+	// Backend should consider that obj is case-sensitive
+	return Platform_GetNativeObject( obj );
+}
+
 static void pfnTouch_HideButtons( const char *name, byte state )
 {
 	Touch_HideButtons( name, state, true );
@@ -92,7 +111,7 @@ static char *pfnParseFileSafe( char *data, char *buf, const int size, unsigned i
 	return COM_ParseFileSafe( data, buf, size, flags, len, NULL );
 }
 
-static const mobile_engfuncs_t gMobileEngfuncs =
+static mobile_engfuncs_t gpMobileEngfuncs =
 {
 	MOBILITY_API_VERSION,
 	pfnVibrate,
@@ -105,45 +124,28 @@ static const mobile_engfuncs_t gMobileEngfuncs =
 	Touch_ResetDefaultButtons,
 	pfnDrawScaledCharacter,
 	Sys_Warn,
-	Sys_GetNativeObject,
+	pfnGetNativeObject,
 	ID_SetCustomClientID,
 	pfnParseFileSafe
 };
 
 qboolean Mobile_Init( void )
 {
+	qboolean success = false;
 	pfnMobilityInterface ExportToClient;
 
-	Cmd_AddCommand( "vibrate", Vibrate_f, "Vibrate for specified time");
+	// find a mobility interface
-	Cvar_RegisterVariable( &vibration_length );
+	ExportToClient = COM_GetProcAddress( clgame.hInstance, MOBILITY_CLIENT_EXPORT );
-	Cvar_RegisterVariable( &vibration_enable );
+	gMobileEngfuncs = &gpMobileEngfuncs;
 
-	// find mobility interface
+	if( ExportToClient && !ExportToClient( gMobileEngfuncs ) )
-	if(( ExportToClient = COM_GetProcAddress( clgame.hInstance, MOBILITY_CLIENT_EXPORT )))
+		success = true;
-	{
-		static mobile_engfuncs_t mobile_engfuncs; // keep a copy, don't let user change engine pointers
 
-		mobile_engfuncs = gMobileEngfuncs;
+	Cmd_AddCommand( "vibrate", (xcommand_t)Vibrate_f, "Vibrate for specified time");
+	vibration_length = Cvar_Get( "vibration_length", "1.0", FCVAR_ARCHIVE | FCVAR_PRIVILEGED, "Vibration length");
+	vibration_enable = Cvar_Get( "vibration_enable", "1", FCVAR_ARCHIVE | FCVAR_PRIVILEGED, "Enable vibration");
 
-		if( !ExportToClient( &mobile_engfuncs ))
+	return success;
-		{
-			Con_Reportf( "%s: ^2initailized extended MobilityAPI ^7ver. %i\n", __func__, MOBILITY_API_VERSION );
-			return true;
-		}
-
-		// make sure that mobile functions are cleared
-#if 1
-		// some SDKs define export as returning void, breaking the contract
-		// ignore result for now...
-		return true;
-#else
-		memset( &mobile_engfuncs, 0, sizeof( mobile_engfuncs ));
-
-		return false; // just tell user about problems
-#endif
-	}
-
-	return true; // mobile interface is missed
 }
 
 void Mobile_Shutdown( void )

engine/client/cl_netgraph.c

@@ -33,12 +33,12 @@ GNU General Public License for more details.
 #define NETGRAPH_NET_COLORS		5
 #define NUM_LATENCY_SAMPLES		8
 
-CVAR_DEFINE_AUTO( net_graph, "0", FCVAR_ARCHIVE, "draw network usage graph" );
+convar_t	*net_graph;
-static CVAR_DEFINE_AUTO( net_graphpos, "1", FCVAR_ARCHIVE, "network usage graph position" );
+static convar_t	*net_graphpos;
-static CVAR_DEFINE_AUTO( net_scale, "5", FCVAR_ARCHIVE, "network usage graph scale level" );
+static convar_t	*net_graphwidth;
-static CVAR_DEFINE_AUTO( net_graphwidth, "192", FCVAR_ARCHIVE, "network usage graph width" );
+static convar_t	*net_graphheight;
-static CVAR_DEFINE_AUTO( net_graphheight, "64", FCVAR_ARCHIVE, "network usage graph height" );
+static convar_t	*net_graphsolid;
-static CVAR_DEFINE_AUTO( net_graphsolid, "1", FCVAR_ARCHIVE, "fill segments in network usage graph" );
+static convar_t	*net_scale;
 
 static struct packet_latency_t
 {
@@ -63,9 +63,9 @@ static byte netcolors[NETGRAPH_NET_COLORS+NETGRAPH_LERP_HEIGHT][4] =
 	// other will be generated through NetGraph_InitColors()
 };
 
-static const byte sendcolor[4] = { 88, 29, 130, 255 };
+static byte sendcolor[4] = { 88, 29, 130, 255 };
-static const byte holdcolor[4] = { 255, 0, 0, 200 };
+static byte holdcolor[4] = { 255, 0, 0, 200 };
-static const byte extrap_base_color[4] = { 255, 255, 255, 255 };
+static byte extrap_base_color[4] = { 255, 255, 255, 255 };
 static netbandwidthgraph_t	netstat_graph[NET_TIMINGS];
 static float		packet_loss;
 static float		packet_choke;
@@ -79,7 +79,7 @@ NetGraph_DrawRect
 NetGraph_FillRGBA shortcut
 ==========
 */
-static void NetGraph_DrawRect( const wrect_t *rect, const byte colors[4] )
+static void NetGraph_DrawRect( wrect_t *rect, byte colors[4] )
 {
 	ref.dllFuncs.Color4ub( colors[0], colors[1], colors[2], colors[3] );	// color for this quad
 
@@ -211,7 +211,7 @@ static void NetGraph_GetFrameData( float *latency, int *latency_count )
 		else
 		{
 			int frame_latency = Q_min( 1.0f, f->latency );
-			p->latency = (( frame_latency + 0.1f ) / 1.1f ) * ( net_graphheight.value - NETGRAPH_LERP_HEIGHT - 2 );
+			p->latency = (( frame_latency + 0.1f ) / 1.1f ) * ( net_graphheight->value - NETGRAPH_LERP_HEIGHT - 2 );
 
 			if( i > cls.netchan.incoming_sequence - NUM_LATENCY_SAMPLES )
 			{
@@ -260,7 +260,7 @@ static void NetGraph_DrawTimes( wrect_t rect, int x, int w )
 	for( a = 0; a < w; a++ )
 	{
 		i = ( cls.netchan.outgoing_sequence - a ) & NET_TIMINGS_MASK;
-		h = Q_min(( netstat_cmdinfo[i].cmd_lerp / 3.0f ) * NETGRAPH_LERP_HEIGHT, net_graphheight.value * 0.7f);
+		h = Q_min(( netstat_cmdinfo[i].cmd_lerp / 3.0f ) * NETGRAPH_LERP_HEIGHT, net_graphheight->value * 0.7f);
 
 		fill.left = x + w - a - 1;
 		fill.right = fill.bottom = 1;
@@ -273,7 +273,7 @@ static void NetGraph_DrawTimes( wrect_t rect, int x, int w )
 			h -= extrap_point;
 			fill.top -= extrap_point;
 
-			if( !net_graphsolid.value )
+			if( !net_graphsolid->value )
 			{
 				fill.top -= (h - 1);
 				start = (h - 1);
@@ -295,7 +295,7 @@ static void NetGraph_DrawTimes( wrect_t rect, int x, int w )
 			fill.top -= h;
 			h = extrap_point - h;
 
-			if( !net_graphsolid.value )
+			if( !net_graphsolid->value )
 				h = 1;
 
 			for( j = 0; j < h; j++ )
@@ -334,7 +334,7 @@ NetGraph_DrawHatches
 */
 static void NetGraph_DrawHatches( int x, int y )
 {
-	int	ystep = (int)( 10.0f / net_scale.value );
+	int	ystep = (int)( 10.0f / net_scale->value );
 	byte	colorminor[4] = { 0, 63, 63, 200 };
 	byte	color[4] = { 0, 200, 0, 255 };
 	wrect_t	hatch = { x, 4, y, 1 };
@@ -342,9 +342,9 @@ static void NetGraph_DrawHatches( int x, int y )
 
 	ystep = Q_max( ystep, 1 );
 
-	for( starty = hatch.top; hatch.top > 0 && ((starty - hatch.top) * net_scale.value < (maxmsgbytes + 50)); hatch.top -= ystep )
+	for( starty = hatch.top; hatch.top > 0 && ((starty - hatch.top) * net_scale->value < (maxmsgbytes + 50)); hatch.top -= ystep )
 	{
-		if(!((int)((starty - hatch.top) * net_scale.value ) % 50 ))
+		if(!((int)((starty - hatch.top) * net_scale->value ) % 50 ))
 		{
 			NetGraph_DrawRect( &hatch, color );
 		}
@@ -370,14 +370,14 @@ static void NetGraph_DrawTextFields( int x, int y, int w, wrect_t rect, int coun
 	int		pty = Q_max( rect.top + rect.bottom - NETGRAPH_LERP_HEIGHT - 3, 1 );
 	int		out, i = ( cls.netchan.outgoing_sequence - 1 ) & NET_TIMINGS_MASK;
 	int		j = cls.netchan.incoming_sequence & NET_TIMINGS_MASK;
-	int		last_y = y - net_graphheight.value;
+	int		last_y = y - net_graphheight->value;
 
 	if( count > 0 )
 	{
 		avg = avg / (float)( count - ( host.frametime * FRAMERATE_AVG_FRAC ));
 
-		if( cl_updaterate.value > 0.0f )
+		if( cl_updaterate->value > 0.0f )
-			avg -= 1000.0f / cl_updaterate.value;
+			avg -= 1000.0f / cl_updaterate->value;
 
 		// can't be below zero
 		avg = Q_max( 0.0f, avg );
@@ -387,11 +387,11 @@ static void NetGraph_DrawTextFields( int x, int y, int w, wrect_t rect, int coun
 	// move rolling average
 	framerate = FRAMERATE_AVG_FRAC * host.frametime + ( 1.0f - FRAMERATE_AVG_FRAC ) * framerate;
 
-	CL_SetFontRendermode( font );
+	ref.dllFuncs.GL_SetRenderMode( font->rendermode );
 
 	if( framerate > 0.0f )
 	{
-		y -= net_graphheight.value;
+		y -= net_graphheight->value;
 
 		CL_DrawStringf( font, x, y, colors, FONT_DRAW_NORENDERMODE, "%.1f fps" , 1.0f / framerate);
 
@@ -422,9 +422,9 @@ static void NetGraph_DrawTextFields( int x, int y, int w, wrect_t rect, int coun
 	}
 
 	if( graphtype < 3 )
-		CL_DrawStringf( font, ptx, pty, colors, FONT_DRAW_NORENDERMODE, "%i/s", (int)cl_cmdrate.value );
+		CL_DrawStringf( font, ptx, pty, colors, FONT_DRAW_NORENDERMODE, "%i/s", (int)cl_cmdrate->value );
 
-	CL_DrawStringf( font, ptx, last_y, colors, FONT_DRAW_NORENDERMODE, "%i/s" , (int)cl_updaterate.value );
+	CL_DrawStringf( font, ptx, last_y, colors, FONT_DRAW_NORENDERMODE, "%i/s" , (int)cl_updaterate->value );
 }
 
 /*
@@ -435,12 +435,12 @@ NetGraph_DrawDataSegment
 */
 static int NetGraph_DrawDataSegment( wrect_t *fill, int bytes, byte r, byte g, byte b, byte a )
 {
-	float	h = bytes / net_scale.value;
+	float	h = bytes / net_scale->value;
 	byte	colors[4] = { r, g, b, a };
 
 	fill->top -= (int)h;
 
-	if( net_graphsolid.value )
+	if( net_graphsolid->value )
 		fill->bottom = (int)h;
 	else fill->bottom = 1;
 
@@ -498,7 +498,7 @@ NetGraph_DrawDataUsage
 static void NetGraph_DrawDataUsage( int x, int y, int w, int graphtype )
 {
 	int	a, i, h, lastvalidh = 0, ping;
-	int	pingheight = net_graphheight.value - NETGRAPH_LERP_HEIGHT - 2;
+	int	pingheight = net_graphheight->value - NETGRAPH_LERP_HEIGHT - 2;
 	wrect_t	fill = { 0 };
 	byte	color[4];
 
@@ -554,7 +554,7 @@ static void NetGraph_DrawDataUsage( int x, int y, int w, int graphtype )
 			continue;
 
 		color[0] = color[1] = color[2] = color[3] = 255;
-		fill.top = y - net_graphheight.value - 1;
+		fill.top = y - net_graphheight->value - 1;
 		fill.bottom = 1;
 
 		if( NetGraph_AtEdge( a, w ))
@@ -589,7 +589,7 @@ static void NetGraph_DrawDataUsage( int x, int y, int w, int graphtype )
 		if( !NetGraph_DrawDataSegment( &fill, netstat_graph[i].voicebytes, 255, 255, 255, 255 ))
 			continue;
 
-		fill.top = y - net_graphheight.value - 1;
+		fill.top = y - net_graphheight->value - 1;
 		fill.bottom = 1;
 		fill.top -= 2;
 
@@ -598,7 +598,7 @@ static void NetGraph_DrawDataUsage( int x, int y, int w, int graphtype )
 	}
 
 	if( graphtype >= 2 )
-		NetGraph_DrawHatches( x, y - net_graphheight.value - 1 );
+		NetGraph_DrawHatches( x, y - net_graphheight->value - 1 );
 }
 
 /*
@@ -613,12 +613,12 @@ static void NetGraph_GetScreenPos( wrect_t *rect, int *w, int *x, int *y )
 	rect->right = refState.width;
 	rect->bottom = refState.height;
 
-	*w = Q_min( NET_TIMINGS, net_graphwidth.value );
+	*w = Q_min( NET_TIMINGS, net_graphwidth->value );
 	if( rect->right < *w + 10 )
 		*w = rect->right - 10;
 
 	// detect x and y position
-	switch( (int)net_graphpos.value )
+	switch( (int)net_graphpos->value )
 	{
 	case 1: // right sided
 		*x = rect->left + rect->right - 5 - *w;
@@ -661,16 +661,16 @@ void SCR_DrawNetGraph( void )
 	{
 		graphtype = 2;
 	}
-	else if( net_graph.value != 0.0f )
+	else if( net_graph->value != 0.0f )
 	{
-		graphtype = (int)net_graph.value;
+		graphtype = (int)net_graph->value;
 	}
 	else
 	{
 		return;
 	}
 
-	if( net_scale.value <= 0 )
+	if( net_scale->value <= 0 )
 		Cvar_SetValue( "net_scale", 0.1f );
 
 	NetGraph_GetScreenPos( &rect, &w, &x, &y );
@@ -697,12 +697,12 @@ void SCR_DrawNetGraph( void )
 
 void CL_InitNetgraph( void )
 {
-	Cvar_RegisterVariable( &net_graph );
+	net_graph = Cvar_Get( "net_graph", "0", FCVAR_ARCHIVE, "draw network usage graph" );
-	Cvar_RegisterVariable( &net_graphpos );
+	net_graphpos = Cvar_Get( "net_graphpos", "1", FCVAR_ARCHIVE, "network usage graph position" );
-	Cvar_RegisterVariable( &net_scale );
+	net_scale = Cvar_Get( "net_scale", "5", FCVAR_ARCHIVE, "network usage graph scale level" );
-	Cvar_RegisterVariable( &net_graphwidth );
+	net_graphwidth = Cvar_Get( "net_graphwidth", "192", FCVAR_ARCHIVE, "network usage graph width" );
-	Cvar_RegisterVariable( &net_graphheight );
+	net_graphheight = Cvar_Get( "net_graphheight", "64", FCVAR_ARCHIVE, "network usage graph height" );
-	Cvar_RegisterVariable( &net_graphsolid );
+	net_graphsolid = Cvar_Get( "net_graphsolid", "1", FCVAR_ARCHIVE, "fill segments in network usage graph" );
 	packet_loss = packet_choke = 0.0;
 
 	NetGraph_InitColors();

engine/client/cl_parse_48.c

@@ -1,631 +0,0 @@
-/*
-cl_parse.c - parse a message received from the server
-Copyright (C) 2008 Uncle Mike
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-*/
-
-#include "common.h"
-#include "client.h"
-#include "net_encode.h"
-#include "particledef.h"
-#include "cl_tent.h"
-#include "shake.h"
-#include "hltv.h"
-#include "input.h"
-
-
-/*
-==================
-CL_ParseStaticEntity
-
-static client entity
-==================
-*/
-static void CL_LegacyParseStaticEntity( sizebuf_t *msg )
-{
-	int		i;
-	entity_state_t	state;
-	cl_entity_t	*ent;
-
-	memset( &state, 0, sizeof( state ));
-	state.modelindex = MSG_ReadShort( msg );
-	state.sequence = MSG_ReadByte( msg );
-	state.frame = MSG_ReadByte( msg );
-	state.colormap = MSG_ReadWord( msg );
-	state.skin = MSG_ReadByte( msg );
-
-	for( i = 0; i < 3; i++ )
-	{
-		state.origin[i] = MSG_ReadCoord( msg );
-		state.angles[i] = MSG_ReadBitAngle( msg, 16 );
-	}
-
-	state.rendermode = MSG_ReadByte( msg );
-
-	if( state.rendermode != kRenderNormal )
-	{
-		state.renderamt = MSG_ReadByte( msg );
-		state.rendercolor.r = MSG_ReadByte( msg );
-		state.rendercolor.g = MSG_ReadByte( msg );
-		state.rendercolor.b = MSG_ReadByte( msg );
-		state.renderfx = MSG_ReadByte( msg );
-	}
-
-	i = clgame.numStatics;
-	if( i >= MAX_STATIC_ENTITIES )
-	{
-		Con_Printf( S_ERROR "MAX_STATIC_ENTITIES limit exceeded!\n" );
-		return;
-	}
-
-	ent = &clgame.static_entities[i];
-	clgame.numStatics++;
-
-	// all states are same
-	ent->baseline = ent->curstate = ent->prevstate = state;
-	ent->index = 0; // static entities doesn't has the numbers
-
-	// statics may be respawned in game e.g. for demo recording
-	if( cls.state == ca_connected || cls.state == ca_validate )
-		ent->trivial_accept = INVALID_HANDLE;
-
-	// setup the new static entity
-	VectorCopy( ent->curstate.origin, ent->origin );
-	VectorCopy( ent->curstate.angles, ent->angles );
-	ent->model = CL_ModelHandle( state.modelindex );
-	ent->curstate.framerate = 1.0f;
-	CL_ResetLatchedVars( ent, true );
-
-	if( ent->curstate.rendermode == kRenderNormal && ent->model != NULL )
-	{
-		// auto 'solid' faces
-		if( FBitSet( ent->model->flags, MODEL_TRANSPARENT ) && Host_IsQuakeCompatible( ))
-		{
-			ent->curstate.rendermode = kRenderTransAlpha;
-			ent->curstate.renderamt = 255;
-		}
-	}
-
-	R_AddEfrags( ent );	// add link
-}
-
-static void CL_LegacyParseSoundPacket( sizebuf_t *msg, qboolean is_ambient )
-{
-	vec3_t	pos;
-	int 	chan, sound;
-	float 	volume, attn;
-	int	flags, pitch, entnum;
-	sound_t	handle = 0;
-
-	flags = MSG_ReadWord( msg );
-	if( flags & SND_LEGACY_LARGE_INDEX )
-	{
-		sound = MSG_ReadWord( msg );
-		flags &= ~SND_LEGACY_LARGE_INDEX;
-	}
-	else
-		sound = MSG_ReadByte( msg );
-	chan = MSG_ReadByte( msg );
-
-	if( FBitSet( flags, SND_VOLUME ))
-		volume = (float)MSG_ReadByte( msg ) / 255.0f;
-	else volume = VOL_NORM;
-
-	if( FBitSet( flags, SND_ATTENUATION ))
-		attn = (float)MSG_ReadByte( msg ) / 64.0f;
-	else attn = ATTN_NONE;
-
-	if( FBitSet( flags, SND_PITCH ))
-		pitch = MSG_ReadByte( msg );
-	else pitch = PITCH_NORM;
-
-	// entity reletive
-	entnum = MSG_ReadWord( msg );
-
-	// positioned in space
-	MSG_ReadVec3Coord( msg, pos );
-
-	if( FBitSet( flags, SND_SENTENCE ))
-	{
-		char	sentenceName[32];
-		Q_snprintf( sentenceName, sizeof( sentenceName ), "!%i", sound );
-		handle = S_RegisterSound( sentenceName );
-	}
-	else handle = cl.sound_index[sound];	// see precached sound
-
-	if( !cl.audio_prepped )
-		return; // too early
-
-	// g-cont. sound and ambient sound have only difference with channel
-	if( is_ambient )
-	{
-		S_AmbientSound( pos, entnum, handle, volume, attn, pitch, flags );
-	}
-	else
-	{
-		S_StartSound( pos, entnum, chan, handle, volume, attn, pitch, flags );
-	}
-}
-/*
-================
-CL_PrecacheSound
-
-prceache sound from server
-================
-*/
-static void CL_LegacyPrecacheSound( sizebuf_t *msg )
-{
-	int	soundIndex;
-
-	soundIndex = MSG_ReadUBitLong( msg, MAX_SOUND_BITS );
-
-	if( soundIndex < 0 || soundIndex >= MAX_SOUNDS )
-		Host_Error( "%s: bad soundindex %i\n", __func__, soundIndex );
-
-	Q_strncpy( cl.sound_precache[soundIndex], MSG_ReadString( msg ), sizeof( cl.sound_precache[0] ));
-
-	// when we loading map all resources is precached sequentially
-	//if( !cl.audio_prepped ) return;
-
-	cl.sound_index[soundIndex] = S_RegisterSound( cl.sound_precache[soundIndex] );
-}
-
-static void CL_LegacyPrecacheModel( sizebuf_t *msg )
-{
-	int	modelIndex;
-	string model;
-
-	modelIndex = MSG_ReadUBitLong( msg, MAX_LEGACY_MODEL_BITS );
-
-	if( modelIndex < 0 || modelIndex >= MAX_MODELS )
-		Host_Error( "%s: bad modelindex %i\n", __func__, modelIndex );
-
-	Q_strncpy( model, MSG_ReadString( msg ), sizeof( model ));
-	//Q_strncpy( cl.model_precache[modelIndex], BF_ReadString( msg ), sizeof( cl.model_precache[0] ));
-
-	// when we loading map all resources is precached sequentially
-	//if( !cl.video_prepped ) return;
-	if( modelIndex == 1 && !cl.worldmodel )
-	{
-		CL_ClearWorld ();
-
-		cl.models[modelIndex] = cl.worldmodel = Mod_LoadWorld( model, true );
-		return;
-
-	}
-
-	//Mod_RegisterModel( cl.model_precache[modelIndex], modelIndex );
-
-	cl.models[modelIndex] = Mod_ForName( model, false, false );
-	cl.nummodels = Q_max( cl.nummodels, modelIndex  );
-}
-
-static void CL_LegacyPrecacheEvent( sizebuf_t *msg )
-{
-	int	eventIndex;
-
-	eventIndex = MSG_ReadUBitLong( msg, MAX_EVENT_BITS );
-
-	if( eventIndex < 0 || eventIndex >= MAX_EVENTS )
-		Host_Error( "%s: bad eventindex %i\n", __func__, eventIndex );
-
-	Q_strncpy( cl.event_precache[eventIndex], MSG_ReadString( msg ), sizeof( cl.event_precache[0] ));
-
-	// can be set now
-	CL_SetEventIndex( cl.event_precache[eventIndex], eventIndex );
-}
-
-#if XASH_LOW_MEMORY == 0
-#define MAX_LEGACY_RESOURCES 2048
-#elif XASH_LOW_MEMORY == 2
-#define MAX_LEGACY_RESOURCES 1
-#elif XASH_LOW_MEMORY == 1
-#define MAX_LEGACY_RESOURCES 512
-#endif
-/*
-==============
-CL_ParseResourceList
-
-==============
-*/
-static void CL_LegacyParseResourceList( sizebuf_t *msg )
-{
-	int	i = 0;
-	static struct
-	{
-		int  rescount;
-		int  restype[MAX_LEGACY_RESOURCES];
-		char resnames[MAX_LEGACY_RESOURCES][MAX_QPATH];
-	} reslist;
-
-	memset( &reslist, 0, sizeof( reslist ));
-	reslist.rescount = MSG_ReadWord( msg ) - 1;
-
-	if( reslist.rescount > MAX_LEGACY_RESOURCES )
-		Host_Error( "MAX_RESOURCES reached\n" );
-
-	for( i = 0; i < reslist.rescount; i++ )
-	{
-		reslist.restype[i] = MSG_ReadWord( msg );
-		Q_strncpy( reslist.resnames[i], MSG_ReadString( msg ), sizeof( reslist.resnames[i] ));
-	}
-
-	if( cls.demoplayback )
-		return;
-
-	if( !cl_allow_download.value )
-	{
-		Con_DPrintf( "Refusing new resource, cl_allow_download set to 0\n" );
-		reslist.rescount = 0;
-	}
-
-	if( cls.state == ca_active && !cl_download_ingame.value )
-	{
-		Con_DPrintf( "Refusing new resource, cl_download_ingame set to 0\n" );
-		reslist.rescount = 0;
-	}
-
-	HTTP_ResetProcessState();
-
-	host.downloadcount = 0;
-
-	for( i = 0; i < reslist.rescount; i++ )
-	{
-		char soundpath[MAX_VA_STRING];
-		const char *path;
-
-		if( reslist.restype[i] == t_sound )
-		{
-			Q_snprintf( soundpath, sizeof( soundpath ), DEFAULT_SOUNDPATH "%s", reslist.resnames[i] );
-
-			path = soundpath;
-		}
-		else path = reslist.resnames[i];
-
-		if( FS_FileExists( path, false ))
-			continue;	// already exists
-
-		host.downloadcount++;
-		HTTP_AddDownload( path, -1, true );
-	}
-
-	if( !host.downloadcount )
-	{
-		MSG_WriteByte( &cls.netchan.message, clc_stringcmd );
-		MSG_WriteString( &cls.netchan.message, "continueloading" );
-	}
-}
-
-/*
-=====================
-CL_ParseLegacyServerMessage
-
-dispatch messages
-=====================
-*/
-void CL_ParseLegacyServerMessage( sizebuf_t *msg )
-{
-	size_t		bufStart, playerbytes;
-	int		cmd;
-	int		old_background;
-	const char	*s;
-
-	// parse the message
-	while( 1 )
-	{
-		if( MSG_CheckOverflow( msg ))
-		{
-			Host_Error( "%s: overflow!\n", __func__ );
-			return;
-		}
-
-		// mark start position
-		bufStart = MSG_GetNumBytesRead( msg );
-
-		// end of message (align bits)
-		if( MSG_GetNumBitsLeft( msg ) < 8 )
-			break;
-
-		cmd = MSG_ReadServerCmd( msg );
-
-		// record command for debugging spew on parse problem
-		CL_Parse_RecordCommand( cmd, bufStart );
-
-		if( CL_ParseCommonDLLMessage( msg, PROTO_LEGACY, cmd, bufStart ))
-			continue;
-
-		// other commands
-		switch( cmd )
-		{
-		case svc_bad:
-			Host_Error( "svc_bad\n" );
-			break;
-		case svc_nop:
-			// this does nothing
-			break;
-		case svc_disconnect:
-			CL_Drop ();
-			Host_AbortCurrentFrame ();
-			break;
-		case svc_legacy_event:
-			CL_ParseEvent( msg, PROTO_LEGACY );
-			cl.frames[cl.parsecountmod].graphdata.event += MSG_GetNumBytesRead( msg ) - bufStart;
-			break;
-		case svc_legacy_changing:
-			old_background = cl.background;
-			if( MSG_ReadOneBit( msg ))
-			{
-				int maxclients = cl.maxclients;
-
-				// we can only changelevel in singleplayer
-				// and singleplayer always runs in current protocol
-				// cls.changelevel = true;
-				S_StopAllSounds( true );
-
-				Con_Printf( "Server changing, reconnecting\n" );
-
-				if( cls.demoplayback )
-				{
-					SCR_BeginLoadingPlaque( cl.background );
-					cls.changedemo = true;
-				}
-
-				CL_ClearState( );
-
-				// a1ba: need to restore cl.maxclients because engine chooses
-				// frame backups count depending on this value
-				// In general, it's incorrect to call CL_InitEdicts right after
-				// CL_ClearState because of this bug. Some time later this logic
-				// should be re-done.
-				CL_InitEdicts( maxclients ); // re-arrange edicts
-			}
-			else Con_Printf( "Server disconnected, reconnecting\n" );
-
-			if( cls.demoplayback )
-			{
-				cl.background = (cls.demonum != -1) ? true : false;
-				cls.state = ca_connected;
-			}
-			else
-			{
-				// g-cont. local client skip the challenge
-				if( SV_Active( ))
-					cls.state = ca_disconnected;
-				else cls.state = ca_connecting;
-				cl.background = old_background;
-				cls.connect_time = MAX_HEARTBEAT;
-				cls.connect_retry = 0;
-			}
-			break;
-		case svc_setview:
-			CL_ParseViewEntity( msg );
-			break;
-		case svc_sound:
-			CL_LegacyParseSoundPacket( msg, false );
-			cl.frames[cl.parsecountmod].graphdata.sound += MSG_GetNumBytesRead( msg ) - bufStart;
-			break;
-		case svc_legacy_ambientsound:
-			CL_LegacyParseSoundPacket( msg, true );
-			cl.frames[cl.parsecountmod].graphdata.sound += MSG_GetNumBytesRead( msg ) - bufStart;
-
-			break;
-		case svc_time:
-			CL_ParseServerTime( msg, PROTO_LEGACY );
-			break;
-		case svc_print:
-			Con_Printf( "%s", MSG_ReadString( msg ));
-			break;
-		case svc_stufftext:
-			s = MSG_ReadString( msg );
-			if( cl_trace_stufftext.value )
-			{
-				size_t len = Q_strlen( s );
-				Con_Printf( "Stufftext: %s%c", s, len && s[len-1] == '\n' ? '\0' : '\n' );
-			}
-
-#ifdef HACKS_RELATED_HLMODS
-			// disable Cry Of Fear antisave protection
-			if( !Q_strnicmp( s, "disconnect", 10 ) && cls.signon != SIGNONS )
-				break; // too early
-#endif
-			Cbuf_AddFilteredText( s );
-			break;
-		case svc_setangle:
-			CL_ParseSetAngle( msg );
-			break;
-		case svc_serverdata:
-			Cbuf_Execute(); // make sure any stuffed commands are done
-			CL_ParseServerData( msg, PROTO_LEGACY );
-			break;
-		case svc_lightstyle:
-			CL_ParseLightStyle( msg, PROTO_LEGACY );
-			break;
-		case svc_updateuserinfo:
-			CL_UpdateUserinfo( msg, PROTO_LEGACY );
-			break;
-		case svc_deltatable:
-			Delta_ParseTableField( msg );
-			break;
-		case svc_clientdata:
-			CL_ParseClientData( msg, PROTO_LEGACY );
-			cl.frames[cl.parsecountmod].graphdata.client += MSG_GetNumBytesRead( msg ) - bufStart;
-			break;
-		case svc_resource:
-			CL_ParseResource( msg );
-			break;
-		case svc_pings:
-			CL_UpdateUserPings( msg );
-			break;
-		case svc_particle:
-			CL_ParseParticles( msg, PROTO_LEGACY );
-			break;
-		case svc_restoresound:
-			Con_Printf( S_ERROR "%s: svc_restoresound: implement me!\n", __func__ );
-			break;
-		case svc_spawnstatic:
-			CL_LegacyParseStaticEntity( msg );
-			break;
-		case svc_event_reliable:
-			CL_ParseReliableEvent( msg, PROTO_LEGACY );
-			cl.frames[cl.parsecountmod].graphdata.event += MSG_GetNumBytesRead( msg ) - bufStart;
-			break;
-		case svc_spawnbaseline:
-			CL_ParseBaseline( msg, PROTO_LEGACY );
-			break;
-		case svc_setpause:
-			cl.paused = ( MSG_ReadOneBit( msg ) != 0 );
-			break;
-		case svc_signonnum:
-			CL_ParseSignon( msg, PROTO_LEGACY );
-			break;
-		case svc_centerprint:
-			CL_CenterPrint( MSG_ReadString( msg ), 0.25f );
-			break;
-		case svc_legacy_modelindex:
-			CL_LegacyPrecacheModel( msg );
-			break;
-		case svc_legacy_soundindex:
-			CL_LegacyPrecacheSound( msg );
-			break;
-		case svc_restore:
-			CL_ParseRestore( msg );
-			break;
-		case svc_legacy_eventindex:
-			CL_LegacyPrecacheEvent(msg);
-			break;
-		case svc_bspdecal:
-			CL_ParseStaticDecal( msg );
-			break;
-		case svc_addangle:
-			CL_ParseAddAngle( msg );
-			break;
-		case svc_usermessage:
-			CL_RegisterUserMessage( msg, PROTO_LEGACY );
-			break;
-		case svc_packetentities:
-			playerbytes = CL_ParsePacketEntities( msg, false, PROTO_LEGACY );
-			cl.frames[cl.parsecountmod].graphdata.players += playerbytes;
-			cl.frames[cl.parsecountmod].graphdata.entities += MSG_GetNumBytesRead( msg ) - bufStart - playerbytes;
-			break;
-		case svc_deltapacketentities:
-			playerbytes = CL_ParsePacketEntities( msg, true, PROTO_LEGACY );
-			cl.frames[cl.parsecountmod].graphdata.players += playerbytes;
-			cl.frames[cl.parsecountmod].graphdata.entities += MSG_GetNumBytesRead( msg ) - bufStart - playerbytes;
-			break;
-		case svc_legacy_chokecount:
-		{
-			int i, j;
-			i = MSG_ReadByte( msg );
-			j = cls.netchan.incoming_acknowledged - 1;
-			for( ; i > 0 && j > cls.netchan.outgoing_sequence - CL_UPDATE_BACKUP; j-- )
-			{
-				if( cl.frames[j & CL_UPDATE_MASK].receivedtime != -3.0 )
-				{
-					cl.frames[j & CL_UPDATE_MASK].choked = true;
-					cl.frames[j & CL_UPDATE_MASK].receivedtime = -2.0;
-					i--;
-				}
-			}
-			break;
-		}
-			//cl.frames[cls.netchan.incoming_sequence & CL_UPDATE_MASK].choked = true;
-			//cl.frames[cls.netchan.incoming_sequence & CL_UPDATE_MASK].receivedtime = -2.0;
-			break;
-		case svc_resourcelist:
-			CL_LegacyParseResourceList( msg );
-			break;
-		case svc_deltamovevars:
-			CL_ParseMovevars( msg );
-			break;
-		case svc_resourcerequest:
-			CL_ParseResourceRequest( msg );
-			break;
-		case svc_customization:
-			CL_ParseCustomization( msg );
-			break;
-		case svc_crosshairangle:
-			CL_ParseCrosshairAngle( msg );
-			break;
-		case svc_soundfade:
-			CL_ParseSoundFade( msg );
-			break;
-		case svc_filetxferfailed:
-			CL_ParseFileTransferFailed( msg );
-			break;
-		case svc_hltv:
-			CL_ParseHLTV( msg );
-			break;
-		case svc_resourcelocation:
-			CL_ParseResLocation( msg );
-			break;
-		case svc_querycvarvalue:
-			CL_ParseCvarValue( msg, false, PROTO_LEGACY );
-			break;
-		case svc_querycvarvalue2:
-			CL_ParseCvarValue( msg, true, PROTO_LEGACY );
-			break;
-		default:
-			CL_ParseUserMessage( msg, cmd, PROTO_LEGACY );
-			cl.frames[cl.parsecountmod].graphdata.usr += MSG_GetNumBytesRead( msg ) - bufStart;
-			break;
-		}
-	}
-}
-
-void CL_LegacyPrecache_f( void )
-{
-	int	spawncount, i;
-	model_t *mod;
-
-	if( cls.legacymode != PROTO_LEGACY )
-		return;
-
-	spawncount = Q_atoi( Cmd_Argv( 1 ));
-
-	Con_Printf( "Setting up renderer...\n" );
-
-	// load tempent sprites (glowshell, muzzleflashes etc)
-	CL_LoadClientSprites ();
-
-	// invalidate all decal indexes
-	memset( cl.decal_index, 0, sizeof( cl.decal_index ));
-	cl.video_prepped = true;
-	cl.audio_prepped = true;
-	if( clgame.entities )
-		clgame.entities->model = cl.worldmodel;
-
-	// load skybox
-	R_SetupSky( clgame.movevars.skyName );
-
-	// tell rendering system we have a new set of models.
-	ref.dllFuncs.R_NewMap ();
-
-	CL_SetupOverviewParams();
-
-	// release unused SpriteTextures
-	for( i = 1, mod = clgame.sprites; i < MAX_CLIENT_SPRITES; i++, mod++ )
-	{
-		if( mod->needload == NL_UNREFERENCED && COM_CheckString( mod->name ))
-			Mod_FreeModel( mod );
-	}
-
-//	Mod_FreeUnused ();
-
-	if( host_developer.value <= DEV_NONE )
-		Con_ClearNotify(); // clear any lines of console text
-
-	// done with all resources, issue prespawn command.
-	// Include server count in case server disconnects and changes level during d/l
-	MSG_BeginClientCmd( &cls.netchan.message, clc_stringcmd );
-	MSG_WriteStringf( &cls.netchan.message, "begin %i", spawncount );
-	cls.signon = SIGNONS - 1;
-}

engine/client/cl_parse_gs.c

@@ -1,762 +0,0 @@
-/*
-cl_parse.c - parse a message received from the server (GoldSrc 48 protocol)
-Copyright (C) 2008 Uncle Mike
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-*/
-
-#include "common.h"
-#include "client.h"
-#include "net_encode.h"
-#include "particledef.h"
-#include "cl_tent.h"
-#include "shake.h"
-#include "hltv.h"
-#include "input.h"
-#include "server.h"
-
-static void CL_ParseExtraInfo( sizebuf_t *msg )
-{
-	string clientfallback;
-
-	Q_strncpy( clientfallback, MSG_ReadString( msg ), sizeof( clientfallback ));
-	if( COM_CheckStringEmpty( clientfallback ))
-		Con_Reportf( S_ERROR "%s: TODO: add fallback directory %s!\n", __func__ );
-
-	if( MSG_ReadByte( msg ))
-	{
-		Cvar_FullSet( "sv_cheats", "1", FCVAR_READ_ONLY | FCVAR_SERVER );
-	}
-	else
-	{
-		Cvar_SetCheatState();
-		Cvar_FullSet( "sv_cheats", "0", FCVAR_READ_ONLY | FCVAR_SERVER );
-	}
-}
-
-static void CL_ParseNewMovevars( sizebuf_t *msg )
-{
-	Delta_InitClient(); // finalize client delta's
-
-	clgame.movevars.gravity           = MSG_ReadFloat( msg );
-	clgame.movevars.stopspeed         = MSG_ReadFloat( msg );
-	clgame.movevars.maxspeed          = MSG_ReadFloat( msg );
-	clgame.movevars.spectatormaxspeed = MSG_ReadFloat( msg );
-	clgame.movevars.accelerate        = MSG_ReadFloat( msg );
-	clgame.movevars.airaccelerate     = MSG_ReadFloat( msg );
-	clgame.movevars.wateraccelerate   = MSG_ReadFloat( msg );
-	clgame.movevars.friction          = MSG_ReadFloat( msg );
-	clgame.movevars.edgefriction      = MSG_ReadFloat( msg );
-	clgame.movevars.waterfriction     = MSG_ReadFloat( msg );
-	clgame.movevars.entgravity        = MSG_ReadFloat( msg );
-	clgame.movevars.bounce            = MSG_ReadFloat( msg );
-	clgame.movevars.stepsize          = MSG_ReadFloat( msg );
-	clgame.movevars.maxvelocity       = MSG_ReadFloat( msg );
-	clgame.movevars.zmax              = MSG_ReadFloat( msg );
-	clgame.movevars.waveHeight        = MSG_ReadFloat( msg );
-	clgame.movevars.footsteps         = MSG_ReadByte( msg );
-	clgame.movevars.rollangle         = MSG_ReadFloat( msg );
-	clgame.movevars.rollspeed         = MSG_ReadFloat( msg );
-	clgame.movevars.skycolor_r        = MSG_ReadFloat( msg );
-	clgame.movevars.skycolor_g        = MSG_ReadFloat( msg );
-	clgame.movevars.skycolor_b        = MSG_ReadFloat( msg );
-	clgame.movevars.skyvec_x          = MSG_ReadFloat( msg );
-	clgame.movevars.skyvec_y          = MSG_ReadFloat( msg );
-	clgame.movevars.skyvec_z          = MSG_ReadFloat( msg );
-
-	Q_strncpy( clgame.movevars.skyName, MSG_ReadString( msg ), sizeof( clgame.movevars.skyName ));
-
-	// water alpha is not allowed
-	if( !FBitSet( world.flags, FWORLD_WATERALPHA ))
-		clgame.movevars.wateralpha = 1.0f;
-
-	// update sky if changed
-	if( Q_strcmp( clgame.oldmovevars.skyName, clgame.movevars.skyName ) && cl.video_prepped )
-		R_SetupSky( clgame.movevars.skyName );
-
-	clgame.oldmovevars = clgame.movevars;
-	clgame.entities->curstate.scale = clgame.movevars.waveHeight;
-
-	// keep features an actual!
-	clgame.oldmovevars.features = clgame.movevars.features = host.features;
-}
-
-typedef struct delta_header_t
-{
-	qboolean remove : 1;
-	qboolean custom : 1;
-	qboolean instanced : 1;
-	uint instanced_baseline_index : 6;
-	uint offset : 6;
-} delta_header_t;
-
-static int CL_ParseDeltaHeader( sizebuf_t *msg, qboolean delta, int oldnum, struct delta_header_t *hdr )
-{
-	int entnum = oldnum;
-	memset( hdr, 0, sizeof( *hdr ));
-
-	if( !delta )
-	{
-		// if we have one bit set, then it's a next entity in line
-		// if we have next bit NON set, then it's a one of next 64 entities
-		// if not, it's a new entity
-		if( MSG_ReadOneBit( msg ))
-			entnum++;
-		else if( MSG_ReadOneBit( msg ) == 0 )
-			entnum += MSG_ReadUBitLong( msg, 6 );
-		else
-			entnum = MSG_ReadUBitLong( msg, MAX_GOLDSRC_ENTITY_BITS );
-	}
-	else
-	{
-		// does this packet encode entity deletion?
-		hdr->remove = MSG_ReadOneBit( msg );
-
-		// same logic as above
-		if( MSG_ReadOneBit( msg ) == 0 )
-			entnum += MSG_ReadUBitLong( msg, 6 );
-		else entnum = MSG_ReadUBitLong( msg, MAX_GOLDSRC_ENTITY_BITS );
-	}
-
-	// if we are not removing this entity
-	if( !hdr->remove )
-	{
-		hdr->custom = MSG_ReadOneBit( msg );
-
-		// do we got instanced baselines in svc_spawnbaselines?
-		if( cl.instanced_baseline_count )
-		{
-			hdr->instanced = MSG_ReadOneBit( msg );
-			if( hdr->instanced )
-				hdr->instanced_baseline_index = MSG_ReadUBitLong( msg, 6 );
-		}
-
-		if( !delta && !hdr->instanced )
-		{
-			if( MSG_ReadOneBit( msg ))
-				hdr->offset = MSG_ReadUBitLong( msg, 6 );
-		}
-	}
-
-	return entnum;
-}
-
-static int CL_GetEntityDelta( const struct delta_header_t *hdr, int entnum )
-{
-	if( hdr->custom )
-		return DT_CUSTOM_ENTITY_STATE_T;
-
-	if( CL_IsPlayerIndex( entnum ))
-		return DT_ENTITY_STATE_PLAYER_T;
-
-	return DT_ENTITY_STATE_T;
-}
-
-static void CL_FlushEntityPacketGS( frame_t *frame, sizebuf_t *msg )
-{
-	frame->valid = false;
-	cl.validsequence = 0; // can't render a frame
-
-	// read it all but ignore it
-	while( 1 )
-	{
-		int num = 0;
-		entity_state_t from = { 0 }, to;
-		delta_header_t hdr;
-
-		if( MSG_ReadWord( msg ) != 0 )
-		{
-			MSG_SeekToBit( msg, -16, SEEK_CUR );
-			num = CL_ParseDeltaHeader( msg, false, num, &hdr );
-		}
-		else break;
-
-		if( MSG_CheckOverflow( msg ))
-			Host_Error( "%s: overflow\n", __func__ );
-
-		if( hdr.remove )
-			continue;
-
-		Delta_ReadGSFields( msg, CL_GetEntityDelta( &hdr, num ), &from, &to, cl.mtime[0] );
-	}
-}
-
-static void CL_DeltaEntityGS( const delta_header_t *hdr, sizebuf_t *msg, frame_t *frame, int newnum, const entity_state_t *from )
-{
-	cl_entity_t	*ent;
-	entity_state_t	*to;
-	qboolean newent = from == NULL;
-	int pack = frame->num_entities;
-	qboolean has_update = msg != NULL;
-
-	// alloc next slot to store update
-	to = &cls.packet_entities[cls.next_client_entities % cls.num_client_entities];
-
-	if(( newnum < 0 ) || ( newnum >= clgame.maxEntities ))
-	{
-		Con_DPrintf( S_ERROR "CL_DeltaEntity: invalid newnum: %d\n", newnum );
-		Host_Error( "%s: bad delta entity number: %i", __func__, newnum );
-		return;
-	}
-
-	ent = CL_EDICT_NUM( newnum );
-	if( hdr->remove )
-	{
-		if( !newent )
-			CL_KillDeadBeams( ent );
-		else
-			Con_Printf( S_WARN "%s: entity remove on non-delta update (%d)\n", __func__, newnum );
-		return;
-	}
-
-	ent->index = newnum; // enumerate entity index
-	if( newent )
-	{
-		if( hdr->instanced )
-			from = &cl.instanced_baseline[hdr->instanced_baseline_index];
-		else if( hdr->offset != 0 )
-			from = &cls.packet_entities[(cls.next_client_entities - hdr->offset) % cls.num_client_entities];
-		else
-			from = &ent->baseline;
-	}
-
-	if( has_update )
-		Delta_ReadGSFields( msg, CL_GetEntityDelta( hdr, newnum ), from, to, cl.mtime[0] );
-	else memcpy( to, from, sizeof( entity_state_t ));
-
-	to->entityType = hdr->custom ? ENTITY_BEAM : ENTITY_NORMAL;
-	to->number = newnum;
-
-	if( newent )
-	{
-		// interpolation must be reset
-		SETVISBIT( frame->flags, pack );
-
-		// release beams from previous entity
-		CL_KillDeadBeams( ent );
-	}
-
-	// add entity to packet
-	cls.next_client_entities++;
-	frame->num_entities++;
-}
-
-static void CL_CopyPacketEntity( frame_t *frame, int num, const entity_state_t *from )
-{
-	delta_header_t fakehdr =
-	{
-		.custom = FBitSet( from->entityType, ENTITY_BEAM ) == ENTITY_BEAM,
-	};
-	CL_DeltaEntityGS( &fakehdr, NULL, frame, num, from );
-}
-
-static int CL_ParsePacketEntitiesGS( sizebuf_t *msg, qboolean delta )
-{
-	frame_t *frame, *oldframe;
-	int oldindex, newnum, oldnum, numbase = 0;
-	entity_state_t *oldent;
-	int count;
-	int playerbytes = 0;
-
-	// save first uncompressed packet as timestamp
-	if( cls.changelevel && !delta && cls.demorecording )
-		CL_WriteDemoJumpTime();
-
-	count = MSG_ReadWord( msg );
-
-	frame = &cl.frames[cl.parsecountmod];
-	memset( frame->flags, 0, sizeof( frame->flags ));
-	frame->first_entity = cls.next_client_entities;
-	frame->num_entities = 0;
-	frame->valid = true;
-
-	if( delta )
-	{
-		uint oldpacket = MSG_ReadByte( msg );
-		oldframe = &cl.frames[oldpacket & CL_UPDATE_MASK];
-
-		if( !CL_ValidateDeltaPacket( oldpacket, oldframe ))
-		{
-			MSG_StartBitWriting( msg );
-			CL_FlushEntityPacketGS( frame, msg );
-			MSG_EndBitWriting( msg );
-			return playerbytes;
-		}
-	}
-	else
-	{
-		oldframe = NULL;
-		cl.send_reply = true;
-		cls.demowaiting = false;
-	}
-
-	cl.validsequence = cls.netchan.incoming_sequence;
-
-	MSG_StartBitWriting( msg );
-
-	oldent = NULL;
-	oldindex = 0;
-	oldnum = CL_UpdateOldEntNum( oldindex, oldframe, &oldent );
-
-	// read it all but ignore it
-	while( 1 )
-	{
-		int bufstart;
-		qboolean player;
-		delta_header_t hdr;
-		int val = MSG_ReadWord( msg );
-
-		if( val )
-		{
-			MSG_SeekToBit( msg, -16, SEEK_CUR );
-			numbase = newnum = CL_ParseDeltaHeader( msg, delta, numbase, &hdr );
-		}
-		else break;
-
-		if( MSG_CheckOverflow( msg ))
-			Host_Error( "%s: overflow\n", __func__ );
-
-		player = CL_IsPlayerIndex( newnum );
-
-		while( oldnum < newnum )
-		{
-			if( !delta )
-				Con_Printf( S_WARN "%s: old frame copy on non-delta update (%d < %d)\n", __func__, oldnum, newnum );
-
-			// one or more entities from the old packet are unchanged
-			CL_CopyPacketEntity( frame, oldnum, oldent );
-			oldnum = CL_UpdateOldEntNum( ++oldindex, oldframe, &oldent );
-		}
-
-		bufstart = MSG_GetNumBytesRead( msg );
-
-		if( oldnum == newnum )
-		{
-			if( !delta )
-				Con_Printf( S_WARN "%s: delta entity on non-delta update (%d)\n", __func__, oldnum );
-
-			// from delta
-			CL_DeltaEntityGS( &hdr, msg, frame, newnum, oldent );
-			oldnum = CL_UpdateOldEntNum( ++oldindex, oldframe, &oldent );
-		}
-		else if( oldnum > newnum )
-		{
-			// from baseline
-			CL_DeltaEntityGS( &hdr, msg, frame, newnum, NULL );
-		}
-
-		if( player ) playerbytes += MSG_GetNumBytesRead( msg ) - bufstart;
-	}
-
-	if( MSG_CheckOverflow( msg ))
-		Host_Error( "%s: overflow\n", __func__ );
-
-	// any remaining entities in the old frame are copied over
-	while( oldnum != MAX_ENTNUMBER )
-	{
-		// one or more entities from the old packet are unchanged
-		CL_CopyPacketEntity( frame, oldnum, oldent );
-		oldnum = CL_UpdateOldEntNum( ++oldindex, oldframe, &oldent );
-	}
-
-	MSG_EndBitWriting( msg );
-
-	if( frame->num_entities != count )
-		Con_Reportf( S_WARN "CL_Parse%sPacketEntitiesGS: (%i should be %i)\n", delta ? "Delta" : "", frame->num_entities, count );
-
-	if( !frame->valid )
-		return playerbytes;
-
-	CL_ProcessPacket( frame );
-	CL_SetSolidEntities();
-
-	// first update, received world, remove loading plaque
-	if( cls.signon == ( SIGNONS - 1 ))
-	{
-		cls.signon = SIGNONS;
-		CL_SignonReply( PROTO_GOLDSRC );
-	}
-
-	return playerbytes;
-}
-
-static float MSG_ReadGSBitCoord( sizebuf_t *sb )
-{
-	float value = 0;
-	int ival, fval;
-
-	ival = MSG_ReadOneBit( sb );
-	fval = MSG_ReadOneBit( sb );
-
-	if( ival || fval )
-	{
-		int sign = MSG_ReadOneBit( sb );
-
-		if( ival )
-			ival = MSG_ReadUBitLong( sb, 12 );
-		if( fval )
-			fval = MSG_ReadUBitLong( sb, 3 );
-
-		value = (float)( fval / 8.0 + ival );
-		if( sign )
-			value = -value;
-	}
-
-	return value;
-}
-
-static void MSG_ReadGSBitVec3Coord( sizebuf_t *sb, vec3_t fa )
-{
-	qboolean x, y, z;
-
-	VectorClear( fa );
-
-	x = MSG_ReadOneBit( sb );
-	y = MSG_ReadOneBit( sb );
-	z = MSG_ReadOneBit( sb );
-	if( x )
-		fa[0] = MSG_ReadGSBitCoord( sb );
-	if( y )
-		fa[1] = MSG_ReadGSBitCoord( sb );
-	if( z )
-		fa[2] = MSG_ReadGSBitCoord( sb );
-}
-
-static void CL_ParseSoundPacketGS( sizebuf_t *msg )
-{
-	vec3_t	pos;
-	int 	chan, sound;
-	float 	volume, attn;
-	int	flags, pitch, entnum;
-	sound_t	handle = 0;
-
-	MSG_StartBitWriting( msg );
-
-	flags = MSG_ReadUBitLong( msg, 9 );
-
-	if( FBitSet( flags, SND_VOLUME ))
-		volume = (float)MSG_ReadByte( msg ) / 255.0f;
-	else volume = VOL_NORM;
-
-	if( FBitSet( flags, SND_ATTENUATION ))
-		attn = (float)MSG_ReadByte( msg ) / 64.0f;
-	else attn = ATTN_NONE;
-
-	chan = MSG_ReadUBitLong( msg, 3 );
-	entnum = MSG_ReadUBitLong( msg, MAX_GOLDSRC_ENTITY_BITS );
-	if( FBitSet( flags, SND_LEGACY_LARGE_INDEX ))
-		sound = MSG_ReadWord( msg );
-	else sound = MSG_ReadByte( msg );
-	MSG_ReadGSBitVec3Coord( msg, pos );
-
-	if( FBitSet( flags, SND_PITCH ))
-		pitch = MSG_ReadByte( msg );
-	else pitch = PITCH_NORM;
-
-	MSG_EndBitWriting( msg );
-
-	ClearBits( flags, SND_LEGACY_LARGE_INDEX );
-
-	if( FBitSet( flags, SND_SENTENCE ))
-	{
-		char	sentenceName[32];
-		Q_snprintf( sentenceName, sizeof( sentenceName ), "!%i", sound );
-		handle = S_RegisterSound( sentenceName );
-	}
-	else handle = cl.sound_index[sound];	// see precached sound
-
-	if( !cl.audio_prepped )
-		return; // too early
-
-	// g-cont. sound and ambient sound have only difference with channel
-	if( chan == CHAN_STATIC )
-	{
-		S_AmbientSound( pos, entnum, handle, volume, attn, pitch, flags );
-	}
-	else
-	{
-		S_StartSound( pos, entnum, chan, handle, volume, attn, pitch, flags );
-	}
-}
-
-static void CL_ParseSpawnStaticSound( sizebuf_t *msg )
-{
-	vec3_t pos;
-	int handle, entnum, pitch, flags;
-	float volume, attn;
-
-	MSG_ReadVec3Coord( msg, pos );
-	handle = MSG_ReadShort( msg );
-	volume = MSG_ReadByte( msg ) * ( 1.0f / 255.0f );
-	attn   = MSG_ReadByte( msg ) * ( 1.0f / 64.0f );
-	entnum = MSG_ReadShort( msg );
-	pitch  = MSG_ReadByte( msg );
-	flags  = MSG_ReadByte( msg );
-
-	S_AmbientSound( pos, entnum, handle, volume, attn, pitch, flags );
-}
-
-/*
-=====================================================================
-
-ACTION MESSAGES
-
-=====================================================================
-*/
-/*
-=====================
-CL_ParseGoldSrcServerMessage
-
-dispatch messages
-=====================
-*/
-void CL_ParseGoldSrcServerMessage( sizebuf_t *msg )
-{
-	size_t		bufStart, playerbytes;
-	int		cmd, param1;
-	const char	*s;
-
-	// parse the message
-	while( 1 )
-	{
-		if( MSG_CheckOverflow( msg ))
-		{
-			Host_Error( "CL_ParseServerMessage: overflow!\n" );
-			return;
-		}
-
-		// mark start position
-		bufStart = MSG_GetNumBytesRead( msg );
-
-		// end of message (align bits)
-		if( MSG_GetNumBitsLeft( msg ) < 8 )
-			break;
-
-		cmd = MSG_ReadServerCmd( msg );
-
-		// record command for debugging spew on parse problem
-		CL_Parse_RecordCommand( cmd, bufStart );
-
-		if( CL_ParseCommonDLLMessage( msg, PROTO_GOLDSRC, cmd, bufStart ))
-			continue;
-
-		// other commands
-		switch( cmd )
-		{
-		case svc_bad:
-			Host_Error( "svc_bad\n" );
-			break;
-		case svc_nop:
-		case svc_spawnstatic:
-		case svc_goldsrc_damage:
-		case svc_goldsrc_killedmonster:
-		case svc_goldsrc_foundsecret:
-			// this does nothing
-			break;
-		case svc_disconnect:
-			s = MSG_ReadString( msg );
-			if( COM_CheckStringEmpty( s ))
-				Con_Printf( "Server issued disconnect. Reason: %s\n", s );
-			CL_Drop ();
-			Host_AbortCurrentFrame ();
-			break;
-		case svc_event:
-			MSG_StartBitWriting( msg );
-			CL_ParseEvent( msg, PROTO_GOLDSRC );
-			MSG_EndBitWriting( msg );
-			cl.frames[cl.parsecountmod].graphdata.event += MSG_GetNumBytesRead( msg ) - bufStart;
-			break;
-		case svc_goldsrc_version:
-			param1 = MSG_ReadLong( msg );
-			if( param1 != PROTOCOL_GOLDSRC_VERSION )
-				Host_Error( "Server use invalid protocol (%i should be %i)\n", param1, PROTOCOL_GOLDSRC_VERSION );
-			break;
-		case svc_setview:
-			CL_ParseViewEntity( msg );
-			break;
-		case svc_sound:
-			CL_ParseSoundPacketGS( msg );
-			cl.frames[cl.parsecountmod].graphdata.sound += MSG_GetNumBytesRead( msg ) - bufStart;
-			break;
-		case svc_time:
-			CL_ParseServerTime( msg, PROTO_GOLDSRC );
-			break;
-		case svc_print:
-			Con_Printf( "%s", MSG_ReadString( msg ));
-			break;
-		case svc_stufftext:
-			s = MSG_ReadString( msg );
-			if( cl_trace_stufftext.value )
-			{
-				size_t len = Q_strlen( s );
-				Con_Printf( "Stufftext: %s%c", s, len && s[len-1] == '\n' ? '\0' : '\n' );
-			}
-
-#ifdef HACKS_RELATED_HLMODS
-			// disable Cry Of Fear antisave protection
-			if( !Q_strnicmp( s, "disconnect", 10 ) && cls.signon != SIGNONS )
-				break; // too early
-#endif
-			Cbuf_AddFilteredText( s );
-			break;
-		case svc_setangle:
-			CL_ParseSetAngle( msg );
-			break;
-		case svc_goldsrc_serverinfo:
-			Cbuf_Execute(); // make sure any stuffed commands are done
-			CL_ParseServerData( msg, PROTO_GOLDSRC );
-			break;
-		case svc_lightstyle:
-			CL_ParseLightStyle( msg, PROTO_GOLDSRC );
-			break;
-		case svc_updateuserinfo:
-			CL_UpdateUserinfo( msg, PROTO_GOLDSRC );
-			break;
-		case svc_goldsrc_deltadescription:
-			Delta_ParseTableField_GS( msg );
-			break;
-		case svc_clientdata:
-			MSG_StartBitWriting( msg );
-			CL_ParseClientData( msg, PROTO_GOLDSRC );
-			MSG_EndBitWriting( msg );
-			cl.frames[cl.parsecountmod].graphdata.client += MSG_GetNumBytesRead( msg ) - bufStart;
-			break;
-		case svc_goldsrc_stopsound:
-			param1 = MSG_ReadWord( msg );
-			S_StopSound( param1 >> 3, param1 & 7, NULL );
-			cl.frames[cl.parsecountmod].graphdata.sound += MSG_GetNumBytesRead( msg ) - bufStart;
-			break;
-		case svc_pings:
-			MSG_StartBitWriting( msg );
-			CL_UpdateUserPings( msg );
-			MSG_EndBitWriting( msg );
-			break;
-		case svc_particle:
-			CL_ParseParticles( msg, PROTO_GOLDSRC );
-			break;
-		case svc_event_reliable:
-			MSG_StartBitWriting( msg );
-			CL_ParseReliableEvent( msg, PROTO_GOLDSRC );
-			MSG_EndBitWriting( msg );
-			cl.frames[cl.parsecountmod].graphdata.event += MSG_GetNumBytesRead( msg ) - bufStart;
-			break;
-		case svc_spawnbaseline:
-			MSG_StartBitWriting( msg );
-			CL_ParseBaseline( msg, PROTO_GOLDSRC );
-			MSG_EndBitWriting( msg );
-			break;
-		case svc_setpause:
-			cl.paused = ( MSG_ReadByte( msg ) != 0 );
-			break;
-		case svc_signonnum:
-			CL_ParseSignon( msg, PROTO_GOLDSRC );
-			break;
-		case svc_centerprint:
-			CL_CenterPrint( MSG_ReadString( msg ), 0.25f );
-			break;
-		case svc_goldsrc_spawnstaticsound:
-			CL_ParseSpawnStaticSound( msg );
-			break;
-		case svc_finale:
-			CL_ParseFinaleCutscene( msg, 2 );
-			break;
-		case svc_restore:
-			CL_ParseRestore( msg );
-			break;
-		case svc_cutscene:
-			CL_ParseFinaleCutscene( msg, 3 );
-			break;
-		case svc_goldsrc_decalname:
-			param1 = MSG_ReadByte( msg );
-			s = MSG_ReadString( msg );
-			Q_strncpy( host.draw_decals[param1], s, sizeof( host.draw_decals[param1] ));
-			break;
-		case svc_addangle:
-			CL_ParseAddAngle( msg );
-			break;
-		case svc_goldsrc_newusermsg:
-			CL_RegisterUserMessage( msg, PROTO_GOLDSRC );
-			break;
-		case svc_packetentities:
-			playerbytes = CL_ParsePacketEntitiesGS( msg, false );
-			cl.frames[cl.parsecountmod].graphdata.players += playerbytes;
-			cl.frames[cl.parsecountmod].graphdata.entities += MSG_GetNumBytesRead( msg ) - bufStart - playerbytes;
-			break;
-		case svc_deltapacketentities:
-			playerbytes = CL_ParsePacketEntitiesGS( msg, true );
-			cl.frames[cl.parsecountmod].graphdata.players += playerbytes;
-			cl.frames[cl.parsecountmod].graphdata.entities += MSG_GetNumBytesRead( msg ) - bufStart - playerbytes;
-			break;
-		case svc_choke:
-			cl.frames[cls.netchan.incoming_sequence & CL_UPDATE_MASK].choked = true;
-			cl.frames[cls.netchan.incoming_sequence & CL_UPDATE_MASK].receivedtime = -2.0;
-			break;
-		case svc_resourcelist:
-			MSG_StartBitWriting( msg );
-			CL_ParseResourceList( msg, PROTO_GOLDSRC );
-			MSG_EndBitWriting( msg );
-			break;
-		case svc_goldsrc_newmovevars:
-			CL_ParseNewMovevars( msg );
-			break;
-		case svc_resourcerequest:
-			CL_ParseResourceRequest( msg );
-			break;
-		case svc_customization:
-			CL_ParseCustomization( msg );
-			break;
-		case svc_crosshairangle:
-			CL_ParseCrosshairAngle( msg );
-			break;
-		case svc_soundfade:
-			CL_ParseSoundFade( msg );
-			break;
-		case svc_filetxferfailed:
-			CL_ParseFileTransferFailed( msg );
-			break;
-		case svc_hltv:
-			CL_ParseHLTV( msg );
-			break;
-		case svc_voiceinit:
-			CL_ParseVoiceInit( msg );
-			break;
-		case svc_voicedata:
-			CL_ParseVoiceData( msg, PROTO_GOLDSRC );
-			cl.frames[cl.parsecountmod].graphdata.voicebytes += MSG_GetNumBytesRead( msg ) - bufStart;
-			break;
-		case svc_resourcelocation:
-			CL_ParseResLocation( msg );
-			break;
-		case svc_goldsrc_sendextrainfo:
-			CL_ParseExtraInfo( msg );
-			break;
-		case svc_goldsrc_timescale:
-			// we can set sys_timescale to anything we want but in GoldSrc it's locked for
-			// HLTV and demoplayback. Do we really want to have it then if both are out of scope?
-			Con_Reportf( S_ERROR "%s: svc_goldsrc_timescale: implement me!\n", __func__ );
-			MSG_ReadFloat( msg );
-			break;
-		case svc_goldsrc_sendcvarvalue:
-			CL_ParseCvarValue( msg, false, PROTO_GOLDSRC );
-			break;
-		case svc_goldsrc_sendcvarvalue2:
-			CL_ParseCvarValue( msg, true, PROTO_GOLDSRC );
-			break;
-		case svc_exec:
-			CL_ParseExec( msg );
-			break;
-		default:
-			CL_ParseUserMessage( msg, cmd, PROTO_LEGACY );
-			cl.frames[cl.parsecountmod].graphdata.usr += MSG_GetNumBytesRead( msg ) - bufStart;
-			break;
-		}
-	}
-}

engine/client/cl_pmove.c

@@ -54,14 +54,39 @@ void GAME_EXPORT CL_PopPMStates( void )
 	clgame.pushed = false;
 }
 
+/*
+=============
+CL_PushTraceBounds
+
+=============
+*/
+void GAME_EXPORT CL_PushTraceBounds( int hullnum, const float *mins, const float *maxs )
+{
+	hullnum = bound( 0, hullnum, 3 );
+	VectorCopy( mins, clgame.pmove->player_mins[hullnum] );
+	VectorCopy( maxs, clgame.pmove->player_maxs[hullnum] );
+}
+
+/*
+=============
+CL_PopTraceBounds
+
+=============
+*/
+void GAME_EXPORT CL_PopTraceBounds( void )
+{
+	memcpy( clgame.pmove->player_mins, host.player_mins, sizeof( host.player_mins ));
+	memcpy( clgame.pmove->player_maxs, host.player_maxs, sizeof( host.player_maxs ));
+}
+
 /*
 ===============
 CL_IsPredicted
 ===============
 */
-static qboolean CL_IsPredicted( void )
+qboolean CL_IsPredicted( void )
 {
-	if( cl_nopred.value || cl.intermission )
+	if( cl_nopred->value || cl.intermission )
 		return false;
 
 	// never predict the quake demos
@@ -158,7 +183,7 @@ void CL_SetIdealPitch( void )
 	}
 
 	if( steps < 2 ) return;
-	cl.local.idealpitch = -dir * cl_idealpitchscale.value;
+	cl.local.idealpitch = -dir * cl_idealpitchscale->value;
 }
 
 /*
@@ -209,7 +234,7 @@ void CL_CheckPredictionError( void )
 	// save the prediction error for interpolation
 	if( dist > MAX_PREDICTION_ERROR )
 	{
-		if( cl_showerror.value && host_developer.value )
+		if( cl_showerror->value && host_developer.value )
 			Con_NPrintf( 10 + ( ++pos & 3 ), "^3player teleported:^7 %.3f units\n", dist );
 
 		// a teleport or something or gamepaused
@@ -217,7 +242,7 @@ void CL_CheckPredictionError( void )
 	}
 	else
 	{
-		if( cl_showerror.value && dist > MIN_PREDICTION_EPSILON && host_developer.value )
+		if( cl_showerror->value && dist > MIN_PREDICTION_EPSILON && host_developer.value )
 			Con_NPrintf( 10 + ( ++pos & 3 ), "^1prediction error:^7 %.3f units\n", dist );
 
 		VectorCopy( cl.frames[cmd].playerstate[cl.playernum].origin, cl.local.predicted_origins[frame] );
@@ -228,7 +253,7 @@ void CL_CheckPredictionError( void )
 		// GoldSrc checks for singleplayer
 		// we would check for local server
 		if( dist > MIN_CORRECTION_DISTANCE && !SV_Active() )
-			cls.correction_time = cl_smoothtime.value;
+			cls.correction_time = cl_smoothtime->value;
 	}
 }
 
@@ -392,7 +417,7 @@ CL_AddLinksToPmove
 collect solid entities
 ====================
 */
-static void CL_AddLinksToPmove( frame_t *frame )
+void CL_AddLinksToPmove( frame_t *frame )
 {
 	entity_state_t	*state;
 	model_t		*model;
@@ -508,7 +533,7 @@ void GAME_EXPORT CL_SetSolidPlayers( int playernum )
 	physent_t		*pe;
 	int		i;
 
-	if( !cl_solid_players.value )
+	if( !cl_solid_players->value )
 		return;
 
 	for( i = 0; i < MAX_CLIENTS; i++ )
@@ -544,8 +569,8 @@ void GAME_EXPORT CL_SetSolidPlayers( int playernum )
 		// some fields needs to be override from cls.predicted_players
 		VectorCopy( player->origin, pe->origin );
 		VectorCopy( player->angles, pe->angles );
-		VectorCopy( host.player_mins[player->usehull], pe->mins );
+		VectorCopy( clgame.pmove->player_mins[player->usehull], pe->mins );
-		VectorCopy( host.player_maxs[player->usehull], pe->maxs );
+		VectorCopy( clgame.pmove->player_maxs[player->usehull], pe->maxs );
 		pe->movetype = player->movetype;
 		pe->solid = player->solid;
 	}
@@ -662,6 +687,11 @@ cl_entity_t *CL_GetWaterEntity( const float *rgflPos )
 	return CL_GetEntityByIndex( entnum );
 }
 
+int GAME_EXPORT CL_TestLine( const vec3_t start, const vec3_t end, int flags )
+{
+	return PM_TestLineExt( clgame.pmove, clgame.pmove->physents, clgame.pmove->numphysent, start, end, flags );
+}
+
 static int GAME_EXPORT pfnTestPlayerPosition( float *pos, pmtrace_t *ptrace )
 {
 	return PM_TestPlayerPosition( clgame.pmove, pos, ptrace, NULL );
@@ -794,16 +824,6 @@ static void CL_SetupPMove( playermove_t *pmove, const local_state_t *from, const
 	cd = &from->client;
 
 	pmove->player_index = ps->number - 1;
-
-	// a1ba: workaround bug where the server refuse to send our local player in delta
-	// cl.playernum, in theory, must be equal to our local player index anyway
-	//
-	// this might not be a real solution, since everything else will be bogus
-	// but we need to properly run prediction and avoid potential memory
-	// corruption
-	if( pmove->player_index < 0 )
-		pmove->player_index = bound( 0, cl.playernum, cl.maxclients - 1 );
-
 	pmove->multiplayer = (cl.maxclients > 1);
 	pmove->runfuncs = runfuncs;
 	pmove->time = time * 1000.0f;
@@ -853,10 +873,10 @@ static void CL_SetupPMove( playermove_t *pmove, const local_state_t *from, const
 	VectorCopy( cd->vuser4, pmove->vuser4 );
 	pmove->cmd = *ucmd;	// copy current cmds
 
-	Q_strncpy( pmove->physinfo, cls.physinfo, sizeof( pmove->physinfo ));
+	Q_strncpy( pmove->physinfo, cls.physinfo, MAX_INFO_STRING );
 }
 
-static const void CL_FinishPMove( const playermove_t *pmove, local_state_t *to )
+const void CL_FinishPMove( const playermove_t *pmove, local_state_t *to )
 {
 	entity_state_t	*ps;
 	clientdata_t	*cd;
@@ -909,7 +929,7 @@ CL_RunUsercmd
 Runs prediction code for user cmd
 =================
 */
-static void CL_RunUsercmd( local_state_t *from, local_state_t *to, usercmd_t *u, qboolean runfuncs, double *time, unsigned int random_seed )
+void CL_RunUsercmd( local_state_t *from, local_state_t *to, usercmd_t *u, qboolean runfuncs, double *time, unsigned int random_seed )
 {
 	usercmd_t		cmd;
 
@@ -1085,7 +1105,7 @@ void CL_PredictMovement( qboolean repredicting )
 			cl.local.onground = frame->playerstate[cl.playernum].onground;
 		else cl.local.onground = -1;
 
-		if( !repredicting || !cl_lw.value )
+		if( !repredicting || !CVAR_TO_BOOL( cl_lw ))
 			cl.local.viewmodel = to->client.viewmodel;
 		cl.local.repredicting = false;
 		cl.local.moving = false;
@@ -1117,7 +1137,7 @@ void CL_PredictMovement( qboolean repredicting )
 
 	cl.local.waterlevel = to->client.waterlevel;
 	cl.local.usehull = to->playerstate.usehull;
-	if( !repredicting || !cl_lw.value )
+	if( !repredicting || !CVAR_TO_BOOL( cl_lw ))
 		cl.local.viewmodel = to->client.viewmodel;
 
 	if( FBitSet( to->client.flags, FL_ONGROUND ))
@@ -1147,7 +1167,7 @@ void CL_PredictMovement( qboolean repredicting )
 		cl.local.moving = false;
 	}
 
-	if( cls.correction_time > 0 && !cl_nosmooth.value && cl_smoothtime.value )
+	if( cls.correction_time > 0 && !cl_nosmooth->value && cl_smoothtime->value )
 	{
 		vec3_t delta;
 		float frac;
@@ -1157,14 +1177,14 @@ void CL_PredictMovement( qboolean repredicting )
 			cls.correction_time -= host.frametime;
 
 		// Make sure smoothtime is postive
-		if( cl_smoothtime.value <= 0.0f )
+		if( cl_smoothtime->value <= 0.0f )
-			Cvar_DirectSet( &cl_smoothtime, "0.1" );
+			Cvar_DirectSet( cl_smoothtime, "0.1" );
 
 		// Clamp from 0 to cl_smoothtime.value
-		cls.correction_time = bound( 0.0, cls.correction_time, cl_smoothtime.value );
+		cls.correction_time = bound( 0.0, cls.correction_time, cl_smoothtime->value );
 
 		// Compute backward interpolation fraction along full correction
-		frac = 1.0f - cls.correction_time / cl_smoothtime.value;
+		frac = 1.0f - cls.correction_time / cl_smoothtime->value;
 
 		// Determine how much error we still have to make up for
 		VectorSubtract( cl.simorg, cl.local.lastorigin, delta );

engine/client/cl_qparse.c

@@ -22,24 +22,22 @@ GNU General Public License for more details.
 #include "hltv.h"
 #include "input.h"
 
-enum {
+#define STAT_HEALTH		0
-	STAT_HEALTH = 0,
+#define STAT_FRAGS		1
-	STAT_FRAGS,
+#define STAT_WEAPON		2
-	STAT_WEAPON,
+#define STAT_AMMO		3
-	STAT_AMMO,
+#define STAT_ARMOR		4
-	STAT_ARMOR,
+#define STAT_WEAPONFRAME	5
-	STAT_WEAPONFRAME,
+#define STAT_SHELLS		6
-	STAT_SHELLS,
+#define STAT_NAILS		7
-	STAT_NAILS,
+#define STAT_ROCKETS	8
-	STAT_ROCKETS,
+#define STAT_CELLS		9
-	STAT_CELLS,
+#define STAT_ACTIVEWEAPON	10
-	STAT_ACTIVEWEAPON,
+#define STAT_TOTALSECRETS	11
-	STAT_TOTALSECRETS,
+#define STAT_TOTALMONSTERS	12
-	STAT_TOTALMONSTERS,
+#define STAT_SECRETS	13		// bumped on client side by svc_foundsecret
-	STAT_SECRETS,  // bumped on client side by svc_foundsecret
+#define STAT_MONSTERS	14		// bumped by svc_killedmonster
-	STAT_MONSTERS, // bumped by svc_killedmonster
+#define MAX_STATS		32
-	MAX_STATS =	32,
-};
 
 static char	cmd_buf[8192];
 static char	msg_buf[8192];
@@ -213,7 +211,7 @@ static void CL_ParseQuakeServerInfo( sizebuf_t *msg )
 	clgame.maxEntities = GI->max_edicts;
 	clgame.maxEntities = bound( 600, clgame.maxEntities, MAX_EDICTS );
 	clgame.maxModels = MAX_MODELS;
-	Q_strncpy( clgame.maptitle, MSG_ReadString( msg ), sizeof( clgame.maptitle ));
+	Q_strncpy( clgame.maptitle, MSG_ReadString( msg ), MAX_STRING );
 
 	// Re-init hud video, especially if we changed game directories
 	clgame.dllFuncs.pfnVidInit();
@@ -234,10 +232,10 @@ static void CL_ParseQuakeServerInfo( sizebuf_t *msg )
 		// loading user settings
 		CSCR_LoadDefaultCVars( "user.scr" );
 
-		if( r_decals.value > mp_decals.value )
+		if( r_decals->value > mp_decals.value )
-			Cvar_DirectSet( &r_decals, mp_decals.string );
+			Cvar_SetValue( "r_decals", mp_decals.value );
 	}
-	else Cvar_DirectSet( &r_decals, NULL );
+	else Cvar_Reset( "r_decals" );
 
 	if( cl.background )	// tell the game parts about background state
 		Cvar_FullSet( "cl_background", "1", FCVAR_READ_ONLY );
@@ -260,7 +258,7 @@ static void CL_ParseQuakeServerInfo( sizebuf_t *msg )
 	Q_strncpy( gameui.globals->maptitle, clgame.maptitle, sizeof( gameui.globals->maptitle ));
 
 	if( !cls.changelevel && !cls.changedemo )
-		CL_InitEdicts( cl.maxclients ); // re-arrange edicts
+		CL_InitEdicts (); // re-arrange edicts
 
 	// Quake just have a large packet of initialization data
 	for( i = 1; i < MAX_MODELS; i++ )
@@ -304,9 +302,9 @@ static void CL_ParseQuakeServerInfo( sizebuf_t *msg )
 	else Cvar_Set( "cl_levelshot_name", va( "levelshots/%s_%s", clgame.mapname, refState.wideScreen ? "16x9" : "4x3" ));
 	Cvar_SetValue( "scr_loading", 0.0f ); // reset progress bar
 
-	if(( cl_allow_levelshots.value && !cls.changelevel ) || cl.background )
+	if(( cl_allow_levelshots->value && !cls.changelevel ) || cl.background )
 	{
-		if( !FS_FileExists( va( "%s.bmp", cl_levelshot_name.string ), true ))
+		if( !FS_FileExists( va( "%s.bmp", cl_levelshot_name->string ), true ))
 			Cvar_Set( "cl_levelshot_name", "*black" ); // render a black screen
 		cls.scrshot_request = scrshot_plaque; // request levelshot even if exist (check filetime)
 	}
@@ -330,7 +328,7 @@ static void CL_ParseQuakeServerInfo( sizebuf_t *msg )
 	clgame.movevars.gravity = 800.0f;	// quake doesn't write gravity in demos
 	clgame.movevars.maxvelocity = 2000.0f;
 
-	clgame.oldmovevars = clgame.movevars;
+	memcpy( &clgame.oldmovevars, &clgame.movevars, sizeof( movevars_t ));
 }
 
 /*
@@ -416,7 +414,7 @@ If an entities model or origin changes from frame to frame, it must be
 relinked.  Other attributes can change without relinking.
 ==================
 */
-static void CL_ParseQuakeEntityData( sizebuf_t *msg, int bits )
+void CL_ParseQuakeEntityData( sizebuf_t *msg, int bits )
 {
 	int		i, newnum, pack;
 	qboolean		forcelink;
@@ -431,7 +429,7 @@ static void CL_ParseQuakeEntityData( sizebuf_t *msg, int bits )
 		cls.signon = SIGNONS;
 
 		// Clear loading plaque.
-		CL_SignonReply( PROTO_QUAKE );
+		CL_SignonReply ();
 	}
 
 	// alloc next slot to store update
@@ -567,7 +565,7 @@ CL_ParseQuakeParticles
 
 ==================
 */
-static void CL_ParseQuakeParticle( sizebuf_t *msg )
+void CL_ParseQuakeParticle( sizebuf_t *msg )
 {
 	int	count, color;
 	vec3_t	org, dir;
@@ -589,7 +587,7 @@ CL_ParseQuakeStaticSound
 
 ===================
 */
-static void CL_ParseQuakeStaticSound( sizebuf_t *msg )
+void CL_ParseQuakeStaticSound( sizebuf_t *msg )
 {
 	int	sound_num;
 	float 	vol, attn;
@@ -622,7 +620,7 @@ static void CL_ParseQuakeDamage( sizebuf_t *msg )
 
 /*
 ===================
-CL_ParseStaticEntity
+CL_ParseQuakeStaticEntity
 
 ===================
 */
@@ -648,7 +646,7 @@ static void CL_ParseQuakeStaticEntity( sizebuf_t *msg )
 	i = clgame.numStatics;
 	if( i >= MAX_STATIC_ENTITIES )
 	{
-		Con_Printf( S_ERROR "%s: static entities limit exceeded!\n", __func__ );
+		Con_Printf( S_ERROR "CL_ParseStaticEntity: static entities limit exceeded!\n" );
 		return;
 	}
 
@@ -696,13 +694,17 @@ static void CL_ParseQuakeBaseline( sizebuf_t *msg )
 	cl_entity_t	*ent;
 	int		newnum;
 
+	memset( &state, 0, sizeof( state ));
 	newnum = MSG_ReadWord( msg ); // entnum
 
 	if( newnum >= clgame.maxEntities )
-		Host_Error( "%s: no free edicts\n", __func__ );
+		Host_Error( "CL_AllocEdict: no free edicts\n" );
+
+	ent = CL_EDICT_NUM( newnum );
+	memset( &ent->prevstate, 0, sizeof( ent->prevstate ));
+	ent->index = newnum;
 
 	// parse baseline
-	memset( &state, 0, sizeof( state ));
 	state.modelindex = MSG_ReadByte( msg );
 	state.frame = MSG_ReadByte( msg );
 	state.colormap = MSG_ReadByte( msg );
@@ -713,11 +715,10 @@ static void CL_ParseQuakeBaseline( sizebuf_t *msg )
 	state.angles[1] = MSG_ReadAngle( msg );
 	state.origin[2] = MSG_ReadCoord( msg );
 	state.angles[2] = MSG_ReadAngle( msg );
-
-	ent = CL_EDICT_NUM( newnum );
-	ent->index = newnum;
 	ent->player = CL_IsPlayerIndex( newnum );
-	ent->prevstate = ent->baseline = state;
+
+	memcpy( &ent->baseline, &state, sizeof( entity_state_t ));
+	memcpy( &ent->prevstate, &state, sizeof( entity_state_t ));
 }
 
 /*
@@ -779,7 +780,7 @@ static void CL_ParseQuakeSignon( sizebuf_t *msg )
 	int	i = MSG_ReadByte( msg );
 
 	if( i == 3 ) cls.signon = SIGNONS - 1;
-	Con_Reportf( "%s: %d\n", __func__, i );
+	Con_Reportf( "CL_Signon: %d\n", i );
 }
 
 /*
@@ -817,7 +818,7 @@ CL_QuakeStuffText
 
 ==================
 */
-static void CL_QuakeStuffText( const char *text )
+void CL_QuakeStuffText( const char *text )
 {
 	Q_strncat( cmd_buf, text, sizeof( cmd_buf ));
 
@@ -832,7 +833,7 @@ CL_QuakeExecStuff
 
 ==================
 */
-static void CL_QuakeExecStuff( void )
+void CL_QuakeExecStuff( void )
 {
 	char	*text = cmd_buf;
 	char	token[256];
@@ -845,7 +846,7 @@ static void CL_QuakeExecStuff( void )
 	while( 1 )
 	{
 		// skip whitespace up to a /n
-		while( *text && ((byte)*text ) <= ' ' && *text != '\r' && *text != '\n' )
+		while( *text && ((byte)*text) <= ' ' && *text != '\r' && *text != '\n' )
 			text++;
 
 		if( *text == '\n' || *text == '\r' )
@@ -887,21 +888,38 @@ CL_ParseQuakeMessage
 
 ==================
 */
-void CL_ParseQuakeMessage( sizebuf_t *msg )
+void CL_ParseQuakeMessage( sizebuf_t *msg, qboolean normal_message )
 {
 	int		cmd, param1, param2;
 	size_t		bufStart;
 	const char	*str;
 
+	cls.starting_count = MSG_GetNumBytesRead( msg );	// updates each frame
+	CL_Parse_Debug( true );			// begin parsing
+
 	// init excise buffer
 	MSG_Init( &msg_demo, "UserMsg", msg_buf, sizeof( msg_buf ));
 
+	if( normal_message )
+	{
+		// assume no entity/player update this packet
+		if( cls.state == ca_active )
+		{
+			cl.frames[cls.netchan.incoming_sequence & CL_UPDATE_MASK].valid = false;
+			cl.frames[cls.netchan.incoming_sequence & CL_UPDATE_MASK].choked = false;
+		}
+		else
+		{
+			CL_ResetFrame( &cl.frames[cls.netchan.incoming_sequence & CL_UPDATE_MASK] );
+		}
+	}
+
 	// parse the message
 	while( 1 )
 	{
 		if( MSG_CheckOverflow( msg ))
 		{
-			Host_Error( "%s: overflow!\n", __func__ );
+			Host_Error( "CL_ParseServerMessage: overflow!\n" );
 			return;
 		}
 
@@ -950,7 +968,7 @@ void CL_ParseQuakeMessage( sizebuf_t *msg )
 			break;
 		case svc_time:
 			Cbuf_AddText( "\n" ); // new frame was started
-			CL_ParseServerTime( msg, PROTO_QUAKE );
+			CL_ParseServerTime( msg );
 			break;
 		case svc_print:
 			str = MSG_ReadString( msg );
@@ -1092,11 +1110,14 @@ void CL_ParseQuakeMessage( sizebuf_t *msg )
 			}
 			break;
 		default:
-			Host_Error( "%s: Illegible server message\n", __func__ );
+			Host_Error( "CL_ParseServerMessage: Illegible server message\n" );
 			break;
 		}
 	}
 
+	cl.frames[cl.parsecountmod].graphdata.msgbytes += MSG_GetNumBytesRead( msg ) - cls.starting_count;
+	CL_Parse_Debug( false ); // done
+
 	// now process packet.
 	CL_ProcessPacket( &cl.frames[cl.parsecountmod] );