Split 2d mode editor stuff that remained in engine.c into 2d.c.

git-svn-id: https://svn.eduke32.com/eduke32@5790 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2016-06-21 00:33:14 +00:00
parent 205a757109
commit 3eb979f8da
8 changed files with 1398 additions and 1388 deletions

View file

@ -43,6 +43,7 @@ ENGINE_OBJS = \
crc32 \ crc32 \
defs \ defs \
engine \ engine \
2d \
hash \ hash \
palette \ palette \
polymost \ polymost \

View file

@ -137,6 +137,7 @@ ENGINE_OBJS= \
$(ENGINE_OBJ)\defs.$o \ $(ENGINE_OBJ)\defs.$o \
$(ENGINE_OBJ)\colmatch.$o \ $(ENGINE_OBJ)\colmatch.$o \
$(ENGINE_OBJ)\engine.$o \ $(ENGINE_OBJ)\engine.$o \
$(ENGINE_OBJ)\2d.$o \
$(ENGINE_OBJ)\hash.$o \ $(ENGINE_OBJ)\hash.$o \
$(ENGINE_OBJ)\palette.$o \ $(ENGINE_OBJ)\palette.$o \
$(ENGINE_OBJ)\glbuild.$o \ $(ENGINE_OBJ)\glbuild.$o \

View file

@ -10,6 +10,7 @@ $(ENGINE_OBJ)/config.$o: $(ENGINE_SRC)/config.c $(ENGINE_INC)/compat.h $(ENGINE_
$(ENGINE_OBJ)/crc32.$o: $(ENGINE_SRC)/crc32.c $(ENGINE_INC)/crc32.h $(ENGINE_OBJ)/crc32.$o: $(ENGINE_SRC)/crc32.c $(ENGINE_INC)/crc32.h
$(ENGINE_OBJ)/defs.$o: $(ENGINE_SRC)/defs.c $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/scriptfile.h $(ENGINE_INC)/compat.h $(ENGINE_OBJ)/defs.$o: $(ENGINE_SRC)/defs.c $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/scriptfile.h $(ENGINE_INC)/compat.h
$(ENGINE_OBJ)/engine.$o: $(ENGINE_SRC)/engine.c $(ENGINE_INC)/compat.h $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/pragmas.h $(ENGINE_INC)/cache1d.h $(ENGINE_INC)/a.h $(ENGINE_INC)/osd.h $(ENGINE_INC)/baselayer.h $(ENGINE_SRC)/engine_priv.h $(ENGINE_SRC)/engine_oldmap.h $(ENGINE_INC)/polymost.h $(ENGINE_INC)/hightile.h $(ENGINE_INC)/mdsprite.h $(ENGINE_INC)/polymer.h $(ENGINE_OBJ)/engine.$o: $(ENGINE_SRC)/engine.c $(ENGINE_INC)/compat.h $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/pragmas.h $(ENGINE_INC)/cache1d.h $(ENGINE_INC)/a.h $(ENGINE_INC)/osd.h $(ENGINE_INC)/baselayer.h $(ENGINE_SRC)/engine_priv.h $(ENGINE_SRC)/engine_oldmap.h $(ENGINE_INC)/polymost.h $(ENGINE_INC)/hightile.h $(ENGINE_INC)/mdsprite.h $(ENGINE_INC)/polymer.h
$(ENGINE_OBJ)/2d.$o: $(ENGINE_SRC)/2d.c $(ENGINE_INC)/2d.h
$(ENGINE_OBJ)/hash.$o: $(ENGINE_SRC)/hash.c $(ENGINE_INC)/hash.h $(ENGINE_OBJ)/hash.$o: $(ENGINE_SRC)/hash.c $(ENGINE_INC)/hash.h
$(ENGINE_OBJ)/palette.$o: $(ENGINE_SRC)/palette.c $(ENGINE_INC)/palette.h $(ENGINE_OBJ)/palette.$o: $(ENGINE_SRC)/palette.c $(ENGINE_INC)/palette.h
$(ENGINE_OBJ)/polymost.$o: $(ENGINE_SRC)/polymost.c $(ENGINE_INC)/lz4.h $(ENGINE_INC)/compat.h $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_SRC)/engine_priv.h $(ENGINE_INC)/polymost.h $(ENGINE_INC)/hightile.h $(ENGINE_INC)/mdsprite.h $(ENGINE_INC)/texcache.h $(ENGINE_OBJ)/polymost.$o: $(ENGINE_SRC)/polymost.c $(ENGINE_INC)/lz4.h $(ENGINE_INC)/compat.h $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_SRC)/engine_priv.h $(ENGINE_INC)/polymost.h $(ENGINE_INC)/hightile.h $(ENGINE_INC)/mdsprite.h $(ENGINE_INC)/texcache.h

View file

@ -644,6 +644,7 @@ EXTERN int16_t maskwall[MAXWALLSB], maskwallcnt;
EXTERN int16_t thewall[MAXWALLSB]; EXTERN int16_t thewall[MAXWALLSB];
EXTERN tspritetype *tspriteptr[MAXSPRITESONSCREEN + 1]; EXTERN tspritetype *tspriteptr[MAXSPRITESONSCREEN + 1];
EXTERN int32_t wx1, wy1, wx2, wy2;
EXTERN int32_t xdim, ydim, numpages; EXTERN int32_t xdim, ydim, numpages;
EXTERN int32_t yxaspect, viewingrange; EXTERN int32_t yxaspect, viewingrange;
EXTERN intptr_t *ylookup; EXTERN intptr_t *ylookup;

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -253,6 +253,7 @@
<ClInclude Include="source\enet\include\enet\win32.h" /> <ClInclude Include="source\enet\include\enet\win32.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="build\src\2d.c" />
<ClCompile Include="build\src\a-c.c" /> <ClCompile Include="build\src\a-c.c" />
<ClCompile Include="build\src\baselayer.c" /> <ClCompile Include="build\src\baselayer.c" />
<ClCompile Include="build\src\build.c" /> <ClCompile Include="build\src\build.c" />

View file

@ -941,6 +941,9 @@
<ClCompile Include="build\src\palette.c"> <ClCompile Include="build\src\palette.c">
<Filter>build\source</Filter> <Filter>build\source</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="build\src\2d.c">
<Filter>build\source</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Makefile.msvc"> <None Include="Makefile.msvc">