Permalink
Browse files

Remove cv_disabledemos; Remove cv_blinkingrate; Add stubs for new gam…

…e brand/mission checking; Make raven just a check for heretic
  • Loading branch information...
RestlessRodent committed Feb 4, 2017
1 parent c050843 commit a0c891dd5329f1626e28cda4d2297e8447051564
Showing with 627 additions and 733 deletions.
  1. +2 −1 GNUmakefile
  2. +2 −1 isrc/sdl/endtxt.c
  3. +3 −3 src/am_map.c
  4. +5 −5 src/console.c
  5. +67 −177 src/d_main.c
  6. +0 −2 src/d_netcmd.c
  7. +11 −35 src/doomstat.h
  8. +98 −106 src/f_finale.c
  9. +15 −19 src/g_game.c
  10. +0 −1 src/g_game.h
  11. +2 −1 src/g_input.c
  12. +2 −2 src/hu_stuff.c
  13. +78 −0 src/j_bridge.c
  14. +15 −15 src/m_cheat.c
  15. +0 −2 src/m_menu.c
  16. +0 −1 src/m_menu.h
  17. +1 −3 src/m_menudr.c
  18. +169 −185 src/m_menufn.c
  19. +4 −4 src/p_doors.c
  20. +9 −9 src/p_enemy.c
  21. +16 −26 src/p_info.c
  22. +14 −14 src/p_inter.c
  23. +8 −8 src/p_map.c
  24. +13 −14 src/p_mobj.c
  25. +2 −2 src/p_plats.c
  26. +5 −5 src/p_pspr.c
  27. +4 −4 src/p_setup.c
  28. +12 −12 src/p_spec.c
  29. +14 −19 src/p_switch.c
  30. +3 −3 src/p_telept.c
  31. +3 −3 src/p_user.c
  32. +6 −6 src/r_draw.c
  33. +1 −1 src/r_main.c
  34. +2 −2 src/r_things.c
  35. +7 −7 src/s_sound.c
  36. +17 −18 src/st_stuff.c
  37. +1 −1 src/v_video.c
  38. +16 −16 src/wi_stuff.c
View
@@ -399,7 +399,8 @@ CC_OBJS = $(SYSTEMOBJECTS) \
$(CC_OBJPREFIX)wi_stuff.o \
$(CC_OBJPREFIX)w_wad.o \
$(CC_OBJPREFIX)z_zone.o \
$(CC_OBJPREFIX)j_init.o
$(CC_OBJPREFIX)j_init.o \
$(CC_OBJPREFIX)j_bridge.o \
.PHONY:
all: remood.jar $(CC_EXEOUTPUT)
View
@@ -18,6 +18,7 @@
#include "z_zone.h"
#include "m_argv.h"
#include "endtxt.h"
#include "g_game.h"
void ShowEndTxt()
{
@@ -42,7 +43,7 @@ void ShowEndTxt()
*/
/* get the lump with the text */
if (gamemode == heretic)
if (X_IsHeretic())
text = W_CacheLumpNum(W_GetNumForName("ENDTEXT"), PU_CACHE);
else
text = W_CacheLumpNum(W_GetNumForName("ENDOOM"), PU_CACHE);
View
@@ -462,7 +462,7 @@ static void AM_initVariables(void)
old_m_w = m_w;
old_m_h = m_h;
if (gamemode == heretic)
if (X_IsHeretic())
{
REDS = 12 * 8;
REDRANGE = 1;
@@ -1389,7 +1389,7 @@ void AM_drawThings(int colors, int colorrange)
}
// Modify Color
if (gamemode != heretic)
if (!X_IsHeretic())
{
if (t->info->flags & MF_COUNTKILL || t->type == MT_SKULL)
{
@@ -1487,7 +1487,7 @@ void AM_Drawer(void)
// mapname
{
int y;
y = BASEVIDHEIGHT - (gamemode == heretic ? SBARHEIGHT : ST_HEIGHT) - 1;
y = BASEVIDHEIGHT - (X_IsHeretic() ? SBARHEIGHT : ST_HEIGHT) - 1;
V_DrawString(20, y - V_StringHeight(P_LevelName()), 0, P_LevelName());
}
View
@@ -215,7 +215,7 @@ static void CON_SetupBackColormap(void)
// 191 is darker
// 183 is the lightest
if (gamemode == heretic)
if (X_IsHeretic())
greenmap[k] = 145 + (j >> 6);
else
greenmap[k] = /*127 */ 183 - (j >> 6);
@@ -236,7 +236,7 @@ static void CON_SetupBackColormap(void)
locolor = 0.0;
// 255 * 0.32 = 81.6, 255 / 32 = 7.96875
if (gamemode == heretic)
if (X_IsHeretic())
l = 145 + (int)(12 * locolor);//37 + (int)(7 * locolor);
else
{
@@ -246,7 +246,7 @@ static void CON_SetupBackColormap(void)
whitemap[k] = l;
// 255 * 0.32 = 81.6, 255 / 32 = 7.96875
if (gamemode == heretic)
if (X_IsHeretic())
l = 241 + (int)(4 * locolor);
else
{
@@ -259,7 +259,7 @@ static void CON_SetupBackColormap(void)
}
orangemap[k] = l;
if (gamemode == heretic)
if (X_IsHeretic())
graymap[k] = 0 + (int)(16 * locolor);
else
graymap[k] = 111 - (int)(16 * hicolor);
@@ -839,7 +839,7 @@ void CON_Print(char *msg)
else if (*msg == '\3')
{
mask = 128; // white text + sound
if (gamemode == commercial)
if (X_IsDoomCommercial())
S_StartSound(0, sfx_radio);
else
S_StartSound(0, sfx_tink);
Oops, something went wrong.

0 comments on commit a0c891d

Please sign in to comment.