From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 22 Dec 2012 06:19:30 +0000 (+0000)
Subject: added GAME_QUOTH to use the hipnotic hud and workarounds with the quoth
X-Git-Tag: xonotic-v0.8.0~96^2~173
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=46d05bc2437a6daea845411245424c0d0bab1b21;p=xonotic%2Fdarkplaces.git

added GAME_QUOTH to use the hipnotic hud and workarounds with the quoth
folder instead of hipnotic


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11865 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/cl_parse.c b/cl_parse.c
index 506e53f3..53bc140c 100644
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -2210,7 +2210,7 @@ static void CL_ParseClientdata (void)
 		cl.stats[STAT_NAILS] = MSG_ReadByte(&cl_message);
 		cl.stats[STAT_ROCKETS] = MSG_ReadByte(&cl_message);
 		cl.stats[STAT_CELLS] = MSG_ReadByte(&cl_message);
-		if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE || gamemode == GAME_NEXUIZ)
+		if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE || gamemode == GAME_QUOTH || gamemode == GAME_NEXUIZ)
 			cl.stats[STAT_ACTIVEWEAPON] = (1<<MSG_ReadByte(&cl_message));
 		else
 			cl.stats[STAT_ACTIVEWEAPON] = MSG_ReadByte(&cl_message);
diff --git a/cmd.c b/cmd.c
index 4d615f1a..9ddf9491 100644
--- a/cmd.c
+++ b/cmd.c
@@ -503,7 +503,7 @@ static void Cmd_Exec(const char *filename)
 		// hipnotic mission pack has issues in their 'friendly monster' ai, which seem to attempt to attack themselves for some reason when findradius() returns non-solid entities.
 		// hipnotic mission pack has issues with bobbing water entities 'jittering' between different heights on alternate frames at the default 0.0138889 ticrate, 0.02 avoids this issue
 		// hipnotic mission pack has issues in their proximity mine sticking code, which causes them to bounce off.
-		if (gamemode == GAME_HIPNOTIC)
+		if (gamemode == GAME_HIPNOTIC || gamemode == GAME_QUOTH)
 			Cbuf_InsertText("\nsv_gameplayfix_blowupfallenzombies 0\nsys_ticrate 0.02\nsv_gameplayfix_slidemoveprojectiles 0\n\n");
 		// rogue mission pack has a guardian boss that does not wake up if findradius returns one of the entities around its spawn area
 		if (gamemode == GAME_ROGUE)
diff --git a/common.c b/common.c
index 175a5185..e981b779 100644
--- a/common.c
+++ b/common.c
@@ -1449,6 +1449,7 @@ static const gamemode_info_t gamemode_info [GAME_COUNT] =
 { GAME_HIPNOTIC,		GAME_NORMAL,			"hipnotic",			"-hipnotic",		"Darkplaces-Hipnotic",	"id1",		"hipnotic",		"dp",			"darkplaces"		}, // COMMANDLINEOPTION: Game: -hipnotic runs Quake mission pack 1: The Scourge of Armagon
 { GAME_ROGUE,			GAME_NORMAL,			"rogue",			"-rogue",			"Darkplaces-Rogue",		"id1",		"rogue",		"dp",			"darkplaces"		}, // COMMANDLINEOPTION: Game: -rogue runs Quake mission pack 2: The Dissolution of Eternity
 { GAME_NEHAHRA,			GAME_NORMAL,			"nehahra",			"-nehahra",			"DarkPlaces-Nehahra",	"id1",		"nehahra",		"dp",			"darkplaces"		}, // COMMANDLINEOPTION: Game: -nehahra runs The Seal of Nehahra movie and game
+{ GAME_QUOTH,			GAME_NORMAL,			"quoth",			"-quoth",			"Darkplaces-Quoth",		"id1",		"quoth",		"dp",			"darkplaces"		}, // COMMANDLINEOPTION: Game: -quoth runs the Quoth mod for playing community maps made for it
 { GAME_NEXUIZ,			GAME_NEXUIZ,			"nexuiz",			"-nexuiz",			"Nexuiz",				"data",		NULL,			"nexuiz",		"nexuiz"			}, // COMMANDLINEOPTION: Game: -nexuiz runs the multiplayer game Nexuiz
 { GAME_XONOTIC,			GAME_XONOTIC,			"xonotic",			"-xonotic",			"Xonotic",				"data",		NULL,			"xonotic",		"xonotic"			}, // COMMANDLINEOPTION: Game: -xonotic runs the multiplayer game Xonotic
 { GAME_TRANSFUSION,		GAME_TRANSFUSION,		"transfusion",		"-transfusion",		"Transfusion",			"basetf",	NULL,			"transfusion",	"transfusion"		}, // COMMANDLINEOPTION: Game: -transfusion runs Transfusion (the recreation of Blood in Quake)
diff --git a/common.h b/common.h
index ebbd15a9..1324da27 100644
--- a/common.h
+++ b/common.h
@@ -268,6 +268,7 @@ typedef enum gamemode_e
 	GAME_NORMAL,
 	GAME_HIPNOTIC,
 	GAME_ROGUE,
+	GAME_QUOTH,
 	GAME_NEHAHRA,
 	GAME_NEXUIZ,
 	GAME_XONOTIC,
