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

1) Removed 'skidding preview'.

Browse Source 
2) log output (stderr or terminal) is not saved in user config anymore
   (avoiding the problem of not seeing error messages because they
   are redirected to a log file)


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2496 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2008-11-24 08:14:40 +00:00
parent 7b8e34226f
commit dab73791c3
3 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/race_gui.cpp
View File

@@ -463,7 +463,7 @@ void RaceGUI::drawPowerupIcons ( Kart* player_kart, int offset_x,
void RaceGUI::drawEnergyMeter ( Kart *player_kart, int offset_x, int offset_y,
float ratio_x, float ratio_y )
{
float state = (float)(player_kart->getNumItems()) /
float state = (float)(player_kart->getEnergy()) /
MAX_ITEMS_COLLECTED;
int x = (int)((user_config->m_width-24) * ratio_x) + offset_x;
int y = (int)(250 * ratio_y) + offset_y;

35
src/user_config.cpp
View File

@@ -103,7 +103,6 @@ void UserConfig::setDefaults()
m_background_music = "";
m_profile = 0;
m_print_kart_sizes = false;
m_skidding = false;
m_max_fps = 120;
m_sfx_volume = 1.0f;
m_use_kph = false;
@@ -440,11 +439,10 @@ void UserConfig::loadConfig(const std::string& filename)
/*get number of karts*/
lisp->get("karts", m_karts);
//get whether to log errors to file
lisp->get("log-errors", m_log_errors);
lisp->get("kart-group", m_kart_group);
lisp->get("track-group", m_track_group);
lisp->get("last-track", m_last_track);
// Handle loading the stick config in it own method.
readStickConfigs(lisp);
@@ -674,30 +672,27 @@ void UserConfig::saveConfig(const std::string& filename)
writer->write("sfx-volume", m_sfx_volume);
writer->writeComment("screen resolution and windowing mode");
writer->write("width\t", m_width);
writer->write("height\t", m_height);
writer->write("prev_width\t", m_prev_width);
writer->write("prev_height\t", m_prev_height);
writer->write("prev_windowed\t", m_prev_windowed);
writer->write("width\t", m_width);
writer->write("height\t", m_height);
writer->write("prev_width\t", m_prev_width);
writer->write("prev_height\t", m_prev_height);
writer->write("prev_windowed\t", m_prev_windowed);
writer->write("crash_detected\t", m_crashed);
writer->write("blacklisted_resolutions\t", m_blacklist_res);
writer->write("fullscreen\t", m_fullscreen);
writer->write("blacklisted_resolutions\t",
m_blacklist_res);
writer->write("fullscreen\t", m_fullscreen);
writer->writeComment("number of karts. -1 means use all");
writer->write("karts\t", m_karts);
writer->writeComment("error logging to log (true) or stderr (false)");
writer->write("log-errors\t", m_log_errors);
writer->write("karts\t", m_karts);
writer->writeComment("Last selected kart group");
writer->write("kart-group", m_kart_group);
writer->write("kart-group", m_kart_group);
writer->writeComment("Last selected track group");
writer->write("track-group", m_track_group);
writer->write("track-group", m_track_group);
writer->writeComment("Last track played");
writer->write("last-track", m_last_track);
writer->write("last-track", m_last_track);
writer->writeComment("Information about last server used");
writer->write("server-address", m_server_address);
writer->write("server-port", m_server_port);
writer->write("server-address", m_server_address);
writer->write("server-port", m_server_port);
writeStickConfigs(writer);

1
src/user_config.hpp
View File

@@ -168,7 +168,6 @@ public:
int m_profile; // Positive number: time in seconds, neg: # laps. (used to profile AI)
bool m_print_kart_sizes; // print all kart sizes
// 0 if no profiling. Never saved in config file!
bool m_skidding;
float m_sfx_volume;
int m_max_fps;
std::string m_item_style;