merged branch

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7382 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lucas GAUTHERON
2013-03-22 19:49:21 +00:00
parent eb5b6ffd99
commit a7a1e46bcc
36 changed files with 2944 additions and 514 deletions
+2 -3
View File
@@ -1111,10 +1111,9 @@ void showmapstats()
}
COMMAND(showmapstats, "");
VARP(showmodedescriptions, 0, 1, 1);
void startmap(const char *name, bool reset) // called just after a map load
VARP(showmodedescriptions, 0, 1, 1);extern bool canceldownloads;void startmap(const char *name, bool reset) // called just after a map load
{
canceldownloads = false;
copystring(clientmap, name);
sendmapidenttoserver = true;
// Added by Rick