Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- cleaned up some compiler warnings

This commit is contained in:
Mark Vejvoda 2011-03-10 18:45:05 +00:00
parent 689b1ee218
commit a013d9300f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/glest_game/global/config.cpp
View File

@ -648,10 +648,10 @@ vector<pair<string,string> > Config::getPropertiesFromContainer(const Properties
vector<pair<string,string> > Config::getMergedProperties() const {
vector<pair<string,string> > result = getMasterProperties();
vector<pair<string,string> > resultUser = getUserProperties();
for(int i = 0; i < resultUser.size(); ++i) {
for(unsigned int i = 0; i < resultUser.size(); ++i) {
const pair<string,string> &propertyUser = resultUser[i];
bool overrideProperty = false;
for(int j = 0; j < result.size(); ++j) {
for(unsigned int j = 0; j < result.size(); ++j) {
pair<string,string> &property = result[j];
// Take the user property and override the original value
if(property.first == propertyUser.first) {
@ -679,7 +679,7 @@ vector<pair<string,string> > Config::getUserProperties() const {
void Config::setUserProperties(const vector<pair<string,string> > &valueList) {
Properties &propertiesObj = properties.second;
for(int idx = 0; idx < valueList.size(); ++ idx) {
for(unsigned int idx = 0; idx < valueList.size(); ++ idx) {
const pair<string,string> &nameValuePair = valueList[idx];
propertiesObj.setString(nameValuePair.first,nameValuePair.second);
}