From: havoc Date: Sat, 12 Jan 2013 01:50:07 +0000 (+0000) Subject: cast to etype_t to avoid g++ compiler errors X-Git-Tag: xonotic-v0.8.0~96^2~159 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d6bd857e29e3a35c79f9002db0451a1a91413d35;p=xonotic%2Fdarkplaces.git cast to etype_t to avoid g++ compiler errors git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11879 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/prvm_edict.c b/prvm_edict.c index 2c60372b..191197f5 100644 --- a/prvm_edict.c +++ b/prvm_edict.c @@ -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