From: <han...@us...> - 2007-08-17 16:56:40
|
Revision: 1203 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=1203&view=rev Author: hansthefarmer Date: 2007-08-17 09:56:31 -0700 (Fri, 17 Aug 2007) Log Message: ----------- Bug-fix for --list-karts and --track. Added options: --stk-config FILE --mode N to set difficulty Modified Paths: -------------- trunk/supertuxkart/src/main.cpp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sc...@us...> - 2008-01-28 22:16:45
|
Revision: 1417 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=1417&view=rev Author: scifly Date: 2008-01-28 14:16:42 -0800 (Mon, 28 Jan 2008) Log Message: ----------- Fixed bug where blacklisted resolutions could be selected from the command line. Modified Paths: -------------- trunk/supertuxkart/src/main.cpp Modified: trunk/supertuxkart/src/main.cpp =================================================================== --- trunk/supertuxkart/src/main.cpp 2008-01-25 01:29:12 UTC (rev 1416) +++ trunk/supertuxkart/src/main.cpp 2008-01-28 22:16:42 UTC (rev 1417) @@ -40,6 +40,8 @@ #include <stdexcept> #include <cstdio> #include <string> +#include <sstream> +#include <algorithm> #include "user_config.hpp" #include "track_manager.hpp" @@ -254,7 +256,15 @@ #if !defined(WIN32) && !defined(__CYGWIN) else if ( !strcmp(argv[i], "--fullscreen") || !strcmp(argv[i], "-f")) { - user_config->m_fullscreen = true; + // Check that current res is not blacklisted + std::ostringstream o; + o << user_config->m_width << "x" << user_config->m_height; + std::string res = o.str(); + if (std::find(user_config->m_blacklist_res.begin(), + user_config->m_blacklist_res.end(),res) == user_config->m_blacklist_res.end()) + user_config->m_fullscreen = true; + else + fprintf ( stdout, _("Resolution %s has been blacklisted, so it is not available!\n"), res.c_str()); } else if ( !strcmp(argv[i], "--windowed") || !strcmp(argv[i], "-w")) { @@ -263,13 +273,24 @@ #endif else if ( !strcmp(argv[i], "--screensize") || !strcmp(argv[i], "-s") ) { - if (sscanf(argv[i+1], "%dx%d", &user_config->m_width, &user_config->m_height) == 2) + //Check if fullscreen and new res is blacklisted + int width, height; + if (sscanf(argv[i+1], "%dx%d", &width, &height) == 2) + { + std::ostringstream o; + o << width << "x" << height; + std::string res = o.str(); + if (!user_config->m_fullscreen || std::find(user_config->m_blacklist_res.begin(), + user_config->m_blacklist_res.end(),res) == user_config->m_blacklist_res.end()) { + user_config->m_prev_width = user_config->m_width = width; + user_config->m_prev_height = user_config->m_height = height; fprintf ( stdout, _("You choose to be in %dx%d.\n"), user_config->m_width, - user_config->m_height ); - user_config->m_prev_width = user_config->m_width; - user_config->m_prev_height = user_config->m_height; - } + user_config->m_height ); + } + else + fprintf ( stdout, _("Resolution %s has been blacklisted, so it is not available!\n"), res.c_str()); + } else { fprintf(stderr, _("Error: --screensize argument must be given as WIDTHxHEIGHT\n")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hik...@us...> - 2008-02-14 06:16:11
|
Revision: 1491 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=1491&view=rev Author: hikerstk Date: 2008-02-13 22:16:06 -0800 (Wed, 13 Feb 2008) Log Message: ----------- Fixed crash when an incorrect kart name was specified on the command line (--kart). Modified Paths: -------------- trunk/supertuxkart/src/main.cpp Modified: trunk/supertuxkart/src/main.cpp =================================================================== --- trunk/supertuxkart/src/main.cpp 2008-02-14 04:52:29 UTC (rev 1490) +++ trunk/supertuxkart/src/main.cpp 2008-02-14 06:16:06 UTC (rev 1491) @@ -144,7 +144,12 @@ } else if( (!strcmp(argv[i], "--kart") && i+1<argc )) { - race_manager->setPlayerKart(0, argv[i+1]); + if(!kart_properties_manager->getKart(argv[i+1])) + { + fprintf(stdout, _("Kart '%s' not found, ignored.\n"), + argv[i+1]); + } + else race_manager->setPlayerKart(0, argv[i+1]); } else if( (!strcmp(argv[i], "--mode") && i+1<argc )) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hik...@us...> - 2008-02-14 06:57:02
|
Revision: 1492 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=1492&view=rev Author: hikerstk Date: 2008-02-13 22:57:00 -0800 (Wed, 13 Feb 2008) Log Message: ----------- Fixed previous patch for detecing of invalid kart names. Modified Paths: -------------- trunk/supertuxkart/src/main.cpp Modified: trunk/supertuxkart/src/main.cpp =================================================================== --- trunk/supertuxkart/src/main.cpp 2008-02-14 06:16:06 UTC (rev 1491) +++ trunk/supertuxkart/src/main.cpp 2008-02-14 06:57:00 UTC (rev 1492) @@ -144,12 +144,19 @@ } else if( (!strcmp(argv[i], "--kart") && i+1<argc )) { - if(!kart_properties_manager->getKart(argv[i+1])) - { - fprintf(stdout, _("Kart '%s' not found, ignored.\n"), - argv[i+1]); - } - else race_manager->setPlayerKart(0, argv[i+1]); + std::string filename=std::string("data")+ + Loader::DIR_SEPARATOR+argv[i+1]+".tkkf"; + try + { + std::string s=loader->getPath(filename); + race_manager->setPlayerKart(0, argv[i+1]); + fprintf ( stdout, _("You choose to use kart '%s'.\n"), argv[i+1] ) ; + } + catch(std::runtime_error) + { + fprintf(stdout, _("Kart '%s' not found, ignored.\n"), + argv[i+1]); + } } else if( (!strcmp(argv[i], "--mode") && i+1<argc )) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sc...@us...> - 2008-04-17 12:19:20
|
Revision: 1692 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=1692&view=rev Author: scifly Date: 2008-04-17 05:19:12 -0700 (Thu, 17 Apr 2008) Log Message: ----------- Bugfix: Bug 1944513, Fullscreen mode is now retained across starts. Modified Paths: -------------- trunk/supertuxkart/src/main.cpp Modified: trunk/supertuxkart/src/main.cpp =================================================================== --- trunk/supertuxkart/src/main.cpp 2008-04-17 11:44:15 UTC (rev 1691) +++ trunk/supertuxkart/src/main.cpp 2008-04-17 12:19:12 UTC (rev 1692) @@ -517,6 +517,7 @@ /* Program closing...*/ + if (user_config->m_crashed) user_config->m_crashed = false; user_config->saveConfig(); delete inputDriver; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sc...@us...> - 2008-05-08 14:33:01
|
Revision: 1830 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=1830&view=rev Author: scifly Date: 2008-05-08 07:32:51 -0700 (Thu, 08 May 2008) Log Message: ----------- 1. The --list-tracks argument on the command line now lists unlocked tracks only. 2. The --track argument on the command line now checks if the track is unlocked. 3. Updated URL of STK home page. Modified Paths: -------------- trunk/supertuxkart/src/main.cpp Modified: trunk/supertuxkart/src/main.cpp =================================================================== --- trunk/supertuxkart/src/main.cpp 2008-05-08 04:45:08 UTC (rev 1829) +++ trunk/supertuxkart/src/main.cpp 2008-05-08 14:32:51 UTC (rev 1830) @@ -109,7 +109,7 @@ " -h, --help Show this help\n" "\n" "You can visit SuperTuxKart's homepage at " - "http://supertuxkart.berlios.de\n\n", invocation + "http://supertuxkart.sourceforge.net\n\n", invocation ); } // cmdLineHelp @@ -177,8 +177,17 @@ else if( (!strcmp(argv[i], "--track") || !strcmp(argv[i], "-t")) && i+1<argc ) { - race_manager->setTrack(argv[i+1]); - fprintf ( stdout, "You choose to start in track: %s.\n", argv[i+1] ) ; + if (!unlock_manager->isLocked(argv[i+1])) + { + race_manager->setTrack(argv[i+1]); + fprintf ( stdout, "You choose to start in track: %s.\n", argv[i+1] ) ; + } + 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"); + return 0; + } } else if( (!strcmp(argv[i], "--stk-config")) && i+1<argc ) { @@ -203,9 +212,15 @@ fprintf ( stdout, " Available tracks:\n" ); for (size_t i = 0; i != track_manager->getTrackCount(); i++) - fprintf ( stdout, "\t%10s: %s\n", - track_manager->getTrack(i)->getIdent().c_str(), - track_manager->getTrack(i)->getName()); + { + const Track *track = track_manager->getTrack(i); + if (!unlock_manager->isLocked(track->getIdent())) + { + fprintf ( stdout, "\t%10s: %s\n", + track->getIdent().c_str(), + track->getName()); + } + } fprintf ( stdout, "Use --track N to choose track.\n\n"); delete track_manager; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cos...@us...> - 2008-06-19 01:15:40
|
Revision: 2130 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=2130&view=rev Author: cosmosninja Date: 2008-06-18 18:15:38 -0700 (Wed, 18 Jun 2008) Log Message: ----------- Commented out option that doesn't works currently. Modified Paths: -------------- trunk/supertuxkart/src/main.cpp Modified: trunk/supertuxkart/src/main.cpp =================================================================== --- trunk/supertuxkart/src/main.cpp 2008-06-16 19:41:08 UTC (rev 2129) +++ trunk/supertuxkart/src/main.cpp 2008-06-19 01:15:38 UTC (rev 2130) @@ -91,7 +91,7 @@ " --list-karts Show available karts\n" " --laps N Define number of laps to N\n" " --mode N N=1 novice, N=2 driver, N=3 racer\n" - " --players n Define number of players to between 1 and 4.\n" + //FIXME" --players n Define number of players to between 1 and 4.\n" //FIXME " --reverse Enable reverse mode\n" //FIXME " --mirror Enable mirror mode (when supported)\n" " --herring STYLE Use STYLE as your herring style\n" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |