mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-28 06:53:40 +00:00
- 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)
This commit is contained in:
parent
8d4912f4af
commit
738e8ca7ad
6 changed files with 8 additions and 3 deletions
|
@ -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.
|
||||
|
|
|
@ -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 )
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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]];
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue