diff --git a/src/ScreenNetSelectBase.h b/src/ScreenNetSelectBase.h index c3980fdc7f..9bf8269fe6 100644 --- a/src/ScreenNetSelectBase.h +++ b/src/ScreenNetSelectBase.h @@ -8,6 +8,8 @@ #include "Quad.h" #include "BitmapText.h" +// With the addition of Attributes to BitmapText, this class may very well be +// redundant. (Leave it in for now, though.) -aj class ColorBitmapText : public BitmapText { public: @@ -19,8 +21,8 @@ public: protected: struct ColorChange { - RageColor c; //Color to change to - int l; //Change Location + RageColor c; // Color to change to + int l; // Change Location }; vector m_vColors; }; @@ -43,8 +45,8 @@ private: ColorBitmapText m_textChatOutput; AutoActor m_sprChatInputBox; AutoActor m_sprChatOutputBox; - RString m_sTextInput; - RString m_actualText; + RString m_sTextInput; + RString m_actualText; vector m_textUsers; }; diff --git a/src/ScreenSelectProfile.cpp b/src/ScreenSelectProfile.cpp index cdf1bfd21d..6f51733e2d 100644 --- a/src/ScreenSelectProfile.cpp +++ b/src/ScreenSelectProfile.cpp @@ -279,4 +279,4 @@ LUA_REGISTER_DERIVED_CLASS( ScreenSelectProfile, ScreenWithMenuElements ) * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. - */ + */ \ No newline at end of file diff --git a/src/ScreenSelectProfile.h b/src/ScreenSelectProfile.h index 1fdfe1a310..fd523ad634 100644 --- a/src/ScreenSelectProfile.h +++ b/src/ScreenSelectProfile.h @@ -23,7 +23,7 @@ public: int GetProfileIndex( PlayerNumber pn ) { return m_iSelectedProfiles[pn]; } bool Finish(); -private: +protected: int m_iSelectedProfiles[NUM_PLAYERS]; };