no need for these to be RandomSamples
This commit is contained in:
@@ -175,8 +175,8 @@ void EditMenu::Load( const CString &sType )
|
|||||||
ActorUtil::SetXY( m_SourceMeter, sType );
|
ActorUtil::SetXY( m_SourceMeter, sType );
|
||||||
this->AddChild( &m_SourceMeter );
|
this->AddChild( &m_SourceMeter );
|
||||||
|
|
||||||
m_soundChangeRow.Load( THEME->GetPathS(sType,"row") );
|
m_soundChangeRow.Load( THEME->GetPathS(sType,"row"), true );
|
||||||
m_soundChangeValue.Load( THEME->GetPathS(sType,"value") );
|
m_soundChangeValue.Load( THEME->GetPathS(sType,"value"), true );
|
||||||
|
|
||||||
//
|
//
|
||||||
// fill in data structures
|
// fill in data structures
|
||||||
@@ -279,7 +279,7 @@ void EditMenu::Up()
|
|||||||
ChangeToRow( ROW_STEPS );
|
ChangeToRow( ROW_STEPS );
|
||||||
else
|
else
|
||||||
ChangeToRow( EditMenuRow(m_SelectedRow-1) );
|
ChangeToRow( EditMenuRow(m_SelectedRow-1) );
|
||||||
m_soundChangeRow.PlayRandom();
|
m_soundChangeRow.Play();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -291,7 +291,7 @@ void EditMenu::Down()
|
|||||||
ChangeToRow( ROW_ACTION );
|
ChangeToRow( ROW_ACTION );
|
||||||
else
|
else
|
||||||
ChangeToRow( EditMenuRow(m_SelectedRow+1) );
|
ChangeToRow( EditMenuRow(m_SelectedRow+1) );
|
||||||
m_soundChangeRow.PlayRandom();
|
m_soundChangeRow.Play();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -302,7 +302,7 @@ void EditMenu::Left()
|
|||||||
m_iSelection[m_SelectedRow]--;
|
m_iSelection[m_SelectedRow]--;
|
||||||
wrap( m_iSelection[m_SelectedRow], GetRowSize(m_SelectedRow) );
|
wrap( m_iSelection[m_SelectedRow], GetRowSize(m_SelectedRow) );
|
||||||
OnRowValueChanged( m_SelectedRow );
|
OnRowValueChanged( m_SelectedRow );
|
||||||
m_soundChangeValue.PlayRandom();
|
m_soundChangeValue.Play();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -313,7 +313,7 @@ void EditMenu::Right()
|
|||||||
m_iSelection[m_SelectedRow]++;
|
m_iSelection[m_SelectedRow]++;
|
||||||
wrap( m_iSelection[m_SelectedRow], GetRowSize(m_SelectedRow) );
|
wrap( m_iSelection[m_SelectedRow], GetRowSize(m_SelectedRow) );
|
||||||
OnRowValueChanged( m_SelectedRow );
|
OnRowValueChanged( m_SelectedRow );
|
||||||
m_soundChangeValue.PlayRandom();
|
m_soundChangeValue.Play();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
#include "TextBanner.h"
|
#include "TextBanner.h"
|
||||||
#include "GameConstantsAndTypes.h"
|
#include "GameConstantsAndTypes.h"
|
||||||
#include "DifficultyMeter.h"
|
#include "DifficultyMeter.h"
|
||||||
#include "RandomSample.h"
|
#include "RageSound.h"
|
||||||
#include "EnumHelper.h"
|
#include "EnumHelper.h"
|
||||||
#include "ThemeMetric.h"
|
#include "ThemeMetric.h"
|
||||||
#include "GameConstantsAndTypes.h"
|
#include "GameConstantsAndTypes.h"
|
||||||
@@ -112,8 +112,8 @@ private:
|
|||||||
void OnRowValueChanged( EditMenuRow row );
|
void OnRowValueChanged( EditMenuRow row );
|
||||||
void ChangeToRow( EditMenuRow newRow );
|
void ChangeToRow( EditMenuRow newRow );
|
||||||
|
|
||||||
RandomSample m_soundChangeRow;
|
RageSound m_soundChangeRow;
|
||||||
RandomSample m_soundChangeValue;
|
RageSound m_soundChangeValue;
|
||||||
|
|
||||||
ThemeMetric<bool> SHOW_GROUPS;
|
ThemeMetric<bool> SHOW_GROUPS;
|
||||||
ThemeMetric1D<float> ARROWS_X;
|
ThemeMetric1D<float> ARROWS_X;
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ void ScreenSelectCharacter::Init()
|
|||||||
this->AddChild( &m_sprExplanation );
|
this->AddChild( &m_sprExplanation );
|
||||||
|
|
||||||
|
|
||||||
m_soundChange.Load( THEME->GetPathS("ScreenSelectCharacter","change") );
|
m_soundChange.Load( THEME->GetPathS("ScreenSelectCharacter","change"), true );
|
||||||
|
|
||||||
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group intro") );
|
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group intro") );
|
||||||
|
|
||||||
@@ -312,7 +312,7 @@ void ScreenSelectCharacter::Move( PlayerNumber pn, int deltaValue )
|
|||||||
m_iSelectedCharacter[pnAffected] += deltaValue;
|
m_iSelectedCharacter[pnAffected] += deltaValue;
|
||||||
wrap( m_iSelectedCharacter[pnAffected], apCharacters.size() );
|
wrap( m_iSelectedCharacter[pnAffected], apCharacters.size() );
|
||||||
AfterValueChange(pn);
|
AfterValueChange(pn);
|
||||||
m_soundChange.PlayRandom();
|
m_soundChange.Play();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
#include "ScreenWithMenuElements.h"
|
#include "ScreenWithMenuElements.h"
|
||||||
#include "Sprite.h"
|
#include "Sprite.h"
|
||||||
#include "RandomSample.h"
|
#include "RageSound.h"
|
||||||
#include "GameConstantsAndTypes.h"
|
#include "GameConstantsAndTypes.h"
|
||||||
#include "OptionIcon.h"
|
#include "OptionIcon.h"
|
||||||
#include "Banner.h"
|
#include "Banner.h"
|
||||||
@@ -63,7 +63,7 @@ private:
|
|||||||
|
|
||||||
Sprite m_sprExplanation;
|
Sprite m_sprExplanation;
|
||||||
|
|
||||||
RandomSample m_soundChange;
|
RageSound m_soundChange;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ void ScreenSelectGroup::Init()
|
|||||||
this->AddChild( &m_GroupList );
|
this->AddChild( &m_GroupList );
|
||||||
|
|
||||||
|
|
||||||
m_soundChange.Load( THEME->GetPathS("ScreenSelectGroup","change") );
|
m_soundChange.Load( THEME->GetPathS("ScreenSelectGroup","change"), true );
|
||||||
|
|
||||||
SOUND->PlayOnceFromAnnouncer( "select group intro" );
|
SOUND->PlayOnceFromAnnouncer( "select group intro" );
|
||||||
|
|
||||||
@@ -193,7 +193,7 @@ void ScreenSelectGroup::MenuUp( PlayerNumber pn )
|
|||||||
|
|
||||||
AfterChange();
|
AfterChange();
|
||||||
|
|
||||||
m_soundChange.PlayRandom();
|
m_soundChange.Play();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -206,7 +206,7 @@ void ScreenSelectGroup::MenuDown( PlayerNumber pn )
|
|||||||
|
|
||||||
AfterChange();
|
AfterChange();
|
||||||
|
|
||||||
m_soundChange.PlayRandom();
|
m_soundChange.Play();
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenSelectGroup::MenuStart( PlayerNumber pn )
|
void ScreenSelectGroup::MenuStart( PlayerNumber pn )
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
#include "ScreenWithMenuElements.h"
|
#include "ScreenWithMenuElements.h"
|
||||||
#include "Sprite.h"
|
#include "Sprite.h"
|
||||||
#include "RandomSample.h"
|
#include "RageSound.h"
|
||||||
#include "FadingBanner.h"
|
#include "FadingBanner.h"
|
||||||
#include "MusicList.h"
|
#include "MusicList.h"
|
||||||
#include "GroupList.h"
|
#include "GroupList.h"
|
||||||
@@ -43,7 +43,7 @@ private:
|
|||||||
MusicList m_MusicList;
|
MusicList m_MusicList;
|
||||||
GroupList m_GroupList;
|
GroupList m_GroupList;
|
||||||
|
|
||||||
RandomSample m_soundChange;
|
RageSound m_soundChange;
|
||||||
|
|
||||||
bool m_bChosen;
|
bool m_bChosen;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user