fix compile, warnings

This commit is contained in:
Glenn Maynard
2005-01-29 21:26:51 +00:00
parent 8a9dd8d177
commit de1f953b91
2 changed files with 10 additions and 6 deletions
+8 -4
View File
@@ -212,9 +212,11 @@ void ScreenNetRoom::MenuUp( PlayerNumber pn, const InputEventType type )
void ScreenNetRoom::MenuDown( PlayerNumber pn, const InputEventType type ) void ScreenNetRoom::MenuDown( PlayerNumber pn, const InputEventType type )
{ {
switch (m_SelectMode) { switch( m_SelectMode )
{
case SelectRooms: case SelectRooms:
if (m_iRoomPlace+1 < m_RoomList.size()) { if( m_iRoomPlace+1 < (int) m_RoomList.size() )
{
ShiftRoomsUp(); ShiftRoomsUp();
m_iRoomPlace++; m_iRoomPlace++;
} }
@@ -301,8 +303,10 @@ void ScreenNetRoom::ShiftRoomsUp() {
} }
} }
void ScreenNetRoom::ShiftRoomsDown() { void ScreenNetRoom::ShiftRoomsDown()
for ( int x = 0; x < m_RoomList.size(); ++x) { {
for( unsigned x = 0; x < m_RoomList.size(); ++x )
{
if ((m_RoomList[x].GetY()+ROOMSPACEY >= ROOMUPPERBOUND)&&(m_RoomList[x].GetY()+ROOMSPACEY < ROOMLOWERBOUND)) { if ((m_RoomList[x].GetY()+ROOMSPACEY >= ROOMUPPERBOUND)&&(m_RoomList[x].GetY()+ROOMSPACEY < ROOMLOWERBOUND)) {
COMMAND(m_RoomList[x], "ShiftDown"); COMMAND(m_RoomList[x], "ShiftDown");
COMMAND(m_RoomList[x], "RoomsOn"); COMMAND(m_RoomList[x], "RoomsOn");
+2 -2
View File
@@ -9,8 +9,8 @@
class RoomData { class RoomData {
public: public:
void SetName(CString& name) { m_name = name; } void SetName( const CString& name ) { m_name = name; }
void SetDescription(CString& desc) { m_description = desc; } void SetDescription( const CString& desc ) { m_description = desc; }
void SetState(unsigned int state) { m_state = state; } void SetState(unsigned int state) { m_state = state; }
inline CString Name() { return m_name; } inline CString Name() { return m_name; }
inline CString Description() { return m_description; } inline CString Description() { return m_description; }