r150 - in trunk/src: . objects

[DONOTREPLY at icculus.org]

Author: jonas
Date: 2005-09-06 05:34:31 -0400 (Tue, 06 Sep 2005)
New Revision: 150

Modified:
   trunk/src/objects/erik.cpp
   trunk/src/objects/erik.h
   trunk/src/players_common.cpp
   trunk/src/players_common.h
Log:
a few additional erik animations, removed anim_land_[left|right]

Modified: trunk/src/objects/erik.cpp
===================================================================
--- trunk/src/objects/erik.cpp	2005-09-06 08:34:41 UTC (rev 149)
+++ trunk/src/objects/erik.cpp	2005-09-06 09:34:31 UTC (rev 150)
@@ -36,8 +36,6 @@
     anim_fall_right=loadAnimation("erik_fall_right",config.lvlscale,BP_LD);
     anim_fall_fast_left=loadAnimation("erik_fall_fast_left",config.lvlscale,BP_RD);
     anim_fall_fast_right=loadAnimation("erik_fall_fast_right",config.lvlscale,BP_LD);
-    anim_land_left=loadAnimation("erik_land_left",config.lvlscale,BP_RD,ATYPE_ONCE_END);
-    anim_land_right=loadAnimation("erik_land_right",config.lvlscale,BP_LD,ATYPE_ONCE_END);
     anim_crash_left=loadAnimation("erik_crash_left",config.lvlscale,BP_RD,ATYPE_ONCE_END,calcFPS(1,T_IRR));
     anim_crash_right=loadAnimation("erik_crash_right",config.lvlscale,BP_LD,ATYPE_ONCE_END,calcFPS(1,T_IRR));
     anim_rope_left=loadAnimation("erik_rope_left",config.lvlscale,BP_RD);
@@ -63,6 +61,8 @@
     anim_erik_jump2_right=loadAnimation("erik_jump2_right",config.lvlscale,BP_LD,ATYPE_ONCE);
     anim_erik_start_run_left=loadAnimation("erik_start_run_left",config.lvlscale,BP_RD,ATYPE_ONCE);
     anim_erik_start_run_right=loadAnimation("erik_start_run_right",config.lvlscale,BP_LD,ATYPE_ONCE);    
+    anim_erik_run_left=loadAnimation("erik_run_left",config.lvlscale,BP_RD,ATYPE_ONCE);
+    anim_erik_run_right=loadAnimation("erik_run_right",config.lvlscale,BP_LD,ATYPE_ONCE);    
     anim_erik_swim_left=loadAnimation("erik_swim_left",config.lvlscale,BP_RD,ATYPE_ONCE);         
     anim_erik_swim_right=loadAnimation("erik_swim_right",config.lvlscale,BP_LD,ATYPE_ONCE);    
     anim_erik_swim_up_left=loadAnimation("erik_swim_up_left",config.lvlscale,BP_RD,ATYPE_ONCE);
@@ -91,7 +91,7 @@
         if (state&(STATE_MLEFT|STATE_MRIGHT)) {
             if (state&STATE_MRIGHT) run_right=true;
             else run_right=false;
-            setEvent(new ERun(this,10000,maxspeedx,500,ESTATE_ABORT,au_run));
+            setEvent(new ERun(this,10000,maxspeedx,500,ESTATE_ABORT,au_run,(state&STATE_LEFT) ? anim_erik_run_left : anim_erik_run_right));
         }
     }
 }
@@ -104,11 +104,11 @@
     } else if (state&STATE_ACT_1) {
         setState(STATE_ACT_2);
         addSpeed(jump2);
-        setEvent(new CAnimEvent(this,DE_JUMP,0,0,au_jump));
+        setEvent(new CAnimEvent(this,DE_JUMP,0,ESTATE_ABORT,au_jump,(state&STATE_LEFT) ? anim_erik_jump2_left : anim_erik_jump2_right));
     } else {
         setState(STATE_ACT_1);
         addSpeed(jump);
-        setEvent(new CAnimEvent(this,DE_JUMP));
+        setEvent(new CAnimEvent(this,DE_JUMP,0,ESTATE_ABORT,NULL,(state&STATE_LEFT) ? anim_erik_jump_left : anim_erik_jump_right));
     }
 }
 
@@ -117,7 +117,7 @@
     if (state&(STATE_MLEFT|STATE_MRIGHT)) {
         if (state&STATE_MRIGHT) run_right=true;
         else run_right=false;
-        setEvent(new ERun(this,10000,maxspeedx,500,ESTATE_ABORT,au_run));
+        setEvent(new ERun(this,10000,maxspeedx,500,ESTATE_ABORT,au_run,(state&STATE_LEFT) ? anim_erik_run_left : anim_erik_run_right));
     }
 }
 

Modified: trunk/src/objects/erik.h
===================================================================
--- trunk/src/objects/erik.h	2005-09-06 08:34:41 UTC (rev 149)
+++ trunk/src/objects/erik.h	2005-09-06 09:34:31 UTC (rev 150)
@@ -30,6 +30,8 @@
         EmptyAnimationPtr anim_erik_jump2_right;
         EmptyAnimationPtr anim_erik_start_run_left;
         EmptyAnimationPtr anim_erik_start_run_right;
+        EmptyAnimationPtr anim_erik_run_left;
+        EmptyAnimationPtr anim_erik_run_right;
         EmptyAnimationPtr anim_erik_swim_left;
         EmptyAnimationPtr anim_erik_swim_right;
         EmptyAnimationPtr anim_erik_swim_up_left;

Modified: trunk/src/players_common.cpp
===================================================================
--- trunk/src/players_common.cpp	2005-09-06 08:34:41 UTC (rev 149)
+++ trunk/src/players_common.cpp	2005-09-06 09:34:31 UTC (rev 150)
@@ -28,8 +28,6 @@
   anim_fall_right(new EmptyAnimation(&anim_right)),
   anim_fall_fast_left(new EmptyAnimation(&anim_fall_left)),
   anim_fall_fast_right(new EmptyAnimation(&anim_fall_right)),
-  anim_land_left(new EmptyAnimation()),
-  anim_land_right(new EmptyAnimation()),
   anim_crash_left(new EmptyAnimation()),
   anim_crash_right(new EmptyAnimation()),
   anim_rope_left(new EmptyAnimation(&anim_left)),
@@ -280,7 +278,9 @@
                 speed=0;
                 Weapon tmpweap(-1,W_PRESSURE,WS_PRESSURE);
                 hit(DIR_UP,tmpweap);
-            } else speed=0;
+            } else {
+                speed=0;
+            }
             break;
         }
     }

Modified: trunk/src/players_common.h
===================================================================
--- trunk/src/players_common.h	2005-09-06 08:34:41 UTC (rev 149)
+++ trunk/src/players_common.h	2005-09-06 09:34:31 UTC (rev 150)
@@ -142,8 +142,6 @@
         EmptyAnimationPtr anim_fall_right;
         EmptyAnimationPtr anim_fall_fast_left;
         EmptyAnimationPtr anim_fall_fast_right;
-        EmptyAnimationPtr anim_land_left;
-        EmptyAnimationPtr anim_land_right;
         EmptyAnimationPtr anim_crash_left;
         EmptyAnimationPtr anim_crash_right;
         EmptyAnimationPtr anim_rope_left;