Skip to content

Commit

Permalink
fixed crashes, added esp snaplines, fixed sdk, etc
Browse files Browse the repository at this point in the history
  • Loading branch information
rdbo committed Jan 13, 2021
1 parent 13ed05c commit 5c40fae
Show file tree
Hide file tree
Showing 188 changed files with 6,697 additions and 3,374 deletions.
30 changes: 25 additions & 5 deletions AssaultCube-Multihack.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<AdditionalDependencies>OPENGL32.lib;EFX-Util.lib;enet.lib;jpeg.lib;ogg.lib;OpenAL32.lib;SDL.lib;SDL_image.lib;vorbis.lib;vorbisfile.lib;winmm.lib;ws2_32.lib;zdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>OPENGL32.lib;EFX-Util.lib;enet.lib;jpeg.lib;libcurl.lib;libintl.lib;libvorbisfile.lib;ogg.lib;OpenAL32.lib;SDL.lib;SDL_image.lib;SDL_ttf.lib;vorbis.lib;winmm.lib;wldap32.lib;ws2_32.lib;zdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProjectDir)include\assaultcube\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
Expand All @@ -115,7 +115,7 @@
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<AdditionalDependencies>OPENGL32.lib;EFX-Util.lib;enet.lib;jpeg.lib;ogg.lib;OpenAL32.lib;SDL.lib;SDL_image.lib;vorbis.lib;vorbisfile.lib;winmm.lib;ws2_32.lib;zdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>OPENGL32.lib;EFX-Util.lib;enet.lib;jpeg.lib;libcurl.lib;libintl.lib;libvorbisfile.lib;ogg.lib;OpenAL32.lib;SDL.lib;SDL_image.lib;SDL_ttf.lib;vorbis.lib;winmm.lib;wldap32.lib;ws2_32.lib;zdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProjectDir)include\assaultcube\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
Expand All @@ -136,7 +136,7 @@
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>OPENGL32.lib;EFX-Util.lib;enet.lib;jpeg.lib;ogg.lib;OpenAL32.lib;SDL.lib;SDL_image.lib;vorbis.lib;vorbisfile.lib;winmm.lib;ws2_32.lib;zdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>OPENGL32.lib;EFX-Util.lib;enet.lib;jpeg.lib;libcurl.lib;libintl.lib;libvorbisfile.lib;ogg.lib;OpenAL32.lib;SDL.lib;SDL_image.lib;SDL_ttf.lib;vorbis.lib;winmm.lib;wldap32.lib;ws2_32.lib;zdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProjectDir)include\assaultcube\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
Expand All @@ -157,7 +157,7 @@
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>OPENGL32.lib;EFX-Util.lib;enet.lib;jpeg.lib;ogg.lib;OpenAL32.lib;SDL.lib;SDL_image.lib;vorbis.lib;vorbisfile.lib;winmm.lib;ws2_32.lib;zdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>OPENGL32.lib;EFX-Util.lib;enet.lib;jpeg.lib;libcurl.lib;libintl.lib;libvorbisfile.lib;ogg.lib;OpenAL32.lib;SDL.lib;SDL_image.lib;SDL_ttf.lib;vorbis.lib;winmm.lib;wldap32.lib;ws2_32.lib;zdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProjectDir)include\assaultcube\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
Expand Down Expand Up @@ -211,7 +211,9 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="src\base.cpp" />
<ClCompile Include="src\game.cpp" />
<ClCompile Include="src\hacks\Crosshair.cpp" />
<ClCompile Include="src\hacks\ESP_Snaplines.cpp" />
<ClCompile Include="src\hacks\Teleport.cpp" />
<ClCompile Include="src\hooks\c2sinfo.cpp" />
<ClCompile Include="src\hooks\drawcrosshair.cpp" />
Expand All @@ -238,6 +240,13 @@
<ClInclude Include="include\assaultcube\include\AL\xram.h" />
<ClInclude Include="include\assaultcube\include\begin_code.h" />
<ClInclude Include="include\assaultcube\include\close_code.h" />
<ClInclude Include="include\assaultcube\include\curl\curl.h" />
<ClInclude Include="include\assaultcube\include\curl\curlver.h" />
<ClInclude Include="include\assaultcube\include\curl\easy.h" />
<ClInclude Include="include\assaultcube\include\curl\mprintf.h" />
<ClInclude Include="include\assaultcube\include\curl\multi.h" />
<ClInclude Include="include\assaultcube\include\curl\stdcheaders.h" />
<ClInclude Include="include\assaultcube\include\curl\types.h" />
<ClInclude Include="include\assaultcube\include\enet\callbacks.h" />
<ClInclude Include="include\assaultcube\include\enet\enet.h" />
<ClInclude Include="include\assaultcube\include\enet\list.h" />
Expand All @@ -252,6 +261,7 @@
<ClInclude Include="include\assaultcube\include\jerror.h" />
<ClInclude Include="include\assaultcube\include\jmorecfg.h" />
<ClInclude Include="include\assaultcube\include\jpeglib.h" />
<ClInclude Include="include\assaultcube\include\libintl.h" />
<ClInclude Include="include\assaultcube\include\ogg\ogg.h" />
<ClInclude Include="include\assaultcube\include\ogg\os_types.h" />
<ClInclude Include="include\assaultcube\include\SDL.h" />
Expand Down Expand Up @@ -285,9 +295,14 @@
<ClInclude Include="include\assaultcube\include\SDL_syswm.h" />
<ClInclude Include="include\assaultcube\include\SDL_thread.h" />
<ClInclude Include="include\assaultcube\include\SDL_timer.h" />
<ClInclude Include="include\assaultcube\include\SDL_ttf.h" />
<ClInclude Include="include\assaultcube\include\SDL_types.h" />
<ClInclude Include="include\assaultcube\include\SDL_version.h" />
<ClInclude Include="include\assaultcube\include\SDL_video.h" />
<ClInclude Include="include\assaultcube\include\utf8.h" />
<ClInclude Include="include\assaultcube\include\utf8\checked.h" />
<ClInclude Include="include\assaultcube\include\utf8\core.h" />
<ClInclude Include="include\assaultcube\include\utf8\unchecked.h" />
<ClInclude Include="include\assaultcube\include\vorbis\codec.h" />
<ClInclude Include="include\assaultcube\include\vorbis\vorbisenc.h" />
<ClInclude Include="include\assaultcube\include\vorbis\vorbisfile.h" />
Expand All @@ -305,6 +320,7 @@
<ClInclude Include="include\assaultcube\src\entity.h" />
<ClInclude Include="include\assaultcube\src\geom.h" />
<ClInclude Include="include\assaultcube\src\hudgun.h" />
<ClInclude Include="include\assaultcube\src\i18n.h" />
<ClInclude Include="include\assaultcube\src\jpegenc.h" />
<ClInclude Include="include\assaultcube\src\md2.h" />
<ClInclude Include="include\assaultcube\src\md3.h" />
Expand Down Expand Up @@ -350,13 +366,17 @@
<Library Include="include\assaultcube\lib\EFX-Util.lib" />
<Library Include="include\assaultcube\lib\enet.lib" />
<Library Include="include\assaultcube\lib\jpeg.lib" />
<Library Include="include\assaultcube\lib\libcurl.lib" />
<Library Include="include\assaultcube\lib\libintl.lib" />
<Library Include="include\assaultcube\lib\libvorbisfile.lib" />
<Library Include="include\assaultcube\lib\ogg.lib" />
<Library Include="include\assaultcube\lib\OpenAL32.lib" />
<Library Include="include\assaultcube\lib\SDL.lib" />
<Library Include="include\assaultcube\lib\SDL_image.lib" />
<Library Include="include\assaultcube\lib\SDL_ttf.lib" />
<Library Include="include\assaultcube\lib\vorbis.lib" />
<Library Include="include\assaultcube\lib\vorbisfile.lib" />
<Library Include="include\assaultcube\lib\winmm.lib" />
<Library Include="include\assaultcube\lib\wldap32.lib" />
<Library Include="include\assaultcube\lib\ws2_32.lib" />
<Library Include="include\assaultcube\lib\zdll.lib" />
</ItemGroup>
Expand Down
53 changes: 53 additions & 0 deletions AssaultCube-Multihack.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@
<ClCompile Include="src\hooks\drawcrosshair.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\hacks\ESP_Snaplines.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\game.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\pch.h">
Expand Down Expand Up @@ -413,6 +419,48 @@
<ClInclude Include="src\game.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\assaultcube\include\curl\curl.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\assaultcube\include\curl\curlver.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\assaultcube\include\curl\easy.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\assaultcube\include\curl\mprintf.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\assaultcube\include\curl\multi.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\assaultcube\include\curl\stdcheaders.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\assaultcube\include\curl\types.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\assaultcube\include\utf8\checked.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\assaultcube\include\utf8\core.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\assaultcube\include\utf8\unchecked.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\assaultcube\include\libintl.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\assaultcube\include\SDL_ttf.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\assaultcube\include\utf8.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\assaultcube\src\i18n.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Text Include="build\readme.txt" />
Expand All @@ -431,5 +479,10 @@
<Library Include="include\assaultcube\lib\winmm.lib" />
<Library Include="include\assaultcube\lib\ws2_32.lib" />
<Library Include="include\assaultcube\lib\zdll.lib" />
<Library Include="include\assaultcube\lib\libcurl.lib" />
<Library Include="include\assaultcube\lib\libintl.lib" />
<Library Include="include\assaultcube\lib\libvorbisfile.lib" />
<Library Include="include\assaultcube\lib\SDL_ttf.lib" />
<Library Include="include\assaultcube\lib\wldap32.lib" />
</ItemGroup>
</Project>
Binary file removed build/Win32/Debug/AssaultCube-Multihack.dll
Binary file not shown.
Binary file removed build/Win32/Debug/AssaultCube-Multihack.ilk
Binary file not shown.
Binary file removed build/Win32/Debug/AssaultCube-Multihack.pdb
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
15 changes: 0 additions & 15 deletions build/Win32/Debug/bin/AssaultCube-Multihack.log

