More effective fixes.
FINALLY understand how to work with Structs, Classes, Vectors, etc. Took a little long.
This commit is contained in:
@@ -7132,7 +7132,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;
|
||||||
@@ -7668,7 +7668,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;
|
||||||
@@ -8003,7 +8003,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;
|
||||||
@@ -8132,7 +8132,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;
|
||||||
|
|||||||
+6
-5
@@ -134,9 +134,9 @@ struct TapNote
|
|||||||
void LoadFromNode( const XNode* pNode );
|
void LoadFromNode( const XNode* pNode );
|
||||||
|
|
||||||
TapNote(): type(empty), subType(SubType_Invalid), source(original),
|
TapNote(): type(empty), subType(SubType_Invalid), source(original),
|
||||||
pn(PLAYER_INVALID), bHopoPossible(false),
|
result(), pn(PLAYER_INVALID), bHopoPossible(false),
|
||||||
sAttackModifiers(""), fAttackDurationSeconds(0),
|
sAttackModifiers(""), fAttackDurationSeconds(0),
|
||||||
iKeysoundIndex(-1), iDuration(0) {}
|
iKeysoundIndex(-1), iDuration(0), HoldResult() {}
|
||||||
void Init()
|
void Init()
|
||||||
{
|
{
|
||||||
type = empty;
|
type = empty;
|
||||||
@@ -155,10 +155,11 @@ struct TapNote
|
|||||||
RString sAttackModifiers_,
|
RString sAttackModifiers_,
|
||||||
float fAttackDurationSeconds_,
|
float fAttackDurationSeconds_,
|
||||||
int iKeysoundIndex_ ):
|
int iKeysoundIndex_ ):
|
||||||
type(type_), subType(subType_), source(source_),
|
type(type_), subType(subType_), source(source_), result(),
|
||||||
pn(PLAYER_INVALID), sAttackModifiers(sAttackModifiers_),
|
pn(PLAYER_INVALID), bHopoPossible(false),
|
||||||
|
sAttackModifiers(sAttackModifiers_),
|
||||||
fAttackDurationSeconds(fAttackDurationSeconds_),
|
fAttackDurationSeconds(fAttackDurationSeconds_),
|
||||||
iKeysoundIndex(iKeysoundIndex_), iDuration(0) {}
|
iKeysoundIndex(iKeysoundIndex_), iDuration(0), HoldResult() {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Determine if the two TapNotes are equal to each other.
|
* @brief Determine if the two TapNotes are equal to each other.
|
||||||
|
|||||||
+4
-4
@@ -18,6 +18,7 @@ struct TrailEntry
|
|||||||
pSong(NULL),
|
pSong(NULL),
|
||||||
pSteps(NULL),
|
pSteps(NULL),
|
||||||
Modifiers(""),
|
Modifiers(""),
|
||||||
|
Attacks(),
|
||||||
bSecret(false),
|
bSecret(false),
|
||||||
iLowMeter(-1),
|
iLowMeter(-1),
|
||||||
iHighMeter(-1),
|
iHighMeter(-1),
|
||||||
@@ -72,10 +73,9 @@ public:
|
|||||||
Trail(): m_StepsType(StepsType_Invalid),
|
Trail(): m_StepsType(StepsType_Invalid),
|
||||||
m_CourseType(CourseType_Invalid),
|
m_CourseType(CourseType_Invalid),
|
||||||
m_CourseDifficulty(Difficulty_Invalid),
|
m_CourseDifficulty(Difficulty_Invalid),
|
||||||
m_iSpecifiedMeter(-1), m_bRadarValuesCached(false)
|
m_vEntries(), m_iSpecifiedMeter(-1),
|
||||||
{
|
m_bRadarValuesCached(false), m_CachedRadarValues(),
|
||||||
m_vEntries.clear();
|
m_CachedObject() {}
|
||||||
}
|
|
||||||
void Init()
|
void Init()
|
||||||
{
|
{
|
||||||
m_StepsType = StepsType_Invalid;
|
m_StepsType = StepsType_Invalid;
|
||||||
|
|||||||
Reference in New Issue
Block a user