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

Add --animations=[01] and --gfx=[01] to control effects from command line.

Browse Source 
Plus clean a bunch of tabs and trailing whitespace.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7207 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
mbjornstk 2010-12-31 05:04:59 +00:00
parent d6b3e494de
commit 810dbc3edc
1 changed files with 56 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/main.cpp
View File

@ -103,6 +103,9 @@ void cmdLineHelp (char* invocation)
" (Default: 0, OpenGL: 1, Direct3D9: 2, \n" " (Default: 0, OpenGL: 1, Direct3D9: 2, \n"
" Direct3D8: 3, Software: 4, \n" " Direct3D8: 3, Software: 4, \n"
" Burning's Software: 5, Null device: 6).\n" " Burning's Software: 5, Null device: 6).\n"
" --animations=n Play karts' animations (Enable: 1, Disable: 0).\n"
" --gfx=n Play other graphical effects like impact stars dance,\n"
" water animations or explosions (Enable: 1, Disable: 0).\n"
// should not be used by unaware users:u // should not be used by unaware users:u
// " --profile Enable automatic driven profile mode for 20 seconds.\n" // " --profile Enable automatic driven profile mode for 20 seconds.\n"
// " --profile=n Enable automatic driven profile mode for n seconds.\n" // " --profile=n Enable automatic driven profile mode for n seconds.\n"
@ -125,7 +128,7 @@ void cmdLineHelp (char* invocation)
} // cmdLineHelp } // cmdLineHelp
//============================================================================= //=============================================================================
/** For base options that don't need much to be inited (and, in some cases, /** For base options that don't need much to be inited (and, in some cases,
* that need to be read before initing stuff) - it only assumes that * that need to be read before initing stuff) - it only assumes that
* user config is loaded (necessary to check for blacklisted screen * user config is loaded (necessary to check for blacklisted screen
* resolutions), but nothing else (esp. not kart_properties_manager and * resolutions), but nothing else (esp. not kart_properties_manager and
@ -169,8 +172,8 @@ int handleCmdLinePreliminary(int argc, char **argv)
std::ostringstream o; std::ostringstream o;
o << UserConfigParams::m_width << "x" << UserConfigParams::m_height; o << UserConfigParams::m_width << "x" << UserConfigParams::m_height;
std::string res = o.str(); std::string res = o.str();
if (std::find(UserConfigParams::m_blacklist_res.begin(), if (std::find(UserConfigParams::m_blacklist_res.begin(),
UserConfigParams::m_blacklist_res.end(),res) == UserConfigParams::m_blacklist_res.end()) UserConfigParams::m_blacklist_res.end(),res) == UserConfigParams::m_blacklist_res.end())
UserConfigParams::m_fullscreen = true; UserConfigParams::m_fullscreen = true;
else else
fprintf ( stdout, "Resolution %s has been blacklisted, so it is not available!\n", res.c_str()); fprintf ( stdout, "Resolution %s has been blacklisted, so it is not available!\n", res.c_str());
@ -250,10 +253,10 @@ int handleCmdLine(int argc, char **argv)
{ {
UserConfigParams::m_gamepad_debug=true; UserConfigParams::m_gamepad_debug=true;
} }
else if (!strcmp(argv[i], "--tutorial-debug")) else if (!strcmp(argv[i], "--tutorial-debug"))
{ {
UserConfigParams::m_tutorial_debug = true; UserConfigParams::m_tutorial_debug = true;
} }
else if(sscanf(argv[i], "--track-debug=%d",&n)==1) else if(sscanf(argv[i], "--track-debug=%d",&n)==1)
{ {
UserConfigParams::m_track_debug=n; UserConfigParams::m_track_debug=n;
@ -272,17 +275,17 @@ int handleCmdLine(int argc, char **argv)
} }
else if(!strcmp(argv[i], "--kartsize-debug")) else if(!strcmp(argv[i], "--kartsize-debug"))
{ {
for(unsigned int i=0; i<kart_properties_manager->getNumberOfKarts(); for(unsigned int i=0; i<kart_properties_manager->getNumberOfKarts();
i++) i++)
{ {
const KartProperties *km = kart_properties_manager->getKartById(i); const KartProperties *km = kart_properties_manager->getKartById(i);
printf("%s:\t%swidth: %f length: %f height: %f mesh-buffer count %d\n", printf("%s:\t%swidth: %f length: %f height: %f mesh-buffer count %d\n",
km->getIdent().c_str(), km->getIdent().c_str(),
(km->getIdent().size()<7) ? "\t" : "", (km->getIdent().size()<7) ? "\t" : "",
km->getMasterKartModel().getWidth(), km->getMasterKartModel().getWidth(),
km->getMasterKartModel().getLength(), km->getMasterKartModel().getLength(),
km->getMasterKartModel().getHeight(), km->getMasterKartModel().getHeight(),
km->getMasterKartModel().getModel()->getMeshBufferCount()); km->getMasterKartModel().getModel()->getMeshBufferCount());
} }
} }
else if(!strcmp(argv[i], "--check-debug")) else if(!strcmp(argv[i], "--check-debug"))
@ -311,13 +314,35 @@ int handleCmdLine(int argc, char **argv)
network_manager->setMode(NetworkManager::NW_CLIENT); network_manager->setMode(NetworkManager::NW_CLIENT);
UserConfigParams::m_server_address=s; UserConfigParams::m_server_address=s;
} }
else if ( sscanf(argv[i], "--gfx=%d", &n) )
{
if (n)
{
UserConfigParams::m_graphical_effects = true;
}
else
{
UserConfigParams::m_graphical_effects = false;
}
}
else if ( sscanf(argv[i], "--animations=%d", &n) )
{
if (n)
{
UserConfigParams::m_show_steering_animations = true;
}
else
{
UserConfigParams::m_show_steering_animations = false;
}
}
else if( (!strcmp(argv[i], "--kart") && i+1<argc )) else if( (!strcmp(argv[i], "--kart") && i+1<argc ))
{ {
std::string filename=file_manager->getKartFile(std::string(argv[i+1])+".tkkf"); std::string filename=file_manager->getKartFile(std::string(argv[i+1])+".tkkf");
if(filename!="") if(filename!="")
{ {
UserConfigParams::m_default_kart = argv[i+1]; UserConfigParams::m_default_kart = argv[i+1];
// if a player was added with -N, change its kart. Otherwise, nothing to do, // if a player was added with -N, change its kart. Otherwise, nothing to do,
// kart choice will be picked up upon player creation. // kart choice will be picked up upon player creation.
if (StateManager::get()->activePlayerCount() > 0) if (StateManager::get()->activePlayerCount() > 0)
@ -358,7 +383,7 @@ int handleCmdLine(int argc, char **argv)
race_manager->setTrack(argv[i+1]); race_manager->setTrack(argv[i+1]);
fprintf ( stdout, "You choose to start in track: %s.\n", argv[i+1] ) ; fprintf ( stdout, "You choose to start in track: %s.\n", argv[i+1] ) ;
} }
else else
{ {
fprintf(stdout, "Track %s has not been unlocked yet. \n", argv[i+1]); fprintf(stdout, "Track %s has not been unlocked yet. \n", argv[i+1]);
fprintf(stdout, "Use --list-tracks to list available tracks.\n\n"); fprintf(stdout, "Use --list-tracks to list available tracks.\n\n");
@ -400,7 +425,7 @@ int handleCmdLine(int argc, char **argv)
track->getIdent().c_str(), track->getIdent().c_str(),
track->getName().c_str()); track->getName().c_str());
} }
} }
fprintf ( stdout, "Use --track N to choose track.\n\n"); fprintf ( stdout, "Use --track N to choose track.\n\n");
} }
@ -462,7 +487,7 @@ int handleCmdLine(int argc, char **argv)
UserConfigParams::m_log_errors=true; UserConfigParams::m_log_errors=true;
} else if( sscanf(argv[i], "--profile=%d", &n)==1) } else if( sscanf(argv[i], "--profile=%d", &n)==1)
{ {
if(n<0) if(n<0)
{ {
printf("Profiling %d laps\n",-n); printf("Profiling %d laps\n",-n);
ProfileWorld::setProfileModeLaps(-n); ProfileWorld::setProfileModeLaps(-n);
@ -555,12 +580,12 @@ void initRest()
stk_config->load(file_manager->getDataFile("stk_config.xml")); stk_config->load(file_manager->getDataFile("stk_config.xml"));
irr_driver = new IrrDriver(); irr_driver = new IrrDriver();
// Init GUI // Init GUI
IrrlichtDevice* device = irr_driver->getDevice(); IrrlichtDevice* device = irr_driver->getDevice();
video::IVideoDriver* driver = device->getVideoDriver(); video::IVideoDriver* driver = device->getVideoDriver();
GUIEngine::init(device, driver, StateManager::get()); GUIEngine::init(device, driver, StateManager::get());
#ifdef ADDONS_MANAGER #ifdef ADDONS_MANAGER
// This only initialises the non-network part of the addons manager. The // This only initialises the non-network part of the addons manager. The
// online section of the addons manager will be initialised from a // online section of the addons manager will be initialised from a
@ -585,21 +610,21 @@ void initRest()
#ifdef ADDONS_MANAGER #ifdef ADDONS_MANAGER
KartPropertiesManager::addKartSearchDir( KartPropertiesManager::addKartSearchDir(
file_manager->getAddonsFile("data/karts/") ); file_manager->getAddonsFile("data/karts/") );
track_manager->addTrackSearchDir( track_manager->addTrackSearchDir(
file_manager->getAddonsFile("/data/tracks/")); file_manager->getAddonsFile("/data/tracks/"));
#endif #endif
track_manager->loadTrackList(); track_manager->loadTrackList();
music_manager->addMusicToTracks(); music_manager->addMusicToTracks();
GUIEngine::addLoadingIcon( GUIEngine::addLoadingIcon(
irr_driver->getTexture(file_manager->getTextureFile("notes.png")) ); irr_driver->getTexture(file_manager->getTextureFile("notes.png")) );
grand_prix_manager = new GrandPrixManager (); grand_prix_manager = new GrandPrixManager ();
// Consistency check for challenges, and enable all challenges // Consistency check for challenges, and enable all challenges
// that have all prerequisites fulfilled // that have all prerequisites fulfilled
grand_prix_manager->checkConsistency(); grand_prix_manager->checkConsistency();
GUIEngine::addLoadingIcon( irr_driver->getTexture(file_manager->getTextureFile("cup_gold.png")) ); GUIEngine::addLoadingIcon( irr_driver->getTexture(file_manager->getTextureFile("cup_gold.png")) );
race_manager = new RaceManager (); race_manager = new RaceManager ();
// default settings for Quickstart // default settings for Quickstart
race_manager->setNumPlayers(1); race_manager->setNumPlayers(1);
@ -645,10 +670,10 @@ void cleanTuxKart()
//============================================================================= //=============================================================================
int main(int argc, char *argv[] ) int main(int argc, char *argv[] )
{ {
srand(( unsigned ) time( 0 )); srand(( unsigned ) time( 0 ));
try { try {
// Init the minimum managers so that user config exists, then // Init the minimum managers so that user config exists, then
// handle all command line options that do not need (or must // handle all command line options that do not need (or must
@ -656,9 +681,9 @@ int main(int argc, char *argv[] )
initUserConfig(argv); // argv passed so config file can be initUserConfig(argv); // argv passed so config file can be
// found more reliably // found more reliably
handleCmdLinePreliminary(argc, argv); handleCmdLinePreliminary(argc, argv);
initRest(); initRest();
if (UserConfigParams::m_log_errors) //Enable logging of stdout and stderr to logfile if (UserConfigParams::m_log_errors) //Enable logging of stdout and stderr to logfile
{ {
std::string logoutfile = file_manager->getLogFile("stdout.log"); std::string logoutfile = file_manager->getLogFile("stdout.log");
@ -678,10 +703,10 @@ int main(int argc, char *argv[] )
} }
input_manager = new InputManager (); input_manager = new InputManager ();
// Get into menu mode initially. // Get into menu mode initially.
input_manager->setMode(InputManager::MENU); input_manager->setMode(InputManager::MENU);
main_loop = new MainLoop(); main_loop = new MainLoop();
material_manager -> loadMaterial (); material_manager -> loadMaterial ();
GUIEngine::addLoadingIcon( irr_driver->getTexture(file_manager->getGUIDir() + "/options_video.png") ); GUIEngine::addLoadingIcon( irr_driver->getTexture(file_manager->getGUIDir() + "/options_video.png") );
@ -690,7 +715,7 @@ int main(int argc, char *argv[] )
//m_tutorial_manager = new TutorialManager(); //m_tutorial_manager = new TutorialManager();
GUIEngine::addLoadingIcon( irr_driver->getTexture(file_manager->getTextureFile("gui_lock.png")) ); GUIEngine::addLoadingIcon( irr_driver->getTexture(file_manager->getTextureFile("gui_lock.png")) );
projectile_manager -> loadData (); projectile_manager -> loadData ();
// Both item_manager and powerup_manager load models and therefore // Both item_manager and powerup_manager load models and therefore
// textures from the model directory. To avoid reading the // textures from the model directory. To avoid reading the
// materials.xml twice, we do this here once for both: // materials.xml twice, we do this here once for both:
@ -704,7 +729,7 @@ int main(int argc, char *argv[] )
} }
if(materials_file!="") if(materials_file!="")
material_manager->popTempMaterial(); material_manager->popTempMaterial();
GUIEngine::addLoadingIcon( irr_driver->getTexture(file_manager->getGUIDir() + "/gift.png") ); GUIEngine::addLoadingIcon( irr_driver->getTexture(file_manager->getGUIDir() + "/gift.png") );
file_manager->popTextureSearchPath(); file_manager->popTextureSearchPath();
@ -812,7 +837,7 @@ int main(int argc, char *argv[] )
user_config->saveConfig(); user_config->saveConfig();
} }
if(input_manager) delete input_manager; // if early crash avoid delete NULL if(input_manager) delete input_manager; // if early crash avoid delete NULL
if (user_config && UserConfigParams::m_log_errors) //close logfiles if (user_config && UserConfigParams::m_log_errors) //close logfiles
{ {
fclose(stderr); fclose(stderr);