Fix texture names.

This commit is contained in:
Bill Currie 2010-09-27 20:53:52 +09:00
parent 530ed45655
commit 3e9f72ef37

View file

@ -67,6 +67,20 @@ unsigned badtex_d[] = {
qtexture_t badtex = qtexture_t badtex =
{ "notexture", 16, 16, NULL, badtex_d, {{0, 0, 255, 255}} }; { "notexture", 16, 16, NULL, badtex_d, {{0, 0, 255, 255}} };
void
CleanupName (const char *in, char *out)
{
int i;
for (i = 0; i < 16; i++) {
if (!in[i])
break;
out[i] = toupper (in[i]);
}
for ( ; i < 16; i++)
out[i] = 0;
}
/* /*
============== ==============
TEX_InitPalette TEX_InitPalette
@ -197,7 +211,7 @@ TEX_InitFromWad (char *path)
for (i = 1; i < wad->numlumps; i++, lumpinfo++) { for (i = 1; i < wad->numlumps; i++, lumpinfo++) {
if (lumpinfo->type != TYP_MIPTEX) if (lumpinfo->type != TYP_MIPTEX)
Sys_Error ("TEX_InitFromWad: %s is not a miptex!", lumpinfo->name); Sys_Error ("TEX_InitFromWad: %s is not a miptex!", lumpinfo->name);
// XXX CleanupName (lumpinfo->name,qtextures[tex_count].name); CleanupName (lumpinfo->name,qtextures[tex_count].name);
TEX_ImageFromMiptex (wad, lumpinfo); TEX_ImageFromMiptex (wad, lumpinfo);
} }
@ -216,14 +230,14 @@ TEX_NumForName
qtexture_t * qtexture_t *
TEX_ForName (char *name) TEX_ForName (char *name)
{ {
// XXX char newname[16]; char newname[16];
int i; int i;
qtexture_t *q; qtexture_t *q;
// XXX CleanupName (name, newname); CleanupName (name, newname);
for (i = 0, q = qtextures; i < tex_count; i++, q++) { for (i = 0, q = qtextures; i < tex_count; i++, q++) {
if (!strcmp (name, q->name)) if (!strcmp (newname, q->name))
return q; return q;
} }
@ -494,7 +508,7 @@ TEX_ForName (char *name)
int max; int max;
max =[textureList_i count]; max =[textureList_i count];
// XXX CleanupName(name,name); CleanupName(name,name);
for (i = 0; i < max; i++) { for (i = 0; i < max; i++) {
t =[textureList_i elementAt:i]; t =[textureList_i elementAt:i];
if (!strcmp (t->name, name)) { if (!strcmp (t->name, name)) {