diff --git a/source/src/protocol.cpp b/source/src/protocol.cpp index 46e57558..67ee369a 100644 --- a/source/src/protocol.cpp +++ b/source/src/protocol.cpp @@ -310,7 +310,7 @@ const char *voteerrors[] = { "voting is currently disabled", "there is already a const char *mmfullnames[] = { "open", "private", "match" }; const char *fullmodestr(int n) { return (n>=-1 && size_t(n+1) < sizeof(modefullnames)/sizeof(modefullnames[0])) ? modefullnames[n+1] : "unknown"; } -const char *acronymmodestr(int n) { return (n>=-1 && size_t(n+1) < sizeof(modeacronymnames)/sizeof(modeacronymnames[0])) ? modeacronymnames[n+1] : "n/a"; } +const char *acronymmodestr(int n) { return (n>=-1 && size_t(n+1) < sizeof(modeacronymnames)/sizeof(modeacronymnames[0])) ? modeacronymnames[n+1] : "UNK"; } // 'n/a' bad on *nix filesystem (demonameformat) const char *modestr(int n, bool acronyms) { return acronyms ? acronymmodestr (n) : fullmodestr(n); } const char *voteerrorstr(int n) { return (n>=0 && (size_t)n < sizeof(voteerrors)/sizeof(voteerrors[0])) ? voteerrors[n] : "unknown"; } const char *mmfullname(int n) { return (n>=0 && n < MM_NUM) ? mmfullnames[n] : "unknown"; } diff --git a/source/src/protos.h b/source/src/protos.h index a73c75cd..ad876d62 100644 --- a/source/src/protos.h +++ b/source/src/protos.h @@ -252,7 +252,7 @@ extern void gl_drawframe(int w, int h, float changelod, float curfps); extern void clearminimap(); extern void rendercursor(int x, int y, int w); extern void renderaboveheadicon(playerent *p); -extern void drawscope(); +extern void drawscope(bool preload = false); extern float dynfov(); extern void damageblend(int n); @@ -349,7 +349,8 @@ extern bool securemapcheck(const char *map, bool msg = true); extern void sendintro(); extern void getdemo(char *idx, char *dsp); extern void listdemos(); -// for AUTH: +extern const char *acronymmodestr(int n); +extern const char *fullmodestr(int n); extern bool tryauth(const char *desc); extern authkey *findauthkey(const char *desc); @@ -753,6 +754,7 @@ extern void pushscontext(int newcontext); extern int popscontext(); extern int curscontext(); extern int execcontext; +extern const char *currentserver(int i, bool internal = false); // 2011feb05:ft: exposed // server extern int modeacronyms;