zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 03:00:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix a couple of issues that cropped up after some of the previous OSD refactoring commits

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7166 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-11-18 18:07:20 +00:00
parent 369c671632
commit 0c74991a21
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/build/src/osd.cpp
View file

@ -178,7 +178,7 @@ int OSD_Exec(const char *szScript)
if (err || kread(handle, buf, len) != len) if (err || kread(handle, buf, len) != len)
{ {
if (err != 2) // no error message for blank file if (!err) // no error message for blank file
OSD_Printf("Error executing \"%s\"!\n", szScript); OSD_Printf("Error executing \"%s\"!\n", szScript);
if (handle != -1) if (handle != -1)
@ -421,7 +421,7 @@ static int osdfunc_alias(osdcmdptr_t parm)
for (auto &symb : osd->symbptrs) for (auto &symb : osd->symbptrs)
{ {
if (!symb->func || !symb->name) if (symb == NULL)
break; break;
else if (symb->func == OSD_ALIAS) else if (symb->func == OSD_ALIAS)
{ {
@ -438,7 +438,7 @@ static int osdfunc_alias(osdcmdptr_t parm)
for (auto &symb : osd->symbptrs) for (auto &symb : osd->symbptrs)
{ {
if (!symb->func || !symb->name) if (symb == NULL)
break; break;
else if (!Bstrcasecmp(parm->parms[0], symb->name)) else if (!Bstrcasecmp(parm->parms[0], symb->name))
{ {
@ -2001,7 +2001,8 @@ static osdsymbol_t *osd_addsymbol(const char *pszName)
// //
static osdsymbol_t * osd_findsymbol(const char * const pszName, osdsymbol_t *pSymbol) static osdsymbol_t * osd_findsymbol(const char * const pszName, osdsymbol_t *pSymbol)
{ {
Bassert(osd->symbols != NULL); if (osd->symbols == NULL)
return NULL;
if (!pSymbol) pSymbol = osd->symbols; if (!pSymbol) pSymbol = osd->symbols;
@ -2021,7 +2022,8 @@ static osdsymbol_t * osd_findsymbol(const char * const pszName, osdsymbol_t *pSy
// //
static osdsymbol_t * osd_findexactsymbol(const char *pszName) static osdsymbol_t * osd_findexactsymbol(const char *pszName)
{ {
Bassert(osd->symbols != NULL); if (osd->symbols == NULL)
return NULL;
int symbolNum = hash_find(&h_osd, pszName); int symbolNum = hash_find(&h_osd, pszName);
@ -2180,7 +2182,9 @@ void OSD_WriteAliases(FILE *fp)
for (auto &symb : osd->symbptrs) for (auto &symb : osd->symbptrs)
{ {
if (symb->func == (void *)OSD_ALIAS) if (symb == NULL)
break;
else if (symb->func == (void *)OSD_ALIAS)
Bfprintf(fp, "alias \"%s\" \"%s\"\n", symb->name, symb->help); Bfprintf(fp, "alias \"%s\" \"%s\"\n", symb->name, symb->help);
} }
} }