engine: rework how HTTP finite-machine works, use function pointers instead of enum. Preliminary chunked transfer and compression support.

* Update MultiEmulator submodule

.builds/alpine.yml

@@ -0,0 +1,28 @@
+image: alpine/latest
+packages:
+- build-base
+- sdl2-dev
+- freetype-dev
+- fontconfig-dev
+- opus-dev
+- bzip2-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

@@ -0,0 +1,31 @@
+image: debian/sid
+arch: amd64
+packages:
+- build-essential
+- python-is-python3
+- libsdl2-dev
+- libfreetype-dev
+- libfontconfig-dev
+- libopus-dev
+- libbz2-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

@@ -0,0 +1,30 @@
+image: debian/sid
+packages:
+- build-essential
+- python-is-python3
+- libsdl2-dev
+- libfreetype-dev
+- libfontconfig-dev
+- libopus-dev
+- libbz2-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

@@ -0,0 +1,30 @@
+image: freebsd/latest
+packages:
+- lang/python
+- devel/pkgconf
+- devel/sdl20
+- print/freetype2
+- x11-fonts/fontconfig
+- audio/opus
+- archivers/bzip2
+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

@@ -0,0 +1,30 @@
+image: netbsd/latest
+packages:
+- python311
+- SDL2
+- freetype2
+- fontconfig
+- libopus
+- pkgconf
+- bzip2
+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

@@ -0,0 +1,27 @@
+image: openbsd/latest
+packages:
+- python3
+- sdl2
+- opus
+- bzip2
+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

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

.editorconfig

@@ -0,0 +1,365 @@
+# this file is just a suggestion, you might follow it, you might not
+root = true
+
+[*]
+charset = utf-8
+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

.gitattributes

@@ -0,0 +1,3 @@
+*.c	text eol=lf diff=cpp
+*.h	text eol=lf diff=cpp
+wscript text eol=lf diff=python

.github/FUNDING.yml

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

.github/workflows/c-cpp.yml

@@ -0,0 +1,124 @@
+name: Build & Deploy Engine
+on: [push, pull_request]
+jobs:
+#  cleanup:
+#    runs-on: self-hosted
+#    steps:
+#    - name: Cleanup
+#      run: rm -rf .* || true
+  build:
+    runs-on: ${{ matrix.os }}
+    continue-on-error: true
+    strategy:
+      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
+          - os: ubuntu-20.04
+            targetos: linux
+            targetarch: i386
+#          - os: ubuntu-aarch64-20.04
+#            targetos: linux
+#            targetarch: aarch64
+          - os: ubuntu-20.04
+            targetos: android
+            targetarch: multiarch
+#          - os: ubuntu-20.04
+#            targetos: motomagx
+#            targetarch: armv6
+
+          - os: ubuntu-latest
+            targetos: nswitch
+            targetarch: arm64
+          - os: ubuntu-latest
+            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
+            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
+      GH_CPU_ARCH: ${{ matrix.targetarch }}
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      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
+      with:
+        name: artifact-${{ matrix.targetos }}-${{ matrix.targetarch }}
+        path: artifacts/*
+  flatpak:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - app: su.xash.Engine.Compat.i386
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:freedesktop-23.08
+      options: --privileged
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+    - name: Build flatpak (Compat.i386)
+      uses: FWGS/flatpak-github-actions/flatpak-builder@v6.3
+      with:
+        bundle: ${{ matrix.app }}.flatpak
+        manifest-path: scripts/flatpak/${{ matrix.app }}.yml
+  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
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        RELEASE_TAG: ${{ github.ref_name == 'master' && 'continuous' || format('continuous-{0}', github.ref_name) }}
+      run: |
+        gh release delete "$RELEASE_TAG" \
+          --yes \
+          --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
+        popd
+        sleep 20s
+        gh release create "$RELEASE_TAG" artifacts/* \
+          --title "Xash3D FWGS Continuous ${{ github.ref_name }} Build" \
+          --target $GITHUB_SHA \
+          --repo "$GITHUB_REPOSITORY" \
+          --prerelease

.gitignore

@@ -0,0 +1,347 @@
+# Binaries
+*.o
+*.so
+*.a
+*.framework
+
+# Other
+*.save
+
+# Qt Creator for some reason creates *.user.$version files, so exclude it too
+*.user*
+*~
+
+### Xcode ###
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
+*.xcuserstate
+
+
+### OSX ###
+.DS_Store
+.AppleDouble
+.LSOverride
+
+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### CMake ###
+CMakeCache.txt
+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
+*.dll
+*.exp
+*.lib
+*.suo
+*.sdf
+Debug/
+Release/
+ipch/
+*.opensdf
+# Use CMake for generating projects
+*.vcxproj.filters
+*.vcxproj
+*.sln
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+build/
+bld/
+[Bb]in/
+[Oo]bj/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+artifacts/
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings 
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+
+# Windows Azure Build Output
+csx/
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.pfx
+*.publishsettings
+node_modules/
+orleans.codegen.cs
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# PVS Studio for Linux output
+*.cl.cfg
+
+# Kate
+*.kate-swp
+*.swp
+
+# QtCreator
+build-*
+
+# Android
+*.apk
+*.config
+*.creator
+*.includes
+*.files
+
+# Waf
+build_current
+*waf-*/
+*waf3-*/
+.lock-waf*
+*.lastbuildstate
+*.unsuccessfulbuild
+__pycache__
+*.pyc
+
+# MSVC projects
+*.vcproj
+*.sln
+*.vcxproj
+
+# Visual Studio Code
+.vscode/*
+*.code-workspace
+.history/*
+.cache/*
+enc_temp_folder/
+
+# KDevelop4
+*.kdev4
+
+# ccls langauge server
+.ccls-*

.gitmodules

@@ -0,0 +1,27 @@
+[submodule "mainui"]
+	path = 3rdparty/mainui
+	url = https://github.com/FWGS/mainui_cpp
+[submodule "ref_gl/nanogl"]
+	path = 3rdparty/nanogl
+	url = https://github.com/FWGS/nanogl
+[submodule "ref_gl/gl-wes-v2"]
+	path = 3rdparty/gl-wes-v2
+	url = https://github.com/FWGS/gl-wes-v2
+[submodule "ref_gl/gl4es"]
+	path = 3rdparty/gl4es/gl4es
+	url = https://github.com/ptitSeb/gl4es
+[submodule "vgui_support"]
+	path = 3rdparty/vgui_support
+	url = https://github.com/FWGS/vgui_support
+[submodule "opus"]
+	path = 3rdparty/opus/opus
+	url = https://github.com/xiph/opus
+[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
+[submodule "3rdparty/MultiEmulator"]
+	path = 3rdparty/MultiEmulator
+	url = https://github.com/FWGS/MultiEmulator

3rdparty/bzip2/bz_version.h

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

3rdparty/bzip2/wscript

@@ -0,0 +1,34 @@
+#! /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):
+# doesn't work with CMake generator
+#	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',
+		includes = ['.', 'bzip2/'],
+		subsystem = bld.env.MSVC_SUBSYSTEM,
+		export_includes = ['bzip2/']
+	)

3rdparty/extras/wscript

@@ -0,0 +1,29 @@
+#! /usr/bin/env python
+# encoding: utf-8
+
+import os
+
+def options(opt):
+	pass
+
+def configure(conf):
+	if not conf.path.find_dir('xash-extras'):
+		conf.fatal('Can\'t find xash-extras submodule.')
+		return
+
+	conf.load('zip')
+
+def build(bld):
+	srcdir = bld.path.find_dir('xash-extras')
+
+	if bld.env.DEST_OS in ['android']:
+		install_path = bld.env.PREFIX
+	else:
+		install_path = os.path.join(bld.env.SHAREDIR, bld.env.GAMEDIR)
+
+	bld(features='zip',
+		name = 'extras.pk3',
+		files = srcdir.ant_glob('**/*'),
+		relative_to = srcdir,
+		compresslevel = 0,
+		install_path = install_path)

3rdparty/gl4es/wscript

@@ -0,0 +1,23 @@
+#! /usr/bin/env python
+# encoding: utf-8
+
+import os
+
+def options(opt):
+	pass
+
+def configure(conf):
+	if not conf.path.find_dir('gl4es') or not conf.path.find_dir('gl4es/src'):
+		conf.fatal('Can\'t find gl4es submodule. Run `git submodule update --init --recursive`.')
+		return
+
+def build(bld):
+	gl4es_srcdir = bld.path.find_node('gl4es/src')
+
+	bld.stlib(source   = gl4es_srcdir.ant_glob(['gl/*.c', 'gl/*/*.c', 'glx/hardext.c']),
+		target   = 'gl4es',
+		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'],
+		cflags   = ['-w', '-fvisibility=hidden', '-std=gnu99'],
+		subsystem = bld.env.MSVC_SUBSYSTEM,
+		export_includes = '.')

3rdparty/opus/wscript

@@ -0,0 +1,40 @@
+#! /usr/bin/env python
+# encoding: utf-8
+
+import os
+
+def options(opt):
+	pass
+
+def configure(conf):
+	if not conf.path.find_dir('opus') or not conf.path.find_dir('opus/src'):
+		conf.fatal('Can\'t find opus submodule. Run `git submodule update --init --recursive`.')
+		return
+
+	# TODO: ARM/x86 intrinsics detection
+	# TODO: maybe call autotools/cmake/meson instead?
+
+def build(bld):
+	sources = bld.path.ant_glob([
+		'opus/src/*.c',
+		'opus/celt/*.c',
+		'opus/silk/*.c',
+		'opus/silk/float/*.c'
+	], excl = [
+		'opus/src/repacketizer_demo.c',
+		'opus/src/opus_demo.c',
+		'opus/src/opus_compare.c',
+		'opus/celt/opus_custom_demo.c'
+	])
+	includes = ['opus/include/', 'opus/celt/', 'opus/silk/', 'opus/silk/float/']
+	defines = ['USE_ALLOCA', 'OPUS_BUILD', 'FLOAT_APPROX', 'PACKAGE_VERSION="1.4.0"', 'CUSTOM_MODES']
+
+	bld.stlib(
+		source = sources,
+		target = 'opus',
+		features = 'c',
+		includes = includes,
+		defines = defines,
+		subsystem = bld.env.MSVC_SUBSYSTEM,
+		export_includes = ['opus/include/']
+	)

CONTRIBUTING.md

@@ -0,0 +1,47 @@
+## If you are reporting bugs
+
+1. Check you are using latest version. You can build latest Xash3D FWGS for yourself, look to README.md.
+2. Check open issues is your bug is already reported and closed issues if it reported and fixed. Don't send bug if it's already reported.
+3. Re-run engine with `-dev 2 -log` arguments, reproduce bug and post engine.log which can be found in your working directory.
+3. Describe steps to reproduce bug.
+4. Describe which OS and architecture you are using.
+6. Attach screenshot if it will help clarify the situation.
+
+## If you are contributing code
+
+### Which branch?
+
+* We recommend using `master` branch.
+
+### Third-party libraries
+
+* Philosophy of any Xash Project by Uncle Mike: don't be bloated. We follow it too.
+* Adding new library is allowed only if there is a REAL reason to use it. It's will be nice, if you will leave a possibility to remove new dependency at build-time.
+* Adding new dependencies for Waf Build System is not welcomed.
+
+### Portability level
+
+* Xash3D have it's own crt library. It's recommended to use it. It most cases it's just a wrappers around standart C library.
+* If your feature need platform-specific code, move it to `engine/platform` and try to implement to every supported OS and every supported compiler or at least leave a stubs.
+* You must put it under appopriate macro. It's a rule: Xash3D FWGS must compile everywhere. For list of platforms we support, refer to public/build.h file.
+
+### Code style
+
+* This project uses mixed Quake's and HLSDK's C/C++ code style convention. 
+* In short:
+  * Use spaces in parenthesis.
+  * Only tabs for indentation.
+  * Any brace must have it's own line.
+  * Short blocks, if statements and loops on single line are allowed.
+  * Avoid magic numbers.
+  * While macros are powerful, it's better to avoid overusing them.
+  * If you unsure, try to mimic code style from anywhere else of engine source code.
+* **ANY** commit message should start from declaring a tags, in format:
+  
+  `tag: added some bugs`
+  
+  `tag: subtag: fixed some features`
+  
+  Tags can be any: subsystem, simple feature name or even just a filename, without extension.
+  Just keep them always same, it helps keep history clean and commit messages short.
+

Documentation/bug-compatibility.md

@@ -0,0 +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.
+
+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 |
+| ------- | ----------- | ---------------------------- |
+| `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 |
+| `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. |

Documentation/cross-compiling-for-windows-with-wine.md

@@ -0,0 +1,9 @@
+# Cross-compiling for Windows with Wine
+
+This can be useful to test engine in Wine without using virtual machines or dual-booting to Windows.
+
+0. Clone and install https://github.com/mstorsjo/msvc-wine (you can skip CMake part)
+1. Set environment variable MSVC_WINE_PATH to the path to installed MSVC toolchain
+2. Pre-load wine: `wineserver -k; wineserver -p; wine64 wineboot`
+3. Run `./waf configure -T <build-type> --enable-wine-msvc --sdl2=../SDL2_VC`. Configuration step will take more time than usual.
+4. .. other typical steps to build from console ...

Documentation/debugging-using-minidumps.md

@@ -0,0 +1,10 @@
+# Debugging your mod using minidump files (Windows only)
+Minidump files is awesome instrument for debugging your mod after it's being released, or for catch specific crashes which are presented only in one specific configuration, but doesn't happens in other configurations or even on developer machine. It contains a lot of information useful for debugging, and therefore it size is not so small: around hundreds or even thousands of megabytes. But this is not a problem, since minidump files compresses very effectively using common algorithms.
+There are short algorithm, explaining how to use this debugging instrument:
+
+1. User starts your mod with `-minidumps` startup parameter
+2. Finally, crash happened on user's machine, and minidump file being written. This file has `.mdmp` extension and located in same folder, where mod folder located
+3. User packs this minidump file to .zip/.7z archive, and somehow sends it to developer
+4. Developer just opens minidump file in Visual Studio, then a virtual debugging session is opened and now reasons of crash is pretty easy to detect: you can see call stack, local function variables and global variables, information about exception and a lot of other information
+
+You can find more information about minidumps in this [awesome article](https://learn.microsoft.com/en-us/windows/win32/dxtecharts/crash-dump-analysis?source=recommendations#writing-a-minidump).

Documentation/donate.md

@@ -0,0 +1,24 @@
+# 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/engine-porting-guide.md

@@ -0,0 +1,71 @@
+## Abstract
+
+Before start, I would recommend you to compile and run engine for already supported and well-spread platform, such as GNU/Linux or Windows. Hack it, get familiar with engine.
+
+One beauties of Xash3D FWGS Engine is it modularity, so game logic, UI and renderers are located in platform-independent libraries. Every library is loaded at run time and may or may be not optional.  For example, if your platform doesn't have OpenGL of any kind, you can skip it and use our software renderer! Of course, there is no real reason to run game engine, if you don't have game logic of any kind, so the minimal build of Xash3D FWGS is headless dedicated server.
+
+Historically, Xash3D Engine was even more modular(see github.com/a1batross/Xash3D_ancient), but we thought that to fulfill our crossplatform needs we will keep all platform-specific stuff in the engine itself and libraries must import or expose platform-independent APIs.
+
+Ok, get to the point!
+
+## Porting guidelines
+
+It will not be a complete tutorial as covering everything in one article is probably just impossible. Instead, I will give you hints on how engine can be ported, how to get your port to upstreamed and how you should maintain your port.
+
+0) Get to know your platform. Maybe I asked for this lately, but you MUST KNOW YOUR PLATFORM, i.e. what's this capable of.
+
+The one of unsupported configurations at this time is when platform can't load dynamic libraries(`*.so` or DLLs). We can't help you as supporting full-static ports are violating the GPL license in various ways.
+
+The other yet unsupported configuration is the big endian.
+
+1) Setup toolchain. For dirty port, you can write Makefile for yourself, engine is written that way, so **it doesn't relies** on any generated data or any special processing. But I recommend you to use Waf anyway, it's better integrated to engine and self-documentable. Also, I will cover only our Waf build options.
+
+2) Open `public/build.h` file. Add appropriate checks for your operating system and/or CPU architecture. It shouldn't be hard.
+
+Also, you'll need to build [Half-Life SDK](https://github.com/FWGS/hlsdk-xash3d/). It has same `public/build.h` so reflect changes into it. Note that to be compatible with HLSDK proprietary license, it's relicensed as public domain under [Unlicense](https://unlicense.org).
+
+We have a library naming scheme that allows us and game creators to distribute binaries for different platforms in one archive. Read `Documentation/extensions/library-naming.md` for more information.
+
+In short, you need to call your platform in unique way. For engine side it's done in `engine/common/build.c` file in engine source code, for HLSDK side it's done in `cmake/LibraryNaming.cmake` and `scripts/waifulib/library-naming.py` files in HLSDK source code.
+
+You can use [predef project wiki](https://sourceforge.net/p/predef/wiki/Home/) for reference.
+
+2) Look at the `engine/platform` directory. We usually try to have all platform-specific stuff inside this folder.
+
+* Functions that must be available on your platform are declared in `platform.h` header. Most of them aren't used in headless dedicated build, but I will cover that later.
+
+* The POSIX-compliant(for *nix operating systems) goes into `posix` subdirectory.
+
+* The SDL-specific code goes into `sdl` subdirectory. Note that even I said before that platform-specific code is in `platform` directory, SDL obviously isn't a __platform__, so you can met checks for XASH_SDL inside whole engine, usually in input.
+
+* Custom SWAP implementation for *nix-based systems is in `swap` subdirectory. It's used when hardware may not have enough memory and you can't add swap memory. I will cover that later
+It relies on a fact that systems with paged memory will load pages into RAM and move unused to mmap()-ed by custom swap area.
+That allowed to run game engine on music player with MIPS CPU, Linux without SWAP support and
+
+* Other folders as `win32`, `android`, `linux` and so on are self-descriptive.
+
+3) As proof of concept, you can try to test that network features and dynamic library loading are implemented correctly. Build a dedicated server with XASH_DEDICATED or `--dedicated` passed  to `waf configure`.
+
+Start a server and try to connect to it from PC. If everything is fine, then you can move to next step.
+
+If you get out of memory issues, you can try Low Memory Mode, it's enabled with `--low-memory-mode=N` passed to `waf configure` where N is 1 or 2. Low Memory Mode 1 means that we will NOT break a network compatibility. 2 is deeper and doesn't guarantee protocol compatibility and available multiplayer. Of course, with Low Memory Mode 2 you can't test your port dedicated server.
+
+If you got anything compiling, it's nice time to make a commit. Commit your changes into git and push them somewhere(GitHub, GitLab or what you prefer), so you will not lose them accidentally.
+
+4) Here is most interesting, building the client part.
+
+There are three possible situations for you, by increasing difficulty.
+
+1. Do you have SDL2 for your platform? If yes, go ahead and compile engine with client part enabled.
+
+2. Do you have SDL1.2 for your platform? If yes, try to compile it, but SDL1.2 support is very limited and not tested well.
+
+3. You don't have SDL and you can't port it for some reason by yourself or SDL port just don't stable for your platform? Then you need to implement an engine backend.
+
+How to implement engine backend? Well, we have a backends system that was introduced in Old Engine. It's simply two files: backends.h and defaults.h in `common` folder in repository root. You will need to add a macros for your backends in `backends.h` and define a logic in `defaults.h`. We have already have some, check them out, as they may be handy for you.
+
+Once you did it, go back to `platform` directory and open `platform.h` headers. Create new subdirectory in `platform` folder and start implementing missing platform-specific backends one by one. I can't explain this as for obvious reasons it's too specific. You can use macros you defined before in `build.h` to check that you're compiling for your platform and `backends.h` macros to check if platform-specific backend must be enabled.
+
+As you finished, compile engine, fix errors and commit your changes and push to repository.
+
+Remember, if something doesn't work and you can't figure out why, you can join our Discord server at discord.me/fwgs. Ping me (@a1batross) or other engine developer and attach link to your repository, so we can discuss and help you in porting.

Documentation/entity-tools.md

@@ -0,0 +1,150 @@
+# There are few new commands availiable in xash3d fork:
+
+## Commands:
+### ent_create
+Create entity with specified classname and key/values
+
+`ent_create <classname> <key> <value> <key> <value> ...`
+
+for example:
+
+`ent_create monster_zombie targetname zomb1`
+
+after creating entity, ent_last_xxx cvars are set to new entity and ent_last_cb called, look at ent_getvars description
+
+### ent_fire
+
+Make some actions on entity
+
+`ent_fire <pattern> <command> <args>`
+Availiavle commands:
+* Set fields (Only set entity field, does not call any functions):
+   * health
+   * gravity
+   * movetype
+   * solid
+   * rendermode
+   * rendercolor (vector)
+   * renderfx
+   * renderamt
+   * hullmin (vector)
+   * hullmax (vector)
+* Actions
+   * rename: set entity targetname
+   * settarget: set entity target (only targetnames)
+   * setmodel: set entity model (does not update)
+   * set: set key/value by server library
+       * See game FGD to get list.
+       * command takes two arguments
+   * touch: touch entity by current player.
+   * use: use entity by current player.
+   * movehere: place entity in player fov.
+   * drop2floor: place entity to nearest floor surface
+   * moveup: move entity to 25 units up
+   * moveup (value): move by y axis relatively to specified value
+* Flags (Set/clear specified flag bit, arg is bit number):
+   * setflag
+   * clearflag
+   * setspawnflag
+   * clearspawnflag
+
+### ent_info
+Print information about entity by identificator
+
+`ent_info <identificator>`
+
+### ent_getvars
+Set client cvars containing entity information (useful for [[Scripting]]) and call ent_last_cb
+
+`ent_getvars <identificator>`
+
+These cvars are set:
+```
+ent_last_name
+ent_last_num
+ent_last_inst
+ent_last_origin
+ent_last_class
+```
+
+### ent_list
+Print short information about antities, filtered by pattern
+
+`ent_list <pattern>`
+
+## Syntax description
+
+### \<identificator\>
+
+* !cross: entity under aim
+* Instance code: !\<number\>_\<seria\l>
+ * set by ent_getvars command
+* Entity index
+* targetname pattern
+
+### \<pattern\>
+
+Pattern is like identificator, but may filter many entities by classname
+
+### (vector)
+
+used by ent_fire command. vector means three float values, entered without quotes
+
+### key/value
+
+All entities parameters may be set by specifiing key and value strings.
+
+Originally, this mechanizm is used in map/bsp format, but it can be used in enttools too.
+
+Keys and values are passed to server library and processed by entity keyvalue function, setting edict and entity owns parameters.
+
+If value contains spaces, it must be put in quotes:
+
+`ent_fire !cross set origin "0 0 0"`
+
+## Using with scripting
+
+ent_create and ent_getvars commands are setting cvars on client
+
+It can be used with ent_last_cb alias that is executed after setting cvars.
+
+Simple example:
+
+```
+ent_create weapon_c4
+alias ent_last_cb "ent_fire \$ent_last_inst use"
+```
+
+Use weapon_c4 after creating it.
+
+Note that you cannot use many dfferent callbacks at the same time.
+
+You can set entity name by by pattern and create special script, contatning all callbacks.
+
+Example:
+
+example.cfg
+```
+alias ent_last_cb exec entity_cb.cfg
+ent create \<class\> targetname my_ent1_$name
+ent_create \<class\> targetname my_ent2_$name
+```
+entity_cb.cfg
+```
+if $ent_last_name == my_ent1_$name
+:(ent1 actions)
+if $ent_last_name == my_ent2_$name
+:(ent2 actions)
+```
+Note that scripting cannot be blocking. You cannot wait for server answer and continue. But you can use small scripts, connected with ent_last_cb command. The best usage is user interaction. You can add touch buttons to screen or call user command menu actions by callbacks.
+##  Server side
+
+To enable entity tools on server, set sv_enttools_enable to 1
+
+To change maximum number of entities, touched by ent_fire, change sv_enttools_maxfire to required number.
+
+To enable actions on players, set sv_enttools_players to 1.
+
+To enable entity tools for player by nickname, set sv_enttools_godplayer to nickname. Useful to temporary enable from rcon.
+
+To prevent crash on some actions, set host_mapdesign_fatal to 0

Documentation/environment-variables.md

@@ -0,0 +1,21 @@
+## 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/console-scripting.md

@@ -0,0 +1,68 @@
+## Console variables
+
+Console variables (or CVars) are present in all quake-based games.
+
+By default, it is settings, created by engine, server or client libraries.
+
+But you can use `set` command to define variables even if they are not created by the engine.
+
+For example, you can set cvar before it is registered in code.
+
+`set defaultmap crossfire`
+
+This works even in server.cfg before server cvars initialization and the engine will reuse its value on cvar creation
+
+## Aliases
+
+An alias allows to define new commands.
+
+`alias wnext "invnext;wait;wait;+attack;wait;-attack"`
+
+You can hook any command by adding an alias to it and unaliasing it, when you want to use original command.
+
+```
+alias invnext1 "unalias invnext;wnext;alias invnext invnext1"
+alias invnext invnext1
+```
+
+## Scripting extensions
+
+This is an extensions of Xash3D FWGS(merged to original Xash3D since build 3887), that can be enabled by cmd_scripting cvar.
+
+Enabling scripting: `cmd_scripting 1`
+
+This is an archive cvar and it will be saved.
+
+### CVar substitution
+
+You can substitute cvar value to any command by adding \$ symbol:
+
+`echo $sv_cheats`
+
+### Condition checking
+
+Allows checking cvar values.
+
+```
+if <value1> <operator> <value2>
+:<action1>
+:if <value3>
+::<action2>
+:<action3>
+else
+:<action4>
+```
+
+* Values are any string or numeric values (for example, substituted cvars).
+* Operator is = (or ==), \!=, \<, \>, \<=, \>=. == is same to =.
+* If single value specified, condition is true when value is non-zero
+
+Example:
+
+```
+if $sv_cheats == 1
+:echo Cheats enabled, adding cheat menu
+:exec cheatmenu.cfg
+else
+:echo Please enable cheats to use this!
+```

Documentation/extensions/expanded-common-structures.md

