SVN r39 (trunk)

This commit is contained in:
Christoph Oelckers 2006-04-13 20:33:19 +00:00
parent 218fd0ae56
commit e8c7a10f80
2 changed files with 12 additions and 4 deletions

View file

@ -1,4 +1,9 @@
April 13, 2006 (Changes by Graf Zahl) April 13, 2006 (Changes by Graf Zahl)
- Fixed: The decal stretcher is supposed to stretch the decal to a specifiable
size but it used that size as a scaling factor instead. The old code allowed
a maximum scaling factor of 4 which masked this bug to a large extent but
with the increased precision the blood smears were stretched to abnormal
proportions.
- Fixed: A non-spectral attack set any spectral target to its missile state. - Fixed: A non-spectral attack set any spectral target to its missile state.
This is not supposed to happen. This is not supposed to happen.
- Fixed: The Prison Key was misspelled in the pickup message. - Fixed: The Prison Key was misspelled in the pickup message.

View file

@ -1186,18 +1186,21 @@ DThinker *FDecalStretcherAnim::CreateThinker (DBaseDecal *actor, side_t *wall) c
thinker->TimeToStart = level.maptime + StretchStart; thinker->TimeToStart = level.maptime + StretchStart;
thinker->TimeToStop = thinker->TimeToStart + StretchTime; thinker->TimeToStop = thinker->TimeToStart + StretchTime;
if (GoalX >= 0)
FTexture * tex = TexMan[actor->PicNum];
if (GoalX >= 0 && tex != NULL)
{ {
thinker->GoalX = GoalX; thinker->GoalX = GoalX / tex->GetWidth();
thinker->bStretchX = true; thinker->bStretchX = true;
} }
else else
{ {
thinker->bStretchX = false; thinker->bStretchX = false;
} }
if (GoalY >= 0) if (GoalY >= 0 && tex != NULL)
{ {
thinker->GoalY = GoalY; thinker->GoalY = GoalY / tex->GetHeight();
thinker->bStretchY = true; thinker->bStretchY = true;
} }
else else