diff --git a/source/player/panimsfx.cpp b/source/player/panimsfx.cpp index 8d73486c7..1f1305b0f 100644 --- a/source/player/panimsfx.cpp +++ b/source/player/panimsfx.cpp @@ -42,7 +42,7 @@ // ANIM_PLAYER_ANIM_BUTTBOUNCEEND -static CPlayer::AnimFrameSfx s_buttBounceEndSfx[]= +static const CPlayer::AnimFrameSfx s_buttBounceEndSfx[]= { { 1, CSoundMediator::SFX_SPONGEBOB_BUTTBOUNCE, }, }; @@ -72,7 +72,7 @@ static const int s_buttBounceEndCount=sizeof(s_buttBounceEndSfx)/sizeof(CPlayer: // ANIM_PLAYER_ANIM_IDLEWIGGLEARM // ANIM_PLAYER_ANIM_JUMPEND -static CPlayer::AnimFrameSfx s_jumpEndSfx[]= +static const CPlayer::AnimFrameSfx s_jumpEndSfx[]= { { 4, CSoundMediator::SFX_SPONGEBOB_WALK_2 }, { 5, CSoundMediator::SFX_SPONGEBOB_WALK_1 }, @@ -80,7 +80,7 @@ static CPlayer::AnimFrameSfx s_jumpEndSfx[]= static const int s_jumpEndCount=sizeof(s_jumpEndSfx)/sizeof(CPlayer::AnimFrameSfx); // ANIM_PLAYER_ANIM_KARATE Might have to go into the CPlayerStateChop::enter code (PKG) -static CPlayer::AnimFrameSfx s_chopSfx[]= +static const CPlayer::AnimFrameSfx s_chopSfx[]= { { 1, CSoundMediator::SFX_SPONGEBOB_KARATE_1, }, }; @@ -90,7 +90,7 @@ static const int s_chopCount=sizeof(s_chopSfx)/sizeof(CPlayer::AnimFrameSfx); // ANIM_PLAYER_ANIM_KNOCKFORWARD // ANIM_PLAYER_ANIM_RUN -static CPlayer::AnimFrameSfx s_runSfx[]= +static const CPlayer::AnimFrameSfx s_runSfx[]= { { 6, CSoundMediator::SFX_SPONGEBOB_WALK_1 }, { 18, CSoundMediator::SFX_SPONGEBOB_WALK_2 }, @@ -99,7 +99,7 @@ static const int s_runCount=sizeof(s_runSfx)/sizeof(CPlayer::AnimFrameSfx); // ANIM_PLAYER_ANIM_RUNSTART // ANIM_PLAYER_ANIM_RUNSTOP -static CPlayer::AnimFrameSfx s_runStopSfx[]= +static const CPlayer::AnimFrameSfx s_runStopSfx[]= { { 6, CSoundMediator::SFX_SPONGEBOB_WALK_1 }, { 18, CSoundMediator::SFX_SPONGEBOB_WALK_2 }, @@ -121,7 +121,7 @@ static const int s_runStopCount=sizeof(s_runStopSfx)/sizeof(CPlayer::AnimFrameSf // This is the table that ties up anims to sfx // CPlayer::setAnimFrame() uses this table to generate sfx based upon anim frames -CPlayer::AnimSfx CPlayer::s_animSfx[]= +const CPlayer::AnimSfx CPlayer::s_animSfx[]= { { s_buttBounceEndCount, s_buttBounceEndSfx }, // ANIM_PLAYER_ANIM_BUTTBOUNCEEND { 0, NULL }, // ANIM_PLAYER_ANIM_BUTTBOUNCESTART diff --git a/source/player/player.cpp b/source/player/player.cpp index 220c45eb4..7fbdb9148 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -452,7 +452,7 @@ int CPlayer::getAnimFrame() } void CPlayer::setAnimFrame(int _animFrame) { - AnimSfx *sfx; + const AnimSfx *sfx; m_animFrame=_animFrame; @@ -460,8 +460,8 @@ void CPlayer::setAnimFrame(int _animFrame) sfx=&s_animSfx[m_animNo]; if(sfx->m_numAnimFrameSfx) { - AnimFrameSfx *frameSfx; - int i; + const AnimFrameSfx *frameSfx; + int i; frameSfx=sfx->m_animFrameSfx; for(i=0;im_numAnimFrameSfx;i++) diff --git a/source/player/player.h b/source/player/player.h index d9ebb4a63..a96fec2a0 100644 --- a/source/player/player.h +++ b/source/player/player.h @@ -182,10 +182,10 @@ public: private: typedef struct { - int m_numAnimFrameSfx; - struct AnimFrameSfx *m_animFrameSfx; + int m_numAnimFrameSfx; + const struct AnimFrameSfx *m_animFrameSfx; } AnimSfx; - static AnimSfx s_animSfx[]; + static const AnimSfx s_animSfx[]; int m_animFrame; int m_animNo; CSkel m_skel;