diff --git a/host_cmd.c b/host_cmd.c
index 841c4df2..eb02215f 100644
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -2075,7 +2075,7 @@ static void Host_Give_f (void)
 	case '8':
 	case '9':
 		// MED 01/04/97 added hipnotic give stuff
-		if (gamemode == GAME_HIPNOTIC)
+		if (gamemode == GAME_HIPNOTIC || gamemode == GAME_QUOTH)
 		{
 			if (t[0] == '6')
 			{
diff --git a/menu.c b/menu.c
index 493ecad5..26b690e2 100644
--- a/menu.c
+++ b/menu.c
@@ -3201,6 +3201,7 @@ static int M_ChooseQuitMessage(int request)
 	case GAME_NORMAL:
 	case GAME_HIPNOTIC:
 	case GAME_ROGUE:
+	case GAME_QUOTH:
 	case GAME_NEHAHRA:
 	case GAME_DEFEATINDETAIL2:
 		if (request-- == 0) return M_QuitMessage("Are you gonna quit","this game just like","everything else?",NULL,NULL,NULL,NULL,NULL);
@@ -3936,6 +3937,7 @@ static gameinfo_t gamelist[] =
 	{GAME_NORMAL, &sharewarequakegame, &registeredquakegame},
 	{GAME_HIPNOTIC, &hipnoticgame, &hipnoticgame},
 	{GAME_ROGUE, &roguegame, &roguegame},
+	{GAME_QUOTH, &sharewarequakegame, &registeredquakegame},
 	{GAME_NEHAHRA, &nehahragame, &nehahragame},
 	{GAME_TRANSFUSION, &transfusiongame, &transfusiongame},
 	{GAME_GOODVSBAD2, &goodvsbad2game, &goodvsbad2game},
diff --git a/sbar.c b/sbar.c
index 1da2be08..43888d5e 100644
--- a/sbar.c
+++ b/sbar.c
@@ -291,7 +291,7 @@ static void sbar_start(void)
 		sb_scorebar = Draw_CachePic_Flags ("gfx/scorebar", CACHEPICFLAG_QUIET);
 
 	//MED 01/04/97 added new hipnotic weapons
-		if (gamemode == GAME_HIPNOTIC)
+		if (gamemode == GAME_HIPNOTIC || gamemode == GAME_QUOTH)
 		{
 			hsb_weapons[0][0] = Draw_CachePic_Flags ("gfx/inv_laser", CACHEPICFLAG_QUIET);
 			hsb_weapons[0][1] = Draw_CachePic_Flags ("gfx/inv_mjolnir", CACHEPICFLAG_QUIET);
@@ -804,7 +804,7 @@ static void Sbar_DrawInventory (void)
 
 	// MED 01/04/97
 	// hipnotic weapons
-	if (gamemode == GAME_HIPNOTIC)
+	if (gamemode == GAME_HIPNOTIC || gamemode == GAME_QUOTH)
 	{
 		int grenadeflashing=0;
 		for (i=0 ; i<4 ; i++)
@@ -879,13 +879,13 @@ static void Sbar_DrawInventory (void)
 		if (cl.stats[STAT_ITEMS] & (1<<(17+i)))
 		{
 			//MED 01/04/97 changed keys
-			if (gamemode != GAME_HIPNOTIC || (i>1))
+			if (!(gamemode == GAME_HIPNOTIC || gamemode == GAME_QUOTH) || (i>1))
 				Sbar_DrawPic (192 + i*16, -16, sb_items[i]);
 		}
 
 	//MED 01/04/97 added hipnotic items
 	// hipnotic items
-	if (gamemode == GAME_HIPNOTIC)
+	if (gamemode == GAME_HIPNOTIC || gamemode == GAME_QUOTH)
 	{
 		for (i=0 ; i<2 ; i++)
 			if (cl.stats[STAT_ITEMS] & (1<<(24+i)))
@@ -1636,7 +1636,7 @@ void Sbar_Draw (void)
 
 				// keys (hipnotic only)
 				//MED 01/04/97 moved keys here so they would not be overwritten
-				if (gamemode == GAME_HIPNOTIC)
+				if (gamemode == GAME_HIPNOTIC || gamemode == GAME_QUOTH)
 				{
 					if (cl.stats[STAT_ITEMS] & IT_KEY1)
 						Sbar_DrawPic (209, 3, sb_items[0]);
diff --git a/sv_main.c b/sv_main.c
index 14ae253c..64a29138 100644
--- a/sv_main.c
+++ b/sv_main.c
@@ -2210,7 +2210,7 @@ void SV_WriteClientdataToMessage (client_t *client, prvm_edict_t *ent, sizebuf_t
 		MSG_WriteByte (msg, stats[STAT_NAILS]);
 		MSG_WriteByte (msg, stats[STAT_ROCKETS]);
 		MSG_WriteByte (msg, stats[STAT_CELLS]);
-		if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE || gamemode == GAME_NEXUIZ)
+		if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE || gamemode == GAME_QUOTH || gamemode == GAME_NEXUIZ)
 		{
 			for (i = 0;i < 32;i++)
 				if (stats[STAT_ACTIVEWEAPON] & (1<<i))