@@ -0,0 +1,8 @@
+# Expanded structures that used by engine and mods
+To make porting and developing mods on 64-bit platforms less painful, we decided to expand size of several structures.
+This information important in case you are using codebase like XashXT, Paranoia 2: Savior and want to compile your mod for platform with 64-bit pointer size: you should replace old definitions with new ones, otherwise your mod will not work with Xash3D FWGS (typically, it's just crashing when starting map).
+| Structure name | Locates in file | Original size on 64-bit | Current size on 64-bit |
+|----------------|-----------------|-------------------------|------------------------|
+|`mfaceinfo_t` | `common/com_model.h` | 176 bytes |  304 bytes |
+|`decal_s` | `common/com_model.h` | 72 bytes |  88 bytes |
+|`mextrasurf_t` | `common/com_model.h` | 376 bytes |  504 bytes |

Documentation/extensions/input-interface-ru.md

@@ -0,0 +1,48 @@
+## Цель
+
+На текущий момент клиенты имеют некоторые части платформозависимого кода внутри себя. Это плохо, т.к. мы не можем использовать одинаковые функции (если не перепишем почти половину кода SDL) на разных платформах.
+
+## Клиентская часть
+
+* Клиент будет иметь возможность полностью реализовать touch-ввод. Отрисовка может быть произведена через HUD.
+* Клиент получит простые события движения и обзора от движка
+
+### Клиентская реализация
+
+#### Клиент будет экспортировать некоторые функции движку (опционально):
+
+* `int IN_ClientTouchEvent ( int fingerID, float x, float y, float dx, float dy );`
+
+Вернёт 1 если касание активно, иначе 0.
+
+* `void IN_ClientMoveEvent ( float forwardmove, float sidemove );`
+
+Клиент будет накапливать значения величин для команд движения перед созданием команд и очищать их при CreateMove.
+
+* `void IN_ClientLookEvent ( float relyaw, float relpitch );`
+
+Клиент будет вращать камерой когда нужно, прямо как в реализации мыши
+
+## Движковая часть
+
+* Движок будет управлять событиями платформы и вызывать клиентские функции
+* Движок реализует стандартную систему взгляда и движения если её нет в клиенте
+
+### Движковая реализация
+
+#### События касания
+
+Перед вызовом ClientMove движок обязан получить события о касании.
+
+Если из клиента экспортирована функция IN_ClientTouchEvent, событие будет отправлено клиенту.
+
+Иначе, движок будет рисовать свой touch-интерфейс.
+
+#### Другие события
+
+Интерфейс прикосновений и код джойстика в движке будут генерировать следующие два типа событий:
+* События движения (функция IN_ClientMoveEvent)
+* События просмотра (функция IN_ClientLookEvent)
+
+Если клиент экспортирует эти функции, события будут отправляться клиенту перед CreateMove
+Иначе события просмотра будут происходить перед CreateMove, но после MoveEvent. Они будут применены к генерируемым командам

Documentation/extensions/input-interface.md

@@ -0,0 +1,48 @@
+## Purpose
+
+Clients have different platform-depended input code now.
+It is bad because we cannot use same functions (if we won't rewrite almost half of SDL) on different platforms.
+
+## Client part
+
+* Client will have ability to fully implement touch input. Drawing may be done by HUD.
+* Client will receive basic motion and look events from engine
+
+### Client implementation
+
+#### Client will optionally export some functions to Engine:
+* `int IN_ClientTouchEvent ( int fingerID, float x, float y, float dx, float dy );`
+
+Return 1 if touch is active, 0 otherwise.
+
+* `void IN_ClientMoveEvent ( float forwardmove, float sidemove );`
+
+Client wil accumulate move values before creating commands and flush it on CreateMove.
+
+* `void IN_ClientLookEvent ( float relyaw, float relpitch );`
+
+Client will rotate camera when needed as in mouse implementation
+
+## Engine part
+
+* Engine will handle platform events and call client functions.
+* Engine will implement fallback look and movement system when client interface not present
+
+### Engine implementation
+
+#### Touch events
+
+Before calling ClientMove engine must get touch events.
+
+If client exported IN_ClientTouchEvent, event will be sent to client.
+
+Otherwise engine will draw own touch interface.
+
+#### Other events
+
+Engine touch interface and joystick support code will generate two types of events:
+* Move events (IN_ClientMoveEvent function)
+* Look events (IN_ClientLookEvent function)
+
+If client exported these functions, events will be sent to client before CreateMove
+Otherwise Look Event will be processed before CreateMove, but MoveEvent after. It will be applied to generated command

Documentation/extensions/library-naming.md

@@ -0,0 +1,44 @@
+I propose a new library naming scheme, which will allow to distribute mods and games in single archive to different operating systems and CPUs:
+
+Legend:
+* $os -- Q_buildos() return value, in lower case.
+* $arch -- Q_buildarch() return value, in lower case.
+* $ext -- OS-specific extension: dll, so, dylib, etc.
+
+The scheme will be:
+
+1. Client library:
+* ```client.$ext``` for **Win/Lin/Mac** with **x86**.
+* ```client_$arch.$ext``` for **Win/Lin/Mac** with **NON-x86**.
+* ```client_$os_$arch.$ext``` for everything else.
+
+2. Menu library:
+* ```menu.$ext``` for **Win/Lin/Mac** with **x86**.
+* ```menu_$arch.$ext``` for **Win/Lin/Mac** with **NON-x86**.
+* ```menu_$os_$arch.$ext``` for everything else.
+
+3. Server library:
+* On  **Win/Lin/Mac** with **x86**, it **MUST** use the raw gamedll name for corresponding OS field from `gameinfo.txt`.
+* On **Win/Lin/Mac** with **NON-x86**, it **MUST** use the raw gamedll name for corresponding OS field from `gameinfo.txt`, but append ```_$arch``` before file extension. Like: ```hl_amd64.so``` or ```cs_e2k.so```.
+* On everything else, it must use gamedll name from ```gamedll_linux``` field, but append ```_$os_$arch``` before file extension. Like: ```hl_haiku_amd64.so``` or ```cs_freebsd_armhf.so```.
+Why ```gamedll_linux``` and not ```gamedll```? Because it looks more logic that way, most operating systems are *nix-like and share code with Linux, rather than Windows.
+
+4. Refresh library: not needed, as RefAPI is not stable and it's not intended to distribute with mods.
+
+For any libraries distributed **with** engine, naming scheme should be used more convenient for OS port.
+
+Issue #0. Inconsistency between ABI and Q_buildarch.\
+Resolution: Change Q_buildarch return value to use Debian-styled architectures list: https://www.debian.org/ports/, which includes a special naming for big/little-endian and hard/soft-float ARM.
+
+Issue #1: Build-system integration.\
+Resolution: implemented as [LibraryNaming.cmake](https://github.com/FWGS/hlsdk-portable/blob/master/cmake/LibraryNaming.cmake) and [library_naming.py](https://github.com/FWGS/hlsdk-portable/blob/master/scripts/waifulib/library_naming.py) extensions, see 
+
+Issue #2(related to #0): Which ARM flavours we actually need to handle?\
+Resolution: Little-endian only, as there is no known big-endian ARM platforms in the wild.
+Architecture is coded this way:
+* ```armvxy```, where `x` is ARM instruction set level and `y` is hard-float ABI presence: `hf` where hard float ABI used, otherwise `l`.
+
+Issue #3: Some mods (like The Specialists, Tyrian, ...) already apply suffixes _i386, _i686 to the gamedll path:\
+Resolution: On x86 on **Win/Lin/Mac**, don't change anything. Otherwise, strip the _i?86 part and follow the usual scheme.
+
+See discussion: https://github.com/FWGS/xash3d-fwgs/issues/39

Documentation/extensions/mp3-loops.md

@@ -0,0 +1,22 @@
+## Looping MP3 extension
+
+It is now possible to loop MP3 file in Xash3D FWGS by adding a custom text tag with `LOOP_START` or `LOOPSTART` in description and time point (in raw samples) in value.
+
+### Example with foobar2000
+1. Open Foobar2000
+2. Add your .mp3 file to playlist
+3. Right click to newly added file and select Properties
+4. In Metadata tab, at the bottom of the table, select "+add new"
+5. In newly added line replace `<60>input field name<6D>` with `LOOP_START` (without any symbols).
+6. Press Tab and enter loop time point in raw samples. For example, `0` will replay sound file from beginning to end indefinitely.
+
+### Possible alternatives
+1. Classic WAV files looping. HQ WAV files can take too much disk space, and recommended software supporting cue points is paid, outdated and can't run on modern systems. (Although there is alternative that's proven to work with idTech-based engines called LoopAuditioneer.)
+2. Vorbis looping through comment. Engine doesn't support Vorbis but this extension was highly inspired by this hack.
+
+### Known bugs and limitations
+1. At this time using MP3 as SFX requires complete decoding. This can cause noticeable stutters, so keep MP3 file length in mind.
+2. We deliberately only support modern ID3v2.3 and ID3v2.4 tags. Using ID3v1 is not possible.
+
+
+

Documentation/extensions/native-object.md

@@ -0,0 +1,25 @@
+# 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

@@ -0,0 +1,65 @@
+# 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

@@ -0,0 +1,117 @@
+# 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

@@ -0,0 +1,14 @@
+# 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

@@ -0,0 +1,40 @@
+### 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/mod-porting-guide.md

@@ -0,0 +1,110 @@
+# Self-made port
+## Compatibility with RISC architectures
+### Unaligned access
+Unaligned access on **i386** causes only performance penalty, but on **RISC** it can cause unstable work.
+
+For HLSDK at least you need such patches in util.cpp:
+ - https://github.com/FWGS/halflife/commit/7bfefe86e35d67867ae7af830ac1fc38f2908360
+ - https://github.com/FWGS/hlsdk-portable/commit/617d75545f2ecb9b2d46cc30728dc37c9eb6d35e
+
+### Signed chars
+`char` type defined as **signed** for **x86** and as **unsigned** for **arm**.
+
+And sometimes such difference can break logic.
+
+As a solution you can use `signed char` type in code directly or use `-fsigned-char` option for gcc/clang compilers.
+
+For HLSDK at least you need such [fix](https://github.com/FWGS/hlsdk-portable/commit/1ca34fcb4381682bd517612b530db22a1354a795) in nodes.cpp/.h.
+
+## Compatibility with 64bit architectures
+You need list of patches for Studio Model Render, MAKE_STRING macro and nodes:
+ - https://github.com/FWGS/hlsdk-portable/commit/d287ed446332e615ab5fb25ca81b99fa14d18a73
+ - https://github.com/FWGS/hlsdk-portable/commit/3bce17e3a04f8af10a927a07ceb8ab0f09152ec4
+ - https://github.com/FWGS/hlsdk-portable/commit/9ebfc981773ec4c7a89ffe52d9c249e1fbef9634
+ - https://github.com/FWGS/hlsdk-portable/commit/00833188dab87ef5746286479ba5aeb9d83b4a0c
+ - https://github.com/FWGS/hlsdk-portable/commit/4661b5c1a5245b27a5532745c11e44b5540e4172
+ - https://github.com/FWGS/hlsdk-portable/commit/2b61380146b1d58a8c465f0e312c061b12bda115
+ - https://github.com/FWGS/hlsdk-portable/commit/8ef6cb2427ee16a763103bd3f315f38e2f01cfe2
+
+## Mobility API
+Xash3D FWGS has special extended interface in `mobility_int.h` which adds some new features like vibration on mobile platforms.
+
+## Porting server-side code
+Original valve's server code was compatible with linux and gcc 2.x.
+
+Newer gcc versions have restriction which breaks build.
+
+Now, to make it building with gcc 4.x+ or clang, you need to do following:
+* Go to cbase.h and redefine macros as following
+```
+#define SetThink( a ) m_pfnThink = static_cast <void (CBaseEntity::*)(void)> (&a)
+#define SetTouch( a ) m_pfnTouch = static_cast <void (CBaseEntity::*)(CBaseEntity *)> (&a)
+#define SetUse( a ) m_pfnUse = static_cast <void (CBaseEntity::*)( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )> (&a)
+#define SetBlocked( a ) m_pfnBlocked = static_cast <void (CBaseEntity::*)(CBaseEntity *)> (&a)
+#define ResetThink( ) m_pfnThink = static_cast <void (CBaseEntity::*)(void)> (NULL)
+#define ResetTouch( ) m_pfnTouch = static_cast <void (CBaseEntity::*)(CBaseEntity *)> (NULL)
+#define ResetUse( ) m_pfnUse = static_cast <void (CBaseEntity::*)( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )> (NULL)
+#define ResetBlocked( ) m_pfnBlocked = static_cast <void (CBaseEntity::*)(CBaseEntity *)> (NULL)
+...
+#define SetMoveDone( a ) m_pfnCallWhenMoveDone = static_cast <void (CBaseToggle::*)(void)> (&a)
+```
+* Replace all SetThink(NULL), SetTouch(NULL), setUse(NULL) and SetBlocked(NULL) by ResetThink(), ResetTouch(), ResetUse() and ResetBlocked()
+* Sometimes you may need to add #include <ctype.h> if functions tolower or isspace are missing
+
+## Porting client-side code
+
+* Redefine all DLLEXPORT defines as empty field (Place it under _WIN32 macro if you want to keep windows compatibility).
+* Remove hud_servers.cpp and Servers_Init/Servers_Shutdown from hud.cpp.
+* Fix CAPS filenames in includes (like STDIO.H, replace by stdio.h).
+* Replace broken macros as DECLARE_MESSAGE, DECLARE_COMMAND by fixed examples from our hlsdk-portable port (cl_util.h).
+* Add ctype.h where is needed (tolower, isspace functions).
+* Add string.h where is needed (memcpy, strcpy, etc).
+* Use in_defs.h from hlsdk-portable.
+* Add input_xash3d.cpp from hlsdk-portable project to fix input.
+
+Now your client should be able to build and work correctly.
+
+# Porting mod to hlsdk-portable
+Look at changes which was made.
+
+If there are not too much changes (for example, only some weapons was added), add these changes in hlsdk-portable.
+
+You can use diff with original HLSDK and apply it as patch to hlsdk-portable.
+
+```
+NOTE: Many an old mods was made on HLSDK 2.0-2.1 and some rare mods on HLSDK 1.0.
+So you need to have different versions of HLSDK to make diffs.
+Plus different Spirit of Half-Life versions if mod was made on it.
+Also, weapons in old HLSDK versions does not use client weapon prediction system and you may be need to port standart half-life weapons to server side.
+```
+Files must have same line endings (use dos2unix on all files).
+
+We recommend to enable ignoring space changes in diff.
+
+Move all new files to separate directories.
+
+# Possible replacements for non-portable external dependencies
+1. If mod uses **fmod.dll** or **base.dll** to play mp3/ogg on client-side or to precache sounds on server-side, you can replace it with:
+	- [pfnPrimeMusicStream](https://github.com/FWGS/hlsdk-portable/blob/master/engine/cdll_int.h#L293=) engine callback;
+	- [miniaudio](https://github.com/mackron/miniaudio);
+	- [phonon](https://community.kde.org/Phonon).
+
+2. If mod uses **OpenGL**, porting code to Xash3D render interface is recommended.
+
+3. If mod uses **cg.dll**, you can try to port code to [NVFX](https://github.com/tlorach/nvFX).
+
+4. If mod uses detours, comment code or try to find replacement somehow by yourself.
+
+# Additional recommendations
+1. If mod uses STL, you can replace it with [MiniUTL](https://github.com/FWGS/MiniUTL).
+2. Avoid to use dynamic casts to make small size binaries.
+3. Avoid to use exceptions to make small size binaries.
+ 
+# Writing build scripts
+
+Use wscript/CMakeLists.txt files from hlsdk-portable as build scripts example.
+
+Get .c and .cpp file lists from Visual Studio project.
+
+Add missing include dirs.
+

Documentation/musl.md

@@ -0,0 +1,15 @@
+# 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/not-supported-mod-list-and-reasons-why.md

@@ -0,0 +1,11 @@
+# Not supported mods and reasons why
+
+|Name							|Version			|Why not working						|What was made for that
+|----							|-------			|---------------						|----------------------
+|Blue Shift						|The latest steam release	|Uses vgui2 library which xash3d does not support		|Recreated source code here: https://github.com/FWGS/hlsdk-xash3d/tree/bshift
+|Counter Strike						|1.6(The latest steam release)	|Uses vgui2 library which xash3d does not support		|Some work on vgui2 support was made here: https://github.com/FWGS/xash3d/tree/vinterface
+|Counter Strike: Condition Zero				|The latest steam release	|Uses vgui2 library which xash3d does not support		|Some work on vgui2 support was made here: https://github.com/FWGS/xash3d/tree/vinterface
+|Counter Strike: Condition Zero - Deleted scenes	|The latest steam release	|Uses vgui2 library which xash3d does not support		|Some work on vgui2 support was made here: https://github.com/FWGS/xash3d/tree/vinterface
+|Day of Defeat						|The latest steam release	|Uses vgui2 library which xash3d does not support		|Some work on vgui2 support was made here: https://github.com/FWGS/xash3d/tree/vinterface
+|Sven-Coop						|5.0+				|Uses custom GoldSrc engine					|
+

Documentation/opensource-mods.md

@@ -0,0 +1,380 @@
+Source code of this mods is available for modders and porters in public access.
+
+# Original Work
+## Absolute Zero
+Official gitlab repository - https://gitlab.com/Cobalt-57/half-life-absolute-zero/
+
+## Adrenaline Gamer
+Official github repository by Martin \"Bullet\" Webrant - https://github.com/martinwebrant/agmod
+
+## Arrangement
+Mirrored on github - https://github.com/JoelTroch/am_src_30jan2011
+
+## Arrangemode: Rebirth
+Mirrored on github - https://github.com/JoelTroch/am_src_rebirth
+
+## Battle Grounds
+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)
+
+Mirrored on github - https://github.com/HLSources/BubbleMod
+
+## Chicken Fortress
+Official github repository - https://github.com/CKFDevPowered/CKF3Alpha
+
+## Cold Ice
+Version 1.9 is available on ModDB - https://www.moddb.com/mods/cold-ice/downloads/cold-ice-sdk
+
+Version 1.9 mirrored on github - https://github.com/solidi/hl-mods/tree/master/ci
+
+## Cold Ice Ressurection
+Mirrored on github - https://github.com/solidi/hl-mods/tree/master/cir
+
+## Cthulhu
+Uploaded to github by Oleg Cherkasky - https://github.com/gunrunners-paradise/Cthulhu-HLmod-SDK
+
+## Deathmatch Classic
+Available in Valve's Half-Life repository - https://github.com/ValveSoftware/halflife/tree/master/dmc
+
+## ESHQ
+Official github repository - https://github.com/adslbarxatov/xash3d-for-ESHQ
+
+## Flat-Life
+Available on GamerLab - http://gamer-lab.com/eng/code_mods_goldsrc/Half-Life_2D_(Flat-Life)
+
+## Gang Wars
+Mirrored on github - https://github.com/nekonomicon/gw1.45src
+
+## Go-mod
+Versions 2.0 and 3.0, available in mod archives on ModDB - https://www.moddb.com/mods/go-mod/downloads
+
+Version 3.0, mirrored on github - https://github.com/nekonomicon/Go-mod30
+
+## GT mod
+Available on GamerLab - http://gamer-lab.com/eng/code_mods_goldsrc/GT_mod_(Polnie_ishodniki)
+
+## Half-Life: Advanced Deathmatch
+Mirrored on github - https://github.com/solidi/hl-mods/tree/master/hla
+
+## Half-Life: Decay
+Mirrored on github(PC Port) - https://github.com/hoaxer/Half-Life-Decay
+
+## Half-Life: Echoes
+Available on ModDB - https://www.moddb.com/mods/half-life-echoes
+
+## Half-Life: Expanded Arsenal
+Available on ModDB - https://www.moddb.com/mods/half-life-expanded-arsenal
+
+## Half-Life: Gravgun mod
+Branch **gravgun** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/gravgun
+
+## Half-Life: Invasion
+Official github repository - https://github.com/jlecorre/hlinvasion
+
+## Half-Life: Pong
+Mirrored on github - https://github.com/solidi/hl-mods/tree/master/pong
+
+## Half-Life: Quest Mode
+Available on cs-mapping.com.ua - https://old.cs-mapping.com.ua/forum/showthread.php?t=38030
+
+## Half-Life: Top-Down
+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
+
+## Half-Life: Year of the Dragon
+Available on ModDB - https://www.moddb.com/mods/year-of-the-dragon
+
+## Half-Nuked
+Available on ModDB - https://www.moddb.com/mods/half-nuked/downloads/half-nuked-src
+
+## Half-Payne
+Official github repository - https://github.com/suXinjke/HalfPayne
+
+## Half-Quake
+Official github repository - https://github.com/muddasheep/hqtrilogy
+
+## Half-Rats: Parasomnia
+Official github repository - https://github.com/HeathGames/half_rats_parasomnia_src
+
+## Half-Screwed
+Official github repository - https://github.com/desukuran/half-screwed
+
+## Headcrab Frenzy
+Version 1.3 on ModDB - https://www.moddb.com/mods/headcrab-frenzy/downloads/headcrab-frenzy-13-beta-source-code
+
+## Heart of Evil
+Mirrored on github - https://github.com/nekonomicon/HeartOfEvil
+
+## Ingram Chillin' Mod
+Official SourceForge repository - https://sourceforge.net/projects/icm-hl/
+
+## MechMod
+Official github repository - https://github.com/vermagav/mechmod
+
+## Mortal Combat Forever
+Available on GamerLab - http://gamer-lab.com/eng/code_mods_goldsrc/Mortal_Combat_Forever_(Polnie_ishodniki)
+
+## Natural Selection
+Official github repository - https://github.com/unknownworlds/NS
+
+## Overturn
+Available in mod archive on ModDB - https://www.moddb.com/mods/overturn
+
+## Oz Deathmatch
+Mirrored on github - https://github.com/nekonomicon/OZDM
+
+## Paranoia
+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
+
+Version 1.51, mirrored on github - https://github.com/a1batross/Paranoia2_original
+
+## Raven City
+*Unfinished mod*
+
+Was found on HLFX - http://hlfx.ru/forum/showthread.php?s=2c892dfc52f72be52a89c3f52a397cd0&threadid=1819&postid=44674#post44674
+
+## 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
+
+## ZXC
+Available on ModDB - https://www.moddb.com/mods/zxc-mod-133/downloads/zxc-mod-136-final
+
+Mirrored on github - https://github.com/ZXCmod/ZXCmod
+
+# Reimplementation
+## Absolute Redemption
+Branch **redempt** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/redempt
+
+## Adrenaline Gamer
+OpenAG by YaLTeR - https://github.com/YaLTeR/OpenAG
+
+## Afraid of Monsters
+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
+
+## 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
+
+## Big Lolly
+malortie's recreation - https://github.com/malortie/hl-biglolly
+
+Branch **biglolly** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/biglolly
+
+## Black Ops
+malortie's recreation - https://github.com/malortie/hl-blackops
+
+Branch **blackops** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/blackops
+
+## Bloody Pizza: Vendetta
+Branch **caseclosed** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/caseclosed
+
+## Case Closed
+Branch **caseclosed** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/caseclosed
+
+## Cleaner's Adventures
+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 server part by nagist - https://github.com/nagist/cs16nd
+
+Reverse-engineered code of server part by s1lentq - https://github.com/s1lentq/ReGameDLL_CS
+
+## Counter Strike Online
+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
+
+## 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
+
+## Half-Life: Induction
+Branch **induction** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/induction
+
+## 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
+
+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
+
+## Half-Life: Urbicide
+Branch **hl_urbicide** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/hl_urbicide
+
+## 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
+
+## Half-Secret
+Branch **half-secret** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/half-secret
+
+## Night at the Office
+malortie's recreation - https://github.com/malortie/hl-nato
+
+Branch **noffice** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/noffice
+
+## 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
+
+## 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
+
+## Residual Life
+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
+
+## Sewer Beta
+Branch **sewer_beta** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/sewer_beta
+
+## Team Fortress Classic
+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
+
+## 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
+
+They Hunger: Tactical - https://www.moddb.com/mods/they-hunger-tactical/downloads/tht-source-code-documentation
+
+## Times of Troubles
+malortie's recreation - https://github.com/malortie/hl-tot
+
+Branch **tot** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/tot
+
+# Derived work
+## Adrenaline Gamer
+Branch **aghl** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/aghl
+
+## Bubblemod
+Branch **bubblemod** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/bubblemod
+
+## Deathmatch Classic
+Deathmatch Classic: Adrenaline Gamer Edition - https://github.com/martinwebrant/agmod/tree/master/src/dmc
+
+Deathmatch Quaked - https://www.moddb.com/games/deathmatch-classic/downloads/dmq2
+
+Branch **dmc** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/dmc
+
+## Half-Life: Echoes
+Branch **echoes** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/echoes
+
+## Half-Life: Invasion
+Port to HLSDK 2.4 by malortie - https://github.com/malortie/hl-invasion
+
+Port to Linux by fmoraw - https://github.com/fmoraw/hlinvasion
+
+Branch **invasion** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/invasion
+
+## Half-Life: Top-Down
+Branch **hltopdown** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/hltopdown
+
+## Half-Screwed
+Branch **half-screwed** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/half-screwed
+
+## Natural Selection
+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
+
+## 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

@@ -0,0 +1,33 @@
+Xash3D FWGS is intended to be easily ported to specific platform, however main issue is maintaining such ports. 
+
+This page is about merged ports to main source tree and responsible for it developers.
+
+For porting guidelines, look engine-porting-guide.md.
+
+Status: 
+* **Supported**: active, was confirmed to be fully functional.
+* **In progress**: active, under development.
+* **Old Engine**: port was for old engine fork
+* **Not maintained**: lack of human resources
+* **Deprecated**: not supported anymore
+
+Table is sorted by status and platform.
+
+| Platform        | Status                     | Maintainer               | Note
+| --------        | ------                     | ----------               | ----
+| Android         | Supported                  | @Velaron                 |
+| *BSD            | Supported                  | @nekonomicon             |
+| DOS4GW          | Supported                  | @mittorn                 |
+| GNU/Linux       | Supported                  | @a1batross, @mittorn     |
+| Haiku           | Supported                  | not maintained           | Was added by #478 and #483
+| macOS           | Supported                  | @sofakng                 | 
+| MotoMAGX        | Supported                  | @a1batross               |
+| PSVita          | Supported                  | @fgsfdsfgs               |
+| Switch          | Supported                  | @fgsfdsfgs               |
+| Windows         | Supported                  | @a1batross, @SNMetamorph |
+| 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)
+| iOS             | Deprecated                 | not maintained           | See GitHub issue #61

Documentation/psvita.md

@@ -0,0 +1,49 @@
+## PlayStation Vita port
+
+### Prerequisites
+1. Make sure your PSVita is [set up to run homebrew applications](https://vita.hacks.guide/).
+2. Install [kubridge](https://github.com/TheOfficialFloW/kubridge/releases/) by copying `kubridge.suprx` to your taiHEN plugins folder (usually `ux0:/tai`) and add it to your `config.txt`, for example:
+   ```
+   *KERNEL
+   ux0:tai/kubridge.skprx
+   ```
+3. Install `libshacccg.suprx` by following [this guide](https://cimmerian.gitbook.io/vita-troubleshooting-guide/shader-compiler/extract-libshacccg.suprx).
+
+### Installation
+1. If you have an old vitaXash3D install, remove it.
+2. Get `xash3d-fwgs-psvita.7z` from the latest [automatic build](https://github.com/FWGS/xash3d-fwgs/releases/tag/continuous).
+3. Install `xash.vpk` from the 7z archive onto your PSVita.
+4. Copy the `data` directory from the 7z archive to the root of your PSVita's SD card.
+5. Copy the valve folder and any other mod folders from your Half-Life install to `ux0:/data/xash3d/` (you can use other mountpoints instead of `ux0`). **Do not overwrite anything.**
+
+### Build instructions
+1. Install [VitaSDK](https://vitasdk.org/).
+2. Build and install [vitaGL](https://github.com/Rinnegatamante/vitaGL):
+    ```
+    git clone https://github.com/Rinnegatamante/vitaGL.git
+    make -C vitaGL NO_TEX_COMBINER=1 HAVE_UNFLIPPED_FBOS=1 HAVE_PTHREAD=1 SINGLE_THREADED_GC=1 MATH_SPEEDHACK=1 DRAW_SPEEDHACK=1 HAVE_CUSTOM_HEAP=1 -j2 install
+    ```
+3. Build and install [vita-rtld](https://github.com/fgsfdsfgs/vita-rtld):
+    ```
+    git clone https://github.com/fgsfdsfgs/vita-rtld.git && cd vita-rtld
+    mkdir build && cd build
+    cmake -DCMAKE_BUILD_TYPE=Release ..
+    make -j2 install
+    ```
+4. Build and install [this SDL2 fork](https://github.com/Northfear/SDL) with vitaGL integration:
+    ```
+    git clone https://github.com/Northfear/SDL.git && cd SDL
+    mkdir build && cd build
+    cmake -DCMAKE_TOOLCHAIN_FILE=${VITASDK}/share/vita.toolchain.cmake -DCMAKE_BUILD_TYPE=Release -DVIDEO_VITA_VGL=ON ..
+    make -j2 install
+    ```
+5. Use `waf`:
+    ```
+    ./waf configure -T release --psvita
+    ./waf build
+    ```
+6. Copy all the resulting `.so` files into a single folder:
+    ```
+    ./waf install --destdir=xash3d
+    ```
+7. `xash.vpk` is located in `build/engine/`.

Documentation/public-servers-rules-and-recommendations.md

@@ -0,0 +1,15 @@
+As online community is growing, we don't want to keep bad or invalid servers on the Internet Games list. It's a common rules for all Xash3D server owners who are using default master server. 
+
+1. Breaking master server or clients is prohibited in any way. If you found a serious bug, contact us at contact 'at' fwgs.ru or post an issue at GitHub.
+
+2. Changing settings, exploiting vulnerabilities of clients is prohibited in any way. If you found a serious bug, contact us at contact 'at' fwgs.ru or post an issue at GitHub.
+
+2. Agressive advertisement and spam on other servers is prohibited in any way.
+
+3. If your server is require downloading custom content, it should be available for everyone. Recommended way to deliver custom content is FastDL.
+
+4. It's recommended to keep your server is up-to-date. You may use our public Debian/Ubuntu/Arch Linux [repository](https://github.com/FWGS/xash3d/wiki/How-to-set-up-a-Xash3D-Dedicated-Server-on-Debian-or-Ubuntu) to simplify updating process.
+
+Just follow these rules to not get banned on our master server. Good luck, have fun!
+
+

README.md

@@ -0,0 +1,100 @@
+# 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" />
+[![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/) \
+[![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 heavily modified fork of an original [Xash3D Engine](https://www.moddb.com/engines/xash3d-engine) by Unkle Mike.
+
+## Donate
+[![Donate to FWGS button](https://img.shields.io/badge/Donate_to_FWGS-%3C3-magenta)](Documentation/donate.md) \
+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.
+* Crossplatform and modern compilers support: supports Windows, Linux, BSD & Android on x86 & ARM and [many more](Documentation/ports.md).
+* Better multiplayer: multiple master servers, headless dedicated server, voice chat, [GoldSrc protocol support](Documentation/goldsrc-protocol-support.md) and IPv6 support.
+* Multiple renderers support: OpenGL, GLESv1, GLESv2 and Software.
+* Advanced virtual filesystem: `.pk3` and `.pk3dir` support, compatibility with GoldSrc FS module, fast case-insensitivity emulation for crossplatform.
+* Mobility API: better game integration on mobile devices (vibration, touch controls).
+* Different input methods: touch and gamepad in addition to mouse & keyboard.
+* TrueType font rendering, as a part of mainui_cpp.
+* External VGUI support module.
+* PNG & KTX2 image format support.
+* [A set of small improvements](Documentation/), without broken compatibility.
+
+## 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.
+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.
+* 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/).
+
+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.
+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.
+
+#### Windows (Visual Studio)
+* Install Visual Studio.
+* Install latest [Python](https://python.org) **OR** run `cinst python.install` if you have Chocolatey.
+* Install latest [Git](https://git-scm.com/download/win) **OR** run `cinst git.install` if you have Chocolatey.
+* Download [SDL2](https://libsdl.org/download-2.0.php) development package for Visual Studio.
+* Clone this repository: `git clone --recursive https://github.com/FWGS/xash3d-fwgs`.
+* Make sure you have at least 12GB of free space to store all build-time dependencies: ~10GB for Visual Studio, 300 MB for Git, 100 MB for Python and other.
+
+#### GNU/Linux
+##### Debian/Ubuntu
+* Only for 32-bit engine on 64-bit x86 operating system:
+  * Enable i386 on your system: `$ sudo dpkg --add-architecture i386`.
+  * Install `aptitude` ([why?](https://github.com/FWGS/xash3d-fwgs/issues/1828#issuecomment-2415131759)):  `$ sudo apt update && sudo apt upgrade && sudo apt install aptitude`
+  * Install development tools: `$ sudo aptitude --without-recommends install git build-essential gcc-multilib g++-multilib libsdl2-dev:i386 libfontconfig-dev:i386 libfreetype-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 64-bit engine on 64-bit x86 and other non-x86 systems:
+  * Install development tools: `$ sudo apt install git build-essential python libsdl2-dev libfontconfig-dev libfreetype6-dev libopus-dev libbz2-dev`.
+
+* Clone this repostory: `$ git clone --recursive https://github.com/FWGS/xash3d-fwgs`.
+
+##### RedHat/Fedora
+* Only for 32-bit engine on 64-bit x86 operating system:
+  * Install development tools: `$ sudo dnf install git gcc gcc-c++ glibc-devel.i686 SDL2-devel.i686 opus-devel.i686 fontconfig-devel.i686 freetype-devel.i686 bzip2-devel.i686`.
+  * Set PKG_CONFIG_PATH environment variable to point at 32-bit libraries: `$ export PKG_CONFIG_PATH=/usr/lib/pkgconfig`.
+
+* For 64-bit engine on 64-bit x86 and other non-x86 systems:
+  * Install development tools: `$ sudo dnf install git 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.
+1) Navigate to `xash3d-fwgs` directory.
+2) (optional) Examine which build options are available: `waf --help`.
+3) Configure build: `waf configure --sdl2=c:/path/to/SDL2`.
+4) Compile: `waf build`.
+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.
+
+0) (optional) 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).
+2) Compile: `./waf build`.
+3) Install: `./waf install --destdir=/path/to/any/output/directory`.

common/backends.h

@@ -0,0 +1,53 @@
+/*
+backends.h - backend macro definitions
+Copyright (C) 2016 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.
+*/
+#ifndef BACKENDS_H
+#define BACKENDS_H
+
+// video backends (XASH_VIDEO)
+#define VIDEO_NULL    0
+#define VIDEO_SDL     1
+#define VIDEO_FBDEV   3
+#define VIDEO_DOS     4
+
+// audio backends (XASH_SOUND)
+#define SOUND_NULL     0
+#define SOUND_SDL      1
+#define SOUND_ALSA     3
+
+// input (XASH_INPUT)
+#define INPUT_NULL    0
+#define INPUT_SDL     1
+#define INPUT_EVDEV   3
+
+// timer (XASH_TIMER)
+#define TIMER_NULL  0 // not used
+#define TIMER_SDL   1
+#define TIMER_POSIX 2
+#define TIMER_WIN32 3
+#define TIMER_DOS   4
+
+// messageboxes (XASH_MESSAGEBOX)
+#define MSGBOX_STDERR  0
+#define MSGBOX_SDL     1
+#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/bspfile.h

@@ -61,23 +61,27 @@ BRUSH MODELS
 #define LS_UNUSED			0xFE
 #define LS_NONE			0xFF
 
+#define MAX_MAP_CLIPNODES_HLBSP 32767
+#define MAX_MAP_CLIPNODES_BSP2  524288
+
 // these limis not using by modelloader but only for displaying 'mapstats' correctly
 #ifdef SUPPORT_BSP2_FORMAT
 #define MAX_MAP_MODELS		2048		// embedded models
 #define MAX_MAP_ENTSTRING		0x200000		// 2 Mb should be enough
 #define MAX_MAP_PLANES		131072		// can be increased without problems
 #define MAX_MAP_NODES		262144		// can be increased without problems
-#define MAX_MAP_CLIPNODES		524288		// can be increased without problems
+#define MAX_MAP_CLIPNODES		MAX_MAP_CLIPNODES_BSP2		// can be increased without problems
 #define MAX_MAP_LEAFS		131072		// CRITICAL STUFF to run ad_sepulcher!!!
 #define MAX_MAP_VERTS		524288		// can be increased without problems
 #define MAX_MAP_FACES		262144		// can be increased without problems
 #define MAX_MAP_MARKSURFACES		524288		// can be increased without problems
 #else
-#define MAX_MAP_MODELS		768		// embedded models
+// increased to match PrimeXT compilers
+#define MAX_MAP_MODELS		1024		// embedded models
 #define MAX_MAP_ENTSTRING		0x100000		// 1 Mb should be enough
 #define MAX_MAP_PLANES		65536		// can be increased without problems
 #define MAX_MAP_NODES		32767		// because negative shorts are leafs
-#define MAX_MAP_CLIPNODES		32767		// because negative shorts are contents
+#define MAX_MAP_CLIPNODES		MAX_MAP_CLIPNODES_HLBSP		// because negative shorts are contents
 #define MAX_MAP_LEAFS		32767		// signed short limit
 #define MAX_MAP_VERTS		65535		// unsigned short limit
 #define MAX_MAP_FACES		65535		// unsigned short limit

common/com_image.h

@@ -0,0 +1,134 @@
+#pragma once
+/*
+========================================================================
+
+internal image format
+
+typically expanded to rgba buffer
+NOTE: number at end of pixelformat name it's a total bitscount e.g. PF_RGB_24 == PF_RGB_888
+========================================================================
+*/
+#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 ) \
+	(  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
+{
+	PF_UNKNOWN = 0,
+	PF_INDEXED_24,	// inflated palette (768 bytes)
+	PF_INDEXED_32,	// deflated palette (1024 bytes)
+	PF_RGBA_32,	// normal rgba buffer
+	PF_BGRA_32,	// big endian RGBA (MacOS)
+	PF_RGB_24,	// uncompressed dds or another 24-bit image
+	PF_BGR_24,	// big-endian RGB (MacOS)
+	PF_LUMINANCE,
+	PF_DXT1,		// s3tc DXT1/BC1 format
+	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_SRGB,
+	PF_KTX2_RAW, // Raw KTX2 data, used for yet unsupported KTX2 subformats
+	PF_TOTALCOUNT,	// must be last
+} pixformat_t;
+
+typedef struct bpc_desc_s
+{
+	int	format;	// pixelformat
+	char	name[16];	// used for debug
+	uint	glFormat;	// RGBA format
+	int	bpp;	// channels (e.g. rgb = 3, rgba = 4)
+} bpc_desc_t;
+
+// imagelib global settings
+typedef enum
+{
+	IL_USE_LERPING	= BIT(0),	// lerping images during resample
+	IL_KEEP_8BIT	= BIT(1),	// don't expand paletted images
+	IL_ALLOW_OVERWRITE	= BIT(2),	// allow to overwrite stored images
+	IL_DONTFLIP_TGA	= BIT(3),	// Steam background completely ignore tga attribute 0x20 (stupid lammers!)
+	IL_DDS_HARDWARE	= BIT(4),	// DXT compression is support
+	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
+#define DXT_ENCODE_DEFAULT		0	// don't use custom encoders
+#define DXT_ENCODE_COLOR_YCoCg	0x1A01	// make sure that value dosn't collide with anything
+#define DXT_ENCODE_ALPHA_1BIT		0x1A02	// normal 1-bit alpha
+#define DXT_ENCODE_ALPHA_8BIT		0x1A03	// normal 8-bit alpha
+#define DXT_ENCODE_ALPHA_SDF		0x1A04	// signed distance field
+#define DXT_ENCODE_NORMAL_AG_ORTHO	0x1A05	// orthographic projection
+#define DXT_ENCODE_NORMAL_AG_STEREO	0x1A06	// stereographic projection
+#define DXT_ENCODE_NORMAL_AG_PARABOLOID	0x1A07	// paraboloid projection
+#define DXT_ENCODE_NORMAL_AG_QUARTIC	0x1A08	// newton method
+#define DXT_ENCODE_NORMAL_AG_AZIMUTHAL	0x1A09	// Lambert Azimuthal Equal-Area
+
+// rgbdata output flags
+typedef enum
+{
+	// rgbdata->flags
+	IMAGE_CUBEMAP	= BIT(0),		// it's 6-sides cubemap buffer
+	IMAGE_HAS_ALPHA	= BIT(1),		// image contain alpha-channel
+	IMAGE_HAS_COLOR	= BIT(2),		// image contain RGB-channel
+	IMAGE_COLORINDEX	= BIT(3),		// all colors in palette is gradients of last color (decals)
+	IMAGE_HAS_LUMA	= BIT(4),		// image has luma pixels (q1-style maps)
+	IMAGE_SKYBOX	= BIT(5),		// only used by FS_SaveImage - for write right suffixes
+	IMAGE_QUAKESKY	= BIT(6),		// it's a quake sky double layered clouds (so keep it as 8 bit)
+	IMAGE_DDS_FORMAT	= BIT(7),		// a hint for GL loader
+	IMAGE_MULTILAYER	= BIT(8),		// to differentiate from 3D texture
+	IMAGE_ONEBIT_ALPHA	= BIT(9),		// binary alpha
+	IMAGE_QUAKEPAL	= BIT(10),	// image has quake1 palette
+
+	// Image_Process manipulation flags
+	IMAGE_FLIP_X	= BIT(16),	// flip the image by width
+	IMAGE_FLIP_Y	= BIT(17),	// flip the image by height
+	IMAGE_ROT_90	= BIT(18),	// flip from upper left corner to down right corner
+	IMAGE_ROT180	= IMAGE_FLIP_X|IMAGE_FLIP_Y,
+	IMAGE_ROT270	= IMAGE_FLIP_X|IMAGE_FLIP_Y|IMAGE_ROT_90,
+// reserved
+	IMAGE_RESAMPLE	= BIT(20),	// resample image to specified dims
+// reserved
+// reserved
+	IMAGE_FORCE_RGBA	= BIT(23),	// force image to RGBA buffer
+	IMAGE_MAKE_LUMA	= BIT(24),	// create luma texture from indexed
+	IMAGE_QUANTIZE	= BIT(25),	// make indexed image from 24 or 32- bit image
+	IMAGE_LIGHTGAMMA	= BIT(26),	// apply gamma for image
+	IMAGE_REMAP	= BIT(27),	// interpret width and height as top and bottom color
+} imgFlags_t;
+
+typedef struct rgbdata_s
+{
+	word	width;		// image width
+	word	height;		// image height
+	word	depth;		// image depth
+	uint	type;		// compression type
+	uint	flags;		// misc image flags
+	word	encode;		// DXT may have custom encoder, that will be decoded in GLSL-side
+	byte	numMips;		// mipmap count
+	byte	*palette;		// palette if present
+	byte	*buffer;		// image buffer
+	rgba_t	fogParams;	// some water textures in hl1 has info about fog color and alpha
+	size_t	size;		// for bounds checking
+} rgbdata_t;
+

common/com_model.h

@@ -16,11 +16,9 @@ GNU General Public License for more details.
 #ifndef COM_MODEL_H
 #define COM_MODEL_H
 
+#include "xash3d_types.h"
 #include "bspfile.h"	// we need some declarations from it
 
-typedef vec_t		vec2_t[2];
-typedef vec_t		vec4_t[4];
-
 /*
 ==============================================================================
 
@@ -34,7 +32,8 @@ typedef vec_t		vec4_t[4];
 
 #define MIPLEVELS		4
 #define VERTEXSIZE		7
-#define MAXLIGHTMAPS	4
+#define MAXLIGHTMAPS	4	// max light styles per face
+#define MAXDYNLIGHTS	8	// maximum dynamic lights per one pixel
 #define NUM_AMBIENTS	4		// automatic ambient sounds
 
 // model types
@@ -106,7 +105,7 @@ typedef struct
 
 	vec3_t		mins, maxs;	// terrain bounds (fill by user)
 
-	int		reserved[32];	// just for future expansions or mod-makers
+	intptr_t	reserved[32];	// just for future expansions or mod-makers
 } mfaceinfo_t;
 
 typedef struct
@@ -128,14 +127,23 @@ typedef struct
 	int		flags;		// sky or slime, no lightmap or 256 subdivision
 } mtexinfo_t;
 
-typedef struct glpoly_s
+// a1ba: changed size to avoid undefined behavior. Check your allocations if you take this header!
+// 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 glpoly_s	*next;
+	struct glpoly2_s	*next;
-	struct glpoly_s	*chain;
+	struct glpoly2_s	*chain;
 	int		numverts;
 	int		flags;          		// for SURF_UNDERWATER
-	float		verts[4][VERTEXSIZE];	// variable sized (xyz s1t1 s2t2)
+#ifdef __cplusplus
-} glpoly_t;
+	float	verts[1][VERTEXSIZE]; // variable sized (xyz s1t1 s2t2)
+#else
+	float	verts[][VERTEXSIZE]; // variable sized (xyz s1t1 s2t2)
+#endif
+} glpoly2_t;
 
 typedef struct mnode_s
 {
@@ -174,8 +182,8 @@ struct decal_s
 	short		entityIndex;	// Entity this is attached to
 // Xash3D specific
 	vec3_t		position;		// location of the decal center in world space.
-	glpoly_t		*polys;		// precomputed decal vertices
+	glpoly2_t	*polys;		// precomputed decal vertices
-	int		reserved[4];	// just for future expansions or mod-makers
+	intptr_t	reserved[4];	// just for future expansions or mod-makers
 };
 
 typedef struct mleaf_s
@@ -229,10 +237,10 @@ typedef struct mextrasurf_s
 	unsigned short	numverts;		// world->vertexes[]
 	int		firstvertex;	// fisrt look up in tr.tbn_vectors[], then acess to world->vertexes[]
 
-	int		reserved[32];	// just for future expansions or mod-makers
+	intptr_t	reserved[32];	// just for future expansions or mod-makers
 } mextrasurf_t;
 
-typedef struct msurface_s
+struct msurface_s
 {
 	int		visframe;		// should be drawn when node is crossed
 
@@ -247,7 +255,7 @@ typedef struct msurface_s
 
 	int		light_s, light_t;	// gl lightmap coordinates
 
-	glpoly_t		*polys;		// multiple if warped
+	glpoly2_t		*polys;		// multiple if warped
 	struct msurface_s	*texturechain;
 
 	mtexinfo_t	*texinfo;
@@ -264,7 +272,7 @@ typedef struct msurface_s
 
 	color24		*samples;		// note: this is the actual lightmap data for this surface
 	decal_t		*pdecals;
-} msurface_t;
+};
 
 typedef struct hull_s
 {
@@ -292,7 +300,7 @@ typedef struct model_s
 	// shared modelinfo
 	modtype_t		type;		// model type
 	int		numframes;	// sprite's framecount
-	byte		*mempool;		// private mempool (was synctype)
+	poolhandle_t mempool;		// private mempool (was synctype)
 	int		flags;		// hl compatibility
 
 //
@@ -489,7 +497,8 @@ typedef struct
 	int		flags;
 	float		size;
 
-	int		reserved[8];		// VBO offsets
+	const trivertex_t **pposeverts; // only valid during loading, used to build GL mesh
+	intptr_t	reserved[7];		// VBO offsets
 
 	int		numposes;
 	int		poseverts;
@@ -504,4 +513,38 @@ typedef struct
 	maliasframedesc_t	frames[1];	// variable sized
 } aliashdr_t;
 
+
+
+// remapping info
+#define SUIT_HUE_START		192
+#define SUIT_HUE_END		223
+#define PLATE_HUE_START		160
+#define PLATE_HUE_END		191
+
+#define SHIRT_HUE_START		16
+#define SHIRT_HUE_END		32
+#define PANTS_HUE_START		96
+#define PANTS_HUE_END		112
+
+
+// 1/32 epsilon to keep floating point happy
+#define DIST_EPSILON		(1.0f / 32.0f)
+#define FRAC_EPSILON		(1.0f / 1024.0f)
+#define BACKFACE_EPSILON		0.01f
+#define MAX_BOX_LEAFS		256
+#define ANIM_CYCLE			2
+#define MOD_FRAMES			20
+
+
+
+#define MAX_DEMOS		32
+#define MAX_MOVIES		8
+#define MAX_CDTRACKS	32
+#define MAX_CLIENT_SPRITES	512	// SpriteTextures (0-256 hud, 256-512 client)
+#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

@@ -20,45 +20,45 @@
 // Most came from server.h
 
 // edict->flags
-#define FL_FLY		(1<<0)	// Changes the SV_Movestep() behavior to not need to be on ground
+#define FL_FLY		(1U<<0)	// Changes the SV_Movestep() behavior to not need to be on ground
-#define FL_SWIM		(1<<1)	// Changes the SV_Movestep() behavior to not need to be on ground (but stay in water)
+#define FL_SWIM		(1U<<1)	// Changes the SV_Movestep() behavior to not need to be on ground (but stay in water)
-#define FL_CONVEYOR		(1<<2)
+#define FL_CONVEYOR		(1U<<2)
-#define FL_CLIENT		(1<<3)
+#define FL_CLIENT		(1U<<3)
-#define FL_INWATER		(1<<4)
+#define FL_INWATER		(1U<<4)
-#define FL_MONSTER		(1<<5)
+#define FL_MONSTER		(1U<<5)
-#define FL_GODMODE		(1<<6)
+#define FL_GODMODE		(1U<<6)
-#define FL_NOTARGET		(1<<7)
+#define FL_NOTARGET		(1U<<7)
-#define FL_SKIPLOCALHOST	(1<<8)	// Don't send entity to local host, it's predicting this entity itself
+#define FL_SKIPLOCALHOST	(1U<<8)	// Don't send entity to local host, it's predicting this entity itself
-#define FL_ONGROUND		(1<<9)	// At rest / on the ground
+#define FL_ONGROUND		(1U<<9)	// At rest / on the ground
-#define FL_PARTIALGROUND	(1<<10)	// not all corners are valid
+#define FL_PARTIALGROUND	(1U<<10)	// not all corners are valid
-#define FL_WATERJUMP	(1<<11)	// player jumping out of water
+#define FL_WATERJUMP	(1U<<11)	// player jumping out of water
-#define FL_FROZEN		(1<<12)	// Player is frozen for 3rd person camera
+#define FL_FROZEN		(1U<<12)	// Player is frozen for 3rd person camera
-#define FL_FAKECLIENT	(1<<13)	// JAC: fake client, simulated server side; don't send network messages to them
+#define FL_FAKECLIENT	(1U<<13)	// JAC: fake client, simulated server side; don't send network messages to them
-#define FL_DUCKING		(1<<14)	// Player flag -- Player is fully crouched
+#define FL_DUCKING		(1U<<14)	// Player flag -- Player is fully crouched
-#define FL_FLOAT		(1<<15)	// Apply floating force to this entity when in water
+#define FL_FLOAT		(1U<<15)	// Apply floating force to this entity when in water
-#define FL_GRAPHED		(1<<16)	// worldgraph has this ent listed as something that blocks a connection
+#define FL_GRAPHED		(1U<<16)	// worldgraph has this ent listed as something that blocks a connection
 
 // UNDONE: Do we need these?
-#define FL_IMMUNE_WATER	(1<<17)
+#define FL_IMMUNE_WATER	(1U<<17)
-#define FL_IMMUNE_SLIME	(1<<18)
+#define FL_IMMUNE_SLIME	(1U<<18)
-#define FL_IMMUNE_LAVA	(1<<19)
+#define FL_IMMUNE_LAVA	(1U<<19)
 
-#define FL_PROXY		(1<<20)	// This is a spectator proxy
+#define FL_PROXY		(1U<<20)	// This is a spectator proxy
-#define FL_ALWAYSTHINK	(1<<21)	// Brush model flag -- call think every frame regardless of nextthink - ltime (for constantly changing velocity/path)
+#define FL_ALWAYSTHINK	(1U<<21)	// Brush model flag -- call think every frame regardless of nextthink - ltime (for constantly changing velocity/path)
-#define FL_BASEVELOCITY	(1<<22)	// Base velocity has been applied this frame (used to convert base velocity into momentum)
+#define FL_BASEVELOCITY	(1U<<22)	// Base velocity has been applied this frame (used to convert base velocity into momentum)
-#define FL_MONSTERCLIP	(1<<23)	// Only collide in with monsters who have FL_MONSTERCLIP set
+#define FL_MONSTERCLIP	(1U<<23)	// Only collide in with monsters who have FL_MONSTERCLIP set
-#define FL_ONTRAIN		(1<<24)	// Player is _controlling_ a train, so movement commands should be ignored on client during prediction.
+#define FL_ONTRAIN		(1U<<24)	// Player is _controlling_ a train, so movement commands should be ignored on client during prediction.
-#define FL_WORLDBRUSH	(1<<25)	// Not moveable/removeable brush entity (really part of the world, but represented as an entity for transparency or something)
+#define FL_WORLDBRUSH	(1U<<25)	// Not moveable/removeable brush entity (really part of the world, but represented as an entity for transparency or something)
-#define FL_SPECTATOR	(1<<26)	// This client is a spectator, don't run touch functions, etc.
+#define FL_SPECTATOR	(1U<<26)	// This client is a spectator, don't run touch functions, etc.
-#define FL_LASERDOT		(1<<27)	// Predicted laser spot from rocket launcher
+#define FL_LASERDOT		(1U<<27)	// Predicted laser spot from rocket launcher
 
-#define FL_CUSTOMENTITY	(1<<29)	// This is a custom entity
+#define FL_CUSTOMENTITY	(1U<<29)	// This is a custom entity
-#define FL_KILLME		(1<<30)	// This entity is marked for death -- This allows the engine to kill ents at the appropriate time
+#define FL_KILLME		(1U<<30)	// This entity is marked for death -- This allows the engine to kill ents at the appropriate time
-#define FL_DORMANT		(1<<31)	// Entity is dormant, no updates to client
+#define FL_DORMANT		(1U<<31)	// Entity is dormant, no updates to client
 
 // Goes into globalvars_t.trace_flags
-#define FTRACE_SIMPLEBOX		(1<<0)	// Traceline with a simple box
+#define FTRACE_SIMPLEBOX		(1U<<0)	// Traceline with a simple box
-#define FTRACE_IGNORE_GLASS		(1<<1)	// traceline will be ignored entities with rendermode != kRenderNormal
+#define FTRACE_IGNORE_GLASS		(1U<<1)	// traceline will be ignored entities with rendermode != kRenderNormal
 
 // walkmove modes
 #define WALKMOVE_NORMAL		0	// normal walkmove
@@ -114,11 +114,11 @@
 #define EF_LIGHT			64	// rocket flare glow sprite
 #define EF_NODRAW			128	// don't draw entity
 
-#define EF_WATERSIDES		(1<<26)	// Do not remove sides for func_water entity
+#define EF_WATERSIDES		(1U<<26)	// Do not remove sides for func_water entity
-#define EF_FULLBRIGHT		(1<<27)	// Just get fullbright
+#define EF_FULLBRIGHT		(1U<<27)	// Just get fullbright
-#define EF_NOSHADOW			(1<<28)	// ignore shadow for this entity
+#define EF_NOSHADOW			(1U<<28)	// ignore shadow for this entity
-#define EF_MERGE_VISIBILITY		(1<<29)	// this entity allowed to merge vis (e.g. env_sky or portal camera)
+#define EF_MERGE_VISIBILITY		(1U<<29)	// this entity allowed to merge vis (e.g. env_sky or portal camera)
-#define EF_REQUEST_PHS		(1<<30)	// This entity requested phs bitvector instead of pvsbitvector in AddToFullPack calls
+#define EF_REQUEST_PHS		(1U<<30)	// This entity requested phs bitvector instead of pvsbitvector in AddToFullPack calls
 // g-cont. one reserved bit here for me
 
 // entity flags
@@ -606,13 +606,6 @@
 #define CONTENT_GRAVITY_FLYFIELD	-18
 #define CONTENT_FOG			-19
 
-#define CONTENT_EMPTY		-1
-#define CONTENT_SOLID		-2
-#define CONTENT_WATER		-3
-#define CONTENT_SLIME		-4
-#define CONTENT_LAVA		-5
-#define CONTENT_SKY			-6
-
 // channels
 #define CHAN_AUTO			0
 #define CHAN_WEAPON			1
@@ -647,22 +640,22 @@
 #define SF_TRAIN_PASSABLE		8	// Train is not solid -- used to make water trains
 
 // buttons
-#define IN_ATTACK			(1<<0)
+#define IN_ATTACK			(1U<<0)
-#define IN_JUMP			(1<<1)
+#define IN_JUMP			(1U<<1)
-#define IN_DUCK			(1<<2)
+#define IN_DUCK			(1U<<2)
-#define IN_FORWARD			(1<<3)
+#define IN_FORWARD			(1U<<3)
-#define IN_BACK			(1<<4)
+#define IN_BACK			(1U<<4)
-#define IN_USE			(1<<5)
+#define IN_USE			(1U<<5)
-#define IN_CANCEL			(1<<6)
+#define IN_CANCEL			(1U<<6)
-#define IN_LEFT			(1<<7)
+#define IN_LEFT			(1U<<7)
-#define IN_RIGHT			(1<<8)
+#define IN_RIGHT			(1U<<8)
-#define IN_MOVELEFT			(1<<9)
+#define IN_MOVELEFT			(1U<<9)
-#define IN_MOVERIGHT		(1<<10)
+#define IN_MOVERIGHT		(1U<<10)
-#define IN_ATTACK2			(1<<11)
+#define IN_ATTACK2			(1U<<11)
-#define IN_RUN			(1<<12)
+#define IN_RUN			(1U<<12)
-#define IN_RELOAD			(1<<13)
+#define IN_RELOAD			(1U<<13)
-#define IN_ALT1			(1<<14)
+#define IN_ALT1			(1U<<14)
-#define IN_SCORE			(1<<15)   // Used by client.dll for when scoreboard is held down
+#define IN_SCORE			(1U<<15)   // Used by client.dll for when scoreboard is held down
 
 // Break Model Defines
 #define BREAK_TYPEMASK		0x4F
@@ -724,24 +717,15 @@ enum
 	kRenderFxExplode,			// Scale up really big!
 	kRenderFxGlowShell,			// Glowing Shell
 	kRenderFxClampMinScale,		// Keep this sprite from getting very small (SPRITES only!)
+	kRenderFxLightMultiplier,
 };
 
 typedef int		func_t;
 typedef int		string_t;
 
-typedef unsigned char	byte;
 typedef unsigned short	word;
 
-#define Q_isspace( ch )	(ch < 32 || ch > 255)
+#include "xash3d_types.h"
-
-#undef true
-#undef false
-
-#ifndef __cplusplus
-typedef enum { false, true }	qboolean;
-#else 
-typedef int qboolean;
-#endif
 
 typedef struct
 {

common/cvardef.h

@@ -1,45 +1,122 @@
-/***
+/*
-*
+cvardef.h - quake cvar definition
-*	Copyright (c) 1996-2002, Valve LLC. All rights reserved.
+Copyright (C) 1997-2001 Id Software, Inc.
-*	
+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
 
-#define FCVAR_ARCHIVE		(1<<0)	// set to cause it to be saved to vars.rc
+This program is free software; you can redistribute it and/or
-#define FCVAR_USERINFO		(1<<1)	// changes the client's info string
+modify it under the terms of the GNU General Public License
-#define FCVAR_SERVER		(1<<2)	// notifies players when changed
+as published by the Free Software Foundation; either version 2
-#define FCVAR_EXTDLL		(1<<3)	// defined by external DLL
+of the License, or (at your option) any later version.
-#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_MOVEVARS		(1<<10)	// this cvar is a part of movevars_t struct that shared between client and server
+This program is distributed in the hope that it will be useful,
-#define FCVAR_LATCH			(1<<11)	// notify client what this cvar will be applied only after server restart (but don't does more nothing)
+but WITHOUT ANY WARRANTY; without even the implied warranty of
-#define FCVAR_GLCONFIG		(1<<12)	// write it into opengl.cfg
+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
 
-typedef struct cvar_s
+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 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
 {
-	char		*name;
+	// GoldSrc compatibility flags
-	char		*string;
+	FCVAR_ARCHIVE           = 1 << 0,  // set to cause it to be saved to vars.rc
-	int		flags;
+	FCVAR_USERINFO          = 1 << 1,  // added to userinfo when changed
-	float		value;
+	FCVAR_SERVER            = 1 << 2,  // added to serverinfo when changed, will notify clients by default
-	struct cvar_s	*next;
+	FCVAR_EXTDLL            = 1 << 3,  // defined by server.dll
-} cvar_t;
+	FCVAR_CLIENTDLL         = 1 << 4,  // defined by client.dll
+	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
 
-#endif//CVARDEF_H
+	// Xash3D public flags
+	// 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

@@ -0,0 +1,196 @@
+/*
+defaults.h - set up default configuration
+Copyright (C) 2016 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.
+*/
+
+#ifndef DEFAULTS_H
+#define DEFAULTS_H
+
+#include "backends.h"
+#include "build.h"
+
+/*
+===================================================================
+
+SETUP BACKENDS DEFINITIONS
+
+===================================================================
+*/
+#if !XASH_DEDICATED
+	#if XASH_SDL
+		// we are building using libSDL
+		#ifndef XASH_VIDEO
+			#define XASH_VIDEO VIDEO_SDL
+		#endif // XASH_VIDEO
+
+		#ifndef XASH_INPUT
+			#define XASH_INPUT INPUT_SDL
+		#endif // XASH_INPUT
+
+		#ifndef XASH_SOUND
+			#define XASH_SOUND SOUND_SDL
+		#endif // XASH_SOUND
+
+		#if XASH_SDL == 2
+			#ifndef XASH_TIMER
+				#define XASH_TIMER TIMER_SDL
+			#endif // XASH_TIMER
+
+			#ifndef XASH_MESSAGEBOX
+				#if !XASH_NSWITCH // SDL2 messageboxes not available
+					#define XASH_MESSAGEBOX MSGBOX_SDL
+				#endif
+			#endif // XASH_MESSAGEBOX
+		#endif
+	#elif XASH_LINUX
+		// we are building for Linux without SDL2, can draw only to framebuffer yet
+		#ifndef XASH_VIDEO
+			#define XASH_VIDEO VIDEO_FBDEV
+		#endif // XASH_VIDEO
+
+		#ifndef XASH_INPUT
+			#define XASH_INPUT INPUT_EVDEV
+		#endif // XASH_INPUT
+
+		#ifndef XASH_SOUND
+			#define XASH_SOUND SOUND_ALSA
+		#endif // XASH_SOUND
+
+		#define XASH_USE_EVDEV 1
+	#elif XASH_DOS4GW
+		#ifndef XASH_VIDEO
+			#define XASH_VIDEO VIDEO_DOS
+		#endif
+		#ifndef XASH_TIMER
+			#define XASH_TIMER TIMER_DOS
+		#endif
+
+		// usually only 10-20 fds availiable
+		#define XASH_REDUCE_FD
+	#endif
+
+#endif // XASH_DEDICATED
+
+//
+// select messagebox implementation
+//
+#ifndef XASH_MESSAGEBOX
+	#if XASH_WIN32
+		#define XASH_MESSAGEBOX MSGBOX_WIN32
+	#elif XASH_NSWITCH
+		#define XASH_MESSAGEBOX MSGBOX_NSWITCH
+	#else // !XASH_WIN32
+		#define XASH_MESSAGEBOX MSGBOX_STDERR
+	#endif // !XASH_WIN32
+#endif // XASH_MESSAGEBOX
+
+//
+// no timer - no xash
+//
+#ifndef XASH_TIMER
+	#if XASH_WIN32
+		#define XASH_TIMER TIMER_WIN32
+	#else // !XASH_WIN32
+		#define XASH_TIMER TIMER_POSIX
+	#endif // !XASH_WIN32
+#endif
+
+#ifdef XASH_STATIC_LIBS
+#define XASH_LIB LIB_STATIC
+#define XASH_INTERNAL_GAMELIBS
+#define XASH_ALLOW_SAVERESTORE_OFFSETS
+#elif XASH_WIN32
+#define XASH_LIB LIB_WIN32
+#elif XASH_POSIX
+#define XASH_LIB LIB_POSIX
+#endif
+
+//
+// fallback to NULL
+//
+#ifndef XASH_VIDEO
+	#define XASH_VIDEO VIDEO_NULL
+#endif // XASH_VIDEO
+
+#ifndef XASH_SOUND
+	#define XASH_SOUND SOUND_NULL
+#endif // XASH_SOUND
+
+#ifndef XASH_INPUT
+	#define XASH_INPUT INPUT_NULL
+#endif // XASH_INPUT
+
+/*
+=========================================================================
+
+Default build-depended cvar and constant values
+
+=========================================================================
+*/
+
+// Platform overrides
+#if XASH_NSWITCH
+	#define DEFAULT_TOUCH_ENABLE "0"
+	#define DEFAULT_M_IGNORE     "1"
+	#define DEFAULT_MODE_WIDTH   1280
+	#define DEFAULT_MODE_HEIGHT  720
+	#define DEFAULT_ALLOWCONSOLE 1
+#elif XASH_PSVITA
+	#define DEFAULT_TOUCH_ENABLE "0"
+	#define DEFAULT_M_IGNORE     "1"
+	#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"
+#endif // !XASH_MOBILE_PLATFORM && !XASH_NSWITCH
+
+#if XASH_ANDROID || XASH_IOS || XASH_EMSCRIPTEN
+	// this means that libraries are provided with engine, but not in game data
+	// You need add library loading code to library.c when adding new platform
+	#define XASH_INTERNAL_GAMELIBS
+#endif // XASH_ANDROID || XASH_IOS || XASH_EMSCRIPTEN
+
+// Defaults
+#ifndef DEFAULT_TOUCH_ENABLE
+	#define DEFAULT_TOUCH_ENABLE "0"
+#endif // DEFAULT_TOUCH_ENABLE
+
+#ifndef DEFAULT_M_IGNORE
+	#define DEFAULT_M_IGNORE "0"
+#endif // DEFAULT_M_IGNORE
+
+#ifndef DEFAULT_JOY_DEADZONE
+	#define DEFAULT_JOY_DEADZONE "4096"
+#endif // DEFAULT_JOY_DEADZONE
+
+#ifndef DEFAULT_DEV
+	#define DEFAULT_DEV 0
+#endif // DEFAULT_DEV
+
+#ifndef DEFAULT_ALLOWCONSOLE
+	#define DEFAULT_ALLOWCONSOLE 0
+#endif // DEFAULT_ALLOWCONSOLE
+
+#ifndef DEFAULT_FULLSCREEN
+	#define DEFAULT_FULLSCREEN "1" // must be a string
+#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 @@
 /*
-features.h - engine features that can be enabled by mod-maker request
+enginefeatures.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
@@ -25,5 +25,22 @@ GNU General Public License for more details.
 #define ENGINE_COMPENSATE_QUAKE_BUG	(1<<5)	// compensate stupid quake bug (inverse pitch) for mods where this bug is fixed
 #define ENGINE_IMPROVED_LINETRACE	(1<<6)	// new traceline that tracing through alphatextures
 #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

@@ -18,6 +18,9 @@ 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)
 
 /*
 ========================================================================
@@ -27,7 +30,7 @@ GAMEINFO stuff
 internal shared gameinfo structure (readonly for engine parts)
 ========================================================================
 */
-typedef struct
+typedef struct GAMEINFO_s
 {
 	// filesystem info
 	char		gamefolder[64];	// used for change game '-game x'
@@ -47,4 +50,48 @@ typedef struct
 	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

@@ -0,0 +1,35 @@
+/*
+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
+//
+typedef struct
+{
+	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 // KBUTTON_H

common/net_api.h

@@ -27,13 +27,16 @@
 // 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 );
 
 #define NET_SUCCESS				( 0 )
 #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
 {
@@ -86,7 +89,7 @@ typedef struct net_api_s
 	void		(*SendRequest)( int context, int request, int flags, double timeout, struct netadr_s *remote_address, net_api_response_func_t response );
 	void		(*CancelRequest)( int context );
 	void		(*CancelAllRequests)( void );
-	char		*(*AdrToString)( struct netadr_s *a );
+	const char	*(*AdrToString)( struct netadr_s *a );
 	int		( *CompareAdr)( struct netadr_s *a, struct netadr_s *b );
 	int		( *StringToAdr)( char *s, struct netadr_s *a );
 	const char	*(*ValueForKey)( const char *s, const char *key );

common/netadr.h

@@ -1,37 +1,74 @@
-/***
+/*
-*
+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.
-*
-****/
 
-#ifndef NETADR_H
+This program is free software; you can redistribute it and/or
-#define NETADR_H
+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.
 
-typedef enum
+This program is distributed in the hope that it will be useful,
-{
+but WITHOUT ANY WARRANTY; without even the implied warranty of
-	NA_UNUSED,
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-	NA_LOOPBACK,
-	NA_BROADCAST,
-	NA_IP,
-	NA_IPX,
-	NA_BROADCAST_IPX
-} netadrtype_t;
 
-typedef struct netadr_s
+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 STDINT_H
+
+// net.h -- quake's interface to the networking layer
+// 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;
-	unsigned char	ip[4];
+
-	unsigned char	ipx[10];
+	byte	ip[4];
+	byte	ipx[10];
+
 	unsigned short	port;
 } netadr_t;
+*/
 
-#endif//NETADR_H
+#pragma pack( push, 1 )
+typedef struct netadr_s
+{
+	union
+	{
+		// IPv6 struct
+		struct
+		{
+			uint16_t	type6;
+			uint8_t	ip6[16];
+		};
+		struct
+		{
+			uint32_t	type; // must be netadrtype_t but will break with short enums
+			union
+			{
+				uint8_t	ip[4];
+				uint32_t	ip4; // for easier conversions
+			};
+			uint8_t	ipx[10];
+		};
+	};
+	uint16_t	port;
+} netadr_t;
+#pragma pack( pop )
+
+STATIC_CHECK_SIZEOF( netadr_t, 20, 20 );
+
+#endif // NET_ADR_H

common/port.h

@@ -0,0 +1,93 @@
+/*
+port.h -- Portability Layer for Windows types
+Copyright (C) 2015 Alibek Omarov
+
+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.
+*/
+
+#pragma once
+#ifndef PORT_H
+#define PORT_H
+
+#include "build.h"
+
+#if !XASH_WIN32
+	#if XASH_APPLE
+		#include <sys/syslimits.h>
+		#define OS_LIB_EXT "dylib"
+		#define OPEN_COMMAND "open"
+	#else
+		#define OS_LIB_EXT "so"
+		#define OPEN_COMMAND "xdg-open"
+	#endif
+	#define OS_LIB_PREFIX "lib"
+	#define VGUI_SUPPORT_DLL "libvgui_support." OS_LIB_EXT
+
+	// Windows-specific
+	#define __cdecl
+	#define __stdcall
+	#define _inline	static inline
+
+	#if XASH_POSIX
+		#include <unistd.h>
+		#if XASH_NSWITCH
+			#define SOLDER_LIBDL_COMPAT
+			#include <solder.h>
+		#elif XASH_PSVITA
+			#define VRTLD_LIBDL_COMPAT
+			#include <vrtld.h>
+			#define O_BINARY 0
+		#else
+			#include <dlfcn.h>
+			#define HAVE_DUP
+			#define O_BINARY 0
+		#endif
+		#define O_TEXT 0
+		#define _mkdir( x ) mkdir( x, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH )
+	#endif
+
+	typedef void* HANDLE;
+	typedef void* HINSTANCE;
+
+	typedef struct tagPOINT
+	{
+		int x, y;
+	} POINT;
+#else // WIN32
+	#define open _open
+	#define read _read
+	#define alloca _alloca
+
+	#define HSPRITE WINAPI_HSPRITE
+		#define WIN32_LEAN_AND_MEAN
+		#include <winsock2.h>
+		#include <windows.h>
+	#undef HSPRITE
+
+	#define OS_LIB_PREFIX ""
+	#define OS_LIB_EXT "dll"
+	#define VGUI_SUPPORT_DLL "../vgui_support." OS_LIB_EXT
+	#define HAVE_DUP
+#endif //WIN32
+
+#ifndef XASH_LOW_MEMORY
+#define XASH_LOW_MEMORY 0
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+
+#if defined XASH_SDL && !defined REF_DLL
+#include <SDL.h>
+#endif
+
+#endif // PORT_H

common/r_efx.h

@@ -56,6 +56,8 @@ color24 gTracerColors[] =
 };
 */
 
+#define TRACER_COLORINDEX_DEFAULT 4
+
 // Temporary entity array
 #define TENTPRIORITY_LOW	0
 #define TENTPRIORITY_HIGH	1
@@ -84,7 +86,7 @@ color24 gTracerColors[] =
 #define FTENT_CLIENTCUSTOM		0x00080000 // Must specify callback.  Callback function is responsible for killing tempent and updating fields ( unless other flags specify how to do things )
 #define FTENT_SCALE			0x00100000 // An experiment
 
-typedef struct tempent_s	TEMPENTITY;
+struct pmtrace_s;
 typedef struct tempent_s
 {
 	int		flags;
@@ -98,7 +100,7 @@ typedef struct tempent_s
 	int		hitSound;
 	void		(*hitcallback)( struct tempent_s *ent, struct pmtrace_s *ptr );
 	void		(*callback)( struct tempent_s *ent, float frametime, float currenttime );
-	TEMPENTITY	*next;
+	struct tempent_s	*next;
 	int		priority;
 	short		clientIndex;	// if attached, this is the index of the client to stick to
 					// if COLLIDEALL, this is the index of the client to ignore
@@ -117,58 +119,58 @@ typedef struct efx_api_s efx_api_t;
 struct efx_api_s
 {
 	particle_t	*(*R_AllocParticle)( void (*callback)( struct particle_s *particle, float frametime ));
-	void		(*R_BlobExplosion)( float *org );
+	void		(*R_BlobExplosion)( const float *org );
-	void		(*R_Blood)( float *org, float *dir, int pcolor, int speed );
+	void		(*R_Blood)( const float *org, const float *dir, int pcolor, int speed );
-	void		(*R_BloodSprite)( float *org, int colorindex, int modelIndex, int modelIndex2, float size );
+	void		(*R_BloodSprite)( const float *org, int colorindex, int modelIndex, int modelIndex2, float size );
-	void		(*R_BloodStream)( float *org, float *dir, int pcolor, int speed );
+	void		(*R_BloodStream)( const float *org, const float *dir, int pcolor, int speed );
-	void		(*R_BreakModel)( float *pos, float *size, float *dir, float random, float life, int count, int modelIndex, char flags );
+	void		(*R_BreakModel)( const float *pos, const float *size, const float *dir, float random, float life, int count, int modelIndex, char flags );
-	void		(*R_Bubbles)( float *mins, float *maxs, float height, int modelIndex, int count, float speed );
+	void		(*R_Bubbles)( const float *mins, const float *maxs, float height, int modelIndex, int count, float speed );
-	void		(*R_BubbleTrail)( float *start, float *end, float height, int modelIndex, int count, float speed );
+	void		(*R_BubbleTrail)( const float *start, const float *end, float height, int modelIndex, int count, float speed );
-	void		(*R_BulletImpactParticles)( float *pos );
+	void		(*R_BulletImpactParticles)( const float *pos );
 	void		(*R_EntityParticles)( struct cl_entity_s *ent );
 	void		(*R_Explosion)( float *pos, int model, float scale, float framerate, int flags );
 	void		(*R_FizzEffect)( struct cl_entity_s *pent, int modelIndex, int density );
 	void		(*R_FireField)( float *org, int radius, int modelIndex, int count, int flags, float life );
-	void		(*R_FlickerParticles)( float *org );
+	void		(*R_FlickerParticles)( const float *org );
-	void		(*R_FunnelSprite)( float *org, int modelIndex, int reverse );
+	void		(*R_FunnelSprite)( const float *org, int modelIndex, int reverse );
-	void		(*R_Implosion)( float *end, float radius, int count, float life );
+	void		(*R_Implosion)( const float *end, float radius, int count, float life );
-	void		(*R_LargeFunnel)( float *org, int reverse );
+	void		(*R_LargeFunnel)( const float *org, int reverse );
-	void		(*R_LavaSplash)( float *org );
+	void		(*R_LavaSplash)( const float *org );
-	void		(*R_MultiGunshot)( float *org, float *dir, float *noise, int count, int decalCount, int *decalIndices );
+	void		(*R_MultiGunshot)( const float *org, const float *dir, const float *noise, int count, int decalCount, int *decalIndices );
-	void		(*R_MuzzleFlash)( float *pos1, int type );
+	void		(*R_MuzzleFlash)( const float *pos1, int type );
-	void		(*R_ParticleBox)( float *mins, float *maxs, unsigned char r, unsigned char g, unsigned char b, float life );
+	void		(*R_ParticleBox)( const float *mins, const float *maxs, unsigned char r, unsigned char g, unsigned char b, float life );
-	void		(*R_ParticleBurst)( float *pos, int size, int color, float life );
+	void		(*R_ParticleBurst)( const float *pos, int size, int color, float life );
-	void		(*R_ParticleExplosion)( float *org );
+	void		(*R_ParticleExplosion)( const float *org );
-	void		(*R_ParticleExplosion2)( float *org, int colorStart, int colorLength );
+	void		(*R_ParticleExplosion2)( const float *org, int colorStart, int colorLength );
-	void		(*R_ParticleLine)( float *start, float *end, unsigned char r, unsigned char g, unsigned char b, float life );
+	void		(*R_ParticleLine)( const float *start, const float *end, unsigned char r, unsigned char g, unsigned char b, float life );
 	void		(*R_PlayerSprites)( int client, int modelIndex, int count, int size );
-	void		(*R_Projectile)( float *origin, float *velocity, int modelIndex, int life, int owner, void (*hitcallback)( struct tempent_s *ent, struct pmtrace_s *ptr ) );
+	void		(*R_Projectile)( const float *origin, const float *velocity, int modelIndex, int life, int owner, void (*hitcallback)( struct tempent_s *ent, struct pmtrace_s *ptr ) );
-	void		(*R_RicochetSound)( float *pos );
+	void		(*R_RicochetSound)( const float *pos );
-	void		(*R_RicochetSprite)( float *pos, struct model_s *pmodel, float duration, float scale );
+	void		(*R_RicochetSprite)( const float *pos, struct model_s *pmodel, float duration, float scale );
-	void		(*R_RocketFlare)( float *pos );
+	void		(*R_RocketFlare)( const float *pos );
 	void		(*R_RocketTrail)( float *start, float *end, int type );
-	void		(*R_RunParticleEffect)( float *org, float *dir, int color, int count );
+	void		(*R_RunParticleEffect)( const float *org, const float *dir, int color, int count );
-	void		(*R_ShowLine)( float *start, float *end );
+	void		(*R_ShowLine)( const float *start, const float *end );
-	void		(*R_SparkEffect)( float *pos, int count, int velocityMin, int velocityMax );
+	void		(*R_SparkEffect)( const float *pos, int count, int velocityMin, int velocityMax );
-	void		(*R_SparkShower)( float *pos );
+	void		(*R_SparkShower)( const float *pos );
-	void		(*R_SparkStreaks)( float *pos, int count, int velocityMin, int velocityMax );
+	void		(*R_SparkStreaks)( const float *pos, int count, int velocityMin, int velocityMax );
-	void		(*R_Spray)( float *pos, float *dir, int modelIndex, int count, int speed, int spread, int rendermode );
+	void		(*R_Spray)( const float *pos, const float *dir, int modelIndex, int count, int speed, int spread, int rendermode );
 	void		(*R_Sprite_Explode)( TEMPENTITY *pTemp, float scale, int flags );
 	void		(*R_Sprite_Smoke)( TEMPENTITY *pTemp, float scale );
-	void		(*R_Sprite_Spray)( float *pos, float *dir, int modelIndex, int count, int speed, int iRand );
+	void		(*R_Sprite_Spray)( const float *pos, const float *dir, int modelIndex, int count, int speed, int iRand );
 	void		(*R_Sprite_Trail)( int type, float *start, float *end, int modelIndex, int count, float life, float size, float amplitude, int renderamt, float speed );
 	void		(*R_Sprite_WallPuff)( TEMPENTITY *pTemp, float scale );
-	void		(*R_StreakSplash)( float *pos, float *dir, int color, int count, float speed, int velocityMin, int velocityMax );
+	void		(*R_StreakSplash)( const float *pos, const float *dir, int color, int count, float speed, int velocityMin, int velocityMax );
-	void		(*R_TracerEffect)( float *start, float *end );
+	void		(*R_TracerEffect)( const float *start, const float *end );
 	void		(*R_UserTracerParticle)( float *org, float *vel, float life, int colorIndex, float length, unsigned char deathcontext, void (*deathfunc)( struct particle_s *particle ));
 	particle_t	*(*R_TracerParticles)( float *org, float *vel, float life );
-	void		(*R_TeleportSplash)( float *org );
+	void		(*R_TeleportSplash)( const float *org );
-	void		(*R_TempSphereModel)( float *pos, float speed, float life, int count, int modelIndex );
+	void		(*R_TempSphereModel)( const float *pos, float speed, float life, int count, int modelIndex );
-	TEMPENTITY	*(*R_TempModel)( float *pos, float *dir, float *angles, float life, int modelIndex, int soundtype );
+	TEMPENTITY	*(*R_TempModel)( const float *pos, const float *dir, const float *angles, float life, int modelIndex, int soundtype );
-	TEMPENTITY	*(*R_DefaultSprite)( float *pos, int spriteIndex, float framerate );
+	TEMPENTITY	*(*R_DefaultSprite)( const float *pos, int spriteIndex, float framerate );
-	TEMPENTITY	*(*R_TempSprite)( float *pos, float *dir, float scale, int modelIndex, int rendermode, int renderfx, float a, float life, int flags );
+	TEMPENTITY	*(*R_TempSprite)( float *pos, const float *dir, float scale, int modelIndex, int rendermode, int renderfx, float a, float life, int flags );
 	int		(*Draw_DecalIndex)( int id );
-	int		(*Draw_DecalIndexFromName)( char *name );
+	int		(*Draw_DecalIndexFromName)( const char *name );
 	void		(*R_DecalShoot)( int textureIndex, int entity, int modelIndex, float *position, int flags );
 	void		(*R_AttachTentToPlayer)( int client, int modelIndex, float zoffset, float life );
 	void		(*R_KillAttachedTents)( int client );
@@ -182,10 +184,10 @@ struct efx_api_s
 	BEAM		*(*R_BeamRing)( int startEnt, int endEnt, int modelIndex, float life, float width, float amplitude, float brightness, float speed, int startFrame, float framerate, float r, float g, float b );
 	dlight_t		*(*CL_AllocDlight)( int key );
 	dlight_t		*(*CL_AllocElight)( int key );
-	TEMPENTITY	*(*CL_TempEntAlloc)( float *org, struct model_s *model );
+	TEMPENTITY	*(*CL_TempEntAlloc)( const float *org, struct model_s *model );
-	TEMPENTITY	*(*CL_TempEntAllocNoModel)( float *org );
+	TEMPENTITY	*(*CL_TempEntAllocNoModel)( const float *org );
-	TEMPENTITY	*(*CL_TempEntAllocHigh)( float *org, struct model_s *model );
+	TEMPENTITY	*(*CL_TempEntAllocHigh)( const float *org, struct model_s *model );
-	TEMPENTITY	*(*CL_TentEntAllocCustom)( float *origin, struct model_s *model, int high, void (*callback)( struct tempent_s *ent, float frametime, float currenttime ));
+	TEMPENTITY	*(*CL_TentEntAllocCustom)( const float *origin, struct model_s *model, int high, void (*callback)( struct tempent_s *ent, float frametime, float currenttime ));
 	void		(*R_GetPackedColor)( short *packed, short color );
 	short		(*R_LookupColor)( unsigned char r, unsigned char g, unsigned char b );
 	void		(*R_DecalRemoveAll)( int textureIndex ); // textureIndex points to the decal index in the array, not the actual texture index.

common/r_studioint.h

@@ -26,7 +26,7 @@ typedef struct engine_studio_api_s
 	// Check to see if pointer is in the cache
 	void		*( *Cache_Check )( struct cache_user_s *c );
 	// Load file into cache ( can be swapped out on demand )
-	void		( *LoadCacheFile )( char *path, struct cache_user_s *cu );
+	void		( *LoadCacheFile )( const char *path, struct cache_user_s *cu );
 	// Retrieve model pointer for the named model
 	struct model_s	*( *Mod_ForName )( const char *name, int crash_if_missing );
 	// Retrieve pointer to studio model data block from a model
@@ -120,7 +120,7 @@ typedef struct server_studio_api_s
 	// Check to see if pointer is in the cache
 	void		*( *Cache_Check )( struct cache_user_s *c );
 	// Load file into cache ( can be swapped out on demand )
-	void		( *LoadCacheFile )( char *path, struct cache_user_s *cu );
+	void		( *LoadCacheFile )( const char *path, struct cache_user_s *cu );
 	// Retrieve pointer to studio model data block from a model
 	void		*( *Mod_Extradata )( struct model_s *mod );
 } server_studio_api_t;

common/render_api.h

@@ -82,7 +82,7 @@ typedef enum
 	TF_KEEP_SOURCE	= (1<<1),		// some images keep source
 	TF_NOFLIP_TGA	= (1<<2),		// Steam background completely ignore tga attribute 0x20
 	TF_EXPAND_SOURCE	= (1<<3),		// Don't keep source as 8-bit expand to RGBA
-	TF_ALLOW_EMBOSS	= (1<<4),		// Allow emboss-mapping for this image
+// reserved
 	TF_RECTANGLE	= (1<<5),		// this is GL_TEXTURE_RECTANGLE
 	TF_CUBEMAP	= (1<<6),		// it's cubemap texture
 	TF_DEPTHMAP	= (1<<7),		// custom texture filter used
@@ -107,19 +107,24 @@ 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_ALLOW_NEAREST = (1<<30),	// allows toggling nearest filtering for TF_NOMIPMAP textures
 } texFlags_t;
 
 typedef enum
 {
-	CONTEXT_TYPE_GL = 0,
+	CONTEXT_TYPE_GL = 0, // compatibility profile
 	CONTEXT_TYPE_GLES_1_X,
-	CONTEXT_TYPE_GLES_2_X
+	CONTEXT_TYPE_GLES_2_X,
+	CONTEXT_TYPE_GL_CORE
 } gl_context_type_t;
 
 typedef enum
 {
-	GLES_WRAPPER_NONE = 0,		// native GLES
+	GLES_WRAPPER_NONE = 0,		// native GL
 	GLES_WRAPPER_NANOGL,		// used on GLES platforms
+	GLES_WRAPPER_WES,		// used on GLES platforms
+	GLES_WRAPPER_GL4ES,		// used on GLES platforms
 } gles_wrapper_t;
 
 // 30 bytes here
@@ -152,10 +157,12 @@ typedef struct decallist_s
 	modelstate_t	studio_state;	// studio decals only
 } decallist_t;
 
+struct ref_viewpass_s;
+
 typedef struct render_api_s
 {
 	// Get renderer info (doesn't changes engine state at all)
-	int		(*RenderGetParm)( int parm, int arg );	// generic
+	intptr_t	(*RenderGetParm)( int parm, int arg );	// generic
 	void		(*GetDetailScaleForTexture)( int texture, float *xScale, float *yScale );
 	void		(*GetExtraParmsForTexture)( int texture, byte *red, byte *green, byte *blue, byte *alpha );
 	lightstyle_t*	(*GetLightStyle)( int number );
@@ -175,9 +182,9 @@ typedef struct render_api_s
 	const char*	(*GL_TextureName)( unsigned int texnum );
 	const byte*	(*GL_TextureData)( unsigned int texnum ); // may be NULL
 	int		(*GL_LoadTexture)( const char *name, const byte *buf, size_t size, int flags );
-	int		(*GL_CreateTexture)( const char *name, int width, int height, const void *buffer, int flags ); 
+	int		(*GL_CreateTexture)( const char *name, int width, int height, const void *buffer, texFlags_t flags );
 	int		(*GL_LoadTextureArray)( const char **names, int flags );
-	int		(*GL_CreateTextureArray)( const char *name, int width, int height, int depth, const void *buffer, int flags );
+	int		(*GL_CreateTextureArray)( const char *name, int width, int height, int depth, const void *buffer, texFlags_t flags );
 	void		(*GL_FreeTexture)( unsigned int texnum );
 
 	// Decals manipulating (draw & remove)
@@ -187,9 +194,9 @@ typedef struct render_api_s
 
 	// AVIkit support
 	void		*(*AVI_LoadVideo)( const char *filename, qboolean load_audio );
-	int		(*AVI_GetVideoInfo)( void *Avi, long *xres, long *yres, float *duration );
+	int		(*AVI_GetVideoInfo)( void *Avi, int *xres, int *yres, float *duration ); // a1ba: changed longs to int
-	long		(*AVI_GetVideoFrameNumber)( void *Avi, float time );
+	int		(*AVI_GetVideoFrameNumber)( void *Avi, float time );
-	byte		*(*AVI_GetVideoFrame)( void *Avi, long frame );
+	byte		*(*AVI_GetVideoFrame)( void *Avi, int frame );
 	void		(*AVI_UploadRawFrame)( int texture, int cols, int rows, int width, int height, const byte *data );
 	void		(*AVI_FreeVideo)( void *Avi );
 	int		(*AVI_IsActive)( void *Avi );
@@ -219,23 +226,24 @@ typedef struct render_api_s
 	struct mstudiotex_s *( *StudioGetTexture )( struct cl_entity_s *e );
 	const struct ref_overview_s *( *GetOverviewParms )( void );
 	const char	*( *GetFileByIndex )( int fileindex );
-	int		(*pfnSaveFile)( const char *filename, const void *data, long len );
+	int		(*pfnSaveFile)( const char *filename, const void *data, int len );
 	void		(*R_Reserved0)( void );
 
 	// static allocations
-	void		*(*pfnMemAlloc)( size_t cb, const char *filename, const int fileline );
+	void		*(*pfnMemAlloc)( size_t cb, const char *filename, const int fileline ) ALLOC_CHECK( 1 );
 	void		(*pfnMemFree)( void *mem, const char *filename, const int fileline );
 
  	// engine utils (not related with render API but placed here)
 	char		**(*pfnGetFilesList)( const char *pattern, int *numFiles, int gamedironly );
-	unsigned long	(*pfnFileBufferCRC32)( const void *buffer, const int length );
+	unsigned int	(*pfnFileBufferCRC32)( const void *buffer, const int length );
 	int		(*COM_CompareFileTime)( const char *filename1, const char *filename2, int *iCompare );
 	void		(*Host_Error)( const char *error, ... ); // cause Host Error
 	void*		( *pfnGetModel )( int modelindex );
 	float		(*pfnTime)( void );				// Sys_DoubleTime
-	void		(*Cvar_Set)( char *name, char *value );
+	void		(*Cvar_Set)( const char *name, const char *value );
 	void		(*S_FadeMusicVolume)( float fadePercent );	// fade background track (0-100 percents)
-	void		(*SetRandomSeed)( long lSeed );		// set custom seed for RANDOM_FLOAT\RANDOM_LONG for predictable random
+	// a1ba: changed long to int
+	void		(*SetRandomSeed)( int lSeed );		// set custom seed for RANDOM_FLOAT\RANDOM_LONG for predictable random
 	// ONLY ADD NEW FUNCTIONS TO THE END OF THIS STRUCT.  INTERFACE VERSION IS FROZEN AT 37
 } render_api_t;
 
@@ -254,7 +262,7 @@ typedef struct render_interface_s
 	// clear decals by engine request (e.g. for demo recording or vid_restart)
 	void		(*R_ClearStudioDecals)( void );
 	// grab r_speeds message
-	qboolean		(*R_SpeedsMessage)( char *out, size_t size );
+	qboolean	(*R_SpeedsMessage)( char *out, size_t size );
 	// alloc or destroy model custom data
 	void		(*Mod_ProcessUserData)( struct model_s *mod, qboolean create, const byte *buffer );
 	// alloc or destroy entity custom data

common/studio_event.h

@@ -12,16 +12,26 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef STUDIO_EVENT_H
 #define STUDIO_EVENT_H
 
+#define MAXEVENTSTRING		64
+
 typedef struct mstudioevent_s
 {
-	int 		frame;
+	// the frame at which this animation event occurs
-	int		event;
+	int32_t 	frame;
-	int		type;
+
-	char		options[64];
+	// the script event type
+	int32_t		event;
+
+	// was "type"
+	int32_t		unused;
+
+	// options
+	// could be path to sound WAVE files
+	char		options[MAXEVENTSTRING];
 } mstudioevent_t;
 
-#endif//STUDIO_EVENT_H
+#endif // STUDIO_EVENT_H

common/synctype.h

@@ -0,0 +1,24 @@
+/*
+synctype.h -- shared synctype_t definition
+Copyright (C) 1996-1997 Id Software, Inc.
+Copyright (C) 2023 Alibek Omarov
+
+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 SYNCTYPE_H
+#define SYNCTYPE_H
+typedef enum {ST_SYNC=0, ST_RAND } synctype_t;
+#endif

common/triangleapi.h

@@ -44,14 +44,14 @@ typedef struct triangleapi_s
 	void	(*Color4f)( float r, float g, float b, float a );
 	void	(*Color4ub)( unsigned char r, unsigned char g, unsigned char b, unsigned char a );
 	void	(*TexCoord2f)( float u, float v );
-	void	(*Vertex3fv)( float *worldPnt );
+	void	(*Vertex3fv)( const float *worldPnt );
 	void	(*Vertex3f)( float x, float y, float z );
 	void	(*Brightness)( float brightness );
 	void	(*CullFace)( TRICULLSTYLE style );
 	int	(*SpriteTexture)( struct model_s *pSpriteModel, int frame );
-	int	(*WorldToScreen)( float *world, float *screen );  // Returns 1 if it's z clipped
+	int	(*WorldToScreen)( const float *world, float *screen );  // Returns 1 if it's z clipped
 	void	(*Fog)( float flFogColor[3], float flStart, float flEnd, int bOn ); //Works just like GL_FOG, flFogColor is r/g/b.
-	void	(*ScreenToWorld)( float *screen, float *world  ); 
+	void	(*ScreenToWorld)( const float *screen, float *world  );
 	void	(*GetMatrix)( const int pname, float *matrix );
 	int	(*BoxInPVS)( float *mins, float *maxs );
 	void	(*LightAtPoint)( float *pos, float *value );

common/xash3d_types.h

@@ -0,0 +1,238 @@
+// basic typedefs
+#ifndef XASH_TYPES_H
+#define XASH_TYPES_H
+
+#include "build.h"
+
+#if XASH_IRIX
+#include <port.h>
+#endif
+
+#if XASH_WIN32
+#include <wchar.h> // off_t
+#endif // _WIN32
+
+#include <sys/types.h> // off_t
+#include STDINT_H
+#include <assert.h>
+
+typedef unsigned char byte;
+typedef int		sound_t;
+typedef float		vec_t;
+typedef vec_t		vec2_t[2];
+typedef vec_t		vec3_t[3];
+typedef vec_t		vec4_t[4];
+typedef vec_t		quat_t[4];
+typedef byte		rgba_t[4];	// unsigned byte colorpack
+typedef byte		rgb_t[3];		// unsigned byte colorpack
+typedef vec_t		matrix3x4[3][4];
+typedef vec_t		matrix4x4[4][4];
+
+typedef uint32_t        poolhandle_t;
+
+#undef true
+#undef false
+
+#ifndef __cplusplus
+typedef enum { false, true }	qboolean;
+#else
+typedef int qboolean;
+#endif
+
+typedef uint64_t longtime_t;
+
+#define MAX_STRING		256	// generic string
+#define MAX_INFO_STRING	256	// infostrings are transmitted across network
+#define MAX_SERVERINFO_STRING	512	// server handles too many settings. expand to 1024?
+#define MAX_LOCALINFO_STRING	32768	// localinfo used on server and not sended to the clients
+#define MAX_SYSPATH		1024	// system filepath
+#define MAX_VA_STRING	1024	// string length returned by va()
+#define MAX_PRINT_MSG	8192	// how many symbols can handle single call of Con_Printf or Con_DPrintf
+#define MAX_TOKEN		2048	// parse token length
+#define MAX_MODS		512	// environment games that engine can keep visible
+#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 SetBits( iBitVector, bits )	((iBitVector) = (iBitVector) | (bits))
+#define ClearBits( iBitVector, bits )	((iBitVector) = (iBitVector) & ~(bits))
+#define FBitSet( iBitVector, bit )	((iBitVector) & (bit))
+
+#ifndef __cplusplus
+#ifdef NULL
+#undef NULL
+#endif
+
+#define NULL		((void *)0)
+#endif
+
+// color strings
+#define IsColorString( p )	( p && *( p ) == '^' && *(( p ) + 1) && *(( p ) + 1) >= '0' && *(( p ) + 1 ) <= '9' )
+#define ColorIndex( c )	((( c ) - '0' ) & 7 )
+
+#if defined( __GNUC__ )
+	#if defined( __i386__ )
+		#define EXPORT         __attribute__(( visibility( "default" ), force_align_arg_pointer ))
+		#define GAME_EXPORT    __attribute(( force_align_arg_pointer ))
+	#else
+		#define EXPORT         __attribute__(( visibility ( "default" )))
+		#define GAME_EXPORT
+	#endif
+
+	#define MALLOC __attribute__(( malloc ))
+
+	// added in GCC 11
+	#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 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
+	#define unlikely( x )     __builtin_expect( x, 0 )
+	#define likely( x )       __builtin_expect( x, 1 )
+#elif defined( __has_builtin )
+	#if __has_builtin( __builtin_expect ) // this must be after defined() check
+		#define unlikely( x )     __builtin_expect( x, 0 )
+		#define likely( x )       __builtin_expect( x, 1 )
+	#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]
+	// need these to correctly expand the line macro
+	#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 XASH_64BIT
+#define STATIC_CHECK_SIZEOF( type, size32, size64 ) \
+	STATIC_ASSERT( sizeof( type ) == size64, #type " unexpected size" )
+#else
+#define STATIC_CHECK_SIZEOF( type, size32, size64 ) \
+	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
+#define LittleLong(x) (((int)(((x)&255)<<24)) + ((int)((((x)>>8)&255)<<16)) + ((int)(((x)>>16)&255)<<8) + (((x) >> 24)&255))
+#define LittleLongSW(x) (x = LittleLong(x) )
+#define LittleShort(x) ((short)( (((short)(x) >> 8) & 255) + (((short)(x) & 255) << 8)))
+#define LittleShortSW(x) (x = LittleShort(x) )
+_inline float LittleFloat( float f )
+{
+	union
+	{
+		float f;
+		unsigned char b[4];
+	} dat1, dat2;
+
+	dat1.f = f;
+	dat2.b[0] = dat1.b[3];
+	dat2.b[1] = dat1.b[2];
+	dat2.b[2] = dat1.b[1];
+	dat2.b[3] = dat1.b[0];
+
+	return dat2.f;
+}
+#else
+#define LittleLong(x) (x)
+#define LittleLongSW(x)
+#define LittleShort(x) (x)
+#define LittleShortSW(x)
+#define LittleFloat(x) (x)
+#endif
+
+
+typedef unsigned int  dword;
+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
+typedef off_t fs_offset_t;
+#if XASH_WIN32
+typedef int fs_size_t; // return type of _read, _write funcs
+#else /* !XASH_WIN32 */
+typedef ssize_t fs_size_t;
+#endif /* !XASH_WIN32 */
+
+typedef struct dllfunc_s
+{
+	const char	*name;
+	void		**func;
+} dllfunc_t;
+
+typedef struct dll_info_s
+{
+	const char	*name;	// name of library
+	const dllfunc_t	*fcts;	// list of dll exports
+	qboolean		crash;	// crash if dll not found
+	void		*link;	// hinstance of loading library
+} 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.
+// each config string can be at most CS_SIZE characters.
+#if XASH_LOW_MEMORY == 0
+#define MAX_QPATH		64	// max length of a game pathname
+#elif XASH_LOW_MEMORY == 2
+#define MAX_QPATH		32 // should be enough for singleplayer
+#elif XASH_LOW_MEMORY == 1
+#define MAX_QPATH 48
+#endif
+#define MAX_OSPATH		260	// max length of a filesystem pathname
+#define CS_SIZE		64	// size of one config string
+#define CS_TIME		16	// size of time string
+
+#endif // XASH_TYPES_H

engine/alias.h

@@ -16,6 +16,10 @@
 #ifndef ALIAS_H
 #define ALIAS_H
 
+#include "build.h"
+#include STDINT_H
+#include "synctype.h"
+
 /*
 ==============================================================================
 
@@ -39,16 +43,6 @@ Alias models are position independent, so the cache manager can move them.
 #define ALIAS_TRACER2		0x0040	// orange split trail + rotate
 #define ALIAS_TRACER3		0x0080	// purple trail
 
-// must match definition in sprite.h
-#ifndef SYNCTYPE_T
-#define SYNCTYPE_T
-typedef enum
-{
-	ST_SYNC = 0,
-	ST_RAND
-} synctype_t;
-#endif
-
 typedef enum
 {
 	ALIAS_SINGLE = 0,
@@ -63,36 +57,42 @@ typedef enum
 
 typedef struct
 {
-	int		ident;
+	int32_t		ident;
-	int		version;
+	int32_t		version;
 	vec3_t		scale;
 	vec3_t		scale_origin;
 	float		boundingradius;
 	vec3_t		eyeposition;
-	int		numskins;
+	int32_t		numskins;
-	int		skinwidth;
+	int32_t		skinwidth;
-	int		skinheight;
+	int32_t		skinheight;
-	int		numverts;
+	int32_t		numverts;
-	int		numtris;
+	int32_t		numtris;
-	int		numframes;
+	int32_t		numframes;
-	synctype_t	synctype;
+	uint32_t	synctype; // was synctype_t
-	int		flags;
+	int32_t		flags;
 	float		size;
 } daliashdr_t;
 
+STATIC_CHECK_SIZEOF( daliashdr_t, 84, 84 );
+
 typedef struct
 {
-	int		onseam;
+	int32_t		onseam;
-	int		s;
+	int32_t		s;
-	int		t;
+	int32_t		t;
 } stvert_t;
 
+STATIC_CHECK_SIZEOF( stvert_t, 12, 12 );
+
 typedef struct dtriangle_s
 {
-	int		facesfront;
+	int32_t		facesfront;
-	int		vertindex[3];
+	int32_t		vertindex[3];
 } dtriangle_t;
 
+STATIC_CHECK_SIZEOF( dtriangle_t, 16, 16 );
+
 #define DT_FACES_FRONT	0x0010
 #define ALIAS_ONSEAM	0x0020
 
@@ -103,36 +103,50 @@ typedef struct
 	char		name[16];	// frame name from grabbing
 } daliasframe_t;
 
+STATIC_CHECK_SIZEOF( daliasframe_t, 24, 24 );
+
 typedef struct
 {
-	int		numframes;
+	int32_t		numframes;
 	trivertex_t	bboxmin;	// lightnormal isn't used
 	trivertex_t	bboxmax;	// lightnormal isn't used
 } daliasgroup_t;
 
+STATIC_CHECK_SIZEOF( daliasgroup_t, 12, 12 );
+
 typedef struct
 {
-	int		numskins;
+	int32_t		numskins;
 } daliasskingroup_t;
 
+STATIC_CHECK_SIZEOF( daliasskingroup_t, 4, 4 );
+
 typedef struct
 {
 	float		interval;
 } daliasinterval_t;
 
+STATIC_CHECK_SIZEOF( daliasinterval_t, 4, 4 );
+
 typedef struct
 {
 	float		interval;
 } daliasskininterval_t;
 
+STATIC_CHECK_SIZEOF( daliasskininterval_t, 4, 4 );
+
 typedef struct
 {
-	aliasframetype_t	type;
+	uint32_t	type; // was aliasframetype_t
 } daliasframetype_t;
 
+STATIC_CHECK_SIZEOF( daliasframetype_t, 4, 4 );
+
 typedef struct
 {
-	aliasskintype_t	type;
+	uint32_t	type; // was aliasskintype_t
 } daliasskintype_t;
 
+STATIC_CHECK_SIZEOF( daliasskintype_t, 4, 4 );
+
 #endif//ALIAS_H

engine/anorms.h

@@ -1,18 +1,22 @@
-/***
+/*
-*
+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
+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.
+
+*/
 {-0.525731, 0.000000, 0.850651}, 
 {-0.442863, 0.238856, 0.864188}, 
 {-0.295242, 0.000000, 0.955423}, 

engine/cdll_exp.h

@@ -15,6 +15,14 @@ GNU General Public License for more details.
 #ifndef CDLL_EXP_H
 #define CDLL_EXP_H
 
+struct tempent_s;
+struct usercmd_s;
+struct physent_s;
+struct playermove_s;
+struct mstudioevent_s;
+struct engine_studio_api_s;
+struct r_studio_interface_s;
+
 // NOTE: ordering is important!
 typedef struct cldll_func_s
 {
@@ -62,6 +70,10 @@ typedef struct cldll_func_s
 	// Xash3D extension
 	int	(*pfnGetRenderInterface)( int version, render_api_t *renderfuncs, render_interface_t *callback );
 	void	(*pfnClipMoveToEntity)( struct physent_s *pe, const vec3_t start, vec3_t mins, vec3_t maxs, const vec3_t end, struct pmtrace_s *tr );
+	// Xash3D FWGS extension
+	int (*pfnTouchEvent)( int type, int fingerID, float x, float y, float dx, float dy );
+	void (*pfnMoveEvent)( float forwardmove, float sidemove );
+	void (*pfnLookEvent)( float relyaw, float relpitch );
 } cldll_func_t;
 
 #endif//CDLL_EXP_H

engine/cdll_int.h

@@ -27,6 +27,16 @@ extern "C" {
 #endif
 
 #include "const.h"
+#include <stdint.h>
+
+#define MAX_ALIAS_NAME	32
+
+typedef struct cmdalias_s
+{
+	struct cmdalias_s	*next;
+	char		name[MAX_ALIAS_NAME];
+	char		*value;
+} cmdalias_t;
 
 // this file is included by both the engine and the client-dll,
 // so make sure engine declarations aren't done twice
@@ -96,8 +106,14 @@ typedef struct hud_player_info_s
 	char		*model;
 	short		topcolor;
 	short		bottomcolor;
+
+	uint64_t	m_nSteamID;
 } hud_player_info_t;
 
+struct screenfade_s;
+struct tagPOINT;
+struct event_args_s;
+
 typedef struct cl_enginefuncs_s
 {
 	// sprite handlers
@@ -119,20 +135,20 @@ typedef struct cl_enginefuncs_s
 	void	(*pfnSetCrosshair)( HSPRITE hspr, wrect_t rc, int r, int g, int b );
 
 	// cvar handlers
-	struct cvar_s *(*pfnRegisterVariable)( char *szName, char *szValue, int flags );
+	struct cvar_s *(*pfnRegisterVariable)( const char *szName, const char *szValue, int flags );
-	float	(*pfnGetCvarFloat)( char *szName );
+	float	(*pfnGetCvarFloat)( const char *szName );
-	char*	(*pfnGetCvarString)( char *szName );
+	const char*	(*pfnGetCvarString)( const char *szName );
 
 	// command handlers
-	int	(*pfnAddCommand)( char *cmd_name, void (*function)(void) );
+	int	(*pfnAddCommand)( const char *cmd_name, void (*function)(void) );
-	int	(*pfnHookUserMsg)( char *szMsgName, pfnUserMsgHook pfn );
+	int	(*pfnHookUserMsg)( const char *szMsgName, pfnUserMsgHook pfn );
-	int	(*pfnServerCmd)( char *szCmdString );
+	int	(*pfnServerCmd)( const char *szCmdString );
-	int	(*pfnClientCmd)( char *szCmdString );
+	int	(*pfnClientCmd)( const char *szCmdString );
 
 	void	(*pfnGetPlayerInfo)( int ent_num, hud_player_info_t *pinfo );
 
 	// sound handlers
-	void	(*pfnPlaySoundByName)( char *szSound, float volume );
+	void	(*pfnPlaySoundByName)( const char *szSound, float volume );
 	void	(*pfnPlaySoundByIndex)( int iSound, float volume );
 
 	// vector helpers
@@ -154,14 +170,14 @@ typedef struct cl_enginefuncs_s
 	void	(*GetViewAngles)( float * );
 	void	(*SetViewAngles)( float * );
 	int	(*GetMaxClients)( void );
-	void	(*Cvar_SetValue)( char *cvar, float value );
+	void	(*Cvar_SetValue)( const char *cvar, float value );
 
-	int       (*Cmd_Argc)( void );	
+	int   (*Cmd_Argc)( void );
-	char	*(*Cmd_Argv)( int arg );
+	const char	*(*Cmd_Argv)( int arg );
-	void	(*Con_Printf)( char *fmt, ... );
+	void	(*Con_Printf)( const char *fmt, ... );
-	void	(*Con_DPrintf)( char *fmt, ... );
+	void	(*Con_DPrintf)( const char *fmt, ... );
-	void	(*Con_NPrintf)( int pos, char *fmt, ... );
+	void	(*Con_NPrintf)( int pos, const char *fmt, ... );
-	void	(*Con_NXPrintf)( struct con_nprint_s *info, char *fmt, ... );
+	void	(*Con_NXPrintf)( struct con_nprint_s *info, const char *fmt, ... );
 
 	const char* (*PhysInfo_ValueForKey)( const char *key );
 	const char* (*ServerInfo_ValueForKey)( const char *key );
@@ -180,8 +196,8 @@ typedef struct cl_enginefuncs_s
 	void	(*V_CalcShake)( void );
 	void	(*V_ApplyShake)( float *origin, float *angles, float factor );
 
-	int	(*PM_PointContents)( float *point, int *truecontents );
+	int	(*PM_PointContents)( const float *point, int *truecontents );
-	int	(*PM_WaterEntity)( float *p );
+	int	(*PM_WaterEntity)( const float *p );
 	struct pmtrace_s *(*PM_TraceLine)( float *start, float *end, int flags, int usehull, int ignore_pe );
 
 	struct model_s *(*CL_LoadModel)( const char *modelname, int *index );
@@ -194,19 +210,20 @@ typedef struct cl_enginefuncs_s
 	void	(*pfnPlaybackEvent)( int flags, const struct edict_s *pInvoker, unsigned short eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2 );
 	void	(*pfnWeaponAnim)( int iAnim, int body );
 	float	(*pfnRandomFloat)( float flLow, float flHigh );
-	long	(*pfnRandomLong)( long lLow, long lHigh );
+	int	(*pfnRandomLong)( int lLow, int lHigh );
-	void	(*pfnHookEvent)( char *name, void ( *pfnEvent )( struct event_args_s *args ));
+	void	(*pfnHookEvent)( const char *name, void ( *pfnEvent )( struct event_args_s *args ));
-	int	(*Con_IsVisible) ();
+
+	int	(*Con_IsVisible) ( void );
 	const char *(*pfnGetGameDirectory)( void );
 	struct cvar_s *(*pfnGetCvarPointer)( const char *szName );
 	const char *(*Key_LookupBinding)( const char *pBinding );
 	const char *(*pfnGetLevelName)( void );
 	void	(*pfnGetScreenFade)( struct screenfade_s *fade );
 	void	(*pfnSetScreenFade)( struct screenfade_s *fade );
-	void*	(*VGui_GetPanel)( );
+	void*	(*VGui_GetPanel)( void );
 	void	(*VGui_ViewportPaintBackground)( int extents[4] );
 
-	byte*	(*COM_LoadFile)( char *path, int usehunk, int *pLength );
+	byte*	(*COM_LoadFile)( const char *path, int usehunk, int *pLength );
 	char*	(*COM_ParseFile)( char *data, char *token );
 	void	(*COM_FreeFile)( void *buffer );
 
@@ -248,39 +265,47 @@ typedef struct cl_enginefuncs_s
 	void	(*pfnGetMousePos)( struct tagPOINT *ppt );
 	void	(*pfnSetMousePos)( int x, int y );
 	void	(*pfnSetMouseEnable)( qboolean fEnable );
-	void	(*pfnUnused1)( void );
+
-	void	(*pfnUnused2)( void );
+	// undocumented interface starts here
-	void	(*pfnUnused3)( void );
+	struct cvar_s*	(*pfnGetFirstCvarPtr)( void );
-	void	(*pfnUnused4)( void );
+	void*		(*pfnGetFirstCmdFunctionHandle)( void );
-	float	(*pfnGetClientOldTime)( void );
+	void*		(*pfnGetNextCmdFunctionHandle)( void *cmdhandle );
-	float	(*pfnGetGravity)( void );
+	const char*	(*pfnGetCmdFunctionName)( void *cmdhandle );
-	struct model_s*(*pfnGetModelByIndex)( int index );
+	float		(*pfnGetClientOldTime)( void );
-	void	(*pfnUnused5)( void );
+	float		(*pfnGetGravity)( void );
-	void	(*pfnUnused6)( void );
+	struct model_s*	(*pfnGetModelByIndex)( int index );
-	void	(*pfnUnused7)( void );
+	void		(*pfnSetFilterMode)( int mode ); // same as gl_texsort in original Quake
-	void	(*pfnUnused8)( void );
+	void		(*pfnSetFilterColor)( float red, float green, float blue );
-	void	(*pfnUnused9)( void );
+	void		(*pfnSetFilterBrightness)( float brightness );
-	void	(*pfnUnused10)( void );
+	void		*(*pfnSequenceGet)( const char *fileName, const char *entryName );
-	void	(*pfnUnused11)( void );
+	void		(*pfnSPR_DrawGeneric)( int frame, int x, int y, const wrect_t *prc, int blendsrc, int blenddst, int width, int height );
-	void	(*pfnUnused12)( void );
+	void		*(*pfnSequencePickSentence)( const char *groupName, int pickMethod, int *entryPicked );
-	const char*(*LocalPlayerInfo_ValueForKey)( const char* key );
+	int		(*pfnDrawString)( int x, int y, const char *str, int r, int g, int b );
-	void	(*pfnUnused13)( void );
+	int		(*pfnDrawStringReverse)( int x, int y, const char *str, int r, int g, int b );
-	void	(*pfnUnused14)( void );
+	const char	*(*LocalPlayerInfo_ValueForKey)( const char* key );
-	void	(*pfnUnused15)( void );
+	int		(*pfnVGUI2DrawCharacter)( int x, int y, int ch, unsigned int font );
-	void	(*pfnUnused16)( void );
+	int		(*pfnVGUI2DrawCharacterAdditive)( int x, int y, int ch, int r, int g, int b, unsigned int font );
-	void	(*Cvar_Set)( char *name, char *value );
+	unsigned int	(*pfnGetApproxWavePlayLen)( const char *filename );
-	void	(*pfnUnused17)( void );
+	void*		(*GetCareerGameUI)( void );	// g-cont. !!!! potential crash-point!
-	void	(*pfnUnused18)( void );
+	void		(*Cvar_Set)( const char *name, const char *value );
-	void	(*pfnUnused19)( void );
+	int		(*pfnIsPlayingCareerMatch)( void );
-	double	(*pfnSys_FloatTime)( void );
+	void		(*pfnPlaySoundVoiceByName)( char *szSound, float volume, int pitch );
-	void	(*pfnUnused20)( void );
+	void		(*pfnPrimeMusicStream)( char *filename, int looping );
-	void	(*pfnUnused21)( void );
+	double		(*pfnSys_FloatTime)( void );
-	void	(*pfnUnused22)( void );
+
-	void	(*pfnUnused23)( void );
+	// decay funcs
-	void	(*pfnFillRGBABlend)( int x, int y, int width, int height, int r, int g, int b, int a );
+	void		(*pfnProcessTutorMessageDecayBuffer)( int *buffer, int buflen );
-	int	(*pfnGetAppID)( void );
+	void		(*pfnConstructTutorMessageDecayBuffer)( int *buffer, int buflen );
-	void	(*pfnUnused24)( void );
+	void		(*pfnResetTutorMessageDecayData)( void );
-	void	(*pfnUnused25)( void );
+
+	void		(*pfnPlaySoundByNameAtPitch)( char *szSound, float volume, int pitch );
+	void		(*pfnFillRGBABlend)( int x, int y, int width, int height, int r, int g, int b, int a );
+	int		(*pfnGetAppID)( void );
+	cmdalias_t	*(*pfnGetAliases)( void );
+	void		(*pfnVguiWrap2_GetMouseDelta)( int *x, int *y );
+
+	// added in 2019 update, not documented yet
+	int		(*pfnFilteredClientCmd)( const char *cmd );
 } cl_enginefunc_t;
 
 #define CLDLL_INTERFACE_VERSION	7

engine/client/avi/avi.h

@@ -0,0 +1,37 @@
+/*
+avi.h -- common avi support header
+Copyright (C) 2018 a1batross, 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.
+*/
+#ifndef AVI_H
+#define AVI_H
+
+//
+// avikit.c
+//
+typedef struct movie_state_s  movie_state_t;
+int AVI_GetVideoFrameNumber( movie_state_t *Avi, float time );
+byte *AVI_GetVideoFrame( movie_state_t *Avi, int frame );
+qboolean AVI_GetVideoInfo( movie_state_t *Avi, int *xres, int *yres, float *duration );
+qboolean AVI_GetAudioInfo( movie_state_t *Avi, wavdata_t *snd_info );
+int AVI_GetAudioChunk( movie_state_t *Avi, char *audiodata, int offset, int length );
+void AVI_OpenVideo( movie_state_t *Avi, const char *filename, qboolean load_audio, int quiet );
+movie_state_t *AVI_LoadVideo( const char *filename, qboolean load_audio );
+int AVI_TimeToSoundPosition( movie_state_t *Avi, int time );
+void AVI_CloseVideo( movie_state_t *Avi );
+qboolean AVI_IsActive( movie_state_t *Avi );
+void AVI_FreeVideo( movie_state_t *Avi );
+movie_state_t *AVI_GetState( int num );
+qboolean AVI_Initailize( void );
+void AVI_Shutdown( void );
+
+#endif // AVI_H

engine/client/avi/avi_stub.c

@@ -0,0 +1,90 @@
+/*
+avi_stub.c - playing AVI files (stub)
+Copyright (C) 2018 a1batross
+
+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 "build.h"
+#if !XASH_WIN32
+#include "common.h"
+
+int AVI_GetVideoFrameNumber( movie_state_t *Avi, float time )
+{
+	return 0;
+}
+
+byte *AVI_GetVideoFrame( movie_state_t *Avi, int frame )
+{
+	return NULL;
+}
+
+qboolean AVI_GetVideoInfo( movie_state_t *Avi, int *xres, int *yres, float *duration )
+{
+	return false;
+}
+
+qboolean AVI_GetAudioInfo( movie_state_t *Avi, wavdata_t *snd_info )
+{
+	return false;
+}
+
+int AVI_GetAudioChunk( movie_state_t *Avi, char *audiodata, int offset, int length )
+{
+	return 0;
+}
+
+void AVI_OpenVideo( movie_state_t *Avi, const char *filename, qboolean load_audio, int quiet )
+{
+	;
+}
+
+movie_state_t *AVI_LoadVideo( const char *filename, qboolean load_audio )
+{
+	return NULL;
+}
+
+int AVI_TimeToSoundPosition( movie_state_t *Avi, int time )
+{
+	return 0;
+}
+
+void AVI_CloseVideo( movie_state_t *Avi )
+{
+	;
+}
+
+qboolean AVI_IsActive( movie_state_t *Avi )
+{
+	return false;
+}
+
+void AVI_FreeVideo( movie_state_t *Avi )
+{
+	;
+}
+
+movie_state_t *AVI_GetState( int num )
+{
+	return NULL;
+}
+
+qboolean AVI_Initailize( void )
+{
+	return false;
+}
+
+void AVI_Shutdown( void )
+{
+	;
+}
+
+#endif // WIN32

engine/client/avi/avi_win.c

@@ -1,5 +1,6 @@
 /*
-avikit.c - playing AVI files (based on original AVIKit code)
+avi_win.c - playing AVI files (based on original AVIKit code, Win32 version)
+Copyright (c) 2003-2004, Ruari O'Sullivan
 Copyright (C) 2010 Uncle Mike
 
 This program is free software: you can redistribute it and/or modify
@@ -13,9 +14,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 */
 
+#include "build.h"
+#if XASH_WIN32
 #include "common.h"
 #include "client.h"
-#include "gl_local.h"
 #include <vfw.h> // video for windows
 
 // msvfw32.dll exports
@@ -58,14 +60,14 @@ dll_info_t msacm_dll = { "msacm32.dll", msacm_funcs, false };
 static int (_stdcall *pAVIStreamInfo)( PAVISTREAM pavi, AVISTREAMINFO *psi, LONG lSize );
 static int (_stdcall *pAVIStreamRead)( PAVISTREAM pavi, LONG lStart, LONG lSamples, void *lpBuffer, LONG cbBuffer, LONG *plBytes, LONG *plSamples );
 static PGETFRAME (_stdcall *pAVIStreamGetFrameOpen)( PAVISTREAM pavi, LPBITMAPINFOHEADER lpbiWanted );
-static long (_stdcall *pAVIStreamTimeToSample)( PAVISTREAM pavi, LONG lTime );
+static int (_stdcall *pAVIStreamTimeToSample)( PAVISTREAM pavi, LONG lTime );
 static void* (_stdcall *pAVIStreamGetFrame)( PGETFRAME pg, LONG lPos );
 static int (_stdcall *pAVIStreamGetFrameClose)( PGETFRAME pg );
 static dword (_stdcall *pAVIStreamRelease)( PAVISTREAM pavi );
-static int (_stdcall *pAVIFileOpen)( PAVIFILE *ppfile, LPCSTR szFile, UINT uMode, LPCLSID lpHandler );
+static int (_stdcall *pAVIFileOpenW)( PAVIFILE *ppfile, LPCWSTR szFile, UINT uMode, LPCLSID lpHandler );
 static int (_stdcall *pAVIFileGetStream)( PAVIFILE pfile, PAVISTREAM *ppavi, DWORD fccType, LONG lParam );
 static int (_stdcall *pAVIStreamReadFormat)( PAVISTREAM pavi, LONG lPos,LPVOID lpFormat, LONG *lpcbFormat );
-static long (_stdcall *pAVIStreamStart)( PAVISTREAM pavi );
+static int (_stdcall *pAVIStreamStart)( PAVISTREAM pavi );
 static dword (_stdcall *pAVIFileRelease)( PAVIFILE pfile );
 static void (_stdcall *pAVIFileInit)( void );
 static void (_stdcall *pAVIFileExit)( void );
@@ -75,7 +77,7 @@ static dllfunc_t avifile_funcs[] =
 { "AVIFileExit", (void **) &pAVIFileExit },
 { "AVIFileGetStream", (void **) &pAVIFileGetStream },
 { "AVIFileInit", (void **) &pAVIFileInit },
-{ "AVIFileOpenA", (void **) &pAVIFileOpen },
+{ "AVIFileOpenW", (void **) &pAVIFileOpenW },
 { "AVIFileRelease", (void **) &pAVIFileRelease },
 { "AVIStreamGetFrame", (void **) &pAVIStreamGetFrame },
 { "AVIStreamGetFrameClose", (void **) &pAVIStreamGetFrameClose },
@@ -99,17 +101,17 @@ typedef struct movie_state_s
 	PAVIFILE		pfile;		// avi file pointer
 	PAVISTREAM	video_stream;	// video stream pointer
 	PGETFRAME		video_getframe;	// pointer to getframe object for video stream
-	long		video_frames;	// total frames
+	int		video_frames;	// total frames
-	long		video_xres;	// video stream resolution
+	int		video_xres;	// video stream resolution
-	long		video_yres;
+	int		video_yres;
 	float		video_fps;	// video stream fps
 
 	PAVISTREAM	audio_stream;	// audio stream pointer
 	WAVEFORMAT	*audio_header;	// audio stream header
-	long		audio_header_size;	// WAVEFORMAT is returned for PCM data; WAVEFORMATEX for others
+	int		audio_header_size;	// WAVEFORMAT is returned for PCM data; WAVEFORMATEX for others
-	long		audio_codec;	// WAVE_FORMAT_PCM is oldstyle: anything else needs conversion
+	int		audio_codec;	// WAVE_FORMAT_PCM is oldstyle: anything else needs conversion
-	long		audio_length;	// in converted samples
+	int		audio_length;	// in converted samples
-	long		audio_bytes_per_sample; // guess.
+	int		audio_bytes_per_sample; // guess.
 
 	// compressed audio specific data
 	dword		cpa_blockalign;	// block size to read
@@ -251,7 +253,7 @@ qboolean AVI_ACMConvertAudio( movie_state_t *Avi )
 	return true;
 }
 
-qboolean AVI_GetVideoInfo( movie_state_t *Avi, long *xres, long *yres, float *duration )
+qboolean AVI_GetVideoInfo( movie_state_t *Avi, int *xres, int *yres, float *duration )
 {
 	if( !Avi->active )
 		return false;
@@ -269,7 +271,7 @@ qboolean AVI_GetVideoInfo( movie_state_t *Avi, long *xres, long *yres, float *du
 }
 
 // returns a unique frame identifier
-long AVI_GetVideoFrameNumber( movie_state_t *Avi, float time )
+int AVI_GetVideoFrameNumber( movie_state_t *Avi, float time )
 {
 	if( !Avi->active )
 		return 0;
@@ -277,15 +279,7 @@ long AVI_GetVideoFrameNumber( movie_state_t *Avi, float time )
 	return (time * Avi->video_fps);
 }
 
-long AVI_GetVideoFrameCount( movie_state_t *Avi )
+int AVI_TimeToSoundPosition( movie_state_t *Avi, int time )
-{
-	if( !Avi->active )
-		return 0;
-
-	return Avi->video_frames;
-}
-
-long AVI_TimeToSoundPosition( movie_state_t *Avi, long time )
 {
 	if( !Avi->active || !Avi->audio_stream )
 		return 0;
@@ -295,7 +289,7 @@ long AVI_TimeToSoundPosition( movie_state_t *Avi, long time )
 }
 
 // gets the raw frame data
-byte *AVI_GetVideoFrame( movie_state_t *Avi, long frame )
+byte *AVI_GetVideoFrame( movie_state_t *Avi, int frame )
 {
 	LPBITMAPINFOHEADER	frame_info;
 	byte		*frame_raw;
@@ -382,9 +376,9 @@ qboolean AVI_SeekPosition( movie_state_t *Avi, dword offset )
 }
 
 // get a chunk of audio from the stream (in bytes)
-long AVI_GetAudioChunk( movie_state_t *Avi, char *audiodata, long offset, long length )
+int AVI_GetAudioChunk( movie_state_t *Avi, char *audiodata, int offset, int length )
 {
-	long	result = 0;
+	int	result = 0;
 	int	i;
 
 	// zero data past the end of the file
@@ -392,7 +386,7 @@ long AVI_GetAudioChunk( movie_state_t *Avi, char *audiodata, long offset, long l
 	{
 		if( offset <= Avi->audio_length )
 		{
-			long	remaining_length = Avi->audio_length - offset;
+			int	remaining_length = Avi->audio_length - offset;
 
 			AVI_GetAudioChunk( Avi, audiodata, offset, remaining_length );
 
@@ -427,7 +421,7 @@ long AVI_GetAudioChunk( movie_state_t *Avi, char *audiodata, long offset, long l
 
 		while( length > 0 )
 		{
-			long	blockread = Avi->cpa_conversion_header.cbDstLengthUsed - Avi->cpa_blockpos;
+			int	blockread = Avi->cpa_conversion_header.cbDstLengthUsed - Avi->cpa_blockpos;
 
 			if( blockread <= 0 ) // read next
 			{
@@ -490,8 +484,9 @@ void AVI_OpenVideo( movie_state_t *Avi, const char *filename, qboolean load_audi
 {
 	BITMAPINFOHEADER	bmih;
 	AVISTREAMINFO	stream_info;
-	long		opened_streams = 0;
+	int		opened_streams = 0;
 	LONG		hr;
+	wchar_t		pathBuffer[MAX_PATH];
 
 	// default state: non-working.
 	Avi->active = false;
@@ -500,8 +495,15 @@ void AVI_OpenVideo( movie_state_t *Avi, const char *filename, qboolean load_audi
 	// can't load Video For Windows :-(
 	if( !avi_initialized ) return;
 
+	// convert to wide char
+	if( MultiByteToWideChar( CP_UTF8, 0, filename, -1, pathBuffer, ARRAYSIZE( pathBuffer )) <= 0 )
+	{
+		Con_DPrintf( S_ERROR "filename buffer limit exceeded\n" );
+		return;
+	}
+
 	// load the AVI
-	hr = pAVIFileOpen( &Avi->pfile, filename, OF_SHARE_DENY_WRITE, 0L );
+	hr = pAVIFileOpenW( &Avi->pfile, pathBuffer, OF_SHARE_DENY_WRITE, 0L );
 
 	if( hr != 0 ) // error opening AVI:
 	{
@@ -557,7 +559,7 @@ void AVI_OpenVideo( movie_state_t *Avi, const char *filename, qboolean load_audi
 		}
 		else if( stream_info.fccType == streamtypeAUDIO && Avi->audio_stream == NULL && load_audio )
 		{
-			long	size;
+			int	size;
 
 			Avi->audio_stream = stream;
 
@@ -570,7 +572,7 @@ void AVI_OpenVideo( movie_state_t *Avi, const char *filename, qboolean load_audi
 			Avi->audio_codec = Avi->audio_header->wFormatTag;
 
 			// length of converted audio in samples
-			Avi->audio_length = (long)((float)stream_info.dwLength / Avi->audio_header->nAvgBytesPerSec );
+			Avi->audio_length = (int)((float)stream_info.dwLength / Avi->audio_header->nAvgBytesPerSec );
 			Avi->audio_length *= Avi->audio_header->nSamplesPerSec;
 
 			if( Avi->audio_codec != WAVE_FORMAT_PCM )
@@ -656,7 +658,7 @@ movie_state_t *AVI_LoadVideo( const char *filename, qboolean load_audio )
 
 	// open cinematic
 	Q_snprintf( path, sizeof( path ), "media/%s", filename );
-	COM_DefaultExtension( path, ".avi" );
+	COM_DefaultExtension( path, ".avi", sizeof( path ));
 	fullpath = FS_GetDiskPath( path, false );
 
 	if( FS_FileExists( path, false ) && !fullpath )
@@ -730,3 +732,4 @@ void AVI_Shutdown( void )
 	Sys_FreeLibrary( &msacm_dll );
 	avi_initialized = false;
 }
+#endif // _WIN32

engine/client/cl_cmds.c

@@ -15,7 +15,6 @@ GNU General Public License for more details.
 
 #include "common.h"
 #include "client.h"
-#include "gl_local.h"
 
 /*
 ====================
@@ -86,6 +85,12 @@ 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 ))
@@ -97,6 +102,12 @@ 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 );
@@ -127,7 +138,7 @@ void CL_PlayCDTrack_f( void )
 		int	i, maxTrack;
 
 		for( maxTrack = i = 0; i < MAX_CDTRACKS; i++ )
-			if( Q_strlen( clgame.cdtracks[i] )) maxTrack++;
+			if( COM_CheckStringEmpty( clgame.cdtracks[i] ) ) maxTrack++;
 
 		Con_Printf( "%u tracks\n", maxTrack );
 		if( track )
@@ -135,7 +146,7 @@ void CL_PlayCDTrack_f( void )
 			if( paused ) Con_Printf( "Paused %s track %u\n", looped ? "looping" : "playing", track );
 			else Con_Printf( "Currently %s track %u\n", looped ? "looping" : "playing", track );
 		}
-		Con_Printf( "Volume is %f\n", Cvar_VariableValue( "MP3Volume" ));
+		Con_Printf( "Volume is %f\n", s_musicvolume.value );
 		return;
 	}
 	else Con_Printf( "%s: unknown command %s\n", Cmd_Argv( 0 ), command );
@@ -146,56 +157,12 @@ void CL_PlayCDTrack_f( void )
 CL_ScreenshotGetName
 ==================
 */
-qboolean CL_ScreenshotGetName( int lastnum, char *filename )
+static qboolean CL_ScreenshotGetName( const char *fmt, int lastnum, char *filename, size_t size )
 {
-	int	a, b, c, d;
-
 	if( lastnum < 0 || lastnum > 9999 )
-	{
-		Con_Printf( S_ERROR "unable to write screenshot\n" );
 		return false;
-	}
 
-	a = lastnum / 1000;
+	return Q_snprintf( filename, size, fmt, clgame.mapname, lastnum ) > 0;
-	lastnum -= a * 1000;
-	b = lastnum / 100;
-	lastnum -= b * 100;
-	c = lastnum / 10;
-	lastnum -= c * 10;
-	d = lastnum;
-
-	Q_sprintf( filename, "scrshots/%s_shot%i%i%i%i.bmp", clgame.mapname, a, b, c, d );
-
-	return true;
-}
-
-/* 
-================== 
-CL_SnapshotGetName
-================== 
-*/  
-qboolean CL_SnapshotGetName( int lastnum, char *filename )
-{
-	int	a, b, c, d;
-
-	if( lastnum < 0 || lastnum > 9999 )
-	{
-		Con_Printf( S_ERROR "unable to write snapshot\n" );
-		FS_AllowDirectPaths( false );
-		return false;
-	}
-
-	a = lastnum / 1000;
-	lastnum -= a * 1000;
-	b = lastnum / 100;
-	lastnum -= b * 100;
-	c = lastnum / 10;
-	lastnum -= c * 10;
-	d = lastnum;
-
-	Q_sprintf( filename, "../%s_%i%i%i%i.bmp", clgame.mapname, a, b, c, d );
-
-	return true;
 }
 
 /*
@@ -205,127 +172,6 @@ qboolean CL_SnapshotGetName( int lastnum, char *filename )
 
 ==============================================================================
 */
-/* 
-================== 
-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 ))
-				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 ))
-				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_sprintf( 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_sprintf( 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
@@ -344,7 +190,8 @@ void CL_LevelShot_f( void )
 	// check for exist
 	if( cls.demoplayback && ( cls.demonum != -1 ))
 	{
-		Q_sprintf( cls.shotname, "levelshots/%s_%s.bmp", cls.demoname, glState.wideScreen ? "16x9" : "4x3" );
+		Q_snprintf( cls.shotname, sizeof( cls.shotname ),
+			"levelshots/%s_%s.bmp", cls.demoname, refState.wideScreen ? "16x9" : "4x3" );
 		Q_snprintf( filename, sizeof( filename ), "%s.dem", cls.demoname );
 
 		// make sure what levelshot is newer than demo
@@ -353,7 +200,8 @@ void CL_LevelShot_f( void )
 	}
 	else
 	{
-		Q_sprintf( cls.shotname, "levelshots/%s_%s.bmp", clgame.mapname, glState.wideScreen ? "16x9" : "4x3" );
+		Q_snprintf( cls.shotname, sizeof( cls.shotname ),
+			"levelshots/%s_%s.bmp", clgame.mapname, refState.wideScreen ? "16x9" : "4x3" );
 
 		// make sure what levelshot is newer than bsp
 		ft1 = FS_FileTime( cl.worldmodel->name, false );
@@ -366,23 +214,107 @@ 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( Cmd_Argc() < 2 )
+	if( !Q_stricmp( string, "snapshot" ))
+		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 )
 	{
-		Con_Printf( S_USAGE "saveshot <savename>\n" );
+		if( CL_IsDevOverviewMode() == 1 )
-		return;
+			type = scrshot_mapshot;
+	}
+	else
+	{
+		if( Cmd_Argc() < 2 )
+		{
+			Con_Printf( S_USAGE "%s <shotname>\n", argv0 );
+			return;
+		}
 	}
 
-	Q_sprintf( cls.shotname, "%s%s.bmp", DEFAULT_SAVE_DIRECTORY, Cmd_Argv( 1 ));
+	switch( type )
-	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;
 }
 
 /*
@@ -427,52 +359,6 @@ void CL_SetSky_f( void )
 	R_SetupSky( Cmd_Argv( 1 ));
 }
 
-/*
-================
-SCR_TimeRefresh_f
-
-timerefresh [noflip]
-================
-*/
-void SCR_TimeRefresh_f( void )
-{
-	int	i;
-	double	start, stop;
-	double	time;
-
-	if( cls.state != ca_active )
-		return;
-
-	start = Sys_DoubleTime();
-
-	// run without page flipping like GoldSrc
-	if( Cmd_Argc() == 1 )
-	{	
-		pglDrawBuffer( GL_FRONT );
-		for( i = 0; i < 128; i++ )
-		{
-			RI.viewangles[1] = i / 128.0 * 360.0f;
-			R_RenderScene();
-		}
-		pglFinish();
-		R_EndFrame();
-	}
-	else
-	{
-		for( i = 0; i < 128; i++ )
-		{
-			R_BeginFrame( true );
-			RI.viewangles[1] = i / 128.0 * 360.0f;
-			R_RenderScene();
-			R_EndFrame();
-		}
-	}
-
-	stop = Sys_DoubleTime ();
-	time = (stop - start);
-	Con_Printf( "%f seconds (%f fps)\n", time, 128 / time );
-}
-
 /*
 =============
 SCR_Viewpos_f
@@ -482,6 +368,35 @@ viewpos (level-designer helper)
 */
 void SCR_Viewpos_f( void )
 {
-	Con_Printf( "org ( %g %g %g )\n", RI.vieworg[0], RI.vieworg[1], RI.vieworg[2] );
+	Con_Printf( "org ( %g %g %g )\n", refState.vieworg[0], refState.vieworg[1], refState.vieworg[2] );
-	Con_Printf( "ang ( %g %g %g )\n", RI.viewangles[0], RI.viewangles[1], RI.viewangles[2] );
+	Con_Printf( "ang ( %g %g %g )\n", refState.viewangles[0], refState.viewangles[1], refState.viewangles[2] );
+}
+
+/*
+=============
+CL_WavePlayLen_f
+
+=============
+*/
+void CL_WavePlayLen_f( void )
+{
+	const char *name;
+	uint msecs;
+
+	if( Cmd_Argc() != 2 )
+	{
+		Con_Printf( "waveplaylen <wave file name>: returns approximate number of milliseconds a wave file will take to play.\n" );
+		return;
+	}
+
+	name = Cmd_Argv( 1 );
+	msecs = Sound_GetApproxWavePlayLen( name );
+
+	if( msecs == 0 )
+	{
+		Con_Printf( "Unable to read %s, file may be missing or incorrectly formatted.\n", name );
+		return;
+	}
+
+	Con_Printf( "Play time is approximately %dms\n", msecs );
 }

engine/client/cl_custom.c

@@ -39,7 +39,7 @@ qboolean CL_CheckFile( sizebuf_t *msg, resource_t *pResource )
 	}
 
 	if( pResource->type == t_sound )
-		Q_strncpy( filepath, va( "%s%s", DEFAULT_SOUNDPATH, pResource->szFileName ), sizeof( filepath ));
+		Q_snprintf( filepath, sizeof( filepath ), DEFAULT_SOUNDPATH "%s", pResource->szFileName );
 	else Q_strncpy( filepath, pResource->szFileName, sizeof( filepath ));
 
 	if( !COM_IsSafeFileToDownload( filepath ))
@@ -50,7 +50,7 @@ qboolean CL_CheckFile( sizebuf_t *msg, resource_t *pResource )
 
 	if( !cl_allow_download.value )
 	{
-		Con_Reportf( "Download refused, cl_allow_download is 0\n" );
+		Con_Reportf( "Download refused, cl_allowdownload is 0\n" );
 		return true;
 	}
 
@@ -70,10 +70,18 @@ qboolean CL_CheckFile( sizebuf_t *msg, resource_t *pResource )
 		return true;
 	}
 
-	MSG_BeginClientCmd( msg, clc_stringcmd );
-	MSG_WriteString( msg, va( "dlfile %s", filepath ));
 	host.downloadcount++;
 
+	if( cl.http_download )
+	{
+		HTTP_AddDownload( filepath, pResource->nDownloadSize, true, pResource );
+	}
+	else
+	{
+		MSG_BeginClientCmd( msg, clc_stringcmd );
+		MSG_WriteStringf( msg, "dlfile %s", filepath );
+	}
+
 	return false;
 }
 
@@ -97,9 +105,9 @@ 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 CL_RemoveFromResourceList\n" );
+		Host_Error( "mislinked resource in %s\n", __func__ );
 
-	if ( pResource->pNext == pResource || pResource->pPrev == pResource )
+	if( pResource->pNext == pResource || pResource->pPrev == pResource )
 		Host_Error( "attempt to free last entry in list.\n" );
 
 	pResource->pPrev->pNext = pResource->pNext;
@@ -112,7 +120,7 @@ void CL_MoveToOnHandList( resource_t *pResource )
 {
 	if( !pResource )
 	{
-		Con_Reportf( "Null resource passed to CL_MoveToOnHandList\n" );
+		Con_Reportf( "Null resource passed to %s\n", __func__ );
 		return;
 	}
 
@@ -120,7 +128,7 @@ void CL_MoveToOnHandList( resource_t *pResource )
 	CL_AddToResourceList( pResource, &cl.resourcesonhand );
 }
 
-void CL_ClearResourceList( resource_t *pList )
+static void CL_ClearResourceList( resource_t *pList )
 {
 	resource_t	*p, *n;
 

engine/client/cl_debug.c

@@ -17,7 +17,6 @@ GNU General Public License for more details.
 #include "client.h"
 #include "net_encode.h"
 #include "particledef.h"
-#include "gl_local.h"
 #include "cl_tent.h"
 #include "shake.h"
 #include "hltv.h"
@@ -26,69 +25,6 @@ GNU General Public License for more details.
 #define MSG_COUNT		32		// last 32 messages parsed
 #define MSG_MASK		(MSG_COUNT - 1)
 
-const char *svc_strings[svc_lastmsg+1] =
-{
-	"svc_bad",
-	"svc_nop",
-	"svc_disconnect",
-	"svc_event",
-	"svc_changing",
-	"svc_setview",
-	"svc_sound",
-	"svc_time",
-	"svc_print",
-	"svc_stufftext",
-	"svc_setangle",
-	"svc_serverdata",
-	"svc_lightstyle",
-	"svc_updateuserinfo",
-	"svc_deltatable",
-	"svc_clientdata",
-	"svc_resource",
-	"svc_pings",
-	"svc_particle",
-	"svc_restoresound",
-	"svc_spawnstatic",
-	"svc_event_reliable",
-	"svc_spawnbaseline",
-	"svc_temp_entity",
-	"svc_setpause",
-	"svc_signonnum",
-	"svc_centerprint",
-	"svc_unused27",
-	"svc_unused28",
-	"svc_unused29",
-	"svc_intermission",
-	"svc_finale",
-	"svc_cdtrack",
-	"svc_restore",
-	"svc_cutscene",
-	"svc_weaponanim",
-	"svc_bspdecal",
-	"svc_roomtype",
-	"svc_addangle",
-	"svc_usermessage",
-	"svc_packetentities",
-	"svc_deltapacketentities",
-	"svc_choke",
-	"svc_resourcelist",
-	"svc_deltamovevars",
-	"svc_resourcerequest",
-	"svc_customization",
-	"svc_crosshairangle",
-	"svc_soundfade",
-	"svc_filetxferfailed",
-	"svc_hltv",
-	"svc_director",
-	"svc_voiceinit",
-	"svc_voicedata",
-	"svc_deltapacketbones",
-	"svc_unused55",
-	"svc_resourcelocation",
-	"svc_querycvarvalue",
-	"svc_querycvarvalue2",
-};
-
 typedef struct
 {
 	int	command;
@@ -109,12 +45,34 @@ const char *CL_MsgInfo( int cmd )
 {
 	static string	sz;
 
-	Q_strcpy( sz, "???" );
+	Q_strncpy( sz, "???", sizeof( sz ));
 
 	if( cmd >= 0 && cmd <= svc_lastmsg )
 	{
 		// get engine message name
-		Q_strncpy( sz, svc_strings[cmd], sizeof( sz ));
+		const char *svc_string = NULL;
+
+		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

@@ -15,7 +15,6 @@ GNU General Public License for more details.
 
 #include "common.h"
 #include "client.h"
-#include "gl_local.h"
 #include "net_encode.h"
 
 #define dem_unknown		0	// unknown command
@@ -41,6 +40,8 @@ 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",
@@ -52,6 +53,7 @@ const char *demo_cmd[dem_lastcmd+1] =
 	"dem_stop",
 };
 
+#pragma pack( push, 1 )
 typedef struct
 {
 	int		id;		// should be IDEM
@@ -63,6 +65,7 @@ typedef struct
 	char		gamedir[64];	// name of game directory (FS_Gamedir())
 	int		directory_offset;	// offset of Entry Directory.
 } demoheader_t;
+#pragma pack( pop )
 
 typedef struct
 {
@@ -78,7 +81,7 @@ typedef struct
 typedef struct
 {
 	demoentry_t	*entries;		// track entry info
-	int		numentries;	// number of tracks
+	int32_t		numentries;	// number of tracks
 } demodirectory_t;
 
 // add angles
@@ -106,6 +109,42 @@ 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
@@ -116,12 +155,8 @@ we record a demo on this level
 */
 void CL_StartupDemoHeader( void )
 {
-	if( cls.demoheader )
+	CL_CloseDemoHeader();
-	{
-		FS_Close( cls.demoheader );
-	}
 
-	// Note: this is replacing tmpfile()
 	cls.demoheader = FS_Open( "demoheader.tmp", "w+b", true );
 
 	if( !cls.demoheader )
@@ -155,7 +190,7 @@ CL_GetDemoRecordClock
 write time while demo is recording
 ====================
 */
-float CL_GetDemoRecordClock( void ) 
+static float CL_GetDemoRecordClock( void )
 {
 	return cl.mtime[0];
 }
@@ -167,7 +202,7 @@ CL_GetDemoPlaybackClock
 overwrite host.realtime
 ====================
 */
-float CL_GetDemoPlaybackClock( void ) 
+static float CL_GetDemoPlaybackClock( void )
 {
 	return host.realtime + host.frametime;
 }
@@ -193,7 +228,7 @@ CL_WriteDemoCmdHeader
 Writes the demo command header and time-delta
 ====================
 */
-void CL_WriteDemoCmdHeader( byte cmd, file_t *file )
+static void CL_WriteDemoCmdHeader( byte cmd, file_t *file )
 {
 	float	dt;
 
@@ -250,7 +285,7 @@ void CL_WriteDemoUserCmd( int cmdnumber )
 
 	// write usercmd_t
 	MSG_Init( &buf, "UserCmd", data, sizeof( data ));
-	CL_WriteUsercmd( &buf, -1, cmdnumber );	// always no delta
+	CL_WriteUsercmd( PROTO_CURRENT, &buf, -1, cmdnumber ); // always no delta, always in current protocol
 
 	bytes = MSG_GetNumBytesWritten( &buf );
 
@@ -266,7 +301,7 @@ Save state of cls.netchan sequences
 so that we can play the demo correctly.
 ====================
 */
-void CL_WriteDemoSequence( file_t *file )
+static void CL_WriteDemoSequence( file_t *file )
 {
 	Assert( file != NULL );
 
@@ -294,10 +329,6 @@ 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;
 
@@ -347,11 +378,11 @@ CL_WriteDemoHeader
 Write demo header
 ====================
 */
-void CL_WriteDemoHeader( const char *name )
+static void CL_WriteDemoHeader( const char *name )
 {
-	long	copysize;
+	int	copysize;
-	long	savepos;
+	int	savepos;
-	long	curpos;
+	int	curpos;
 
 	Con_Printf( "recording to %s.\n", name );
 	cls.demofile = FS_Open( name, "wb", false );
@@ -370,8 +401,8 @@ void CL_WriteDemoHeader( const char *name )
 
 	demo.header.id = IDEMOHEADER;
 	demo.header.dem_protocol = DEMO_PROTOCOL;
-	demo.header.net_protocol = PROTOCOL_VERSION;
+	demo.header.net_protocol = CL_GetDemoNetProtocol( cls.legacymode );
-	demo.header.host_fps = bound( MIN_FPS, host_maxfps->value, MAX_FPS );
+	demo.header.host_fps = host_maxfps.value ? bound( MIN_FPS, host_maxfps.value, MAX_FPS ) : 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 ));
@@ -390,6 +421,7 @@ 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 );
@@ -435,7 +467,7 @@ CL_StopRecord
 finish recording demo
 =================
 */
-void CL_StopRecord( void )
+static void CL_StopRecord( void )
 {
 	int	i, curpos;
 	float	stoptime;
@@ -489,7 +521,7 @@ void CL_DrawDemoRecording( void )
 {
 	char	string[64];
 	rgba_t	color = { 255, 255, 255, 255 };
-	long	pos;
+	int	pos;
 	int	len;
 
 	if(!( host_developer.value && cls.demorecording ))
@@ -497,10 +529,10 @@ void CL_DrawDemoRecording( void )
 
 	pos = FS_Tell( cls.demofile );
 	Q_snprintf( string, sizeof( string ), "^1RECORDING:^7 %s: %s time: %02d:%02d", cls.demoname,
-	Q_memprint( pos ), (int)(cls.demotime / 60.0f ), (int)fmod( cls.demotime, 60.0f ));
+		Q_memprint( pos ), (int)(cls.demotime / 60.0f ), (int)fmod( cls.demotime, 60.0f ));
 
 	Con_DrawStringLen( string, &len, NULL );
-	Con_DrawString(( glState.width - len ) >> 1, glState.height >> 2, string, color );
+	Con_DrawString(( refState.width - len ) >> 1, refState.height >> 4, string, color );
 }
 
 /*
@@ -517,14 +549,26 @@ CL_ReadDemoCmdHeader
 read the demo command
 =================
 */
-void CL_ReadDemoCmdHeader( byte *cmd, float *dt )
+static qboolean CL_ReadDemoCmdHeader( byte *cmd, float *dt )
 {
 	// read the command
-	FS_Read( cls.demofile, cmd, sizeof( byte ));
+	// HACKHACK: skip NOPs
-	Assert( *cmd >= 1 && *cmd <= dem_lastcmd );
+	do
+	{
+		FS_Read( cls.demofile, cmd, sizeof( byte ));
+	} while( *cmd == dem_unknown );
+
+	if( *cmd > dem_lastcmd )
+	{
+		Con_Printf( S_ERROR "Demo cmd %d > %d, file offset = %d\n", *cmd, dem_lastcmd, (int)FS_Tell( cls.demofile ));
+		CL_DemoCompleted();
+		return false;
+	}
 
 	// read the timestamp
 	FS_Read( cls.demofile, dt, sizeof( float ));
+
+	return true;
 }
 
 /*
@@ -535,7 +579,7 @@ read the demo usercmd for predicting
 and smooth movement during playback the demo
 =================
 */
-void CL_ReadDemoUserCmd( qboolean discard )
+static void CL_ReadDemoUserCmd( qboolean discard )
 {
 	byte	data[1024];
 	int	cmdnumber;
@@ -557,6 +601,9 @@ 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;
@@ -597,7 +644,7 @@ CL_ReadDemoSequence
 read netchan sequences
 =================
 */
-void CL_ReadDemoSequence( qboolean discard )
+static void CL_ReadDemoSequence( qboolean discard )
 {
 	int	incoming_sequence;
 	int	incoming_acknowledged;
@@ -631,15 +678,17 @@ void CL_ReadDemoSequence( qboolean discard )
 CL_DemoStartPlayback
 =================
 */
-void CL_DemoStartPlayback( int mode )
+static void CL_DemoStartPlayback( int mode )
 {
 	if( cls.changedemo )
 	{
+		int maxclients = cl.maxclients;
+
 		S_StopAllSounds( true );
 		SCR_BeginLoadingPlaque( false );
 
-		CL_ClearState ();
+		CL_ClearState( );
-		CL_InitEdicts (); // re-arrange edicts
+		CL_InitEdicts( maxclients ); // re-arrange edicts
 	}
 	else
 	{
@@ -659,7 +708,7 @@ 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 );
+	CL_SetupNetchanForProtocol( cls.legacymode );
 
 	memset( demo.cmds, 0, sizeof( demo.cmds ));
 	demo.angle_position = 1;
@@ -674,7 +723,7 @@ void CL_DemoStartPlayback( int mode )
 CL_DemoAborted
 =================
 */
-void CL_DemoAborted( void )
+static void CL_DemoAborted( void )
 {
 	if( cls.demofile )
 		FS_Close( cls.demofile );
@@ -685,7 +734,7 @@ void CL_DemoAborted( void )
 	cls.demofile = NULL;
 	cls.demonum = -1;
 
-	Cvar_SetValue( "v_dark", 0.0f );
+	Cvar_DirectSet( &v_dark, "0" );
 }
 
 /*
@@ -703,7 +752,7 @@ void CL_DemoCompleted( void )
 	if( !CL_NextDemo() && !cls.changedemo )
 		UI_SetActiveMenu( true );
 
-	Cvar_SetValue( "v_dark", 0.0f );
+	Cvar_DirectSet( &v_dark, "0" );
 }
 
 /*
@@ -714,7 +763,7 @@ returns true on success, false on failure
 g-cont. probably captain obvious mode is ON
 =================
 */
-qboolean CL_DemoMoveToNextSection( void )
+static qboolean CL_DemoMoveToNextSection( void )
 {
 	if( ++demo.entryIndex >= demo.directory.numentries )
 	{
@@ -736,7 +785,7 @@ qboolean CL_DemoMoveToNextSection( void )
 	return true;
 }
 
-qboolean CL_ReadRawNetworkData( byte *buffer, size_t *length )
+static qboolean CL_ReadRawNetworkData( byte *buffer, size_t *length )
 {
 	int	msglen = 0;
 
@@ -787,7 +836,7 @@ CL_DemoReadMessageQuake
 reads demo data and write it to client
 =================
 */
-qboolean CL_DemoReadMessageQuake( byte *buffer, size_t *length )
+static qboolean CL_DemoReadMessageQuake( byte *buffer, size_t *length )
 {
 	vec3_t		viewangles;
 	int		msglen = 0;
@@ -887,7 +936,7 @@ qboolean CL_DemoReadMessage( byte *buffer, size_t *length )
 	qboolean		swallowmessages = true;
 	static int	tdlastdemoframe = 0;
 	byte		*userbuf = NULL;
-	size_t		size;
+	size_t		size = 0;
 	byte		cmd;
 
 	if( !cls.demofile )
@@ -912,7 +961,8 @@ qboolean CL_DemoReadMessage( byte *buffer, size_t *length )
 		if( !cls.demofile ) break;
 		curpos = FS_Tell( cls.demofile );
 
-		CL_ReadDemoCmdHeader( &cmd, &demo.timestamp );
+		if( !CL_ReadDemoCmdHeader( &cmd, &demo.timestamp ))
+			return false;
 
 		fElapsedTime = CL_GetDemoPlaybackClock() - demo.starttime;
 		if( !cls.timedemo ) bSkipMessage = ((demo.timestamp - cl_serverframetime()) >= fElapsedTime) ? true : false;
@@ -1001,7 +1051,7 @@ qboolean CL_DemoReadMessage( byte *buffer, size_t *length )
 	return CL_ReadRawNetworkData( buffer, length );
 }
 
-void CL_DemoFindInterpolatedViewAngles( float t, float *frac, demoangle_t **prev, demoangle_t **next )
+static void CL_DemoFindInterpolatedViewAngles( float t, float *frac, demoangle_t **prev, demoangle_t **next )
 {
 	int	i, i0, i1, imod;
 	float	at;
@@ -1096,8 +1146,9 @@ CL_FinishTimeDemo
 show stats
 ==============
 */
-void CL_FinishTimeDemo( void )
+static void CL_FinishTimeDemo( void )
 {
+	qboolean temp = host.allow_console;
 	int	frames;
 	double	time;
 
@@ -1108,7 +1159,12 @@ void CL_FinishTimeDemo( void )
 	time = host.realtime - cls.td_starttime;
 	if( !time ) time = 1.0;
 
-	Con_Printf( "%i frames %5.3f seconds %5.3f fps\n", frames, time, frames / time );
+	host.allow_console = true;
+	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();
 }
 
 /*
@@ -1153,6 +1209,7 @@ void CL_StopPlayback( void )
 		// let game known about demo state
 		Cvar_FullSet( "cl_background", "0", FCVAR_READ_ONLY );
 		cls.state = ca_disconnected;
+		memset( &cls.serveradr, 0, sizeof( cls.serveradr ) );
 		cls.set_lastdemo = false;
 		S_StopBackgroundTrack();
 		cls.connect_time = 0;
@@ -1169,7 +1226,7 @@ void CL_StopPlayback( void )
 CL_GetDemoComment
 ==================
 */
-qboolean CL_GetDemoComment( const char *demoname, char *comment )
+int GAME_EXPORT CL_GetDemoComment( const char *demoname, char *comment )
 {
 	file_t		*demfile;
 	demoheader_t	demohdr;
@@ -1183,9 +1240,9 @@ qboolean CL_GetDemoComment( const char *demoname, char *comment )
 	demfile = FS_Open( demoname, "rb", false );
 	if( !demfile )
 	{
-		Q_strncpy( comment, "", MAX_STRING );
+		comment[0] = '\0';
 		return false;
-          }
+	}
 
 	// read in the m_DemoHeader
 	FS_Read( demfile, &demohdr, sizeof( demoheader_t ));
@@ -1197,7 +1254,9 @@ qboolean CL_GetDemoComment( const char *demoname, char *comment )
 		return false;
 	}
 
-	if( demohdr.net_protocol != PROTOCOL_VERSION || demohdr.dem_protocol != DEMO_PROTOCOL )
+	if(( demohdr.net_protocol != PROTOCOL_VERSION &&
+		demohdr.net_protocol != PROTOCOL_LEGACY_VERSION ) ||
+		demohdr.dem_protocol != DEMO_PROTOCOL )
 	{
 		FS_Close( demfile );
 		Q_strncpy( comment, "<invalid protocol>", MAX_STRING );
@@ -1224,7 +1283,7 @@ qboolean CL_GetDemoComment( const char *demoname, char *comment )
 	// split comment to sections
 	Q_strncpy( comment, demohdr.mapname, CS_SIZE );
 	Q_strncpy( comment + CS_SIZE, demohdr.comment, CS_SIZE );
-	Q_strncpy( comment + CS_SIZE * 2, va( "%g sec", playtime ), CS_TIME );
+	Q_snprintf( comment + CS_SIZE * 2, CS_TIME, "%g sec", playtime );
 
 	// all done
 	FS_Close( demfile );
@@ -1239,7 +1298,7 @@ CL_NextDemo
 Called when a demo finishes
 ==================
 */
-qboolean CL_NextDemo( void )
+static qboolean CL_NextDemo( void )
 {
 	char	str[MAX_QPATH];
 
@@ -1289,7 +1348,7 @@ void CL_CheckStartupDemos( void )
 	}
 
 	// run demos loop in background mode
-	Cvar_SetValue( "v_dark", 1.0f );
+	Cvar_DirectSet( &v_dark, "1" );
 	cls.demos_pending = false;
 	cls.demonum = 0;
 	CL_NextDemo ();
@@ -1300,26 +1359,16 @@ void CL_CheckStartupDemos( void )
 CL_DemoGetName
 ==================
 */
-static void CL_DemoGetName( int lastnum, char *filename )
+static void CL_DemoGetName( int lastnum, char *filename, size_t size )
 {
-	int	a, b, c, d;
-
 	if( lastnum < 0 || lastnum > 9999 )
 	{
 		// bound
-		Q_strcpy( filename, "demo9999" );
+		Q_strncpy( filename, "demo9999", size );
 		return;
 	}
 
-	a = lastnum / 1000;
+	Q_snprintf( filename, size, "demo%04d", lastnum );
-	lastnum -= a * 1000;
-	b = lastnum / 100;
-	lastnum -= b * 100;
-	c = lastnum / 10;
-	lastnum -= c * 10;
-	d = lastnum;
-
-	Q_sprintf( filename, "demo%i%i%i%i", a, b, c, d );
 }
 
 /*
@@ -1373,8 +1422,10 @@ void CL_Record_f( void )
 		// scan for a free filename
 		for( n = 0; n < 10000; n++ )
 		{
-			CL_DemoGetName( n, demoname );
+			CL_DemoGetName( n, demoname, sizeof( demoname ));
-			if( !FS_FileExists( va( "%s.dem", demoname ), true ))
+			Q_snprintf( demopath, sizeof( demopath ), "%s.dem", demoname );
+
+			if( !FS_FileExists( demopath, true ))
 				break;
 		}
 
@@ -1387,9 +1438,9 @@ void CL_Record_f( void )
 	else Q_strncpy( demoname, name, sizeof( demoname ));
 
 	// open the demo file
-	Q_sprintf( demopath, "%s.dem", demoname );
+	Q_snprintf( demopath, sizeof( demopath ), "%s.dem", demoname );
 
-	// make sure what old demo is removed
+	// make sure that old demo is removed
 	if( FS_FileExists( demopath, false ))
 		FS_Delete( demopath );
 
@@ -1399,6 +1450,51 @@ 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 && hdr->net_protocol != PROTOCOL_GOLDSRC_VERSION_DEMO )
+	{
+		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
@@ -1414,14 +1510,12 @@ void CL_PlayDemo_f( void )
 
 	if( Cmd_Argc() < 2 )
 	{
-		Con_Printf( S_USAGE "playdemo <demoname>\n" );
+		Con_Printf( S_USAGE "%s <demoname>\n", Cmd_Argv( 0 ));
 		return;
 	}
 
 	if( cls.demoplayback )
-	{
 		CL_StopPlayback();
-	}
 
 	if( cls.demorecording )
 	{
@@ -1461,7 +1555,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' )
 		{
@@ -1471,47 +1565,32 @@ 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
-	FS_Read( cls.demofile, &demo.header, sizeof( demoheader_t ));
+	if( !CL_ParseDemoHeader( Cmd_Argv( 0 ), filename, cls.demofile, &demo.header, &demo.directory.numentries ))
-
-	if( demo.header.id != IDEMOHEADER )
 	{
-		Con_Printf( S_ERROR "%s is not a demo file\n", demoname );
-		CL_DemoAborted();
-		return;
-	}
-
-	if( demo.header.net_protocol != PROTOCOL_VERSION || demo.header.dem_protocol != DEMO_PROTOCOL )
-	{
-		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 );
-
-		if( demo.header.net_protocol != PROTOCOL_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( demoentry_t ) * demo.directory.numentries );
+	demo.directory.entries = Mem_Malloc( cls.mempool, sizeof( *demo.directory.entries ) * demo.directory.numentries );
 
 	for( i = 0; i < demo.directory.numentries; i++ )
 	{
-		FS_Read( cls.demofile, &demo.directory.entries[i], sizeof( demoentry_t ));
+		demoentry_t *entry = &demo.directory.entries[i];
+
+		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;
@@ -1521,6 +1600,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 ));
 
@@ -1536,12 +1618,6 @@ timedemo <demoname>
 */
 void CL_TimeDemo_f( void )
 {
-	if( Cmd_Argc() != 2 )
-	{
-		Con_Printf( S_USAGE "timedemo <demoname>\n" );
-		return;
-	}
-
 	CL_PlayDemo_f ();
 
 	// cls.td_starttime will be grabbed at the second frame of the demo, so
@@ -1570,7 +1646,7 @@ void CL_StartDemos_f( void )
 	c = Cmd_Argc() - 1;
 	if( c > MAX_DEMOS )
 	{
-		Con_DPrintf( S_WARN "Host_StartDemos: max %i demos in demoloop\n", MAX_DEMOS );
+		Con_DPrintf( S_WARN "%s: max %i demos in demoloop\n", __func__, MAX_DEMOS );
 		c = MAX_DEMOS;
 	}
 
@@ -1628,3 +1704,78 @@ 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

@@ -14,11 +14,11 @@ GNU General Public License for more details.
 */
 
 #include "common.h"
-#include "client.h"
-#include "gl_local.h"
-#include "mod_local.h"
 #include "entity_types.h"
 #include "studio.h"
+#include "world.h" // BOX_ON_PLANE_SIDE
+#include "client.h"
+#include "xash3d_mathlib.h"
 
 /*
 ===============================================================================
@@ -28,49 +28,50 @@ 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;
+}
 
 /*
-================
+==============
-R_RemoveEfrags
+CL_ClearEfrags
-
+==============
-Call when removing an object from the world or moving it to another position
-================
 */
-void R_RemoveEfrags( cl_entity_t *ent )
+void CL_ClearEfrags( void )
 {
-	efrag_t	*ef, *old, *walk, **prev;
+	cl_efrags_num = 0;
-	
+	cl_efrags = NULL;
-	ef = ent->efrag;
-	
-	while( ef )
-	{
-		prev = &ef->leaf->efrags;
-		while( 1 )
-		{
-			walk = *prev;
-			if( !walk ) break;
-
-			if( walk == ef )
-			{	
-				// remove this fragment
-				*prev = ef->leafnext;
-				break;
-			}
-			else prev = &walk->leafnext;
-		}
-				
-		old = ef;
-		ef = ef->entnext;
-		
-		// put it on the free list
-		old->entnext = clgame.free_efrags;
-		clgame.free_efrags = old;
-	}
-	ent->efrag = NULL; 
 }
 
 /*
@@ -96,14 +97,11 @@ static void R_SplitEntityOnNode( mnode_t *node )
 		leaf = (mleaf_t *)node;
 
 		// grab an efrag off the free list
-		ef = clgame.free_efrags;
+		ef = cl_efrags;
 		if( !ef )
-		{
+			ef = CL_AllocEfrags( NUM_EFRAGS_ALLOC );
-			Con_Printf( S_ERROR "too many efrags!\n" );
-			return; // no free fragments...
-		}
 
-		clgame.free_efrags = clgame.free_efrags->entnext;
+		cl_efrags = ef->entnext;
 		ef->entity = r_addent;
 
 		// add the entity link
@@ -173,37 +171,29 @@ R_StoreEfrags
 */
 void R_StoreEfrags( efrag_t **ppefrag, int framecount )
 {
-	cl_entity_t	*pent;
+	efrag_t *pefrag;
-	model_t		*clmodel;
+	cl_entity_t *pent;
-	efrag_t		*pefrag;
+	model_t *clmodel;
 
 	while(( pefrag = *ppefrag ) != NULL )
 	{
 		pent = pefrag->entity;
 		clmodel = pent->model;
 
-		switch( clmodel->type )
+		// how this could happen?
+		if( unlikely( clmodel->type < mod_brush || clmodel->type > mod_studio ))
+			continue;
+
+		if( pent->visframe != framecount )
 		{
-		case mod_alias:
+			if( CL_AddVisibleEntity( pent, ET_FRAGMENTED ))
-		case mod_brush:
-		case mod_studio:
-		case mod_sprite:
-			pent = pefrag->entity;
-
-			if( pent->visframe != framecount )
 			{
-				if( CL_AddVisibleEntity( pent, ET_FRAGMENTED ))
+				// mark that we've recorded this entity for this frame
-				{
+				pent->curstate.messagenum = cl.parsecount;
-					// mark that we've recorded this entity for this frame
+				pent->visframe = framecount;
-					pent->curstate.messagenum = cl.parsecount;
-					pent->visframe = framecount;
-				}
 			}
-
-			ppefrag = &pefrag->leafnext;
-			break;
-		default:	
-			break;
 		}
+
+		ppefrag = &pefrag->leafnext;
 	}
 }

engine/client/cl_events.c

@@ -40,7 +40,7 @@ CL_CalcPlayerVelocity
 compute velocity for a given client
 =============
 */
-void CL_CalcPlayerVelocity( int idx, vec3_t velocity )
+static void CL_CalcPlayerVelocity( int idx, vec3_t velocity )
 {
 	clientdata_t	*pcd;
 	vec3_t		delta;
@@ -63,7 +63,7 @@ void CL_CalcPlayerVelocity( int idx, vec3_t velocity )
 		if( dt != 0.0 )
 		{
 			VectorSubtract( clgame.entities[idx].curstate.velocity, clgame.entities[idx].prevstate.velocity, delta );
-			VectorScale( delta, 1.0 / dt, velocity );
+			VectorScale( delta, 1.0f / dt, velocity );
 		}
 		else
 		{
@@ -78,23 +78,48 @@ CL_DescribeEvent
 
 =============
 */
-void CL_DescribeEvent( int slot, int flags, const char *eventname )
+static void CL_DescribeEvent( event_info_t *ei, int slot )
 {
-	int		idx = (slot & 31);
+	int		idx = (slot & 63) * 2;
 	con_nprint_t	info;
+	string origin_str = { 0 }; //, angles_str = { 0 };
 
-	if( !eventname || !cl_showevents->value )
+	if( !cl_showevents.value )
 		return;
 
-	// mark reliable as green and unreliable as red
+	info.time_to_live = 1.0f;
-	if( FBitSet( flags, FEV_RELIABLE ))
-		VectorSet( info.color, 0.0f, 1.0f, 0.0f );
-	else VectorSet( info.color, 1.0f, 0.0f, 0.0f );
-
-	info.time_to_live = 0.5f;
 	info.index = idx;
 
-	Con_NXPrintf( &info, "%i %f %s", slot, cl.time, eventname );
+	// mark reliable as green and unreliable as red
+	if( FBitSet( ei->flags, FEV_RELIABLE ))
+		VectorSet( info.color, 0.5f, 1.0f, 0.5f );
+	else VectorSet( info.color, 1.0f, 0.5f, 0.5f );
+
+	if( !VectorIsNull( ei->args.origin ))
+	{
+		Q_snprintf( origin_str, sizeof( origin_str ), "(%.2f,%.2f,%.2f)",
+			ei->args.origin[0], ei->args.origin[1], ei->args.origin[2]);
+	}
+
+	/*if( !VectorIsNull( ei->args.angles ))
+	{
+		Q_snprintf( angles_str, sizeof( angles_str ), "ang %.2f %.2f %.2f",
+			ei->args.angles[0], ei->args.angles[1], ei->args.angles[2]);
+	}*/
+
+	Con_NXPrintf( &info, "%i %.2f %c %s %s",
+		slot, cl.time,
+		(FBitSet( ei->flags, FEV_CLIENT ) ? 'c' :
+		FBitSet( ei->flags, FEV_SERVER ) ? 's' : '?'),
+		cl.event_precache[ei->index],
+		origin_str);
+
+	info.index++;
+
+	Con_NXPrintf( &info, "b(%i,%i) i(%i,%i) f(%.2f,%.2f)",
+		ei->args.bparam1, ei->args.bparam2,
+		ei->args.iparam1, ei->args.iparam2,
+		ei->args.fparam1, ei->args.fparam2);
 }
 
 /*
@@ -133,7 +158,7 @@ CL_EventIndex
 */
 word CL_EventIndex( const char *name )
 {
-	int	i;
+	word	i;
 
 	if( !COM_CheckString( name ))
 		return 0;
@@ -167,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, MAX_QPATH );
+	Q_strncpy( ev->name, szEvName, sizeof( ev->name ));
 	ev->func = func;
 }
 
@@ -177,7 +202,7 @@ CL_FireEvent
 
 =============
 */
-qboolean CL_FireEvent( event_info_t *ei, int slot )
+static qboolean CL_FireEvent( event_info_t *ei, int slot )
 {
 	cl_user_event_t	*ev;
 	const char	*name;
@@ -194,21 +219,32 @@ qboolean CL_FireEvent( event_info_t *ei, int slot )
 		if( !ev )
 		{
 			idx = bound( 1, ei->index, ( MAX_EVENTS - 1 ));
-			Con_Reportf( S_ERROR "CL_FireEvent: %s not precached\n", cl.event_precache[idx] );
+			Con_Reportf( S_ERROR "%s: %s not precached\n", __func__, 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( slot, ei->flags, cl.event_precache[ei->index] );
+				CL_DescribeEvent( ei, slot );
 				ev->func( &ei->args );
 				return true;
 			}
 
-			name = cl.event_precache[ei->index];
+			Con_Reportf( S_ERROR "%s: %s not hooked\n", __func__, name );
-			Con_Reportf( S_ERROR "CL_FireEvent: %s not hooked\n", name );
 			break;
 		}
 	}
@@ -256,7 +292,7 @@ CL_FindEvent
 find first empty event
 =============
 */
-event_info_t *CL_FindEmptyEvent( void )
+static event_info_t *CL_FindEmptyEvent( void )
 {
 	int		i;
 	event_state_t	*es;
@@ -284,7 +320,7 @@ CL_FindEvent
 replace only unreliable events
 =============
 */
-event_info_t *CL_FindUnreliableEvent( void )
+static event_info_t *CL_FindUnreliableEvent( void )
 {
 	event_state_t	*es;
 	event_info_t	*ei;
@@ -314,7 +350,7 @@ CL_QueueEvent
 
 =============
 */
-void CL_QueueEvent( int flags, int index, float delay, event_args_t *args )
+static void CL_QueueEvent( int flags, int index, float delay, event_args_t *args )
 {
 	event_info_t	*ei;
 
@@ -344,7 +380,7 @@ CL_ParseReliableEvent
 
 =============
 */
-void CL_ParseReliableEvent( sizebuf_t *msg )
+void CL_ParseReliableEvent( sizebuf_t *msg, connprotocol_t proto )
 {
 	int		event_index;
 	event_args_t	nullargs, args;
@@ -354,11 +390,19 @@ void CL_ParseReliableEvent( sizebuf_t *msg )
 
 	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
-	MSG_ReadDeltaEvent( msg, &nullargs, &args );
+	if( proto == PROTO_GOLDSRC )
+	{
+		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;
@@ -373,33 +417,42 @@ CL_ParseEvent
 
 =============
 */
-void CL_ParseEvent( sizebuf_t *msg )
+void CL_ParseEvent( sizebuf_t *msg, connprotocol_t proto )
 {
 	int		event_index;
 	int		i, num_events;
 	int		packet_index;
-	event_args_t	nullargs, args;
+	const event_args_t nullargs = { 0 };
+	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, MAX_ENTITY_BITS );
-		else packet_index = -1;
-
 		if( MSG_ReadOneBit( msg ))
 		{
-			MSG_ReadDeltaEvent( msg, &nullargs, &args );
+			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 ))
 			delay = (float)MSG_ReadWord( msg ) * (1.0f / 100.0f);
@@ -450,7 +503,7 @@ CL_PlaybackEvent
 
 =============
 */
-void CL_PlaybackEvent( int flags, const edict_t *pInvoker, word eventindex, float delay, float *origin,
+void GAME_EXPORT CL_PlaybackEvent( int flags, const edict_t *pInvoker, word eventindex, float delay, float *origin,
 	float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2 )
 {
 	event_args_t	args;
@@ -459,16 +512,16 @@ void CL_PlaybackEvent( int flags, const edict_t *pInvoker, word eventindex, floa
 		return;
 
 	// first check event for out of bounds
-	if( eventindex < 1 || eventindex > MAX_EVENTS )
+	if( eventindex < 1 || eventindex >= MAX_EVENTS )
 	{
-		Con_DPrintf( S_ERROR "CL_PlaybackEvent: invalid eventindex %i\n", eventindex );
+		Con_DPrintf( S_ERROR "%s: invalid eventindex %i\n", __func__, eventindex );
 		return;
 	}
 
 	// check event for precached
 	if( !CL_EventIndex( cl.event_precache[eventindex] ))
 	{
-		Con_DPrintf( S_ERROR "CL_PlaybackEvent: event %i was not precached\n", eventindex );
+		Con_DPrintf( S_ERROR "%s: event %i was not precached\n", __func__, eventindex );
 		return;
 	}
 

engine/client/cl_font.c

@@ -0,0 +1,377 @@
+/*
+cl_font.c - bare bones engine font manager
+Copyright (C) 2023 Alibek Omarov
+
+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 "filesystem.h"
+#include "client.h"
+#include "qfont.h"
+
+qboolean CL_FixedFont( cl_font_t *font )
+{
+	return font && font->valid && font->type == FONT_FIXED;
+}
+
+static int CL_LoadFontTexture( const char *fontname, uint texFlags, int *width )
+{
+	int font_width;
+	int tex;
+
+	if( !g_fsapi.FileExists( fontname, false ))
+		return 0;
+
+	tex = ref.dllFuncs.GL_LoadTexture( fontname, NULL, 0, texFlags );
+	if( !tex )
+		return 0;
+
+	font_width = REF_GET_PARM( PARM_TEX_WIDTH, tex );
+	if( !font_width )
+	{
+		ref.dllFuncs.GL_FreeTexture( tex );
+		return 0;
+	}
+
+	*width = font_width;
+	return tex;
+}
+
+static int CL_FontRenderMode( convar_t *fontrender )
+{
+	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
+
+	font->hFontTexture = CL_LoadFontTexture( fontname, texFlags, &font_width );
+	if( !font->hFontTexture )
+		return false;
+
+	font->type = FONT_FIXED;
+	font->valid = true;
+	font->scale = scale;
+	font->rendermode = rendermode;
+	font->charHeight = Q_rint( font_width / 16 * scale );
+
+	for( i = 0; i < ARRAYSIZE( font->fontRc ); i++ )
+	{
+		font->fontRc[i].left   = ( i * font_width / 16 ) % font_width;
+		font->fontRc[i].right  = font->fontRc[i].left + font_width / 16;
+		font->fontRc[i].top    = ( i / 16 ) * ( font_width / 16 );
+		font->fontRc[i].bottom = font->fontRc[i].top + font_width / 16;
+
+		font->charWidths[i] = Q_rint( font_width / 16 * scale );
+	}
+
+	return true;
+}
+
+qboolean Con_LoadVariableWidthFont( const char *fontname, cl_font_t *font, float scale, convar_t *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;
+
+	pfile = g_fsapi.LoadFile( fontname, &length, false );
+	if( !pfile )
+		return false;
+
+	if( length < sizeof( src ))
+	{
+		Mem_Free( pfile );
+		return false;
+	}
+
+	memcpy( &src, pfile, sizeof( src ));
+	Mem_Free( pfile );
+
+	font->hFontTexture = CL_LoadFontTexture( fontname, texFlags, &font_width );
+	if( !font->hFontTexture )
+		return false;
+
+	font->type = FONT_VARIABLE;
+	font->valid = true;
+	font->scale = scale ? scale : 1.0f;
+	font->rendermode = rendermode;
+	font->charHeight = Q_rint( src.rowheight * scale );
+
+	for( i = 0; i < ARRAYSIZE( font->fontRc ); i++ )
+	{
+		const charinfo *ci = &src.fontinfo[i];
+
+		font->fontRc[i].left   = (word)ci->startoffset % font_width;
+		font->fontRc[i].right  = font->fontRc[i].left + ci->charwidth;
+		font->fontRc[i].top    = (word)ci->startoffset / font_width;
+		font->fontRc[i].bottom = font->fontRc[i].top + src.rowheight;
+
+		font->charWidths[i] = Q_rint( src.fontinfo[i].charwidth * scale );
+	}
+
+	return true;
+}
+
+void CL_FreeFont( cl_font_t *font )
+{
+	if( !font || !font->valid )
+		return;
+
+	ref.dllFuncs.GL_FreeTexture( font->hFontTexture );
+	memset( font, 0, sizeof( *font ));
+}
+
+static int CL_CalcTabStop( const cl_font_t *font, int x )
+{
+	int space = font->charWidths[' '];
+	int tab   = space * 6; // 6 spaces
+	int stop  = tab - x % tab;
+
+	if( stop < space )
+		return tab * 2 - x % tab; // select next
+
+	return stop;
+}
+
+int CL_DrawCharacter( float x, float y, int number, rgba_t color, cl_font_t *font, int flags )
+{
+	wrect_t *rc;
+	float w, h;
+	float s1, t1, s2, t2, half = 0.5f;
+	int texw, texh;
+
+	if( !font || !font->valid || y < -font->charHeight )
+		return 0;
+
+	// check if printable
+	if( number <= 32 )
+	{
+		if( number == ' ' )
+			return font->charWidths[' '];
+		else if( number == '\t' )
+			return CL_CalcTabStop( font, x );
+		return 0;
+	}
+
+	if( FBitSet( flags, FONT_DRAW_UTF8 ))
+		number = Con_UtfProcessChar( number & 255 );
+	else number &= 255;
+
+	if( !number || !font->charWidths[number])
+		return 0;
+
+	R_GetTextureParms( &texw, &texh, font->hFontTexture );
+	if( !texw || !texh )
+		return font->charWidths[number];
+
+	rc = &font->fontRc[number];
+
+	if( font->scale <= 1.f || !REF_GET_PARM( PARM_TEX_FILTERING, font->hFontTexture ))
+		half = 0;
+
+	s1 = ((float)rc->left + half ) / texw;
+	t1 = ((float)rc->top + half ) / texh;
+	s2 = ((float)rc->right - half ) / texw;
+	t2 = ((float)rc->bottom - half ) / texh;
+	w = ( rc->right - rc->left ) * font->scale;
+	h = ( rc->bottom - rc->top ) * font->scale;
+
+	if( FBitSet( flags, FONT_DRAW_HUD ))
+		SPR_AdjustSize( &x, &y, &w, &h );
+
+	if( !FBitSet( flags, FONT_DRAW_NORENDERMODE ))
+		CL_SetFontRendermode( font );
+
+	// 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
+		ref.dllFuncs.Color4ub( color[0], color[1], color[2], color[3] );
+	else ref.dllFuncs.Color4ub( 255, 255, 255, color[3] );
+	ref.dllFuncs.R_DrawStretchPic( x, y, w, h, s1, t1, s2, t2, font->hFontTexture );
+
+	return font->charWidths[number];
+}
+
+int CL_DrawString( float x, float y, const char *s, rgba_t color, cl_font_t *font, int flags )
+{
+	rgba_t current_color;
+	int draw_len = 0;
+
+	if( !font || !font->valid )
+		return 0;
+
+	if( FBitSet( flags, FONT_DRAW_UTF8 ))
+		Con_UtfProcessChar( 0 ); // clear utf state
+
+	if( !FBitSet( flags, FONT_DRAW_NORENDERMODE ))
+		CL_SetFontRendermode( font );
+
+	Vector4Copy( color, current_color );
+
+	while( *s )
+	{
+		if( *s == '\n' )
+		{
+			s++;
+
+			if( !*s )
+				break;
+
+			// some client functions ignore newlines
+			if( !FBitSet( flags, FONT_DRAW_NOLF ))
+			{
+				draw_len = 0;
+				y += font->charHeight;
+			}
+
+			if( FBitSet( flags, FONT_DRAW_RESETCOLORONLF ))
+				 Vector4Copy( color, current_color );
+			continue;
+		}
+
+		if( IsColorString( s ))
+		{
+			// don't copy alpha
+			if( !FBitSet( flags, FONT_DRAW_FORCECOL ))
+				VectorCopy( g_color_table[ColorIndex(*( s + 1 ))], current_color );
+
+			s += 2;
+			continue;
+		}
+
+		// skip setting rendermode, it was changed for this string already
+		draw_len += CL_DrawCharacter( x + draw_len, y, (byte)*s, current_color, font, flags | FONT_DRAW_NORENDERMODE );
+
+		s++;
+	}
+
+	return draw_len;
+}
+
+int CL_DrawStringf( cl_font_t *font, float x, float y, rgba_t color, int flags, const char *fmt, ... )
+{
+	va_list va;
+	char buf[MAX_VA_STRING];
+
+	va_start( va, fmt );
+	Q_vsnprintf( buf, sizeof( buf ), fmt, va );
+	va_end( va );
+
+	return CL_DrawString( x, y, buf, color, font, flags );
+}
+
+void CL_DrawCharacterLen( cl_font_t *font, int number, int *width, int *height )
+{
+	if( !font || !font->valid ) return;
+	if( width )
+	{
+		if( number == '\t' )
+			*width = CL_CalcTabStop( font, 0 ); // at least return max tabstop
+		else *width = font->charWidths[number & 255];
+	}
+	if( height ) *height = font->charHeight;
+}
+
+void CL_DrawStringLen( cl_font_t *font, const char *s, int *width, int *height, int flags )
+{
+	int draw_len = 0;
+
+	if( !font || !font->valid )
+		return;
+
+	if( height )
+		*height = font->charHeight;
+
+	if( width )
+		*width = 0;
+
+	if( !COM_CheckString( s ))
+		return;
+
+	if( FBitSet( flags, FONT_DRAW_UTF8 ))
+		Con_UtfProcessChar( 0 ); // reset utf state
+
+	while( *s )
+	{
+		int number;
+
+		if( *s == '\n' )
+		{
+			// BUG: no check for end string here
+			// but high chances somebody's relying on this
+			s++;
+			draw_len = 0;
+			if( !FBitSet( flags, FONT_DRAW_NOLF ))
+			{
+				if( height )
+					*height += font->charHeight;
+			}
+			continue;
+		}
+		else if( *s == '\t' )
+		{
+			draw_len += CL_CalcTabStop( font, 0 ); // at least return max tabstop
+			s++;
+			continue;
+		}
+
+		if( IsColorString( s ))
+		{
+			s += 2;
+			continue;
+		}
+
+		if( FBitSet( flags, FONT_DRAW_UTF8 ))
+			number = Con_UtfProcessChar( (byte)*s );
+		else number = (byte)*s;
+
+		if( number )
+		{
+			draw_len += font->charWidths[number];
+
+			if( draw_len > *width )
+				*width = draw_len;
+		}
+
+		s++;
+	}
+}

engine/client/cl_frame.c

@@ -17,7 +17,6 @@ GNU General Public License for more details.
 #include "client.h"
 #include "net_encode.h"
 #include "entity_types.h"
-#include "gl_local.h"
 #include "pm_local.h"
 #include "cl_tent.h"
 #include "studio.h"
@@ -25,7 +24,7 @@ GNU General Public License for more details.
 #include "sound.h"
 #include "input.h"
 
-#define STUDIO_INTERPOLATION_FIX
+// #define STUDIO_INTERPOLATION_FIX
 
 /*
 ==================
@@ -53,16 +52,30 @@ CL_UpdatePositions
 Store another position into interpolation circular buffer
 ==================
 */
-void CL_UpdatePositions( cl_entity_t *ent )
+static void CL_UpdatePositions( cl_entity_t *ent )
 {
-	position_history_t	*ph;
+	position_history_t	*ph, *prev;
+
+	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;	// !!!
+
+	ph->animtime = ent->curstate.animtime;
+
+	// a1ba: for some reason, this sometimes still may happen
+	// at this time, I'm not sure whether this bug happens in delta readwrite code
+	// 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;
+	}
 }
 
 /*
@@ -72,7 +85,7 @@ CL_ResetPositions
 Interpolation init or reset after teleporting
 ==================
 */
-void CL_ResetPositions( cl_entity_t *ent )
+static void CL_ResetPositions( cl_entity_t *ent )
 {
 	position_history_t	store;
 
@@ -82,8 +95,7 @@ void CL_ResetPositions( cl_entity_t *ent )
 	ent->current_position = 1;
 
 	memset( ent->ph, 0, sizeof( position_history_t ) * HISTORY_MAX );
-	memcpy( &ent->ph[1], &store, sizeof( position_history_t ));
+	ent->ph[1] = ent->ph[0] = store;
-	memcpy( &ent->ph[0], &store, sizeof( position_history_t ));
 }
 
 /*
@@ -94,7 +106,7 @@ check for instant movement in case
 we don't want interpolate this
 ==================
 */
-qboolean CL_EntityTeleported( cl_entity_t *ent )
+static qboolean CL_EntityTeleported( cl_entity_t *ent )
 {
 	float	len, maxlen;
 	vec3_t	delta;
@@ -102,7 +114,7 @@ qboolean CL_EntityTeleported( cl_entity_t *ent )
 	VectorSubtract( ent->curstate.origin, ent->prevstate.origin, delta );
 
 	// compute potential max movement in units per frame and compare with entity movement
-	maxlen = ( clgame.movevars.maxvelocity * ( 1.0 / GAME_FPS ));
+	maxlen = ( clgame.movevars.maxvelocity * ( 1.0f / GAME_FPS ));
 	len = VectorLength( delta );
 
 	return (len > maxlen);
@@ -115,7 +127,7 @@ CL_CompareTimestamps
 round-off floating errors
 ==================
 */
-qboolean CL_CompareTimestamps( float t1, float t2 )
+static qboolean CL_CompareTimestamps( float t1, float t2 )
 {
 	int	iTime1 = t1 * 1000;
 	int	iTime2 = t2 * 1000;
@@ -130,8 +142,11 @@ CL_EntityIgnoreLerp
 some ents will be ignore lerping
 ==================
 */
-qboolean CL_EntityIgnoreLerp( cl_entity_t *e )
+static qboolean CL_EntityIgnoreLerp( cl_entity_t *e )
 {
+	if( cl_nointerp.value > 0.f )
+		return true;
+
 	if( e->model && e->model->type == mod_alias )
 		return false;
 
@@ -144,7 +159,7 @@ CL_EntityCustomLerp
 
 ==================
 */
-qboolean CL_EntityCustomLerp( cl_entity_t *e )
+static qboolean CL_EntityCustomLerp( cl_entity_t *e )
 {
 	switch( e->curstate.movetype )
 	{
@@ -154,6 +169,13 @@ 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;
@@ -166,7 +188,7 @@ CL_ParametricMove
 check for parametrical moved entities
 ==================
 */
-qboolean CL_ParametricMove( cl_entity_t *ent )
+static qboolean CL_ParametricMove( cl_entity_t *ent )
 {
 	float	frac, dt, t;
 	vec3_t	delta;
@@ -203,7 +225,7 @@ CL_UpdateLatchedVars
 
 ====================
 */
-void CL_UpdateLatchedVars( cl_entity_t *ent )
+static 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
@@ -217,7 +239,7 @@ void CL_UpdateLatchedVars( cl_entity_t *ent )
 
 	if( ent->curstate.sequence != ent->prevstate.sequence )
 	{
-		memcpy( ent->prevstate.blending, ent->latched.prevseqblending, sizeof( ent->prevstate.blending ));
+		memcpy( ent->latched.prevseqblending, ent->prevstate.blending, sizeof( ent->latched.prevseqblending ));
 		ent->latched.prevsequence = ent->prevstate.sequence;
 		ent->latched.sequencetime = ent->curstate.animtime;
 	}
@@ -230,6 +252,33 @@ void CL_UpdateLatchedVars( cl_entity_t *ent )
 		clgame.drawFuncs.CL_UpdateLatchedVars( ent, false );
 }
 
+/*
+====================
+CL_GetStudioEstimatedFrame
+
+====================
+*/
+static float CL_GetStudioEstimatedFrame( cl_entity_t *ent )
+{
+	studiohdr_t	*pstudiohdr;
+	mstudioseqdesc_t	*pseqdesc;
+	int		sequence;
+
+	if( ent->model != NULL && ent->model->type == mod_studio )
+	{
+		pstudiohdr = (studiohdr_t *)Mod_StudioExtradata( ent->model );
+
+		if( pstudiohdr )
+		{
+			sequence = bound( 0, ent->curstate.sequence, pstudiohdr->numseq - 1 );
+			pseqdesc = (mstudioseqdesc_t *)((byte *)pstudiohdr + pstudiohdr->seqindex) + sequence;
+			return ref.dllFuncs.R_StudioEstimateFrame( ent, pseqdesc, cl.time );
+		}
+	}
+
+	return 0;
+}
+
 /*
 ====================
 CL_ResetLatchedVars
@@ -271,7 +320,7 @@ CL_ProcessEntityUpdate
 apply changes since new frame received
 ==================
 */
-void CL_ProcessEntityUpdate( cl_entity_t *ent )
+static void CL_ProcessEntityUpdate( cl_entity_t *ent )
 {
 	qboolean	parametric;
 
@@ -281,7 +330,7 @@ void CL_ProcessEntityUpdate( cl_entity_t *ent )
 	if( FBitSet( ent->curstate.entityType, ENTITY_NORMAL ))
 		COM_NormalizeAngles( ent->curstate.angles );
 
-	parametric = CL_ParametricMove( ent );
+	parametric = ent->curstate.starttime != 0.0f && ent->curstate.impacttime != 0.0f;
 
 	// allow interpolation on bmodels too
 	if( ent->model && ent->model->type == mod_brush )
@@ -317,11 +366,10 @@ CL_FindInterpolationUpdates
 find two timestamps
 ==================
 */
-qboolean CL_FindInterpolationUpdates( cl_entity_t *ent, float targettime, position_history_t **ph0, position_history_t **ph1 )
+static qboolean CL_FindInterpolationUpdates( cl_entity_t *ent, double targettime, position_history_t **ph0, position_history_t **ph1 )
 {
 	qboolean	extrapolate = true;
-	int	i, i0, i1, imod;
+	uint		i, i0, i1, imod;
-	float	at;
 
 	imod = ent->current_position;
 	i0 = (imod - 0) & HISTORY_MASK;	// curpos (lerp end)
@@ -329,8 +377,10 @@ qboolean CL_FindInterpolationUpdates( cl_entity_t *ent, float targettime, positi
 
 	for( i = 1; i < HISTORY_MAX - 1; i++ )
 	{
-		at = ent->ph[( imod - i ) & HISTORY_MASK].animtime;
+		double at = ent->ph[( imod - i ) & HISTORY_MASK].animtime;
-		if( at == 0.0 ) break;
+
+		if( at == 0.0f )
+			break;
 
 		if( targettime > at )
 		{
@@ -355,15 +405,14 @@ CL_PureOrigin
 non-local players interpolation
 ==================
 */
-void CL_PureOrigin( cl_entity_t *ent, float t, vec3_t outorigin, vec3_t outangles )
+static void CL_PureOrigin( cl_entity_t *ent, double t, vec3_t outorigin, vec3_t outangles )
 {
-	qboolean		extrapolate;
+	double		t1, t0, frac;
-	float		t1, t0, frac;
 	position_history_t	*ph0, *ph1;
 	vec3_t		delta;
 
 	// NOTE: ph0 is next, ph1 is a prev
-	extrapolate = CL_FindInterpolationUpdates( ent, t, &ph0, &ph1 );
+	CL_FindInterpolationUpdates( ent, t, &ph0, &ph1 );
 
 	if ( !ph0 || !ph1 )
 		return;
@@ -371,17 +420,17 @@ void CL_PureOrigin( cl_entity_t *ent, float t, vec3_t outorigin, vec3_t outangle
 	t0 = ph0->animtime;
 	t1 = ph1->animtime;
 
-	if( t0 != 0.0f )
+	if( t0 != 0.0 )
 	{
 		vec4_t	q, q1, q2;
 
 		VectorSubtract( ph0->origin, ph1->origin, delta );
 
-		if( t0 != t1 )
+		if( !Q_equal( t0, t1 ))
 			frac = ( t - t1 ) / ( t0 - t1 );
-		else frac = 1.0f;
+		else frac = 1.0;
 
-		frac = bound( 0.0f, frac, 1.2f );
+		frac = bound( 0.0, frac, 1.2 );
 
 		VectorMA( ph1->origin, frac, delta, outorigin );
 
@@ -405,11 +454,11 @@ CL_InterpolateModel
 non-players interpolation
 ==================
 */
-int CL_InterpolateModel( cl_entity_t *e )
+static int CL_InterpolateModel( cl_entity_t *e )
 {
 	position_history_t  *ph0 = NULL, *ph1 = NULL;
 	vec3_t		origin, angles, delta;
-	float		t, t1, t2, frac;
+	double		t, t1, t2, frac;
 	vec4_t		q, q1, q2;
 
 	VectorCopy( e->curstate.origin, e->origin );
@@ -432,13 +481,13 @@ 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 )
@@ -457,7 +506,7 @@ int CL_InterpolateModel( cl_entity_t *e )
 		return 0;
 	}
 
-	if( t2 == t1 )
+	if( Q_equal( t2, t1 ))
 	{
 		VectorCopy( ph0->origin, e->origin );
 		VectorCopy( ph0->angles, e->angles );
@@ -495,14 +544,21 @@ interpolate non-local clients
 */
 void CL_ComputePlayerOrigin( cl_entity_t *ent )
 {
-	float	targettime;
+	double	targettime;
 	vec4_t	q, q1, q2;
 	vec3_t	origin;
 	vec3_t	angles;
 
-	if( !ent->player || ent->index == ( cl.playernum + 1 ))
+	if( !ent->player )
 		return;
 
+	if( cl_nointerp.value > 0.f )
+	{
+		VectorCopy( ent->curstate.angles, ent->angles );
+		VectorCopy( ent->curstate.origin, ent->origin );
+		return;
+	}
+
 	if( cls.demoplayback == DEMO_QUAKE1 )
 	{
 		// quake lerping is easy
@@ -514,7 +570,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 );
@@ -528,7 +584,7 @@ CL_ProcessPlayerState
 process player states after the new packet has received
 =================
 */
-void CL_ProcessPlayerState( int playerindex, entity_state_t *state )
+static void CL_ProcessPlayerState( int playerindex, entity_state_t *state )
 {
 	entity_state_t	*ps;
 
@@ -548,7 +604,7 @@ reset latched state if this frame entity was teleported
 or just EF_NOINTERP was set
 =================
 */
-void CL_ResetLatchedState( int pnum, frame_t *frame, cl_entity_t *ent )
+static void CL_ResetLatchedState( int pnum, frame_t *frame, cl_entity_t *ent )
 {
 	if( CHECKVISBIT( frame->flags, pnum ))
 	{
@@ -613,6 +669,24 @@ FRAME PARSING
 
 =========================================================================
 */
+static qboolean CL_ParseEntityNumFromPacket( sizebuf_t *msg, int *newnum, connprotocol_t proto )
+{
+	if( proto == PROTO_LEGACY )
+	{
+		*newnum = MSG_ReadWord( msg );
+		if( *newnum == 0 )
+			return false;
+	}
+	else
+	{
+		*newnum = MSG_ReadUBitLong( msg, MAX_ENTITY_BITS );
+		if( *newnum == LAST_EDICT )
+			return false;
+	}
+
+	return true;
+}
+
 /*
 =================
 CL_FlushEntityPacket
@@ -620,7 +694,7 @@ CL_FlushEntityPacket
 Read and ignore whole entity packet.
 =================
 */
-void CL_FlushEntityPacket( sizebuf_t *msg )
+static void CL_FlushEntityPacket( sizebuf_t *msg, connprotocol_t proto )
 {
 	int		newnum;
 	entity_state_t	from, to;
@@ -633,16 +707,57 @@ void CL_FlushEntityPacket( sizebuf_t *msg )
 	// read it all, but ignore it
 	while( 1 )
 	{
-		newnum = MSG_ReadUBitLong( msg, MAX_ENTITY_BITS );
+		if( !CL_ParseEntityNumFromPacket( msg, &newnum, proto ))
-		if( newnum == LAST_EDICT ) break; // done
+			break; // done
 
 		if( MSG_CheckOverflow( msg ))
-			Host_Error( "CL_FlushEntityPacket: overflow\n" );
+			Host_Error( "%s: overflow\n", __func__ );
 
 		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
@@ -650,7 +765,7 @@ CL_DeltaEntity
 processing delta update
 =================
 */
-void CL_DeltaEntity( sizebuf_t *msg, frame_t *frame, int newnum, entity_state_t *old, qboolean has_update )
+static 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;
@@ -665,7 +780,7 @@ void CL_DeltaEntity( sizebuf_t *msg, frame_t *frame, int newnum, entity_state_t
 
 	if(( newnum < 0 ) || ( newnum >= clgame.maxEntities ))
 	{
-		Con_DPrintf( S_ERROR "CL_DeltaEntity: invalid newnum: %d\n", newnum );
+		Con_DPrintf( S_ERROR "%s: invalid newnum: %d\n", __func__, newnum );
 		if( has_update )
 			MSG_ReadDeltaEntity( msg, old, state, newnum, delta_type, cl.mtime[0] );
 		return;
@@ -677,7 +792,7 @@ void CL_DeltaEntity( sizebuf_t *msg, frame_t *frame, int newnum, entity_state_t
 
 	if( has_update )
 		alive = MSG_ReadDeltaEntity( msg, old, state, newnum, delta_type, cl.mtime[0] );
-	else memcpy( state, old, sizeof( entity_state_t ));
+	else *state = *old;
 
 	if( !alive )
 	{
@@ -713,7 +828,7 @@ An svc_packetentities has just been parsed, deal with the
 rest of the data stream.
 ==================
 */
-int CL_ParsePacketEntities( sizebuf_t *msg, qboolean delta )
+int CL_ParsePacketEntities( sizebuf_t *msg, qboolean delta, connprotocol_t proto )
 {
 	frame_t		*newframe, *oldframe;
 	int		oldindex, newnum, oldnum;
@@ -729,7 +844,10 @@ int CL_ParsePacketEntities( sizebuf_t *msg, qboolean delta )
 		CL_WriteDemoJumpTime();
 
 	// sentinel count. save it for debug checking
-	count = ( MSG_ReadUBitLong( msg, MAX_VISIBLE_PACKET_BITS ) + 1 );
+	if( proto == PROTO_LEGACY )
+		count = MSG_ReadWord( msg );
+	else count = MSG_ReadUBitLong( msg, MAX_VISIBLE_PACKET_BITS ) + 1;
+
 	newframe = &cl.frames[cl.parsecountmod];
 
 	// allocate parse entities
@@ -740,32 +858,12 @@ int CL_ParsePacketEntities( sizebuf_t *msg, qboolean delta )
 
 	if( delta )
 	{
-		int	subtracted;
+		uint oldpacket = MSG_ReadByte( msg );
-
-		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(( cls.next_client_entities - oldframe->first_entity ) > ( cls.num_client_entities - NUM_PACKET_ENTITIES ))
+		if( !CL_ValidateDeltaPacket( oldpacket, oldframe ))
 		{
-			Con_NPrintf( 2, "^3Warning:^1 delta frame is too old^7\n" );
+			CL_FlushEntityPacket( msg, proto );
-			CL_FlushEntityPacket( msg );
 			return playerbytes;
 		}
 	}
@@ -783,48 +881,23 @@ int CL_ParsePacketEntities( sizebuf_t *msg, qboolean delta )
 
 	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 )
 	{
-		newnum = MSG_ReadUBitLong( msg, MAX_ENTITY_BITS );
+		if( !CL_ParseEntityNumFromPacket( msg, &newnum, proto ))
-		if( newnum == LAST_EDICT ) break; // end of packet entities
+			break; // done
 
 		if( MSG_CheckOverflow( msg ))
-			Host_Error( "CL_ParsePacketEntities: overflow\n" );
+			Host_Error( "%s: overflow\n", __func__ );
+
 		player = CL_IsPlayerIndex( newnum );
 
 		while( oldnum < newnum )
 		{
 			// one or more entities from the old packet are unchanged
 			CL_DeltaEntity( msg, newframe, oldnum, oldent, false );
-			oldindex++;
+			oldnum = CL_UpdateOldEntNum( ++oldindex, oldframe, &oldent );
-
-			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 )
@@ -833,17 +906,7 @@ int CL_ParsePacketEntities( sizebuf_t *msg, qboolean delta )
 			bufStart = MSG_GetNumBytesRead( msg );
 			CL_DeltaEntity( msg, newframe, newnum, oldent, true );
 			if( player ) playerbytes += MSG_GetNumBytesRead( msg ) - bufStart;
-			oldindex++;
+			oldnum = CL_UpdateOldEntNum( ++oldindex, oldframe, &oldent );
-
-			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;
 		}
 
@@ -862,21 +925,11 @@ int CL_ParsePacketEntities( sizebuf_t *msg, qboolean delta )
 	{
 		// one or more entities from the old packet are unchanged
 		CL_DeltaEntity( msg, newframe, oldnum, oldent, false );
-		oldindex++;
+		oldnum = CL_UpdateOldEntNum( ++oldindex, oldframe, &oldent );
-
-		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 "CL_Parse%sPacketEntities: (%i should be %i)\n", delta ? "Delta" : "", newframe->num_entities, count );
+		Con_Reportf( S_WARN "%s%s: (%i should be %i)\n", __func__, delta ? "Delta" : "", newframe->num_entities, count );
 
 	if( !newframe->valid )
 		return playerbytes; // frame is not valid but message was parsed
@@ -894,7 +947,7 @@ int CL_ParsePacketEntities( sizebuf_t *msg, qboolean delta )
 		cls.signon = SIGNONS;
 
 		// Clear loading plaque.
-		CL_SignonReply ();
+		CL_SignonReply( proto );
 	}
 
 	return playerbytes;
@@ -916,9 +969,25 @@ all the visible entities should pass this filter
 */
 qboolean CL_AddVisibleEntity( cl_entity_t *ent, int entityType )
 {
+	qboolean draw_player = true;
+
 	if( !ent || !ent->model )
 		return false;
 
+	// don't add the player in firstperson mode
+	if( RP_LOCALCLIENT( ent ))
+	{
+		cl.local.apply_effects = true;
+
+		if( !CL_IsThirdPerson( ) && ( ent->index == cl.viewentity ))
+		{
+			// we don't draw player in default renderer in firstperson mode
+			// but let the client.dll know about player entity anyway
+			// for use in custom renderers
+			draw_player = false;
+		}
+	}
+
 	// check for adding this entity
 	if( !clgame.dllFuncs.pfnAddEntity( entityType, ent, ent->model->name ))
 	{
@@ -928,28 +997,23 @@ qboolean CL_AddVisibleEntity( cl_entity_t *ent, int entityType )
 		return false;
 	}
 
-	// don't add the player in firstperson mode
+	if( !draw_player )
-	if( RP_LOCALCLIENT( ent ) && !CL_IsThirdPerson( ) && ( ent->index == cl.viewentity ))
 		return false;
 
 	if( entityType == ET_BEAM )
 	{
-		CL_AddCustomBeam( ent );
+		ref.dllFuncs.CL_AddCustomBeam( ent );
 		return true;
 	}
-	else if( !R_AddEntity( ent, entityType ))
+	else if( !ref.dllFuncs.R_AddEntity( ent, entityType ))
 	{
 		return false;
 	}
 
 	// because pTemp->entity.curstate.effects
 	// is already occupied by FTENT_FLICKER
-	if( entityType != ET_TEMPENTITY )
+	if( entityType != ET_TEMPENTITY && !RP_LOCALCLIENT( ent ) )
 	{
-		// no reason to do it twice
-		if( RP_LOCALCLIENT( ent ))
-			cl.local.apply_effects = false;
-
 		// apply client-side effects
 		CL_AddEntityEffects( ent );
 
@@ -967,7 +1031,7 @@ CL_LinkCustomEntity
 Add server beam to draw list
 =============
 */
-void CL_LinkCustomEntity( cl_entity_t *ent, entity_state_t *state )
+static void CL_LinkCustomEntity( cl_entity_t *ent, entity_state_t *state )
 {
 	ent->curstate.movetype = state->modelindex; // !!!
 
@@ -990,7 +1054,7 @@ Create visible entities in the correct position
 for all current players
 =============
 */
-void CL_LinkPlayers( frame_t *frame )
+static void CL_LinkPlayers( frame_t *frame )
 {
 	entity_state_t	*state;
 	cl_entity_t	*ent;
@@ -1001,7 +1065,6 @@ void CL_LinkPlayers( frame_t *frame )
 	// apply muzzleflash to weaponmodel
 	if( ent && FBitSet( ent->curstate.effects, EF_MUZZLEFLASH ))
 		SetBits( clgame.viewent.curstate.effects, EF_MUZZLEFLASH );
-	cl.local.apply_effects = true;
 
 	// check all the clients but add only visible
 	for( i = 0, state = frame->playerstate; i < MAX_CLIENTS; i++, state++ )
@@ -1040,6 +1103,9 @@ void CL_LinkPlayers( frame_t *frame )
 
 		if ( i == cl.playernum )
 		{
+			// using interpolation only for local player angles
+			CL_ComputePlayerOrigin( ent );
+
 			if( cls.demoplayback == DEMO_QUAKE1 )
 				VectorLerp( ent->prevstate.origin, cl.lerpFrac, ent->curstate.origin, cl.simorg );
 			VectorCopy( cl.simorg, ent->origin );
@@ -1071,7 +1137,7 @@ CL_LinkPacketEntities
 
 ===============
 */
-void CL_LinkPacketEntities( frame_t *frame )
+static void CL_LinkPacketEntities( frame_t *frame )
 {
 	cl_entity_t	*ent;
 	entity_state_t	*state;
@@ -1095,7 +1161,7 @@ void CL_LinkPacketEntities( frame_t *frame )
 
 		if( !ent )
 		{
-			Con_Reportf( S_ERROR "CL_LinkPacketEntity: bad entity %i\n", state->number );
+			Con_Reportf( S_ERROR "%s: bad entity %i\n", __func__, state->number );
 			continue;
 		}
 
@@ -1109,7 +1175,7 @@ void CL_LinkPacketEntities( frame_t *frame )
 		if( ent->curstate.rendermode == kRenderNormal )
 		{
 			// auto 'solid' faces
-			if( FBitSet( ent->model->flags, MODEL_TRANSPARENT ) && CL_IsQuakeCompatible( ))
+			if( FBitSet( ent->model->flags, MODEL_TRANSPARENT ) && Host_IsQuakeCompatible( ))
 			{
 				ent->curstate.rendermode = kRenderTransAlpha;
 				ent->curstate.renderamt = 255;
@@ -1136,17 +1202,33 @@ 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 );
 
-						// disable step interpolation in client.dll
+						if( !FBitSet( host.features, ENGINE_COMPUTE_STUDIO_LERP ))
-						ent->curstate.movetype = MOVETYPE_NONE;
+						{
+							// disable step interpolation in client.dll
+							ent->curstate.movetype = MOVETYPE_NONE;
+						}
 					}
 					else
 					{
-						// restore step interpolation in client.dll
+						if( FBitSet( host.features, ENGINE_COMPUTE_STUDIO_LERP ))
-						ent->curstate.movetype = MOVETYPE_STEP;
+						{
+							interpolate = true;
+						}
+						else
+						{
+							// restore step interpolation in client.dll
+							ent->curstate.movetype = MOVETYPE_STEP;
+						}
 					}
 #endif
 				}
@@ -1171,11 +1253,24 @@ void CL_LinkPacketEntities( frame_t *frame )
 				if ( !CL_InterpolateModel( ent ))
 					continue;
 			}
-			else if( ent->curstate.movetype == MOVETYPE_STEP && !NET_IsLocalAddress( cls.netchan.remote_address ))
+			// a1ba: in GoldSrc this is done for cstrike and czero
+			// 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
@@ -1186,7 +1281,7 @@ void CL_LinkPacketEntities( frame_t *frame )
 			if( ent->model->type == mod_studio )
 			{
 				if( interpolate && FBitSet( host.features, ENGINE_COMPUTE_STUDIO_LERP ))
-					R_StudioLerpMovement( ent, cl.time, ent->origin, ent->angles );
+					ref.dllFuncs.R_StudioLerpMovement( ent, cl.time, ent->origin, ent->angles );
 			}
 		}
 
@@ -1257,8 +1352,6 @@ void CL_EmitEntities( void )
 {
 	if( cl.paused ) return; // don't waste time
 
-	R_ClearScene ();
-
 	// not in server yet, no entities to redraw
 	if( cls.state != ca_active || !cl.validsequence )
 		return;
@@ -1268,7 +1361,7 @@ void CL_EmitEntities( void )
 		return;
 
 	// animate lightestyles
-	CL_RunLightStyles ();
+	ref.dllFuncs.CL_RunLightStyles ();
 
 	// decay dynamic lights
 	CL_DecayLights ();
@@ -1279,9 +1372,7 @@ void CL_EmitEntities( void )
 	// set client ideal pitch when mlook is disabled
 	CL_SetIdealPitch ();
 
-	// clear the scene befor start new frame
+	ref.dllFuncs.R_ClearScene ();
-	if( clgame.drawFuncs.R_ClearScene != NULL )
-		clgame.drawFuncs.R_ClearScene();
 
 	// link all the visible clients first
 	CL_LinkPlayers ( &cl.frames[cl.parsecountmod] );
@@ -1325,7 +1416,7 @@ qboolean CL_GetEntitySpatialization( channel_t *ch )
 
 	if(( ch->entnum - 1 ) == cl.playernum )
 	{
-		VectorCopy( RI.vieworg, ch->origin );
+		VectorCopy( refState.vieworg, ch->origin );
 		return true;
 	}
 
@@ -1333,27 +1424,19 @@ qboolean CL_GetEntitySpatialization( channel_t *ch )
 	ent = CL_GetEntityByIndex( ch->entnum );
 
 	// entity is not present on the client but has valid origin
-	if( !ent || !ent->index || ent->curstate.messagenum == 0 )
+	if( !ent || !ent->model || ent->curstate.messagenum != cl.parsecount )
 		return valid_origin;
 
-#if 0
-	// uncomment this if you want enable additional check by PVS
-	if( ent->curstate.messagenum != cl.parsecount )
-		return valid_origin;
-#endif
-	ch->movetype = ent->curstate.movetype;
-
 	// setup origin
-	VectorAverage( ent->curstate.mins, ent->curstate.maxs, ch->origin );
+	if( ent->model->type == mod_brush )
-	VectorAdd( ch->origin, ent->curstate.origin, ch->origin );
+	{
-
+		VectorAverage( ent->model->mins, ent->model->maxs, ch->origin );
-	// setup mins\maxs
+		VectorAdd( ent->origin, ch->origin, ch->origin );
-	VectorAdd( ent->curstate.mins, ent->curstate.origin, ch->absmin );
+	}
-	VectorAdd( ent->curstate.maxs, ent->curstate.origin, ch->absmax );
+	else
-
+	{
-	// setup radius
+		VectorCopy( ent->origin, ch->origin );
-	if( ent->model != NULL && ent->model->radius ) ch->radius = ent->model->radius;
+	}
-	else ch->radius = RadiusFromBounds( ent->curstate.mins, ent->curstate.maxs );
 
 	return true;
 }
@@ -1371,18 +1454,15 @@ qboolean CL_GetMovieSpatialization( rawchan_t *ch )
 		return valid_origin;
 
 	// setup origin
-	VectorAverage( ent->curstate.mins, ent->curstate.maxs, ch->origin );
+	if( ent->model->type == mod_brush )
-	VectorAdd( ch->origin, ent->curstate.origin, ch->origin );
+	{
-
+		VectorAverage( ent->model->mins, ent->model->maxs, ch->origin );
-	// setup radius
+		VectorAdd( ent->origin, ch->origin, ch->origin );
-	if( ent->model != NULL && ent->model->radius ) ch->radius = ent->model->radius;
+	}
-	else ch->radius = RadiusFromBounds( ent->curstate.mins, ent->curstate.maxs );
+	else
+	{
+		VectorCopy( ent->origin, ch->origin );
+	}
 
 	return true;
 }
-
-void CL_ExtraUpdate( void )
-{
-	clgame.dllFuncs.IN_Accumulate();
-	S_ExtraUpdate();
-}

engine/client/cl_mobile.c

@@ -0,0 +1,152 @@
+/*
+cl_mobile.c - common mobile interface
+Copyright (C) 2015 a1batross
+
+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 "mobility_int.h"
+#include "library.h"
+#include "input.h"
+#include "platform/platform.h"
+
+static CVAR_DEFINE_AUTO( vibration_length, "1.0", FCVAR_ARCHIVE | FCVAR_PRIVILEGED, "vibration length" );
+static CVAR_DEFINE_AUTO( vibration_enable, "1", FCVAR_ARCHIVE | FCVAR_PRIVILEGED, "enable vibration" );
+
+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 )
+		return;
+
+	// here goes platform-specific backends
+	Platform_Vibrate( life * vibration_length.value, flags );
+}
+
+static void Vibrate_f( void )
+{
+	if( Cmd_Argc() != 2 )
+	{
+		Msg( S_USAGE "vibrate <time>\n" );
+		return;
+	}
+
+	pfnVibrate( Q_atof( Cmd_Argv( 1 )), VIBRATE_NORMAL );
+}
+
+static void pfnEnableTextInput( int enable )
+{
+	Key_EnableTextInput( enable, false );
+}
+
+static int pfnDrawScaledCharacter( int x, int y, int number, int r, int g, int b, float scale )
+{
+	// this call is very ineffective and possibly broken!
+	rgba_t color = { r, g, b, 255 };
+	int flags = FONT_DRAW_HUD;
+
+	if( hud_utf8.value )
+		SetBits( flags, FONT_DRAW_UTF8 );
+
+	if( fabs( g_font_scale - scale ) > 0.1f ||
+		g_scaled_font.hFontTexture != cls.creditsFont.hFontTexture )
+	{
+		int i;
+
+		g_scaled_font = cls.creditsFont;
+		g_scaled_font.scale *= scale;
+		g_scaled_font.charHeight *= scale;
+		for( i = 0; i < ARRAYSIZE( g_scaled_font.charWidths ); i++ )
+			g_scaled_font.charWidths[i] *= scale;
+
+		g_font_scale = scale;
+	}
+
+	return CL_DrawCharacter( x, y, number, color, &g_scaled_font, flags );
+}
+
+static void pfnTouch_HideButtons( const char *name, byte state )
+{
+	Touch_HideButtons( name, state, true );
+}
+
+static void pfnTouch_RemoveButton( const char *name )
+{
+	Touch_RemoveButton( name, true );
+}
+
+static char *pfnParseFileSafe( char *data, char *buf, const int size, unsigned int flags, int *len )
+{
+	return COM_ParseFileSafe( data, buf, size, flags, len, NULL );
+}
+
+static const mobile_engfuncs_t gMobileEngfuncs =
+{
+	MOBILITY_API_VERSION,
+	pfnVibrate,
+	pfnEnableTextInput,
+	Touch_AddClientButton,
+	Touch_AddDefaultButton,
+	pfnTouch_HideButtons,
+	pfnTouch_RemoveButton,
+	Touch_SetClientOnly,
+	Touch_ResetDefaultButtons,
+	pfnDrawScaledCharacter,
+	Sys_Warn,
+	Sys_GetNativeObject,
+	ID_SetCustomClientID,
+	pfnParseFileSafe
+};
+
+qboolean Mobile_Init( void )
+{
+	pfnMobilityInterface ExportToClient;
+
+	Cmd_AddCommand( "vibrate", Vibrate_f, "Vibrate for specified time");
+	Cvar_RegisterVariable( &vibration_length );
+	Cvar_RegisterVariable( &vibration_enable );
+
+	// find mobility interface
+	if(( ExportToClient = COM_GetProcAddress( clgame.hInstance, MOBILITY_CLIENT_EXPORT )))
+	{
+		static mobile_engfuncs_t mobile_engfuncs; // keep a copy, don't let user change engine pointers
+
+		mobile_engfuncs = gMobileEngfuncs;
+
+		if( !ExportToClient( &mobile_engfuncs ))
+		{
+			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 )
+{
+	Cmd_RemoveCommand( "vibrate" );
+}

engine/client/cl_netgraph.c

@@ -15,24 +15,30 @@ GNU General Public License for more details.
 
 #include "common.h"
 #include "client.h"
-#include "gl_local.h"
+#include "kbutton.h"
 
+#if XASH_LOW_MEMORY == 0
 #define NET_TIMINGS			1024
+#elif XASH_LOW_MEMORY == 1
+#define NET_TIMINGS			256
+#elif XASH_LOW_MEMORY == 2
+#define NET_TIMINGS			64
+#endif
 #define NET_TIMINGS_MASK		(NET_TIMINGS - 1)
-#define LATENCY_AVG_FRAC		0.5
+#define LATENCY_AVG_FRAC		0.5f
-#define FRAMERATE_AVG_FRAC		0.5
+#define FRAMERATE_AVG_FRAC		0.5f
-#define PACKETLOSS_AVG_FRAC		0.5
+#define PACKETLOSS_AVG_FRAC		0.5f
-#define PACKETCHOKE_AVG_FRAC		0.5
+#define PACKETCHOKE_AVG_FRAC		0.5f
 #define NETGRAPH_LERP_HEIGHT		24
 #define NETGRAPH_NET_COLORS		5
 #define NUM_LATENCY_SAMPLES		8
 
-convar_t	*net_graph;
+CVAR_DEFINE_AUTO( net_graph, "0", FCVAR_ARCHIVE, "draw network usage graph" );
-convar_t	*net_graphpos;
+static CVAR_DEFINE_AUTO( net_graphpos, "1", FCVAR_ARCHIVE, "network usage graph position" );
-convar_t	*net_graphwidth;
+static CVAR_DEFINE_AUTO( net_scale, "5", FCVAR_ARCHIVE, "network usage graph scale level" );
-convar_t	*net_graphheight;
+static CVAR_DEFINE_AUTO( net_graphwidth, "192", FCVAR_ARCHIVE, "network usage graph width" );
-convar_t	*net_graphsolid;
+static CVAR_DEFINE_AUTO( net_graphheight, "64", FCVAR_ARCHIVE, "network usage graph height" );
-convar_t	*net_scale;
+static CVAR_DEFINE_AUTO( net_graphsolid, "1", FCVAR_ARCHIVE, "fill segments in network usage graph" );
 
 static struct packet_latency_t
 {
@@ -57,9 +63,9 @@ static byte netcolors[NETGRAPH_NET_COLORS+NETGRAPH_LERP_HEIGHT][4] =
 	// other will be generated through NetGraph_InitColors()
 };
 
-static byte sendcolor[4] = { 88, 29, 130, 255 };
+static const byte sendcolor[4] = { 88, 29, 130, 255 };
-static byte holdcolor[4] = { 255, 0, 0, 200 };
+static const byte holdcolor[4] = { 255, 0, 0, 200 };
-static byte extrap_base_color[4] = { 255, 255, 255, 255 };
+static const byte extrap_base_color[4] = { 255, 255, 255, 255 };
 static netbandwidthgraph_t	netstat_graph[NET_TIMINGS];
 static float		packet_loss;
 static float		packet_choke;
@@ -73,14 +79,14 @@ NetGraph_DrawRect
 NetGraph_FillRGBA shortcut
 ==========
 */
-static void NetGraph_DrawRect( wrect_t *rect, byte colors[4] )
+static void NetGraph_DrawRect( const wrect_t *rect, const byte colors[4] )
 {
-	pglColor4ubv( colors );	// color for this quad
+	ref.dllFuncs.Color4ub( colors[0], colors[1], colors[2], colors[3] );	// color for this quad
 
-	pglVertex2f( rect->left, rect->top );
+	ref.dllFuncs.Vertex3f( rect->left, rect->top, 0 );
-	pglVertex2f( rect->left + rect->right, rect->top );
+	ref.dllFuncs.Vertex3f( rect->left + rect->right, rect->top, 0 );
-	pglVertex2f( rect->left + rect->right, rect->top + rect->bottom );
+	ref.dllFuncs.Vertex3f( rect->left + rect->right, rect->top + rect->bottom, 0 );
-	pglVertex2f( rect->left, rect->top + rect->bottom );
+	ref.dllFuncs.Vertex3f( rect->left, rect->top + rect->bottom, 0 );
 }
 
 /*
@@ -90,7 +96,7 @@ NetGraph_AtEdge
 edge detect
 ==========
 */
-qboolean NetGraph_AtEdge( int x, int width )
+static qboolean NetGraph_AtEdge( int x, int width )
 {
 	if( x > 3 )
 	{
@@ -108,7 +114,7 @@ NetGraph_InitColors
 init netgraph colors
 ==========
 */
-void NetGraph_InitColors( void )
+static void NetGraph_InitColors( void )
 {
 	byte	mincolor[2][3];
 	byte	maxcolor[2][3];
@@ -152,6 +158,7 @@ void NetGraph_InitColors( void )
 			f = (float)(i - hfrac) / (float)(NETGRAPH_LERP_HEIGHT - hfrac );
 			VectorMA( mincolor[1], f, dc[1], netcolors[NETGRAPH_NET_COLORS + i] );
 		}
+		netcolors[NETGRAPH_NET_COLORS + i][3] = 255;
 	}
 }
 
@@ -162,7 +169,7 @@ NetGraph_GetFrameData
 get frame data info, like chokes, packet losses, also update graph, packet and cmdinfo
 ==========
 */
-void NetGraph_GetFrameData( float *latency, int *latency_count )
+static void NetGraph_GetFrameData( float *latency, int *latency_count )
 {
 	int		i, choke_count = 0, loss_count = 0;
 	double		newtime = Sys_DoubleTime();
@@ -204,7 +211,7 @@ void NetGraph_GetFrameData( float *latency, int *latency_count )
 		else
 		{
 			int frame_latency = Q_min( 1.0f, f->latency );
-			p->latency = (( frame_latency + 0.1 ) / 1.1 ) * ( 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 )
 			{
@@ -230,12 +237,12 @@ void NetGraph_GetFrameData( float *latency, int *latency_count )
 	}
 
 	// packet loss
-	loss = 100.0 * (float)loss_count / CL_UPDATE_BACKUP;
+	loss = 100.0f * (float)loss_count / CL_UPDATE_BACKUP;
-	packet_loss = PACKETLOSS_AVG_FRAC * packet_loss + ( 1.0 - PACKETLOSS_AVG_FRAC ) * loss;
+	packet_loss = PACKETLOSS_AVG_FRAC * packet_loss + ( 1.0f - PACKETLOSS_AVG_FRAC ) * loss;
 
 	// packet choke
-	choke = 100.0 * (float)choke_count / CL_UPDATE_BACKUP;
+	choke = 100.0f * (float)choke_count / CL_UPDATE_BACKUP;
-	packet_choke = PACKETCHOKE_AVG_FRAC * packet_choke + ( 1.0 - PACKETCHOKE_AVG_FRAC ) * choke;
+	packet_choke = PACKETCHOKE_AVG_FRAC * packet_choke + ( 1.0f - PACKETCHOKE_AVG_FRAC ) * choke;
 }
 
 /*
@@ -244,7 +251,7 @@ NetGraph_DrawTimes
 
 ===========
 */
-void NetGraph_DrawTimes( wrect_t rect, int x, int w )
+static void NetGraph_DrawTimes( wrect_t rect, int x, int w )
 {
 	int	i, j, extrap_point = NETGRAPH_LERP_HEIGHT / 3, a, h;
 	rgba_t	colors = { 0.9 * 255, 0.9 * 255, 0.7 * 255, 255 };
@@ -253,7 +260,7 @@ 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 = ( netstat_cmdinfo[i].cmd_lerp / 3.0f ) * NETGRAPH_LERP_HEIGHT;
+		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;
@@ -266,7 +273,7 @@ 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);
@@ -274,7 +281,10 @@ void NetGraph_DrawTimes( wrect_t rect, int x, int w )
 
 			for( j = start; j < h; j++ )
 			{
-				NetGraph_DrawRect( &fill, netcolors[NETGRAPH_NET_COLORS + j + extrap_point] );
+				int color = NETGRAPH_NET_COLORS + j + extrap_point;
+				color = Q_min( color, ARRAYSIZE( netcolors ) - 1 );
+
+				NetGraph_DrawRect( &fill, netcolors[color] );
 				fill.top--;
 			}
 		}
@@ -285,12 +295,15 @@ 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++ )
 			{
-				NetGraph_DrawRect( &fill, netcolors[NETGRAPH_NET_COLORS + j + oldh] );
+				int color = NETGRAPH_NET_COLORS + j + oldh;
+				color = Q_min( color, ARRAYSIZE( netcolors ) - 1 );
+
+				NetGraph_DrawRect( &fill, netcolors[color] );
 				fill.top--;
 			}
 		}
@@ -319,9 +332,9 @@ NetGraph_DrawHatches
 
 ===========
 */
-void NetGraph_DrawHatches( int x, int y )
+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 };
@@ -329,9 +342,9 @@ 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 );
 		}
@@ -348,40 +361,42 @@ NetGraph_DrawTextFields
 
 ===========
 */
-void NetGraph_DrawTextFields( int x, int y, int w, wrect_t rect, int count, float avg, int packet_loss, int packet_choke )
+static void NetGraph_DrawTextFields( int x, int y, int w, wrect_t rect, int count, float avg, int packet_loss, int packet_choke, int graphtype )
 {
 	static int	lastout;
+	cl_font_t *font = Con_GetFont( 0 );
 	rgba_t		colors = { 0.9 * 255, 0.9 * 255, 0.7 * 255, 255 };
 	int		ptx = Q_max( x + w - NETGRAPH_LERP_HEIGHT - 1, 1 );
 	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.0, avg );
+		avg = Q_max( 0.0f, avg );
 	}
 	else avg = 0.0;
 
 	// move rolling average
-	framerate = FRAMERATE_AVG_FRAC * host.frametime + ( 1.0 - FRAMERATE_AVG_FRAC ) * framerate;
+	framerate = FRAMERATE_AVG_FRAC * host.frametime + ( 1.0f - FRAMERATE_AVG_FRAC ) * framerate;
-	Con_SetFont( 0 );
+
+	CL_SetFontRendermode( font );
 
 	if( framerate > 0.0f )
 	{
-		y -= net_graphheight->value;
+		y -= net_graphheight.value;
 
-		Con_DrawString( x, y, va( "%.1f fps" , 1.0f / framerate ), colors );
+		CL_DrawStringf( font, x, y, colors, FONT_DRAW_NORENDERMODE, "%.1f fps" , 1.0f / framerate);
 
 		if( avg > 1.0f )
-			Con_DrawString( x + 75, y, va( "%i ms" , (int)avg ), colors );
+			CL_DrawStringf( font, x + 75, y, colors, FONT_DRAW_NORENDERMODE, "%i ms" , (int)avg );
 
 		y += 15;
 
@@ -389,27 +404,27 @@ void NetGraph_DrawTextFields( int x, int y, int w, wrect_t rect, int count, floa
 		if( !out ) out = lastout;
 		else lastout = out;
 
-		Con_DrawString( x, y, va( "in :  %i %.2f k/s", netstat_graph[j].msgbytes, cls.netchan.flow[FLOW_INCOMING].avgkbytespersec ), colors );
+		CL_DrawStringf( font, x, y, colors, FONT_DRAW_NORENDERMODE,
+			"in :  %i %.2f kb/s", netstat_graph[j].msgbytes, cls.netchan.flow[FLOW_INCOMING].avgkbytespersec );
 		y += 15;
 
-		Con_DrawString( x, y, va( "out:  %i %.2f k/s", out, cls.netchan.flow[FLOW_OUTGOING].avgkbytespersec ), colors );
+		CL_DrawStringf( font, x, y, colors, FONT_DRAW_NORENDERMODE,
+			"out:  %i %.2f kb/s", out, cls.netchan.flow[FLOW_OUTGOING].avgkbytespersec );
 		y += 15;
 
-		if( net_graph->value > 2 )
+		if( graphtype > 2 )
 		{
-			int	loss = (int)(( packet_loss + PACKETLOSS_AVG_FRAC ) - 0.01 );
+			int	loss = (int)(( packet_loss + PACKETLOSS_AVG_FRAC ) - 0.01f );
-			int	choke = (int)(( packet_choke + PACKETCHOKE_AVG_FRAC ) - 0.01 );
+			int	choke = (int)(( packet_choke + PACKETCHOKE_AVG_FRAC ) - 0.01f );
 
-			Con_DrawString( x, y, va( "loss: %i choke: %i", loss, choke ), colors );
+			CL_DrawStringf( font, x, y, colors, FONT_DRAW_NORENDERMODE, "loss: %i choke: %i", loss, choke );
 		}
 	}
 
-	if( net_graph->value < 3 )
+	if( graphtype < 3 )
-		Con_DrawString( ptx, pty, va( "%i/s", (int)cl_cmdrate->value ), colors );
+		CL_DrawStringf( font, ptx, pty, colors, FONT_DRAW_NORENDERMODE, "%i/s", (int)cl_cmdrate.value );
 
-	Con_DrawString( ptx, last_y, va( "%i/s" , (int)cl_updaterate->value ), colors );
+	CL_DrawStringf( font, ptx, last_y, colors, FONT_DRAW_NORENDERMODE, "%i/s" , (int)cl_updaterate.value );
-
-	Con_RestoreFont();
 }
 
 /*
@@ -418,14 +433,14 @@ NetGraph_DrawDataSegment
 
 ===========
 */
-int NetGraph_DrawDataSegment( wrect_t *fill, int bytes, byte r, byte g, byte b, byte a )
+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;
 
@@ -445,7 +460,7 @@ NetGraph_ColorForHeight
 color based on packet latency
 ===========
 */
-void NetGraph_ColorForHeight( struct packet_latency_t *packet, byte color[4], int *ping )
+static void NetGraph_ColorForHeight( struct packet_latency_t *packet, byte color[4], int *ping )
 {
 	switch( packet->latency )
 	{
@@ -480,10 +495,10 @@ NetGraph_DrawDataUsage
 
 ===========
 */
-void NetGraph_DrawDataUsage( int x, int y, int w )
+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];
 
@@ -535,11 +550,11 @@ void NetGraph_DrawDataUsage( int x, int y, int w )
 		if( NetGraph_AtEdge( a, w ))
 			NetGraph_DrawRect( &fill, color );
 
-		if( net_graph->value < 2 )
+		if( graphtype < 2 )
 			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 ))
@@ -574,7 +589,7 @@ void NetGraph_DrawDataUsage( int x, int y, int w )
 		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;
 
@@ -582,8 +597,8 @@ void NetGraph_DrawDataUsage( int x, int y, int w )
 			continue;
 	}
 
-	if( net_graph->value >= 2 )
+	if( graphtype >= 2 )
-		NetGraph_DrawHatches( x, y - net_graphheight->value - 1 );
+		NetGraph_DrawHatches( x, y - net_graphheight.value - 1 );
 }
 
 /*
@@ -592,24 +607,24 @@ NetGraph_GetScreenPos
 
 ===========
 */
-void NetGraph_GetScreenPos( wrect_t *rect, int *w, int *x, int *y )
+static void NetGraph_GetScreenPos( wrect_t *rect, int *w, int *x, int *y )
 {
 	rect->left = rect->top = 0;
-	rect->right = glState.width;
+	rect->right = refState.width;
-	rect->bottom = glState.height;
+	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;
 		break;
 	case 2: // center
-		*x = rect->left + ( rect->right - 10 - *w ) / 2;
+		*x = ( rect->left + ( rect->right - 10 - *w )) / 2;
 		break;
 	default: // left sided
 		*x = rect->left + 5;
@@ -631,6 +646,8 @@ void SCR_DrawNetGraph( void )
 	float	avg_ping;
 	int	ping_count;
 	int	w, x, y;
+	kbutton_t *in_graph;
+	int   graphtype;
 
 	if( !host.allow_console )
 		return;
@@ -638,45 +655,54 @@ void SCR_DrawNetGraph( void )
 	if( cls.state != ca_active )
 		return;
 
-	if( !net_graph->value )
+	in_graph = clgame.dllFuncs.KB_Find( "in_graph" );
-		return;
 
-	if( net_scale->value <= 0 )
+	if( in_graph->state & 1 )
+	{
+		graphtype = 2;
+	}
+	else if( net_graph.value != 0.0f )
+	{
+		graphtype = (int)net_graph.value;
+	}
+	else
+	{
+		return;
+	}
+
+	if( net_scale.value <= 0 )
 		Cvar_SetValue( "net_scale", 0.1f );
 
 	NetGraph_GetScreenPos( &rect, &w, &x, &y );
 
 	NetGraph_GetFrameData( &avg_ping, &ping_count );
 
-	NetGraph_DrawTextFields( x, y, w, rect, ping_count, avg_ping, packet_loss, packet_choke );
+	NetGraph_DrawTextFields( x, y, w, rect, ping_count, avg_ping, packet_loss, packet_choke, graphtype );
 
-	if( net_graph->value < 3 )
+	if( graphtype < 3 )
 	{
-		pglEnable( GL_BLEND );
+		ref.dllFuncs.GL_SetRenderMode( kRenderTransColor );
-		pglDisable( GL_TEXTURE_2D );
+		ref.dllFuncs.GL_Bind( XASH_TEXTURE0, R_GetBuiltinTexture( REF_WHITE_TEXTURE ) );
-		pglTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
+		ref.dllFuncs.Begin( TRI_QUADS ); // draw all the fills as a long solid sequence of quads for speedup reasons
-		pglBlendFunc( GL_SRC_ALPHA, GL_ONE );
-		pglBegin( GL_QUADS ); // draw all the fills as a long solid sequence of quads for speedup reasons
 
 		// NOTE: fill colors without texture at this point
-		NetGraph_DrawDataUsage( x, y, w );
+		NetGraph_DrawDataUsage( x, y, w, graphtype );
 		NetGraph_DrawTimes( rect, x, w );
 
-		pglEnd();
+		ref.dllFuncs.End();
-		pglColor4ub( 255, 255, 255, 255 );
+		ref.dllFuncs.Color4ub( 255, 255, 255, 255 );
-		pglEnable( GL_TEXTURE_2D );
+		ref.dllFuncs.GL_SetRenderMode( kRenderNormal );
-		pglDisable( GL_BLEND );
 	}
 }
 
 void CL_InitNetgraph( void )
 {
-	net_graph = Cvar_Get( "net_graph", "0", FCVAR_ARCHIVE, "draw network usage graph" );
+	Cvar_RegisterVariable( &net_graph );
-	net_graphpos = Cvar_Get( "net_graphpos", "1", FCVAR_ARCHIVE, "network usage graph position" );
+	Cvar_RegisterVariable( &net_graphpos );
-	net_scale = Cvar_Get( "net_scale", "5", FCVAR_ARCHIVE, "network usage graph scale level" );
+	Cvar_RegisterVariable( &net_scale );
-	net_graphwidth = Cvar_Get( "net_graphwidth", "192", FCVAR_ARCHIVE, "network usage graph width" );
+	Cvar_RegisterVariable( &net_graphwidth );
-	net_graphheight = Cvar_Get( "net_graphheight", "64", FCVAR_ARCHIVE, "network usage graph height" );
+	Cvar_RegisterVariable( &net_graphheight );
-	net_graphsolid = Cvar_Get( "net_graphsolid", "1", FCVAR_ARCHIVE, "fill segments in network usage graph" );
+	Cvar_RegisterVariable( &net_graphsolid );
 	packet_loss = packet_choke = 0.0;
 
 	NetGraph_InitColors();

engine/client/cl_parse_48.c

@@ -0,0 +1,631 @@
+/*
+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_allowdownload 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, NULL );
+	}
+
+	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

@@ -0,0 +1,762 @@
+/*
+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__, clientfallback );
+
+	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

@@ -26,27 +26,13 @@ GNU General Public License for more details.
 #define MIN_PREDICTION_EPSILON	0.5f	// complain if error is > this and we have cl_showerror set
 #define MAX_PREDICTION_ERROR		64.0f	// above this is assumed to be a teleport, don't smooth, etc.
 
-/*
-=============
-CL_ClearPhysEnts
-
-=============
-*/
-void CL_ClearPhysEnts( void )
-{
-	clgame.pmove->numtouch = 0;
-	clgame.pmove->numvisent = 0;
-	clgame.pmove->nummoveent = 0;
-	clgame.pmove->numphysent = 0;
-}
-
 /*
 =============
 CL_PushPMStates
 
 =============
 */
-void CL_PushPMStates( void )
+void GAME_EXPORT CL_PushPMStates( void )
 {
 	if( clgame.pushed ) return;
 	clgame.oldphyscount = clgame.pmove->numphysent;
@@ -60,7 +46,7 @@ CL_PopPMStates
 
 =============
 */
-void CL_PopPMStates( void )
+void GAME_EXPORT CL_PopPMStates( void )
 {
 	if( !clgame.pushed ) return;
 	clgame.pmove->numphysent = clgame.oldphyscount;
@@ -68,39 +54,14 @@ void CL_PopPMStates( void )
 	clgame.pushed = false;
 }
 
-/*
-=============
-CL_PushTraceBounds
-
-=============
-*/
-void 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 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
 ===============
 */
-qboolean CL_IsPredicted( void )
+static qboolean CL_IsPredicted( void )
 {
-	if( cl_nopred->value || cl.intermission )
+	if( cl_nopred.value || cl.intermission )
 		return false;
 
 	// never predict the quake demos
@@ -197,7 +158,7 @@ void CL_SetIdealPitch( void )
 	}
 
 	if( steps < 2 ) return;
-	cl.local.idealpitch = -dir * cl_idealpitchscale->value;
+	cl.local.idealpitch = -dir * cl_idealpitchscale.value;
 }
 
 /*
@@ -208,7 +169,7 @@ check for instant movement in case
 we don't want interpolate this
 ==================
 */
-qboolean CL_PlayerTeleported( local_state_t *from, local_state_t *to )
+static qboolean CL_PlayerTeleported( local_state_t *from, local_state_t *to )
 {
 	int	len, maxlen;
 	vec3_t	delta;
@@ -216,7 +177,7 @@ qboolean CL_PlayerTeleported( local_state_t *from, local_state_t *to )
 	VectorSubtract( to->playerstate.origin, from->playerstate.origin, delta );
 
 	// compute potential max movement in units per frame and compare with entity movement
-	maxlen = ( clgame.movevars.maxvelocity * ( 1.0 / GAME_FPS ));
+	maxlen = ( clgame.movevars.maxvelocity * ( 1.0f / GAME_FPS ));
 	len = VectorLength( delta );
 
 	return (len > maxlen);
@@ -248,7 +209,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
@@ -256,7 +217,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] );
@@ -264,8 +225,10 @@ void CL_CheckPredictionError( void )
 		// save for error interpolation
 		VectorCopy( delta, cl.local.prediction_error );
 
-		if( dist > MIN_CORRECTION_DISTANCE )
+		// GoldSrc checks for singleplayer
-			cls.correction_time = cl_smoothtime->value;
+		// we would check for local server
+		if( dist > MIN_CORRECTION_DISTANCE && !SV_Active() )
+			cls.correction_time = cl_smoothtime.value;
 	}
 }
 
@@ -280,7 +243,7 @@ then with clipping against them.
 This sets up the first phase.
 =============
 */
-void CL_SetUpPlayerPrediction( int dopred, int bIncludeLocalClient )
+void GAME_EXPORT CL_SetUpPlayerPrediction( int dopred, int bIncludeLocalClient )
 {
 	entity_state_t	*state;
 	predicted_player_t	*player;
@@ -429,7 +392,7 @@ CL_AddLinksToPmove
 collect solid entities
 ====================
 */
-void CL_AddLinksToPmove( frame_t *frame )
+static void CL_AddLinksToPmove( frame_t *frame )
 {
 	entity_state_t	*state;
 	model_t		*model;
@@ -538,14 +501,14 @@ pmove must be setup with world and solid entity hulls before calling
 (via CL_PredictMove)
 ===============
 */
-void CL_SetSolidPlayers( int playernum )
+void GAME_EXPORT CL_SetSolidPlayers( int playernum )
 {
 	entity_state_t	*state;
 	predicted_player_t	*player;
 	physent_t		*pe;
 	int		i;
 
-	if( !cl_solid_players->value )
+	if( !cl_solid_players.value )
 		return;
 
 	for( i = 0; i < MAX_CLIENTS; i++ )
@@ -581,8 +544,8 @@ void 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( clgame.pmove->player_mins[player->usehull], pe->mins );
+		VectorCopy( host.player_mins[player->usehull], pe->mins );
-		VectorCopy( clgame.pmove->player_maxs[player->usehull], pe->maxs );
+		VectorCopy( host.player_maxs[player->usehull], pe->maxs );
 		pe->movetype = player->movetype;
 		pe->solid = player->solid;
 	}
@@ -594,7 +557,7 @@ CL_WaterEntity
 
 =============
 */
-int CL_WaterEntity( const float *rgflPos )
+int GAME_EXPORT CL_WaterEntity( const float *rgflPos )
 {
 	physent_t		*pe;
 	hull_t		*hull;
@@ -699,148 +662,37 @@ cl_entity_t *CL_GetWaterEntity( const float *rgflPos )
 	return CL_GetEntityByIndex( entnum );
 }
 
-int CL_TestLine( const vec3_t start, const vec3_t end, int flags )
+static int GAME_EXPORT pfnTestPlayerPosition( float *pos, pmtrace_t *ptrace )
-{
-	return PM_TestLineExt( clgame.pmove, clgame.pmove->physents, clgame.pmove->numphysent, start, end, flags );
-}
-
-static int pfnTestPlayerPosition( float *pos, pmtrace_t *ptrace )
 {
 	return PM_TestPlayerPosition( clgame.pmove, pos, ptrace, NULL );
 }
 
-static void pfnStuckTouch( int hitent, pmtrace_t *tr )
+static void GAME_EXPORT pfnStuckTouch( int hitent, pmtrace_t *tr )
 {
-	int	i;
+	PM_StuckTouch( clgame.pmove, hitent, tr );
-
-	for( i = 0; i < clgame.pmove->numtouch; i++ )
-	{
-		if( clgame.pmove->touchindex[i].ent == hitent )
-			return;
-	}
-
-	if( clgame.pmove->numtouch >= MAX_PHYSENTS )
-		return;
-
-	VectorCopy( clgame.pmove->velocity, tr->deltavelocity );
-	tr->ent = hitent;
-
-	clgame.pmove->touchindex[clgame.pmove->numtouch++] = *tr;
 }
 
-static int pfnPointContents( float *p, int *truecontents )
+static int GAME_EXPORT pfnTruePointContents( float *p )
-{
-	int	cont, truecont;
-
-	truecont = cont = PM_PointContents( clgame.pmove, p );
-	if( truecontents ) *truecontents = truecont;
-
-	if( cont <= CONTENTS_CURRENT_0 && cont >= CONTENTS_CURRENT_DOWN )
-		cont = CONTENTS_WATER;
-	return cont;
-}
-
-static int pfnTruePointContents( float *p )
 {
 	return PM_TruePointContents( clgame.pmove, p );
 }
 
-static int pfnHullPointContents( struct hull_s *hull, int num, float *p )
+static pmtrace_t GAME_EXPORT pfnPlayerTrace( float *start, float *end, int traceFlags, int ignore_pe )
-{
-	return PM_HullPointContents( hull, num, p );
-}
-
-static pmtrace_t pfnPlayerTrace( float *start, float *end, int traceFlags, int ignore_pe )
 {
 	return PM_PlayerTraceExt( clgame.pmove, start, end, traceFlags, clgame.pmove->numphysent, clgame.pmove->physents, ignore_pe, NULL );
 }
 
-static pmtrace_t *pfnTraceLine( float *start, float *end, int flags, int usehull, int ignore_pe )
+static void *pfnHullForBsp( physent_t *pe, float *offset )
-{
-	static pmtrace_t	tr;
-	int		old_usehull;
-
-	old_usehull = clgame.pmove->usehull;
-	clgame.pmove->usehull = usehull;	
-
-	switch( flags )
-	{
-	case PM_TRACELINE_PHYSENTSONLY:
-		tr = PM_PlayerTraceExt( clgame.pmove, start, end, 0, clgame.pmove->numphysent, clgame.pmove->physents, ignore_pe, NULL );
-		break;
-	case PM_TRACELINE_ANYVISIBLE:
-		tr = PM_PlayerTraceExt( clgame.pmove, start, end, 0, clgame.pmove->numvisent, clgame.pmove->visents, ignore_pe, NULL );
-		break;
-	}
-
-	clgame.pmove->usehull = old_usehull;
-
-	return &tr;
-}
-
-static hull_t *pfnHullForBsp( physent_t *pe, float *offset )
 {
 	return PM_HullForBsp( pe, clgame.pmove, offset );
 }
 
-static float pfnTraceModel( physent_t *pe, float *start, float *end, trace_t *trace )
+static float GAME_EXPORT pfnTraceModel( physent_t *pe, float *start, float *end, trace_t *trace )
 {
-	int	old_usehull;
+	return PM_TraceModel( clgame.pmove, pe, start, end, trace );
-	vec3_t	start_l, end_l;
-	vec3_t	offset, temp;
-	qboolean	rotated;
-	matrix4x4	matrix;
-	hull_t	*hull;
-
-	old_usehull = clgame.pmove->usehull;
-	clgame.pmove->usehull = 2;
-
-	hull = PM_HullForBsp( pe, clgame.pmove, offset );
-
-	clgame.pmove->usehull = old_usehull;
-
-	if( pe->solid == SOLID_BSP && !VectorIsNull( pe->angles ))
-		rotated = true;
-	else rotated = false;
-
- 	if( rotated )
- 	{
- 		Matrix4x4_CreateFromEntity( matrix, pe->angles, offset, 1.0f );
- 		Matrix4x4_VectorITransform( matrix, start, start_l );
- 		Matrix4x4_VectorITransform( matrix, end, end_l );
- 	}
- 	else
- 	{
- 		VectorSubtract( start, offset, start_l );
- 		VectorSubtract( end, offset, end_l );
- 	}
-
-	PM_RecursiveHullCheck( hull, hull->firstclipnode, 0, 1, start_l, end_l, (pmtrace_t *)trace );
-	trace->ent = NULL;
-
-	if( rotated )
-	{
-		VectorCopy( trace->plane.normal, temp );
-		Matrix4x4_TransformPositivePlane( matrix, temp, trace->plane.dist, trace->plane.normal, &trace->plane.dist );
-	}
-
-	VectorLerp( start, trace->fraction, end, trace->endpos );
-
-	return trace->fraction;
 }
 
-static const char *pfnTraceTexture( int ground, float *vstart, float *vend )
+static void GAME_EXPORT pfnPlaySound( int channel, const char *sample, float volume, float attenuation, int fFlags, int pitch )
-{
-	physent_t *pe;
-
-	if( ground < 0 || ground >= clgame.pmove->numphysent )
-		return NULL; // bad ground
-
-	pe = &clgame.pmove->physents[ground];
-	return PM_TraceTexture( pe, vstart, vend );
-}			
-
-static void pfnPlaySound( int channel, const char *sample, float volume, float attenuation, int fFlags, int pitch )
 {
 	if( !clgame.pmove->runfuncs )
 		return;
@@ -848,54 +700,25 @@ static void pfnPlaySound( int channel, const char *sample, float volume, float a
 	S_StartSound( NULL, clgame.pmove->player_index + 1, channel, S_RegisterSound( sample ), volume, attenuation, pitch, fFlags );
 }
 
-static void pfnPlaybackEventFull( int flags, int clientindex, word eventindex, float delay, float *origin,
+static void GAME_EXPORT pfnPlaybackEventFull( int flags, int clientindex, word eventindex, float delay, float *origin,
 	float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2 )
 {
 	CL_PlaybackEvent( flags, NULL, eventindex, delay, origin, angles, fparam1, fparam2, iparam1, iparam2, bparam1, bparam2 );
 }
 
-static pmtrace_t pfnPlayerTraceEx( float *start, float *end, int traceFlags, pfnIgnore pmFilter )
+static pmtrace_t GAME_EXPORT pfnPlayerTraceEx( float *start, float *end, int traceFlags, pfnIgnore pmFilter )
 {
 	return PM_PlayerTraceExt( clgame.pmove, start, end, traceFlags, clgame.pmove->numphysent, clgame.pmove->physents, -1, pmFilter );
 }
 
-static int pfnTestPlayerPositionEx( float *pos, pmtrace_t *ptrace, pfnIgnore pmFilter )
+static int GAME_EXPORT pfnTestPlayerPositionEx( float *pos, pmtrace_t *ptrace, pfnIgnore pmFilter )
 {
 	return PM_TestPlayerPosition( clgame.pmove, pos, ptrace, pmFilter );
 }
 
 static pmtrace_t *pfnTraceLineEx( float *start, float *end, int flags, int usehull, pfnIgnore pmFilter )
 {
-	static pmtrace_t	tr;
+	return PM_TraceLineEx( clgame.pmove, start, end, flags, usehull, pmFilter );
-	int		old_usehull;
-
-	old_usehull = clgame.pmove->usehull;
-	clgame.pmove->usehull = usehull;	
-
-	switch( flags )
-	{
-	case PM_TRACELINE_PHYSENTSONLY:
-		tr = PM_PlayerTraceExt( clgame.pmove, start, end, 0, clgame.pmove->numphysent, clgame.pmove->physents, -1, pmFilter );
-		break;
-	case PM_TRACELINE_ANYVISIBLE:
-		tr = PM_PlayerTraceExt( clgame.pmove, start, end, 0, clgame.pmove->numvisent, clgame.pmove->visents, -1, pmFilter );
-		break;
-	}
-
-	clgame.pmove->usehull = old_usehull;
-
-	return &tr;
-}
-
-static struct msurface_s *pfnTraceSurface( int ground, float *vstart, float *vend )
-{
-	physent_t *pe;
-
-	if( ground < 0 || ground >= clgame.pmove->numphysent )
-		return NULL; // bad ground
-
-	pe = &clgame.pmove->physents[ground];
-	return PM_TraceSurface( pe, vstart, vend );
 }
 
 /*
@@ -928,18 +751,18 @@ void CL_InitClientMove( void )
 
 	// common utilities
 	clgame.pmove->PM_Info_ValueForKey = Info_ValueForKey;
-	clgame.pmove->PM_Particle = CL_Particle;
+	clgame.pmove->PM_Particle = CL_Particle; // ref should be initialized here already
 	clgame.pmove->PM_TestPlayerPosition = pfnTestPlayerPosition;
 	clgame.pmove->Con_NPrintf = Con_NPrintf;
 	clgame.pmove->Con_DPrintf = Con_DPrintf;
 	clgame.pmove->Con_Printf = Con_Printf;
 	clgame.pmove->Sys_FloatTime = Sys_DoubleTime;
 	clgame.pmove->PM_StuckTouch = pfnStuckTouch;
-	clgame.pmove->PM_PointContents = pfnPointContents;
+	clgame.pmove->PM_PointContents = (void*)PM_CL_PointContents;
 	clgame.pmove->PM_TruePointContents = pfnTruePointContents;
-	clgame.pmove->PM_HullPointContents = pfnHullPointContents; 
+	clgame.pmove->PM_HullPointContents = (void*)PM_HullPointContents;
 	clgame.pmove->PM_PlayerTrace = pfnPlayerTrace;
-	clgame.pmove->PM_TraceLine = pfnTraceLine;
+	clgame.pmove->PM_TraceLine = PM_CL_TraceLine;
 	clgame.pmove->RandomLong = COM_RandomLong;
 	clgame.pmove->RandomFloat = COM_RandomFloat;
 	clgame.pmove->PM_GetModelType = pfnGetModelType;
@@ -951,7 +774,7 @@ void CL_InitClientMove( void )
 	clgame.pmove->COM_FreeFile = COM_FreeFile;
 	clgame.pmove->memfgets = COM_MemFgets;
 	clgame.pmove->PM_PlaySound = pfnPlaySound;
-	clgame.pmove->PM_TraceTexture = pfnTraceTexture;
+	clgame.pmove->PM_TraceTexture = PM_CL_TraceTexture;
 	clgame.pmove->PM_PlaybackEventFull = pfnPlaybackEventFull;
 	clgame.pmove->PM_PlayerTraceEx = pfnPlayerTraceEx;
 	clgame.pmove->PM_TestPlayerPositionEx = pfnTestPlayerPositionEx;
@@ -962,26 +785,25 @@ void CL_InitClientMove( void )
 	clgame.dllFuncs.pfnPlayerMoveInit( clgame.pmove );
 }
 
-static void PM_CheckMovingGround( clientdata_t *cd, entity_state_t *state, float frametime )
+static void CL_SetupPMove( playermove_t *pmove, const local_state_t *from, const usercmd_t *ucmd, qboolean runfuncs, double time )
 {
-	if(!( cd->flags & FL_BASEVELOCITY ))
+	const entity_state_t	*ps;
-	{
+	const clientdata_t	*cd;
-		// apply momentum (add in half of the previous frame of velocity first)
-		VectorMA( cd->velocity, 1.0f + (frametime * 0.5f), state->basevelocity, cd->velocity );
-		VectorClear( state->basevelocity );
-	}
-	cd->flags &= ~FL_BASEVELOCITY;
-}
-
-void CL_SetupPMove( playermove_t *pmove, local_state_t *from, usercmd_t *ucmd, qboolean runfuncs, double time )
-{
-	entity_state_t	*ps;
-	clientdata_t	*cd;
 
 	ps = &from->playerstate;
 	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;
@@ -993,22 +815,21 @@ void CL_SetupPMove( playermove_t *pmove, local_state_t *from, usercmd_t *ucmd, q
 	VectorCopy( ps->basevelocity, pmove->basevelocity );
 	VectorCopy( cd->view_ofs, pmove->view_ofs );
 	VectorClear( pmove->movedir );
-	pmove->flDuckTime = cd->flDuckTime;
+	pmove->flDuckTime = (float)cd->flDuckTime;
 	pmove->bInDuck = cd->bInDuck;
 	pmove->usehull = ps->usehull;
 	pmove->flTimeStepSound = cd->flTimeStepSound;
 	pmove->iStepLeft = ps->iStepLeft;
 	pmove->flFallVelocity = ps->flFallVelocity;
-	pmove->flSwimTime = cd->flSwimTime;
+	pmove->flSwimTime = (float)cd->flSwimTime;
 	VectorCopy( cd->punchangle, pmove->punchangle );
-	pmove->flSwimTime = cd->flSwimTime;
 	pmove->flNextPrimaryAttack = 0.0f; // not used by PM_ code
 	pmove->effects = ps->effects;
 	pmove->flags = cd->flags;
 	pmove->gravity = ps->gravity;
 	pmove->friction = ps->friction;
 	pmove->oldbuttons = ps->oldbuttons;
-	pmove->waterjumptime = cd->waterjumptime;
+	pmove->waterjumptime = (float)cd->waterjumptime;
 	pmove->dead = (cl.local.health <= 0);
 	pmove->deadflag = cd->deadflag;
 	pmove->spectator = (cls.spectator != 0);
@@ -1032,10 +853,10 @@ void CL_SetupPMove( playermove_t *pmove, local_state_t *from, usercmd_t *ucmd, q
 	VectorCopy( cd->vuser4, pmove->vuser4 );
 	pmove->cmd = *ucmd;	// copy current cmds
 
-	Q_strncpy( pmove->physinfo, cls.physinfo, MAX_INFO_STRING );
+	Q_strncpy( pmove->physinfo, cls.physinfo, sizeof( pmove->physinfo ));
 }
 
-void CL_FinishPMove( playermove_t *pmove, local_state_t *to )
+static const void CL_FinishPMove( const playermove_t *pmove, local_state_t *to )
 {
 	entity_state_t	*ps;
 	clientdata_t	*cd;
@@ -1046,7 +867,7 @@ void CL_FinishPMove( playermove_t *pmove, local_state_t *to )
 	cd->flags = pmove->flags;
 	cd->bInDuck = pmove->bInDuck;
 	cd->flTimeStepSound = pmove->flTimeStepSound;
-	cd->flDuckTime = pmove->flDuckTime;
+	cd->flDuckTime = (int)pmove->flDuckTime;
 	cd->flSwimTime = (int)pmove->flSwimTime;
 	cd->waterjumptime = (int)pmove->waterjumptime;
 	cd->watertype = pmove->watertype;
@@ -1059,7 +880,7 @@ void CL_FinishPMove( playermove_t *pmove, local_state_t *to )
 	VectorCopy( pmove->angles, ps->angles );
 	VectorCopy( pmove->basevelocity, ps->basevelocity );
 	VectorCopy( pmove->punchangle, cd->punchangle );
-	ps->oldbuttons = pmove->oldbuttons;
+	ps->oldbuttons = (uint)pmove->cmd.buttons;
 	ps->friction = pmove->friction;
 	ps->movetype = pmove->movetype;
 	ps->onground = pmove->onground;
@@ -1088,16 +909,17 @@ CL_RunUsercmd
 Runs prediction code for user cmd
 =================
 */
-void CL_RunUsercmd( local_state_t *from, local_state_t *to, usercmd_t *u, qboolean runfuncs, double *time, unsigned int random_seed )
+static 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;
-	local_state_t	temp;
-	usercmd_t		split;
-
-	memset( &temp, 0, sizeof( temp ));
 
 	if( u->msec > 50 )
 	{
+		local_state_t	temp;
+		usercmd_t		split;
+
+		memset( &temp, 0, sizeof( temp ));
+
 		split = *u;
 		split.msec /= 2;
 		CL_RunUsercmd( from, &temp, &split, runfuncs, time, random_seed );
@@ -1164,15 +986,11 @@ Sets cl.predicted.origin and cl.predicted.angles
 */
 void CL_PredictMovement( qboolean repredicting )
 {
-	runcmd_t		*to_cmd, *from_cmd;
+	runcmd_t		*to_cmd = NULL, *from_cmd;
 	local_state_t	*from = NULL, *to = NULL;
-	int		current_command;
+	frame_t *frame = NULL;
-	int		current_command_mod;
+	uint		i, stoppoint;
-	frame_t		*frame = NULL;
-	int		i, stoppoint;
-	qboolean		runfuncs;
 	double		f = 1.0;
-	cl_entity_t	*ent;
 	double		time;
 
 	if( cls.state != ca_active || cls.spectator )
@@ -1183,7 +1001,7 @@ void CL_PredictMovement( qboolean repredicting )
 
 	CL_SetUpPlayerPrediction( false, false );
 
-	if( cls.state != ca_active || !cl.validsequence )
+	if( !cl.validsequence )
 		return;
 
 	if(( cls.netchan.outgoing_sequence - cls.netchan.incoming_acknowledged ) >= CL_UPDATE_MASK )
@@ -1224,6 +1042,10 @@ void CL_PredictMovement( qboolean repredicting )
 
 	for( i = 1; i < CL_UPDATE_MASK && cls.netchan.incoming_acknowledged + i < cls.netchan.outgoing_sequence + stoppoint; i++ )
 	{
+		uint		current_command;
+		uint		current_command_mod;
+		qboolean		runfuncs;
+
 		current_command = cls.netchan.incoming_acknowledged + i;
 		current_command_mod = current_command & CL_UPDATE_MASK;
 
@@ -1238,10 +1060,6 @@ void CL_PredictMovement( qboolean repredicting )
 		if( to_cmd->senttime >= host.realtime )
 			break;
 
-		// now interpolate some fraction of the final frame
-		if( to_cmd->senttime != from_cmd->senttime )
-			f = (host.realtime - from_cmd->senttime) / (to_cmd->senttime - from_cmd->senttime) * 0.1;
-
 		from = to;
 		from_cmd = to_cmd;
 	}
@@ -1267,15 +1085,17 @@ void CL_PredictMovement( qboolean repredicting )
 			cl.local.onground = frame->playerstate[cl.playernum].onground;
 		else cl.local.onground = -1;
 
-		if( !repredicting || !CVAR_TO_BOOL( cl_lw ))
+		if( !repredicting || !cl_lw.value )
 			cl.local.viewmodel = to->client.viewmodel;
 		cl.local.repredicting = false;
 		cl.local.moving = false;
 		return;
 	}
 
-	f = bound( 0.0f, f, 1.0f );
+	// now interpolate some fraction of the final frame
-	f = 0.0;	// FIXME: make work, do revision
+	if( to_cmd->senttime != from_cmd->senttime )
+		f = bound( 0.0, (host.realtime - from_cmd->senttime) / (to_cmd->senttime - from_cmd->senttime) * 0.1, 1.0 );
+	else f = 0.0;
 
 	if( CL_PlayerTeleported( from, to ))
 	{
@@ -1297,12 +1117,12 @@ void CL_PredictMovement( qboolean repredicting )
 
 	cl.local.waterlevel = to->client.waterlevel;
 	cl.local.usehull = to->playerstate.usehull;
-	if( !repredicting || !CVAR_TO_BOOL( cl_lw ))
+	if( !repredicting || !cl_lw.value )
 		cl.local.viewmodel = to->client.viewmodel;
 
 	if( FBitSet( to->client.flags, FL_ONGROUND ))
 	{
-		ent = CL_GetEntityByIndex( cl.local.lastground );
+		cl_entity_t	*ent = CL_GetEntityByIndex( cl.local.lastground );
 		cl.local.onground = cl.local.lastground;
 		cl.local.moving = false;
 
@@ -1324,27 +1144,27 @@ void CL_PredictMovement( qboolean repredicting )
 	else
 	{
 		cl.local.onground = -1;
-		cl.local.moving = 0;
+		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;
+		vec3_t delta;
-		float	frac;
+		float frac;
 
 		// only decay timer once per frame
 		if( !repredicting )
 			cls.correction_time -= host.frametime;
 
 		// Make sure smoothtime is postive
-		if( cl_smoothtime->value <= 0.0 )
+		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.0 - 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 );