More warning squishing.
Make a note of LuaManager: either define the needed items or hide them away.
This commit is contained in:
@@ -7116,7 +7116,7 @@
|
|||||||
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
|
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
|
||||||
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
|
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
|
||||||
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
||||||
GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO;
|
GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = YES;
|
||||||
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
|
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
|
||||||
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
|
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
|
||||||
GCC_WARN_MISSING_PARENTHESES = YES;
|
GCC_WARN_MISSING_PARENTHESES = YES;
|
||||||
@@ -7652,7 +7652,7 @@
|
|||||||
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
|
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
|
||||||
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
|
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
|
||||||
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
||||||
GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO;
|
GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = YES;
|
||||||
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
|
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
|
||||||
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
|
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
|
||||||
GCC_WARN_MISSING_PARENTHESES = YES;
|
GCC_WARN_MISSING_PARENTHESES = YES;
|
||||||
@@ -7987,7 +7987,7 @@
|
|||||||
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
|
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
|
||||||
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
|
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
|
||||||
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
||||||
GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO;
|
GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = YES;
|
||||||
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
|
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
|
||||||
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
|
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
|
||||||
GCC_WARN_MISSING_PARENTHESES = YES;
|
GCC_WARN_MISSING_PARENTHESES = YES;
|
||||||
@@ -8116,7 +8116,7 @@
|
|||||||
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
|
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
|
||||||
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
|
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
|
||||||
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
||||||
GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO;
|
GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = YES;
|
||||||
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
|
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
|
||||||
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
|
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
|
||||||
GCC_WARN_MISSING_PARENTHESES = YES;
|
GCC_WARN_MISSING_PARENTHESES = YES;
|
||||||
|
|||||||
+3
-12
@@ -55,18 +55,9 @@ public:
|
|||||||
float fGainSeconds; // time gained back at the beginning of the song. LifeMeterTime only.
|
float fGainSeconds; // time gained back at the beginning of the song. LifeMeterTime only.
|
||||||
int iGainLives; // lives gained back at the beginning of the next song
|
int iGainLives; // lives gained back at the beginning of the next song
|
||||||
|
|
||||||
CourseEntry()
|
CourseEntry(): bSecret(false), bNoDifficult(false),
|
||||||
{
|
songSort(SongSort_Randomize), iChooseIndex(0),
|
||||||
bSecret = false;
|
sModifiers(RString("")), fGainSeconds(0), iGainLives(-1) {}
|
||||||
bNoDifficult = false;
|
|
||||||
|
|
||||||
songSort = SongSort_Randomize;
|
|
||||||
iChooseIndex = 0;
|
|
||||||
|
|
||||||
sModifiers = "";
|
|
||||||
fGainSeconds = 0;
|
|
||||||
iGainLives = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool IsFixedSong() const { return songID.IsValid(); }
|
bool IsFixedSong() const { return songID.IsValid(); }
|
||||||
|
|
||||||
|
|||||||
@@ -42,6 +42,9 @@ public:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
lua_State *m_pLuaMain;
|
lua_State *m_pLuaMain;
|
||||||
|
// Swallow up warnings. If they must be used, define them.
|
||||||
|
LuaManager& operator=(const LuaManager& rhs);
|
||||||
|
LuaManager(const LuaManager& rhs);
|
||||||
};
|
};
|
||||||
|
|
||||||
extern LuaManager *LUA;
|
extern LuaManager *LUA;
|
||||||
@@ -155,6 +158,9 @@ private:
|
|||||||
|
|
||||||
LuaReference *m_Name;
|
LuaReference *m_Name;
|
||||||
LuaReference *m_pOldValue;
|
LuaReference *m_pOldValue;
|
||||||
|
|
||||||
|
// Swallow up warnings. If they must be used, define them.
|
||||||
|
LuaThreadVariable& operator=(const LuaThreadVariable& rhs);
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -112,9 +112,8 @@ class CachedObjectPointer
|
|||||||
public:
|
public:
|
||||||
typedef CachedObject<T> Object;
|
typedef CachedObject<T> Object;
|
||||||
|
|
||||||
CachedObjectPointer()
|
CachedObjectPointer() : m_pCache(NULL), m_bCacheIsSet(false)
|
||||||
{
|
{
|
||||||
m_bCacheIsSet = false;
|
|
||||||
Object::Register( this );
|
Object::Register( this );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+3
-6
@@ -48,15 +48,12 @@ public:
|
|||||||
} /** @brief The Song's locked status. */ m_Locked;
|
} /** @brief The Song's locked status. */ m_Locked;
|
||||||
|
|
||||||
/** @brief Set up the initial criteria. */
|
/** @brief Set up the initial criteria. */
|
||||||
StepsCriteria()
|
StepsCriteria(): m_difficulty(Difficulty_Invalid),
|
||||||
|
m_iLowMeter(-1), m_iHighMeter(-1),
|
||||||
|
m_st(StepsType_Invalid), m_Locked(Locked_DontCare)
|
||||||
{
|
{
|
||||||
m_difficulty = Difficulty_Invalid;
|
|
||||||
m_iLowMeter = -1;
|
|
||||||
m_iHighMeter = -1;
|
|
||||||
//m_fLowBPM = -1;
|
//m_fLowBPM = -1;
|
||||||
//m_fHighBPM = -1;
|
//m_fHighBPM = -1;
|
||||||
m_st = StepsType_Invalid;
|
|
||||||
m_Locked = Locked_DontCare;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+8
-8
@@ -52,16 +52,16 @@ enum UnlockEntryStatus {
|
|||||||
class UnlockEntry
|
class UnlockEntry
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
UnlockEntry()
|
/**
|
||||||
|
* @brief Set up the UnlockEntry with default values.
|
||||||
|
*
|
||||||
|
* m_sEntryID starts as an empty string. It will be filled automatically
|
||||||
|
* if not specified. */
|
||||||
|
UnlockEntry(): m_Type(UnlockRewardType_Invalid),
|
||||||
|
m_dc(Difficulty_Invalid), m_bRequirePassHardSteps(false),
|
||||||
|
m_bRoulette(false), m_sEntryID(RString(""))
|
||||||
{
|
{
|
||||||
m_Type = UnlockRewardType_Invalid;
|
|
||||||
|
|
||||||
m_dc = Difficulty_Invalid;
|
|
||||||
|
|
||||||
ZERO( m_fRequirement );
|
ZERO( m_fRequirement );
|
||||||
m_bRequirePassHardSteps = false;
|
|
||||||
m_bRoulette = false;
|
|
||||||
m_sEntryID = ""; // "" means not yet filled. This will be filled in automatically if not specified.
|
|
||||||
}
|
}
|
||||||
|
|
||||||
UnlockRewardType m_Type;
|
UnlockRewardType m_Type;
|
||||||
|
|||||||
Reference in New Issue
Block a user