Skip to content

Commit

Permalink
Add Heretic mobj_t info
Browse files Browse the repository at this point in the history
Needs tidying up, but at least I got it to compile. The idea is to copy everything in h_info.c to the states and mobjinfo arrays at startup.
  • Loading branch information
bradharding committed Apr 23, 2018
1 parent 5c2879b commit 45e36c7
Show file tree
Hide file tree
Showing 9 changed files with 8,009 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Expand Up @@ -62,7 +62,7 @@ INCLUDE(FindPkgConfig)
PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2)
PKG_SEARCH_MODULE(SDL2_MIXER REQUIRED SDL2_mixer)
PKG_SEARCH_MODULE(SDL2_IMAGE REQUIRED SDL2_image)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/doom/ ${SDL2_INCLUDE_DIRS} ${SDL2_MIXER_INCLUDE_DIRS} ${SDL2_IMAGE_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src ${SDL2_INCLUDE_DIRS} ${SDL2_MIXER_INCLUDE_DIRS} ${SDL2_IMAGE_INCLUDE_DIRS})

IF (APPLE)
FIND_LIBRARY(COCOA_LIBRARY Cocoa)
Expand Down
6 changes: 4 additions & 2 deletions msvc/doomretro.vcxproj
Expand Up @@ -349,7 +349,8 @@
<ClInclude Include="..\src\c_cmds.h" />
<ClInclude Include="..\src\c_console.h" />
<ClInclude Include="..\src\doomkeys.h" />
<ClInclude Include="..\src\doom\info.h" />
<ClInclude Include="..\src\h_info.h" />
<ClInclude Include="..\src\info.h" />
<ClInclude Include="..\src\i_midirpc.h" />
<ClInclude Include="..\src\r_patch.h" />
<ClInclude Include="..\src\sc_man.h" />
Expand Down Expand Up @@ -429,9 +430,10 @@
<ClCompile Include="..\src\c_cmds.c" />
<ClCompile Include="..\src\c_console.c" />
<ClCompile Include="..\src\doomstat.c" />
<ClCompile Include="..\src\doom\info.c" />
<ClCompile Include="..\src\dstrings.c" />
<ClCompile Include="..\src\d_deh.c" />
<ClCompile Include="..\src\h_info.c" />
<ClCompile Include="..\src\info.c" />
<ClCompile Include="..\src\i_midirpc.c" />
<ClCompile Include="..\src\i_music.c" />
<ClCompile Include="..\src\i_sound.c" />
Expand Down
2 changes: 1 addition & 1 deletion src/d_items.c
Expand Up @@ -37,7 +37,7 @@
*/

#include "d_items.h"
#include "doom/info.h"
#include "info.h"

weaponinfo_t weaponinfo[NUMWEAPONS] =
{
Expand Down
6,233 changes: 6,233 additions & 0 deletions src/h_info.c

Large diffs are not rendered by default.

0 comments on commit 45e36c7

Please sign in to comment.