Skip to content
Browse files

Merge branch 'master' of github.com:Kajakklubben/48pixels

Conflicts:
	settings/settings.xml
  • Loading branch information...
2 parents 7258a38 + b33abd8 commit bdff674a1bb5adc7d3bdda9dbb0526cf733418a5 @timgarbos timgarbos committed
Showing with 21 additions and 9 deletions.
  1. BIN art/char_climb.psd
  2. +10 −0 code/GameBlock.cpp
  3. +3 −1 code/GameBlock.h
  4. +8 −8 settings/settings.xml
View
BIN art/char_climb.psd
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
10 code/GameBlock.cpp
@@ -245,7 +245,17 @@ void GameBlock::updateSprite(int dir){
return;
}
//lillypads
+ else if(leftBlock->sprite==AnimationLoader::blockAnimations[S_trunk])
+ {
+ sprite = AnimationLoader::blockAnimations[S_branchLeft];
+ return;
+ }
+ else if(rightBlock->sprite==AnimationLoader::blockAnimations[S_trunk])
+ {
+ sprite = AnimationLoader::blockAnimations[S_branchRight];
+ return;
+ }
}
View
4 code/GameBlock.h
@@ -30,7 +30,9 @@ enum BlockAnimationType {
S_springStalk=13,
S_earthWater=14,
S_waterplant=15,
- S_waterplantTrunk=16
+ S_waterplantTrunk=16,
+ S_branchLeft=17,
+ S_branchRight=18
};
const double BlockFadeTime = 0.8;
View
16 settings/settings.xml
@@ -82,14 +82,14 @@
</sprite>
<sprite name="spring" margin="5" layer="6">
<variation>
- <frame duration="0.1" img="water/spring01.png" />
- <frame duration="0.1" img="water/spring02.png" />
- <frame duration="0.1" img="water/spring03.png" />
- <frame duration="0.1" img="water/spring04.png" />
- <frame duration="0.1" img="water/spring05.png" />
- <frame duration="0.1" img="water/spring06.png" />
- <frame duration="0.1" img="water/spring07.png" />
- <frame duration="0.1" img="water/spring08.png" />
+ <frame duration="0.2" img="water/spring01.png" />
+ <frame duration="0.2" img="water/spring02.png" />
+ <frame duration="0.2" img="water/spring03.png" />
+ <frame duration="0.2" img="water/spring04.png" />
+ <frame duration="0.2" img="water/spring05.png" />
+ <frame duration="0.2" img="water/spring06.png" />
+ <frame duration="0.2" img="water/spring07.png" />
+ <frame duration="0.2" img="water/spring08.png" />
</variation>
</sprite>
<sprite name="bush" margin="5" layer="3">

0 comments on commit bdff674

Please sign in to comment.
Something went wrong with that request. Please try again.