r3489 - packages/trunk/warsow/debian/patches

[Andres Mejia]

Author: ceros-guest
Date: 2007-07-30 03:03:24 +0000 (Mon, 30 Jul 2007)
New Revision: 3489

Added:
   packages/trunk/warsow/debian/patches/disable_battleye.diff
Log:
Forgot to add patch.

Added: packages/trunk/warsow/debian/patches/disable_battleye.diff
===================================================================
--- packages/trunk/warsow/debian/patches/disable_battleye.diff	                        (rev 0)
+++ packages/trunk/warsow/debian/patches/disable_battleye.diff	2007-07-30 03:03:24 UTC (rev 3489)
@@ -0,0 +1,124 @@
+Index: BattlEye will be disabled on dfsg warsow packages.
+===================================================================
+--- ./warsow_0.31/source/game/wsw_shared.h.bak	2007-07-26 13:54:55.000000000 -0400
++++ ./warsow_0.31/source/game/wsw_shared.h	2007-07-26 13:55:46.000000000 -0400
+@@ -53,7 +53,9 @@
+ // collaborations
+ //==============================================
+ #define DEMOCAM
++/* Disabling use of BattlEye
+ #define BATTLEYE // Sable
++*/
+ 
+ // symbol address retrieval
+ //==============================================
+Index: Server search won't display battleye servers by default.
+===================================================================
+--- ./warsow_0.31/source/ui/ui_connect.c.bak	2007-07-26 14:37:48.000000000 -0400
++++ ./warsow_0.31/source/ui/ui_connect.c	2007-07-26 14:39:55.000000000 -0400
+@@ -51,9 +51,10 @@
+ static menucommon_t *menuitem_gametypefilter;
+ static menucommon_t *menuitem_maxpingfilter;
+ static menucommon_t *menuitem_namematchfilter;
+-#ifdef BATTLEYE
++//Enabling even with BATTLEYE undefined
++//#ifdef BATTLEYE
+ static menucommon_t *menuitem_battleyefilter;
+-#endif
++//#endif
+ 
+ typedef struct server_s
+ {
+@@ -70,9 +71,9 @@
+ 	unsigned int ping;
+ 	unsigned int ping_retries;
+ 	qboolean	displayed;
+-#ifdef BATTLEYE
++//#ifdef BATTLEYE
+ 	qboolean	battleye;
+-#endif
++//#endif
+ 	char		address[80];
+ 
+ 	struct server_s *pnext;
+@@ -195,9 +196,9 @@
+ 	newserv->bots = 0;
+ 	newserv->ping = 9999;
+ 	newserv->ping_retries = 0;
+-#ifdef BATTLEYE
++//#ifdef BATTLEYE
+ 	newserv->battleye = qfalse;
+-#endif
++//#endif
+ 
+ 	// set up the actual new item
+ 	newserv->pnext = servers;
+@@ -366,7 +367,7 @@
+ 				continue;
+ 			}
+ 
+-#ifdef BATTLEYE
++//#ifdef BATTLEYE
+ 			// got cmd
+ 			if( !Q_stricmp(tok, "be") ) {
+ 				int battleye;
+@@ -380,7 +381,7 @@
+ 				}
+ 				continue;
+ 			}
+-#endif
++//#endif
+ 			// got cmd
+ 			if( !Q_stricmp(tok, "ping") ) {
+ 				int ping;
+@@ -962,13 +963,13 @@
+ 			if( menuitem_passwordfilter->curvalue - 1 == ptr->password )
+ 				add = qfalse;
+ 		}
+-#ifdef BATTLEYE
++//#ifdef BATTLEYE
+ 		// ignore if it has battleye and we are filtering those
+ 		if( menuitem_battleyefilter && menuitem_battleyefilter->curvalue ) {
+ 			if( menuitem_battleyefilter->curvalue - 1 == ptr->battleye )
+ 				add = qfalse;
+ 		}
+-#endif
++//#endif
+ 		// ignore if it's of filtered ping
+ 		if( menuitem_maxpingfilter && (int)trap_Cvar_VariableValue("ui_filter_ping") ) {
+ 			if( ptr->ping > trap_Cvar_VariableValue("ui_filter_ping") )
+@@ -1033,9 +1034,9 @@
+ 	if( menuitem_skillfilter )trap_Cvar_SetValue( "ui_filter_skill", menuitem_skillfilter->curvalue );
+ 	if( menuitem_gametypefilter )trap_Cvar_SetValue( "ui_filter_gametype", menuitem_gametypefilter->curvalue );
+ 	if( menuitem_maxpingfilter )trap_Cvar_Set( "ui_filter_ping", UI_GetMenuitemFieldBuffer(menuitem_maxpingfilter) );
+-#ifdef BATTLEYE
++//#ifdef BATTLEYE
+ 	if( menuitem_battleyefilter )trap_Cvar_SetValue( "ui_filter_battleye", menuitem_battleyefilter->curvalue );
+-#endif
++//#endif
+ 	if( menuitem_namematchfilter )trap_Cvar_Set( "ui_filter_name", UI_GetMenuitemFieldBuffer(menuitem_namematchfilter) );
+ 
+ 	M_RefreshScrollWindowList();
+@@ -1271,6 +1272,8 @@
+ 	trap_Cvar_Get( "ui_filter_ping", "0", CVAR_ARCHIVE );
+ #ifdef BATTLEYE
+ 	trap_Cvar_Get( "ui_filter_battleye", "0", CVAR_ARCHIVE );
++#else
++	trap_Cvar_Get( "ui_filter_battleye", "2", CVAR_ARCHIVE );
+ #endif
+ 
+ 	if( uis.vidWidth < 800 )
+@@ -1335,11 +1338,11 @@
+ 	UI_SetupField( menuitem_maxpingfilter, trap_Cvar_VariableString("ui_filter_ping"), 4, -1 );
+ 	yoffset += trap_SCR_strHeight( menuitem_maxpingfilter->font );
+ 
+-#ifdef BATTLEYE
++//#ifdef BATTLEYE
+ 	menuitem_battleyefilter = UI_InitMenuItem( "m_connect_filterbattleye", "BattlEye", UI_SCALED_WIDTH(-100), yoffset, MTYPE_SPINCONTROL, ALIGN_RIGHT_TOP, uis.fontSystemSmall, M_Connect_UpdateFiltersSettings );
+ 	Menu_AddItem( &s_joinserver_menu, menuitem_battleyefilter );
+ 	UI_SetupSpinControl( menuitem_battleyefilter, filter_names, trap_Cvar_VariableValue("ui_filter_battleye") );
+-#endif
++//#endif
+ 
+ 	menuitem_namematchfilter = UI_InitMenuItem( "m_connect_filternamematch", "matched name", UI_SCALED_WIDTH(120), yoffset, MTYPE_FIELD, ALIGN_RIGHT_TOP, uis.fontSystemSmall, M_Connect_UpdateFiltersSettings );
+ 	Menu_AddItem( &s_joinserver_menu, menuitem_namematchfilter );