teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-18 23:21:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor fixups needed to build as a native VS project

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6982 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-09-28 04:27:42 +00:00
parent b9eb42672d
commit d4c9cc28d5
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/build/src/mdsprite.cpp
View file

@ -605,7 +605,7 @@ static int32_t mdloadskin_failed(char * const skinfile, char const * const fn)
int32_t mdloadskin(md2model_t *m, int32_t number, int32_t pal, int32_t surf)
{
int32_t i;
char *skinfile, fn[BMAX_PATH];
char *skinfile = NULL, fn[BMAX_PATH];
GLuint *texidx = NULL;
mdskinmap_t *sk, *skzero = NULL;
int32_t doalloc = 1;
@ -667,7 +667,7 @@ int32_t mdloadskin(md2model_t *m, int32_t number, int32_t pal, int32_t surf)
#endif
}
if (!skinfile[0])
if (skinfile == NULL || !skinfile[0])
return 0;
if (*texidx)

2
source/build/src/sdlayer.cpp
View file

@ -1877,7 +1877,7 @@ int32_t videoSetGamma(void)
}
#if !defined __APPLE__ && !defined EDUKE32_TOUCH_DEVICES
extern struct sdlappicon sdlappicon;
extern "C" struct sdlappicon sdlappicon;
static inline SDL_Surface *loadappicon(void)
{
SDL_Surface *surf = SDL_CreateRGBSurfaceFrom((void *)sdlappicon.pixels, sdlappicon.width, sdlappicon.height, 32,

4
source/duke3d/rsrc/buildres.rc
View file

@ -1,6 +1,6 @@
#define NEED_COMMCTRL_H
#include "windows_inc.h"
#include "startwin.editor.h"
#include "..\..\build\include\windows_inc.h"
#include "..\..\build\include\startwin.editor.h"
RSRC_ICON ICON "build_icon.ico"
RSRC_BMP BITMAP "build.bmp"

4
source/duke3d/rsrc/gameres.rc
View file

@ -1,6 +1,6 @@
#define NEED_COMMCTRL_H
#include "windows_inc.h"
#include "startwin.game.h"
#include "..\..\build\include\windows_inc.h"
#include "..\src\startwin.game.h"
RSRC_ICON ICON "game_icon.ico"
RSRC_BMP BITMAP "game.bmp"