From 738e8ca7ad2957186de4e37a3aafb14196e97b63 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Tue, 14 Oct 2008 03:21:53 +0000 Subject: [PATCH] - GCC warning removal. * This may or may not be a problem, but GCC warned that FStateDefinitions:: AddStateDefines() does not initialize def.FStateDefine::DefineFlags, so I fixed that. SVN r1262 (trunk) --- docs/rh-log.txt | 3 +++ src/CMakeLists.txt | 1 + src/p_states.cpp | 1 + src/sound/fmod_wrap.h | 2 +- src/thingdef/thingdef_properties.cpp | 2 +- src/win32/fb_ddraw.cpp | 2 +- 6 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 6de4707da..83a3ef993 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,7 @@ October 13, 2008 +- This may or may not be a problem, but GCC warned that FStateDefinitions:: + AddStateDefines() does not initialize def.FStateDefine::DefineFlags, so + I fixed that. - Fixed: The three-argument version of AActor::FindState() initialized a two-entry array for passing to the main FindState() routine, but did not actually pass it, passing the original primary label instead. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6efae63d2..d1bd7bd4c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -30,6 +30,7 @@ if( WIN32 ) set( FMOD_SEARCH_PATHS "C:/Program Files/FMOD SoundSystem/FMOD Programmers API ${WIN_TYPE}/api" "C:/Program Files (x86)/FMOD SoundSystem/FMOD Programmers API ${WIN_TYPE}/api" + "E:/Programs/Dev/FMOD/FMOD Programmers API ${WIN_TYPE}/api" "E:/Program Files (x86)/FMOD SoundSystem/FMOD Programmers API ${WIN_TYPE}/api" ) set( FMOD_INC_PATH_SUFFIXES PATH_SUFFIXES inc ) set( FMOD_LIB_PATH_SUFFIXES PATH_SUFFIXES lib ) diff --git a/src/p_states.cpp b/src/p_states.cpp index 8fad65770..4953a0865 100644 --- a/src/p_states.cpp +++ b/src/p_states.cpp @@ -582,6 +582,7 @@ void FStateDefinitions::AddStateDefines(const FStateLabels *list) def.Label = list->Labels[i].Label; def.State = list->Labels[i].State; + def.DefineFlags = SDF_STATE; StateLabels.Push(def); } } diff --git a/src/sound/fmod_wrap.h b/src/sound/fmod_wrap.h index d80aabc19..c20c784af 100644 --- a/src/sound/fmod_wrap.h +++ b/src/sound/fmod_wrap.h @@ -103,7 +103,7 @@ namespace FMOD FMOD_RESULT getPluginHandle (FMOD_PLUGINTYPE plugintype, int index, unsigned int *handle) { return FMOD_System_GetPluginHandle(this, plugintype, index, handle); } FMOD_RESULT getPluginInfo (unsigned int handle, FMOD_PLUGINTYPE *plugintype, char *name, int namelen, unsigned int *version) { return FMOD_System_GetPluginInfo(this, handle, plugintype, name, namelen, version); } FMOD_RESULT setOutputByPlugin (unsigned int handle) { return FMOD_System_SetOutputByPlugin(this, handle); } - FMOD_RESULT getOutputByPlugin (unsigned int handle) { return FMOD_System_GetOutputByPlugin(this, handle); } + FMOD_RESULT getOutputByPlugin (unsigned int *handle) { return FMOD_System_GetOutputByPlugin(this, handle); } FMOD_RESULT createCodec (FMOD_CODEC_DESCRIPTION *description, unsigned int priority = 0) { return FMOD_System_CreateCodec(this, description, priority); } // Init/Close diff --git a/src/thingdef/thingdef_properties.cpp b/src/thingdef/thingdef_properties.cpp index 432b4d19d..7e8a56853 100644 --- a/src/thingdef/thingdef_properties.cpp +++ b/src/thingdef/thingdef_properties.cpp @@ -858,7 +858,7 @@ DEFINE_PROPERTY(renderstyle, S, Actor) if (!strnicmp(str, "style_", 6)) str+=6; int style = MatchString(str, renderstyles); - if (style < 0) I_Error("Unknown render style '%s'"); + if (style < 0) I_Error("Unknown render style '%s'", str); defaults->RenderStyle = LegacyRenderStyles[renderstyle_values[style]]; } diff --git a/src/win32/fb_ddraw.cpp b/src/win32/fb_ddraw.cpp index 006288d5e..e440bd7f1 100644 --- a/src/win32/fb_ddraw.cpp +++ b/src/win32/fb_ddraw.cpp @@ -1167,7 +1167,7 @@ void DDrawFB::Update () } BlitCycles.Unclock(); - LOG1 ("cycles = %.1 ms\n", BlitCycles.TimeMS()); + LOG1 ("cycles = %.1f ms\n", BlitCycles.TimeMS()); Buffer = NULL; LockCount = 0;