no message

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@534 e016b1c5-ed68-44aa-a2f7-31cac88cffde

source/enet/callbacks.c

@@ -5,6 +5,7 @@
 #define ENET_BUILDING_LIB 1
 #include "enet/enet.h"
 
+
 static ENetCallbacks callbacks = { malloc, free, rand };
 
 int

source/src/bot/ac_bot_ai.cpp

@@ -95,7 +95,7 @@ bool CACBot::ChoosePreferredWeapon()
      
 void CACBot::Reload(int Gun)
 {
-    printf("bot reload");
+    
 };
      
 entity *CACBot::SearchForEnts(bool bUseWPs, float flRange, float flMaxHeight)

source/src/renderextras.cpp

@@ -551,8 +551,6 @@ void addshotline(dynent *d, vec &from, vec &to)
     };
 };
 
-VAR(shotline_duration, 0, 75, 10000);
-
 void rendershotlines()
 {
     int lines = 0;
@@ -560,6 +558,7 @@ void rendershotlines()
     {
         shotline *s = &shotlines[i];
         if(!s->inuse) continue;
+		const int shotline_duration = 75;
         if(lastmillis-s->millis > shotline_duration) { s->inuse = false; continue; }
 
         if(!lines)

source/src/weapon.cpp

@@ -113,7 +113,7 @@ COMMAND(altaction, ARG_1INT);
 
 void reload(dynent *d)
 {
-	if(!d || d->reloading) return;   
+	if(!d || d->reloading || d->weaponchanging) return;   
 	if(d == player1) setscope(false);
     bool akimbo = d->gunselect==GUN_PISTOL && d->akimbo!=0;
     

source/vcpp/cube.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="cube"
 	ProjectGUID="{1FAF5BB4-C49A-4124-9F23-188528BAE7C8}"
 	RootNamespace="cube"
@@ -371,7 +371,7 @@
 				ForceConformanceInForLoopScope="true"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="cube.h"
-				PrecompiledHeaderFile="Standalone/cube.pch"
+				PrecompiledHeaderFile=".\Standalone/cube.pch"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -392,7 +392,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib zlib.lib opengl32.lib glu32.lib msvcrt.lib SDLmain.lib SDL.lib SDL_image.lib ws2_32.lib winmm.lib SDL_mixer.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib zdll.lib opengl32.lib glu32.lib msvcrt.lib SDLmain.lib SDL.lib SDL_image.lib ws2_32.lib winmm.lib SDL_mixer.lib"
 				OutputFile="../../bin_win32/ac_server.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -918,7 +918,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
+						UsePrecompiledHeader="0"
 					/>
 				</FileConfiguration>
 			</File>