- Added Martin Howe's fixes for morphing and DECORATE function prototypes.

- Minor fixes in texture code.


SVN r922 (trunk)
This commit is contained in:
Christoph Oelckers 2008-04-17 20:34:58 +00:00
commit 5d0dc65044
7 changed files with 19 additions and 7 deletions

View file

@ -535,6 +535,7 @@ void APowerStrength::InitEffect ()
void APowerStrength::Tick ()
{
// Strength counts up to diminish the fade.
assert(EffectTics < (INT_MAX - 1)); // I can't see a game lasting nearly two years, but...
EffectTics += 2;
Super::Tick();
}
@ -998,6 +999,7 @@ void APowerFlight::Tick ()
// The Wings of Wrath only expire in multiplayer and non-hub games
if (!multiplayer && (level.flags & LEVEL_INFINITE_FLIGHT))
{
assert(EffectTics < INT_MAX); // I can't see a game lasting nearly two years, but...
EffectTics++;
}