This file was deleted.

Binary file removed build/Win32/Debug/bin/AssaultCube-Multihack.pch
Binary file not shown.
Binary file removed build/Win32/Debug/bin/Crosshair.obj
Binary file not shown.
Binary file removed build/Win32/Debug/bin/ShowCursor.obj
Binary file not shown.
Binary file removed build/Win32/Debug/bin/SwapBuffers.obj
Binary file not shown.
Binary file removed build/Win32/Debug/bin/Teleport.obj
Binary file not shown.
Binary file removed build/Win32/Debug/bin/WndProc.obj
Binary file not shown.
Binary file removed build/Win32/Debug/bin/base.obj
Binary file not shown.
Binary file removed build/Win32/Debug/bin/c2sinfo.obj
Binary file not shown.
Binary file removed build/Win32/Debug/bin/drawcrosshair.obj
Binary file not shown.
Binary file removed build/Win32/Debug/bin/hooks.obj
Binary file not shown.
Binary file removed build/Win32/Debug/bin/imgui.obj
Binary file not shown.
Binary file removed build/Win32/Debug/bin/imgui_demo.obj
Binary file not shown.
Binary file removed build/Win32/Debug/bin/imgui_draw.obj
Binary file not shown.
Binary file removed build/Win32/Debug/bin/imgui_impl_opengl2.obj
Binary file not shown.
Binary file removed build/Win32/Debug/bin/imgui_impl_win32.obj
Binary file not shown.
Binary file removed build/Win32/Debug/bin/imgui_tables.obj
Binary file not shown.
Binary file removed build/Win32/Debug/bin/imgui_widgets.obj
Binary file not shown.
Binary file removed build/Win32/Debug/bin/libmem.obj
Binary file not shown.
Binary file removed build/Win32/Debug/bin/main.obj
Binary file not shown.
Binary file removed build/Win32/Debug/bin/movelocalplayer.obj
Binary file not shown.
Binary file removed build/Win32/Debug/bin/pch.obj
Binary file not shown.
Binary file removed build/Win32/Debug/bin/servertoclient.obj
Binary file not shown.
Binary file removed build/Win32/Debug/bin/vc142.idb
Binary file not shown.
Binary file removed build/Win32/Debug/bin/vc142.pdb
Binary file not shown.
Binary file removed build/Win32/Release/AssaultCube-Multihack.dll
Binary file not shown.
Binary file removed build/Win32/Release/AssaultCube-Multihack.iobj
Binary file not shown.
Binary file removed build/Win32/Release/AssaultCube-Multihack.ipdb
Binary file not shown.
Binary file removed build/Win32/Release/AssaultCube-Multihack.pdb
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
8 changes: 0 additions & 8 deletions build/Win32/Release/bin/AssaultCube-Multihack.log

