Fixes and additions

- minor fixes
- added missing files to VisualStudio project

code/game/g_client.c

@@ -1908,6 +1908,7 @@ void G_Client_Spawn(gentity_t *ent, int rpgx_spawn, qboolean fromDeath ) {
 	pclass_t	pClass = 0;//PC_NOCLASS;
 	int		cCDT = 0;
 	int clientNum;
+	pclass_t oClass;
 
 	index = ent - g_entities;
 	client = ent->client;
@@ -2023,7 +2024,7 @@ void G_Client_Spawn(gentity_t *ent, int rpgx_spawn, qboolean fromDeath ) {
 	// health will count down towards max_health
 	ent->health = client->ps.stats[STAT_HEALTH] = client->ps.stats[STAT_MAX_HEALTH] * 1.25;
 
-	pclass_t oClass = client->sess.sessionClass;
+	oClass = client->sess.sessionClass;
 
 	if ( oClass != client->sess.sessionClass )
 	{//need to send the class change

code/game/g_fx.c

@@ -1628,6 +1628,8 @@ void plasma_link( gentity_t *ent )
 //------------------------------------------
 void SP_fx_plasma( gentity_t *ent )
 {
+	int t;
+
 	if (!ent->startRGBA)
 	{
 		ent->startRGBA[0] = 100;
@@ -1644,7 +1646,6 @@ void SP_fx_plasma( gentity_t *ent )
 	G_SpawnInt( "damage", "0", &ent->damage );
 
 	// Convert from range of 0-255 to 0-1
-	int t;
 	for (t=0; t < 3; t++)
 	{
 		ent->startRGBA[t] = ent->startRGBA[t] / 255;
@@ -2014,6 +2015,8 @@ void borg_energy_beam_link( gentity_t *ent )
 //------------------------------------------
 void SP_fx_borg_energy_beam( gentity_t *ent )
 {
+	int t;
+
 	G_SpawnFloat( "radius", "30", &ent->distance );
 	G_SpawnFloat( "speed", "100", &ent->speed );
 	if (!ent->startRGBA)
@@ -2023,7 +2026,6 @@ void SP_fx_borg_energy_beam( gentity_t *ent )
 	}
 
 	// Convert from range of 0-255 to 0-1
-	int t;
 	for (t=0; t < 4; t++)
 	{
 		ent->startRGBA[t] = ent->startRGBA[t] / 255;

code/game/g_syscalls.c

@@ -127,8 +127,10 @@ void trap_Trace( trace_t *results, const vec3_t start, const vec3_t mins, const
 	syscall( G_TRACE, results, start, mins, maxs, end, passEntityNum, contentmask );
 	if(g_developer.integer & 2) { // Debug trace
 		vec3_t s;
+		gentity_t* tmp;
+
 		VectorCopy(start, s);
-		gentity_t* tmp = G_TempEntity(s, EV_DEBUG_TRACE);
+		tmp = G_TempEntity(s, EV_DEBUG_TRACE);
 		VectorCopy(end, tmp->s.origin2);
 	}
 }

code/game/g_turrets.c

@@ -1098,11 +1098,13 @@ void laser_arm_start (gentity_t *base)
 {
 	vec3_t	armAngles;
 	vec3_t	headAngles;
+	gentity_t *arm;
+	gentity_t *head;
 
 	base->think = 0;
 	/* We're the base, spawn the arm and head */
-	gentity_t *arm = G_Spawn();
-	gentity_t *head = G_Spawn();
+	arm = G_Spawn();
+	head = G_Spawn();
 
 	VectorCopy( base->s.angles, armAngles );
 	VectorCopy( base->s.angles, headAngles );

code/game/game.vcxproj

@@ -68,7 +68,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>lua\include;mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__WIN32__;WIN32;_DEBUG;_WINDOWS;DEBUG;QAGAME;XTRA;G_LUA;CG_LUA;SQL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__WIN32__;WIN32;_DEBUG;_WINDOWS;DEBUG;QAGAME;XTRA;G_LUA;CG_LUA;SQL=1;LUA_COMPAT_ALL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -89,7 +89,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;lua52.lib;mysqlclient.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>C:\Program Files\Raven\Star Trek Voyager Elite Force\RPG-X2\qagamex86.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>.\game.def</ModuleDefinitionFile>
@@ -475,6 +475,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="lua_vector.c" />
+    <ClCompile Include="sqlite3.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ai_chat.h" />
@@ -536,6 +537,7 @@
     <ClInclude Include="match.h" />
     <ClInclude Include="md5.h" />
     <ClInclude Include="q_shared.h" />
+    <ClInclude Include="sqlite3.h" />
     <ClInclude Include="surfaceflags.h" />
     <ClInclude Include="syn.h" />
   </ItemGroup>

code/game/game.vcxproj.filters

@@ -282,6 +282,9 @@
     <ClCompile Include="md5.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="sqlite3.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ai_chat.h">
@@ -467,6 +470,9 @@
     <ClInclude Include="md5.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="sqlite3.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="game.def">