Two tweaks for USE_OPENGL=0 builds.

- Always parse 'animsounds' defs
- don't print "ignored frame/animation definition" warnings

git-svn-id: https://svn.eduke32.com/eduke32@2288 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-01-27 15:03:18 +00:00
parent de2cbbfb47
commit 2c2adee5e9

View file

@ -176,9 +176,7 @@ static int32_t defsparser(scriptfile *script)
{ "tile", T_TEXTURE }, { "tile", T_TEXTURE },
{ "music", T_MUSIC }, { "music", T_MUSIC },
{ "sound", T_SOUND }, { "sound", T_SOUND },
#ifdef USE_LIBVPX
{ "animsounds", T_ANIMSOUNDS }, // dummy { "animsounds", T_ANIMSOUNDS }, // dummy
#endif
// other stuff // other stuff
{ "undefmodel", T_UNDEFMODEL }, { "undefmodel", T_UNDEFMODEL },
{ "undefmodelrange", T_UNDEFMODELRANGE }, { "undefmodelrange", T_UNDEFMODELRANGE },
@ -757,7 +755,9 @@ static int32_t defsparser(scriptfile *script)
if (lastmodelid < 0) if (lastmodelid < 0)
{ {
#ifdef USE_OPENGL
initprintf("Warning: Ignoring frame definition.\n"); initprintf("Warning: Ignoring frame definition.\n");
#endif
break; break;
} }
#ifdef USE_OPENGL #ifdef USE_OPENGL
@ -798,7 +798,9 @@ static int32_t defsparser(scriptfile *script)
if (lastmodelid < 0) if (lastmodelid < 0)
{ {
#ifdef USE_OPENGL
initprintf("Warning: Ignoring animation definition.\n"); initprintf("Warning: Ignoring animation definition.\n");
#endif
break; break;
} }
#ifdef USE_OPENGL #ifdef USE_OPENGL
@ -1041,7 +1043,9 @@ static int32_t defsparser(scriptfile *script)
if (lastmodelid < 0) if (lastmodelid < 0)
{ {
#ifdef USE_OPENGL
initprintf("Warning: Ignoring frame definition.\n"); initprintf("Warning: Ignoring frame definition.\n");
#endif
break; break;
} }
#ifdef USE_OPENGL #ifdef USE_OPENGL
@ -1111,7 +1115,9 @@ static int32_t defsparser(scriptfile *script)
if (lastmodelid < 0) if (lastmodelid < 0)
{ {
#ifdef USE_OPENGL
initprintf("Warning: Ignoring animation definition.\n"); initprintf("Warning: Ignoring animation definition.\n");
#endif
break; break;
} }
#ifdef USE_OPENGL #ifdef USE_OPENGL
@ -1303,7 +1309,9 @@ static int32_t defsparser(scriptfile *script)
if (lastmodelid < 0) if (lastmodelid < 0)
{ {
#ifdef USE_OPENGL
initprintf("Warning: Ignoring frame definition.\n"); initprintf("Warning: Ignoring frame definition.\n");
#endif
break; break;
} }
#ifdef USE_OPENGL #ifdef USE_OPENGL
@ -1967,7 +1975,6 @@ static int32_t defsparser(scriptfile *script)
} }
break; break;
#ifdef USE_LIBVPX
case T_ANIMSOUNDS: case T_ANIMSOUNDS:
{ {
char *dummy; char *dummy;
@ -1983,7 +1990,6 @@ static int32_t defsparser(scriptfile *script)
} }
} }
break; break;
#endif
case T_SOUND: case T_SOUND:
case T_MUSIC: case T_MUSIC: