diff --git a/reaction/cgame/cg_local.h b/reaction/cgame/cg_local.h
index 4f4823fb..9ac9955d 100644
--- a/reaction/cgame/cg_local.h
+++ b/reaction/cgame/cg_local.h
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.110  2002/07/21 18:46:32  niceass
+// weaponprediction cvar added
+//
 // Revision 1.109  2002/07/20 02:25:53  jbravo
 // Added the AQDT CTB sounds to the base radio paks
 //
@@ -1659,9 +1662,8 @@ extern vmCvar_t cg_RQ3_bloodStyle;
 
 //NiceAss: strobing weapons/items like quake 2
 extern vmCvar_t cg_RQ3_strobe;
+extern vmCvar_t cg_RQ3_predictWeapons;
 
-//Niceass: Q2-like prediction (or lack of)
-// extern       vmCvar_t                cg_RQ3_oldpredict;
 //Makro - avidemo with jpegs
 extern vmCvar_t cg_RQ3_avidemo;
 extern vmCvar_t cg_drawFriend;
diff --git a/reaction/cgame/cg_main.c b/reaction/cgame/cg_main.c
index 69213310..eaefe824 100644
--- a/reaction/cgame/cg_main.c
+++ b/reaction/cgame/cg_main.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.99  2002/07/21 18:46:57  niceass
+// weaponprediction cvar added
+//
 // Revision 1.98  2002/07/20 02:25:53  jbravo
 // Added the AQDT CTB sounds to the base radio paks
 //
@@ -405,6 +408,10 @@ vmCvar_t cg_RQ3_bloodStyle;
 //NiceAss: Temporary boolean strobe cvar
 vmCvar_t cg_RQ3_strobe;
 
+//NiceAss: Predict weapon animations or not. Makes it like Q2 if disabled.
+vmCvar_t cg_RQ3_predictWeapons;
+
+
 //Makro: avidemo with jpegs
 vmCvar_t cg_RQ3_avidemo;
 vmCvar_t cg_drawFriend;
@@ -610,6 +617,7 @@ static cvarTable_t cvarTable[] = {	// bk001129
 	{&cg_RQ3_laserAssist, "cg_RQ3_laserAssist", "0", CVAR_ARCHIVE},
 	{&cg_RQ3_anouncer, "cg_RQ3_announcer", "1", CVAR_ARCHIVE},
 	{&cg_RQ3_bloodStyle, "cg_RQ3_bloodStyle", "0", CVAR_ARCHIVE},
+	{&cg_RQ3_predictWeapons, "cg_RQ3_predictWeapons", "1", CVAR_ARCHIVE},
 	{&cg_oldRail, "cg_oldRail", "1", CVAR_ARCHIVE},
 	{&cg_oldRocket, "cg_oldRocket", "1", CVAR_ARCHIVE},
 	{&cg_oldPlasma, "cg_oldPlasma", "1", CVAR_ARCHIVE},
diff --git a/reaction/cgame/cg_predict.c b/reaction/cgame/cg_predict.c
index 4a4737b7..e5b29c72 100644
--- a/reaction/cgame/cg_predict.c
+++ b/reaction/cgame/cg_predict.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.25  2002/07/21 18:47:27  niceass
+// weaponprediction cvar added
+//
 // Revision 1.24  2002/06/16 20:06:13  jbravo
 // Reindented all the source files with "indent -kr -ut -i8 -l120 -lc120 -sob -bad -bap"
 //
@@ -636,6 +639,13 @@ void CG_PredictPlayerState(void)
 			cg_pmove.lca = qtrue;
 		else
 			cg_pmove.lca = qfalse;
+		
+		
+		if (cg_RQ3_predictWeapons.integer)
+			cg_pmove.predict = qtrue;
+		else
+			cg_pmove.predict = qfalse;
+
 		Pmove(&cg_pmove);
 
 		moved = qtrue;