{
if(idx < Map_Count)
{
- if(map == argv(idx))
+ if(map == bufstr_get(maplist_buffer, idx))
{
return idx;
}
for(int pos = 0; pos < Map_Count; ++pos)
{
- if(map == argv(pos))
+ if(map == bufstr_get(maplist_buffer, pos))
return pos;
}
return true;
}
-string Map_Filename(int position)
+string Map_Filename(string m)
{
- return strcat("maps/", argv(position), ".bsp");
+ return strcat("maps/", m, ".bsp");
}
void Map_MarkAsRecent(string m)
bool Map_IsRecent(string m)
{
+ if(autocvar_g_maplist_mostrecent == "")
+ return false;
return strhasword(autocvar_g_maplist_mostrecent, m);
}
-bool Map_Check(int position, float pass)
+bool Map_Check(string m, int pass)
{
- string map_next = argv(position);
if(pass <= 1)
{
- if(Map_IsRecent(map_next))
+ if(Map_IsRecent(m))
return false;
}
- if(MapInfo_CheckMap(map_next))
+ if(MapInfo_CheckMap(m))
{
if(pass == 2)
return true;
// MapInfo_Map_flags was set by MapInfo_CheckMap()
if (MapInfo_Map_flags & MAPINFO_FLAG_DONOTWANT)
return false;
- if(MapHasRightSize(map_next))
+ if(MapHasRightSize(m))
return true;
return false;
}
else
{
- string filename = Map_Filename(position);
+ string filename = Map_Filename(m);
LOG_DEBUG( "Couldn't select '", filename, "'..." );
}
{
Map_Current = position;
cvar_set("g_maplist_index", ftos(position));
- Map_Goto_SetStr(argv(position));
+ Map_Goto_SetStr(bufstr_get(maplist_buffer, position));
}
void Map_Goto(float reinit)
// -2 = permanent failure
int MaplistMethod_Iterate(void) // usual method
{
- int pass, i;
+ int attempts = 42; // skip advanced checks if this many maps fail
LOG_TRACE("Trying MaplistMethod_Iterate");
- for(pass = 1; pass <= 2; ++pass)
+ for(int i = 1; i < Map_Count; ++i)
{
- for(i = 1; i < Map_Count; ++i)
+ int mapindex = (i + Map_Current) % Map_Count;
+ if(Map_Check(bufstr_get(maplist_buffer, mapindex), 1))
+ return mapindex;
+
+ attempts -= 1;
+ if(attempts <= 0)
{
- int mapindex;
- mapindex = (i + Map_Current) % Map_Count;
- if(Map_Check(mapindex, pass))
- return mapindex;
+ LOG_DEBUG("MaplistMethod_Iterate: Couldn't find a suitable map, falling back to next valid");
+ break;
}
}
- return -1;
+
+ // failing that, just accept the next map in the list
+ int mapindex = (1 + Map_Current) % Map_Count;
+ return mapindex;
}
int MaplistMethod_Repeat(void) // fallback method
{
LOG_TRACE("Trying MaplistMethod_Repeat");
- if(Map_Check(Map_Current, 2))
+ if(Map_Check(bufstr_get(maplist_buffer, Map_Current), 2))
return Map_Current;
return -2;
}
{
int mapindex;
mapindex = (Map_Current + floor(random() * (Map_Count - 1) + 1)) % Map_Count; // any OTHER map
- if(Map_Check(mapindex, 1))
+ if(Map_Check(bufstr_get(maplist_buffer, mapindex), 1))
return mapindex;
}
return -1;
}
-// the exponent sets a bias on the map selection:
-// the higher the exponent, the less likely "shortly repeated" same maps are
-int MaplistMethod_Shuffle(float exponent) // more clever shuffling
+// NOTE: call Maplist_Close when you're done!
+int Maplist_Init(void)
{
- float i, j, imax, insertpos;
-
- LOG_TRACE("Trying MaplistMethod_Shuffle");
-
- imax = 42;
-
- for(i = 0; i <= imax; ++i)
+ bool have_maps = false;
+ if(autocvar_g_maplist != "")
{
- string newlist;
-
- // now reinsert this at another position
- insertpos = (random() ** (1 / exponent)); // ]0, 1]
- insertpos = insertpos * (Map_Count - 1); // ]0, Map_Count - 1]
- insertpos = ceil(insertpos) + 1; // {2, 3, 4, ..., Map_Count}
- LOG_TRACE("SHUFFLE: insert pos = ", ftos(insertpos));
-
- // insert the current map there
- newlist = "";
- for(j = 1; j < insertpos; ) // i == 1: no loop, will be inserted as first; however, i == 1 has been excluded above
+ // make sure there is at least one playable map in the list
+ bool needtrim = false;
+ FOREACH_WORD(autocvar_g_maplist, true,
{
- if (j + 2 < insertpos)
- newlist = strcat(newlist, " ", argv(j++), " ", argv(j++), " ", argv(j++));
- else
- newlist = strcat(newlist, " ", argv(j++));
- }
- newlist = strcat(newlist, " ", argv(0)); // now insert the just selected map
- for(j = insertpos; j < Map_Count; ) // i == Map_Count: no loop, has just been inserted as last
+ if(!fexists(Map_Filename(it)))
+ {
+ needtrim = true;
+ if(have_maps)
+ break;
+ continue;
+ }
+ if(have_maps || !Map_Check(it, 2))
+ continue;
+ have_maps = true;
+ if(needtrim)
+ break;
+ });
+
+ // additionally trim any non-existent maps
+ if(needtrim)
{
- if (j + 2 < Map_Count)
- newlist = strcat(newlist, " ", argv(j++), " ", argv(j++), " ", argv(j++));
- else
- newlist = strcat(newlist, " ", argv(j++));
+ int trimmedmaps = 0;
+ string newmaplist = "";
+ FOREACH_WORD(autocvar_g_maplist, true,
+ {
+ if(!fexists(Map_Filename(it)))
+ {
+ trimmedmaps += 1;
+ continue;
+ }
+ newmaplist = cons(newmaplist, it);
+ });
+ cvar_set("g_maplist", newmaplist);
+ LOG_DEBUGF("Maplist_Init: trimmed %d missing maps from the list", trimmedmaps);
}
- newlist = substring(newlist, 1, strlen(newlist) - 1);
- cvar_set("g_maplist", newlist);
- Map_Count = tokenizebyseparator(autocvar_g_maplist, " ");
-
- // NOTE: the selected map has just been inserted at (insertpos-1)th position
- if (Map_Check(insertpos - 1, 1))
- return insertpos - 1;
- }
- return -1;
-}
-
-int Maplist_Init(void)
-{
- int i, available_maps = 0;
- Map_Count = 0;
- if(autocvar_g_maplist != "")
- {
- Map_Count = tokenizebyseparator(autocvar_g_maplist, " ");
- for (i = 0; i < Map_Count; ++i)
- if (Map_Check(i, 2))
- ++available_maps;
}
- if (!available_maps)
+ if (!have_maps)
{
bprint( "Maplist contains no usable maps! Resetting it to default map list.\n" );
cvar_set("g_maplist", MapInfo_ListAllowedMaps(MapInfo_CurrentGametype(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags()));
if(!server_is_dedicated)
localcmd("\nmenu_cmd sync\n");
- Map_Count = tokenizebyseparator(autocvar_g_maplist, " ");
- for (i = 0; i < Map_Count; ++i)
- if (Map_Check(i, 2))
- ++available_maps;
}
+ maplist_buffer = buf_create();
+
+ int _cnt = 0;
+ FOREACH_WORD(autocvar_g_maplist, Map_Check(it, 2),
+ {
+ // NOTE: inlined maplist_shuffle function to avoid a second buffer, keep both in sync
+ if(autocvar_g_maplist_shuffle)
+ {
+ int _j = floor(random() * (_cnt + 1));
+ if(_j != _cnt)
+ bufstr_set(maplist_buffer, _cnt, bufstr_get(maplist_buffer, _j));
+ bufstr_set(maplist_buffer, _j, it);
+ ++_cnt;
+ }
+ else
+ bufstr_set(maplist_buffer, i, it);
+ });
+
+ Map_Count = buf_getsize(maplist_buffer);
+
if(Map_Count == 0)
error("empty maplist, cannot select a new map");
Map_Current = bound(0, GetMaplistPosition(), Map_Count - 1);
- if(autocvar_g_maplist_shuffle)
- cvar_set("g_maplist", shufflewords(autocvar_g_maplist));
+ return Map_Count;
+}
- return available_maps;
+void Maplist_Close()
+{
+ buf_del(maplist_buffer);
}
// NOTE: call Maplist_Init() before making GetNextMap() call(s)
{
int nextMap = -1;
- if(nextMap == -1 && autocvar_g_maplist_shuffle > 0)
- nextMap = MaplistMethod_Shuffle(autocvar_g_maplist_shuffle + 1);
-
if(nextMap == -1 && autocvar_g_maplist_selectrandom)
nextMap = MaplistMethod_Random();
Maplist_Init();
string nextMap = GetNextMap();
+ Maplist_Close();
if(nextMap == "")
error("Everything is broken - cannot find a next map. Please report this to the developers.");
Map_Goto(reinit);
projects / xonotic / xonotic-data.pk3dir.git / commitdiff