Another batch of these.
I think I need to look into adding a feature soon. Either that, or take a minor break.
This commit is contained in:
+3
-4
@@ -11,10 +11,9 @@
|
|||||||
#include "FontCharAliases.h"
|
#include "FontCharAliases.h"
|
||||||
#include "arch/Dialog/Dialog.h"
|
#include "arch/Dialog/Dialog.h"
|
||||||
|
|
||||||
FontPage::FontPage()
|
FontPage::FontPage(): m_iHeight(0), m_iLineSpacing(0), m_fVshift(0),
|
||||||
{
|
m_iDrawExtraPixelsLeft(0), m_iDrawExtraPixelsRight(0),
|
||||||
m_iDrawExtraPixelsLeft = m_iDrawExtraPixelsRight = 0;
|
m_sTexturePath("") {}
|
||||||
}
|
|
||||||
|
|
||||||
void FontPage::Load( const FontPageSettings &cfg )
|
void FontPage::Load( const FontPageSettings &cfg )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -204,6 +204,9 @@ private:
|
|||||||
void LoadFontPageSettings( FontPageSettings &cfg, IniFile &ini, const RString &sTexturePath, const RString &PageName, RString sChars );
|
void LoadFontPageSettings( FontPageSettings &cfg, IniFile &ini, const RString &sTexturePath, const RString &PageName, RString sChars );
|
||||||
static void GetFontPaths( const RString &sFontOrTextureFilePath, vector<RString> &sTexturePaths );
|
static void GetFontPaths( const RString &sFontOrTextureFilePath, vector<RString> &sTexturePaths );
|
||||||
RString GetPageNameFromFileName( const RString &sFilename );
|
RString GetPageNameFromFileName( const RString &sFilename );
|
||||||
|
|
||||||
|
Font(const Font& rhs);
|
||||||
|
Font& operator=(const Font& rhs);
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -349,6 +349,9 @@ private:
|
|||||||
int m_iAwardedExtraStages[NUM_PLAYERS];
|
int m_iAwardedExtraStages[NUM_PLAYERS];
|
||||||
bool m_bEarnedExtraStage;
|
bool m_bEarnedExtraStage;
|
||||||
|
|
||||||
|
GameState(const GameState& rhs);
|
||||||
|
GameState& operator=(const GameState& rhs);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
PlayerNumber GetNextHumanPlayer( PlayerNumber pn );
|
PlayerNumber GetNextHumanPlayer( PlayerNumber pn );
|
||||||
|
|||||||
+4
-1
@@ -24,7 +24,7 @@ enum InputEventType
|
|||||||
|
|
||||||
struct InputEvent
|
struct InputEvent
|
||||||
{
|
{
|
||||||
InputEvent() { type=IET_FIRST_PRESS; };
|
InputEvent(): type(IET_FIRST_PRESS) {}
|
||||||
|
|
||||||
DeviceInput di;
|
DeviceInput di;
|
||||||
InputEventType type;
|
InputEventType type;
|
||||||
@@ -84,6 +84,9 @@ private:
|
|||||||
vector<InputEvent> queue;
|
vector<InputEvent> queue;
|
||||||
RageMutex *queuemutex;
|
RageMutex *queuemutex;
|
||||||
MouseCoordinates m_MouseCoords;
|
MouseCoordinates m_MouseCoords;
|
||||||
|
|
||||||
|
InputFilter(const InputFilter& rhs);
|
||||||
|
InputFilter& operator=(const InputFilter& rhs);
|
||||||
};
|
};
|
||||||
|
|
||||||
extern InputFilter* INPUTFILTER; // global and accessable from anywhere in our program
|
extern InputFilter* INPUTFILTER; // global and accessable from anywhere in our program
|
||||||
|
|||||||
+5
-3
@@ -78,10 +78,8 @@ struct AutoMappings
|
|||||||
AutoMappingEntry im37 = AutoMappingEntry(),
|
AutoMappingEntry im37 = AutoMappingEntry(),
|
||||||
AutoMappingEntry im38 = AutoMappingEntry(),
|
AutoMappingEntry im38 = AutoMappingEntry(),
|
||||||
AutoMappingEntry im39 = AutoMappingEntry() )
|
AutoMappingEntry im39 = AutoMappingEntry() )
|
||||||
|
: m_sGame(s1), m_sDriverRegex(s2), m_sControllerName(s3)
|
||||||
{
|
{
|
||||||
m_sGame = s1;
|
|
||||||
m_sDriverRegex = s2;
|
|
||||||
m_sControllerName = s3;
|
|
||||||
#define PUSH( im ) if(!im.IsEmpty()) m_vMaps.push_back(im);
|
#define PUSH( im ) if(!im.IsEmpty()) m_vMaps.push_back(im);
|
||||||
PUSH(im0);PUSH(im1);PUSH(im2);PUSH(im3);PUSH(im4);PUSH(im5);PUSH(im6);PUSH(im7);PUSH(im8);PUSH(im9);PUSH(im10);PUSH(im11);PUSH(im12);PUSH(im13);PUSH(im14);PUSH(im15);PUSH(im16);PUSH(im17);PUSH(im18);PUSH(im19);
|
PUSH(im0);PUSH(im1);PUSH(im2);PUSH(im3);PUSH(im4);PUSH(im5);PUSH(im6);PUSH(im7);PUSH(im8);PUSH(im9);PUSH(im10);PUSH(im11);PUSH(im12);PUSH(im13);PUSH(im14);PUSH(im15);PUSH(im16);PUSH(im17);PUSH(im18);PUSH(im19);
|
||||||
PUSH(im20);PUSH(im21);PUSH(im22);PUSH(im23);PUSH(im24);PUSH(im25);PUSH(im26);PUSH(im27);PUSH(im28);PUSH(im29);PUSH(im30);PUSH(im31);PUSH(im32);PUSH(im33);PUSH(im34);PUSH(im35);PUSH(im36);PUSH(im37);PUSH(im38);PUSH(im39);
|
PUSH(im20);PUSH(im21);PUSH(im22);PUSH(im23);PUSH(im24);PUSH(im25);PUSH(im26);PUSH(im27);PUSH(im28);PUSH(im29);PUSH(im30);PUSH(im31);PUSH(im32);PUSH(im33);PUSH(im34);PUSH(im35);PUSH(im36);PUSH(im37);PUSH(im38);PUSH(im39);
|
||||||
@@ -198,6 +196,10 @@ protected:
|
|||||||
|
|
||||||
void UpdateTempDItoGI();
|
void UpdateTempDItoGI();
|
||||||
const InputScheme *m_pInputScheme;
|
const InputScheme *m_pInputScheme;
|
||||||
|
|
||||||
|
private:
|
||||||
|
InputMapper(const InputMapper& rhs);
|
||||||
|
InputMapper& operator=(const InputMapper& rhs);
|
||||||
};
|
};
|
||||||
|
|
||||||
extern InputMapper* INPUTMAPPER; // global and accessable from anywhere in our program
|
extern InputMapper* INPUTMAPPER; // global and accessable from anywhere in our program
|
||||||
|
|||||||
+10
-16
@@ -133,10 +133,10 @@ struct TapNote
|
|||||||
XNode* CreateNode() const;
|
XNode* CreateNode() const;
|
||||||
void LoadFromNode( const XNode* pNode );
|
void LoadFromNode( const XNode* pNode );
|
||||||
|
|
||||||
TapNote()
|
TapNote(): type(empty), subType(SubType_Invalid), source(original),
|
||||||
{
|
pn(PLAYER_INVALID), bHopoPossible(false),
|
||||||
Init();
|
sAttackModifiers(""), fAttackDurationSeconds(0),
|
||||||
}
|
iKeysoundIndex(-1), iDuration(0) {}
|
||||||
void Init()
|
void Init()
|
||||||
{
|
{
|
||||||
type = empty;
|
type = empty;
|
||||||
@@ -154,18 +154,12 @@ struct TapNote
|
|||||||
Source source_,
|
Source source_,
|
||||||
RString sAttackModifiers_,
|
RString sAttackModifiers_,
|
||||||
float fAttackDurationSeconds_,
|
float fAttackDurationSeconds_,
|
||||||
int iKeysoundIndex_ )
|
int iKeysoundIndex_ ):
|
||||||
{
|
type(type_), subType(subType_), source(source_),
|
||||||
Init();
|
pn(PLAYER_INVALID), sAttackModifiers(sAttackModifiers_),
|
||||||
type = type_;
|
fAttackDurationSeconds(fAttackDurationSeconds_),
|
||||||
subType = subType_;
|
iKeysoundIndex(iKeysoundIndex_), iDuration(0) {}
|
||||||
source = source_;
|
|
||||||
sAttackModifiers = sAttackModifiers_;
|
|
||||||
fAttackDurationSeconds = fAttackDurationSeconds_;
|
|
||||||
iKeysoundIndex = iKeysoundIndex_;
|
|
||||||
iDuration = 0;
|
|
||||||
pn = PLAYER_INVALID;
|
|
||||||
}
|
|
||||||
/**
|
/**
|
||||||
* @brief Determine if the two TapNotes are equal to each other.
|
* @brief Determine if the two TapNotes are equal to each other.
|
||||||
* @param other the other TapNote we're checking.
|
* @param other the other TapNote we're checking.
|
||||||
|
|||||||
+9
-8
@@ -17,7 +17,11 @@ class XNode;
|
|||||||
class SongCriteria
|
class SongCriteria
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
RString m_sGroupName; // "" means don't match
|
/**
|
||||||
|
* @brief What group name are we searching for for Songs?
|
||||||
|
*
|
||||||
|
* If an empty string, don't bother using this for searching. */
|
||||||
|
RString m_sGroupName;
|
||||||
bool m_bUseSongGenreAllowedList;
|
bool m_bUseSongGenreAllowedList;
|
||||||
vector<RString> m_vsSongGenreAllowedList;
|
vector<RString> m_vsSongGenreAllowedList;
|
||||||
enum Selectable { Selectable_Yes, Selectable_No, Selectable_DontCare } m_Selectable;
|
enum Selectable { Selectable_Yes, Selectable_No, Selectable_DontCare } m_Selectable;
|
||||||
@@ -43,16 +47,13 @@ public:
|
|||||||
} m_Locked;
|
} m_Locked;
|
||||||
|
|
||||||
/** @brief Set up some initial song criteria. */
|
/** @brief Set up some initial song criteria. */
|
||||||
SongCriteria()
|
SongCriteria(): m_sGroupName(""), m_bUseSongGenreAllowedList(false),
|
||||||
|
m_Selectable(Selectable_DontCare), m_bUseSongAllowedList(false),
|
||||||
|
m_iMaxStagesForSong(-1), m_Tutorial(Tutorial_DontCare),
|
||||||
|
m_Locked(Locked_DontCare)
|
||||||
{
|
{
|
||||||
m_bUseSongGenreAllowedList = false;
|
|
||||||
m_Selectable = Selectable_DontCare;
|
|
||||||
m_bUseSongAllowedList = false;
|
|
||||||
m_iMaxStagesForSong = -1;
|
|
||||||
// m_fMinBPM = -1;
|
// m_fMinBPM = -1;
|
||||||
// m_fMaxBPM = -1;
|
// m_fMaxBPM = -1;
|
||||||
m_Tutorial = Tutorial_DontCare;
|
|
||||||
m_Locked = Locked_DontCare;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ class MutexImpl
|
|||||||
public:
|
public:
|
||||||
RageMutex *m_Parent;
|
RageMutex *m_Parent;
|
||||||
|
|
||||||
MutexImpl( RageMutex *pParent ) { m_Parent = pParent; }
|
MutexImpl( RageMutex *pParent ): m_Parent(pParent) {}
|
||||||
virtual ~MutexImpl() { }
|
virtual ~MutexImpl() { }
|
||||||
|
|
||||||
/* Lock the mutex. If mutex timeouts are implemented, and the mutex times out,
|
/* Lock the mutex. If mutex timeouts are implemented, and the mutex times out,
|
||||||
@@ -40,6 +40,10 @@ public:
|
|||||||
/* Unlock the mutex. This must only be called when the mutex is locked; implementations
|
/* Unlock the mutex. This must only be called when the mutex is locked; implementations
|
||||||
* may fail with an assertion if the mutex is not locked. */
|
* may fail with an assertion if the mutex is not locked. */
|
||||||
virtual void Unlock() = 0;
|
virtual void Unlock() = 0;
|
||||||
|
|
||||||
|
private:
|
||||||
|
MutexImpl(const MutexImpl& rhs);
|
||||||
|
MutexImpl& operator=(const MutexImpl& rhs);
|
||||||
};
|
};
|
||||||
|
|
||||||
class EventImpl
|
class EventImpl
|
||||||
|
|||||||
Reference in New Issue
Block a user