OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- complete restructuring of resource file handling for more flexibility and future

Browse source 
extensions.
- Removed merging of special namespaces. For the texture manager this has
  become totally useless so there is no need to do this anymore. Not merging
  the namespaces also allows a much more reliable detection of lumps belonging
  to special namespaces so the ScanForFlatHack function is no longer needed.
  Instead, any lump up to F_END with a length of 4096 will be marked for 
  inclusion as a flat texture if no F_START marker is found.
- Made the counting of intermission stats in Doom a GAMEINFO option so that
  it can be activated in all games.


SVN r1555 (trunk)
This commit is contained in:
Christoph Oelckers 2009-04-23 22:49:38 +00:00
commit cc066bc409
27 changed files with 2788 additions and 2063 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/wi_stuff.cpp
View file

@ -1648,8 +1648,7 @@ void WI_updateStats ()
{
WI_updateAnimatedBack ();
if ((!(gameinfo.gametype & GAME_DoomChex) || acceleratestage)
&& sp_state != 10)
if ((!gameinfo.intermissioncounter || acceleratestage) && sp_state != 10)
{
if (acceleratestage)
{
@ -1667,7 +1666,7 @@ void WI_updateStats ()
if (sp_state == 2)
{
if (gameinfo.gametype & GAME_DoomChex)
if (gameinfo.intermissioncounter)
{
cnt_kills[0] += 2;
@ -1683,7 +1682,7 @@ void WI_updateStats ()
}
else if (sp_state == 4)
{
if (gameinfo.gametype & GAME_DoomChex)
if (gameinfo.intermissioncounter)
{
cnt_items[0] += 2;
@ -1699,7 +1698,7 @@ void WI_updateStats ()
}
else if (sp_state == 6)
{
if (gameinfo.gametype & GAME_DoomChex)
if (gameinfo.intermissioncounter)
{
cnt_secret[0] += 2;
@ -1715,7 +1714,7 @@ void WI_updateStats ()
}
else if (sp_state == 8)
{
if (gameinfo.gametype & GAME_DoomChex)
if (gameinfo.intermissioncounter)
{
if (!(bcnt&3))
S_Sound (CHAN_VOICE | CHAN_UI, "intermission/tick", 1, ATTN_NONE);