From: havoc Date: Sat, 5 May 2012 21:29:07 +0000 (+0000) Subject: fix some int to bool conversion warnings on MSVS2008 X-Git-Tag: xonotic-v0.8.0~96^2~223 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=88d4c4d84085d0cf1defffd4b4262a66a88151db;p=xonotic%2Fdarkplaces.git fix some int to bool conversion warnings on MSVS2008 git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11815 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/model_alias.c b/model_alias.c index ada6604d..17d486dc 100644 --- a/model_alias.c +++ b/model_alias.c @@ -1214,7 +1214,7 @@ void Mod_IDP0_Load(dp_model_t *mod, void *buffer, void *bufferend) loadmodel->surfmesh.isanimated = loadmodel->numframes > 1 || (loadmodel->animscenes && loadmodel->animscenes[0].framecount > 1); if(mod_alias_force_animated.string[0]) - loadmodel->surfmesh.isanimated = mod_alias_force_animated.integer; + loadmodel->surfmesh.isanimated = mod_alias_force_animated.integer != 0; loadmodel->AnimateVertices = loadmodel->surfmesh.isanimated ? Mod_MDL_AnimateVertices : NULL; if (!loadmodel->surfmesh.isanimated) @@ -1475,7 +1475,7 @@ void Mod_IDP2_Load(dp_model_t *mod, void *buffer, void *bufferend) loadmodel->surfmesh.isanimated = loadmodel->numframes > 1 || (loadmodel->animscenes && loadmodel->animscenes[0].framecount > 1); if(mod_alias_force_animated.string[0]) - loadmodel->surfmesh.isanimated = mod_alias_force_animated.integer; + loadmodel->surfmesh.isanimated = mod_alias_force_animated.integer != 0; loadmodel->AnimateVertices = Mod_MDL_AnimateVertices; // needed during loading, may be cleared by code later in this function if (loadmodel->surfmesh.data_neighbor3i) Mod_BuildTriangleNeighbors(loadmodel->surfmesh.data_neighbor3i, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.num_triangles); @@ -1677,7 +1677,7 @@ void Mod_IDP3_Load(dp_model_t *mod, void *buffer, void *bufferend) loadmodel->surfmesh.data_element3s[i] = loadmodel->surfmesh.data_element3i[i]; loadmodel->surfmesh.isanimated = loadmodel->numframes > 1 || (loadmodel->animscenes && loadmodel->animscenes[0].framecount > 1); if(mod_alias_force_animated.string[0]) - loadmodel->surfmesh.isanimated = mod_alias_force_animated.integer; + loadmodel->surfmesh.isanimated = mod_alias_force_animated.integer != 0; loadmodel->AnimateVertices = Mod_MD3_AnimateVertices; // needed during loading, may be cleared by code later in this function if (loadmodel->surfmesh.data_neighbor3i) Mod_BuildTriangleNeighbors(loadmodel->surfmesh.data_neighbor3i, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.num_triangles); @@ -1883,7 +1883,7 @@ void Mod_ZYMOTICMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) loadmodel->surfmesh.isanimated = loadmodel->num_bones > 1 || loadmodel->numframes > 1 || (loadmodel->animscenes && loadmodel->animscenes[0].framecount > 1); if(mod_alias_force_animated.string[0]) - loadmodel->surfmesh.isanimated = mod_alias_force_animated.integer; + loadmodel->surfmesh.isanimated = mod_alias_force_animated.integer != 0; loadmodel->AnimateVertices = loadmodel->surfmesh.isanimated ? Mod_Skeletal_AnimateVertices : NULL; loadmodel->nummodelsurfaces = loadmodel->num_surfaces; loadmodel->num_textures = loadmodel->num_surfaces * loadmodel->numskins; @@ -2206,7 +2206,7 @@ void Mod_DARKPLACESMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) loadmodel->num_texturesperskin = loadmodel->num_surfaces; loadmodel->surfmesh.isanimated = loadmodel->num_bones > 1 || loadmodel->numframes > 1 || (loadmodel->animscenes && loadmodel->animscenes[0].framecount > 1); if(mod_alias_force_animated.string[0]) - loadmodel->surfmesh.isanimated = mod_alias_force_animated.integer; + loadmodel->surfmesh.isanimated = mod_alias_force_animated.integer != 0; loadmodel->AnimateVertices = loadmodel->surfmesh.isanimated ? Mod_Skeletal_AnimateVertices : NULL; // do most allocations as one merged chunk data = (unsigned char *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int) + loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t) + meshtriangles * sizeof(int[3]) + (meshvertices <= 65536 ? meshtriangles * sizeof(unsigned short[3]) : 0) + (r_enableshadowvolumes.integer ? meshtriangles * sizeof(int[3]) : 0) + meshvertices * (sizeof(float[14]) + sizeof(unsigned short)) + loadmodel->num_poses * loadmodel->num_bones * sizeof(short[7]) + loadmodel->num_bones * sizeof(float[12]) + loadmodel->numskins * sizeof(animscene_t) + loadmodel->num_bones * sizeof(aliasbone_t) + loadmodel->numframes * sizeof(animscene_t)); @@ -2863,7 +2863,7 @@ void Mod_PSKMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) loadmodel->surfmesh.num_triangles = meshtriangles; loadmodel->surfmesh.isanimated = loadmodel->num_bones > 1 || loadmodel->numframes > 1 || (loadmodel->animscenes && loadmodel->animscenes[0].framecount > 1); if(mod_alias_force_animated.string[0]) - loadmodel->surfmesh.isanimated = mod_alias_force_animated.integer; + loadmodel->surfmesh.isanimated = mod_alias_force_animated.integer != 0; loadmodel->AnimateVertices = loadmodel->surfmesh.isanimated ? Mod_Skeletal_AnimateVertices : NULL; // do most allocations as one merged chunk size = loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int) + loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t) + loadmodel->surfmesh.num_triangles * sizeof(int[3]) + (r_enableshadowvolumes.integer ? loadmodel->surfmesh.num_triangles * sizeof(int[3]) : 0) + loadmodel->surfmesh.num_vertices * sizeof(float[3]) + loadmodel->surfmesh.num_vertices * sizeof(float[3]) + loadmodel->surfmesh.num_vertices * sizeof(float[3]) + loadmodel->surfmesh.num_vertices * sizeof(float[3]) + loadmodel->surfmesh.num_vertices * sizeof(float[2]) + loadmodel->surfmesh.num_vertices * sizeof(unsigned short) + loadmodel->num_poses * loadmodel->num_bones * sizeof(short[7]) + loadmodel->num_bones * sizeof(float[12]) + loadmodel->numskins * sizeof(animscene_t) + loadmodel->num_bones * sizeof(aliasbone_t) + loadmodel->numframes * sizeof(animscene_t) + ((loadmodel->surfmesh.num_vertices <= 65536) ? (loadmodel->surfmesh.num_triangles * sizeof(unsigned short[3])) : 0); @@ -3489,7 +3489,7 @@ void Mod_INTERQUAKEMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) loadmodel->surfmesh.isanimated = loadmodel->num_bones > 1 || loadmodel->numframes > 1 || (loadmodel->animscenes && loadmodel->animscenes[0].framecount > 1); if(mod_alias_force_animated.string[0]) - loadmodel->surfmesh.isanimated = mod_alias_force_animated.integer; + loadmodel->surfmesh.isanimated = mod_alias_force_animated.integer != 0; loadmodel->AnimateVertices = loadmodel->surfmesh.isanimated ? Mod_Skeletal_AnimateVertices : NULL; biggestorigin = 0; diff --git a/model_brush.c b/model_brush.c index 7a15c8ac..5892cc09 100644 --- a/model_brush.c +++ b/model_brush.c @@ -3482,7 +3482,10 @@ static void Mod_Q1BSP_RecursiveNodePortals(mnode_t *node) side = 1; } else + { Host_Error("Mod_Q1BSP_RecursiveNodePortals: mislinked portal"); + side = 0; // hush warning + } for (i = 0;i < nodeportal->numpoints*3;i++) frontpoints[i] = nodeportal->points[i]; @@ -3515,7 +3518,10 @@ static void Mod_Q1BSP_RecursiveNodePortals(mnode_t *node) else if (portal->nodes[1] == node) side = 1; else + { Host_Error("Mod_Q1BSP_RecursiveNodePortals: mislinked portal"); + side = 0; // hush warning + } nextportal = portal->next[side]; if (!portal->numpoints) continue; diff --git a/view.c b/view.c index 851c57d1..16dbcf74 100644 --- a/view.c +++ b/view.c @@ -881,7 +881,7 @@ void V_CalcRefdef (void) ent = &cl.entities[cl.viewentity]; cldead = (cl.stats[STAT_HEALTH] <= 0 && cl.stats[STAT_HEALTH] != -666 && cl.stats[STAT_HEALTH] != -2342); - V_CalcRefdefUsing(&ent->render.matrix, cl.viewangles, !ent->persistent.trail_allowed, cl.onground, cl.cmd.jump, cl.stats[STAT_VIEWHEIGHT], cldead, cl.intermission, cl.velocity); // FIXME use a better way to detect teleport/warp than trail_allowed + V_CalcRefdefUsing(&ent->render.matrix, cl.viewangles, !ent->persistent.trail_allowed, cl.onground, cl.cmd.jump, cl.stats[STAT_VIEWHEIGHT], cldead, cl.intermission != 0, cl.velocity); // FIXME use a better way to detect teleport/warp than trail_allowed } else {