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

Fixed in config code : the code was mixed up by all players described using a <Player ...> node in XML... because often it did getNode(Player) which always returned the first player. People please delete your config file (or the Players section in it) to amke sure your data is OK

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5077 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2010-03-27 01:35:11 +00:00
parent daa2c467b3
commit 2b68412239
4 changed files with 71 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/config/player.hpp
View File

@@ -38,15 +38,37 @@ protected:
StringUserConfigParam m_name;
BoolUserConfigParam m_is_guest_account;
public:
IntUserConfigParam m_use_frequency;
/**
* Constructor to create a new player that didn't exist before
*/
PlayerProfile(const char* name) : m_player_group("Player", "Represents one human player"),
m_name(name, "name", &m_player_group), //, m_last_kart_id(-1)
m_is_guest_account(false, "guest", &m_player_group)
m_is_guest_account(false, "guest", &m_player_group),
m_use_frequency(0, "use_frequency", &m_player_group)
{
}
/**
* Constructor to deserialize a player that was saved to a XML file
* (...UserConfigParam classes will automagically take care of serializing all
* create players to the user's config file)
*/
PlayerProfile(const XMLNode* node) : m_player_group("Player", "Represents one human player"),
m_name("-", "name", &m_player_group), //, m_last_kart_id(-1)
m_is_guest_account(false, "guest", &m_player_group),
m_use_frequency(0, "use_frequency", &m_player_group)
{
//m_player_group.findYourDataInAChildOf(node);
m_name.findYourDataInAnAttributeOf(node);
m_is_guest_account.findYourDataInAnAttributeOf(node);
m_use_frequency.findYourDataInAnAttributeOf(node);
}
void setName(const std::string &name_){ m_name = name_; }

53
src/config/user_config.cpp
View File

@@ -83,23 +83,23 @@ void GroupUserConfigParam::write(std::ofstream& stream) const
stream << " />\n\n";
}
void GroupUserConfigParam::readAsNode(const XMLNode* node)
void GroupUserConfigParam::findYourDataInAChildOf(const XMLNode* node)
{
const XMLNode* child = node->getNode( paramName );
if(child == NULL)
if (child == NULL)
{
//std::cout << "Couldn't find parameter group " << paramName << std::endl;
//std::cerr << "/!\\ User Config : Couldn't find parameter group " << paramName << std::endl;
return;
}
const int children_amount = m_children.size();
for(int n=0; n<children_amount; n++)
for (int n=0; n<children_amount; n++)
{
m_children[n]->readAsProperty(child);
m_children[n]->findYourDataInAnAttributeOf(child);
}
}
void GroupUserConfigParam::readAsProperty(const XMLNode* node)
void GroupUserConfigParam::findYourDataInAnAttributeOf(const XMLNode* node)
{
}
std::string GroupUserConfigParam::toString() const
@@ -142,7 +142,7 @@ std::string IntUserConfigParam::toString() const
return buffer;
}
void IntUserConfigParam::readAsNode(const XMLNode* node)
void IntUserConfigParam::findYourDataInAChildOf(const XMLNode* node)
{
const XMLNode* child = node->getNode( paramName );
if(child == NULL)
@@ -154,7 +154,7 @@ void IntUserConfigParam::readAsNode(const XMLNode* node)
child->get( "value", &value );
//std::cout << "read int " << paramName << ", value=" << value << std::endl;
}
void IntUserConfigParam::readAsProperty(const XMLNode* node)
void IntUserConfigParam::findYourDataInAnAttributeOf(const XMLNode* node)
{
node->get( paramName, &value );
}
@@ -183,14 +183,14 @@ void StringUserConfigParam::write(std::ofstream& stream) const
if(comment.size() > 0) stream << " <!-- " << comment.c_str() << " -->\n";
stream << " <" << paramName << " value=\"" << value << "\" />\n\n";
}
void StringUserConfigParam::readAsNode(const XMLNode* node)
void StringUserConfigParam::findYourDataInAChildOf(const XMLNode* node)
{
const XMLNode* child = node->getNode( paramName );
if(child == NULL) return;
child->get( "value", &value );
}
void StringUserConfigParam::readAsProperty(const XMLNode* node)
void StringUserConfigParam::findYourDataInAnAttributeOf(const XMLNode* node)
{
node->get( paramName, &value );
}
@@ -224,7 +224,7 @@ void BoolUserConfigParam::write(std::ofstream& stream) const
if(comment.size() > 0) stream << " <!-- " << comment.c_str() << " -->\n";
stream << " <" << paramName << " value=\"" << (value ? "true" : "false" ) << "\" />\n\n";
}
void BoolUserConfigParam::readAsNode(const XMLNode* node)
void BoolUserConfigParam::findYourDataInAChildOf(const XMLNode* node)
{
const XMLNode* child = node->getNode( paramName );
if(child == NULL) return;
@@ -243,7 +243,7 @@ void BoolUserConfigParam::readAsNode(const XMLNode* node)
else
std::cerr << "Unknown value for " << paramName << "; expected true or false\n";
}
void BoolUserConfigParam::readAsProperty(const XMLNode* node)
void BoolUserConfigParam::findYourDataInAnAttributeOf(const XMLNode* node)
{
std::string textValue = "";
node->get( paramName, &textValue );
@@ -289,14 +289,14 @@ void FloatUserConfigParam::write(std::ofstream& stream) const
if(comment.size() > 0) stream << " <!-- " << comment.c_str() << " -->\n";
stream << " <" << paramName << " value=\"" << value << "\" />\n\n";
}
void FloatUserConfigParam::readAsNode(const XMLNode* node)
void FloatUserConfigParam::findYourDataInAChildOf(const XMLNode* node)
{
const XMLNode* child = node->getNode( paramName );
if(child == NULL) return;
child->get( "value", &value );
}
void FloatUserConfigParam::readAsProperty(const XMLNode* node)
void FloatUserConfigParam::findYourDataInAnAttributeOf(const XMLNode* node)
{
node->get( paramName, &value );
}
@@ -352,7 +352,7 @@ void UserConfig::addDefaultPlayer()
class GuestPlayerProfile : public PlayerProfile
{
public:
GuestPlayerProfile() : PlayerProfile("Guest")
GuestPlayerProfile() : PlayerProfile("Guest") //TODO: i18n
{
m_is_guest_account = true;
}
@@ -423,26 +423,33 @@ bool UserConfig::loadConfig()
// Keep on reading the config files as far as possible
} // if configFileVersion<SUPPORTED_CONFIG_VERSION
// ---- Read all other parameters
// ---- Read parameters values (all parameter objects must have been created before this point if
// you want them automatically read from the config file)
const int paramAmount = all_params.size();
for(int i=0; i<paramAmount; i++)
{
all_params[i].readAsNode(root);
all_params[i].findYourDataInAChildOf(root);
}
// ---- Read players
// we create those AFTER other values are being read simply because we have many Player
// nodes that all bear the same name, so the generic loading code won't work here
UserConfigParams::m_all_players.clearAndDeleteAll();
std::vector<XMLNode*> players;
root->getNodes("Player", players);
const int amount = players.size();
for(int i=0; i<amount; i++)
for (int i=0; i<amount; i++)
{
std::string name;
players[i]->get("name", &name);
UserConfigParams::m_all_players.push_back( new PlayerProfile(name.c_str()) );
//std::string name;
//players[i]->get("name", &name);
UserConfigParams::m_all_players.push_back( new PlayerProfile(players[i]) );
}
delete root;
return true;
} // loadConfig

