fixed BBBZZZT

diff --git a/player_skate.c b/player_skate.c
index 847f7f5bc6399335eb0f0f131bc3a4de67d7d9a1..3b9c7642b3fa4664f013f45748fc8ff096484048 100644 (file)
--- a/player_skate.c
+++ b/player_skate.c
@@ -876,6 +876,12 @@ VG_STATIC void skate_apply_pump_model( player_instance *player )
 {
    struct player_skate *s = &player->_skate;
 
+   if( s->state.activity != k_skate_activity_ground )
+   {
+      v3_zero( s->state.throw_v );
+      return;
+   }
+
    /* Throw / collect routine 
     *
     * TODO: Max speed boost
@@ -1904,7 +1910,6 @@ VG_STATIC void player__skate_update( player_instance *player )
 
       skate_apply_friction_model( player );
       skate_weight_distribute( player );
-      skate_apply_pump_model( player );
    }
    else
    {
@@ -1932,6 +1937,7 @@ grinding:;
    skate_apply_jump_model( player );
    skate_apply_grab_model( player );
    skate_apply_trick_model( player );
+   skate_apply_pump_model( player );
 
 begin_collision:;
 

diff --git a/shaders/model_sky.h b/shaders/model_sky.h
index 4ff6a70c7fc9bc0de8316c55cbe627e3f1d8be76..6fd769e8ea75b8c0cd66577409347428462ace66 100644 (file)
--- a/shaders/model_sky.h
+++ b/shaders/model_sky.h
@@ -408,7 +408,7 @@ static struct vg_shader _shader_model_sky = {
 "\n"
 "   vec3 rd = normalize(aNorm);\n"
 "\n"
-"   float fmove = g_time * 0.004;\n"
+"   float fmove = g_time * 5.0;\n"
 "   vec2 cloudplane = (rd.xz / (rd.y*sign(rd.y))) * 0.025;\n"
 "   vec4 clouds1 = texture( uTexGarbage, cloudplane + vec2(0.1,0.4)*fmove*2.0 );\n"
 "   vec4 clouds2 = texture( uTexGarbage, cloudplane*2.0 + vec2(0.3,0.1)*fmove );\n"