made darkplaces able to compile as C++ again, and fixed all conversion warnings when...

[xonotic/darkplaces.git] / world_cs.c

diff --git a/world_cs.c b/world_cs.c
index f6e6e131dab339da217a7c58c3a2bfd503a8c7d9..c71d2e87d72b38e1cf61afa067c36bc4522c37bd 100644 (file)
--- a/world_cs.c
+++ b/world_cs.c
@@ -322,7 +322,7 @@ void CSSV_LinkEdict (prvm_edict_t *ent, qboolean touch_triggers)
 
        if (ent->fields.client->solid == SOLID_BSP)
        {
-               int modelindex = ent->fields.client->modelindex;
+               int modelindex = (int)ent->fields.client->modelindex;
                if (modelindex < 0 || modelindex > MAX_MODELS)
                {
                        Con_Printf("edict %i: SOLID_BSP with invalid modelindex!\n", PRVM_NUM_FOR_EDICT(ent));
@@ -450,7 +450,7 @@ trace_t CSSV_ClipMoveToEntity(prvm_edict_t *ent, const vec3_t start, const vec3_
 
        if ((int) ent->fields.client->solid == SOLID_BSP || movetype == MOVE_HITMODEL)
        {
-               unsigned int modelindex = ent->fields.client->modelindex;
+               unsigned int modelindex = (unsigned int)ent->fields.client->modelindex;
                // if the modelindex is 0, it shouldn't be SOLID_BSP!
                if (modelindex == 0)
                {