25
src/config/user_config.hpp
View File

@@ -62,8 +62,8 @@ protected:
public:
virtual ~UserConfigParam();
virtual void write(std::ofstream& stream) const = 0;
virtual void readAsNode(const XMLNode* node) = 0;
virtual void readAsProperty(const XMLNode* node) = 0;
virtual void findYourDataInAChildOf(const XMLNode* node) = 0;
virtual void findYourDataInAnAttributeOf(const XMLNode* node) = 0;
virtual std::string toString() const = 0;
};
@@ -73,8 +73,8 @@ class GroupUserConfigParam : public UserConfigParam
public:
GroupUserConfigParam(const char* name, const char* comment=NULL);
void write(std::ofstream& stream) const;
void readAsNode(const XMLNode* node);
void readAsProperty(const XMLNode* node);
void findYourDataInAChildOf(const XMLNode* node);
void findYourDataInAnAttributeOf(const XMLNode* node);
void addChild(UserConfigParam* child);
std::string toString() const;
@@ -88,12 +88,13 @@ public:
IntUserConfigParam(int defaultValue, const char* paramName, GroupUserConfigParam* group, const char* comment = NULL);
void write(std::ofstream& stream) const;
void readAsNode(const XMLNode* node);
void readAsProperty(const XMLNode* node);
void findYourDataInAChildOf(const XMLNode* node);
void findYourDataInAnAttributeOf(const XMLNode* node);
std::string toString() const;
operator int() const { return value; }
int& operator++(int dummy) { value++; return value; }
int& operator=(const int& v) { value = v; return value; }
int& operator=(const IntUserConfigParam& v) { value = (int)v; return value; }
};
@@ -107,8 +108,8 @@ public:
void write(std::ofstream& stream) const;
void readAsNode(const XMLNode* node);
void readAsProperty(const XMLNode* node);
void findYourDataInAChildOf(const XMLNode* node);
void findYourDataInAnAttributeOf(const XMLNode* node);
std::string toString() const;
@@ -128,8 +129,8 @@ public:
void write(std::ofstream& stream) const;
void readAsNode(const XMLNode* node);
void readAsProperty(const XMLNode* node);
void findYourDataInAChildOf(const XMLNode* node);
void findYourDataInAnAttributeOf(const XMLNode* node);
std::string toString() const;
@@ -146,8 +147,8 @@ public:
FloatUserConfigParam(float defaultValue, const char* paramName, GroupUserConfigParam* group, const char* comment = NULL);
void write(std::ofstream& stream) const;
void readAsNode(const XMLNode* node);
void readAsProperty(const XMLNode* node);
void findYourDataInAChildOf(const XMLNode* node);
void findYourDataInAnAttributeOf(const XMLNode* node);
std::string toString() const;

4
src/states_screens/kart_selection.cpp
View File

@@ -1147,6 +1147,10 @@ void KartSelectionScreen::allPlayersDone()
std::cout << "==========\n";
}
for (int n=0; n<players.size(); n++)
{
StateManager::get()->getActivePlayer(n)->getProfile()->m_use_frequency++;
}
// ---- Give player info to race manager
race_manager->setNumPlayers( players.size() );
race_manager->setNumLocalPlayers( players.size() );