Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added amb311 - mapcycle file now ignores .bsp extension

Browse Source
This commit is contained in:
Steve Dudenhoeffer
2007-05-20 15:03:26 +00:00
parent 66feed1d2b
commit 079606c143
4 changed files with 128 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
plugins/ns/mapchooser.sma
View File

@ -148,6 +148,35 @@ public voteNextmap(){
client_cmd(0,"spk Gman/Gman_Choose2")
log_amx("Vote: Voting for the nextmap started")
}
stock bool:ValidMap(mapname[])
{
if ( is_map_valid(mapname) )
{
return true;
}
// If the is_map_valid check failed, check the end of the string
new len = strlen(mapname) - 4;
// The mapname was too short to possibly house the .bsp extension
if (len < 0)
{
return false;
}
if ( equali(mapname[len], ".bsp") )
{
// If the ending was .bsp, then cut it off.
// the string is byref'ed, so this copies back to the loaded text.
mapname[len] = '^0';
// recheck
if ( is_map_valid(mapname) )
{
return true;
}
}
return false;
}
loadSettings(filename[])
{
@ -162,7 +191,7 @@ loadSettings(filename[])
{
if ( szText[0] != ';'
&& parse(szText, g_mapName[g_mapNums] ,31 )
&& is_map_valid( g_mapName[g_mapNums] )
&& ValidMap( g_mapName[g_mapNums] )
&& !equali( g_mapName[g_mapNums] ,g_lastMap)
&& !equali( g_mapName[g_mapNums] ,currentMap) )
++g_mapNums

35
plugins/ns/nextmap.sma
View File

@ -59,6 +59,35 @@ public plugin_init() {
readMapCycle()
findNextMap()
}
stock bool:ValidMap(mapname[])
{
if ( is_map_valid(mapname) )
{
return true;
}
// If the is_map_valid check failed, check the end of the string
new len = strlen(mapname) - 4;
// The mapname was too short to possibly house the .bsp extension
if (len < 0)
{
return false;
}
if ( equali(mapname[len], ".bsp") )
{
// If the ending was .bsp, then cut it off.
// the string is byref'ed, so this copies back to the loaded text.
mapname[len] = '^0';
// recheck
if ( is_map_valid(mapname) )
{
return true;
}
}
return false;
}
public server_changelevel() {
if (g_mapChanging)
@ -68,7 +97,7 @@ public server_changelevel() {
new szCvarNextMap[32]
get_cvar_string("amx_nextmap", szCvarNextMap, 31)
if ( !equal(szCvarNextMap, g_mapCycle[g_nextPos][NAME]) ) {
if (is_map_valid(szCvarNextMap)) {
if (ValidMap(szCvarNextMap)) {
if (g_changeMapDelay)
set_task(INFO_READ_TIME, "changeMap", 0, szCvarNextMap, 32)
else
@ -79,7 +108,7 @@ public server_changelevel() {
new szNextMap[32]
getNextValidMap(szNextMap)
if (is_map_valid(szNextMap)) {
if (ValidMap(szNextMap)) {
if (g_changeMapDelay)
set_task(INFO_READ_TIME, "changeMap", 0, szNextMap, 32)
else
@ -196,7 +225,7 @@ readMapCycle() {
if ( file_exists(szMapCycleFile) ) {
while( read_file(szMapCycleFile, line++, szBuffer, 63, length) ) { // ns_lost "\minplayers\16\maxplayers\32\"
parse(szBuffer, szMapName, 31, szMapPlayerNum, 31)
if ( !isalpha(szMapName[0]) || !is_map_valid(szMapName) ) continue
if ( !isalpha(szMapName[0]) || !ValidMap(szMapName) ) continue
copy(g_mapCycle[g_numMaps][NAME], 31, szMapName)