Fix NOHW compilation (1 error and 1 warning)
This commit is contained in:
1 parent
be83979016
commit
aa723f7a2b
2 files changed
+11
-4
No files matched your search
+6
-1
@@ -896,7 +896,12 @@ static patch_t *R_CreateHardwarePatch(patch_t *patch)
|
||||
void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle, INT32 xpivot, INT32 ypivot, boolean flip)
|
||||
{
|
||||
UINT32 i;
|
||||
patch_t *rotated, *hwpatch;
|
||||
patch_t *rotated;
|
||||
|
||||
#ifdef HWRENDER
|
||||
patch_t *hwpatch;
|
||||
#endif
|
||||
|
||||
UINT16 *rawdst, *rawconv;
|
||||
size_t size;
|
||||
INT32 bflip = (flip != 0x00);
|
||||
|
||||
+5
-3
@@ -820,9 +820,11 @@ UINT16 W_InitFile(const char *filename, boolean local)
|
||||
wadfiles[numwadfiles] = wadfile;
|
||||
numwadfiles++; // must come BEFORE W_LoadDehackedLumps, so any addfile called by COM_BufInsertText called by Lua doesn't overwrite what we just loaded
|
||||
|
||||
// Read shaders from file
|
||||
if (rendermode == render_opengl && (vid.glstate == VID_GL_LIBRARY_LOADED))
|
||||
HWR_LoadCustomShadersFromFile(numwadfiles - 1, (type == RET_PK3));
|
||||
#ifdef HWRENDER
|
||||
// Read shaders from file
|
||||
if (rendermode == render_opengl && (vid.glstate == VID_GL_LIBRARY_LOADED))
|
||||
HWR_LoadCustomShadersFromFile(numwadfiles - 1, (type == RET_PK3));
|
||||
#endif
|
||||
|
||||
// TODO: HACK ALERT - Load Lua & SOC stuff right here. I feel like this should be out of this place, but... Let's stick with this for now.
|
||||
switch (wadfile->type)
|
||||
|
||||
Reference in new issue
Block a user