From: Jakob MG <jakob_mg@hotmail.com>
Date: Sat, 2 Apr 2011 18:05:50 +0000 (+0200)
Subject: Fix rpojectile models/shader for vehicles, disable upforce case in racer_frame as... 
X-Git-Tag: xonotic-v0.5.0~199^2~11^2~92
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0a1ff44c7c821276cec0d024e79c237695b70622;p=xonotic%2Fxonotic-data.pk3dir.git

Fix rpojectile models/shader for vehicles, disable upforce case in racer_frame as tahts handled selwhere now
---

diff --git a/models/vehicles/bomblet.md3 b/models/vehicles/bomblet.md3
index a45d24af1..69f2195db 100644
Binary files a/models/vehicles/bomblet.md3 and b/models/vehicles/bomblet.md3 differ
diff --git a/models/vehicles/clusterbomb.md3 b/models/vehicles/clusterbomb.md3
index 5481c574a..c0842dfee 100644
Binary files a/models/vehicles/clusterbomb.md3 and b/models/vehicles/clusterbomb.md3 differ
diff --git a/models/vehicles/clusterbomb_fragment.md3 b/models/vehicles/clusterbomb_fragment.md3
index c2c63c2e0..516da1624 100644
Binary files a/models/vehicles/clusterbomb_fragment.md3 and b/models/vehicles/clusterbomb_fragment.md3 differ
diff --git a/models/vehicles/rocket01.md3 b/models/vehicles/rocket01.md3
index 329f27730..1d9aab939 100644
Binary files a/models/vehicles/rocket01.md3 and b/models/vehicles/rocket01.md3 differ
diff --git a/models/vehicles/rocket02.md3 b/models/vehicles/rocket02.md3
index ab408796d..0a3eef049 100644
Binary files a/models/vehicles/rocket02.md3 and b/models/vehicles/rocket02.md3 differ
diff --git a/models/vehicles/rockets.tga b/models/vehicles/rockets.tga
index 553fdf0e7..a6b873c4d 100644
Binary files a/models/vehicles/rockets.tga and b/models/vehicles/rockets.tga differ
diff --git a/models/vehicles/rockets_gloss.tga b/models/vehicles/rockets_gloss.tga
index d62e764a2..22616da9b 100644
Binary files a/models/vehicles/rockets_gloss.tga and b/models/vehicles/rockets_gloss.tga differ
diff --git a/models/vehicles/rockets_reflect.tga b/models/vehicles/rockets_reflect.tga
index 0c1616657..3cad23f56 100644
Binary files a/models/vehicles/rockets_reflect.tga and b/models/vehicles/rockets_reflect.tga differ
diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc
index 70611e50b..56db32dee 100644
--- a/qcsrc/server/vehicles/racer.qc
+++ b/qcsrc/server/vehicles/racer.qc
@@ -327,9 +327,11 @@ float racer_frame()
     }
 
     racer_align4point();
-    // Move abt crosshir insted of v_angle. this allows custom chase camera.
+
     crosshair_trace(player);
+
 #if VEHICLES_VIEWROTATE_CROSSHAIR
+    // Move abt crosshir insted of v_angle. this allows custom chase camera.
     racer.angles_x *= -1;
     df = vectoangles(normalize(trace_endpos - self.origin + '0 0 32'));
     if(df_x > 180)  df_x -= 360;
@@ -338,7 +340,7 @@ float racer_frame()
     if(df_y < -180) df_y += 360;
 
     // Yaw
-    ftmp = autocvar_g_vehicle_racer_turnspeed * sys_frametime;
+    ftmp = autocvar_g_vehicle_racer_turnspeed * frametime;
     ftmp2 = ftmp * -1;
 
     ftmp = bound(ftmp2, shortangle_f(df_y - racer.angles_y, racer.angles_y), ftmp);
@@ -353,7 +355,7 @@ float racer_frame()
     racer.angles_y = ftmp2;
 
     // Pitch
-    ftmp = autocvar_g_vehicle_racer_pitchspeed * sys_frametime;
+    ftmp = autocvar_g_vehicle_racer_pitchspeed * frametime;
     ftmp2 = ftmp * -1;
 
     ftmp = bound(ftmp2, shortangle_f(player.v_angle_x - racer.angles_x, racer.angles_x), ftmp);
@@ -365,15 +367,15 @@ float racer_frame()
     racer.angles_x *= -1;
 
     // Yaw
-    ftmp = autocvar_g_vehicle_racer_turnspeed * sys_frametime;
+    ftmp = autocvar_g_vehicle_racer_turnspeed * frametime;
     ftmp = bound(-ftmp, shortangle_f(player.v_angle_y - racer.angles_y, racer.angles_y), ftmp);
     racer.angles_y = anglemods(racer.angles_y + ftmp);
 
     // Roll
-    racer.angles_z += -ftmp * autocvar_g_vehicle_racer_turnroll * sys_frametime;
+    racer.angles_z += -ftmp * autocvar_g_vehicle_racer_turnroll * frametime;
 
     // Pitch
-    ftmp = autocvar_g_vehicle_racer_pitchspeed  * sys_frametime;
+    ftmp = autocvar_g_vehicle_racer_pitchspeed  * frametime;
     ftmp = bound(-ftmp, shortangle_f(player.v_angle_x - racer.angles_x, racer.angles_x), ftmp);
     racer.angles_x = bound(-30, anglemods(racer.angles_x + ftmp), 30);
 
@@ -400,8 +402,8 @@ float racer_frame()
     }
 
     // limit _z to avoid flying on normal thrust
-    if(df_z > 0)
-        df_z = min(df_z, 700);
+    //if(df_z > 0)
+    //    df_z = min(df_z, 700);
 
     // Afterburn
     if (player.BUTTON_JUMP)
diff --git a/scripts/vrockets.shader b/scripts/vrockets.shader
index 84d071f85..aa17a993b 100644
--- a/scripts/vrockets.shader
+++ b/scripts/vrockets.shader
@@ -1,8 +1,8 @@
 models/vehicles/rockets
 {
-	dpreflectcube textures/cubemap/sky
- {
-	models/vehicles/rockets.tga
-	rgbgen vertex
- }
+	dpreflectcube cubemaps/default/sky
+ 	{
+		map models/vehicles/rockets.tga
+		rgbgen lightingDiffuse
+	}
 }
\ No newline at end of file