lsalzman
/
tesseract
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more map rotation fixes

master
Lee Salzman 2013-01-26 02:01:49 +02:00
parent 5a7396eaac
commit 6f4b86d7a1
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/fpsgame/server.cpp
View File

@ -499,16 +499,23 @@ namespace server
bool searchmodename(const char *haystack, const char *needle)
{
if(!needle[0]) return true;
while((haystack = strchr(haystack, needle[0])))
do
{
const char *h = ++haystack, *n = needle+1;
if(needle[0] != '.')
{
haystack = strchr(haystack, needle[0]);
if(!haystack) break;
haystack++;
}
const char *h = haystack, *n = needle+1;
for(; *h && *n; h++)
{
if(*h == *n) n++;
else if(*h != ' ') break;
}
if(!*n) return true;
}
if(*n == '.') return !*h;
} while(needle[0] != '.');
return false;
}
@ -2039,11 +2046,8 @@ namespace server
{
int idx = findmaprotation(mode, smapname);
if(idx < 0 && smapname[0]) idx = findmaprotation(mode, "");
if(idx >= 0)
{
curmaprotation = idx;
map = maprotations[curmaprotation].map;
}
if(idx < 0) return;
map = maprotations[idx].map;
}
if(hasnonlocalclients()) sendservmsgf("local player forced %s on map %s", modename(mode), map[0] ? map : "[new map]");
changemap(map, mode);
@ -2058,7 +2062,8 @@ namespace server
{
int idx = findmaprotation(reqmode, smapname);
if(idx < 0 && smapname[0]) idx = findmaprotation(reqmode, "");
if(idx >= 0) map = maprotations[idx].map;
if(idx < 0) return;
map = maprotations[idx].map;
}
if(lockmaprotation && !ci->privilege && !ci->local && findmaprotation(reqmode, map) < 0)
{