diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 4b861aee8..9f63ece68 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,5 +1,7 @@ Changes towards version 0.3: -- Added a Menu-Delete key for the Super-Melee menu (#123) - Michael +- Changed lander speed to 35 FPS, which matches reported 3DO speed + (Bug #22) -Michael +- Added a Menu-Delete key for the Super-Melee menu (#123) -Michael - Added support for positional (stereo) sound effects, currently works only with OpenAL -Mika - Fixed screen transitions from homeworld conversations (bug #348) -Michael diff --git a/sc2/src/sc2code/libs/timelib.h b/sc2/src/sc2code/libs/timelib.h index 80f60635a..9ac81784a 100644 --- a/sc2/src/sc2code/libs/timelib.h +++ b/sc2/src/sc2code/libs/timelib.h @@ -21,11 +21,12 @@ #include "libs/compiler.h" -// The *minimum* value for ONE_SECOND is 120 -// If increasing the value by only a factor of ~2..4 -// make it an *exact multiple* of 120 +/* ONE_SECOND is the LCM of all the fractions of a second the game uses. + * Battle is 24 FPS, Landers are 35 FPS, most UI-level things are 15 FPS, + * The Interplanetary flight is 30 FPS. Thus, the minimum value for + * ONE_SECOND is 840. */ #if TIMELIB == SDL -# define ONE_SECOND 120 +# define ONE_SECOND 840 #endif typedef DWORD TimeCount; diff --git a/sc2/src/sc2code/planets/lander.c b/sc2/src/sc2code/planets/lander.c index 573c17b3e..189732989 100644 --- a/sc2/src/sc2code/planets/lander.c +++ b/sc2/src/sc2code/planets/lander.c @@ -28,10 +28,11 @@ // PLANET_SIDE_RATE governs how fast the lander, // bio and planet effects will be -// currently: 30 fps -// with current ONE_SECOND=120 definition, -// it can only be 60, 40 and 30 fps -#define PLANET_SIDE_RATE (ONE_SECOND / 40) +// We're using the 3DO speed, which is 35 FPS +// The PC speed was 30 FPS. +// Remember that all values need to evenly divide +// ONE_SECOND. +#define PLANET_SIDE_RATE (ONE_SECOND / 35) //Added by Chris