Unify the command and cvar flags, under the CF_ prefix.

[xonotic/darkplaces.git] / clvm_cmds.c

diff --git a/clvm_cmds.c b/clvm_cmds.c
index 68080dea377fbda6bb15c20f065d2b0664e1d9f7..c8c8123ba902adcb8745e195fce5b95242a87d1f 100644 (file)
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -1103,7 +1103,7 @@ static void VM_CL_R_AddDynamicLight (prvm_prog_t *prog)
        int pflags = PFLAGS_CORONA | PFLAGS_FULLDYNAMIC;
        float coronaintensity = 1;
        float coronasizescale = 0.25;
-       qboolean castshadow = true;
+       qbool castshadow = true;
        float ambientscale = 0;
        float diffusescale = 1;
        float specularscale = 1;
@@ -1362,7 +1362,7 @@ static void VM_CL_boxparticles (prvm_prog_t *prog)
        vec3_t origin_from, origin_to, dir_from, dir_to;
        float count;
        int flags;
-       qboolean istrail;
+       qbool istrail;
        float tintmins[4], tintmaxs[4], fade;
        VM_SAFEPARMCOUNTRANGE(7, 8, VM_CL_boxparticles);
 
@@ -1628,7 +1628,7 @@ static void VM_CL_registercmd (prvm_prog_t *prog)
 {
        VM_SAFEPARMCOUNT(1, VM_CL_registercmd);
        if(!Cmd_Exists(&cmd_client, PRVM_G_STRING(OFS_PARM0)))
-               Cmd_AddCommand(CMD_CLIENT, PRVM_G_STRING(OFS_PARM0), NULL, "console command created by QuakeC");
+               Cmd_AddCommand(CF_CLIENT, PRVM_G_STRING(OFS_PARM0), NULL, "console command created by QuakeC");
 }
 
 //#360 float() readbyte (EXT_CSQC)
@@ -2386,7 +2386,7 @@ int CL_GetPitchSign(prvm_prog_t *prog, prvm_edict_t *ent)
        return 1;
 }
 
-void CL_GetEntityMatrix (prvm_prog_t *prog, prvm_edict_t *ent, matrix4x4_t *out, qboolean viewmatrix)
+void CL_GetEntityMatrix (prvm_prog_t *prog, prvm_edict_t *ent, matrix4x4_t *out, qbool viewmatrix)
 {
        float scale;
        float pitchsign = 1;
@@ -2633,7 +2633,7 @@ static void VM_CL_gettaginfo (prvm_prog_t *prog)
 typedef struct vmparticletheme_s
 {
        unsigned short typeindex;
-       qboolean initialized;
+       qbool initialized;
        pblend_t blendmode;
        porientation_t orientation;
        int color1;
@@ -2649,7 +2649,7 @@ typedef struct vmparticletheme_s
        float liquidfriction;
        float originjitter;
        float velocityjitter;
-       qboolean qualityreduction;
+       qbool qualityreduction;
        float lifetime;
        float stretch;
        int staincolor1;
@@ -2667,8 +2667,8 @@ typedef struct vmparticletheme_s
 typedef struct vmparticlespawner_s
 {
        mempool_t                       *pool;
-       qboolean                        initialized;
-       qboolean                        verified;
+       qbool                   initialized;
+       qbool                   verified;
        vmparticletheme_t       *themes;
        int                                     max_themes;
 }vmparticlespawner_t;
@@ -3248,7 +3248,7 @@ static void VM_CL_GetEntity (prvm_prog_t *prog)
 // --blub
 static void VM_CL_R_RenderScene (prvm_prog_t *prog)
 {
-       qboolean ismain = r_refdef.view.ismain;
+       qbool ismain = r_refdef.view.ismain;
        double t = Sys_DirtyTime();
        VM_SAFEPARMCOUNT(0, VM_CL_R_RenderScene);
 
@@ -3291,7 +3291,7 @@ static void VM_CL_R_PolygonBegin (prvm_prog_t *prog)
 {
        const char *texname;
        int drawflags;
-       qboolean draw2d;
+       qbool draw2d;
        dp_model_t *mod;
 
        VM_SAFEPARMCOUNTRANGE(2, 3, VM_CL_R_PolygonBegin);
@@ -3361,8 +3361,8 @@ static void VM_CL_R_PolygonVertex (prvm_prog_t *prog)
 static void VM_CL_R_PolygonEnd (prvm_prog_t *prog)
 {
        int i;
-       qboolean hascolor;
-       qboolean hasalpha;
+       qbool hascolor;
+       qbool hasalpha;
        int e0 = 0, e1 = 0, e2 = 0;
        float *o;
        dp_model_t *mod = prog->polygonbegin_model;
@@ -3429,7 +3429,7 @@ is not a staircase.
 
 =============
 */
-static qboolean CL_CheckBottom (prvm_edict_t *ent)
+static qbool CL_CheckBottom (prvm_edict_t *ent)
 {
        prvm_prog_t *prog = CLVM_prog;
        vec3_t  mins, maxs, start, stop;
@@ -3498,7 +3498,7 @@ The move will be adjusted for slopes and stairs, but if the move isn't
 possible, no move is done and false is returned
 =============
 */
-static qboolean CL_movestep (prvm_edict_t *ent, vec3_t move, qboolean relink, qboolean noenemy, qboolean settrace)
+static qbool CL_movestep (prvm_edict_t *ent, vec3_t move, qbool relink, qbool noenemy, qbool settrace)
 {
        prvm_prog_t *prog = CLVM_prog;
        float           dz;
@@ -3628,7 +3628,7 @@ static void VM_CL_walkmove (prvm_prog_t *prog)
        vec3_t  move;
        mfunction_t     *oldf;
        int     oldself;
-       qboolean        settrace;
+       qbool   settrace;
 
        VM_SAFEPARMCOUNTRANGE(2, 3, VM_CL_walkmove);
 
@@ -4120,11 +4120,11 @@ static void VM_CL_V_CalcRefdef(prvm_prog_t *prog)
        matrix4x4_t entrendermatrix;
        vec3_t clviewangles;
        vec3_t clvelocity;
-       qboolean teleported;
-       qboolean clonground;
-       qboolean clcmdjump;
-       qboolean cldead;
-       qboolean clintermission;
+       qbool teleported;
+       qbool clonground;
+       qbool clcmdjump;
+       qbool cldead;
+       qbool clintermission;
        float clstatsviewheight;
        prvm_edict_t *ent;
        int flags;