This file was deleted.

Binary file removed build/Win32/Release/bin/AssaultCube-Multihack.pch
Binary file not shown.
Binary file removed build/Win32/Release/bin/Crosshair.obj
Binary file not shown.
Binary file removed build/Win32/Release/bin/ShowCursor.obj
Binary file not shown.
Binary file removed build/Win32/Release/bin/SwapBuffers.obj
Binary file not shown.
Binary file removed build/Win32/Release/bin/Teleport.obj
Binary file not shown.
Binary file removed build/Win32/Release/bin/WndProc.obj
Binary file not shown.
Binary file removed build/Win32/Release/bin/base.obj
Binary file not shown.
Binary file removed build/Win32/Release/bin/c2sinfo.obj
Binary file not shown.
Binary file removed build/Win32/Release/bin/hooks.obj
Binary file not shown.
Binary file removed build/Win32/Release/bin/imgui.obj
Binary file not shown.
Binary file removed build/Win32/Release/bin/imgui_demo.obj
Binary file not shown.
Binary file removed build/Win32/Release/bin/imgui_draw.obj
Binary file not shown.
Binary file removed build/Win32/Release/bin/imgui_impl_opengl2.obj
Binary file not shown.
Binary file removed build/Win32/Release/bin/imgui_impl_win32.obj
Binary file not shown.
Binary file removed build/Win32/Release/bin/imgui_tables.obj
Binary file not shown.
Binary file removed build/Win32/Release/bin/imgui_widgets.obj
Binary file not shown.
Binary file removed build/Win32/Release/bin/libmem.obj
Binary file not shown.
Binary file removed build/Win32/Release/bin/main.obj
Binary file not shown.
Binary file removed build/Win32/Release/bin/movelocalplayer.obj
Binary file not shown.
Binary file removed build/Win32/Release/bin/pch.obj
Binary file not shown.
Binary file removed build/Win32/Release/bin/servertoclient.obj
Binary file not shown.
Binary file removed build/Win32/Release/bin/vc142.pdb
Binary file not shown.
11 changes: 11 additions & 0 deletions include/assaultcube/include/AL/XiphLicense.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
� 2006, Xiph.Org Foundation

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

Neither the name of the Xiph.org Foundation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

This software is provided by the copyright holders and contributors �as is� and any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the foundation or contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage.
6 changes: 2 additions & 4 deletions include/assaultcube/include/GL/glext.h
Original file line number Diff line number Diff line change
Expand Up @@ -3053,19 +3053,17 @@ typedef ptrdiff_t GLintptr;
typedef ptrdiff_t GLsizeiptr;
#endif

#if !defined(GL_ARB_vertex_buffer_object) && !defined(__APPLE__)
#ifndef GL_ARB_vertex_buffer_object
/* GL types for handling large vertex buffer objects */
typedef ptrdiff_t GLintptrARB;
typedef ptrdiff_t GLsizeiptrARB;
#endif

#ifndef GL_ARB_shader
#ifndef GL_ARB_shader_objects
/* GL types for handling shader object handles and program/shader text */
typedef char GLcharARB; /* native character */
#ifndef __APPLE__
typedef unsigned int GLhandleARB; /* shader object handle */
#endif
#endif

/* GL types for "half" precision (s10e5) float data in host memory */
#ifndef GL_ARB_half_float_pixel
Expand Down
Loading

0 comments on commit 5c40fae

Please sign in to comment.