lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MSVC2015: fixup

This commit is contained in:
Alam Ed Arias 2018-01-02 13:22:10 -05:00
parent 61176ee736
commit 75abd428fc
8 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lua_hudlib.c
View File

@ -407,7 +407,7 @@ static int libd_getSpritePatch(lua_State *L)
static int libd_getSprite2Patch(lua_State *L)
{
INT32 i; // skin number
UINT32 j; // sprite2 prefix
INT32 j; // sprite2 prefix
UINT32 frame = 0; // 'A'
UINT8 angle = 0;
spritedef_t *sprdef;

6
src/lua_infolib.c
View File

@ -102,7 +102,7 @@ static int lib_sprnamelen(lua_State *L)
// push sprite name
static int lib_getSpr2name(lua_State *L)
{
UINT32 i;
INT32 i;
lua_remove(L, 1); // don't care about spr2names[] dummy userdata.
@ -129,7 +129,7 @@ static int lib_getSpr2name(lua_State *L)
static int lib_getSpr2default(lua_State *L)
{
UINT32 i;
INT32 i;
lua_remove(L, 1); // don't care about spr2defaults[] dummy userdata.
@ -154,7 +154,7 @@ static int lib_getSpr2default(lua_State *L)
static int lib_setSpr2default(lua_State *L)
{
UINT32 i;
INT32 i;
UINT8 j = 0;
lua_remove(L, 1); // don't care about spr2defaults[] dummy userdata.

5
src/m_menu.c
View File

@ -4964,7 +4964,10 @@ static void M_DrawAddons(void)
// hack - need to refresh at end of frame to handle addfile...
if (refreshdirmenu & M_AddonsRefresh())
return M_DrawMessageMenu();
{
M_DrawMessageMenu();
return;
}
if (addonsresponselimit)
addonsresponselimit--;

2
src/sdl/Srb2SDL-vc10.vcxproj
View File

@ -141,6 +141,7 @@
<ClInclude Include="..\hardware\hw3dsdrv.h" />
<ClInclude Include="..\hardware\hw3sound.h" />
<ClInclude Include="..\hardware\hws_data.h" />
<ClInclude Include="..\hardware\hw_clip.h" />
<ClInclude Include="..\hardware\hw_data.h" />
<ClInclude Include="..\hardware\hw_defs.h" />
<ClInclude Include="..\hardware\hw_dll.h" />
@ -282,6 +283,7 @@
<ClCompile Include="..\hardware\hw3sound.c" />
<ClCompile Include="..\hardware\hw_bsp.c" />
<ClCompile Include="..\hardware\hw_cache.c" />
<ClCompile Include="..\hardware\hw_clip.c" />
<ClCompile Include="..\hardware\hw_draw.c" />
<ClCompile Include="..\hardware\hw_light.c" />
<ClCompile Include="..\hardware\hw_main.c" />

6
src/sdl/Srb2SDL-vc10.vcxproj.filters
View File

@ -444,6 +444,9 @@
<ClInclude Include="sdlmain.h">
<Filter>SDLApp</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw_clip.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\tmap.nas">
@ -879,6 +882,9 @@
<ClCompile Include="SDL_main\SDL_windows_main.c">
<Filter>SDLApp</Filter>
</ClCompile>
<ClCompile Include="..\hardware\hw_clip.c">
<Filter>Hw_Hardware</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Image Include="Srb2SDL.ico">

3
src/w_wad.c
View File

@ -448,7 +448,7 @@ UINT16 W_InitFile(const char *filename)
// We must look for the central directory through the file. (Thanks to JTE for this algorithm.)
// All of the central directory entry headers have a signature of 0x50 0x4b 0x01 0x02.
// The first entry found means the beginning of the central directory.
fseek(handle, -min(size, (22 + 65536)), SEEK_CUR);
fseek(handle, 0-min(size, (22 + 65536)), SEEK_CUR);
s = endPat;
while((c = fgetc(handle)) != EOF)
{
@ -1198,6 +1198,7 @@ size_t W_ReadLumpHeaderPwad(UINT16 wad, UINT16 lump, void *dest, size_t size, si
default:
I_Error("wad %d, lump %d: unsupported compression type!", wad, lump);
}
return 0;
}
size_t W_ReadLumpHeader(lumpnum_t lumpnum, void *dest, size_t size, size_t offset)

2
src/win32/Srb2win-vc10.vcxproj
View File

@ -119,6 +119,7 @@
<ClCompile Include="..\hardware\hw3sound.c" />
<ClCompile Include="..\hardware\hw_bsp.c" />
<ClCompile Include="..\hardware\hw_cache.c" />
<ClCompile Include="..\hardware\hw_clip.c" />
<ClCompile Include="..\hardware\hw_draw.c" />
<ClCompile Include="..\hardware\hw_light.c" />
<ClCompile Include="..\hardware\hw_main.c" />
@ -276,6 +277,7 @@
<ClInclude Include="..\hardware\hw3dsdrv.h" />
<ClInclude Include="..\hardware\hw3sound.h" />
<ClInclude Include="..\hardware\hws_data.h" />
<ClInclude Include="..\hardware\hw_clip.h" />
<ClInclude Include="..\hardware\hw_data.h" />
<ClInclude Include="..\hardware\hw_defs.h" />
<ClInclude Include="..\hardware\hw_dll.h" />

6
src/win32/Srb2win-vc10.vcxproj.filters
View File

@ -450,6 +450,9 @@
<ClCompile Include="..\string.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\hardware\hw_clip.c">
<Filter>Hw_Hardware</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="afxres.h">
@ -845,6 +848,9 @@
<ClInclude Include="..\fastcmp.h">
<Filter>O_Other</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw_clip.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="Srb2win.ico">