From: <au...@us...> - 2011-07-15 23:39:18
|
Revision: 9276 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=9276&view=rev Author: auria Date: 2011-07-15 23:39:09 +0000 (Fri, 15 Jul 2011) Log Message: ----------- Fixed a lot of old logging code left from before the log level was a bit mask. We don't have too many log bits so atm they are classified a lot in 'misc' Modified Paths: -------------- main/trunk/src/audio/sfx_manager.cpp main/trunk/src/input/device_manager.cpp main/trunk/src/io/file_manager.cpp main/trunk/src/karts/kart_properties_manager.cpp main/trunk/src/race/highscore_manager.cpp main/trunk/src/race/race_manager.cpp main/trunk/src/states_screens/arenas_screen.cpp main/trunk/src/states_screens/kart_selection.cpp main/trunk/src/states_screens/options_screen_input2.cpp main/trunk/src/states_screens/tracks_screen.cpp Modified: main/trunk/src/audio/sfx_manager.cpp =================================================================== --- main/trunk/src/audio/sfx_manager.cpp 2011-07-15 23:38:40 UTC (rev 9275) +++ main/trunk/src/audio/sfx_manager.cpp 2011-07-15 23:39:09 UTC (rev 9276) @@ -197,7 +197,7 @@ return NULL; } - if (UserConfigParams::m_verbosity>=5) + if (UserConfigParams::logMisc()) printf("Loading SFX %s\n", sfx_file.c_str()); if (buffer->load()) return buffer; Modified: main/trunk/src/input/device_manager.cpp =================================================================== --- main/trunk/src/input/device_manager.cpp 2011-07-15 23:38:40 UTC (rev 9275) +++ main/trunk/src/input/device_manager.cpp 2011-07-15 23:39:09 UTC (rev 9276) @@ -54,7 +54,7 @@ // Shutdown in case the device manager is being re-initialized shutdown(); - if(UserConfigParams::m_verbosity>=5) + if(UserConfigParams::logMisc()) { printf("Initializing Device Manager\n"); printf("---------------------------\n"); @@ -63,10 +63,10 @@ deserialize(); // Assign a configuration to the keyboard, or create one if we haven't yet - if(UserConfigParams::m_verbosity>=5) printf("Initializing keyboard support.\n"); + if(UserConfigParams::logMisc()) printf("Initializing keyboard support.\n"); if (m_keyboard_configs.size() == 0) { - if(UserConfigParams::m_verbosity>=5) + if(UserConfigParams::logMisc()) printf("No keyboard configuration exists, creating one.\n"); m_keyboard_configs.push_back(new KeyboardConfig()); created = true; @@ -78,12 +78,12 @@ m_keyboards.push_back(new KeyboardDevice(m_keyboard_configs.get(n))); } - if(UserConfigParams::m_verbosity>=5) + if(UserConfigParams::logMisc()) printf("Initializing gamepad support.\n"); irr_driver->getDevice()->activateJoysticks(m_irrlicht_gamepads); numGamepads = m_irrlicht_gamepads.size(); - if(UserConfigParams::m_verbosity>=4) + if(UserConfigParams::logMisc()) { printf("Irrlicht reports %d gamepads are attached to the system.\n", numGamepads); @@ -105,20 +105,20 @@ name = name + " " + StringUtils::toString(id).c_str(); } - if (UserConfigParams::m_verbosity>=4) + if (UserConfigParams::logMisc()) { printf("#%d: %s detected...", id, name.c_str()); } // Returns true if new configuration was created if (getConfigForGamepad(id, name, &gamepadConfig) == true) { - if(UserConfigParams::m_verbosity>=4) + if(UserConfigParams::logMisc()) printf("creating new configuration.\n"); created = true; } else { - if(UserConfigParams::m_verbosity>=4) + if(UserConfigParams::logMisc()) printf("using existing configuration.\n"); } @@ -403,12 +403,12 @@ { static std::string filepath = file_manager->getConfigDir() + "/" + INPUT_FILE_NAME; - if(UserConfigParams::m_verbosity>=5) + if(UserConfigParams::logMisc()) printf("Deserializing input.xml...\n"); if(!file_manager->fileExists(filepath)) { - if(UserConfigParams::m_verbosity>=4) + if(UserConfigParams::logMisc()) printf("Warning: no configuration file exists.\n"); } else @@ -496,7 +496,7 @@ } // end switch } // end while - if(UserConfigParams::m_verbosity>=4) + if(UserConfigParams::logMisc()) { printf("Found %d keyboard and %d gamepad configurations.\n", m_keyboard_configs.size(), m_gamepad_configs.size()); @@ -522,7 +522,7 @@ { static std::string filepath = file_manager->getConfigDir() + "/" + INPUT_FILE_NAME; - if(UserConfigParams::m_verbosity>=5) printf("Serializing input.xml...\n"); + if(UserConfigParams::logMisc()) printf("Serializing input.xml...\n"); std::ofstream configfile; @@ -549,7 +549,7 @@ configfile << "</input>\n"; configfile.close(); - if(UserConfigParams::m_verbosity>=5) printf("Serialization complete.\n\n"); + if(UserConfigParams::logMisc()) printf("Serialization complete.\n\n"); } // serialize // ----------------------------------------------------------------------------- Modified: main/trunk/src/io/file_manager.cpp =================================================================== --- main/trunk/src/io/file_manager.cpp 2011-07-15 23:38:40 UTC (rev 9275) +++ main/trunk/src/io/file_manager.cpp 2011-07-15 23:39:09 UTC (rev 9276) @@ -874,7 +874,7 @@ for(std::set<std::string>::iterator i=files.begin(); i!=files.end(); i++) { if((*i)=="." || (*i)=="..") continue; - if(UserConfigParams::m_verbosity>=3) + if(UserConfigParams::logMisc()) printf("Deleting directory '%s'.\n", (*i).c_str()); std::string full_path=name+"/"+*i; if(isDirectory(full_path)) Modified: main/trunk/src/karts/kart_properties_manager.cpp =================================================================== --- main/trunk/src/karts/kart_properties_manager.cpp 2011-07-15 23:38:40 UTC (rev 9275) +++ main/trunk/src/karts/kart_properties_manager.cpp 2011-07-15 23:39:09 UTC (rev 9276) @@ -171,9 +171,6 @@ { for (int i=0; i<m_karts_properties.size(); i++) { - if (UserConfigParams::m_verbosity>=5) - std::cout << "[KartPropertiesManager] getKartId : " << m_karts_properties[i].getIdent().c_str() << std::endl; - if (m_karts_properties[i].getIdent() == ident) return i; } Modified: main/trunk/src/race/highscore_manager.cpp =================================================================== --- main/trunk/src/race/highscore_manager.cpp 2011-07-15 23:38:40 UTC (rev 9275) +++ main/trunk/src/race/highscore_manager.cpp 2011-07-15 23:39:09 UTC (rev 9276) @@ -121,7 +121,7 @@ m_all_scores.push_back(highscores); } // next entry - if(UserConfigParams::m_verbosity>=4) + if(UserConfigParams::logMisc()) fprintf(stderr, "Highscores will be saved in '%s'.\n", m_filename.c_str()); } Modified: main/trunk/src/race/race_manager.cpp =================================================================== --- main/trunk/src/race/race_manager.cpp 2011-07-15 23:38:40 UTC (rev 9275) +++ main/trunk/src/race/race_manager.cpp 2011-07-15 23:39:09 UTC (rev 9276) @@ -156,7 +156,7 @@ void RaceManager::computeRandomKartList() { int n = m_num_karts - m_player_karts.size(); - if(UserConfigParams::m_verbosity>=5) + if(UserConfigParams::logMisc()) std::cout << "AI karts count = " << n << " for m_num_karts=" << m_num_karts << " and m_player_karts.size()=" << m_player_karts.size() << std::endl; @@ -441,7 +441,7 @@ std::vector<std::string> humanLosers; // because we don't care about AIs that lost for (unsigned int i=0; i < kartStatusCount; ++i) { - if(UserConfigParams::m_verbosity >= 5) + if(UserConfigParams::logMisc()) { std::cout << m_kart_status[i].m_ident << " has GP final rank " << m_kart_status[i].m_gp_rank << std::endl; Modified: main/trunk/src/states_screens/arenas_screen.cpp =================================================================== --- main/trunk/src/states_screens/arenas_screen.cpp 2011-07-15 23:38:40 UTC (rev 9275) +++ main/trunk/src/states_screens/arenas_screen.cpp 2011-07-15 23:39:09 UTC (rev 9276) @@ -120,7 +120,7 @@ if (w2 == NULL) return; const std::string selection = w2->getSelectionIDString(PLAYER_ID_GAME_MASTER); - if (UserConfigParams::m_verbosity>=5) + if (UserConfigParams::logGUI()) std::cout << "Clicked on arena " << selection.c_str() << std::endl; Modified: main/trunk/src/states_screens/kart_selection.cpp =================================================================== --- main/trunk/src/states_screens/kart_selection.cpp 2011-07-15 23:38:40 UTC (rev 9275) +++ main/trunk/src/states_screens/kart_selection.cpp 2011-07-15 23:39:09 UTC (rev 9276) @@ -650,7 +650,7 @@ // update player profile when spinner changed if (originator == spinnerID) { - if(UserConfigParams::m_verbosity>=5) + if(UserConfigParams::logGUI()) { std::cout << "[KartSelectionScreen] Identity changed for player " << m_playerID << " : " << irr::core::stringc(m_player_ident_spinner->getStringValue().c_str()).c_str() @@ -1042,7 +1042,7 @@ // Return true if event was handled successfully bool KartSelectionScreen::playerJoin(InputDevice* device, bool firstPlayer) { - if (UserConfigParams::m_verbosity>=5) std::cout << "[KartSelectionScreen] playerJoin() invoked\n"; + if (UserConfigParams::logGUI()) std::cout << "[KartSelectionScreen] playerJoin() invoked\n"; if (!m_multiplayer && !firstPlayer) return false; assert (g_dispatcher != NULL); @@ -1211,7 +1211,7 @@ std::cerr << "[KartSelectionScreen] WARNING: playerQuit cannot find passed player\n"; return false; } - if(UserConfigParams::m_verbosity>=5) + if(UserConfigParams::logGUI()) std::cout << "playerQuit( " << playerID << " )\n"; // Just a cheap way to check if there is any discrepancy @@ -1350,7 +1350,7 @@ if (player_ready && (ident_conflict || kart_conflict) && !willNeedDuplicates) { - if (UserConfigParams::m_verbosity>=5) + if (UserConfigParams::logGUI()) printf("[KartSelectionScreen] You can't select this identity or kart, someone already took it!!\n"); sfx_manager->quickSound( "anvil" ); @@ -1423,7 +1423,7 @@ if (!w->setSelection( selected_kart, n, n != PLAYER_ID_GAME_MASTER)) { // if we get here, it means one player "lost" his kart in the tab switch - if (UserConfigParams::m_verbosity>=5) + if (UserConfigParams::logGUI()) std::cout << "[KartSelectionScreen] Player " << n << " lost their selection when switching tabs!!!\n"; // Select a random kart in this case @@ -1500,7 +1500,7 @@ const PtrVector< StateManager::ActivePlayer, HOLD >& players = StateManager::get()->getActivePlayers(); // ---- Print selection (for debugging purposes) - if(UserConfigParams::m_verbosity>=4) + if(UserConfigParams::logGUI()) { std::cout << "[KartSelectionScreen] " << players.size() << " players :\n"; for (int n=0; n<players.size(); n++) @@ -1686,7 +1686,7 @@ // check if 2 players took the same name if (sameKart(m_kart_widgets[n], m_kart_widgets[m])) { - if (UserConfigParams::m_verbosity >= 5) + if (UserConfigParams::logGUI()) { printf("[KartSelectionScreen] Kart conflict!!\n"); std::cout << " Player " << n << " chose " << m_kart_widgets[n].getKartInternalName() << std::endl; @@ -1696,7 +1696,7 @@ // two players took the same kart. check if one is ready if (!m_kart_widgets[n].isReady() && m_kart_widgets[m].isReady()) { - if (UserConfigParams::m_verbosity >= 5) + if (UserConfigParams::logGUI()) std::cout << " --> Setting red badge on player " << n << std::endl; // player m is ready, so player n should not choose this name @@ -1704,7 +1704,7 @@ } else if (m_kart_widgets[n].isReady() && !m_kart_widgets[m].isReady()) { - if (UserConfigParams::m_verbosity >= 5) + if (UserConfigParams::logGUI()) std::cout << " --> Setting red badge on player " << m << std::endl; // player n is ready, so player m should not choose this name @@ -1844,7 +1844,7 @@ { if (!m_is_initialised) return EVENT_LET; - if(UserConfigParams::m_verbosity>=5) + if(UserConfigParams::logGUI()) std::cout << "[KartSelectionScreen] FocusDispatcher focused by player " << playerID << std::endl; // since this screen is multiplayer, redirect focus to the right widget Modified: main/trunk/src/states_screens/options_screen_input2.cpp =================================================================== --- main/trunk/src/states_screens/options_screen_input2.cpp 2011-07-15 23:38:40 UTC (rev 9275) +++ main/trunk/src/states_screens/options_screen_input2.cpp 2011-07-15 23:39:09 UTC (rev 9276) @@ -297,7 +297,7 @@ if (keyboard) { - if (UserConfigParams::m_verbosity>=5) + if (UserConfigParams::logMisc()) { std::cout << "% Binding " << KartActionStrings[binding_to_set] << " : setting to keyboard key " << sensed_input.m_button_id @@ -314,7 +314,7 @@ } else if (gamepad) { - if (UserConfigParams::m_verbosity>=5) + if (UserConfigParams::logMisc()) { std::cout << "% Binding " << KartActionStrings[binding_to_set] << " : setting to gamepad #" @@ -404,7 +404,7 @@ if (KartActionStrings[n] == clicked) { // we found which one. show the "press a key" dialog. - if (UserConfigParams::m_verbosity>=5) + if (UserConfigParams::logMisc()) { std::cout << "\n% Entering sensing mode for " << m_config->getName().c_str() Modified: main/trunk/src/states_screens/tracks_screen.cpp =================================================================== --- main/trunk/src/states_screens/tracks_screen.cpp 2011-07-15 23:38:40 UTC (rev 9275) +++ main/trunk/src/states_screens/tracks_screen.cpp 2011-07-15 23:39:09 UTC (rev 9276) @@ -64,7 +64,7 @@ if (w2 != NULL) { const std::string selection = w2->getSelectionIDString(PLAYER_ID_GAME_MASTER); - if(UserConfigParams::m_verbosity>=5) + if(UserConfigParams::logGUI()) std::cout << "Clicked on track " << selection.c_str() << std::endl; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |