OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Prefixed all names of CQ decorations with Chex after seeing some conflicts

Browse source 
with PWADs.
- Removed Chex Quest actors that were just unaltered duplicates of Doom's.
- Added detection for Chex Quest 3 IWAD.
- Cleaned up M_QuitGame because the code was almost incomprehensible and I
  wanted to add CQ3's new quit messages.
- Added Chex Quest obituaries and a few other messages from CQ3.
- Fixed: drawbar improperly clipped images when not in the top left quadrant.



SVN r1219 (trunk)
This commit is contained in:
Christoph Oelckers 2008-09-13 19:19:53 +00:00
commit 2c74e287a9
13 changed files with 224 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/m_menu.cpp
View file

@ -1995,21 +1995,27 @@ void M_QuitResponse(int ch)
void M_QuitGame (int choice)
{
// We pick index 0 which is language sensitive,
// or one at random, between 1 and maximum number.
if (gameinfo.gametype & (GAME_DoomStrifeChex))
{
int quitmsg = 0;
if (gameinfo.gametype == GAME_Doom)
quitmsg = gametic % NUM_QUITDOOMMESSAGES;
else if (gameinfo.gametype == GAME_Strife)
quitmsg = gametic % NUM_QUITSTRIFEMESSAGES - 1;
else //Chex quest has 2 messages but one is more likely to show
quitmsg = (gametic % NUM_QUITCHEXMESSAGES + 6) > NUM_QUITCHEXMESSAGES ? NUM_QUITCHEXMESSAGES - 1 : (gametic % NUM_QUITCHEXMESSAGES + 6);
if (quitmsg != 0 || gameinfo.gametype == GAME_Strife || gameinfo.gametype == GAME_Chex)
{
EndString.Format("QUITMSG%d", quitmsg + (gameinfo.gametype == GAME_Doom ? 0 : (gameinfo.gametype == GAME_Chex ? NUM_QUITDOOMMESSAGES + NUM_QUITSTRIFEMESSAGES : NUM_QUITDOOMMESSAGES + 1)));
quitmsg = gametic % (NUM_QUITDOOMMESSAGES + 1);
}
else if (gameinfo.gametype == GAME_Strife)
{
quitmsg = gametic % (NUM_QUITSTRIFEMESSAGES + 1);
if (quitmsg != 0) quitmsg += NUM_QUITDOOMMESSAGES;
}
else
{
quitmsg = gametic % (NUM_QUITCHEXMESSAGES + 1);
if (quitmsg != 0) quitmsg += NUM_QUITDOOMMESSAGES + NUM_QUITSTRIFEMESSAGES;
}
if (quitmsg != 0)
{
EndString.Format("QUITMSG%d", quitmsg);
EndString.Format("%s\n\n%s", GStrings(EndString), GStrings("DOSY"));
}
else