- Fixed: Weapons did not give you double ammo at baby and nightmare skills.

- Fixed: SetTexture() in p_setup.cpp assumed that all color values were
  six characters. Although this was the intended way to specify colors,
  earlier versions did no error checking, so other lengths worked too.
- Fixed: FPatchTexture waited until MakeTexture() to call CalcBitSize(),
  so the width and height bit sizes weren't available when using it as a
  source for a warp texture.
- Fixed: R_InitSkyMap() should only warn about two sky textures not being
  the same height when they are used as part of a double sky.
- Added a NULL state check in AActor::Tick() before advancing the current
  state. Note that this should not happen, so there's an assert there for
  the debug build as well as a regular check for the release build.


SVN r324 (trunk)

src/textures/warptexture.cpp

@@ -214,9 +214,10 @@ void FWarp2Texture::MakeTexture (DWORD time)
 	}
 
 	DWORD timebase = time * 40 / 28;
-	for (x = xsize-1; x >= 0; x--)
+	for (x = 0; x < xsize; ++x)
 	{
-		for (y = ysize-1; y >= 0; y--)
+		BYTE *dest = Pixels + (x << ybits);
+		for (y = 0; y < ysize; ++y)
 		{
 			int xt = (x + 128
 				+ ((finesine[(y*128 + timebase*5 + 900) & FINEMASK]*2)>>FRACBITS)
@@ -224,9 +225,7 @@ void FWarp2Texture::MakeTexture (DWORD time)
 			int yt = (y + 128
 				+ ((finesine[(y*128 + timebase*3 + 700) & FINEMASK]*2)>>FRACBITS)
 				+ ((finesine[(x*256 + timebase*4 + 1200) & FINEMASK]*2)>>FRACBITS)) & ymask;
-			const BYTE *source = otherpix + (xt << ybits) + yt;
-			BYTE *dest = Pixels + (x << ybits) + y;
-			*dest = *source;
+			*dest++ = otherpix[(xt << ybits) + yt];
 		}
 	}
 }