actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

YOINK!

Browse Source
This commit is contained in:
Jason Felds
2011-02-27 23:13:30 -05:00
parent c86214e144 51e6e47fa4
commit 97d2112fae
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/Scripts/03 CustomSpeedMods.lua
+1 -1
View File
@@ -263,7 +263,7 @@ function SpeedMods()
Choices = GetSpeedMods(), Choices = GetSpeedMods(),
LoadSelections = function(self, list, pn) LoadSelections = function(self, list, pn)
local pMods = GAMESTATE:GetPlayerState(pn):GetPlayerOptions("ModsLevel_Preferred") local pMods = GAMESTATE:GetPlayerState(pn):GetPlayerOptionsString("ModsLevel_Preferred")
for i = 1,table.getn(self.Choices) do for i = 1,table.getn(self.Choices) do
if string.find(pMods, self.Choices[i]) then if string.find(pMods, self.Choices[i]) then
list[i] = true list[i] = true
Themes/default/metrics.ini
+2 -2
View File
@@ -140,7 +140,7 @@ Warning10Command=diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcol
[MusicWheel] [MusicWheel]
FadeSeconds=1 FadeSeconds=1
SwitchSeconds=0.10 SwitchSeconds=0.08
RandomPicksLockedSongs=true RandomPicksLockedSongs=true
RouletteSwitchSeconds=0.05 RouletteSwitchSeconds=0.05
RouletteSlowDownSwitches=5 RouletteSlowDownSwitches=5
@@ -162,7 +162,7 @@ ScrollBarOnCommand=visible,false
; self:rotationx( rotationx_radians * 180/math.pi ); --[[ to degrees end]] \ ; self:rotationx( rotationx_radians * 180/math.pi ); --[[ to degrees end]] \
; end; ; end;
ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:x( (1-math.cos(offsetFromCenter/math.pi))*44 ); self:y( offsetFromCenter*46 ); end ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:x( (1-math.cos(offsetFromCenter/math.pi))*44 ); self:y( offsetFromCenter*46 ); end
NumWheelItems=13 NumWheelItems=11
MusicWheelSortOnCommand=fov,90; MusicWheelSortOnCommand=fov,90;
MusicWheelSortOffCommand=fov,90; MusicWheelSortOffCommand=fov,90;
MusicWheelItemSortOnCommand=zoomy,0;bounceend,0.15;zoomy,1 MusicWheelItemSortOnCommand=zoomy,0;bounceend,0.15;zoomy,1
src/GameState.cpp
+7 -3
View File
@@ -42,7 +42,6 @@
#include <ctime> #include <ctime>
#include <set> #include <set>
GameState* GAMESTATE = NULL; // global and accessable from anywhere in our program GameState* GAMESTATE = NULL; // global and accessable from anywhere in our program
#define NAME_BLACKLIST_FILE "/Data/NamesBlacklist.txt" #define NAME_BLACKLIST_FILE "/Data/NamesBlacklist.txt"
@@ -399,7 +398,7 @@ void GameState::UnjoinPlayer( PlayerNumber pn )
} }
} }
/* handle multiplayer join? */ /* xxx: handle multiplayer join? -aj */
namespace namespace
{ {
@@ -426,7 +425,7 @@ namespace
} }
}; };
// Handle an input that can join a player. Return true if the player joined // Handle an input that can join a player. Return true if the player joined.
bool GameState::JoinInput( PlayerNumber pn ) bool GameState::JoinInput( PlayerNumber pn )
{ {
// When AutoJoin is enabled, join all players on a single start press. // When AutoJoin is enabled, join all players on a single start press.
@@ -1461,6 +1460,11 @@ void GameState::LoadNoteSkinMetrics( PlayerNumber pn )
RString m_sNoteSkin = m_pPlayerState[pn]->m_PlayerOptions.GetStage().m_sNoteSkin; RString m_sNoteSkin = m_pPlayerState[pn]->m_PlayerOptions.GetStage().m_sNoteSkin;
RString sStepsType = StringConversion::ToString( this->m_pCurSteps[pn]->m_StepsType ); RString sStepsType = StringConversion::ToString( this->m_pCurSteps[pn]->m_StepsType );
LOG->Trace("Loading Row/Col/Size values for Noteskin %s | StepsType: %s",m_sNoteSkin.c_str(),sStepsType.c_str()); LOG->Trace("Loading Row/Col/Size values for Noteskin %s | StepsType: %s",m_sNoteSkin.c_str(),sStepsType.c_str());
//m_iNoteSkinRowSpacing[pn] = NOTESKIN->GetMetricI( m_sNoteSkin, sStepsType, "RowSpacing" );
// todo: allow per-column spacing values? -aj
m_iNoteSkinColSpacing[pn] = NOTESKIN->GetMetricI( m_sNoteSkin, sStepsType, "ColSpacing" );
m_iNoteSkinArrowSize[pn] = NOTESKIN->GetMetricI( m_sNoteSkin, sStepsType, "ArrowSize" );
} }
*/ */
src/GameState.h
+1 -1
View File
@@ -215,8 +215,8 @@ public:
BroadcastOnChange<bool> m_bGameplayLeadIn; BroadcastOnChange<bool> m_bGameplayLeadIn;
// Metricable noteskin things // Metricable noteskin things
//void LoadNoteSkinMetrics( PlayerNumber pn );
/* /*
void LoadNoteSkinMetrics( PlayerNumber pn );
int m_iNoteSkinColSpacing[NUM_PLAYERS]; int m_iNoteSkinColSpacing[NUM_PLAYERS];
int m_iNoteSkinArrowSize[NUM_PLAYERS]; int m_iNoteSkinArrowSize[NUM_PLAYERS];
*/ */