1 files changed, 137 insertions, 15 deletions

diff --git a/noncore/games/sfcave-sdl/player.cpp b/noncore/games/sfcave-sdl/player.cpp
index 830ee78..2d52ae2 100644
--- a/noncore/games/sfcave-sdl/player.cpp
+++ b/noncore/games/sfcave-sdl/player.cpp
@@ -11,8 +11,8 @@ Player :: Player( int w, int h )
         sWidth = w;
         sHeight = h;
 
-        thrustUp = 0.4;
-        thrustDown = 0.6;
+        thrust = 0.4;
+        gravity = 0.6;
         maxUpSpeed = 4.0;
         maxDownSpeed = 5.0;
 
@@ -80,10 +80,7 @@ void Player :: drawTrails( SDL_Surface *screen )
         {
                 if ( trail[i].x() >= 0 )
                 {
-        //              int r = (int) ((255.0/pos.x()) * (trail[i].x));
-        //              int g = (int) ((150.0/pos.x()) * (trail[i].x));
                         int c = (int)((150.0/50) * (50.0 - (pos.x() - trail[i].x() ) ));
-        //              SDL_FillRect( screen, &trail[i], SDL_MapRGBA( screen->format, r, g, 0, 0 ) ); //(int)(1.5*c), 0, 255 ) );
                         boxRGBA( screen, trail[i].x(), trail[i].y(), trail[i].x() + 2, trail[i].y() + 2, 255, (int)(1.5*c), 0, c );
                 }
         }
@@ -95,16 +92,16 @@ void Player :: move( bool up )
         moveTrails();
 
         if ( up )
-                thrust -= thrustUp;
+                currentThrust -= thrust;
         else
-                thrust += thrustDown;
+                currentThrust += gravity;
 
-        if ( thrust > maxDownSpeed )
-                thrust = maxDownSpeed;
-        else if ( thrust < -maxUpSpeed )
-                thrust = -maxUpSpeed;
+        if ( currentThrust > maxDownSpeed )
+                currentThrust = maxDownSpeed;
+        else if ( currentThrust < -maxUpSpeed )
+                currentThrust = -maxUpSpeed;
 
-        pos.moveBy( 0, (int)(thrust) );
+        pos.moveBy( 0, (int)(currentThrust) );
 }
 
 void Player :: moveTrails()
@@ -152,11 +149,136 @@ bool Player :: updateCrashing()
         return crashed;
 }
 
-void Player :: setMovementInfo( double up, double down, double maxUp, double maxDown )
+void Player :: setMovementInfo( double up, double grav, double maxUp, double maxDown )
 {
-        thrustUp = up;
-        thrustDown = down;
+        thrust = up;
+        gravity = grav;
         maxUpSpeed = maxUp;
         maxDownSpeed = maxDown;
 }
 
+
+void Player :: incValue( int valueType )
+{
+    switch( valueType )
+    {
+        case PLAYER_THRUST:
+            thrust += 0.1;
+            break;
+        case PLAYER_GRAVITY:
+            gravity += 0.1;
+            break;
+        case PLAYER_MAX_SPEED_UP:
+            maxUpSpeed += 0.1;
+             break;
+       case PLAYER_MAX_SPEED_DOWN:
+            maxDownSpeed += 0.1;
+            break;
+    }
+}
+
+void Player :: decValue( int valueType )
+{
+    switch( valueType )
+    {
+        case PLAYER_THRUST:
+            thrust -= 0.1;
+            break;
+        case PLAYER_GRAVITY:
+            gravity -= 0.1;
+            break;
+       case PLAYER_MAX_SPEED_UP:
+            maxUpSpeed -= 0.1;
+            break;
+        case PLAYER_MAX_SPEED_DOWN:
+            maxDownSpeed -= 0.1;
+            break;
+    }
+}
+
+void Player :: setValue( int valueType, double val )
+{    
+    switch( valueType )
+    {
+        case PLAYER_THRUST:
+            thrust = val;
+            break;
+        case PLAYER_GRAVITY:
+            gravity = val;
+            break;
+       case PLAYER_MAX_SPEED_UP:
+            maxUpSpeed = val;
+            break;
+        case PLAYER_MAX_SPEED_DOWN:
+            maxDownSpeed = val;
+            break;
+    }
+}
+
+double Player :: getValue( int valueType )
+{
+    double val;
+    switch( valueType )
+    {
+        case PLAYER_THRUST:
+            val = thrust;
+            break;
+        case PLAYER_GRAVITY:
+            val = gravity;
+            break;
+        case PLAYER_MAX_SPEED_UP:
+            val = maxUpSpeed;
+            break;
+        case PLAYER_MAX_SPEED_DOWN:
+            val = maxDownSpeed;
+            break;
+    }
+    
+    return val;
+}
+
+string Player :: getValueTypeString( int valueType )
+{
+    string val;
+    switch( valueType )
+    {
+        case PLAYER_THRUST:
+            val = "thrust";
+            break;
+        case PLAYER_GRAVITY:
+            val = "gravity";
+            break;
+        case PLAYER_MAX_SPEED_UP:
+            val = "maxupspeed";
+            break;
+        case PLAYER_MAX_SPEED_DOWN:
+            val = "maxdownspeed";
+            break;
+    }
+
+    return val;
+}
+
+string Player :: getValueString( int valueType )
+{
+    char val[50];
+    switch( valueType )
+    {
+        case PLAYER_THRUST:
+            sprintf( val, "Thrust - %lf", thrust );
+            break;
+        case PLAYER_GRAVITY:
+            sprintf( val, "Gravity - %lf", gravity );
+            break;
+        case PLAYER_MAX_SPEED_UP:
+            sprintf( val, "Max Speed Up - %lf", maxUpSpeed );
+            break;
+        case PLAYER_MAX_SPEED_DOWN:
+            sprintf( val, "Max Speed Down - %lf", maxDownSpeed );
+            break;
+    }
+    
+    string ret = val;
+    return ret;
+}
+