diff --git a/reaction/cgame/cg_info.c b/reaction/cgame/cg_info.c index d84a9628..b9600024 100644 --- a/reaction/cgame/cg_info.c +++ b/reaction/cgame/cg_info.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.36 2002/08/29 04:42:40 blaze +// Anti OGC code +// // Revision 1.35 2002/08/28 02:06:21 blaze // Add SV_PURE DISABLED when connecting to a server with pure disabled. It still prints PURE SERVER when it\'s enabled, but clients may not notice it when it\'s gone. // @@ -345,12 +348,12 @@ void CG_DrawInformation(void) line = "UNKNOWN GAMETYPE"; break; } - + // JBravo: the call to Q_strupr seems to crash Q3 when running as dll or .so. Attempting a fix // Makro: the fix crashes Q3 with .dll's, unfixing ;P //strcat (line, '\0'); //line = Q_strupr(line); - + // cheats warning s = Info_ValueForKey(sysInfo, "sv_cheats"); //Makro - didn't like this diff --git a/reaction/cgame/cg_local.h b/reaction/cgame/cg_local.h index d477e09e..727bacf9 100644 --- a/reaction/cgame/cg_local.h +++ b/reaction/cgame/cg_local.h @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.123 2002/08/29 04:42:40 blaze +// Anti OGC code +// // Revision 1.122 2002/08/28 23:10:06 jbravo // Added cg_RQ3_SuicideLikeARealMan, timestamping to server logs and // fixed stats for non-TP modes. @@ -1649,6 +1652,8 @@ extern vmCvar_t cg_paused; extern vmCvar_t cg_blood; extern vmCvar_t cg_predictItems; extern vmCvar_t cg_deferPlayers; +//Blaze: Anti OGC code +extern vmCvar_t ogc_islame; //Blaze: Reaction weapon positions //extern vmCvar_t cg_RQ3_drawWeapon; diff --git a/reaction/cgame/cg_main.c b/reaction/cgame/cg_main.c index 755b170d..01dc1c0b 100644 --- a/reaction/cgame/cg_main.c +++ b/reaction/cgame/cg_main.c @@ -5,12 +5,8 @@ //----------------------------------------------------------------------------- // // $Log$ -// Revision 1.106 2002/08/28 23:10:06 jbravo -// Added cg_RQ3_SuicideLikeARealMan, timestamping to server logs and -// fixed stats for non-TP modes. -// -// Revision 1.105 2002/08/28 18:52:09 jbravo -// Added the Keanu male radio sound set. +// Revision 1.107 2002/08/29 04:42:41 blaze +// Anti OGC code // // Revision 1.104 2002/08/27 05:10:05 niceass // new ctb marker shader names @@ -374,6 +370,9 @@ vmCvar_t cg_teamOverlayUserinfo; //vmCvar_t cg_RQ3_drawWeapon; vmCvar_t cg_RQ3_glasstime; +//Blaze: Anti OGC code +vmCvar_t ogc_islame; + //Elder: muzzle flash toggle vmCvar_t cg_RQ3_flash; @@ -403,7 +402,6 @@ vmCvar_t cg_RQ3_tkokAutoPopup; // JBravo: radio cvars. vmCvar_t cg_RQ3_radiovoice_male; vmCvar_t cg_RQ3_radiovoice_female; -vmCvar_t cg_RQ3_SuicideLikeARealMan; vmCvar_t cg_RQ3_dynamicRadio; // Slicer: for the Anti-Cheat System @@ -599,6 +597,7 @@ static cvarTable_t cvarTable[] = { // bk001129 {&cg_teamChatsOnly, "cg_teamChatsOnly", "0", CVAR_ARCHIVE}, {&cg_noVoiceChats, "cg_noVoiceChats", "0", CVAR_ARCHIVE}, {&cg_noVoiceText, "cg_noVoiceText", "0", CVAR_ARCHIVE}, + {&ogc_islame,"ogc_islame","1",CVAR_ARCHIVE}, // the following variables are created in other parts of the system, // but we also reference them here {&cg_buildScript, "com_buildScript", "0", 0}, // force loading of all possible data amd error on failures @@ -650,8 +649,8 @@ static cvarTable_t cvarTable[] = { // bk001129 {&cg_RQ3_ssgColorG, "cg_RQ3_ssgColorG", "1.0", CVAR_ARCHIVE}, {&cg_RQ3_ssgColorB, "cg_RQ3_ssgColorB", "0.0", CVAR_ARCHIVE}, {&cg_RQ3_ssgColorA, "cg_RQ3_ssgColorA", "0.75", CVAR_ARCHIVE}, -//Blaze: allow regular crosshair to be overlaid ontop of the ssg crosshair - {&cg_RQ3_overlaycrosshair, "cg_RQ3_overlaycrosshair", "0", CVAR_ARCHIVE}, + //Blaze: allow regular crosshair to be overlaid ontop of the ssg crosshair + {&cg_RQ3_overlaycrosshair, "cg_RQ3_overlaycrosshair", "0", CVAR_ARCHIVE}, // JBravo: cvars for regular crosshairs and their colors // Makro - changed default color to white; it was 0/1/0/.75 before @@ -662,7 +661,6 @@ static cvarTable_t cvarTable[] = { // bk001129 {&cg_RQ3_tkokAutoPopup, "cg_RQ3_tkokAutoPopup", "0", CVAR_ARCHIVE}, {&cg_RQ3_radiovoice_male, "cg_RQ3_radiovoice_male", "1", CVAR_USERINFO | CVAR_ARCHIVE}, {&cg_RQ3_radiovoice_female, "cg_RQ3_radiovoice_female", "1", CVAR_USERINFO | CVAR_ARCHIVE}, - {&cg_RQ3_SuicideLikeARealMan, "cg_RQ3_SuicideLikeARealMan", "0", CVAR_USERINFO | CVAR_ARCHIVE}, {&cg_RQ3_dynamicRadio, "cg_RQ3_dynamicRadio", "1", CVAR_ARCHIVE}, {&cg_RQ3_impactEffects, "cg_RQ3_impactEffects", "1", CVAR_ARCHIVE}, {&cg_RQ3_laserAssist, "cg_RQ3_laserAssist", "0", CVAR_ARCHIVE}, @@ -1203,63 +1201,6 @@ static void CG_RegisterSounds(void) cgs.media.pirate_male_sounds[53] = trap_S_RegisterSound("sound/newradio/pirate/plost1.wav", qtrue); cgs.media.pirate_male_sounds[54] = trap_S_RegisterSound("sound/newradio/pirate/plost2.wav", qtrue); cgs.media.pirate_male_sounds[55] = trap_S_RegisterSound("sound/newradio/pirate/plost3.wav", qtrue); - cgs.media.keanu_male_sounds[0] = trap_S_RegisterSound("sound/newradio/keanu/1.wav", qtrue); - cgs.media.keanu_male_sounds[1] = trap_S_RegisterSound("sound/newradio/keanu/2.wav", qtrue); - cgs.media.keanu_male_sounds[2] = trap_S_RegisterSound("sound/newradio/keanu/3.wav", qtrue); - cgs.media.keanu_male_sounds[3] = trap_S_RegisterSound("sound/newradio/keanu/4.wav", qtrue); - cgs.media.keanu_male_sounds[4] = trap_S_RegisterSound("sound/newradio/keanu/5.wav", qtrue); - cgs.media.keanu_male_sounds[5] = trap_S_RegisterSound("sound/newradio/keanu/6.wav", qtrue); - cgs.media.keanu_male_sounds[6] = trap_S_RegisterSound("sound/newradio/keanu/7.wav", qtrue); - cgs.media.keanu_male_sounds[7] = trap_S_RegisterSound("sound/newradio/keanu/8.wav", qtrue); - cgs.media.keanu_male_sounds[8] = trap_S_RegisterSound("sound/newradio/keanu/9.wav", qtrue); - cgs.media.keanu_male_sounds[9] = trap_S_RegisterSound("sound/newradio/keanu/10.wav", qtrue); - cgs.media.keanu_male_sounds[10] = trap_S_RegisterSound("sound/newradio/keanu/back.wav", qtrue); - cgs.media.keanu_male_sounds[11] = trap_S_RegisterSound("sound/newradio/keanu/cover.wav", qtrue); - cgs.media.keanu_male_sounds[12] = trap_S_RegisterSound("sound/newradio/keanu/down.wav", qtrue); - cgs.media.keanu_male_sounds[13] = trap_S_RegisterSound("sound/newradio/keanu/enemyd.wav", qtrue); - cgs.media.keanu_male_sounds[14] = trap_S_RegisterSound("sound/newradio/keanu/enemys.wav", qtrue); - cgs.media.keanu_male_sounds[15] = trap_S_RegisterSound("sound/newradio/keanu/forward.wav", qtrue); - cgs.media.keanu_male_sounds[16] = trap_S_RegisterSound("sound/newradio/keanu/go.wav", qtrue); - cgs.media.keanu_male_sounds[17] = trap_S_RegisterSound("sound/newradio/keanu/im_hit.wav", qtrue); - cgs.media.keanu_male_sounds[18] = trap_S_RegisterSound("sound/newradio/keanu/left.wav", qtrue); - cgs.media.keanu_male_sounds[19] = trap_S_RegisterSound("sound/newradio/keanu/reportin.wav", qtrue); - cgs.media.keanu_male_sounds[20] = trap_S_RegisterSound("sound/newradio/keanu/right.wav", qtrue); - cgs.media.keanu_male_sounds[21] = trap_S_RegisterSound("sound/newradio/keanu/taking_f.wav", qtrue); - cgs.media.keanu_male_sounds[22] = trap_S_RegisterSound("sound/newradio/keanu/teamdown.wav", qtrue); - cgs.media.keanu_male_sounds[23] = trap_S_RegisterSound("sound/newradio/keanu/treport.wav", qtrue); - cgs.media.keanu_male_sounds[24] = trap_S_RegisterSound("sound/newradio/keanu/up.wav", qtrue); - cgs.media.keanu_male_sounds[25] = trap_S_RegisterSound("sound/radio/click.wav", qtrue); - cgs.media.keanu_male_sounds[26] = trap_S_RegisterSound("sound/newradio/keanu/backup1.wav", qtrue); - cgs.media.keanu_male_sounds[27] = trap_S_RegisterSound("sound/newradio/keanu/backup2.wav", qtrue); - cgs.media.keanu_male_sounds[28] = trap_S_RegisterSound("sound/newradio/keanu/backup3.wav", qtrue); - cgs.media.keanu_male_sounds[29] = trap_S_RegisterSound("sound/newradio/keanu/chit1.wav", qtrue); - cgs.media.keanu_male_sounds[30] = trap_S_RegisterSound("sound/newradio/keanu/chit2.wav", qtrue); - cgs.media.keanu_male_sounds[31] = trap_S_RegisterSound("sound/newradio/keanu/chit3.wav", qtrue); - cgs.media.keanu_male_sounds[32] = trap_S_RegisterSound("sound/newradio/keanu/deliv1.wav", qtrue); - cgs.media.keanu_male_sounds[33] = trap_S_RegisterSound("sound/newradio/keanu/deliv2.wav", qtrue); - cgs.media.keanu_male_sounds[34] = trap_S_RegisterSound("sound/newradio/keanu/deliv3.wav", qtrue); - cgs.media.keanu_male_sounds[35] = trap_S_RegisterSound("sound/newradio/keanu/ecdown1.wav", qtrue); - cgs.media.keanu_male_sounds[36] = trap_S_RegisterSound("sound/newradio/keanu/ecdown2.wav", qtrue); - cgs.media.keanu_male_sounds[37] = trap_S_RegisterSound("sound/newradio/keanu/ecdown3.wav", qtrue); - cgs.media.keanu_male_sounds[38] = trap_S_RegisterSound("sound/newradio/keanu/enepak1.wav", qtrue); - cgs.media.keanu_male_sounds[39] = trap_S_RegisterSound("sound/newradio/keanu/enepak2.wav", qtrue); - cgs.media.keanu_male_sounds[40] = trap_S_RegisterSound("sound/newradio/keanu/enepak3.wav", qtrue); - cgs.media.keanu_male_sounds[41] = trap_S_RegisterSound("sound/newradio/keanu/escort1.wav", qtrue); - cgs.media.keanu_male_sounds[42] = trap_S_RegisterSound("sound/newradio/keanu/escort2.wav", qtrue); - cgs.media.keanu_male_sounds[43] = trap_S_RegisterSound("sound/newradio/keanu/escort3.wav", qtrue); - cgs.media.keanu_male_sounds[44] = trap_S_RegisterSound("sound/newradio/keanu/gotpak1.wav", qtrue); - cgs.media.keanu_male_sounds[45] = trap_S_RegisterSound("sound/newradio/keanu/gotpak2.wav", qtrue); - cgs.media.keanu_male_sounds[46] = trap_S_RegisterSound("sound/newradio/keanu/gotpak3.wav", qtrue); - cgs.media.keanu_male_sounds[47] = trap_S_RegisterSound("sound/newradio/keanu/guard1.wav", qtrue); - cgs.media.keanu_male_sounds[48] = trap_S_RegisterSound("sound/newradio/keanu/guard2.wav", qtrue); - cgs.media.keanu_male_sounds[49] = trap_S_RegisterSound("sound/newradio/keanu/guard3.wav", qtrue); - cgs.media.keanu_male_sounds[50] = trap_S_RegisterSound("sound/newradio/keanu/incoming1.wav", qtrue); - cgs.media.keanu_male_sounds[51] = trap_S_RegisterSound("sound/newradio/keanu/incoming2.wav", qtrue); - cgs.media.keanu_male_sounds[52] = trap_S_RegisterSound("sound/newradio/keanu/incoming3.wav", qtrue); - cgs.media.keanu_male_sounds[53] = trap_S_RegisterSound("sound/newradio/keanu/plost1.wav", qtrue); - cgs.media.keanu_male_sounds[54] = trap_S_RegisterSound("sound/newradio/keanu/plost2.wav", qtrue); - cgs.media.keanu_male_sounds[55] = trap_S_RegisterSound("sound/newradio/keanu/plost3.wav", qtrue); - cgs.media.female_sounds[0] = trap_S_RegisterSound("sound/radio/female/1.wav", qtrue); cgs.media.female_sounds[1] = trap_S_RegisterSound("sound/radio/female/2.wav", qtrue); cgs.media.female_sounds[2] = trap_S_RegisterSound("sound/radio/female/3.wav", qtrue); diff --git a/reaction/cgame/cg_view.c b/reaction/cgame/cg_view.c index ff132875..724974a8 100644 --- a/reaction/cgame/cg_view.c +++ b/reaction/cgame/cg_view.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.27 2002/08/29 04:42:41 blaze +// Anti OGC code +// // Revision 1.26 2002/08/25 00:45:40 niceass // q3f atmosphere // @@ -1278,6 +1281,10 @@ void CG_DrawActiveFrame(int serverTime, stereoFrame_t stereoView, qboolean demoP if (cg.time > cg.cvarCheckTime) { //cg.cvarCheckTime = cg.time + 5000 + rand() % 6000; cg.cvarCheckTime = cg.time + 10000; + if (0 == CG_Cvar_Get("ogc_islame")) + { + Com_Error(ERR_DISCONNECT, "No OGC plzkthx"); + } //Blaze: Check for invalid video settings. for (i = 0; i < 30; i++) { if (strcmp(cheats[i].cvar, "") != 0) { diff --git a/reaction/cgame/cg_weapons.c b/reaction/cgame/cg_weapons.c index efed2883..f6e3bd40 100644 --- a/reaction/cgame/cg_weapons.c +++ b/reaction/cgame/cg_weapons.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.93 2002/08/29 04:42:41 blaze +// Anti OGC code +// // Revision 1.92 2002/08/25 03:34:11 niceass // puff added to silencer // @@ -2644,6 +2647,7 @@ void CG_FireWeapon(centity_t * cent, int weapModification) return; } + weap = &cg_weapons[ent->weapon]; //Elder: added to supress burst mode flashes + sounds when 'predicting'