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

Use Log:: in main.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12378 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2013-01-17 21:44:51 +00:00
parent 7e9499d986
commit 67dc8141da
2 changed files with 65 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/io/file_manager.cpp
View File

@@ -128,7 +128,7 @@ FileManager::FileManager(char *argv[])
chdir( buffer );
#endif
m_file_system = irr_driver->getDevice()->getFileSystem();
m_file_system = io::createFileSystem();
m_file_system->grab();
m_is_full_path = false;

125
src/main.cpp
View File

@@ -344,7 +344,7 @@ void gamepadVisualisation()
void cmdLineHelp (char* invocation)
{
fprintf ( stdout,
Log::info("main",
"Usage: %s [OPTIONS]\n\n"
"Run SuperTuxKart, a racing game with go-kart that features"
" the Tux and friends.\n\n"
@@ -480,7 +480,7 @@ int handleCmdLinePreliminary(int argc, char **argv)
else if( !strcmp(argv[i], "--log=nocolor"))
{
Log::disableColor();
printf("Colours disabled.\n");
Log::verbose("main", "Colours disabled.\n");
}
else if(sscanf(argv[i], "--log=%d",&n)==1)
{
@@ -493,7 +493,7 @@ int handleCmdLinePreliminary(int argc, char **argv)
else if( (!strcmp(argv[i], "--stk-config")) && i+1<argc )
{
stk_config->load(file_manager->getDataFile(argv[i+1]));
fprintf ( stdout, "STK config will be read from %s.\n",argv[i+1] );
Log::info("main", "STK config will be read from %s.\n",argv[i+1] );
i++;
}
else if( !strcmp(argv[i], "--trackdir") && i+1<argc )
@@ -523,7 +523,7 @@ int handleCmdLinePreliminary(int argc, char **argv)
== UserConfigParams::m_blacklist_res.end())
UserConfigParams::m_fullscreen = true;
else
fprintf ( stdout, "Resolution %s has been blacklisted, so it "
Log::warn("main", "Resolution %s has been blacklisted, so it "
"is not available!\n", res.c_str());
}
else if ( !strcmp(argv[i], "--windowed") || !strcmp(argv[i], "-w"))
@@ -533,7 +533,7 @@ int handleCmdLinePreliminary(int argc, char **argv)
#endif
else if( !strcmp(argv[i], "--renderer") && (i+1 < argc) )
{
printf("You chose renderer %i\n", atoi(argv[i+1]));
Log::verbose("main", "You chose renderer %i\n", atoi(argv[i+1]));
UserConfigParams::m_renderer = atoi(argv[i+1]);
i++;
}
@@ -556,40 +556,39 @@ int handleCmdLinePreliminary(int argc, char **argv)
UserConfigParams::m_width = width;
UserConfigParams::m_prev_height =
UserConfigParams::m_height = height;
fprintf ( stdout, "You choose to be in %dx%d.\n",
Log::verbose("main", "You choose to use %dx%d.\n",
(int)UserConfigParams::m_width,
(int)UserConfigParams::m_height );
}
else
fprintf ( stdout, "Resolution %s has been blacklisted, so "
Log::warn("main", "Resolution %s has been blacklisted, so "
"it is not available!\n", res.c_str());
i++;
}
else
{
fprintf(stderr, "Error: --screensize argument must be given as"
" WIDTHxHEIGHT\n");
Log::fatal("main", "Error: --screensize argument must be "
"given as WIDTHxHEIGHT\n");
exit(EXIT_FAILURE);
}
}
else if (strcmp(argv[i], "--version") == 0 ||
strcmp(argv[i], "-v" ) == 0 )
{
printf("==============================\n");
fprintf ( stdout, "SuperTuxKart, %s.\n", STK_VERSION ) ;
Log::info("main", "==============================\n");
Log::info("main", "SuperTuxKart, %s.\n", STK_VERSION ) ;
#ifdef SVNVERSION
fprintf ( stdout, "SuperTuxKart, SVN revision number '%s'.\n",
Log::info("main", "SuperTuxKart, SVN revision number '%s'.\n",
SVNVERSION ) ;
#endif
// IRRLICHT_VERSION_SVN
fprintf ( stdout, "Irrlicht version %i.%i.%i (%s)\n",
Log::info("main", "Irrlicht version %i.%i.%i (%s)\n",
IRRLICHT_VERSION_MAJOR , IRRLICHT_VERSION_MINOR,
IRRLICHT_VERSION_REVISION, IRRLICHT_SDK_VERSION );
printf("==============================\n");
exit(0);
}
Log::info("main", "==============================\n");
} // --verbose or -v
}
return 0;
}
@@ -648,8 +647,8 @@ int handleCmdLine(int argc, char **argv)
{
const KartProperties *km =
kart_properties_manager->getKartById(i);
printf("%s:\t%swidth: %f length: %f height: %f mesh-buffer "
"count %d\n",
Log::info("main", "%s:\t%swidth: %f length: %f height: %f "
"mesh-buffer count %d\n",
km->getIdent().c_str(),
(km->getIdent().size()<7) ? "\t" : "",
km->getMasterKartModel().getWidth(),
@@ -745,23 +744,23 @@ int handleCmdLine(int argc, char **argv)
{
race_manager->setLocalKartInfo(0, argv[i+1]);
}
fprintf ( stdout, "You chose to use kart '%s'.\n",
argv[i+1] ) ;
Log::verbose("main", "You chose to use kart '%s'.\n",
argv[i+1] ) ;
i++;
}
else
{
fprintf(stdout, "Kart '%s' not found, ignored.\n",
argv[i+1]);
Log::warn("main", "Kart '%s' not found, ignored.\n",
argv[i+1]);
}
}
/*
else
{
fprintf(stdout, "Kart %s has not been unlocked yet. \n",
argv[i+1]);
fprintf(stdout,
"Use --list-karts to list available karts.\n\n");
Log::warn("main", "Kart %s has not been unlocked yet. \n",
argv[i+1]);
Log::warn("main",
"Use --list-karts to list available karts.\n\n");
return 0;
}
*/
@@ -804,7 +803,8 @@ int handleCmdLine(int argc, char **argv)
->setMinorMode(RaceManager::MINOR_MODE_FOLLOW_LEADER);
break;
default:
printf("Invalid race type '%d' - ignored.\n", atoi(argv[i+1]));
Log::warn("main", "Invalid race type '%d' - ignored.\n",
atoi(argv[i+1]));
}
i++;
}
@@ -821,16 +821,16 @@ int handleCmdLine(int argc, char **argv)
//if (!unlock_manager->getCurrentSlot()->isLocked(argv[i+1]))
{
race_manager->setTrack(argv[i+1]);
fprintf ( stdout, "You choose to start in track: %s.\n",
argv[i+1] );
Log::verbose("main", "You choose to start in track: %s.\n",
argv[i+1] );
Track* t = track_manager->getTrack(argv[i+1]);
if (t == NULL)
{
fprintf(stderr, "Can't find track named <%s>\n",argv[i+1]);
exit(1);
Log::warn("main", "Can't find track named <%s>\n",
argv[i+1]);
}
if (t->isArena())
else if (t->isArena())
{
race_manager->setMinorMode(
RaceManager::MINOR_MODE_3_STRIKES);
@@ -839,10 +839,10 @@ int handleCmdLine(int argc, char **argv)
/*
else
{
fprintf(stdout, "Track %s has not been unlocked yet. \n",
argv[i+1]);
fprintf(stdout, "Use --list-tracks to list available "
"tracks.\n\n");
Log::warn("main", "Track %s has not been unlocked yet. \n",
argv[i+1]);
Log::warn("main", "Use --list-tracks to list available "
"tracks.\n\n");
return 0;
}
*/
@@ -856,7 +856,7 @@ int handleCmdLine(int argc, char **argv)
if (gp == NULL)
{
fprintf(stderr, "There is no GP named '%s'\n", argv[i+1]);
Log::warn("main", "There is no GP named '%s'\n", argv[i+1]);
return 0;
}
@@ -869,36 +869,37 @@ int handleCmdLine(int argc, char **argv)
UserConfigParams::m_num_karts = atoi(argv[i+1]);
if(UserConfigParams::m_num_karts > stk_config->m_max_karts)
{
fprintf(stdout, "Number of karts reset to maximum number %d\n",
Log::warn("main",
"Number of karts reset to maximum number %d\n",
stk_config->m_max_karts);
UserConfigParams::m_num_karts = stk_config->m_max_karts;
}
race_manager->setNumKarts( UserConfigParams::m_num_karts );
fprintf(stdout, "%d karts will be used.\n",
(int)UserConfigParams::m_num_karts);
Log::verbose("main", "%d karts will be used.\n",
(int)UserConfigParams::m_num_karts);
i++;
}
else if( !strcmp(argv[i], "--list-tracks") || !strcmp(argv[i], "-l") )
{
fprintf ( stdout, " Available tracks:\n" );
Log::info("main", " Available tracks:\n" );
for (size_t i = 0; i != track_manager->getNumberOfTracks(); i++)
{
const Track *track = track_manager->getTrack(i);
// FIXME: crashes
//if (!unlock_manager->getCurrentSlot()->isLocked(track->getIdent()))
//{
fprintf ( stdout, "\t%14s: %ls\n",
Log::info("main", "\t%14s: %ls\n",
track->getIdent().c_str(),
track->getName());
//}
}
fprintf ( stdout, "Use --track N to choose track.\n\n");
Log::info("main", "Use --track N to choose track.\n\n");
}
else if( !strcmp(argv[i], "--list-karts") )
{
fprintf ( stdout, " Available karts:\n" );
Log::info("main", " Available karts:\n" );
for (unsigned int i = 0;
NULL != kart_properties_manager->getKartById(i); i++)
{
@@ -907,11 +908,11 @@ int handleCmdLine(int argc, char **argv)
// FIXME: crashes
//if (!unlock_manager->getCurrentSlot()->isLocked(KP->getIdent()))
//{
fprintf (stdout, "\t%10s: %ls\n", KP->getIdent().c_str(),
Log::info("main", "\t%10s: %ls\n", KP->getIdent().c_str(),
KP->getName());
//}
}
fprintf ( stdout, "\n" );
Log::info("main", "\n" );
}
else if ( !strcmp(argv[i], "--no-start-screen")
|| !strcmp(argv[i], "-N") )
@@ -926,21 +927,21 @@ int handleCmdLine(int argc, char **argv)
}
else if ( !strcmp(argv[i], "--laps") && i+1<argc )
{
fprintf ( stdout, "You choose to have %d laps.\n",
atoi(argv[i+1]) );
Log::verbose("main", "You choose to have %d laps.\n",
atoi(argv[i+1]) );
race_manager->setNumLaps(atoi(argv[i+1]));
i++;
}
else if( sscanf(argv[i], "--profile-laps=%d", &n)==1)
{
printf("Profiling %d laps\n",n);
Log::verbose("main", "Profiling %d laps\n",n);
UserConfigParams::m_no_start_screen = true;
ProfileWorld::setProfileModeLaps(n);
race_manager->setNumLaps(n);
}
else if( sscanf(argv[i], "--profile-time=%d", &n)==1)
{
printf("Profiling: %d seconds.\n", n);
Log::verbose("main", "Profiling: %d seconds.\n", n);
UserConfigParams::m_no_start_screen = true;
ProfileWorld::setProfileModeTime((float)n);
race_manager->setNumLaps(999999); // profile end depends on time
@@ -1037,7 +1038,7 @@ int handleCmdLine(int argc, char **argv)
#endif
else
{
fprintf ( stderr, "Invalid parameter: %s.\n\n", argv[i] );
Log::error("main", "Invalid parameter: %s.\n\n", argv[i] );
cmdLineHelp(argv[0]);
return 0;
}
@@ -1243,18 +1244,18 @@ int main(int argc, char *argv[] )
//Enable logging of stdout and stderr to logfile
std::string logoutfile = file_manager->getLogFile("stdout.log");
std::string logerrfile = file_manager->getLogFile("stderr.log");
printf("Error messages and other text output will be logged to %s "
"and %s\n", logoutfile.c_str(), logerrfile.c_str());
Log::verbose("main", "Error messages and other text output will "
"be logged to %s and %s\n", logoutfile.c_str(),
logerrfile.c_str());
if(freopen (logoutfile.c_str(),"w",stdout)!=stdout)
{
fprintf(stderr, "Can not open log file '%s'. Writing to "
Log::error("main", "Can not open log file '%s'. Writing to "
"stdout instead.\n", logoutfile.c_str());
}
if(freopen (logerrfile.c_str(),"w",stderr)!=stderr)
{
fprintf(stderr, "Can not open log file '%s'. Writing to stderr"
" instead.\n",
logerrfile.c_str());
Log::error("main", "Can not open log file '%s'. Writing to "
"stderr instead.\n", logerrfile.c_str());
}
}
@@ -1381,7 +1382,9 @@ int main(int argc, char *argv[] )
if (kart_properties_manager->getKart(UserConfigParams::m_default_kart) == NULL)
{
printf("Kart '%s' is unknown so will use the default kart.\n", UserConfigParams::m_default_kart.c_str());
Log::warn("main", "Kart '%s' is unknown so will use the "
"default kart.\n",
UserConfigParams::m_default_kart.c_str());
race_manager->setLocalKartInfo(0, UserConfigParams::m_default_kart.getDefaultValue());
}
else
@@ -1430,7 +1433,7 @@ int main(int argc, char *argv[] )
// here (and will be called again from the network gui).
if(!network_manager->initialiseConnections())
{
fprintf(stderr, "Problems initialising network connections,\n"
Log::error("main", "Problems initialising network connections,\n"
"Running in non-network mode.\n");
}
// On the server start with the network information page for now
@@ -1466,8 +1469,8 @@ int main(int argc, char *argv[] )
} // try
catch (std::exception &e)
{
fprintf(stderr,"Exception caught : %s\n",e.what());
fprintf(stderr,"Aborting SuperTuxKart\n");
Log::error("main", "Exception caught : %s\n",e.what());
Log::error("main", "Aborting SuperTuxKart\n");
}
/* Program closing...*/