mirror of
https://github.com/nzp-team/fteqw.git
synced 2024-12-02 08:31:55 +00:00
Loading textures with empty names will now fail.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1967 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
8fe69738c5
commit
90669f5d8d
1 changed files with 6 additions and 2 deletions
|
@ -100,6 +100,9 @@ int VARGS Plug_Draw_LoadImage(void *offset, unsigned int mask, const long *arg)
|
||||||
|
|
||||||
mpic_t *pic;
|
mpic_t *pic;
|
||||||
|
|
||||||
|
if (!*name)
|
||||||
|
return 0;
|
||||||
|
|
||||||
for (i = 0; i < pluginimagearraylen; i++)
|
for (i = 0; i < pluginimagearraylen; i++)
|
||||||
{
|
{
|
||||||
if (!pluginimagearray[i].plugin)
|
if (!pluginimagearray[i].plugin)
|
||||||
|
@ -140,7 +143,7 @@ int VARGS Plug_Draw_LoadImage(void *offset, unsigned int mask, const long *arg)
|
||||||
pluginimagearray[i].picfromwad = fromwad;
|
pluginimagearray[i].picfromwad = fromwad;
|
||||||
pluginimagearray[i].pic = pic;
|
pluginimagearray[i].pic = pic;
|
||||||
pluginimagearray[i].plugin = currentplug;
|
pluginimagearray[i].plugin = currentplug;
|
||||||
return i;
|
return i + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Plug_DrawReloadImages(void)
|
void Plug_DrawReloadImages(void)
|
||||||
|
@ -190,8 +193,9 @@ int VARGS Plug_Draw_Image(void *offset, unsigned int mask, const long *arg)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
i = VM_LONG(arg[8]);
|
i = VM_LONG(arg[8]);
|
||||||
if (i < 0 || i >= pluginimagearraylen)
|
if (i <= 0 || i > pluginimagearraylen)
|
||||||
return -1; // you fool
|
return -1; // you fool
|
||||||
|
i = i - 1;
|
||||||
if (pluginimagearray[i].plugin != currentplug)
|
if (pluginimagearray[i].plugin != currentplug)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue