mediapack updates : file-list update & URL output on "checkmapdependencies"
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
Binary file not shown.
@@ -193,8 +193,10 @@ packages/maps/official/preview/ac_douze.jpg
|
||||
packages/maps/official/preview/ac_elevation.jpg
|
||||
packages/maps/official/preview/ac_gothic.jpg
|
||||
packages/maps/official/preview/ac_iceroad.jpg
|
||||
packages/maps/official/preview/ac_ingress.jpg
|
||||
packages/maps/official/preview/ac_keller.jpg
|
||||
packages/maps/official/preview/ac_mines.jpg
|
||||
packages/maps/official/preview/ac_outpost.jpg
|
||||
packages/maps/official/preview/ac_power.jpg
|
||||
packages/maps/official/preview/ac_rattrap.jpg
|
||||
packages/maps/official/preview/ac_scaffold.jpg
|
||||
@@ -203,6 +205,7 @@ packages/maps/official/preview/ac_snow.jpg
|
||||
packages/maps/official/preview/ac_sunset.jpg
|
||||
packages/maps/official/preview/ac_toxic.jpg
|
||||
packages/maps/official/preview/ac_urban.jpg
|
||||
packages/maps/official/preview/ac_werk.jpg
|
||||
packages/misc/ALX_chars.png
|
||||
packages/misc/bargraphs.png
|
||||
packages/misc/base.png
|
||||
@@ -673,6 +676,61 @@ packages/textures/mitaman/zastrow/sub_doors512A16.jpg
|
||||
packages/textures/mitaman/zastrow/sub_doors512B05.jpg
|
||||
packages/textures/mitaman/zastrow/sub_window31.jpg
|
||||
packages/textures/mitaman/zastrow/sub_window33.jpg
|
||||
packages/textures/nieb/asphaltdamaged0043_1_l.jpg
|
||||
packages/textures/nieb/b10woods003.jpg
|
||||
packages/textures/nieb/b15walls031b.jpg
|
||||
packages/textures/nieb/b19walls261.jpg
|
||||
packages/textures/nieb/b2metals0052.jpg
|
||||
packages/textures/nieb/b2walls094.jpg
|
||||
packages/textures/nieb/b3_walls149.jpg
|
||||
packages/textures/nieb/b3_walls154.jpg
|
||||
packages/textures/nieb/b3_walls155.jpg
|
||||
packages/textures/nieb/b8walls007b.jpg
|
||||
packages/textures/nieb/brickolddirty0009.jpg
|
||||
packages/textures/nieb/brickolddirty0015.jpg
|
||||
packages/textures/nieb/brickround0047_6.jpg
|
||||
packages/textures/nieb/bricksmall0007.jpg
|
||||
packages/textures/nieb/bricksmall0060.jpg
|
||||
packages/textures/nieb/bricksmall0067.jpg
|
||||
packages/textures/nieb/bricksmall0073.jpg
|
||||
packages/textures/nieb/bricksmall0077.jpg
|
||||
packages/textures/nieb/bricksmall0201.jpg
|
||||
packages/textures/nieb/bricksmall0247.jpg
|
||||
packages/textures/nieb/bricksmalldirty0136.jpg
|
||||
packages/textures/nieb/concretebare0154_3.jpg
|
||||
packages/textures/nieb/doorsgarage0195.jpg
|
||||
packages/textures/nieb/doorsindustrial0183.jpg
|
||||
packages/textures/nieb/dsc20041018_154255_48.jpg
|
||||
packages/textures/nieb/dscf1764.jpg
|
||||
packages/textures/nieb/grass-dirt_1.jpg
|
||||
packages/textures/nieb/grass-dirt_2.jpg
|
||||
packages/textures/nieb/hedges0049_m.jpg
|
||||
packages/textures/nieb/img_0053.jpg
|
||||
packages/textures/nieb/img_0060.jpg
|
||||
packages/textures/nieb/img_0576.jpg
|
||||
packages/textures/nieb/img_0579.jpg
|
||||
packages/textures/nieb/metalcontainers0010.jpg
|
||||
packages/textures/nieb/metalcontainers0010-rotate.jpg
|
||||
packages/textures/nieb/metalcontainers0099.jpg
|
||||
packages/textures/nieb/pd-texture-bigstone-wall-2.jpg
|
||||
packages/textures/nieb/planksold0001.jpg
|
||||
packages/textures/nieb/planksold0002.jpg
|
||||
packages/textures/nieb/planksold0290.jpg
|
||||
packages/textures/nieb/plastercoloured0158.jpg
|
||||
packages/textures/nieb/rock_02.jpg
|
||||
packages/textures/nieb/rooftilesceramicold0031.jpg
|
||||
packages/textures/nieb/rooftilesceramicold0080_2.jpg
|
||||
packages/textures/nieb/rooftilesceramicold0080.jpg
|
||||
packages/textures/nieb/rooftilesceramicold0093_2.jpg
|
||||
packages/textures/nieb/rooftilesceramicold0093.jpg
|
||||
packages/textures/nieb/stone_rock_texture.jpg
|
||||
packages/textures/nieb/tt7020275_2.jpg
|
||||
packages/textures/nieb/tt7020275_in.jpg
|
||||
packages/textures/nieb/tt7020275.jpg
|
||||
packages/textures/nieb/tt7040134.jpg
|
||||
packages/textures/nieb/tt7040146.jpg
|
||||
packages/textures/nieb/various0353.jpg
|
||||
packages/textures/nieb/vents0076.jpg
|
||||
packages/textures/noctua/ground/asph01.jpg
|
||||
packages/textures/noctua/ground/asph02.jpg
|
||||
packages/textures/noctua/ground/asph03.jpg
|
||||
|
||||
+16
-7
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user