Decouple <vector>

This commit is contained in:
Martin Natano
2023-04-21 22:13:41 +02:00
parent aa87f85eef
commit bacecae1f7
422 changed files with 2326 additions and 1295 deletions
+7 -5
View File
@@ -7,6 +7,8 @@
#include "PlayerOptions.h"
#include "PlayerState.h"
#include <vector>
ActiveAttackList::ActiveAttackList()
{
}
@@ -16,14 +18,14 @@ void ActiveAttackList::Init( const PlayerState* pPlayerState )
m_pPlayerState = pPlayerState;
}
void ActiveAttackList::Update( float fDelta )
void ActiveAttackList::Update( float fDelta )
{
bool bTimeToRefresh =
bool bTimeToRefresh =
IsFirstUpdate() || // check this before running Actor::Update()
m_pPlayerState->m_bAttackBeganThisUpdate ||
m_pPlayerState->m_bAttackEndedThisUpdate;
BitmapText::Update( fDelta );
BitmapText::Update( fDelta );
if( bTimeToRefresh )
Refresh();
@@ -56,7 +58,7 @@ void ActiveAttackList::Refresh()
/*
* (c) 2004 Chris Danford
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -66,7 +68,7 @@ void ActiveAttackList::Refresh()
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+1
View File
@@ -17,6 +17,7 @@
#include <cmath>
#include <cstddef>
#include <typeinfo>
#include <vector>
static Preference<bool> g_bShowMasks("ShowMasks", false);
static const float default_effect_period= 1.0f;
+2 -1
View File
@@ -6,7 +6,6 @@
#include "RageUtil_AutoPtr.h"
#include "LuaReference.h"
#include "EnumHelper.h"
#include <map>
class XNode;
struct lua_State;
class LuaClass;
@@ -14,6 +13,8 @@ class LuaClass;
#include "Tween.h"
#include <cstddef>
#include <map>
#include <vector>
typedef AutoPtrCopyOnWrite<LuaReference> apActorCommands;
+1 -1
View File
@@ -11,7 +11,7 @@
#include "ScreenDimensions.h"
#include <cstdint>
#include <vector>
/* Tricky: We need ActorFrames created in Lua to auto delete their children.
* We don't want classes that derive from ActorFrame to auto delete their
+5 -3
View File
@@ -3,6 +3,8 @@
#include "Actor.h"
#include <vector>
/** @brief A container for other Actors. */
class ActorFrame : public Actor
{
@@ -31,7 +33,7 @@ public:
/** @brief Remove all of the children from the frame. */
void RemoveAllChildren();
/**
/**
* @brief Move a particular actor to the tail.
* @param pActor the actor to go to the tail.
*/
@@ -140,7 +142,7 @@ public:
* @author Chris Danford (c) 2001-2004
* @section LICENSE
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -150,7 +152,7 @@ public:
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+4 -2
View File
@@ -6,6 +6,8 @@
#include "Actor.h"
#include "RageDisplay.h"
#include <vector>
class RageTexture;
class ActorMultiTexture: public Actor
@@ -50,7 +52,7 @@ private:
* @author Chris Danford (c) 2001-2004
* @section LICENSE
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -60,7 +62,7 @@ private:
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+1
View File
@@ -16,6 +16,7 @@
#include <cstddef>
#include <cstdint>
#include <numeric>
#include <vector>
const float min_state_delay= 0.0001f;
+1
View File
@@ -7,6 +7,7 @@
#include "RageTextureID.h"
#include <cstddef>
#include <vector>
enum DrawMode
{
+1
View File
@@ -9,6 +9,7 @@
#include "LuaBinding.h"
#include <cmath>
#include <vector>
/* Tricky: We need ActorFrames created in Lua to auto delete their children.
* We don't want classes that derive from ActorFrame to auto delete their
+8 -6
View File
@@ -16,6 +16,8 @@
#include "arch/Dialog/Dialog.h"
#include <vector>
// Actor registration
static std::map<RString,CreateActorFn> *g_pmapRegistrees = nullptr;
@@ -61,7 +63,7 @@ bool ActorUtil::ResolvePath( RString &sPath, const RString &sName, bool optional
switch(LuaHelpers::ReportScriptError(sError, "BROKEN_FILE_REFERENCE", true))
{
case Dialog::abort:
RageException::Throw( "%s", sError.c_str() );
RageException::Throw( "%s", sError.c_str() );
break;
case Dialog::retry:
FILEMAN->FlushDirCache();
@@ -82,7 +84,7 @@ bool ActorUtil::ResolvePath( RString &sPath, const RString &sName, bool optional
switch(LuaHelpers::ReportScriptError(sError, "BROKEN_FILE_REFERENCE", true))
{
case Dialog::abort:
RageException::Throw( "%s", sError.c_str() );
RageException::Throw( "%s", sError.c_str() );
break;
case Dialog::retry:
FILEMAN->FlushDirCache();
@@ -476,7 +478,7 @@ void ActorUtil::LoadAllCommandsFromName( Actor& actor, const RString &sMetricsGr
for (RString const & sv : vsValueNames)
{
static const RString sEnding = "Command";
static const RString sEnding = "Command";
if( EndsWith(sv,sEnding) )
{
RString sCommandName( sv.begin()+sName.size(), sv.end()-sEnding.size() );
@@ -676,7 +678,7 @@ namespace
LIST_METHOD( ResolvePath ),
LIST_METHOD( IsRegisteredClass ),
LIST_METHOD( LoadAllCommands ),
LIST_METHOD( LoadAllCommandsFromName ),
LIST_METHOD( LoadAllCommandsFromName ),
LIST_METHOD( LoadAllCommandsAndSetXY ),
{ nullptr, nullptr }
};
@@ -687,7 +689,7 @@ LUA_REGISTER_NAMESPACE( ActorUtil )
/*
* (c) 2003-2004 Chris Danford
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -697,7 +699,7 @@ LUA_REGISTER_NAMESPACE( ActorUtil )
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+6 -4
View File
@@ -4,6 +4,8 @@
#include "Actor.h"
#include "RageTexture.h"
#include <vector>
class XNode;
typedef Actor* (*CreateActorFn)();
@@ -25,7 +27,7 @@ Actor *CreateActor() { return new T; }
/**
* @brief Register the requested Actor so that it's more accessible.
*
* Each Actor class should have a REGISTER_ACTOR_CLASS in its CPP file. */
* Each Actor class should have a REGISTER_ACTOR_CLASS in its CPP file. */
#define REGISTER_ACTOR_CLASS( className ) REGISTER_ACTOR_CLASS_WITH_NAME( className, className )
enum FileType
@@ -64,7 +66,7 @@ namespace ActorUtil
}
inline void OffCommand( Actor& actor )
{
// HACK: It's very often that we command things to TweenOffScreen
// HACK: It's very often that we command things to TweenOffScreen
// that we aren't drawing. We know that an Actor is not being
// used if its name is blank. So, do nothing on Actors with a blank name.
// (Do "playcommand" anyway; BGAs often have no name.)
@@ -145,7 +147,7 @@ namespace ActorUtil
/*
* (c) 2003-2004 Chris Danford
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -155,7 +157,7 @@ namespace ActorUtil
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+1
View File
@@ -44,6 +44,7 @@
#include <cmath>
#include <cstddef>
#include <vector>
std::vector<TimingData> AdjustSync::s_vpTimingDataOriginal;
+7 -5
View File
@@ -1,8 +1,10 @@
#ifndef AdjustSync_H
#define AdjustSync_H
#include <vector>
class TimingData;
/**
/**
* @brief Allows for adjusting the sync of a song.
*
* This class defines two ways of adjusting the sync of a song.
@@ -18,7 +20,7 @@ public:
*
* This is designed to work with Split Timing. */
static std::vector<TimingData> s_vpTimingDataOriginal;
static float s_fGlobalOffsetSecondsOriginal;
/* We only want to call the Reset methods before a song, not immediately after
* a song. If we reset it at the end of a song, we have to carefully check
@@ -45,7 +47,7 @@ public:
static int s_iAutosyncOffsetSample;
static float s_fStandardDeviation;
// Measured in seconds. If the average error is too high, we
// Measured in seconds. If the average error is too high, we
// reject the recorded data for the Least Squares Regression.
static const float ERROR_TOO_HIGH;
@@ -61,7 +63,7 @@ public:
* @author Chris Danford, John Bauer (c) 2003-2006
* @section LICENSE
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -71,7 +73,7 @@ public:
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+3
View File
@@ -3,7 +3,10 @@
#include "RageLog.h"
#include "RageUtil.h"
#include "RageFile.h"
#include <cstring>
#include <vector>
AnnouncerManager* ANNOUNCER = nullptr; // global and accessible from anywhere in our program
+7 -3
View File
@@ -2,6 +2,10 @@
#define ANNOUNCER_MANAGER_H
#include "RageTypes.h"
#include <vector>
/** @brief The commentators who say seemlingly random things during gameplay. */
class AnnouncerManager
{
@@ -43,7 +47,7 @@ protected:
extern AnnouncerManager* ANNOUNCER; // global and accessible from anywhere in our program
#endif
/**
@@ -51,7 +55,7 @@ extern AnnouncerManager* ANNOUNCER; // global and accessible from anywhere in ou
* @author Chris Danford (c) 2001-2004
* @section LICENSE
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -61,7 +65,7 @@ extern AnnouncerManager* ANNOUNCER; // global and accessible from anywhere in ou
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+2
View File
@@ -16,6 +16,8 @@
#include <cfloat>
#include <cmath>
#include <cstddef>
#include <vector>
static char const dimension_names[4]= "XYZ";
+2
View File
@@ -7,6 +7,8 @@
#include "PlayerState.h"
#include <cmath>
#include <vector>
void Attack::GetAttackBeats( const Song *pSong, float &fStartBeat, float &fEndBeat ) const
{
+10 -6
View File
@@ -5,6 +5,10 @@
#include "GameConstantsAndTypes.h"
#include "PlayerNumber.h"
#include <vector>
class Song;
class PlayerState;
/** @brief An action made against a Player to make things more difficult. */
@@ -48,7 +52,7 @@ struct Attack
bool bShowInAttackList_ = true ):
level(level_), fStartSecond(fStartSecond_),
fSecsRemaining(fSecsRemaining_), sModifiers(sModifiers_),
bOn(bOn_), bGlobal(bGlobal_),
bOn(bOn_), bGlobal(bGlobal_),
bShowInAttackList(bShowInAttackList_) {}
void GetAttackBeats( const Song *pSong, float &fStartBeat, float &fEndBeat ) const;
@@ -65,7 +69,7 @@ struct Attack
bool ContainsTransformOrTurn() const;
static Attack FromGlobalCourseModifier( const RString &sModifiers );
RString GetTextDescription() const;
int GetNumAttacks() const;
};
@@ -75,12 +79,12 @@ struct AttackArray : public std::vector<Attack>
* @brief Determine if the list of attacks contains a transform or turn mod.
* @return true if it does, or false otherwise. */
bool ContainsTransformOrTurn() const;
/**
* @brief Return a string representation used for simfiles.
* @return the string representation. */
std::vector<RString> ToVectorString() const;
/**
* @brief Adjust the starting time of all attacks.
* @param delta the amount to change. */
@@ -94,7 +98,7 @@ struct AttackArray : public std::vector<Attack>
* @author Chris Danford (c) 2003-2004
* @section LICENSE
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -104,7 +108,7 @@ struct AttackArray : public std::vector<Attack>
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+2
View File
@@ -31,6 +31,8 @@
#include "RageLog.h"
#include "RageSoundReader_FileReader.h"
#include <vector>
void AutoKeysounds::Load( PlayerNumber pn, const NoteData& ndAutoKeysoundsOnly )
{
+6 -3
View File
@@ -5,6 +5,9 @@
#include "PlayerNumber.h"
#include "RageSound.h"
#include <vector>
class RageSoundReader;
class RageSoundReader_Chain;
class Song;
@@ -20,7 +23,7 @@ public:
RageSoundReader *GetSharedSound() { return m_pSharedSound; }
RageSoundReader *GetPlayerSound( PlayerNumber pn ) { if( pn == PLAYER_INVALID ) return nullptr; return m_pPlayerSounds[pn]; }
protected:
protected:
void LoadAutoplaySoundsInto( RageSoundReader_Chain *pChain );
static void LoadTracks( const Song *pSong, RageSoundReader *&pGlobal, RageSoundReader *&pPlayer1, RageSoundReader *&pPlayer2 );
@@ -39,7 +42,7 @@ protected:
* @author Chris Danford, Glenn Maynard (c) 2004
* @section LICENSE
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -49,7 +52,7 @@ protected:
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+3
View File
@@ -8,6 +8,9 @@
#include "LuaManager.h"
#include "PrefsManager.h"
#include <vector>
REGISTER_ACTOR_CLASS(BGAnimation);
BGAnimation::BGAnimation()
+5 -2
View File
@@ -3,7 +3,10 @@
#include "GameConstantsAndTypes.h"
#include "ActorFrame.h"
#include <map>
#include <vector>
class XNode;
@@ -57,7 +60,7 @@ protected:
* @author Ben Nordstrom, Chris Danford, Glenn Maynard (c) 2001-2004
* @section LICENSE
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -67,7 +70,7 @@ protected:
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+3 -1
View File
@@ -12,7 +12,9 @@
#include "Steps.h"
#include <cmath>
#include <limits.h>
#include <climits>
#include <vector>
REGISTER_ACTOR_CLASS( BPMDisplay );
+7 -3
View File
@@ -5,6 +5,10 @@
#include "AutoActor.h"
#include "ThemeMetric.h"
#include "LocalizedString.h"
#include <vector>
class Song;
class Steps;
class Course;
@@ -24,7 +28,7 @@ public:
* @brief Update the display as required.
* @param fDeltaTime the changed time.
*/
virtual void Update( float fDeltaTime );
virtual void Update( float fDeltaTime );
void LoadFromNode( const XNode *pNode );
/**
* @brief Use the BPM[s] from a song.
@@ -122,7 +126,7 @@ protected:
* @author Chris Danford (c) 2001-2002
* @section LICENSE
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -132,7 +136,7 @@ protected:
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+2
View File
@@ -24,6 +24,8 @@
#include "AutoActor.h"
#include <cfloat>
#include <vector>
static ThemeMetric<float> LEFT_EDGE ("Background","LeftEdge");
static ThemeMetric<float> TOP_EDGE ("Background","TopEdge");
+5 -2
View File
@@ -6,6 +6,9 @@
#include "PlayerNumber.h"
#include "BackgroundUtil.h"
#include <vector>
class DancingCharacters;
class Song;
class BackgroundImpl;
@@ -48,7 +51,7 @@ protected:
* @author Chris Danford, Ben Nordstrom (c) 2001-2004
* @section LICENSE
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -58,7 +61,7 @@ protected:
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+6 -4
View File
@@ -5,11 +5,13 @@
#include "IniFile.h"
#include "RageLog.h"
#include <set>
#include "Background.h"
#include "RageFileManager.h"
#include "ActorUtil.h"
#include <set>
#include <vector>
bool BackgroundDef::operator<( const BackgroundDef &other ) const
{
@@ -25,7 +27,7 @@ bool BackgroundDef::operator<( const BackgroundDef &other ) const
bool BackgroundDef::operator==( const BackgroundDef &other ) const
{
return
return
m_sEffect == other.m_sEffect &&
m_sFile1 == other.m_sFile1 &&
m_sFile2 == other.m_sFile2 &&
@@ -380,7 +382,7 @@ void BackgroundUtil::BakeAllBackgroundChanges( Song *pSong )
/*
* (c) 2001-2004 Chris Danford, Ben Nordstrom
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -390,7 +392,7 @@ void BackgroundUtil::BakeAllBackgroundChanges( Song *pSong )
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+12 -9
View File
@@ -1,6 +1,9 @@
#ifndef BackgroundUtil_H
#define BackgroundUtil_H
#include <vector>
class Song;
class XNode;
@@ -27,11 +30,11 @@ struct BackgroundDef
RString m_sColor2; // "" == use default
XNode *CreateNode() const;
/** @brief Set up the BackgroundDef with default values. */
BackgroundDef(): m_sEffect(""), m_sFile1(""), m_sFile2(""),
m_sColor1(""), m_sColor2("") {}
/**
* @brief Set up the BackgroundDef with some defined values.
* @param effect the intended effect.
@@ -47,11 +50,11 @@ struct BackgroundChange
BackgroundChange(): m_def(), m_fStartBeat(-1), m_fRate(1),
m_sTransition("") {}
BackgroundChange(
float s,
BackgroundChange(
float s,
RString f1,
RString f2=RString(),
float r=1.f,
float r=1.f,
RString e=SBE_Centered,
RString t=RString()
):
@@ -64,7 +67,7 @@ struct BackgroundChange
RString m_sTransition;
RString GetTextDescription() const;
/**
* @brief Get the string representation of the change.
* @return the string representation. */
@@ -75,7 +78,7 @@ namespace BackgroundUtil
{
void AddBackgroundChange( std::vector<BackgroundChange> &vBackgroundChanges, BackgroundChange seg );
void SortBackgroundChangesArray( std::vector<BackgroundChange> &vBackgroundChanges );
void GetBackgroundEffects( const RString &sName, std::vector<RString> &vsPathsOut, std::vector<RString> &vsNamesOut );
void GetBackgroundTransitions( const RString &sName, std::vector<RString> &vsPathsOut, std::vector<RString> &vsNamesOut );
@@ -94,7 +97,7 @@ namespace BackgroundUtil
/*
* (c) 2001-2004 Chris Danford, Ben Nordstrom
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -104,7 +107,7 @@ namespace BackgroundUtil
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+1
View File
@@ -12,6 +12,7 @@
#include <cmath>
#include <cstddef>
#include <vector>
REGISTER_ACTOR_CLASS( BitmapText );
+2
View File
@@ -5,6 +5,8 @@
#include <cstddef>
#include <map>
#include <vector>
class RageTexture;
class Font;
+9 -6
View File
@@ -5,6 +5,9 @@
#include "RageTextureID.h"
#include "ActorUtil.h"
#include <vector>
RString GetRandomFileInDir( RString sDir );
Character::Character(): m_sCharDir(""), m_sCharacterID(""),
@@ -86,8 +89,8 @@ RString Character::GetModelPath() const
{
RString s = m_sCharDir + "model.txt";
if( DoesFileExist(s) )
return s;
else
return s;
else
return RString();
}
@@ -171,7 +174,7 @@ bool Character::Has2DElems()
if( DoesFileExist(m_sCharDir + "2DFever/BGAnimation.ini") ) // check 2D Idle BGAnim exists
return true;
if( DoesFileExist(m_sCharDir + "2DGood/BGAnimation.ini") ) // check 2D Idle BGAnim exists
return true;
return true;
if( DoesFileExist(m_sCharDir + "2DMiss/BGAnimation.ini") ) // check 2D Idle BGAnim exists
return true;
if( DoesFileExist(m_sCharDir + "2DWin/BGAnimation.ini") ) // check 2D Idle BGAnim exists
@@ -206,7 +209,7 @@ void Character::UndemandGraphics()
// lua start
#include "LuaBinding.h"
/** @brief Allow Lua to have access to the Character. */
/** @brief Allow Lua to have access to the Character. */
class LunaCharacter: public Luna<Character>
{
public:
@@ -245,7 +248,7 @@ LUA_REGISTER_CLASS( Character )
/*
* (c) 2003 Chris Danford
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -255,7 +258,7 @@ LUA_REGISTER_CLASS( Character )
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+7 -4
View File
@@ -5,6 +5,9 @@
#include "LuaManager.h"
#include <vector>
#define CHARACTERS_DIR "/Characters/"
CharacterManager* CHARMAN = nullptr; // global object accessible from anywhere in the program
@@ -45,7 +48,7 @@ CharacterManager::CharacterManager()
else
delete pChar;
}
if( !FoundDefault )
RageException::Throw( "'Characters/default' is missing." );
@@ -119,7 +122,7 @@ Character* CharacterManager::GetCharacterFromID( RString sCharacterID )
// lua start
#include "LuaBinding.h"
/** @brief Allow Lua to have access to the CharacterManager. */
/** @brief Allow Lua to have access to the CharacterManager. */
class LunaCharacterManager: public Luna<CharacterManager>
{
public:
@@ -176,7 +179,7 @@ LUA_REGISTER_CLASS( CharacterManager )
/*
* (c) 2001-2004 Chris Danford
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -186,7 +189,7 @@ LUA_REGISTER_CLASS( CharacterManager )
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+6 -3
View File
@@ -1,6 +1,9 @@
#ifndef CHARACTER_MANAGER_H
#define CHARACTER_MANAGER_H
#include <vector>
class Character;
struct lua_State;
@@ -35,13 +38,13 @@ private:
extern CharacterManager* CHARMAN; // global and accessible from anywhere in our program
#endif
/*
* (c) 2001-2004 Chris Danford
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -51,7 +54,7 @@ extern CharacterManager* CHARMAN; // global and accessible from anywhere in our
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+3 -2
View File
@@ -11,6 +11,7 @@
#include "InputEventPlus.h"
#include "OptionRowHandler.h"
const char *CodeNames[] = {
"PrevSteps1",
"PrevSteps2",
@@ -253,7 +254,7 @@ bool CodeDetector::DetectAndAdjustMusicOptions( GameController controller )
/*
* (c) 2001-2004 Chris Danford
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -263,7 +264,7 @@ bool CodeDetector::DetectAndAdjustMusicOptions( GameController controller )
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+5 -2
View File
@@ -4,6 +4,9 @@
#include "InputEventPlus.h"
#include "MessageManager.h"
#include <vector>
#define CODE_NAMES THEME->GetMetric (sType,"CodeNames")
#define CODE( s ) THEME->GetMetric (sType,ssprintf("Code%s",s.c_str()))
void InputQueueCodeSet::Load( const RString &sType )
@@ -56,7 +59,7 @@ bool InputQueueCodeSet::InputMessage( const InputEventPlus &input, Message &msg
/*
* (c) 2007 Glenn Maynard
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -66,7 +69,7 @@ bool InputQueueCodeSet::InputMessage( const InputEventPlus &input, Message &msg
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+5 -2
View File
@@ -3,6 +3,9 @@
#include "InputQueue.h"
#include <vector>
struct Message;
class InputQueueCodeSet
{
@@ -21,7 +24,7 @@ private:
/*
* (c) 2007 Glenn Maynard
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -31,7 +34,7 @@ private:
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+2
View File
@@ -6,6 +6,8 @@
#include <cstddef>
#include <numeric>
#include <vector>
RString Command::GetName() const
{
+8 -5
View File
@@ -3,13 +3,16 @@
#ifndef Commands_H
#define Commands_H
#include <vector>
class Command
{
public:
void Load( const RString &sCommand );
RString GetOriginalCommandString() const; // used when reporting an error in number of args
RString GetName() const; // the command name is the first argument in all-lowercase
RString GetName() const; // the command name is the first argument in all-lowercase
void Clear() { m_vsArgs.clear(); }
@@ -21,7 +24,7 @@ public:
Arg GetArg( unsigned index ) const;
std::vector<RString> m_vsArgs;
Command(): m_vsArgs() {}
};
@@ -33,7 +36,7 @@ public:
RString GetOriginalCommandString() const; // used when reporting an error in number of args
};
// Take a command list string and return pointers to each of the tokens in the
// Take a command list string and return pointers to each of the tokens in the
// string. sCommand list is a list of commands separated by ';'.
// TODO: This is expensive to do during the game. Eventually, move all calls to
// ParseCommands to happen during load, then execute from the parsed Command structures.
@@ -45,7 +48,7 @@ Commands ParseCommands( const RString &sCmds );
/*
* (c) 2004 Chris Danford
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -55,7 +58,7 @@ Commands ParseCommands( const RString &sCmds );
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+4 -2
View File
@@ -18,6 +18,8 @@
#include "ScreenInstallOverlay.h"
#include "ver.h"
#include <vector>
// only used for Version()
#if defined(_WINDOWS)
#include <windows.h>
@@ -88,7 +90,7 @@ void CommandLineActions::Handle(LoadingWindow* pLW)
/*
* (c) 2006 Chris Danford, Steve Checkoway
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -98,7 +100,7 @@ void CommandLineActions::Handle(LoadingWindow* pLW)
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+5 -2
View File
@@ -1,6 +1,9 @@
#ifndef CommandLineActions_H
#define CommandLineActions_H
#include <vector>
class LoadingWindow;
/** @brief The collection of command line actions. */
@@ -32,7 +35,7 @@ namespace CommandLineActions
* @author Chris Danford, Steve Checkoway (c) 2006
* @section LICENSE
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -42,7 +45,7 @@ namespace CommandLineActions
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+8 -5
View File
@@ -8,6 +8,9 @@
#include "ProductInfo.h"
#include "LuaManager.h"
#include <vector>
ThemeMetric<RString> CommonMetrics::OPERATOR_MENU_SCREEN ("Common","OperatorMenuScreen");
ThemeMetric<RString> CommonMetrics::FIRST_ATTRACT_SCREEN ("Common","FirstAttractScreen");
ThemeMetric<RString> CommonMetrics::DEFAULT_MODIFIERS ("Common","DefaultModifiers" );
@@ -22,7 +25,7 @@ ThemeMetric<bool> CommonMetrics::AUTO_SET_STYLE ("Common","AutoSetStyle");
ThemeMetric<int> CommonMetrics::PERCENT_SCORE_DECIMAL_PLACES ("Common","PercentScoreDecimalPlaces");
ThemeMetric<RString> CommonMetrics::IMAGES_TO_CACHE ("Common","ImageCache");
ThemeMetricDifficultiesToShow::ThemeMetricDifficultiesToShow( const RString& sGroup, const RString& sName ) :
ThemeMetricDifficultiesToShow::ThemeMetricDifficultiesToShow( const RString& sGroup, const RString& sName ) :
ThemeMetric<RString>(sGroup,sName)
{
// re-read because ThemeMetric::ThemeMetric calls ThemeMetric::Read, not the derived one
@@ -61,7 +64,7 @@ void ThemeMetricDifficultiesToShow::Read()
const std::vector<Difficulty>& ThemeMetricDifficultiesToShow::GetValue() const { return m_v; }
ThemeMetricCourseDifficultiesToShow::ThemeMetricCourseDifficultiesToShow( const RString& sGroup, const RString& sName ) :
ThemeMetricCourseDifficultiesToShow::ThemeMetricCourseDifficultiesToShow( const RString& sGroup, const RString& sName ) :
ThemeMetric<RString>(sGroup,sName)
{
// re-read because ThemeMetric::ThemeMetric calls ThemeMetric::Read, not the derived one
@@ -120,7 +123,7 @@ static void RemoveStepsTypes( std::vector<StepsType>& inout, RString sStepsTypes
inout.erase( iter );
}
}
ThemeMetricStepsTypesToShow::ThemeMetricStepsTypesToShow( const RString& sGroup, const RString& sName ) :
ThemeMetricStepsTypesToShow::ThemeMetricStepsTypesToShow( const RString& sGroup, const RString& sName ) :
ThemeMetric<RString>(sGroup,sName)
{
// re-read because ThemeMetric::ThemeMetric calls ThemeMetric::Read, not the derived one
@@ -153,7 +156,7 @@ LuaFunction( LocalizeOptionItem, CommonMetrics::LocalizeOptionItem(SArg(1),true)
/*
* (c) 2001-2004 Chris Danford
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -163,7 +166,7 @@ LuaFunction( LocalizeOptionItem, CommonMetrics::LocalizeOptionItem(SArg(1),true)
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+7 -4
View File
@@ -7,6 +7,9 @@
#include "GameConstantsAndTypes.h"
#include "LocalizedString.h"
#include <vector>
// Types
class ThemeMetricDifficultiesToShow : public ThemeMetric<RString>
{
@@ -40,7 +43,7 @@ private:
};
/**
/**
* @brief Definitions of metrics that are in the "Common" group.
*
* These metrics are used throughout the metrics file. */
@@ -74,7 +77,7 @@ namespace CommonMetrics
extern ThemeMetric<bool> AUTO_SET_STYLE;
/** @brief How many decimal places are used? */
extern ThemeMetric<int> PERCENT_SCORE_DECIMAL_PLACES;
extern ThemeMetric<RString> IMAGES_TO_CACHE;
RString LocalizeOptionItem( const RString &s, bool bOptional );
@@ -87,7 +90,7 @@ namespace CommonMetrics
* @author Chris Danford (c) 2003-2004
* @section LICENSE
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -97,7 +100,7 @@ namespace CommonMetrics
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+3 -1
View File
@@ -19,7 +19,9 @@
#include "Style.h"
#include <cstddef>
#include <limits.h>
#include <climits>
#include <vector>
static Preference<int> MAX_SONGS_IN_EDIT_COURSE( "MaxSongsInEditCourse", -1 );
+6 -3
View File
@@ -8,8 +8,11 @@
#include "RageTypes.h"
#include "SongUtil.h"
#include "StepsUtil.h"
#include <map>
#include <set>
#include <vector>
struct lua_State;
class Style;
@@ -54,7 +57,7 @@ public:
bool bNoDifficult; // if true, CourseDifficulty doesn't affect this entry
SongSort songSort; // sort by this after filtering
int iChooseIndex; //
int iChooseIndex; //
RString sModifiers; // set player and song options using these
AttackArray attacks; // timed sModifiers
@@ -218,7 +221,7 @@ public:
/*
* (c) 2001-2004 Chris Danford, Glenn Maynard
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -228,7 +231,7 @@ public:
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+6 -2
View File
@@ -2,6 +2,10 @@
#define COURSE_CONTENTS_LIST_H
#include "ActorScroller.h"
#include <vector>
class CourseEntryDisplay;
/** @brief Holds course name and banner. */
class CourseContentsList : public ActorScroller
@@ -28,7 +32,7 @@ protected:
/*
* (c) 2001-2004 Chris Danford
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -38,7 +42,7 @@ protected:
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+2
View File
@@ -16,6 +16,8 @@
#include "CourseUtil.h"
#include <cfloat>
#include <vector>
/** @brief Edit courses can only be so big before they are rejected. */
const int MAX_EDIT_COURSE_SIZE_BYTES = 32*1024; // 32KB
+7 -4
View File
@@ -16,6 +16,9 @@
#include "RageFileManager.h"
#include "CourseWriterCRS.h"
#include <vector>
// Sorting stuff
static bool CompareCoursePointersByName( const Course* pCourse1, const Course* pCourse2 )
{
@@ -266,7 +269,7 @@ void CourseUtil::AutogenNonstopFromGroup( const RString &sGroupName, Difficulty
out.m_bRepeat = false;
out.m_sMainTitle += " Random";
out.m_sMainTitle += " Random";
// resize to 4
while( out.m_vEntries.size() < 4 )
@@ -575,7 +578,7 @@ XNode* CourseID::CreateNode() const
return pNode;
}
void CourseID::LoadFromNode( const XNode* pNode )
void CourseID::LoadFromNode( const XNode* pNode )
{
ASSERT( pNode->GetName() == "Course" );
sFullTitle = RString();
@@ -605,7 +608,7 @@ bool CourseID::IsValid() const
/*
* (c) 2001-2004 Chris Danford
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -615,7 +618,7 @@ bool CourseID::IsValid() const
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+5 -2
View File
@@ -4,6 +4,9 @@
#include "GameConstantsAndTypes.h"
#include "Difficulty.h"
#include <vector>
class Course;
class Profile;
class XNode;
@@ -101,7 +104,7 @@ private:
* @author Chris Danford (c) 2001-2004
* @section LICENSE
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -111,7 +114,7 @@ private:
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+9 -6
View File
@@ -7,6 +7,9 @@
#include "Song.h"
#include "RageFileDriverMemory.h"
#include <vector>
/** @brief Load the difficulty names from CourseLoaderCRS. */
extern const char *g_CRSDifficultyNames[]; // in CourseLoaderCRS
@@ -129,7 +132,7 @@ bool CourseWriterCRS::Write( const Course &course, RageFileBasic &f, bool bSavin
{
Song *pSong = entry.songID.ToSong();
const RString &sSong = Basename( pSong->GetSongDir() );
f.Write( "#SONG:" );
if( !entry.songCriteria.m_sGroupName.empty() )
f.Write( entry.songCriteria.m_sGroupName + '/' );
@@ -173,12 +176,12 @@ bool CourseWriterCRS::Write( const Course &course, RageFileBasic &f, bool bSavin
sModifiers += ',';
sModifiers += ssprintf( "award%d", entry.iGainLives );
}
f.Write( sModifiers );
f.PutLine( ";" );
}
}
return true;
}
@@ -186,7 +189,7 @@ bool CourseWriterCRS::Write( const Course &course, RageFileBasic &f, bool bSavin
/*
* (c) 2001-2004 Chris Danford, Glenn Maynard
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -196,7 +199,7 @@ bool CourseWriterCRS::Write( const Course &course, RageFileBasic &f, bool bSavin
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+2
View File
@@ -17,6 +17,8 @@
#include "LuaManager.h"
#include <cstdint>
#include <vector>
CryptManager* CRYPTMAN = nullptr; // global and accessible from anywhere in our program
+3
View File
@@ -4,6 +4,9 @@
#include "RageFile.h"
#include "RageLog.h"
#include <vector>
CsvFile::CsvFile()
{
}
+5 -2
View File
@@ -3,6 +3,9 @@
#ifndef CsvFile_H
#define CsvFile_H
#include <vector>
class RageFileBasic;
class CsvFile
@@ -29,7 +32,7 @@ private:
* (c) 2001-2004 Adam Clauss, Chris Danford
*
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -39,7 +42,7 @@ private:
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+2
View File
@@ -5,6 +5,8 @@
#include <cstddef>
#include <list>
#include <vector>
// Spline solving optimization:
// The tridiagonal part of the system of equations for a spline of size n is
+5 -2
View File
@@ -9,6 +9,9 @@
#include "Steps.h"
#include "Trail.h"
#include <vector>
static const char *DifficultyNames[] = {
"Beginner",
"Easy",
@@ -165,7 +168,7 @@ LuaFunction( TrailToCustomDifficulty, TrailToCustomDifficulty(Luna<Trail>::check
/*
* (c) 2001-2004 Chris Danford
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -175,7 +178,7 @@ LuaFunction( TrailToCustomDifficulty, TrailToCustomDifficulty(Luna<Trail>::check
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+2
View File
@@ -11,6 +11,8 @@
#include "XmlFile.h"
#include <cstddef>
#include <vector>
/** @brief Specifies the max number of charts available for a song.
*
+5 -2
View File
@@ -7,6 +7,9 @@
#include "StepsDisplay.h"
#include "ThemeMetric.h"
#include <vector>
class Song;
class Steps;
@@ -77,7 +80,7 @@ private:
/*
* (c) 2003-2004 Glenn Maynard
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -87,7 +90,7 @@ private:
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+3
View File
@@ -3,6 +3,9 @@
#include "LuaBinding.h"
#include "RageLog.h"
#include <vector>
class LunaDisplayMode: public Luna<DisplayMode>
{
public:
+2
View File
@@ -14,6 +14,8 @@
#include "SongUtil.h"
#include <cstddef>
#include <vector>
static const char *EditMenuRowNames[] = {
"Group",
+24 -21
View File
@@ -10,16 +10,19 @@
#include "EnumHelper.h"
#include "ThemeMetric.h"
#include <vector>
/** @brief What type of row is needed for the EditMenu? */
enum EditMenuRow
{
ROW_GROUP,
ROW_SONG,
ROW_STEPS_TYPE,
enum EditMenuRow
{
ROW_GROUP,
ROW_SONG,
ROW_STEPS_TYPE,
ROW_STEPS,
ROW_SOURCE_STEPS_TYPE,
ROW_SOURCE_STEPS,
ROW_ACTION,
ROW_SOURCE_STEPS_TYPE,
ROW_SOURCE_STEPS,
ROW_ACTION,
NUM_EditMenuRow /**< The number of EditMenuRows available. */
};
/** @brief Loop through each EditMenuRow. */
@@ -63,10 +66,10 @@ const RString& EditMenuActionToLocalizedString( EditMenuAction ema );
const int NUM_ARROWS = 2;
/**
* @brief UI on Edit Menu screen.
* @brief UI on Edit Menu screen.
*
* Create Steps, delete Steps, or launch Steps in editor. */
class EditMenu: public ActorFrame
class EditMenu: public ActorFrame
{
public:
/** @brief Set up the EditMenu. */
@@ -110,19 +113,19 @@ public:
/** @brief Retrieve the currently selected group.
* @return the current group. */
RString GetSelectedGroup() const
{
if( !SHOW_GROUPS.GetValue() ) return GROUP_ALL;
{
if( !SHOW_GROUPS.GetValue() ) return GROUP_ALL;
int groups = static_cast<int>(m_sGroups.size());
RETURN_IF_INVALID(m_iSelection[ROW_GROUP] >= groups, "");
return m_sGroups[m_iSelection[ROW_GROUP]];
return m_sGroups[m_iSelection[ROW_GROUP]];
}
/** @brief Retrieve the currently selected song.
* @return the current song. */
Song* GetSelectedSong() const
Song* GetSelectedSong() const
{
RETURN_IF_INVALID(m_pSongs.empty() ||
m_iSelection[ROW_SONG] >= (int)m_pSongs.size(), nullptr);
return m_pSongs[m_iSelection[ROW_SONG]];
return m_pSongs[m_iSelection[ROW_SONG]];
}
/** @brief Retrieve the currently selected steps type.
* @return the current steps type. */
@@ -138,7 +141,7 @@ public:
{
RETURN_IF_INVALID(m_vpSteps.empty() ||
m_iSelection[ROW_STEPS] >= (int)m_vpSteps.size(), nullptr);
return m_vpSteps[m_iSelection[ROW_STEPS]].pSteps;
return m_vpSteps[m_iSelection[ROW_STEPS]].pSteps;
}
/** @brief Retrieve the currently selected difficulty.
* @return the current difficulty. */
@@ -158,11 +161,11 @@ public:
}
/** @brief Retrieve the currently selected source steps.
* @return the current source steps. */
Steps* GetSelectedSourceSteps() const
Steps* GetSelectedSourceSteps() const
{
RETURN_IF_INVALID(m_vpSourceSteps.empty() ||
m_iSelection[ROW_SOURCE_STEPS] >= (int)m_vpSourceSteps.size(), nullptr);
return m_vpSourceSteps[m_iSelection[ROW_SOURCE_STEPS]].pSteps;
return m_vpSourceSteps[m_iSelection[ROW_SOURCE_STEPS]].pSteps;
}
/** @brief Retrieve the currently selected difficulty.
* @return the current difficulty. */
@@ -178,7 +181,7 @@ public:
{
RETURN_IF_INVALID(m_Actions.empty() ||
m_iSelection[ROW_ACTION] >= (int)m_Actions.size(), EditMenuAction_Invalid);
return m_Actions[m_iSelection[ROW_ACTION]];
return m_Actions[m_iSelection[ROW_ACTION]];
}
#undef RETURN_IF_INVALID
@@ -252,7 +255,7 @@ public:
* @author Chris Danford (c) 2001-2004
* @section LICENSE
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -262,7 +265,7 @@ public:
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+2
View File
@@ -13,6 +13,8 @@
#include <cmath>
#include <cstddef>
#include <vector>
FontPage::FontPage(): m_iHeight(0), m_iLineSpacing(0), m_fVshift(0),
m_iDrawExtraPixelsLeft(0), m_iDrawExtraPixelsRight(0),
+2
View File
@@ -9,6 +9,8 @@
#include <cstddef>
#include <map>
#include <vector>
class FontPage;
class RageTexture;
+5 -2
View File
@@ -3,6 +3,9 @@
#include "ActorFrame.h"
#include <vector>
class Song;
/** @brief Foreground in front of notes while playing. */
class Foreground: public ActorFrame
@@ -34,7 +37,7 @@ protected:
/*
* (c) 2004 Glenn Maynard
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -44,7 +47,7 @@ protected:
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+2
View File
@@ -24,6 +24,8 @@
#include "ScreenPrompt.h"
#include <cstddef>
#include <vector>
static LocalizedString COULD_NOT_LAUNCH_BROWSER( "GameCommand", "Could not launch web browser." );
+5 -2
View File
@@ -8,7 +8,10 @@
#include "Difficulty.h"
#include "LuaReference.h"
#include "Command.h"
#include <map>
#include <vector>
class Song;
class Steps;
@@ -132,7 +135,7 @@ private:
/*
* (c) 2001-2004 Chris Danford, Glenn Maynard
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -142,7 +145,7 @@ private:
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+2
View File
@@ -12,6 +12,8 @@
#include <cfloat>
#include <cmath>
#include <vector>
RString StepsTypeToString( StepsType st );
+2
View File
@@ -6,6 +6,8 @@
#include "EnumHelper.h"
#include <cfloat>
#include <vector>
// Note definitions
/** @brief Define the mininum difficulty value allowed. */
+2
View File
@@ -22,6 +22,8 @@
#include "RageInput.h"
#include <cmath>
#include <vector>
static RageTimer g_GameplayTimer;
+2
View File
@@ -15,6 +15,8 @@
#include "Style.h"
#include <cstddef>
#include <vector>
GameManager* GAMEMAN = nullptr; // global and accessable from anywhere in our program
+5 -2
View File
@@ -10,6 +10,9 @@ struct lua_State;
#include "GameConstantsAndTypes.h"
#include "GameInput.h"
#include <vector>
/** @brief The collective information about a Steps' Type. */
struct StepsTypeInfo
{
@@ -64,7 +67,7 @@ extern GameManager* GAMEMAN; // global and accessible from anywhere in our progr
* @author Chris Danford, Glenn Maynard (c) 2001-2004
* @section LICENSE
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -74,7 +77,7 @@ extern GameManager* GAMEMAN; // global and accessible from anywhere in our progr
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+2
View File
@@ -22,6 +22,8 @@
#include <cmath>
#include <cstddef>
#include <vector>
GameSoundManager *SOUND = nullptr;
+2
View File
@@ -46,6 +46,8 @@
#include <cstddef>
#include <ctime>
#include <set>
#include <vector>
GameState* GAMESTATE = nullptr; // global and accessible from anywhere in our program
+2
View File
@@ -17,6 +17,8 @@
#include <deque>
#include <map>
#include <set>
#include <vector>
class Character;
class Course;
+2
View File
@@ -11,6 +11,8 @@
#include "ActorUtil.h"
#include <cstddef>
#include <vector>
void GhostArrowRow::Load( const PlayerState* pPlayerState, float fYReverseOffset )
{
+5 -2
View File
@@ -6,6 +6,9 @@
#include "NoteTypes.h"
#include "NoteDisplay.h"
#include <vector>
class PlayerState;
/** @brief Row of GhostArrow Actors. */
class GhostArrowRow : public ActorFrame
@@ -40,7 +43,7 @@ protected:
* @author Chris Danford (c) 2001-2004
* @section LICENSE
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -50,7 +53,7 @@ protected:
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+6 -2
View File
@@ -5,6 +5,10 @@
#include "Grade.h"
#include "PlayerNumber.h"
#include "AutoActor.h"
#include <vector>
struct lua_State;
/** @brief Grade shown on ScreenEvaluation. */
class GradeDisplay : public ActorFrame
@@ -26,7 +30,7 @@ protected:
/*
* (c) 2001-2002 Chris Danford
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -36,7 +40,7 @@ protected:
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+2
View File
@@ -12,6 +12,8 @@
#include "XmlFile.h"
#include <cmath>
#include <vector>
//#define DIVIDE_LINE_WIDTH THEME->GetMetricI(m_sName,"TexturedBottomHalf")
REGISTER_ACTOR_CLASS( GraphDisplay );
+5 -2
View File
@@ -4,6 +4,9 @@
#include "ActorFrame.h"
#include "AutoActor.h"
#include <vector>
class StageStats;
class PlayerStageStats;
class GraphLine;
@@ -43,7 +46,7 @@ private:
/*
* (c) 2003 Glenn Maynard
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -53,7 +56,7 @@ private:
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+9 -6
View File
@@ -13,6 +13,9 @@
// I feel weird about this coupling, but it has to be done. -aj
#include "GameState.h"
#include <vector>
REGISTER_ACTOR_CLASS(GrooveRadar);
static const ThemeMetric<float> RADAR_EDGE_WIDTH ("GrooveRadar","EdgeWidth");
@@ -167,7 +170,7 @@ void GrooveRadar::GrooveRadarValueMap::DrawPrimitives()
for( int i=0; i<NUM_SHOWN_RADAR_CATEGORIES+1; i++ ) // do one extra to close the fan
{
const int c = i%NUM_SHOWN_RADAR_CATEGORIES;
const float fDistFromCenter =
const float fDistFromCenter =
( m_fValuesOld[c] * (1-m_PercentTowardNew) + m_fValuesNew[c] * m_PercentTowardNew + 0.07f ) * fRadius;
const float fRotation = RADAR_VALUE_ROTATION(i);
const float fX = RageFastCos(fRotation) * fDistFromCenter;
@@ -183,7 +186,7 @@ void GrooveRadar::GrooveRadarValueMap::DrawPrimitives()
for( int i=0; i<=NUM_SHOWN_RADAR_CATEGORIES; i++ )
{
const int c = i%NUM_SHOWN_RADAR_CATEGORIES;
const float fDistFromCenter =
const float fDistFromCenter =
( m_fValuesOld[c] * (1-m_PercentTowardNew) + m_fValuesNew[c] * m_PercentTowardNew + 0.07f ) * fRadius;
const float fRotation = RADAR_VALUE_ROTATION(i);
const float fX = RageFastCos(fRotation) * fDistFromCenter;
@@ -208,12 +211,12 @@ void GrooveRadar::GrooveRadarValueMap::DrawPrimitives()
// lua start
#include "LuaBinding.h"
/** @brief Allow Lua to have access to the GrooveRadar. */
/** @brief Allow Lua to have access to the GrooveRadar. */
class LunaGrooveRadar: public Luna<GrooveRadar>
{
public:
static int SetFromRadarValues( T* p, lua_State *L )
{
{
PlayerNumber pn = Enum::Check<PlayerNumber>(L, 1);
if( lua_isnil(L,2) )
{
@@ -257,7 +260,7 @@ LUA_REGISTER_DERIVED_CLASS( GrooveRadar, ActorFrame )
/*
* (c) 2001-2004 Chris Danford
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -267,7 +270,7 @@ LUA_REGISTER_DERIVED_CLASS( GrooveRadar, ActorFrame )
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+7 -3
View File
@@ -6,6 +6,10 @@
#include "AutoActor.h"
#include "PlayerNumber.h"
#include "GameConstantsAndTypes.h"
#include <vector>
class Steps;
struct RadarValues;
/** @brief The song's GrooveRadar displayed in SelectMusic. */
@@ -16,7 +20,7 @@ public:
virtual GrooveRadar *Copy() const;
virtual void LoadFromNode( const XNode* pNode );
/**
/**
* @brief Give the Player an empty GrooveRadar.
* @param pn the Player to give an empty GrooveRadar. */
void SetEmpty( PlayerNumber pn );
@@ -72,7 +76,7 @@ protected:
* @author Chris Danford (c) 2001-2004
* @section LICENSE
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -82,7 +86,7 @@ protected:
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+6 -3
View File
@@ -5,6 +5,9 @@
#include "ThemeManager.h"
#include "ActorUtil.h"
#include <vector>
REGISTER_ACTOR_CLASS( HelpDisplay );
HelpDisplay::HelpDisplay()
@@ -63,7 +66,7 @@ void HelpDisplay::Update( float fDeltaTime )
#include "LuaBinding.h"
#include "FontCharAliases.h"
/** @brief Allow Lua to have access to the HelpDisplay. */
/** @brief Allow Lua to have access to the HelpDisplay. */
class LunaHelpDisplay: public Luna<HelpDisplay>
{
public:
@@ -127,7 +130,7 @@ LUA_REGISTER_DERIVED_CLASS( HelpDisplay, BitmapText )
/*
* (c) 2001-2003 Chris Danford, Glenn Maynard
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -137,7 +140,7 @@ LUA_REGISTER_DERIVED_CLASS( HelpDisplay, BitmapText )
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+6 -3
View File
@@ -3,6 +3,9 @@
#include "BitmapText.h"
#include <vector>
struct lua_State;
/** @brief A BitmapText that cycles through messages. */
class HelpDisplay : public BitmapText
@@ -29,7 +32,7 @@ public:
protected:
std::vector<RString> m_arrayTips, m_arrayTipsAlt;
int m_iCurTipIndex;
float m_fSecsBetweenSwitches;
float m_fSecsUntilSwitch;
};
@@ -39,7 +42,7 @@ protected:
/*
* (c) 2001-2003 Chris Danford, Glenn Maynard
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -49,7 +52,7 @@ protected:
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+2
View File
@@ -9,6 +9,8 @@
#include <algorithm>
#include <cstddef>
#include <vector>
ThemeMetric<RString> EMPTY_NAME("HighScore","EmptyName");
+6 -3
View File
@@ -6,6 +6,9 @@
#include "DateTime.h"
#include "RageUtil_AutoPtr.h"
#include <vector>
class XNode;
struct RadarValues;
struct lua_State;
@@ -118,7 +121,7 @@ public:
iNumTimesPlayed(0), dtLastPlayed() {}
void Init();
int GetNumTimesPlayed() const
{
return iNumTimesPlayed;
@@ -182,7 +185,7 @@ struct Screenshot
* @author Chris Danford (c) 2004
* @section LICENSE
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -192,7 +195,7 @@ struct Screenshot
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+7 -5
View File
@@ -13,6 +13,8 @@
#include "ScreenDimensions.h"
#include <set>
#include <vector>
static const char *InputEventTypeNames[] = {
"FirstPress",
@@ -249,7 +251,7 @@ void InputFilter::CheckButtonChange( ButtonState &bs, DeviceInput di, const Rage
{
if( bs.m_BeingHeld == bs.m_bLastReportedHeld )
return;
GameInput gi;
/* Possibly apply debounce,
@@ -268,7 +270,7 @@ void InputFilter::CheckButtonChange( ButtonState &bs, DeviceInput di, const Rage
return;
}
}
bs.m_LastReportTime = now;
bs.m_bLastReportedHeld = bs.m_BeingHeld;
bs.m_fSecsHeld = 0;
@@ -479,7 +481,7 @@ void InputFilter::UpdateMouseWheel(float _fZ)
// lua start
#include "LuaBinding.h"
/** @brief Allow Lua to have access to InputFilter. */
/** @brief Allow Lua to have access to InputFilter. */
class LunaInputFilter: public Luna<InputFilter>
{
public:
@@ -519,7 +521,7 @@ LUA_REGISTER_CLASS( InputFilter )
/*
* (c) 2001-2004 Chris Danford
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -529,7 +531,7 @@ LUA_REGISTER_CLASS( InputFilter )
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+5 -2
View File
@@ -5,6 +5,9 @@
#include "RageInputDevice.h"
#include <vector>
enum InputEventType
{
// The device was just pressed.
@@ -103,7 +106,7 @@ extern InputFilter* INPUTFILTER; // global and accessible from anywhere in our p
/*
* (c) 2001-2004 Chris Danford
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -113,7 +116,7 @@ extern InputFilter* INPUTFILTER; // global and accessible from anywhere in our p
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+2
View File
@@ -12,6 +12,8 @@
#include "arch/Dialog/Dialog.h"
#include <cstddef>
#include <vector>
#define AUTOMAPPINGS_DIR "/Data/AutoMappings/"
+49 -45
View File
@@ -4,6 +4,10 @@
#include "RageInputDevice.h"
#include "GameInput.h"
#include "PlayerNumber.h"
#include <vector>
struct Game;
const int NUM_GAME_TO_DEVICE_SLOTS = 5; // five device inputs may map to one game input
@@ -16,7 +20,7 @@ struct AutoMappingEntry
AutoMappingEntry( int i, DeviceButton db, GameButton gb, bool b ):
m_iSlotIndex(i), m_deviceButton(db),
m_gb(gb), m_bSecondController(b) {}
AutoMappingEntry(): m_iSlotIndex(-1),
AutoMappingEntry(): m_iSlotIndex(-1),
m_deviceButton(DeviceButton_Invalid), m_gb(GameButton_Invalid),
m_bSecondController(false) {}
bool IsEmpty() const { return m_deviceButton == DeviceButton_Invalid && m_gb == GameButton_Invalid; }
@@ -35,49 +39,49 @@ struct AutoMappingEntry
struct AutoMappings
{
AutoMappings(
RString s1,
RString s2,
RString s3,
AutoMappingEntry im0 = AutoMappingEntry(),
AutoMappingEntry im1 = AutoMappingEntry(),
AutoMappingEntry im2 = AutoMappingEntry(),
AutoMappingEntry im3 = AutoMappingEntry(),
AutoMappingEntry im4 = AutoMappingEntry(),
AutoMappingEntry im5 = AutoMappingEntry(),
AutoMappingEntry im6 = AutoMappingEntry(),
AutoMappingEntry im7 = AutoMappingEntry(),
AutoMappingEntry im8 = AutoMappingEntry(),
AutoMappingEntry im9 = AutoMappingEntry(),
AutoMappingEntry im10 = AutoMappingEntry(),
AutoMappingEntry im11 = AutoMappingEntry(),
AutoMappingEntry im12 = AutoMappingEntry(),
AutoMappingEntry im13 = AutoMappingEntry(),
AutoMappingEntry im14 = AutoMappingEntry(),
AutoMappingEntry im15 = AutoMappingEntry(),
AutoMappingEntry im16 = AutoMappingEntry(),
AutoMappingEntry im17 = AutoMappingEntry(),
AutoMappingEntry im18 = AutoMappingEntry(),
AutoMappings(
RString s1,
RString s2,
RString s3,
AutoMappingEntry im0 = AutoMappingEntry(),
AutoMappingEntry im1 = AutoMappingEntry(),
AutoMappingEntry im2 = AutoMappingEntry(),
AutoMappingEntry im3 = AutoMappingEntry(),
AutoMappingEntry im4 = AutoMappingEntry(),
AutoMappingEntry im5 = AutoMappingEntry(),
AutoMappingEntry im6 = AutoMappingEntry(),
AutoMappingEntry im7 = AutoMappingEntry(),
AutoMappingEntry im8 = AutoMappingEntry(),
AutoMappingEntry im9 = AutoMappingEntry(),
AutoMappingEntry im10 = AutoMappingEntry(),
AutoMappingEntry im11 = AutoMappingEntry(),
AutoMappingEntry im12 = AutoMappingEntry(),
AutoMappingEntry im13 = AutoMappingEntry(),
AutoMappingEntry im14 = AutoMappingEntry(),
AutoMappingEntry im15 = AutoMappingEntry(),
AutoMappingEntry im16 = AutoMappingEntry(),
AutoMappingEntry im17 = AutoMappingEntry(),
AutoMappingEntry im18 = AutoMappingEntry(),
AutoMappingEntry im19 = AutoMappingEntry(),
AutoMappingEntry im20 = AutoMappingEntry(),
AutoMappingEntry im21 = AutoMappingEntry(),
AutoMappingEntry im22 = AutoMappingEntry(),
AutoMappingEntry im23 = AutoMappingEntry(),
AutoMappingEntry im24 = AutoMappingEntry(),
AutoMappingEntry im25 = AutoMappingEntry(),
AutoMappingEntry im26 = AutoMappingEntry(),
AutoMappingEntry im27 = AutoMappingEntry(),
AutoMappingEntry im28 = AutoMappingEntry(),
AutoMappingEntry im20 = AutoMappingEntry(),
AutoMappingEntry im21 = AutoMappingEntry(),
AutoMappingEntry im22 = AutoMappingEntry(),
AutoMappingEntry im23 = AutoMappingEntry(),
AutoMappingEntry im24 = AutoMappingEntry(),
AutoMappingEntry im25 = AutoMappingEntry(),
AutoMappingEntry im26 = AutoMappingEntry(),
AutoMappingEntry im27 = AutoMappingEntry(),
AutoMappingEntry im28 = AutoMappingEntry(),
AutoMappingEntry im29 = AutoMappingEntry(),
AutoMappingEntry im30 = AutoMappingEntry(),
AutoMappingEntry im31 = AutoMappingEntry(),
AutoMappingEntry im32 = AutoMappingEntry(),
AutoMappingEntry im33 = AutoMappingEntry(),
AutoMappingEntry im34 = AutoMappingEntry(),
AutoMappingEntry im35 = AutoMappingEntry(),
AutoMappingEntry im36 = AutoMappingEntry(),
AutoMappingEntry im37 = AutoMappingEntry(),
AutoMappingEntry im38 = AutoMappingEntry(),
AutoMappingEntry im30 = AutoMappingEntry(),
AutoMappingEntry im31 = AutoMappingEntry(),
AutoMappingEntry im32 = AutoMappingEntry(),
AutoMappingEntry im33 = AutoMappingEntry(),
AutoMappingEntry im34 = AutoMappingEntry(),
AutoMappingEntry im35 = AutoMappingEntry(),
AutoMappingEntry im36 = AutoMappingEntry(),
AutoMappingEntry im37 = AutoMappingEntry(),
AutoMappingEntry im38 = AutoMappingEntry(),
AutoMappingEntry im39 = AutoMappingEntry() )
: m_sGame(s1), m_sDriverRegex(s2), m_sControllerName(s3), m_vMaps()
{
@@ -201,7 +205,7 @@ protected:
void UpdateTempDItoGI();
const InputScheme *m_pInputScheme;
private:
InputMapper(const InputMapper& rhs);
InputMapper& operator=(const InputMapper& rhs);
@@ -214,7 +218,7 @@ extern InputMapper* INPUTMAPPER; // global and accessible from anywhere in our p
/*
* (c) 2001-2003 Chris Danford
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -224,7 +228,7 @@ extern InputMapper* INPUTMAPPER; // global and accessible from anywhere in our p
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+5 -2
View File
@@ -5,6 +5,9 @@
#include "InputEventPlus.h"
#include "InputMapper.h"
#include <vector>
InputQueue* INPUTQUEUE = nullptr; // global and accessible from anywhere in our program
const unsigned MAX_INPUT_QUEUE_LENGTH = 32;
@@ -243,7 +246,7 @@ bool InputQueueCode::Load( RString sButtonsNames )
/*
* (c) 2001-2007 Chris Danford, Glenn Maynard
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -253,7 +256,7 @@ bool InputQueueCode::Load( RString sButtonsNames )
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+6 -3
View File
@@ -4,6 +4,9 @@
#include "GameInput.h"
#include "InputFilter.h"
#include <vector>
class InputEventPlus;
class RageTimer;
@@ -27,7 +30,7 @@ struct InputQueueCode
public:
bool Load( RString sButtonsNames );
bool EnteredCode( GameController controller ) const;
InputQueueCode(): m_aPresses() {}
private:
@@ -59,7 +62,7 @@ extern InputQueue* INPUTQUEUE; // global and accessible from anywhere in our pro
/*
* (c) 2001-2007 Chris Danford, Glenn Maynard
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -69,7 +72,7 @@ extern InputQueue* INPUTQUEUE; // global and accessible from anywhere in our pro
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+5 -2
View File
@@ -11,6 +11,9 @@
#include "ThemeMetric.h"
#include "PlayerState.h"
#include <vector>
void ReloadItems();
#define NUM_ITEM_TYPES THEME->GetMetricF("Inventory","NumItemTypes")
@@ -218,7 +221,7 @@ void Inventory::UseItem( int iSlot )
/*
* (c) 2003 Chris Danford
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -228,7 +231,7 @@ void Inventory::UseItem( int iSlot )
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+5 -2
View File
@@ -6,6 +6,9 @@
#include "RageSound.h"
#include "ScreenMessage.h"
#include <vector>
AutoScreenMessage( SM_BattleDamageLevel1 );
AutoScreenMessage( SM_BattleDamageLevel2 );
AutoScreenMessage( SM_BattleDamageLevel3 );
@@ -43,7 +46,7 @@ protected:
* @author Chris Danford (c) 2003
* @section LICENSE
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -53,7 +56,7 @@ protected:
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+6 -3
View File
@@ -6,6 +6,9 @@
#include "arch/Dialog/Dialog.h"
#include "json/json.h"
#include <vector>
bool JsonUtil::LoadFromString(Json::Value &root, RString sData, RString &sErrorOut)
{
Json::Reader reader;
@@ -58,7 +61,7 @@ bool JsonUtil::WriteFile(const Json::Value &root, const RString &sFile, bool bMi
Json::StyledWriter writer;
s = writer.write(root);
}
else
else
{
Json::FastWriter writer;
s = writer.write(root);
@@ -90,7 +93,7 @@ std::vector<RString> JsonUtil::DeserializeArrayStrings(const Json::Value &value)
/*
* (c) 2001-2004 Chris Danford
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -100,7 +103,7 @@ std::vector<RString> JsonUtil::DeserializeArrayStrings(const Json::Value &value)
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+8 -5
View File
@@ -5,6 +5,9 @@
class RageFileBasic;
#include "json/json.h"
#include <vector>
namespace JsonUtil
{
bool LoadFromString( Json::Value &root, RString sData, RString &sErrorOut );
@@ -33,7 +36,7 @@ namespace JsonUtil
for(unsigned i=0; i<v.size(); i++)
fn(*v[i], root[i]);
}
template<class T>
static void SerializeVectorPointers(const std::vector<T*> &v, void fn(const T &, Json::Value &), Json::Value &root)
{
@@ -42,7 +45,7 @@ namespace JsonUtil
for(unsigned i=0; i<v.size(); i++)
fn(*v[i], root[i]);
}
template<class T>
static void SerializeVectorPointers(const std::vector<const T*> &v, void fn(const T *, Json::Value &), Json::Value &root)
{
@@ -169,7 +172,7 @@ namespace JsonUtil
fn(*v[i], root[i]);
}
}
template<class T>
static void DeserializeVectorPointers(std::vector<T*> &v, void fn(T *, const Json::Value &), const Json::Value &root)
{
@@ -237,7 +240,7 @@ namespace JsonUtil
/*
* (c) 2010 Chris Danford
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -247,7 +250,7 @@ namespace JsonUtil
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+2
View File
@@ -16,6 +16,8 @@
#include <cmath>
#include <cstddef>
#include <vector>
const RString DEFAULT_LIGHTS_DRIVER = "SystemMessage,Export";
static Preference<RString> g_sLightsDriver( "LightsDriver", "" ); // "" == DEFAULT_LIGHTS_DRIVER
+5 -2
View File
@@ -7,6 +7,9 @@
#include "Preference.h"
#include "RageTimer.h"
#include <vector>
extern Preference<float> g_fLightsFalloffSeconds;
extern Preference<float> g_fLightsAheadSeconds;
@@ -112,7 +115,7 @@ extern LightsManager* LIGHTSMAN; // global and accessible from anywhere in our p
/*
* (c) 2003-2004 Chris Danford
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -122,7 +125,7 @@ extern LightsManager* LIGHTSMAN; // global and accessible from anywhere in our p
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+11 -7
View File
@@ -4,6 +4,10 @@
#define LuaBinding_H
#include "LuaManager.h"
#include <vector>
class LuaReference;
class LuaBinding
@@ -12,7 +16,7 @@ public:
LuaBinding();
virtual ~LuaBinding();
void Register( lua_State *L );
static void RegisterTypes( lua_State *L );
bool IsDerivedClass() const { return GetClassName() != GetBaseClassName(); }
@@ -42,7 +46,7 @@ protected:
struct RegType
{
const char *szName;
const char *szName;
binding_t *mfunc;
};
@@ -80,14 +84,14 @@ public:
return get( L, narg );
}
static T *get( lua_State *L, int narg )
{
return (T *) GetPointerFromStack( L, m_sClassName, narg );
}
/* Push a table or userdata for the given object. This is called on the
* base class, so we pick up the instance of the base class, if any. */
* base class, so we pick up the instance of the base class, if any. */
static void PushObject( Lua *L, const RString &sDerivedClassName, T* p );
protected:
@@ -232,7 +236,7 @@ float FArgGTEZero(lua_State* L, int index);
/*
* (c) 2001-2005 Peter Shook, Chris Danford, Glenn Maynard
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -242,7 +246,7 @@ float FArgGTEZero(lua_State* L, int index);
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+1
View File
@@ -20,6 +20,7 @@
#include <cstdint>
#include <map>
#include <sstream> // conversion for lua functions.
#include <vector>
LuaManager *LUA = nullptr;
struct Impl
+13 -10
View File
@@ -22,6 +22,9 @@ extern "C"
// For Dialog::Result
#include "arch/Dialog/Dialog.h"
#include <vector>
class LuaManager
{
public:
@@ -78,7 +81,7 @@ namespace LuaHelpers
/* Run the function with arguments at the top of the stack, with the given
* number of arguments. The specified number of return values are left on
* the Lua stack. On error, nils are left on the stack, sError is set and
* the Lua stack. On error, nils are left on the stack, sError is set and
* false is returned.
* If ReportError is true, Error should contain the string to prepend
* when reporting. The error is reported through LOG->Warn and
@@ -131,7 +134,7 @@ namespace LuaHelpers
lua_pop( L, 1 );
return bRet;
}
template<class T>
void ReadArrayFromTable( std::vector<T> &aOut, lua_State *L )
{
@@ -180,18 +183,18 @@ private:
LuaReference *m_Name;
LuaReference *m_pOldValue;
// Swallow up warnings. If they must be used, define them.
LuaThreadVariable& operator=(const LuaThreadVariable& rhs);
};
/**
* @brief Iterate over all elements in the table.
*
* For safety reasons, the key is pushed onto the stack and can be read (safely)
* as a string and popped or altered in any way. Stack management is handled
* automatically. That is, you need not remove all stack elements above the key.
* Once the loop exits normally, the top of the stack will be where it was before.
*
* For safety reasons, the key is pushed onto the stack and can be read (safely)
* as a string and popped or altered in any way. Stack management is handled
* automatically. That is, you need not remove all stack elements above the key.
* Once the loop exits normally, the top of the stack will be where it was before.
* If you break out of the loop early, you need to handle that explicitly. */
#define FOREACH_LUATABLE(L,index) \
for( const int SM_UNIQUE_NAME(tab) = LuaHelpers::AbsIndex(L,index), \
@@ -292,7 +295,7 @@ REGISTER_WITH_LUA_FUNCTION(LuaFunc_Register_##func_name);
/*
* (c) 2004 Glenn Maynard
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -302,7 +305,7 @@ REGISTER_WITH_LUA_FUNCTION(LuaFunc_Register_##func_name);
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+4 -2
View File
@@ -7,6 +7,8 @@
#include "Song.h"
#include <map>
#include <vector>
// TODO: Use a marker for default color instead of a specific color that may
// accidentally get written back into a lyrics file.
@@ -114,7 +116,7 @@ bool LyricsLoader::LoadFromLRCFile(const RString& sPath, Song& out)
/*
* (c) 2003 Kevin Slaughter, Glenn Maynard
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -124,7 +126,7 @@ bool LyricsLoader::LoadFromLRCFile(const RString& sPath, Song& out)
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+2
View File
@@ -13,6 +13,8 @@
#include "LuaManager.h"
#include <cstddef>
#include <vector>
MemoryCardManager* MEMCARDMAN = nullptr; // global and accessible from anywhere in our program

Some files were not shown because too many files have changed in this diff Show More