From 428ac51c68804e7aa21531c3718e57b2942d5e43 Mon Sep 17 00:00:00 2001 From: SteelT Date: Mon, 10 Aug 2020 12:57:47 -0400 Subject: [PATCH] Merge w_wad.c --- src/w_wad.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/w_wad.c b/src/w_wad.c index 4cb15a584..b663a9548 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -827,11 +827,6 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup) numwadfiles++; // must come BEFORE W_LoadDehackedLumps, so any addfile called by COM_BufInsertText called by Lua doesn't overwrite what we just loaded #ifdef HWRENDER -<<<<<<< HEAD - if (rendermode == render_opengl) - HWR_LoadShaders(numwadfiles - 1, (wadfile->type == RET_PK3)); -#endif -======= // Read shaders from file if (rendermode == render_opengl && (vid_opengl_state == 1)) { @@ -839,7 +834,6 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup) HWR_LoadShaders(); } #endif // HWRENDER ->>>>>>> srb2/next // 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)