X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapinfo.qc;h=f6a14814bcbab1ac1982ec4f0b9905b0eced93af;hb=f67b2effcc9360ae443fc7da413d37b84e060e19;hp=92ed2b9f112d9527936c6339cec6c81c9434d675;hpb=df01ffb2ceeacdcffc7ed259ffb65fd53d455ed4;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index 92ed2b9f1..f6a14814b 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -231,16 +231,13 @@ string MapInfo_BSPName_ByID(float i) string unquote(string s) { - float i, j, l; - l = strlen(s); - j = -1; - for(i = 0; i < l; ++i) + float l = strlen(s); + for(float i = 0; i < l; ++i) { - string ch; - ch = substring(s, i, 1); - if(ch != " ") if(ch != "\"") + string ch = substring(s, i, 1); + if((ch != " ") && (ch != "\"")) { - for(j = strlen(s) - i - 1; j > 0; --j) + for(float j = l - i - 1; j > 0; --j) { ch = substring(s, i+j, 1); if(ch != " ") if(ch != "\"") @@ -1205,14 +1202,13 @@ void MapInfo_LoadMap(string s, float reinit) string MapInfo_ListAllowedMaps(Gametype type, float pRequiredFlags, float pForbiddenFlags) { string out; - float i; // to make absolutely sure: MapInfo_Enumerate(); MapInfo_FilterGametype(type, MapInfo_CurrentFeatures(), pRequiredFlags, pForbiddenFlags, 0); out = ""; - for(i = 0; i < MapInfo_count; ++i) + for(float i = 0; i < MapInfo_count; ++i) out = strcat(out, " ", _MapInfo_GlobItem(MapInfo_FilterList_Lookup(i))); return substring(out, 1, strlen(out) - 1); } @@ -1220,14 +1216,13 @@ string MapInfo_ListAllowedMaps(Gametype type, float pRequiredFlags, float pForbi string MapInfo_ListAllAllowedMaps(float pRequiredFlags, float pForbiddenFlags) { string out; - float i; // to make absolutely sure: MapInfo_Enumerate(); _MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, pRequiredFlags, pForbiddenFlags, 0); out = ""; - for(i = 0; i < MapInfo_count; ++i) + for(float i = 0; i < MapInfo_count; ++i) out = strcat(out, " ", _MapInfo_GlobItem(MapInfo_FilterList_Lookup(i))); MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), pRequiredFlags, pForbiddenFlags, 0);