From 67bf668ad907188fdac029a323bcc12d414a1895 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Fri, 21 Apr 2006 16:32:49 +0000
Subject: [PATCH] April 20, 2006 (Changes by Graf Zahl) - Fixed: Strife's
 ending check included destroying the computer - an event   that happens
 before the branch in the story. - Fixed: The overloaded FRandom::Random2
 function with mask parameter didn't   use its parameter. - Added Jim's latest
 makefile.linux

SVN r60 (trunk)
---
 Makefile.linux    | 16 ++++++++++++++--
 docs/rh-log.txt   |  7 +++++++
 src/f_finale.cpp  |  2 +-
 src/m_options.cpp |  2 +-
 src/m_random.cpp  |  4 ++--
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/Makefile.linux b/Makefile.linux
index 3280acc9e..32edccae5 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -1,7 +1,11 @@
 # created on 4/12/2006 by James Bentler
 CXX ?= g++
 CC ?= gcc
-CFLAGS ?= -Wall -Wno-unused -O2 -fomit-frame-pointer
+ifndef DEBUG
+CFLAGS ?= -pipe -Wall -Wno-unused -O2 -fomit-frame-pointer
+else
+CFLAGS ?= -pipe -Wall -Wno-unused
+endif
 CFLAGS += -DHAVE_FILELENGTH -D__forceinline=inline -Izlib -IFLAC `sdl-config --cflags`
 CFLAGS += -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -DNEED_STRUPR
 LDFLAGS += -lFLAC++ -lFLAC -lz -lfmod `sdl-config --libs`
@@ -114,9 +118,17 @@ zdoom.wad:
 clean: cleanobjs
 	rm -f $(ZDOOMDEBUG) $(ZDOOM) $(ZDOOM).map
 
+cleandebug:
+	rm -f $(ZDOOMDEBUG) $(DEBUGOBJ)/*.o $(DEBUGOBJ)/*.d
+	-rmdir $(DEBUGOBJ)
+
+cleanrelease:
+	rm -f $(ZDOOM) $(ZDOOM).map $(RELEASEOBJ)/*.o $(RELEASEOBJ)/*.o
+	-rmdir $(RELEASEOBJ)
+
 # I could use a recursive delete instead, but that could be dangerous...
 distclean: clean cleandeps
-	rmdir $(RELEASEOBJ) $(DEBUGOBJ)
+	-rmdir $(RELEASEOBJ) $(DEBUGOBJ)
 
 cleandeps:
 	rm -f $(RELEASEOBJ)/*.d $(DEBUGOBJ)/*.d
diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 25fa7ede7..ea701a525 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,10 @@
+April 20, 2006 (Changes by Graf Zahl)
+- Fixed: Strife's ending check included destroying the computer - an event
+  that happens before the branch in the story.
+- Fixed: The overloaded FRandom::Random2 function with mask parameter didn't
+  use its parameter.
+- Added Jim's latest makefile.linux
+
 April 20, 2006
 - Fixed: Crash when opening the player setup menu when you're so dead that
   your head has popped off your body.
diff --git a/src/f_finale.cpp b/src/f_finale.cpp
index d5ca7a260..c346063e8 100644
--- a/src/f_finale.cpp
+++ b/src/f_finale.cpp
@@ -155,7 +155,7 @@ void F_StartFinale (char *music, int musicorder, int cdtrack, unsigned int cdid,
 		else if (EndSequences[FinaleSequence].EndType == END_Strife)
 		{
 			if (players[0].mo->FindInventory (QuestItemClasses[24]) ||
-				players[0].mo->FindInventory (QuestItemClasses[26]))
+				players[0].mo->FindInventory (QuestItemClasses[27]))
 			{
 				FinalePart = 10;
 			}
diff --git a/src/m_options.cpp b/src/m_options.cpp
index cf829f684..d8b5a89c3 100644
--- a/src/m_options.cpp
+++ b/src/m_options.cpp
@@ -867,7 +867,7 @@ menu_t ModesMenu =
 {
 	"VIDEO MODE",
 	2,
-	17,
+	countof(ModesItems),
 	0,
 	ModesItems,
 };
diff --git a/src/m_random.cpp b/src/m_random.cpp
index fe4d10bce..4e8899c07 100644
--- a/src/m_random.cpp
+++ b/src/m_random.cpp
@@ -152,8 +152,8 @@ int FRandom::Random2 ()
 
 int FRandom::Random2 (int mask)
 {
-	int t = (*this)();
-	int u = (*this)();
+	int t = (*this)(mask);
+	int u = (*this)(mask);
 	return t - u;
 }