fix two warnings

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8376 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/model_brush.c b/model_brush.c
index 45709d22c709ed487c3bc733f462b98ecf442aea..0f3f60247bfd5113a6506e08bb3360bfc7b14439 100644 (file)
--- 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 1c01c497491d287696eab7392752eb8f5f0f3d3f..f54b6da0de902b7d33c755b50d0601501e8cd9b8 100644 (file)
--- 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);