print filenames for errors in map and model config files
This commit is contained in:
@@ -830,6 +830,7 @@ COMMANDF(mapsound, "si", (char *name, int *maxuses)
|
||||
{
|
||||
conoutf("\f3error: too many mapsounds");
|
||||
flagmapconfigerror(LWW_CONFIGERR);
|
||||
scripterr();
|
||||
}
|
||||
else if(!strncmp(stripped, mapsoundbasepath, mapsoundbasepath_n))
|
||||
{
|
||||
@@ -846,6 +847,7 @@ COMMANDF(mapsound, "si", (char *name, int *maxuses)
|
||||
{
|
||||
conoutf("\f3error: mapsound \"%s\" outside packages/audio/", stripped);
|
||||
flagmapconfigerror(LWW_CONFIGERR);
|
||||
scripterr();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
|
||||
bool allowidentaccess(ident *id);
|
||||
char *exchangestr(char *o, const char *n) { delete[] o; return newstring(n); }
|
||||
void scripterr();
|
||||
|
||||
vector<const char *> executionstack; // keep history of recursive command execution (to write to log in case of a crash)
|
||||
vector<int> contextstack;
|
||||
@@ -15,7 +14,7 @@ int execcontext;
|
||||
char *commandret = NULL;
|
||||
|
||||
bool loop_break = false, loop_skip = false; // break or continue (skip) current loop
|
||||
int loop_level = 0; // avoid bad calls of break & continue
|
||||
int loop_level = 0; // avoid bad calls of break & continue
|
||||
|
||||
hashtable<const char *, ident> *idents = NULL; // contains ALL vars/commands/aliases
|
||||
|
||||
@@ -409,6 +408,7 @@ char *parseexp(const char *&p, int right) // parse any nested set of
|
||||
p--;
|
||||
conoutf("missing \"%c\"", right);
|
||||
scripterr();
|
||||
flagmapconfigerror(LWW_SCRIPTERR * 4);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
@@ -444,6 +444,7 @@ char *lookup(char *n) // find value of ident reference
|
||||
}
|
||||
conoutf("unknown alias lookup: %s", n+1);
|
||||
scripterr();
|
||||
flagmapconfigerror(LWW_SCRIPTERR * 4);
|
||||
return n;
|
||||
}
|
||||
|
||||
@@ -581,6 +582,7 @@ char *executeret(const char *p) // all evaluation hap
|
||||
{
|
||||
conoutf("unknown command: %s", c);
|
||||
scripterr();
|
||||
flagmapconfigerror(LWW_SCRIPTERR * 4);
|
||||
}
|
||||
setretval(newstring(c));
|
||||
}
|
||||
@@ -588,6 +590,7 @@ char *executeret(const char *p) // all evaluation hap
|
||||
{
|
||||
conoutf("not allowed in this execution context: %s", id->name);
|
||||
scripterr();
|
||||
flagmapconfigerror(LWW_SCRIPTERR * 4);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -981,7 +984,6 @@ void scripterr()
|
||||
{
|
||||
if(curcontext) conoutf("(%s: %s)", curcontext, curinfo);
|
||||
else conoutf("(from console or builtin)");
|
||||
flagmapconfigerror(LWW_SCRIPTERR * 4);
|
||||
}
|
||||
|
||||
void setcontext(const char *context, const char *info)
|
||||
|
||||
+9
-9
@@ -266,7 +266,7 @@ struct md2 : vertmodel
|
||||
formatstring(name2)("packages/models/%s/md2.cfg", pname);
|
||||
execfile(name2);
|
||||
}
|
||||
loadingmd2 = 0;
|
||||
loadingmd2 = NULL;
|
||||
loopv(parts) parts[i]->scaleverts(scale/16.0f, vec(translate.x, -translate.y, translate.z));
|
||||
radius = calcradius(zradius);
|
||||
if(shadowdist) calcneighbors();
|
||||
@@ -277,16 +277,16 @@ struct md2 : vertmodel
|
||||
|
||||
void md2anim(char *anim, int *frame, int *range, float *speed)
|
||||
{
|
||||
if(!loadingmd2 || loadingmd2->parts.empty()) { conoutf("not loading an md2"); flagmapconfigerror(LWW_MODELERR); return; }
|
||||
if(!loadingmd2 || loadingmd2->parts.empty()) { conoutf("not loading an md2"); flagmapconfigerror(LWW_MODELERR); scripterr(); return; }
|
||||
int num = findanim(anim);
|
||||
if(num<0) { conoutf("could not find animation %s", anim); flagmapconfigerror(LWW_MODELERR); return; }
|
||||
if(num<0) { conoutf("could not find animation %s", anim); flagmapconfigerror(LWW_MODELERR); scripterr(); return; }
|
||||
loadingmd2->parts.last()->setanim(num, *frame, *range, *speed);
|
||||
}
|
||||
COMMAND(md2anim, "siif");
|
||||
|
||||
void md2tag(char *name, char *vert1, char *vert2, char *vert3, char *vert4)
|
||||
{
|
||||
if(!loadingmd2 || loadingmd2->parts.empty()) { conoutf("not loading an md2"); flagmapconfigerror(LWW_MODELERR); return; }
|
||||
if(!loadingmd2 || loadingmd2->parts.empty()) { conoutf("not loading an md2"); flagmapconfigerror(LWW_MODELERR); scripterr(); return; }
|
||||
md2::part &mdl = *loadingmd2->parts.last();
|
||||
int indexes[4] = { -1, -1, -1, -1 }, numverts = 0;
|
||||
loopi(4)
|
||||
@@ -317,19 +317,19 @@ void md2tag(char *name, char *vert1, char *vert2, char *vert3, char *vert4)
|
||||
}
|
||||
if(!mdl.meshes.empty()) indexes[i] = mdl.meshes[0]->findvert(axis, dir);
|
||||
}
|
||||
if(indexes[i] < 0) { conoutf("could not find vertex %s", vert); flagmapconfigerror(LWW_MODELERR); return; }
|
||||
if(indexes[i] < 0) { conoutf("could not find vertex %s", vert); flagmapconfigerror(LWW_MODELERR); scripterr(); return; }
|
||||
numverts = i + 1;
|
||||
}
|
||||
if(!mdl.gentag(name, indexes, numverts)) { conoutf("could not generate tag %s", name); flagmapconfigerror(LWW_MODELERR); return; }
|
||||
if(!mdl.gentag(name, indexes, numverts)) { conoutf("could not generate tag %s", name); flagmapconfigerror(LWW_MODELERR); scripterr(); return; }
|
||||
}
|
||||
COMMAND(md2tag, "sssss");
|
||||
|
||||
void md2emit(char *tag, char *_type, int *arg1, int *arg2)
|
||||
{
|
||||
if(!loadingmd2 || loadingmd2->parts.empty()) { conoutf("not loading an md2"); flagmapconfigerror(LWW_MODELERR); return; };
|
||||
if(!loadingmd2 || loadingmd2->parts.empty()) { conoutf("not loading an md2"); flagmapconfigerror(LWW_MODELERR); scripterr(); return; };
|
||||
int type = getlistindex(_type, particletypenames, true, -1);
|
||||
if(type < 0 || type >= MAXPARTYPES) { conoutf("unknown particle type %s", _type); flagmapconfigerror(LWW_MODELERR); return; };
|
||||
if(type < 0 || type >= MAXPARTYPES) { conoutf("unknown particle type %s", _type); flagmapconfigerror(LWW_MODELERR); scripterr(); return; };
|
||||
md2::part &mdl = *loadingmd2->parts.last();
|
||||
if(!mdl.addemitter(tag, type, *arg1, *arg2)) { conoutf("could not find tag %s", tag); flagmapconfigerror(LWW_MODELERR); return; }
|
||||
if(!mdl.addemitter(tag, type, *arg1, *arg2)) { conoutf("could not find tag %s", tag); flagmapconfigerror(LWW_MODELERR); scripterr(); return; }
|
||||
}
|
||||
COMMAND(md2emit, "ssii");
|
||||
|
||||
+11
-10
@@ -253,21 +253,21 @@ struct md3 : vertmodel
|
||||
|
||||
void md3load(char *model)
|
||||
{
|
||||
if(!loadingmd3) { conoutf("not loading an md3"); flagmapconfigerror(LWW_MODELERR); return; };
|
||||
if(!loadingmd3) { conoutf("not loading an md3"); flagmapconfigerror(LWW_MODELERR); scripterr(); return; };
|
||||
filtertext(model, model, FTXT__MEDIAFILEPATH);
|
||||
defformatstring(filename)("%s/%s", md3dir, model);
|
||||
md3::md3part &mdl = *new md3::md3part;
|
||||
loadingmd3->parts.add(&mdl);
|
||||
mdl.model = loadingmd3;
|
||||
mdl.index = loadingmd3->parts.length()-1;
|
||||
if(!mdl.load(path(filename))) { conoutf("could not load %s", filename); flagmapconfigerror(LWW_MODELERR); } // ignore failure
|
||||
if(!mdl.load(path(filename))) { conoutf("could not load %s", filename); flagmapconfigerror(LWW_MODELERR); scripterr(); } // ignore failure
|
||||
}
|
||||
COMMAND(md3load, "s");
|
||||
|
||||
void md3skin(char *objname, char *skin)
|
||||
{
|
||||
filtertext(skin, skin, FTXT__MEDIAFILEPATH);
|
||||
if(!loadingmd3 || loadingmd3->parts.empty()) { conoutf("not loading an md3"); flagmapconfigerror(LWW_MODELERR); return; };
|
||||
if(!loadingmd3 || loadingmd3->parts.empty()) { conoutf("not loading an md3"); flagmapconfigerror(LWW_MODELERR); scripterr(); return; };
|
||||
md3::part &mdl = *loadingmd3->parts.last();
|
||||
bool used = false;
|
||||
loopv(mdl.meshes)
|
||||
@@ -286,15 +286,16 @@ void md3skin(char *objname, char *skin)
|
||||
loopv(mdl.meshes) concatformatstring(s, "|%s", mdl.meshes[i]->name);
|
||||
conoutf("mesh \"%s\" not found in model %s, skin %s not loaded%s", objname, loadingmd3->loadname, skin, mdl.meshes.length() ? s : "");
|
||||
flagmapconfigerror(LWW_MODELERR);
|
||||
scripterr();
|
||||
}
|
||||
}
|
||||
COMMAND(md3skin, "ss");
|
||||
|
||||
void md3anim(char *anim, int *startframe, int *range, float *speed)
|
||||
{
|
||||
if(!loadingmd3 || loadingmd3->parts.empty()) { conoutf("not loading an md3"); flagmapconfigerror(LWW_MODELERR); return; };
|
||||
if(!loadingmd3 || loadingmd3->parts.empty()) { conoutf("not loading an md3"); flagmapconfigerror(LWW_MODELERR); scripterr(); return; };
|
||||
int num = findanim(anim);
|
||||
if(num<0) { conoutf("could not find animation %s", anim); flagmapconfigerror(LWW_MODELERR); return; };
|
||||
if(num<0) { conoutf("could not find animation %s", anim); flagmapconfigerror(LWW_MODELERR); scripterr(); return; };
|
||||
loadingmd3->parts.last()->setanim(num, *startframe, *range, *speed);
|
||||
}
|
||||
COMMAND(md3anim, "siif");
|
||||
@@ -302,17 +303,17 @@ COMMAND(md3anim, "siif");
|
||||
void md3link(int *parent, int *child, char *tagname)
|
||||
{
|
||||
if(!loadingmd3) { conoutf("not loading an md3"); return; };
|
||||
if(!loadingmd3->parts.inrange(*parent) || !loadingmd3->parts.inrange(*child)) { conoutf("no models loaded to link"); flagmapconfigerror(LWW_MODELERR); return; }
|
||||
if(!loadingmd3->parts[*parent]->link(loadingmd3->parts[*child], tagname)) { conoutf("could not link model %s", loadingmd3->loadname); flagmapconfigerror(LWW_MODELERR); }
|
||||
if(!loadingmd3->parts.inrange(*parent) || !loadingmd3->parts.inrange(*child)) { conoutf("no models loaded to link"); flagmapconfigerror(LWW_MODELERR); scripterr(); return; }
|
||||
if(!loadingmd3->parts[*parent]->link(loadingmd3->parts[*child], tagname)) { conoutf("could not link model %s", loadingmd3->loadname); flagmapconfigerror(LWW_MODELERR); scripterr(); }
|
||||
}
|
||||
COMMAND(md3link, "iis");
|
||||
|
||||
void md3emit(char *tag, char *_type, int *arg1, int *arg2)
|
||||
{
|
||||
if(!loadingmd3 || loadingmd3->parts.empty()) { conoutf("not loading an md3"); flagmapconfigerror(LWW_MODELERR); return; };
|
||||
if(!loadingmd3 || loadingmd3->parts.empty()) { conoutf("not loading an md3"); flagmapconfigerror(LWW_MODELERR); scripterr(); return; };
|
||||
int type = getlistindex(_type, particletypenames, true, -1);
|
||||
if(type < 0 || type >= MAXPARTYPES) { conoutf("unknown particle type %s", _type); flagmapconfigerror(LWW_MODELERR); return; };
|
||||
if(type < 0 || type >= MAXPARTYPES) { conoutf("unknown particle type %s", _type); flagmapconfigerror(LWW_MODELERR); scripterr(); return; };
|
||||
md3::part &mdl = *loadingmd3->parts.last();
|
||||
if(!mdl.addemitter(tag, type, *arg1, *arg2)) { conoutf("could not find tag %s", tag); flagmapconfigerror(LWW_MODELERR); return; }
|
||||
if(!mdl.addemitter(tag, type, *arg1, *arg2)) { conoutf("could not find tag %s", tag); flagmapconfigerror(LWW_MODELERR); scripterr(); return; }
|
||||
}
|
||||
COMMAND(md3emit, "ssii");
|
||||
|
||||
@@ -1031,6 +1031,7 @@ extern int curscontext();
|
||||
extern const char *escapestring(const char *s, bool force = true, bool noquotes = false);
|
||||
extern int execcontext;
|
||||
extern const char *currentserver(int i);
|
||||
extern void scripterr();
|
||||
extern void setcontext(const char *context, const char *info);
|
||||
extern void resetcontext();
|
||||
extern void dumpexecutionstack(stream *f);
|
||||
|
||||
@@ -11,7 +11,7 @@ mapmodelattributes loadingattributes;
|
||||
#include "md2.h"
|
||||
#include "md3.h"
|
||||
|
||||
#define checkmdl if(!loadingmodel) { conoutf("not loading a model"); flagmapconfigerror(LWW_MODELERR); return; }
|
||||
#define checkmdl if(!loadingmodel) { conoutf("not loading a model"); flagmapconfigerror(LWW_MODELERR); scripterr(); return; }
|
||||
|
||||
void mdlcullface(int *cullface)
|
||||
{
|
||||
@@ -113,7 +113,7 @@ void mapmodel(int *rad, int *h, int *zoff, char *scale, char *name, char *flags)
|
||||
{
|
||||
if(*scale && *name) // ignore "mapmodel" commands with insufficient parameters
|
||||
{
|
||||
if(!_ignoreillegalpaths && !strchr(name, '/') && !strchr(name, '\\')) flagmapconfigerror(LWW_CONFIGERR * 2); // throw errors for unconverted mapmodels (unspecific, because not all get detected)
|
||||
if(!_ignoreillegalpaths && !strchr(name, '/') && !strchr(name, '\\')) { flagmapconfigerror(LWW_CONFIGERR * 2); scripterr(); } // throw errors for unconverted mapmodels (unspecific, because not all get detected)
|
||||
intret(mapmodels.length());
|
||||
mapmodelinfo &mmi = mapmodels.add();
|
||||
mmi.rad = *rad;
|
||||
@@ -125,7 +125,7 @@ void mapmodel(int *rad, int *h, int *zoff, char *scale, char *name, char *flags)
|
||||
if(mmi.scale < 0.25f || mmi.scale > 4.0f)
|
||||
{
|
||||
mmi.scale = 1.0f;
|
||||
if(strcmp(scale, "0")) flagmapconfigerror(LWW_CONFIGERR * 2);
|
||||
if(strcmp(scale, "0")) { flagmapconfigerror(LWW_CONFIGERR * 2); scripterr(); }
|
||||
}
|
||||
mmi.m = NULL;
|
||||
|
||||
@@ -134,7 +134,7 @@ void mapmodel(int *rad, int *h, int *zoff, char *scale, char *name, char *flags)
|
||||
mapmodelchanged = 1;
|
||||
flagmapconfigchange();
|
||||
}
|
||||
else flagmapconfigerror(LWW_CONFIGERR * 2);
|
||||
else { flagmapconfigerror(LWW_CONFIGERR * 2); scripterr(); }
|
||||
}
|
||||
COMMAND(mapmodel, "iiisss");
|
||||
|
||||
|
||||
@@ -468,7 +468,7 @@ void checktexturefilename(const char *name)
|
||||
if(execcontext == IEXC_MAPCFG && strstr(name, "map_editor"))
|
||||
{
|
||||
conoutf("\f3bad texture: %s", name);
|
||||
if(!_ignoreillegalpaths) flagmapconfigerror(LWW_CONFIGERR * 4);
|
||||
if(!_ignoreillegalpaths) { flagmapconfigerror(LWW_CONFIGERR * 4); scripterr(); }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -481,6 +481,7 @@ COMMANDF(texture, "fs", (float *scale, char *name)
|
||||
{
|
||||
conoutf("\f3texture slot #%d \"%s\" error: scale factor %.7g out of range 0..4", slots.length() - 1, name, *scale);
|
||||
flagmapconfigerror(LWW_CONFIGERR * 4);
|
||||
scripterr();
|
||||
}
|
||||
checktexturefilename(name);
|
||||
flagmapconfigchange();
|
||||
@@ -591,7 +592,7 @@ void loadnotexture(char *c)
|
||||
filtertext(mapconfigdata.notexturename, c, FTXT__MEDIAFILEPATH);
|
||||
defformatstring(p)("packages/textures/%s", mapconfigdata.notexturename);
|
||||
noworldtexture = textureload(p);
|
||||
if(noworldtexture==notexture) { conoutf("could not load alternative texture '%s'.", p); flagmapconfigerror(LWW_CONFIGERR * 8); }
|
||||
if(noworldtexture==notexture) { conoutf("could not load alternative texture '%s'.", p); flagmapconfigerror(LWW_CONFIGERR * 8); scripterr(); }
|
||||
}
|
||||
flagmapconfigchange();
|
||||
}
|
||||
|
||||
@@ -951,7 +951,7 @@ struct vertmodel : model
|
||||
{
|
||||
if(frame<0 || frame>=numframes || range<=0 || frame+range>numframes)
|
||||
{
|
||||
conoutf("invalid frame %d, range %d in model %s", frame, range, model->loadname);
|
||||
conoutf("mdanim: invalid frame %d, range %d in model %s", frame, range, model->loadname);
|
||||
return;
|
||||
}
|
||||
if(!anims) anims = new vector<animinfo>[NUMANIMS];
|
||||
|
||||
Reference in New Issue
Block a user