]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
cast to etype_t to avoid g++ compiler errors
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sat, 12 Jan 2013 01:50:07 +0000 (01:50 +0000)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 13 Jan 2013 20:13:55 +0000 (21:13 +0100)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11879 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=d6bd857e29e3a35c79f9002db0451a1a91413d35

prvm_edict.c

index 2c60372bb34c832717bf299552dc33a5a224054e..191197f5fed5ae1c49b591b8d9496a90028a9332 100644 (file)
@@ -2718,7 +2718,7 @@ static void PRVM_UpdateBreakpoints(prvm_prog_t *prog)
                {
                        size_t sz = sizeof(prvm_vec_t) * ((global->type  & ~DEF_SAVEGLOBAL) == ev_vector ? 3 : 1);
                        prog->watch_global = global->ofs;
-                       prog->watch_global_type = global->type;
+                       prog->watch_global_type = (etype_t)global->type;
                        memcpy(&prog->watch_global_value, PRVM_GLOBALFIELDVALUE(prog->watch_global), sz);
                }
                if (prog->watch_global_type != ev_void)
@@ -2740,7 +2740,7 @@ static void PRVM_UpdateBreakpoints(prvm_prog_t *prog)
                        size_t sz = sizeof(prvm_vec_t) * ((field->type & ~DEF_SAVEGLOBAL) == ev_vector ? 3 : 1);
                        prog->watch_edict = debug->watch_edict;
                        prog->watch_field = field->ofs;
-                       prog->watch_field_type = field->type;
+                       prog->watch_field_type = (etype_t)field->type;
                        if (prog->watch_edict < prog->num_edicts)
                                memcpy(&prog->watch_edictfield_value, PRVM_EDICTFIELDVALUE(PRVM_EDICT_NUM(prog->watch_edict), prog->watch_field), sz);
                        else