mirror of https://github.com/ZDoom/qzdoom.git
- Set the CMAKE_MODULE_DIR so that we can use find_package instead of include for FluidSynth.
- Fixed: FadeTo() accepted parameters out of range. - Fixed: "Enable autosaves" menu option didn't handle all possible values of disableautosave. SVN r3280 (trunk)
This commit is contained in:
parent
5c81cf20ba
commit
f6ddad95b7
|
@ -13,6 +13,8 @@ if( CMAKE_COMPILER_IS_GNUCXX )
|
||||||
set( PROFILE 0 CACHE BOOL "Enable profiling with gprof for Debug and RelWithDebInfo build types." )
|
set( PROFILE 0 CACHE BOOL "Enable profiling with gprof for Debug and RelWithDebInfo build types." )
|
||||||
endif( CMAKE_COMPILER_IS_GNUCXX )
|
endif( CMAKE_COMPILER_IS_GNUCXX )
|
||||||
|
|
||||||
|
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
|
||||||
|
|
||||||
find_package( BZip2 )
|
find_package( BZip2 )
|
||||||
find_package( JPEG )
|
find_package( JPEG )
|
||||||
find_package( ZLIB )
|
find_package( ZLIB )
|
||||||
|
|
|
@ -257,7 +257,7 @@ endif( FMOD_LIBRARY )
|
||||||
|
|
||||||
# Search for FluidSynth
|
# Search for FluidSynth
|
||||||
|
|
||||||
include( ../FindFluidSynth.cmake )
|
find_package( FluidSynth )
|
||||||
|
|
||||||
# Search for NASM
|
# Search for NASM
|
||||||
|
|
||||||
|
|
|
@ -2399,7 +2399,7 @@ int DLevelScript::DoSpawnSpotFacing (int type, int spot, int tid, bool force)
|
||||||
|
|
||||||
void DLevelScript::DoFadeTo (int r, int g, int b, int a, fixed_t time)
|
void DLevelScript::DoFadeTo (int r, int g, int b, int a, fixed_t time)
|
||||||
{
|
{
|
||||||
DoFadeRange (0, 0, 0, -1, r, g, b, a, time);
|
DoFadeRange (0, 0, 0, -1, clamp(r, 0, 255), clamp(g, 0, 255), clamp(b, 0, 255), clamp(a, 0, FRACUNIT), time);
|
||||||
}
|
}
|
||||||
|
|
||||||
void DLevelScript::DoFadeRange (int r1, int g1, int b1, int a1,
|
void DLevelScript::DoFadeRange (int r1, int g1, int b1, int a1,
|
||||||
|
|
|
@ -791,6 +791,13 @@ OptionMenu "AltHUDOptions"
|
||||||
//
|
//
|
||||||
//-------------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
OptionValue Autosave
|
||||||
|
{
|
||||||
|
0, "Always"
|
||||||
|
1, "Scripts Only"
|
||||||
|
2, "Never"
|
||||||
|
}
|
||||||
|
|
||||||
OptionMenu "MiscOptions"
|
OptionMenu "MiscOptions"
|
||||||
{
|
{
|
||||||
Title "Miscellaneous Options"
|
Title "Miscellaneous Options"
|
||||||
|
@ -803,7 +810,7 @@ OptionMenu "MiscOptions"
|
||||||
Option "Show IWAD selection dialog", "queryiwad", "OnOff"
|
Option "Show IWAD selection dialog", "queryiwad", "OnOff"
|
||||||
StaticText " "
|
StaticText " "
|
||||||
Option "Enable cheats from all games", "allcheats", "OnOff"
|
Option "Enable cheats from all games", "allcheats", "OnOff"
|
||||||
Option "Enable autosaves", "disableautosave", "OffOn"
|
Option "Enable autosaves", "disableautosave", "Autosave"
|
||||||
Slider "Number of autosaves", "autosavecount", 1, 32, 1, 0
|
Slider "Number of autosaves", "autosavecount", 1, 32, 1, 0
|
||||||
StaticText " "
|
StaticText " "
|
||||||
Option "Cache nodes", "gl_cachenodes", "OnOff"
|
Option "Cache nodes", "gl_cachenodes", "OnOff"
|
||||||
|
|
Loading…
Reference in New Issue