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

LuaExpression -> LuaReference

Browse Source
This commit is contained in:
Glenn Maynard
2006-09-21 02:09:44 +00:00
parent fc510e7086
commit d04a5920fa
10 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/DynamicActorScroller.h
+1 -1
View File
@@ -16,7 +16,7 @@ protected:
virtual void ShiftSubActors( int iDist ); virtual void ShiftSubActors( int iDist );
virtual void ConfigureActor( Actor *pActor, int iItem ); virtual void ConfigureActor( Actor *pActor, int iItem );
LuaExpression m_LoadFunction; LuaReference m_LoadFunction;
}; };
class DynamicActorScrollerAutoDeleteChildren: public DynamicActorScroller class DynamicActorScrollerAutoDeleteChildren: public DynamicActorScroller
stepmania/src/GameCommand.h
+1 -1
View File
@@ -63,7 +63,7 @@ public:
RString m_sPreferredModifiers; RString m_sPreferredModifiers;
RString m_sStageModifiers; RString m_sStageModifiers;
RString m_sScreen; RString m_sScreen;
LuaExpression m_LuaFunction; LuaReference m_LuaFunction;
Song* m_pSong; Song* m_pSong;
Steps* m_pSteps; Steps* m_pSteps;
Course* m_pCourse; Course* m_pCourse;
stepmania/src/LuaExpressionTransform.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
LuaExpressionTransform::LuaExpressionTransform() LuaExpressionTransform::LuaExpressionTransform()
{ {
m_pexprTransformFunction = new LuaExpression; m_pexprTransformFunction = new LuaReference;
m_iNumSubdivisions = 1; m_iNumSubdivisions = 1;
} }
stepmania/src/LuaExpressionTransform.h
+2 -2
View File
@@ -4,7 +4,7 @@
#define LuaExpressionTransform_H #define LuaExpressionTransform_H
#include "Actor.h" #include "Actor.h"
class LuaExpression; class LuaReference;
#include <map> #include <map>
class LuaExpressionTransform class LuaExpressionTransform
@@ -22,7 +22,7 @@ public:
protected: protected:
LuaExpression *m_pexprTransformFunction; // params: self,offset,itemIndex,numItems LuaReference *m_pexprTransformFunction; // params: self,offset,itemIndex,numItems
int m_iNumSubdivisions; // 1 == one evaluation per position int m_iNumSubdivisions; // 1 == one evaluation per position
struct PositionOffsetAndItemIndex struct PositionOffsetAndItemIndex
{ {
stepmania/src/MenuTimer.h
+1 -1
View File
@@ -40,7 +40,7 @@ protected:
BitmapText m_text[NUM_MENU_TIMER_TEXTS]; BitmapText m_text[NUM_MENU_TIMER_TEXTS];
LuaExpression m_exprFormatText[NUM_MENU_TIMER_TEXTS]; LuaReference m_exprFormatText[NUM_MENU_TIMER_TEXTS];
RageSound m_soundBeep; RageSound m_soundBeep;
stepmania/src/OptionRowHandler.cpp
+2 -2
View File
@@ -726,10 +726,10 @@ class OptionRowHandlerListSongsInCurrentSongGroup: public OptionRowHandlerList
class OptionRowHandlerLua : public OptionRowHandler class OptionRowHandlerLua : public OptionRowHandler
{ {
public: public:
LuaExpression *m_pLuaTable; LuaReference *m_pLuaTable;
LuaReference m_EnabledForPlayersFunc; LuaReference m_EnabledForPlayersFunc;
OptionRowHandlerLua() { m_pLuaTable = new LuaExpression; Init(); } OptionRowHandlerLua() { m_pLuaTable = new LuaReference; Init(); }
virtual ~OptionRowHandlerLua() { delete m_pLuaTable; } virtual ~OptionRowHandlerLua() { delete m_pLuaTable; }
void Init() void Init()
{ {
stepmania/src/PercentageDisplay.h
+1 -1
View File
@@ -42,7 +42,7 @@ private:
BitmapText m_textPercent; BitmapText m_textPercent;
BitmapText m_textPercentRemainder; BitmapText m_textPercentRemainder;
LuaExpression m_Format; LuaReference m_Format;
}; };
#endif #endif
stepmania/src/Player.cpp
+1 -1
View File
@@ -151,7 +151,7 @@ void Player::Init(
// //
// Init judgment positions // Init judgment positions
// //
LuaExpression expr; LuaReference expr;
expr.SetFromExpression( THEME->GetMetric(sType,"JudgmentTransformCommandFunction") ); expr.SetFromExpression( THEME->GetMetric(sType,"JudgmentTransformCommandFunction") );
bool bPlayerUsingBothSides = GAMESTATE->GetCurrentStyle()->m_StyleType==ONE_PLAYER_TWO_SIDES; bool bPlayerUsingBothSides = GAMESTATE->GetCurrentStyle()->m_StyleType==ONE_PLAYER_TWO_SIDES;
stepmania/src/ThemeManager.cpp
+1 -1
View File
@@ -1001,7 +1001,7 @@ void ThemeManager::GetMetric( const RString &sClassName, const RString &sValueNa
} }
#endif #endif
void ThemeManager::GetMetric( const RString &sClassName, const RString &sValueName, LuaExpression &valueOut ) void ThemeManager::GetMetric( const RString &sClassName, const RString &sValueName, LuaReference &valueOut )
{ {
RString sValue = GetMetricRaw( g_pLoadedThemeData->iniMetrics, sClassName, sValueName ); RString sValue = GetMetricRaw( g_pLoadedThemeData->iniMetrics, sClassName, sValueName );
valueOut.SetFromExpression( "function(self) " + sValue + "end" ); valueOut.SetFromExpression( "function(self) " + sValue + "end" );
stepmania/src/ThemeManager.h
+1 -1
View File
@@ -85,7 +85,7 @@ public:
void GetMetric( const RString &sClassName, const RString &sValueName, float &valueOut ) { valueOut = GetMetricF( sClassName, sValueName ); } void GetMetric( const RString &sClassName, const RString &sValueName, float &valueOut ) { valueOut = GetMetricF( sClassName, sValueName ); }
void GetMetric( const RString &sClassName, const RString &sValueName, bool &valueOut ) { valueOut = GetMetricB( sClassName, sValueName ); } void GetMetric( const RString &sClassName, const RString &sValueName, bool &valueOut ) { valueOut = GetMetricB( sClassName, sValueName ); }
void GetMetric( const RString &sClassName, const RString &sValueName, RageColor &valueOut ) { valueOut = GetMetricC( sClassName, sValueName ); } void GetMetric( const RString &sClassName, const RString &sValueName, RageColor &valueOut ) { valueOut = GetMetricC( sClassName, sValueName ); }
void GetMetric( const RString &sClassName, const RString &sValueName, LuaExpression &valueOut ); void GetMetric( const RString &sClassName, const RString &sValueName, LuaReference &valueOut );
#if !defined(SMPACKAGE) #if !defined(SMPACKAGE)
void GetMetric( const RString &sClassName, const RString &sValueName, apActorCommands &valueOut ); void GetMetric( const RString &sClassName, const RString &sValueName, apActorCommands &valueOut );
#endif #endif