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

misc. changes

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6056 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
flowtron
2011-02-05 09:44:07 +00:00
parent 574947fd40
commit 53c35f4fd8
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/protocol.cpp
+1 -1
View File
@@ -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"; }
source/src/protos.h
+4 -2
View File
@@ -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;