From 2c2adee5e9d6cfa4411aede1fb1852cdb67d6dc4 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Fri, 27 Jan 2012 15:03:18 +0000 Subject: [PATCH] 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 --- polymer/eduke32/build/src/defs.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/polymer/eduke32/build/src/defs.c b/polymer/eduke32/build/src/defs.c index 6d77d3de7..f49b3e537 100644 --- a/polymer/eduke32/build/src/defs.c +++ b/polymer/eduke32/build/src/defs.c @@ -176,9 +176,7 @@ static int32_t defsparser(scriptfile *script) { "tile", T_TEXTURE }, { "music", T_MUSIC }, { "sound", T_SOUND }, -#ifdef USE_LIBVPX { "animsounds", T_ANIMSOUNDS }, // dummy -#endif // other stuff { "undefmodel", T_UNDEFMODEL }, { "undefmodelrange", T_UNDEFMODELRANGE }, @@ -757,7 +755,9 @@ static int32_t defsparser(scriptfile *script) if (lastmodelid < 0) { +#ifdef USE_OPENGL initprintf("Warning: Ignoring frame definition.\n"); +#endif break; } #ifdef USE_OPENGL @@ -798,7 +798,9 @@ static int32_t defsparser(scriptfile *script) if (lastmodelid < 0) { +#ifdef USE_OPENGL initprintf("Warning: Ignoring animation definition.\n"); +#endif break; } #ifdef USE_OPENGL @@ -1041,7 +1043,9 @@ static int32_t defsparser(scriptfile *script) if (lastmodelid < 0) { +#ifdef USE_OPENGL initprintf("Warning: Ignoring frame definition.\n"); +#endif break; } #ifdef USE_OPENGL @@ -1111,7 +1115,9 @@ static int32_t defsparser(scriptfile *script) if (lastmodelid < 0) { +#ifdef USE_OPENGL initprintf("Warning: Ignoring animation definition.\n"); +#endif break; } #ifdef USE_OPENGL @@ -1303,7 +1309,9 @@ static int32_t defsparser(scriptfile *script) if (lastmodelid < 0) { +#ifdef USE_OPENGL initprintf("Warning: Ignoring frame definition.\n"); +#endif break; } #ifdef USE_OPENGL @@ -1967,7 +1975,6 @@ static int32_t defsparser(scriptfile *script) } break; -#ifdef USE_LIBVPX case T_ANIMSOUNDS: { char *dummy; @@ -1983,7 +1990,6 @@ static int32_t defsparser(scriptfile *script) } } break; -#endif case T_SOUND: case T_MUSIC: