Permalink
Browse files

Fixed some compile warnings.

  • Loading branch information...
1 parent 8291e3f commit 5a57c5945bdacdd036bcb82ec86c1fff0012bd89 @petarov petarov committed Jun 8, 2013
Showing with 14 additions and 4 deletions.
  1. +5 −0 src/CAnimation.cpp
  2. +6 −1 src/CAnimation.h
  3. +3 −3 src/CSdl.h
View
@@ -159,11 +159,16 @@ void CAnimations::Create( Uint16 pos_x, Uint16 pos_y, CONST_ANIMATIONS anim_type
ptr_anm->life = intGetRnd( MIN_SPLATSTAY_TIME, MAX_SPLATSTAY_TIME );
break;
+ default:
+ DBG("Invalid animation specified!");
+ break;
+
/*else if ( anim_type == ANIM_TIRETRAILS )
{
ptr_anm->frame = 0; //intGetRnd( );
//ptr_anm->life = _game->Timer.Time() + intGetRnd( MIN_SPLATSTAY_TIME, MAX_SPLATSTAY_TIME );
}*/
+
}
break;
View
@@ -69,7 +69,12 @@ class CAnimation
{
public:
CAnimation()
- : x(0.0f), y(0.0f), alive(false), frame(0.0f), time_created(0U), life(0U)
+ : x(0.0f), y(0.0f),
+ frame(0.0f),
+ alive(false),
+ time_created(0U),
+ life(0U),
+ type(ANIM_ANGER)
{};
~CAnimation()
View
@@ -92,12 +92,12 @@ class CSound
~CSound() {};
-#ifdef WITH_FMOD
- FMOD_SOUND *sound;
-#endif
bool buffered; // buffered sound?
int play_channel; // unbuffered sounds do not need separate channels
bool loaded;
+#ifdef WITH_FMOD
+ FMOD_SOUND *sound;
+#endif
bool isMusic; // is this a music type of sound?
void Release();

0 comments on commit 5a57c59

Please sign in to comment.