From 3e8cbd0ede462753431e4480eb786e5b3051cd4f Mon Sep 17 00:00:00 2001 From: havoc Date: Thu, 26 Jun 2008 02:35:36 +0000 Subject: [PATCH] fix two warnings git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8376 d7cf8633-e32d-0410-b094-e92efae38249 --- model_brush.c | 2 +- model_shared.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/model_brush.c b/model_brush.c index 45709d22..0f3f6024 100644 --- a/model_brush.c +++ b/model_brush.c @@ -2402,7 +2402,7 @@ static void Mod_Q1BSP_LoadFaces(lump_t *l) for (surfacenum = 0, surface = loadmodel->data_surfaces;surfacenum < count;surfacenum++, surface++) { - int i, iu, iv, lightmapx, lightmapy; + int i, iu, iv, lightmapx = 0, lightmapy = 0; float u, v, ubase, vbase, uscale, vscale; smax = surface->lightmapinfo->extents[0] >> 4; diff --git a/model_shared.c b/model_shared.c index 1c01c497..f54b6da0 100644 --- a/model_shared.c +++ b/model_shared.c @@ -284,7 +284,7 @@ dp_model_t *Mod_LoadModel(dp_model_t *mod, qboolean crash, qboolean checkdisk, q else if (!memcmp(buf, "ZYMOTICMODEL", 12)) Mod_ZYMOTICMODEL_Load(mod, buf, bufend); else if (!memcmp(buf, "DARKPLACESMODEL", 16)) Mod_DARKPLACESMODEL_Load(mod, buf, bufend); else if (!memcmp(buf, "ACTRHEAD", 8)) Mod_PSKMODEL_Load(mod, buf, bufend); - else if (strlen(mod->name) >= 4 && !strcmp(mod->name - 4, ".map")) Mod_MAP_Load(mod, buf, bufend); + else if (strlen(mod->name) >= 4 && !strcmp(mod->name + strlen(mod->name) - 4, ".map")) Mod_MAP_Load(mod, buf, bufend); else if (num == BSPVERSION || num == 30) Mod_Q1BSP_Load(mod, buf, bufend); else Con_Printf("Mod_LoadModel: model \"%s\" is of unknown/unsupported type\n", mod->name); Mem_Free(buf); -- 2.39.2