zdoom/gzdoom-last-svn
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-last-svn.git synced 2025-05-30 00:41:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update to ZDoom r2005:

Browse source 
- fixed: Morph weapons weren't destroyed because the code checked for 
  them in the unmorphed player class.
- fixed: With padding the largest texture to fit into a page is 254x254.


git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@638 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
Christoph Oelckers 2009-11-28 07:49:53 +00:00
parent 0b257fca95
commit 088dfb6655
5 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
docs/rh-log.txt
View file

@ -1,3 +1,15 @@
November 28, 2009 (Changes by Graf Zahl)
- fixed: Morph weapons weren't destroyed because the code checked for
them in the unmorphed player class.
- fixed: With padding the largest texture to fit into a page is 254x254.
November 27, 2009 (Changes by Graf Zahl)
- fixed an uninitialized variable in p_xlat.cpp (Thanks, MSVC for not
warning about such an obvious problem! :( )
- fixed: The charge attack of Heretic's imp is not precisely the same
as A_SkullAttack with a different speed so A_ImpMsAttack has been
reinstated.
November 25, 2009
- Make the palette indexes used by FRemapTable subject to the global remap
table, just as the images they translate are.

4
src/g_shared/a_morph.cpp
View file

@ -177,7 +177,7 @@ bool P_UndoPlayerMorph (player_t *activator, player_t *player, int unmorphflag,
{
AWeapon *beastweap;
APlayerPawn *mo;
AActor *pmo;
APlayerPawn *pmo;
angle_t angle;
pmo = player->mo;
@ -330,7 +330,7 @@ bool P_UndoPlayerMorph (player_t *activator, player_t *player, int unmorphflag,
}
if (correctweapon)
{ // Better "lose morphed weapon" semantics
const PClass *morphweapon = PClass::FindClass (mo->MorphWeapon);
const PClass *morphweapon = PClass::FindClass (pmo->MorphWeapon);
if (morphweapon != NULL && morphweapon->IsDescendantOf (RUNTIME_CLASS(AWeapon)))
{
AWeapon *OriginalMorphWeapon = static_cast<AWeapon *>(mo->FindInventory (morphweapon));

2
src/p_xlat.cpp
View file

@ -66,7 +66,7 @@ void P_TranslateLineDef (line_t *ld, maplinedef_t *mld)
unsigned short special = (unsigned short) LittleShort(mld->special);
short tag = LittleShort(mld->tag);
DWORD flags = LittleShort(mld->flags);
INTBOOL passthrough;
INTBOOL passthrough = 0;
DWORD flags1 = flags;
DWORD newflags = 0;

4
src/svnrevision.h
View file

@ -3,5 +3,5 @@
// This file was automatically generated by the
// updaterevision tool. Do not edit by hand.
#define ZD_SVN_REVISION_STRING "2001"
#define ZD_SVN_REVISION_NUMBER 2001
#define ZD_SVN_REVISION_STRING "2005"
#define ZD_SVN_REVISION_NUMBER 2005

3
src/win32/fb_d3d9.cpp
View file

@ -1828,7 +1828,8 @@ D3DFB::PackedTexture *D3DFB::AllocPackedTexture(int w, int h, bool wrapping, D3D
PackedTexture *bestbox;
int area;
if (w > 256 || h > 256 || wrapping)
// check for 254 to account for padding
if (w > 254 || h > 254 || wrapping)
{ // Create a new packing texture.
bestpack = new PackingTexture(this, w, h, format);
bestpack->OneUse = true;