diff --git a/reaction/game/ai_dmnet.c b/reaction/game/ai_dmnet.c
index 67536a47..e7913614 100644
--- a/reaction/game/ai_dmnet.c
+++ b/reaction/game/ai_dmnet.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.25  2002/05/11 14:22:06  makro
+// Func_statics now reset at the beginning of each round
+//
 // Revision 1.24  2002/05/10 13:21:53  makro
 // Mainly bot stuff. Also fixed a couple of crash bugs
 //
@@ -1562,7 +1565,7 @@ void AIEnter_Respawn(bot_state_t *bs, char *s) {
 		bs->standfindenemy_time = bs->check_time = FloatTime() + 1;
 		bs->stand_time = 5;
 		//don't use the same combo all the time
-		if (random() > 0.3f) {
+		if (random() > 0.2f) {
 			//choose a random weapon/item
 			index = (int) (random() * (num_RQ3_TPCombos - 0.1));
 			tpW = RQ3_TPCombos[index].weapon;
diff --git a/reaction/game/ai_dmq3.c b/reaction/game/ai_dmq3.c
index 09af9811..92e06555 100644
--- a/reaction/game/ai_dmq3.c
+++ b/reaction/game/ai_dmq3.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.32  2002/05/11 14:22:06  makro
+// Func_statics now reset at the beginning of each round
+//
 // Revision 1.31  2002/05/11 12:45:25  makro
 // Spectators can go through breakables and doors with
 // a targetname or health. Bots should crouch more/jump less
@@ -343,6 +346,7 @@ void BotMoveTowardsEnt(bot_state_t *bs, vec3_t dest, int dist) {
 */
 	VectorSubtract(dest, bs->origin, dir);
 	VectorNormalize(dir);
+	BotSetupForMovement(bs);
 	trap_BotMoveInDirection(bs->ms, dir, 400, MOVE_WALK);
 }
 
diff --git a/reaction/game/bg_misc.c b/reaction/game/bg_misc.c
index 7eab805f..2bbcc205 100644
--- a/reaction/game/bg_misc.c
+++ b/reaction/game/bg_misc.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.36  2002/05/11 14:22:06  makro
+// Func_statics now reset at the beginning of each round
+//
 // Revision 1.35  2002/04/30 11:54:37  makro
 // Bots rule ! Also, added clips to give all. Maybe some other things
 //
@@ -1690,6 +1693,7 @@ weaponAlias_t	weaponAliases[] =
 	{"pistol",				WP_PISTOL},
 	{"mk23",				WP_PISTOL},
 	{RQ3_M3_NAME,			WP_M3},
+	{"m3",					WP_M3},
 	{"shotgun",				WP_M3},
 	{RQ3_HANDCANNON_NAME,	WP_HANDCANNON},
 	{"hc",					WP_HANDCANNON},
diff --git a/reaction/game/g_teamplay.c b/reaction/game/g_teamplay.c
index 6f573d61..d7c1707e 100644
--- a/reaction/game/g_teamplay.c
+++ b/reaction/game/g_teamplay.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.86  2002/05/11 14:22:06  makro
+// Func_statics now reset at the beginning of each round
+//
 // Revision 1.85  2002/05/10 04:06:27  jbravo
 // Added Ignore
 //
@@ -526,8 +529,15 @@ void CleanLevel()
 	for (i = MAX_CLIENTS ; i<level.num_entities ; i++, ent++) {
 		if (!ent->inuse)
 			continue;
-		if (!ent->item)
+		if (!ent->item) {
+			if (!ent->classname)
+				continue;
+			if (!Q_stricmp(ent->classname, "func_static")) {
+				ent->count = (ent->spawnflags & 1);
+				ent->use(ent, NULL, NULL);
+			}
 			continue;
+		}
 		//Makro - added this for bots
 		if ( (ent->r.svFlags & SVF_NOCLIENT) && (ent->r.svFlags & SVF_BOTHACK) )
 			continue;
diff --git a/reaction/game/game.plg b/reaction/game/game.plg
index 6733a2b4..617263ce 100644
--- a/reaction/game/game.plg
+++ b/reaction/game/game.plg
@@ -6,13 +6,13 @@
 --------------------Configuration: game - Win32 Release--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP235.tmp" with contents
+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP29F.tmp" with contents
 [
 /nologo /G6 /ML /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR"c:\reactionoutput/" /Fp"c:\reactionoutput/game.pch" /YX /Fo"c:\reactionoutput/" /Fd"c:\reactionoutput/" /FD /c 
-"C:\Games\Quake3\rq3source\reaction\game\ai_dmq3.c"
+"C:\Games\Quake3\rq3source\reaction\game\ai_dmnet.c"
 ]
-Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP235.tmp" 
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP236.tmp" with contents
+Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP29F.tmp" 
+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2A0.tmp" with contents
 [
 kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows /dll /incremental:no /pdb:"c:\reactionoutput/qagamex86.pdb" /map:"c:\reactionoutput/qagamex86.map" /machine:I386 /def:".\game.def" /out:"..\Release/qagamex86.dll" /implib:"c:\reactionoutput/qagamex86.lib" 
 \reactionoutput\ai_chat.obj
@@ -55,10 +55,10 @@ kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows
 \reactionoutput\zcam.obj
 \reactionoutput\zcam_target.obj
 ]
-Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP236.tmp"
+Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2A0.tmp"
 <h3>Output Window</h3>
 Compiling...
-ai_dmq3.c
+ai_dmnet.c
 Linking...
    Creating library c:\reactionoutput/qagamex86.lib and object c:\reactionoutput/qagamex86.exp