ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed all(?) warnings about signed and unsigned comparisons.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14950 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2014-01-07 00:09:19 +00:00
parent b1c8898b54
commit 7cdca13d7b
34 changed files with 85 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/achievements/achievements_manager.cpp
View File

@@ -155,7 +155,7 @@ void AchievementsManager::createSlotsIfNeeded()
// make sure all players have at least one game slot associated
PtrVector<PlayerProfile>& players = UserConfigParams::m_all_players;
for (int n=0; n<players.size(); n++)
for (unsigned int n=0; n<players.size(); n++)
{
if (getSlot(players[n].getUniqueID(), false) == NULL )
{
@@ -188,7 +188,7 @@ void AchievementsManager::save()
achievements_file << "<?xml version=\"1.0\"?>\n";
achievements_file << "<achievements>\n";
for (int i = 0; i < m_slots.size(); i++)
for (unsigned int i = 0; i < m_slots.size(); i++)
{
m_slots[i].save(achievements_file);
}
@@ -208,7 +208,7 @@ void AchievementsManager::onRaceEnd()
// ============================================================================
AchievementsSlot * AchievementsManager::getSlot(const std::string & id, bool online)
{
for(int i = 0; i < m_slots.size(); i++)
for(unsigned int i = 0; i < m_slots.size(); i++)
{
if(m_slots[i].isOnline() == online && m_slots[i].getID() == id)
{

6
src/challenges/unlock_manager.cpp
View File

@@ -284,7 +284,7 @@ void UnlockManager::save()
for (it = m_game_slots.begin(); it != m_game_slots.end(); it++)
{
std::string name = "unknown player";
for (int i = 0; i < UserConfigParams::m_all_players.size(); i++)
for (unsigned int i = 0; i < UserConfigParams::m_all_players.size(); i++)
{
if (UserConfigParams::m_all_players[i].getUniqueID() == it->second->getPlayerID())
{
@@ -310,7 +310,7 @@ bool UnlockManager::createSlotsIfNeeded()
// make sure all players have at least one game slot associated
PtrVector<PlayerProfile>& players = UserConfigParams::m_all_players;
for (int n=0; n<players.size(); n++)
for (unsigned int n=0; n<players.size(); n++)
{
bool exists = false;
@@ -409,7 +409,7 @@ bool UnlockManager::isSupportedVersion(const ChallengeData &challenge)
PlayerProfile* UnlockManager::getCurrentPlayer()
{
PtrVector<PlayerProfile>& players = UserConfigParams::m_all_players;
for (int n=0; n<players.size(); n++)
for (unsigned int n=0; n<players.size(); n++)
{
if (players[n].getUniqueID() == m_current_game_slot) return players.get(n);
}

2
src/config/saved_grand_prix.cpp
View File

@@ -145,7 +145,7 @@ void SavedGrandPrix::loadKarts(std::vector<RaceManager::KartStatus> & kart_list)
{
//Fix aikarts
int aikarts = 0;
for(int i = 0; i < m_karts.size(); i++)
for(unsigned int i = 0; i < m_karts.size(); i++)
{
const KartProperties *kp = kart_properties_manager->getKart(m_karts[i].m_ident);

2
src/config/saved_grand_prix.hpp
View File

@@ -142,7 +142,7 @@ public:
int difficulty, int total_karts,
int player_karts)
{
for (int n=0; n<UserConfigParams::m_saved_grand_prix_list.size(); n++)
for (unsigned int n=0; n<UserConfigParams::m_saved_grand_prix_list.size(); n++)
{
SavedGrandPrix* gp = &UserConfigParams::m_saved_grand_prix_list[n];
if ((gp->getGPID() == gpid) &&

2
src/config/user_config.cpp
View File

@@ -877,7 +877,7 @@ bool UserConfig::loadConfig()
void UserConfig::postLoadInit()
{
for (int i = 0; i < UserConfigParams::m_all_players.size(); i++)
for (unsigned int i = 0; i < UserConfigParams::m_all_players.size(); i++)
{
PlayerProfile* player = UserConfigParams::m_all_players.get(i);
if (player->isGuestAccount()) player->setName(_LTR("Guest"));

4
src/graphics/irr_driver.cpp
View File

@@ -1912,8 +1912,8 @@ void IrrDriver::RTTProvider::setupRTTScene(PtrVector<scene::IMesh, REF>& mesh,
}
assert(m_rtt_main_node != NULL);
assert(mesh.size() == (int)mesh_location.size());
assert(mesh.size() == (int)model_frames.size());
assert(mesh.size() == mesh_location.size());
assert(mesh.size() == model_frames.size());
const int mesh_amount = mesh.size();
for (int n=1; n<mesh_amount; n++)

2
src/guiengine/abstract_top_level_container.cpp
View File

@@ -220,7 +220,7 @@ Widget* AbstractTopLevelContainer::getFirstWidget(
if (m_first_widget != NULL) return m_first_widget;
if (within_vector == NULL) within_vector = &m_widgets;
for (int i = 0; i < within_vector->size(); i++)
for (unsigned int i = 0; i < within_vector->size(); i++)
{
if (!within_vector->get(i)->m_focusable) continue;

10
src/guiengine/engine.cpp
View File

@@ -752,7 +752,7 @@ namespace GUIEngine
} // showMessage
// ------------------------------------------------------------------------
Widget* getFocusForPlayer(const int playerID)
Widget* getFocusForPlayer(const unsigned int playerID)
{
assert(playerID >= 0);
assert(playerID < MAX_PLAYER_COUNT);
@@ -761,7 +761,7 @@ namespace GUIEngine
} // getFocusForPlayer
// ------------------------------------------------------------------------
void focusNothingForPlayer(const int playerID)
void focusNothingForPlayer(const unsigned int playerID)
{
Widget* focus = getFocusForPlayer(playerID);
if (focus != NULL) focus->unsetFocusForPlayer(playerID);
@@ -770,7 +770,7 @@ namespace GUIEngine
} // focusNothingForPlayer
// ------------------------------------------------------------------------
bool isFocusedForPlayer(const Widget* w, const int playerID)
bool isFocusedForPlayer(const Widget* w, const unsigned int playerID)
{
assert(w != NULL);
assert(playerID >= 0);
@@ -956,7 +956,7 @@ namespace GUIEngine
//if (g_skin != NULL) delete g_skin;
g_skin = NULL;
for (int i=0; i<g_loaded_screens.size(); i++)
for (unsigned int i=0; i<g_loaded_screens.size(); i++)
{
g_loaded_screens[i].unload();
}
@@ -1006,7 +1006,7 @@ namespace GUIEngine
g_driver = driver_a;
g_state_manager = state_manager;
for (int n=0; n<MAX_PLAYER_COUNT; n++)
for (unsigned int n=0; n<MAX_PLAYER_COUNT; n++)
{
g_focus_for_player[n] = NULL;
}

6
src/guiengine/engine.hpp
View File

@@ -57,21 +57,21 @@ namespace GUIEngine
* needs, so we use ours. (i.e. always call these functions are never those
* in IGUIEnvironment)
*/
Widget* getFocusForPlayer(const int playerID);
Widget* getFocusForPlayer(const unsigned int playerID);
/** \brief Focuses nothing for given player (removes any selection for this player).
* \note Do NOT use irrLicht's GUI focus facilities; it's too limited for our
* needs, so we use ours. (i.e. always call these functions are never those
* in IGUIEnvironment)
*/
void focusNothingForPlayer(const int playerID);
void focusNothingForPlayer(const unsigned int playerID);
/** \brief Returns whether given the widget is currently focused by given player.
* \note Do NOT use irrLicht's GUI focus facilities; it's too limited for our
* needs, so we use ours. (i.e. always call these functions are never those
* in IGUIEnvironment)
*/
bool isFocusedForPlayer(const Widget*w, const int playerID);
bool isFocusedForPlayer(const Widget*w, const unsigned int playerID);
/**
* In an attempt to make getters as fast as possible, by possibly still allowing inlining

2
src/guiengine/layout_manager.cpp
View File

@@ -206,7 +206,7 @@ void LayoutManager::readCoords(Widget* self)
int child_max_width = -1, child_max_height = -1;
int total_width = 0, total_height = 0;
for (int child=0; child<self->m_children.size(); child++)
for (unsigned int child=0; child<self->m_children.size(); child++)
{
if (self->m_children[child].m_absolute_w > -1)
{

6
src/guiengine/widget.cpp
View File

@@ -86,7 +86,7 @@ Widget::Widget(WidgetType type, bool reserve_id)
m_tab_down_root = -1;
m_tab_up_root = -1;
for (int n=0; n<MAX_PLAYER_COUNT; n++)
for (unsigned int n=0; n<MAX_PLAYER_COUNT; n++)
{
m_player_focus[n] = false;
m_selected[n] = false;
@@ -108,7 +108,7 @@ Widget::~Widget()
assert(m_magic_number == 0xCAFEC001);
// If any player focused this widget, unset that focus
for (int n=0; n<MAX_PLAYER_COUNT; n++)
for (unsigned int n=0; n<MAX_PLAYER_COUNT; n++)
{
if (m_player_focus[n])
{
@@ -136,7 +136,7 @@ void Widget::elementRemoved()
m_element = NULL;
// If any player focused this widget, unset that focus
for (int n=0; n<MAX_PLAYER_COUNT; n++)
for (unsigned int n=0; n<MAX_PLAYER_COUNT; n++)
{
if (m_player_focus[n])
{

14
src/guiengine/widgets/dynamic_ribbon_widget.cpp
View File

@@ -46,7 +46,7 @@ DynamicRibbonWidget::DynamicRibbonWidget(const bool combo, const bool multi_row)
m_scrolling_enabled = true;
// by default, set all players to have no selection in this ribbon
for (int n=0; n<MAX_PLAYER_COUNT; n++)
for (unsigned int n=0; n<MAX_PLAYER_COUNT; n++)
{
m_selected_item[n] = -1;
}
@@ -305,7 +305,7 @@ void DynamicRibbonWidget::buildInternalStructure()
//printf("****DynamicRibbonWidget::buildInternalStructure()****\n");
// ---- Clean-up what was previously there
for (int i=0; i<m_children.size(); i++)
for (unsigned int i=0; i<m_children.size(); i++)
{
IGUIElement* elem = m_children[i].m_element;
if (elem != NULL && m_children[i].m_type == WTYPE_RIBBON)
@@ -432,7 +432,7 @@ void DynamicRibbonWidget::buildInternalStructure()
{
// debug checks
int childrenCount = 0;
for (int n=0; n<m_rows.size(); n++)
for (unsigned int n=0; n<m_rows.size(); n++)
{
childrenCount += m_rows[n].m_children.size();
}
@@ -713,7 +713,7 @@ void DynamicRibbonWidget::onRibbonWidgetFocus(RibbonWidget* emitter, const int p
{
if (m_deactivated) return;
if (emitter->m_selection[playerID] >= emitter->m_children.size())
if (emitter->m_selection[playerID] >= (int)emitter->m_children.size())
{
emitter->m_selection[playerID] = emitter->m_children.size()-1;
}
@@ -759,7 +759,7 @@ void DynamicRibbonWidget::scroll(const int x_delta)
// update selection markers in child ribbon
if (m_combo)
{
for (int n=0; n<MAX_PLAYER_COUNT; n++)
for (unsigned int n=0; n<MAX_PLAYER_COUNT; n++)
{
RibbonWidget* ribbon = m_rows.get(0); // there is a single row when we can select items
int id = m_selected_item[n] - m_scroll_offset;
@@ -775,7 +775,7 @@ void DynamicRibbonWidget::scroll(const int x_delta)
used to ensure that all children ribbons always select the same column */
void DynamicRibbonWidget::propagateSelection()
{
for (int p=0; p<MAX_PLAYER_COUNT; p++)
for (unsigned int p=0; p<MAX_PLAYER_COUNT; p++)
{
// find selection in current ribbon
RibbonWidget* selected_ribbon = (RibbonWidget*)getSelectedRibbon(p);
@@ -1025,7 +1025,7 @@ bool DynamicRibbonWidget::findItemInRows(const char* name, int* p_row, int* p_id
int row = -1;
int id = -1;
for (int r=0; r<m_rows.size(); r++)
for (unsigned int r=0; r<m_rows.size(); r++)
{
id = m_rows[r].findItemNamed(name);
if (id > -1)

2
src/guiengine/widgets/list_widget.cpp
View File

@@ -352,7 +352,7 @@ void ListWidget::elementRemoved()
{
Widget::elementRemoved();
for (int n=0; n<m_header_elements.size(); n++)
for (unsigned int n=0; n<m_header_elements.size(); n++)
{
m_header_elements[n].elementRemoved();
m_children.remove( m_header_elements.get(n) );

25
src/guiengine/widgets/ribbon_widget.cpp
View File

@@ -45,7 +45,7 @@ const char RibbonWidget::NO_ITEM_ID[] = "?";
RibbonWidget::RibbonWidget(const RibbonType type) : Widget(WTYPE_RIBBON)
{
for (int n=0; n<MAX_PLAYER_COUNT; n++)
for (unsigned int n=0; n<MAX_PLAYER_COUNT; n++)
{
m_selection[n] = -1;
}
@@ -89,7 +89,7 @@ void RibbonWidget::add()
m_element = btn;
m_active_children.clearWithoutDeleting(); // Is just a copy of m_children without the deactivated children. m_children takes care of memory.
for (int i=0; i<m_children.size(); i++)
for (unsigned int i=0; i<m_children.size(); i++)
{
if (m_children[i].isVisible())
{
@@ -149,10 +149,9 @@ void RibbonWidget::add()
const int min_free_space = 50;
global_zoom = (float)m_w / (float)( m_w - free_w_space + min_free_space );
//free_w_space = (int)(m_w - total_needed_space*global_zoom);
const int one_button_space =
(int)roundf((float)m_w / (float)subbuttons_amount);
int(roundf((float)m_w / (float)subbuttons_amount));
int widget_x = -1;
@@ -346,10 +345,10 @@ void RibbonWidget::add()
int old_w = m_active_children[i].m_w;
int old_h = m_active_children[i].m_h;
m_active_children[i].m_x = widget_x - (int)(image_w*zoom/2.0f);
m_active_children[i].m_x = widget_x - int(image_w*zoom/2.0f);
m_active_children[i].m_y = button_y;
m_active_children[i].m_w = (int)(image_w*zoom);
m_active_children[i].m_h = (int)(image_h*zoom);
m_active_children[i].m_w = int(image_w*zoom);
m_active_children[i].m_h = int(image_h*zoom);
IconButtonWidget* icon = ((IconButtonWidget*)m_active_children.get(i));
@@ -483,7 +482,7 @@ EventPropagation RibbonWidget::rightPressed(const int playerID)
m_selection[playerID]++;
if (m_selection[playerID] >= m_active_children.size())
if (m_selection[playerID] >= int(m_active_children.size()))
{
if (m_listener != NULL) m_listener->onRibbonWidgetScroll(1);
@@ -503,7 +502,7 @@ EventPropagation RibbonWidget::rightPressed(const int playerID)
// if we reached a filler item, move again (but don't wrap)
if (getSelectionIDString(playerID) == RibbonWidget::NO_ITEM_ID)
{
if (m_selection[playerID] + 1 < m_active_children.size())
if (m_selection[playerID] + 1 < int(m_active_children.size()))
{
rightPressed(playerID);
}
@@ -595,7 +594,7 @@ void RibbonWidget::unfocused(const int playerID, Widget* new_focus)
{
if (new_focus != NULL && new_focus != this && !m_active_children.contains(new_focus))
{
if (m_selection[playerID] >= 0 && m_selection[playerID] < m_children.size())
if (m_selection[playerID] >= 0 && m_selection[playerID] < int(m_children.size()))
{
m_active_children.get(m_selection[playerID])->unfocused(playerID, new_focus);
}
@@ -650,7 +649,7 @@ const std::string& RibbonWidget::getSelectionIDString(const int playerID)
// to be removed. If this tab group was previously selected, an
// invalid array element would be accessed. In this case just pretend
// that the first child was selected previously.
if(m_selection[playerID]>=m_active_children.size())
if(m_selection[playerID]>=(int)m_active_children.size())
return m_active_children[0].m_properties[PROP_ID];
return m_active_children[m_selection[playerID]].m_properties[PROP_ID];
} // getSelectionIDString
@@ -664,7 +663,7 @@ void RibbonWidget::updateSelection()
//std::cout << "----\n";
// Update selection flags for mouse player
for (int p=0; p<MAX_PLAYER_COUNT; p++)
for (unsigned int p=0; p<MAX_PLAYER_COUNT; p++)
{
for (int i=0; i<subbuttons_amount; i++)
{
@@ -723,7 +722,7 @@ EventPropagation RibbonWidget::transmitEvent(Widget* w,
} // transmitEvent
// ----------------------------------------------------------------------------
void RibbonWidget::setLabel(const int id, irr::core::stringw new_name)
void RibbonWidget::setLabel(const unsigned int id, irr::core::stringw new_name)
{
// This method should only be called AFTER a widget is added
assert(m_element != NULL);

4
src/guiengine/widgets/ribbon_widget.hpp
View File

@@ -131,7 +131,7 @@ namespace GUIEngine
irr::core::stringw getSelectionText(const int playerID)
{
const int selection = m_selection[playerID];
if (selection < 0 || selection >= m_children.size()) return "";
if (selection < 0 || selection >= int(m_children.size())) return "";
return m_children[selection].m_text;
}
// --------------------------------------------------------------------
@@ -150,7 +150,7 @@ namespace GUIEngine
* \pre Must be called after the ribbon was add()ed
* \param id The index of the item to rename, in range [0 .. item count - 1]
*/
void setLabel(const int id, irr::core::stringw new_name);
void setLabel(const unsigned int id, irr::core::stringw new_name);
/** Returns the ID of the item, or -1 if not found */
int findItemNamed(const char* internalName);

2
src/guiengine/widgets/text_box_widget.cpp
View File

@@ -58,7 +58,7 @@ public:
if (event.EventType == EET_KEY_INPUT_EVENT && event.KeyInput.PressedDown)
{
for (int n=0; n<m_listeners.size(); n++)
for (unsigned int n=0; n<m_listeners.size(); n++)
{
m_listeners[n].onTextUpdated();
}

14
src/input/device_manager.cpp
View File

@@ -151,11 +151,11 @@ void DeviceManager::setAssignMode(const PlayerAssignMode assignMode)
// when going back to no-assign mode, do some cleanup
if (assignMode == NO_ASSIGN)
{
for (int i=0; i < m_gamepads.size(); i++)
for (unsigned int i=0; i < m_gamepads.size(); i++)
{
m_gamepads[i].setPlayer(NULL);
}
for (int i=0; i < m_keyboards.size(); i++)
for (unsigned int i=0; i < m_keyboards.size(); i++)
{
m_keyboards[i].setPlayer(NULL);
}
@@ -191,7 +191,7 @@ bool DeviceManager::getConfigForGamepad(const int irr_id,
bool configCreated = false;
// Find appropriate configuration
for(int n=0; n < m_gamepad_configs.size(); n++)
for(unsigned int n=0; n < m_gamepad_configs.size(); n++)
{
if(m_gamepad_configs[n].getName() == name.c_str())
{
@@ -249,7 +249,7 @@ void DeviceManager::addGamepad(GamePadDevice* d)
bool DeviceManager::deleteConfig(DeviceConfig* config)
{
for (int n=0; n<m_keyboards.size(); n++)
for (unsigned int n=0; n<m_keyboards.size(); n++)
{
if (m_keyboards[n].getConfiguration() == config)
{
@@ -257,7 +257,7 @@ bool DeviceManager::deleteConfig(DeviceConfig* config)
n--;
}
}
for (int n=0; n<m_gamepads.size(); n++)
for (unsigned int n=0; n<m_gamepads.size(); n++)
{
if (m_gamepads[n].getConfiguration() == config)
{
@@ -573,11 +573,11 @@ void DeviceManager::serialize()
configfile << "<input version=\"" << INPUT_FILE_VERSION << "\">\n\n";
for(int n=0; n<m_keyboard_configs.size(); n++)
for(unsigned int n=0; n<m_keyboard_configs.size(); n++)
{
m_keyboard_configs[n].serialize(configfile);
}
for(int n=0; n<m_gamepad_configs.size(); n++)
for(unsigned int n=0; n<m_gamepad_configs.size(); n++)
{
m_gamepad_configs[n].serialize(configfile);
}

12
src/karts/kart_properties_manager.cpp
View File

@@ -239,7 +239,7 @@ bool KartPropertiesManager::loadKart(const std::string &dir)
*/
void KartPropertiesManager::setHatMeshName(const std::string &hat_name)
{
for (int i=0; i<m_karts_properties.size(); i++)
for (unsigned int i=0; i<m_karts_properties.size(); i++)
{
m_karts_properties[i].setHatMeshName(hat_name);
}
@@ -251,7 +251,7 @@ void KartPropertiesManager::setHatMeshName(const std::string &hat_name)
*/
const int KartPropertiesManager::getKartId(const std::string &ident) const
{
for (int i=0; i<m_karts_properties.size(); i++)
for (unsigned int i=0; i<m_karts_properties.size(); i++)
{
if (m_karts_properties[i].getIdent() == ident)
return i;
@@ -290,7 +290,7 @@ const KartProperties* KartPropertiesManager::getKartById(int i) const
std::vector<std::string> KartPropertiesManager::getAllAvailableKarts() const
{
std::vector<std::string> all;
for (int i=0; i<m_karts_properties.size(); i++)
for (unsigned int i=0; i<m_karts_properties.size(); i++)
{
if (m_kart_available[i])
all.push_back(m_karts_properties[i].getIdent());
@@ -306,7 +306,7 @@ std::vector<std::string> KartPropertiesManager::getAllAvailableKarts() const
*/
void KartPropertiesManager::setUnavailableKarts(std::vector<std::string> karts)
{
for (int i=0; i<m_karts_properties.size(); i++)
for (unsigned int i=0; i<m_karts_properties.size(); i++)
{
if (!m_kart_available[i]) continue;
@@ -331,7 +331,7 @@ int KartPropertiesManager::getKartByGroup(const std::string& group,
int n) const
{
int count=0;
for (int i=0; i<m_karts_properties.size(); i++)
for (unsigned int i=0; i<m_karts_properties.size(); i++)
{
std::vector<std::string> groups = m_karts_properties[i].getGroups();
if (std::find(groups.begin(), groups.end(), group) == groups.end())
@@ -391,7 +391,7 @@ const std::vector<int> KartPropertiesManager::getKartsInGroup(
if (g == ALL_KART_GROUPS_ID)
{
std::vector<int> out;
for (int n=0; n<m_karts_properties.size(); n++)
for (unsigned int n=0; n<m_karts_properties.size(); n++)
{
out.push_back(n);
}

2
src/main.cpp
View File

@@ -1263,7 +1263,7 @@ int main(int argc, char *argv[] )
// hack to have a running game slot :
PtrVector<PlayerProfile>& players = UserConfigParams::m_all_players;
if (UserConfigParams::m_default_player.toString().size() > 0)
for (int n=0; n<players.size(); n++)
for (unsigned int n=0; n<players.size(); n++)
if (players[n].getName() == UserConfigParams::m_default_player.toString())
unlock_manager->setCurrentSlot(players[n].getUniqueID());

2
src/modes/overworld.cpp
View File

@@ -127,7 +127,7 @@ void OverWorld::update(float dt)
TrackObjectManager* tom = getTrack()->getTrackObjectManager();
PtrVector<TrackObject>& objects = tom->getObjects();
for(int i=0; i<objects.size(); i++)
for(unsigned int i=0; i<objects.size(); i++)
{
TrackObject* obj = objects.get(i);
if(!obj->isGarage())

4
src/modes/soccer_world.cpp
View File

@@ -109,7 +109,7 @@ void SoccerWorld::reset()
m_blueScoreTimes.clear();
m_lastKartToHitBall = -1;
PtrVector<TrackObject>& objects = tom->getObjects();
for(int i=0; i<objects.size(); i++)
for(unsigned int i=0; i<objects.size(); i++)
{
TrackObject* obj = objects.get(i);
if(!obj->isSoccerBall())
@@ -198,7 +198,7 @@ void SoccerWorld::onCheckGoalTriggered(bool first_goal)
assert(tom);
PtrVector<TrackObject>& objects = tom->getObjects();
for(int i=0; i<objects.size(); i++)
for(unsigned int i=0; i<objects.size(); i++)
{
TrackObject* obj = objects.get(i);
if(!obj->isSoccerBall())

2
src/network/protocol_manager.cpp
View File

@@ -114,7 +114,7 @@ void ProtocolManager::notifyEvent(Event* event)
pthread_mutex_lock(&m_events_mutex);
Event* event2 = new Event(*event);
// register protocols that will receive this event
std::vector<int> protocols_ids;
std::vector<unsigned int> protocols_ids;
PROTOCOL_TYPE searchedProtocol = PROTOCOL_NONE;
if (event2->type == EVENT_TYPE_MESSAGE)
{

2
src/network/protocol_manager.hpp
View File

@@ -87,7 +87,7 @@ typedef struct EventProcessingInfo
{
Event* event;
double arrival_time;
std::vector<int> protocols_ids;
std::vector<unsigned int> protocols_ids;
} EventProcessingInfo;
/*!

4
src/network/stk_host.cpp
View File

@@ -277,10 +277,6 @@ uint8_t* STKHost::receiveRawPacket(TransportAddress sender, int max_tries)
Log::info("STKHost", "Message received but the ip address didn't match the expected one.");
}
len = recvfrom(m_host->socket, (char*)buffer, 2048, 0, (struct sockaddr*)(&addr), &from_len);
uint32_t addr1 = addr.sin_addr.s_addr;
uint32_t addr2 = sender.ip;
uint32_t addr3 = ntohl(addr1);
uint32_t addr4 = ntohl(addr2);
StkTime::sleep(1); // wait 1 millisecond between two checks
if (i >= max_tries && max_tries != -1)
{

2
src/physics/physics.cpp
View File

@@ -159,8 +159,6 @@ void Physics::update(float dt)
// --------------------
if(p->getUserPointer(0)->is(UserPointer::UP_KART))
{
AbstractKart *a=p->getUserPointer(0)->getPointerKart();
AbstractKart *b=p->getUserPointer(1)->getPointerKart();
KartKartCollision(p->getUserPointer(0)->getPointerKart(),
p->getContactPointCS(0),
p->getUserPointer(1)->getPointerKart(),

2
src/states_screens/addons_screen.cpp
View File

@@ -255,7 +255,7 @@ void AddonsScreen::loadList()
getWidget<GUIEngine::ListWidget>("list_addons");
w_list->clear();
for(int i=0; i<sorted_list.size(); i++)
for(unsigned int i=0; i<sorted_list.size(); i++)
{
const Addon *addon = &(sorted_list[i]);
// Ignore addons of a different type

10
src/states_screens/kart_selection.cpp
View File

@@ -433,7 +433,7 @@ void PlayerKartWidget::add()
if (m_associatedPlayer) // if player is local
{
bool mineInList = false;
for (int p=0; p<StateManager::get()->activePlayerCount(); p++)
for (unsigned int p=0; p<StateManager::get()->activePlayerCount(); p++)
{
#ifdef DEBUG
assert(StateManager::get()->getActivePlayer(p)->ok());
@@ -1223,7 +1223,7 @@ bool KartSelectionScreen::playerQuit(StateManager::ActivePlayer* player)
std::map<PlayerKartWidget*, std::string> selections;
// Find the player ID associated to this player
for (int n=0; n<m_kart_widgets.size(); n++)
for (unsigned int n=0; n<m_kart_widgets.size(); n++)
{
if (m_kart_widgets[n].getAssociatedPlayer() == player)
{
@@ -1687,7 +1687,7 @@ void KartSelectionScreen::allPlayersDone()
{
std::cout << "[KartSelectionScreen] " << players.size()
<< " players :\n";
for (int n=0; n<players.size(); n++)
for (unsigned int n=0; n<players.size(); n++)
{
std::cout << " Player " << n << " is "
<< core::stringc(
@@ -1696,7 +1696,7 @@ void KartSelectionScreen::allPlayersDone()
}
}
for (int n=0; n<players.size(); n++)
for (unsigned int n=0; n<players.size(); n++)
{
StateManager::get()->getActivePlayer(n)->getProfile()
->incrementUseFrequency();
@@ -1966,7 +1966,7 @@ void KartSelectionScreen::renumberKarts()
Widget* fullarea = getWidget("playerskarts");
const int splitWidth = fullarea->m_w / m_kart_widgets.size();
for (int n=0; n < m_kart_widgets.size(); n++)
for (unsigned int n=0; n < m_kart_widgets.size(); n++)
{
m_kart_widgets[n].setPlayerID(n);
m_kart_widgets[n].move( fullarea->m_x + splitWidth*n, fullarea->m_y,

4
src/states_screens/state_manager.cpp
View File

@@ -63,7 +63,7 @@ void StateManager::deallocate()
StateManager::ActivePlayer* StateManager::getActivePlayer(const int id)
{
ActivePlayer *returnPlayer = NULL;
if (id < m_active_players.size() && id >= 0)
if (id < (int)m_active_players.size() && id >= 0)
{
returnPlayer = m_active_players.get(id);
}
@@ -124,7 +124,7 @@ void StateManager::removeActivePlayer(int id)
// ----------------------------------------------------------------------------
int StateManager::activePlayerCount()
unsigned int StateManager::activePlayerCount()
{
return m_active_players.size();
} // activePlayerCount

2
src/states_screens/state_manager.hpp
View File

@@ -196,7 +196,7 @@ public:
int createActivePlayer(PlayerProfile *profile, InputDevice *device, Online::Profile* use);
void removeActivePlayer(int id);
int activePlayerCount();
unsigned int activePlayerCount();
void resetActivePlayers();
/** \return whether to reduce FPS at the moment

8
src/states_screens/story_mode_lobby.cpp
View File

@@ -57,7 +57,7 @@ void StoryModeLobbyScreen::init()
if (UserConfigParams::m_default_player.toString().size() > 0)
{
for (int n=0; n<players.size(); n++)
for (unsigned int n=0; n<players.size(); n++)
{
if (players[n].getName() == UserConfigParams::m_default_player.toString())
{
@@ -68,7 +68,7 @@ void StoryModeLobbyScreen::init()
}
}
for (int n=0; n<players.size(); n++)
for (unsigned int n=0; n<players.size(); n++)
{
if (players[n].isGuestAccount()) continue;
@@ -109,7 +109,7 @@ void StoryModeLobbyScreen::eventCallback(Widget* widget, const std::string& name
bool slot_found = false;
PtrVector<PlayerProfile>& players = UserConfigParams::m_all_players;
for (int n=0; n<players.size(); n++)
for (unsigned int n=0; n<players.size(); n++)
{
if (list->getSelectionLabel() == players[n].getName())
{
@@ -151,7 +151,7 @@ void StoryModeLobbyScreen::onNewPlayerWithName(const stringw& newName)
bool slot_found = false;
PtrVector<PlayerProfile>& players = UserConfigParams::m_all_players;
for (int n=0; n<players.size(); n++)
for (unsigned int n=0; n<players.size(); n++)
{
if (players[n].getName() == newName)
{

4
src/tracks/check_goal.cpp
View File

@@ -60,7 +60,7 @@ void CheckGoal::update(float dt)
PtrVector<TrackObject>& objects = tom->getObjects();
unsigned int ball_index = 0;
for(int i=0; i<objects.size(); i++)
for(unsigned int i=0; i<objects.size(); i++)
{
TrackObject* obj = objects.get(i);
if(!obj->isSoccerBall())
@@ -116,7 +116,7 @@ void CheckGoal::reset(const Track &track)
m_previous_position.clear();
const PtrVector<TrackObject>& objects = tom->getObjects();
for(int i=0; i<objects.size(); i++)
for(unsigned int i=0; i<objects.size(); i++)
{
const TrackObject* obj = objects.get(i);
if(!obj->isSoccerBall())

2
src/utils/constants.hpp
View File

@@ -47,7 +47,7 @@
#define DEGREE_TO_RAD (M_PI/180.0f)
#define RAD_TO_DEGREE (180.0f/M_PI)
const int MAX_PLAYER_COUNT = 4;
const unsigned int MAX_PLAYER_COUNT = 4;
extern const bool IS_LITTLE_ENDIAN;

2
src/utils/debug.cpp
View File

@@ -119,7 +119,7 @@ bool onEvent(const SEvent &event)
sub->addItem(L"Physics debug", DEBUG_GRAPHICS_BULLET_1);
sub->addItem(L"Physics debug (no kart)", DEBUG_GRAPHICS_BULLET_2);
int itemsMenuIndex = mnu->addItem(L"Items >",-1,true,true);
mnu->addItem(L"Items >",-1,true,true);
sub = mnu->getSubMenu(1);
sub->addItem(L"Basketball", DEBUG_POWERUP_RUBBERBALL );
sub->addItem(L"Bowling", DEBUG_POWERUP_BOWLING );

4
src/utils/ptr_vector.hpp
View File

@@ -97,7 +97,7 @@ public:
} // get
// ------------------------------------------------------------------------
int size() const
unsigned int size() const
{
return m_contents_vector.size();
} // size
@@ -296,7 +296,7 @@ public:
}; // class ptrVector
#define for_in( VAR, VECTOR ) for (int _foreach_i = 0; \
#define for_in( VAR, VECTOR ) for (unsigned int _foreach_i = 0; \
VAR = (_foreach_i < VECTOR.size() ? VECTOR.get(_foreach_i) : NULL),\
_foreach_i < VECTOR.size(); _foreach_i++)