diff --git a/.vscode/launch.json b/.vscode/launch.json index 1a79c4e..4ad9393 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -9,7 +9,7 @@ "type": "cppdbg", "request": "launch", "program": "/home/neople/game/df_game_r", - "args": ["siroco15","start"], + "args": ["siroco18","start"], "stopAtEntry": false, "stopOnException": false, "cwd": "/home/neople/game/", diff --git a/build/.cmake/api/v1/reply/index-2024-07-25T02-27-21-0374.json b/build/.cmake/api/v1/reply/index-2024-08-02T14-34-06-0536.json similarity index 100% rename from build/.cmake/api/v1/reply/index-2024-07-25T02-27-21-0374.json rename to build/.cmake/api/v1/reply/index-2024-08-02T14-34-06-0536.json diff --git a/build/src/CMakeFiles/hook_aurora.dir/controller.cpp.o b/build/src/CMakeFiles/hook_aurora.dir/controller.cpp.o index 24ec611..0df4c5a 100644 Binary files a/build/src/CMakeFiles/hook_aurora.dir/controller.cpp.o and b/build/src/CMakeFiles/hook_aurora.dir/controller.cpp.o differ diff --git a/build/src/CMakeFiles/hook_aurora.dir/controller.cpp.o.d b/build/src/CMakeFiles/hook_aurora.dir/controller.cpp.o.d index 6db5adc..0fd2514 100644 --- a/build/src/CMakeFiles/hook_aurora.dir/controller.cpp.o.d +++ b/build/src/CMakeFiles/hook_aurora.dir/controller.cpp.o.d @@ -20,23 +20,14 @@ src/CMakeFiles/hook_aurora.dir/controller.cpp.o: \ /usr/include/execinfo.h /usr/include/elf.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/stdint.h \ /usr/include/stdint.h /usr/include/bits/wchar.h \ - /home/dnf_project/dnf_project/src/inline_hook.h /usr/include/stdio.h \ - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/stdlib.h /usr/include/bits/waitflags.h \ - /usr/include/bits/waitstatus.h /usr/include/xlocale.h \ - /usr/include/alloca.h /usr/include/bits/stdlib-float.h \ - /usr/include/string.h /usr/include/unistd.h \ - /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \ - /usr/include/bits/confname.h /usr/include/getopt.h \ - /usr/include/sys/mman.h /usr/include/bits/mman.h \ - /usr/include/bits/mman-linux.h /usr/include/c++/4.8.2/map \ - /usr/include/c++/4.8.2/bits/stl_tree.h \ - /usr/include/c++/4.8.2/bits/stl_algobase.h \ + /usr/include/c++/4.8.2/string \ /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/c++config.h \ /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/os_defines.h \ /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/cpu_defines.h \ + /usr/include/c++/4.8.2/bits/stringfwd.h \ + /usr/include/c++/4.8.2/bits/memoryfwd.h \ + /usr/include/c++/4.8.2/bits/char_traits.h \ + /usr/include/c++/4.8.2/bits/stl_algobase.h \ /usr/include/c++/4.8.2/bits/functexcept.h \ /usr/include/c++/4.8.2/bits/exception_defines.h \ /usr/include/c++/4.8.2/bits/cpp_type_traits.h \ @@ -50,6 +41,10 @@ src/CMakeFiles/hook_aurora.dir/controller.cpp.o: \ /usr/include/c++/4.8.2/bits/stl_iterator_base_funcs.h \ /usr/include/c++/4.8.2/debug/debug.h \ /usr/include/c++/4.8.2/bits/stl_iterator.h \ + /usr/include/c++/4.8.2/bits/postypes.h /usr/include/c++/4.8.2/cwchar \ + /usr/include/wchar.h /usr/include/stdio.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/stdarg.h \ + /usr/include/xlocale.h /usr/include/c++/4.8.2/cstdint \ /usr/include/c++/4.8.2/bits/allocator.h \ /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/c++allocator.h \ /usr/include/c++/4.8.2/ext/new_allocator.h /usr/include/c++/4.8.2/new \ @@ -57,25 +52,15 @@ src/CMakeFiles/hook_aurora.dir/controller.cpp.o: \ /usr/include/c++/4.8.2/bits/atomic_lockfree_defines.h \ /usr/include/c++/4.8.2/bits/exception_ptr.h \ /usr/include/c++/4.8.2/bits/nested_exception.h \ - /usr/include/c++/4.8.2/bits/memoryfwd.h \ - /usr/include/c++/4.8.2/bits/stl_function.h \ - /usr/include/c++/4.8.2/backward/binders.h \ - /usr/include/c++/4.8.2/bits/alloc_traits.h \ - /usr/include/c++/4.8.2/bits/ptr_traits.h \ - /usr/include/c++/4.8.2/bits/stl_map.h \ - /usr/include/c++/4.8.2/initializer_list /usr/include/c++/4.8.2/tuple \ - /usr/include/c++/4.8.2/utility /usr/include/c++/4.8.2/bits/stl_relops.h \ - /usr/include/c++/4.8.2/array /usr/include/c++/4.8.2/stdexcept \ - /usr/include/c++/4.8.2/string /usr/include/c++/4.8.2/bits/stringfwd.h \ - /usr/include/c++/4.8.2/bits/char_traits.h \ - /usr/include/c++/4.8.2/bits/postypes.h /usr/include/c++/4.8.2/cwchar \ - /usr/include/c++/4.8.2/cstdint /usr/include/c++/4.8.2/bits/localefwd.h \ + /usr/include/c++/4.8.2/bits/localefwd.h \ /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/c++locale.h \ /usr/include/c++/4.8.2/clocale /usr/include/locale.h \ /usr/include/bits/locale.h /usr/include/c++/4.8.2/iosfwd \ /usr/include/c++/4.8.2/cctype /usr/include/ctype.h \ /usr/include/c++/4.8.2/bits/ostream_insert.h \ /usr/include/c++/4.8.2/bits/cxxabi_forced.h \ + /usr/include/c++/4.8.2/bits/stl_function.h \ + /usr/include/c++/4.8.2/backward/binders.h \ /usr/include/c++/4.8.2/bits/range_access.h \ /usr/include/c++/4.8.2/bits/basic_string.h \ /usr/include/c++/4.8.2/ext/atomicity.h \ @@ -84,15 +69,31 @@ src/CMakeFiles/hook_aurora.dir/controller.cpp.o: \ /usr/include/pthread.h /usr/include/sched.h /usr/include/bits/sched.h \ /usr/include/bits/timex.h /usr/include/bits/setjmp.h \ /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/atomic_word.h \ + /usr/include/c++/4.8.2/initializer_list \ /usr/include/c++/4.8.2/ext/string_conversions.h \ - /usr/include/c++/4.8.2/cstdlib /usr/include/c++/4.8.2/cstdio \ - /usr/include/c++/4.8.2/cerrno /usr/include/errno.h \ - /usr/include/bits/errno.h /usr/include/linux/errno.h \ - /usr/include/asm/errno.h /usr/include/asm-generic/errno.h \ - /usr/include/asm-generic/errno-base.h \ + /usr/include/c++/4.8.2/cstdlib /usr/include/stdlib.h \ + /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \ + /usr/include/alloca.h /usr/include/bits/stdlib-float.h \ + /usr/include/c++/4.8.2/cstdio /usr/include/libio.h \ + /usr/include/_G_config.h /usr/include/bits/stdio_lim.h \ + /usr/include/bits/sys_errlist.h /usr/include/c++/4.8.2/cerrno \ + /usr/include/errno.h /usr/include/bits/errno.h \ + /usr/include/linux/errno.h /usr/include/asm/errno.h \ + /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \ /usr/include/c++/4.8.2/bits/functional_hash.h \ /usr/include/c++/4.8.2/bits/hash_bytes.h \ /usr/include/c++/4.8.2/bits/basic_string.tcc \ + /home/dnf_project/dnf_project/src/inline_hook.h /usr/include/string.h \ + /usr/include/unistd.h /usr/include/bits/posix_opt.h \ + /usr/include/bits/environments.h /usr/include/bits/confname.h \ + /usr/include/getopt.h /usr/include/sys/mman.h /usr/include/bits/mman.h \ + /usr/include/bits/mman-linux.h /usr/include/c++/4.8.2/map \ + /usr/include/c++/4.8.2/bits/stl_tree.h \ + /usr/include/c++/4.8.2/bits/alloc_traits.h \ + /usr/include/c++/4.8.2/bits/ptr_traits.h \ + /usr/include/c++/4.8.2/bits/stl_map.h /usr/include/c++/4.8.2/tuple \ + /usr/include/c++/4.8.2/utility /usr/include/c++/4.8.2/bits/stl_relops.h \ + /usr/include/c++/4.8.2/array /usr/include/c++/4.8.2/stdexcept \ /usr/include/c++/4.8.2/bits/uses_allocator.h \ /usr/include/c++/4.8.2/bits/stl_multimap.h /usr/include/c++/4.8.2/list \ /usr/include/c++/4.8.2/bits/stl_list.h \ diff --git a/build/src/CMakeFiles/hook_aurora.dir/df_main.cpp.o b/build/src/CMakeFiles/hook_aurora.dir/df_main.cpp.o index c9272c2..aee65ef 100644 Binary files a/build/src/CMakeFiles/hook_aurora.dir/df_main.cpp.o and b/build/src/CMakeFiles/hook_aurora.dir/df_main.cpp.o differ diff --git a/build/src/CMakeFiles/hook_aurora.dir/df_main.cpp.o.d b/build/src/CMakeFiles/hook_aurora.dir/df_main.cpp.o.d index 1ca35c9..a1e1bfb 100644 --- a/build/src/CMakeFiles/hook_aurora.dir/df_main.cpp.o.d +++ b/build/src/CMakeFiles/hook_aurora.dir/df_main.cpp.o.d @@ -17,30 +17,16 @@ src/CMakeFiles/hook_aurora.dir/df_main.cpp.o: \ /usr/include/execinfo.h /usr/include/elf.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/stdint.h \ /usr/include/stdint.h /usr/include/bits/wchar.h \ - /home/dnf_project/dnf_project/include/l_squirrel.h \ - /usr/local/include/squirrel.h /usr/local/include/sqconfig.h \ - /usr/local/include/sqstdaux.h /usr/local/include/sqstdblob.h \ - /usr/local/include/sqstdio.h /usr/local/include/sqstdmath.h \ - /usr/local/include/sqstdstring.h /usr/local/include/sqstdsystem.h \ - /home/dnf_project/dnf_project/include/Tool.h \ - /usr/include/c++/4.8.2/iostream \ + /usr/include/c++/4.8.2/string \ /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/c++config.h \ /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/os_defines.h \ /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/cpu_defines.h \ - /usr/include/c++/4.8.2/ostream /usr/include/c++/4.8.2/ios \ - /usr/include/c++/4.8.2/iosfwd /usr/include/c++/4.8.2/bits/stringfwd.h \ + /usr/include/c++/4.8.2/bits/stringfwd.h \ /usr/include/c++/4.8.2/bits/memoryfwd.h \ - /usr/include/c++/4.8.2/bits/postypes.h /usr/include/c++/4.8.2/cwchar \ - /usr/include/wchar.h /usr/include/stdio.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/stdarg.h \ - /usr/include/xlocale.h /usr/include/c++/4.8.2/exception \ - /usr/include/c++/4.8.2/bits/atomic_lockfree_defines.h \ - /usr/include/c++/4.8.2/bits/exception_ptr.h \ - /usr/include/c++/4.8.2/bits/exception_defines.h \ - /usr/include/c++/4.8.2/bits/nested_exception.h \ /usr/include/c++/4.8.2/bits/char_traits.h \ /usr/include/c++/4.8.2/bits/stl_algobase.h \ /usr/include/c++/4.8.2/bits/functexcept.h \ + /usr/include/c++/4.8.2/bits/exception_defines.h \ /usr/include/c++/4.8.2/bits/cpp_type_traits.h \ /usr/include/c++/4.8.2/ext/type_traits.h \ /usr/include/c++/4.8.2/ext/numeric_traits.h \ @@ -52,27 +38,34 @@ src/CMakeFiles/hook_aurora.dir/df_main.cpp.o: \ /usr/include/c++/4.8.2/bits/stl_iterator_base_funcs.h \ /usr/include/c++/4.8.2/debug/debug.h \ /usr/include/c++/4.8.2/bits/stl_iterator.h \ - /usr/include/c++/4.8.2/cstdint /usr/include/c++/4.8.2/bits/localefwd.h \ - /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/c++locale.h \ - /usr/include/c++/4.8.2/clocale /usr/include/locale.h \ - /usr/include/bits/locale.h /usr/include/c++/4.8.2/cctype \ - /usr/include/ctype.h /usr/include/c++/4.8.2/bits/ios_base.h \ - /usr/include/c++/4.8.2/ext/atomicity.h \ - /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/gthr.h \ - /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/gthr-default.h \ - /usr/include/pthread.h /usr/include/sched.h /usr/include/bits/sched.h \ - /usr/include/bits/timex.h /usr/include/bits/setjmp.h \ - /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/atomic_word.h \ - /usr/include/c++/4.8.2/bits/locale_classes.h \ - /usr/include/c++/4.8.2/string /usr/include/c++/4.8.2/bits/allocator.h \ + /usr/include/c++/4.8.2/bits/postypes.h /usr/include/c++/4.8.2/cwchar \ + /usr/include/wchar.h /usr/include/stdio.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/stdarg.h \ + /usr/include/xlocale.h /usr/include/c++/4.8.2/cstdint \ + /usr/include/c++/4.8.2/bits/allocator.h \ /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/c++allocator.h \ /usr/include/c++/4.8.2/ext/new_allocator.h /usr/include/c++/4.8.2/new \ + /usr/include/c++/4.8.2/exception \ + /usr/include/c++/4.8.2/bits/atomic_lockfree_defines.h \ + /usr/include/c++/4.8.2/bits/exception_ptr.h \ + /usr/include/c++/4.8.2/bits/nested_exception.h \ + /usr/include/c++/4.8.2/bits/localefwd.h \ + /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/c++locale.h \ + /usr/include/c++/4.8.2/clocale /usr/include/locale.h \ + /usr/include/bits/locale.h /usr/include/c++/4.8.2/iosfwd \ + /usr/include/c++/4.8.2/cctype /usr/include/ctype.h \ /usr/include/c++/4.8.2/bits/ostream_insert.h \ /usr/include/c++/4.8.2/bits/cxxabi_forced.h \ /usr/include/c++/4.8.2/bits/stl_function.h \ /usr/include/c++/4.8.2/backward/binders.h \ /usr/include/c++/4.8.2/bits/range_access.h \ /usr/include/c++/4.8.2/bits/basic_string.h \ + /usr/include/c++/4.8.2/ext/atomicity.h \ + /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/gthr.h \ + /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/gthr-default.h \ + /usr/include/pthread.h /usr/include/sched.h /usr/include/bits/sched.h \ + /usr/include/bits/timex.h /usr/include/bits/setjmp.h \ + /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/atomic_word.h \ /usr/include/c++/4.8.2/initializer_list \ /usr/include/c++/4.8.2/ext/string_conversions.h \ /usr/include/c++/4.8.2/cstdlib /usr/include/stdlib.h \ @@ -87,6 +80,15 @@ src/CMakeFiles/hook_aurora.dir/df_main.cpp.o: \ /usr/include/c++/4.8.2/bits/functional_hash.h \ /usr/include/c++/4.8.2/bits/hash_bytes.h \ /usr/include/c++/4.8.2/bits/basic_string.tcc \ + /home/dnf_project/dnf_project/include/l_squirrel.h \ + /usr/local/include/squirrel.h /usr/local/include/sqconfig.h \ + /usr/local/include/sqstdaux.h /usr/local/include/sqstdblob.h \ + /usr/local/include/sqstdio.h /usr/local/include/sqstdmath.h \ + /usr/local/include/sqstdstring.h /usr/local/include/sqstdsystem.h \ + /home/dnf_project/dnf_project/include/Tool.h \ + /usr/include/c++/4.8.2/iostream /usr/include/c++/4.8.2/ostream \ + /usr/include/c++/4.8.2/ios /usr/include/c++/4.8.2/bits/ios_base.h \ + /usr/include/c++/4.8.2/bits/locale_classes.h \ /usr/include/c++/4.8.2/bits/locale_classes.tcc \ /usr/include/c++/4.8.2/streambuf \ /usr/include/c++/4.8.2/bits/streambuf.tcc \ diff --git a/build/src/CMakeFiles/hook_aurora.dir/dispatch.cpp.o b/build/src/CMakeFiles/hook_aurora.dir/dispatch.cpp.o index c718730..b6ccdc9 100644 Binary files a/build/src/CMakeFiles/hook_aurora.dir/dispatch.cpp.o and b/build/src/CMakeFiles/hook_aurora.dir/dispatch.cpp.o differ diff --git a/build/src/CMakeFiles/hook_aurora.dir/dispatch.cpp.o.d b/build/src/CMakeFiles/hook_aurora.dir/dispatch.cpp.o.d index 46e7a0f..1bd7a44 100644 --- a/build/src/CMakeFiles/hook_aurora.dir/dispatch.cpp.o.d +++ b/build/src/CMakeFiles/hook_aurora.dir/dispatch.cpp.o.d @@ -18,23 +18,14 @@ src/CMakeFiles/hook_aurora.dir/dispatch.cpp.o: \ /usr/include/execinfo.h /usr/include/elf.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/stdint.h \ /usr/include/stdint.h /usr/include/bits/wchar.h \ - /home/dnf_project/dnf_project/src/inline_hook.h /usr/include/stdio.h \ - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/stdlib.h /usr/include/bits/waitflags.h \ - /usr/include/bits/waitstatus.h /usr/include/xlocale.h \ - /usr/include/alloca.h /usr/include/bits/stdlib-float.h \ - /usr/include/string.h /usr/include/unistd.h \ - /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \ - /usr/include/bits/confname.h /usr/include/getopt.h \ - /usr/include/sys/mman.h /usr/include/bits/mman.h \ - /usr/include/bits/mman-linux.h /usr/include/c++/4.8.2/map \ - /usr/include/c++/4.8.2/bits/stl_tree.h \ - /usr/include/c++/4.8.2/bits/stl_algobase.h \ + /usr/include/c++/4.8.2/string \ /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/c++config.h \ /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/os_defines.h \ /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/cpu_defines.h \ + /usr/include/c++/4.8.2/bits/stringfwd.h \ + /usr/include/c++/4.8.2/bits/memoryfwd.h \ + /usr/include/c++/4.8.2/bits/char_traits.h \ + /usr/include/c++/4.8.2/bits/stl_algobase.h \ /usr/include/c++/4.8.2/bits/functexcept.h \ /usr/include/c++/4.8.2/bits/exception_defines.h \ /usr/include/c++/4.8.2/bits/cpp_type_traits.h \ @@ -48,6 +39,10 @@ src/CMakeFiles/hook_aurora.dir/dispatch.cpp.o: \ /usr/include/c++/4.8.2/bits/stl_iterator_base_funcs.h \ /usr/include/c++/4.8.2/debug/debug.h \ /usr/include/c++/4.8.2/bits/stl_iterator.h \ + /usr/include/c++/4.8.2/bits/postypes.h /usr/include/c++/4.8.2/cwchar \ + /usr/include/wchar.h /usr/include/stdio.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/stdarg.h \ + /usr/include/xlocale.h /usr/include/c++/4.8.2/cstdint \ /usr/include/c++/4.8.2/bits/allocator.h \ /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/c++allocator.h \ /usr/include/c++/4.8.2/ext/new_allocator.h /usr/include/c++/4.8.2/new \ @@ -55,25 +50,15 @@ src/CMakeFiles/hook_aurora.dir/dispatch.cpp.o: \ /usr/include/c++/4.8.2/bits/atomic_lockfree_defines.h \ /usr/include/c++/4.8.2/bits/exception_ptr.h \ /usr/include/c++/4.8.2/bits/nested_exception.h \ - /usr/include/c++/4.8.2/bits/memoryfwd.h \ - /usr/include/c++/4.8.2/bits/stl_function.h \ - /usr/include/c++/4.8.2/backward/binders.h \ - /usr/include/c++/4.8.2/bits/alloc_traits.h \ - /usr/include/c++/4.8.2/bits/ptr_traits.h \ - /usr/include/c++/4.8.2/bits/stl_map.h \ - /usr/include/c++/4.8.2/initializer_list /usr/include/c++/4.8.2/tuple \ - /usr/include/c++/4.8.2/utility /usr/include/c++/4.8.2/bits/stl_relops.h \ - /usr/include/c++/4.8.2/array /usr/include/c++/4.8.2/stdexcept \ - /usr/include/c++/4.8.2/string /usr/include/c++/4.8.2/bits/stringfwd.h \ - /usr/include/c++/4.8.2/bits/char_traits.h \ - /usr/include/c++/4.8.2/bits/postypes.h /usr/include/c++/4.8.2/cwchar \ - /usr/include/c++/4.8.2/cstdint /usr/include/c++/4.8.2/bits/localefwd.h \ + /usr/include/c++/4.8.2/bits/localefwd.h \ /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/c++locale.h \ /usr/include/c++/4.8.2/clocale /usr/include/locale.h \ /usr/include/bits/locale.h /usr/include/c++/4.8.2/iosfwd \ /usr/include/c++/4.8.2/cctype /usr/include/ctype.h \ /usr/include/c++/4.8.2/bits/ostream_insert.h \ /usr/include/c++/4.8.2/bits/cxxabi_forced.h \ + /usr/include/c++/4.8.2/bits/stl_function.h \ + /usr/include/c++/4.8.2/backward/binders.h \ /usr/include/c++/4.8.2/bits/range_access.h \ /usr/include/c++/4.8.2/bits/basic_string.h \ /usr/include/c++/4.8.2/ext/atomicity.h \ @@ -82,15 +67,31 @@ src/CMakeFiles/hook_aurora.dir/dispatch.cpp.o: \ /usr/include/pthread.h /usr/include/sched.h /usr/include/bits/sched.h \ /usr/include/bits/timex.h /usr/include/bits/setjmp.h \ /usr/include/c++/4.8.2/x86_64-redhat-linux/32/bits/atomic_word.h \ + /usr/include/c++/4.8.2/initializer_list \ /usr/include/c++/4.8.2/ext/string_conversions.h \ - /usr/include/c++/4.8.2/cstdlib /usr/include/c++/4.8.2/cstdio \ - /usr/include/c++/4.8.2/cerrno /usr/include/errno.h \ - /usr/include/bits/errno.h /usr/include/linux/errno.h \ - /usr/include/asm/errno.h /usr/include/asm-generic/errno.h \ - /usr/include/asm-generic/errno-base.h \ + /usr/include/c++/4.8.2/cstdlib /usr/include/stdlib.h \ + /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \ + /usr/include/alloca.h /usr/include/bits/stdlib-float.h \ + /usr/include/c++/4.8.2/cstdio /usr/include/libio.h \ + /usr/include/_G_config.h /usr/include/bits/stdio_lim.h \ + /usr/include/bits/sys_errlist.h /usr/include/c++/4.8.2/cerrno \ + /usr/include/errno.h /usr/include/bits/errno.h \ + /usr/include/linux/errno.h /usr/include/asm/errno.h \ + /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \ /usr/include/c++/4.8.2/bits/functional_hash.h \ /usr/include/c++/4.8.2/bits/hash_bytes.h \ /usr/include/c++/4.8.2/bits/basic_string.tcc \ + /home/dnf_project/dnf_project/src/inline_hook.h /usr/include/string.h \ + /usr/include/unistd.h /usr/include/bits/posix_opt.h \ + /usr/include/bits/environments.h /usr/include/bits/confname.h \ + /usr/include/getopt.h /usr/include/sys/mman.h /usr/include/bits/mman.h \ + /usr/include/bits/mman-linux.h /usr/include/c++/4.8.2/map \ + /usr/include/c++/4.8.2/bits/stl_tree.h \ + /usr/include/c++/4.8.2/bits/alloc_traits.h \ + /usr/include/c++/4.8.2/bits/ptr_traits.h \ + /usr/include/c++/4.8.2/bits/stl_map.h /usr/include/c++/4.8.2/tuple \ + /usr/include/c++/4.8.2/utility /usr/include/c++/4.8.2/bits/stl_relops.h \ + /usr/include/c++/4.8.2/array /usr/include/c++/4.8.2/stdexcept \ /usr/include/c++/4.8.2/bits/uses_allocator.h \ /usr/include/c++/4.8.2/bits/stl_multimap.h /usr/include/c++/4.8.2/list \ /usr/include/c++/4.8.2/bits/stl_list.h \ diff --git a/build/src/CMakeFiles/hook_aurora.dir/l_socket.cpp.o b/build/src/CMakeFiles/hook_aurora.dir/l_socket.cpp.o index ed4bc38..b8ed456 100644 Binary files a/build/src/CMakeFiles/hook_aurora.dir/l_socket.cpp.o and b/build/src/CMakeFiles/hook_aurora.dir/l_socket.cpp.o differ diff --git a/build/src/CMakeFiles/hook_aurora.dir/l_squirrel.cpp.o b/build/src/CMakeFiles/hook_aurora.dir/l_squirrel.cpp.o index 58af5cc..f066bd3 100644 Binary files a/build/src/CMakeFiles/hook_aurora.dir/l_squirrel.cpp.o and b/build/src/CMakeFiles/hook_aurora.dir/l_squirrel.cpp.o differ diff --git a/include/l_socket.h b/include/l_socket.h index dfaef47..7565ecd 100644 --- a/include/l_socket.h +++ b/include/l_socket.h @@ -176,6 +176,11 @@ public: sq_pushstring(v, Str.c_str(), -1); sq_call(v, 2, SQFalse, SQTrue); // calls the function } + else + { + std::cout << "缓冲区大小: " << PackData.size() << std::endl; + std::cout << "包内容: " << Str << std::endl; + } sq_settop(v, top); // restores the original stack size TestCode++; diff --git a/src/df_main.cpp b/src/df_main.cpp index 617594b..ef4321a 100644 --- a/src/df_main.cpp +++ b/src/df_main.cpp @@ -48,6 +48,8 @@ SUBHOOK_INIT(CUserWorkPerFiveMin, 0x8652F0C); SUBHOOK_INIT(TimerDispatcher_dispatch, 0x8632A18); SUBHOOK_INIT(SetUserMaxLevel, 0x0868fec8); +SUBHOOK_INIT(initWorldMapScript, 0x0817B950); + // SUBHOOK_INIT(AddMob, 0x08151612); //_setCharacInfoDetail @@ -748,6 +750,14 @@ void *_SetUserMaxLevel(void *CUser, int level) return CUser; } +int _initWorldMapScript(void *a1, char *a2, char *a3) +{ + int ret = initWorldMapScript(a1, a2, a3); + std::cout << a1 << std::endl; + std::cout << a2 << std::endl; + return ret; +} + int _TimerDispatcher_dispatch(void *A, void *B) { int ret = TimerDispatcher_dispatch(A, B); @@ -861,6 +871,9 @@ void Lenheart() // 每帧执行 SUBHOOK_SETUP(TimerDispatcher_dispatch); + + SUBHOOK_SETUP(initWorldMapScript); + // 设置角色等级 // SUBHOOK_SETUP(SetUserMaxLevel); diff --git a/src/import.h b/src/import.h index 4d8a24b..5bb2852 100644 --- a/src/import.h +++ b/src/import.h @@ -5,6 +5,7 @@ #include #include #include +#include #define PADALIGN(x, mask) ((x + mask) & (~(x % mask))) @@ -114,4 +115,6 @@ typedef void *(*fnSetUserMaxLevel)(void *CUser, int level); typedef int (*fnAddMob)(int a1, int a2); +typedef int (*fninitWorldMapScript)(void *a1, void *a2, void *a3); + __END_DECLS \ No newline at end of file