- Added a CopyInfo function to FTexture that contains all code required to

clone a texture. Used for creating warping textures.
- Fixed: P_FindFloorCeiling should not be called before setting the actor's z-
  coordinate. For testing 3D Midtex lines and 3D floors the proper position
  needs to be set first.
- Fixed the autoaim fix from Jan 10.


SVN r1358 (trunk)
This commit is contained in:
Christoph Oelckers 2009-01-18 09:31:49 +00:00
commit bbda4622e7
7 changed files with 37 additions and 16 deletions

View file

@ -219,6 +219,12 @@ protected:
Span **CreateSpans (const BYTE *pixels) const;
void FreeSpans (Span **spans) const;
void CalcBitSize ();
void CopyInfo(FTexture *other)
{
CopySize(other);
bNoDecals = other->bNoDecals;
Rotations = other->Rotations;
}
static void FlipSquareBlock (BYTE *block, int x, int y);
static void FlipSquareBlockRemap (BYTE *block, int x, int y, const BYTE *remap);

View file

@ -43,9 +43,7 @@
FWarpTexture::FWarpTexture (FTexture *source)
: GenTime (0), SourcePic (source), Pixels (0), Spans (0), Speed (1.f)
{
CopySize(source);
bNoDecals = source->bNoDecals;
Rotations = source->Rotations;
CopyInfo(source);
bWarped = 1;
}