kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mediapack updates : file-list update & URL output on "checkmapdependencies"

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5561 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
flowtron
2010-08-08 00:11:41 +00:00
parent 8b7d4a75e4
commit a8f80df36c
3 changed files with 74 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/worldio.cpp
+16 -7
View File
@@ -185,7 +185,7 @@ uchar *readmcfggz(char *name, int *size, int *sizegz)
VAR(advancemaprevision, 1, 1, 100);
void checkmapdependencies(bool silent = false) // find required MediaPack (s) for current map
void checkmapdependencies(bool silent = false, bool details = false) // find required MediaPack (s) for current map
{
if(!silent) conoutf("checking map dependencies");
static hashtable<const char *, int> mufpaths;
@@ -325,7 +325,7 @@ void checkmapdependencies(bool silent = false) // find required MediaPack (s) fo
if(!usethis)
{
formatstring(reqmpak)("%s%s%s", reqmpak, reqmpak[0]=='\0'?"":",", mpdefs[j]);
if(++usedmpaks > 0) usethis = true;
if(++usedmpaks > 0) { usethis = true; conoutf("http://www.26things.com/mrx/get.php?mpid=%s", mpdefs[j]); }
if(usedmpaks>25) conoutf("this map requires too many mediapacks."); // even if silent == true
}
}
@@ -335,14 +335,19 @@ void checkmapdependencies(bool silent = false) // find required MediaPack (s) fo
}
}
idx = -1;
if(!silent)
if(!silent && details)
{
enumeratek(mufpaths, const char *, key, idx++; if(packn[idx]!=0) conoutf("%3d: %s : %d : %s", idx, key, packn[idx], packn[idx]==0?"release":(packn[idx]<0?"LOCAL":mpdefs[packn[idx]-1])); );
conoutf("mediapack details:");
// packn[idx]==0?"release":
enumeratek(mufpaths, const char *, key, idx++; if(packn[idx]!=0) conoutf("%3d: %s : %d : %s", idx, key, packn[idx], packn[idx]<0?"LOCAL":mpdefs[packn[idx]-1]); );
}
conoutf("this map requires the following %d mediapack%s: %s", usedmpaks, usedmpaks==1?"":"s", reqmpak);
if(usedmpaks>0) conoutf("this map requires the following %d mediapack%s: %s", usedmpaks, usedmpaks==1?"":"s", reqmpak);
else conoutf("this map does not appear to use any mediapacks.");
enumeratek(mufpaths, const char *, key, mufpaths.remove(key)); // don't report false positives next time round
}
COMMAND(checkmapdependencies, ARG_NONE);
void wrapCMD(int i) { checkmapdependencies(false, i!=0); }
//COMMAND(checkmapdependencies, ARG_NONE); // for some reason this still results in silent==true - WTF? It used to work with the _proper_ default.
COMMANDN(checkmapdependencies, wrapCMD, ARG_1INT);
void save_world(char *mname)
{
@@ -500,7 +505,11 @@ bool load_world(char *mname) // still supports all map formats that have
if(hdr.version<7) hdr.mediareq[0] = '\0';
else
{
if(hdr.mediareq[0]) conoutf("this map requires the following mediapacks: %s", hdr.mediareq); // TODO: check for client meeting these requirements - hint: listfiles
if(hdr.mediareq[0])
{
conoutf("this map requires the following mediapacks: %s", hdr.mediareq); // TODO: check for client meeting these requirements - hint: listfiles
conoutf("to get a set of URLs to download them please run \f2checkmapdependencies\f5 manually.");
}
//else conoutf("this map works with the vanilla release");
// TODO: output the requirements into a file for easy user-retrieval & -action - needs a base-URL where we will hold the mediapacks
}