OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added support for scaled textures to DCanvas::DrawTexture.

Browse source 
- Changed deh.MaxHealth use to be consistent with other source ports.
- Added NULL pointer checks to APlayerPawn's state set functions. If these
  remove the player from the game a crash is the inevitable result.


SVN r325 (trunk)
This commit is contained in:
Christoph Oelckers 2006-09-09 08:55:47 +00:00
commit 06630b0fee
6 changed files with 39 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/r_data.cpp
View file

@ -388,8 +388,8 @@ void FTextureManager::LoadHiresTex()
// Replace the entire texture and adjust the scaling and offset factors.
newtex->ScaleX = 8 * newtex->GetWidth() / oldtex->GetWidth();
newtex->ScaleY = 8 * newtex->GetHeight() / oldtex->GetHeight();
newtex->LeftOffset = Scale(oldtex->LeftOffset, newtex->ScaleX, 8);
newtex->TopOffset = Scale(oldtex->TopOffset, newtex->ScaleY, 8);
newtex->LeftOffset = MulScale3(oldtex->LeftOffset, newtex->ScaleX);
newtex->TopOffset = MulScale3(oldtex->TopOffset, newtex->ScaleY);
ReplaceTexture(tex, newtex, true);
}
}
@ -417,8 +417,8 @@ void FTextureManager::LoadHiresTex()
// Replace the entire texture and adjust the scaling and offset factors.
newtex->ScaleX = 8 * width / newtex->GetWidth();
newtex->ScaleY = 8 * height / newtex->GetHeight();
newtex->LeftOffset = Scale(newtex->LeftOffset, newtex->ScaleX, 8);
newtex->TopOffset = Scale(newtex->TopOffset, newtex->ScaleY, 8);
newtex->LeftOffset = MulScale3(newtex->LeftOffset, newtex->ScaleX);
newtex->TopOffset = MulScale3(newtex->TopOffset, newtex->ScaleY);
memcpy(newtex->Name, src, sizeof(newtex->Name));
int oldtex = TexMan.CheckForTexture(src, FTexture::TEX_Override);