OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added read and write barriers to the actor pointer in the sound channel

Browse source 
structure.
- Fixed: Items which should stay but had an IF_ALWAYSPICKUP flag were removed.
- Fixed: The pickup flash must only play when an item is picked up so the 
  correct place to spawn it is in AInventory::Touch, not in AInventory::GoAway.


SVN r1278 (trunk)
This commit is contained in:
Christoph Oelckers 2008-10-26 17:06:47 +00:00
commit a8a3aca601
7 changed files with 68 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/m_menu.cpp
View file

@ -1637,9 +1637,13 @@ void M_NewGame(int choice)
}
else if (EpiDef.numitems <= 1)
{
if (EpisodeNoSkill[0])
if (AllSkills.Size() == 1)
{
M_ChooseSkill(2);
M_ChooseSkill(0);
}
else if (EpisodeNoSkill[0])
{
M_ChooseSkill(AllSkills.Size() == 2? 1:2);
}
else
{
@ -1823,12 +1827,16 @@ void M_Episode (int choice)
epi = choice;
if (EpisodeNoSkill[choice])
if (AllSkills.Size() == 1)
{
M_ChooseSkill(2);
M_ChooseSkill(0);
return;
}
else if (EpisodeNoSkill[choice])
{
M_ChooseSkill(AllSkills.Size() == 2? 1:2);
return;
}
M_StartupSkillMenu(NULL);
}
@ -1858,13 +1866,17 @@ static void SCClass (int option)
{
M_SetupNextMenu (&EpiDef);
}
else if (AllSkills.Size() == 1)
{
M_ChooseSkill(0);
}
else if (!EpisodeNoSkill[0])
{
M_StartupSkillMenu(playerclass);
}
else
{
M_ChooseSkill(2);
M_ChooseSkill(AllSkills.Size() == 2? 1:2);
}
}
@ -1886,9 +1898,13 @@ static void M_ChooseClass (int choice)
{
M_SetupNextMenu (&EpiDef);
}
else if (AllSkills.Size() == 1)
{
M_ChooseSkill(0);
}
else if (EpisodeNoSkill[0])
{
M_ChooseSkill(2);
M_ChooseSkill(AllSkills.Size() == 2? 1:2);
}
else
{