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

@@ -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

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.

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;
 			}

src/m_options.cpp

@@ -867,7 +867,7 @@ menu_t ModesMenu =
 {
 	"VIDEO MODE",
 	2,
-	17,
+	countof(ModesItems),
 	0,
 	ModesItems,
 };

src/m_random.cpp

@@ -152,8 +152,8 @@ int FRandom::Random2 ()
 
 int FRandom::Random2 (int mask)
 {
-	int t = (*this)();
+	int t = (*this)(mask);
-	int u = (*this)();
+	int u = (*this)(mask);
 	return t - u;
 }