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

Corrected a couple minor FIXMEs

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8157 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2011-03-31 23:16:31 +00:00
parent 0e2e98071b
commit 7fb259c10c
4 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/states_screens/dialogs/race_over_dialog.cpp
View File

@ -482,25 +482,13 @@ GUIEngine::EventPropagation RaceOverDialog::processEvent(const std::string& even
FeatureUnlockedCutScene* scene =
FeatureUnlockedCutScene::getInstance();
/*
scene->addUnlockedKart( const_cast<KartProperties*>(kart_properties_manager->getKart("gnu")),
_("Unlocked gnu kart") );
scene->addUnlockedPicture(
irr_driver->getTexture(track_manager->getTrack("beach")->getScreenshotFile().c_str()),
_("Unlocked beach track"));
scene->addUnlockedPicture(
irr_driver->getTexture(track_manager->getTrack("lighthouse")->getScreenshotFile().c_str()),
_("Unlocked lighthouse track"));
//scene->addUnlockedPicture( irr_driver->getTexture(track_manager->getTrack("canyon")->getScreenshotFile().c_str()) );
*/
assert(unlocked.size() > 0);
scene->addUnlockedThings(unlocked);
ModalDialog::dismiss();
// clear the race (FIXME: is this the right way to go?)
// clear the race
World::deleteWorld();
StateManager::get()->pushScreen(scene);

15
src/states_screens/main_menu_screen.cpp
View File

@ -36,14 +36,12 @@
#include "states_screens/kart_selection.hpp"
#include "states_screens/options_screen_video.hpp"
#include "states_screens/state_manager.hpp"
//FIXME : remove, temporary tutorial test
#include "states_screens/tutorial_screen.hpp"
// FIXME : remove, temporary test
#include "states_screens/feature_unlocked.hpp"
#include "states_screens/grand_prix_lose.hpp"
#include "states_screens/grand_prix_win.hpp"
//#include "states_screens/feature_unlocked.hpp"
//#include "states_screens/grand_prix_lose.hpp"
//#include "states_screens/grand_prix_win.hpp"
#include "addons/network_http.hpp"
#include "tracks/track_manager.hpp"
@ -269,6 +267,7 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name, cons
std::string selection = ribbon->getSelectionIDString(PLAYER_ID_GAME_MASTER);
#if 0
if (selection == "network")
{
// The DEBUG item
@ -319,7 +318,9 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name, cons
scene->setKarts( losers );
}
}
else if (selection == "new")
else
#endif
if (selection == "new")
{
KartSelectionScreen* s = KartSelectionScreen::getInstance();
s->setMultiplayer(false);

12
src/states_screens/options_screen_input.cpp
View File

@ -90,9 +90,9 @@ void OptionsScreenInput::buildDeviceList()
kbname << "keyboard" << i;
const std::string internal_name = kbname.str();
//FIXME: I18N: since irrLicht's list widget has the nasty tendency to put the
// icons very close to the text, I'm adding spaces to compensate...
devices->addItem(internal_name, _(" Keyboard %i", i), 0 /* icon */);
// since irrLicht's list widget has the nasty tendency to put the
// icons very close to the text, I'm adding spaces to compensate.
devices->addItem(internal_name, (core::stringw(" ") + _("Keyboard %i", i)).c_str(), 0 /* icon */);
}
const int gpad_config_count = input_manager->getDeviceList()->getGamePadConfigAmount();
@ -104,9 +104,9 @@ void OptionsScreenInput::buildDeviceList()
// Don't display the configuration if a matching device is not available
if (config->isPlugged())
{
//FIXME: since irrLicht's list widget has the nasty tendency to put the
// icons very close to the text, I'm adding spaces to compensate...
const irr::core::stringw name = irr::core::stringw(" ") + config->getName().c_str();
// since irrLicht's list widget has the nasty tendency to put the
// icons very close to the text, I'm adding spaces to compensate.
const irr::core::stringw name = (" " + config->getName()).c_str();
std::ostringstream gpname;
gpname << "gamepad" << i;

4
src/states_screens/options_screen_players.cpp
View File

@ -75,7 +75,9 @@ void OptionsScreenPlayers::init()
const int playerAmount = UserConfigParams::m_all_players.size();
for(int n=0; n<playerAmount; n++)
{
// FIXME: encoding issues
// FIXME: Using a truncated ASCII string for internal ID. Let's cross our fingers
// and hope no one enters two player names that, when stripped down to ASCII,
// give the same identifier...
players->addItem( core::stringc(UserConfigParams::m_all_players[n].getName().c_str()).c_str(),
UserConfigParams::m_all_players[n].getName() );
}