mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-10 14:51:51 +00:00
- Fixed: using custom automap backgrounds crashed.
SVN r1735 (trunk)
This commit is contained in:
parent
4134bc3c64
commit
25c0f679cb
3 changed files with 6 additions and 3 deletions
|
@ -1,4 +1,7 @@
|
||||||
July 22, 2009
|
July 24, 2009 (Changes by Graf Zahl)
|
||||||
|
- Fixed: using custom automap backgrounds crashed.
|
||||||
|
|
||||||
|
July 22, 2009
|
||||||
- Added extra states to dehsupp for the MBF additions.
|
- Added extra states to dehsupp for the MBF additions.
|
||||||
- Removed specific Button_Speed handling from the controllers' AddAxes()
|
- Removed specific Button_Speed handling from the controllers' AddAxes()
|
||||||
methods. Analog axes now respond to Button_Speed and cl_run in exactly the
|
methods. Analog axes now respond to Button_Speed and cl_run in exactly the
|
||||||
|
|
|
@ -854,7 +854,7 @@ void AM_loadPics ()
|
||||||
marknums[i] = TexMan.CheckForTexture (namebuf, FTexture::TEX_MiscPatch);
|
marknums[i] = TexMan.CheckForTexture (namebuf, FTexture::TEX_MiscPatch);
|
||||||
}
|
}
|
||||||
|
|
||||||
const char *autopage = level.info->mapbg[0] == 0? "AUTOPAGE" : (const char*)level.info->mapbg[0];
|
const char *autopage = level.info->mapbg[0] == 0? "AUTOPAGE" : (const char*)&level.info->mapbg[0];
|
||||||
|
|
||||||
mapback = TexMan.CheckForTexture(autopage, FTexture::TEX_MiscPatch);
|
mapback = TexMan.CheckForTexture(autopage, FTexture::TEX_MiscPatch);
|
||||||
}
|
}
|
||||||
|
|
|
@ -262,7 +262,7 @@ bool P_UndoPlayerMorph (player_t *activator, player_t *player, bool force)
|
||||||
|
|
||||||
if ((player->health > 0) || undobydeathsaves)
|
if ((player->health > 0) || undobydeathsaves)
|
||||||
{
|
{
|
||||||
player->health = mo->health = mo->GetDefault()->health;
|
player->health = mo->health = mo->SpawnHealth();
|
||||||
}
|
}
|
||||||
else // killed when morphed so stay dead
|
else // killed when morphed so stay dead
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue