branches on trees

Kajakklubben · Apr 29, 2012 · 88f8be8 · 88f8be8
1 parent 3f48db1
commit 88f8be8
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 12 deletions.
diff --git a/code/GameBlock.cpp b/code/GameBlock.cpp
@@ -178,6 +178,22 @@ void GameBlock::updateSprite(int dir){
                 sprite = AnimationLoader::blockAnimations[S_waterplant];
                 return;
             }
+           if((bottomBlock->type==BlockGround || bottomBlock->type==BlockSolid || bottomBlock->sprite==AnimationLoader::blockAnimations[S_trunk] || bottomBlock->sprite==AnimationLoader::blockAnimations[S_bush]) && (topBlock->type==BlockGrass))
+            {
+                sprite = AnimationLoader::blockAnimations[S_trunk];
+                return;
+            }
+            else if(bottomBlock->type==BlockGround || bottomBlock->type==BlockSolid)
+           {
+                sprite = AnimationLoader::blockAnimations[S_bush];
+                return;
+            }
+            else if(bottomBlock->sprite==AnimationLoader::blockAnimations[S_trunk] && topBlock->type!=BlockGrass)
+            {
+                sprite = AnimationLoader::blockAnimations[S_bush];
+
+                return;
+            }
 
 
 
@@ -233,34 +249,41 @@ void GameBlock::updateSprite(int dir){
                 return;
             }
             //trees
+            if((bottomBlock->type==BlockGround || bottomBlock->type==BlockSolid || bottomBlock->sprite==AnimationLoader::blockAnimations[S_trunk] || bottomBlock->sprite==AnimationLoader::blockAnimations[S_bush]) && (topBlock->type==BlockGrass))
+            {
+                sprite = AnimationLoader::blockAnimations[S_trunk];
+                return;
+            }
             else if(bottomBlock->type==BlockGround || bottomBlock->type==BlockSolid)
            {
                 sprite = AnimationLoader::blockAnimations[S_bush];
                 return;
             }
-            else if(bottomBlock->sprite==AnimationLoader::blockAnimations[S_bush] || bottomBlock->sprite==AnimationLoader::blockAnimations[S_trunk])
+            else if(bottomBlock->sprite==AnimationLoader::blockAnimations[S_trunk] && topBlock->type!=BlockGrass)
             {
                 sprite = AnimationLoader::blockAnimations[S_bush];
-                bottomBlock->sprite = AnimationLoader::blockAnimations[S_trunk];
+
                 return;
             }
-            //lillypads
-            else if(leftBlock->sprite==AnimationLoader::blockAnimations[S_trunk])
+            if(leftBlock->sprite==AnimationLoader::blockAnimations[S_trunk])
             {
-                sprite = AnimationLoader::blockAnimations[S_branchLeft];
+                sprite = AnimationLoader::blockAnimations[S_branchRight];
                 return;
 
             }
             else if(rightBlock->sprite==AnimationLoader::blockAnimations[S_trunk])
             {
-                sprite = AnimationLoader::blockAnimations[S_branchRight];
+                sprite = AnimationLoader::blockAnimations[S_branchLeft];
                 return;
             }
+            //lillypads
 
         }
 
         sprite = AnimationLoader::blockAnimations[S_floatingPlant];
 
+
+
     }
 
 }

diff --git a/code/GameBlock.h b/code/GameBlock.h
@@ -31,8 +31,8 @@ enum BlockAnimationType {
     S_earthWater=14,
     S_waterplant=15,
     S_waterplantTrunk=16,
-    S_branchLeft=17,
-    S_branchRight=18
+    S_branchLeft=18,
+    S_branchRight=19
 };
 
 const double BlockFadeTime = 0.8;

diff --git a/settings/settings.xml b/settings/settings.xml
@@ -179,22 +179,22 @@
                     <frame duration="0.2" img="plant/floatingPlant01.png" />
                 </variation>
             </sprite>
-			<sprite name="branchLeft" margin="5" layer="7">
+            <sprite name="branchLeft" margin="5" layer="7">
                 <variation>
                     <frame duration="0.2" img="plant/branchLeft01.png" />
                 </variation>
             </sprite>
-			<sprite name="branchRight" margin="5" layer="7">
+            <sprite name="branchRight" margin="5" layer="7">
                 <variation>
                     <frame duration="0.2" img="plant/branchRight01.png" />
                 </variation>
             </sprite>
-			<sprite name="vineBranchLeft" margin="5" layer="7">
+            <sprite name="vineBranchLeft" margin="5" layer="7">
                 <variation>
                     <frame duration="0.2" img="plant/rootBranchLeft01.png" />
                 </variation>
             </sprite>
-			<sprite name="vineBranchRight" margin="5" layer="7">
+            <sprite name="vineBranchRight" margin="5" layer="7">
                 <variation>
                     <frame duration="0.2" img="plant/rootBranchRight01.png" />
                 </variation>