From 783657fac7fbb254e35367cf10a87b4248e28319 Mon Sep 17 00:00:00 2001
From: Steven Fuller <relnev@icculus.org>
Date: Sun, 9 Dec 2001 01:21:49 +0000
Subject: [PATCH] Fixed "pure virtual method called"

---
 README                             |  4 ++--
 src/avp/support/r2pos666.hpp       |  8 --------
 src/avp/support/trig666.hpp        |  9 ---------
 src/avp/win95/frontend/avp_menus.c |  1 -
 src/avp/win95/gadgets/t_ingadg.hpp | 12 ------------
 src/avp/win95/gadgets/trepgadg.cpp |  7 ++++---
 src/avp/win95/gadgets/trepgadg.hpp |  9 ---------
 7 files changed, 6 insertions(+), 44 deletions(-)

diff --git a/README b/README
index 64423bd..78e9370 100644
--- a/README
+++ b/README
@@ -55,8 +55,8 @@ http://www.icculus.org/avp/english.txt.gz, extract it, and rename it
 language.txt (Regular Ed.) or aenglish.txt (Alien Demo). 
 
 If you get "Aborted" after starting a new game the second time or so,
-try recompiling with gcc-3.0.2.  It seems to have fixed it for me, but I'll
-try to find a workaround that works with gcc-2.95.
+try recompiling with gcc-3.0.2.  This problem should be fixed now; if not,
+let me know.
 
 If you have Debian, the Debian SDL package, and an NVIDIA card, you will
 have to uncomment a LDLIBS line in the Makefile.
diff --git a/src/avp/support/r2pos666.hpp b/src/avp/support/r2pos666.hpp
index a9adcdd..b76a5df 100644
--- a/src/avp/support/r2pos666.hpp
+++ b/src/avp/support/r2pos666.hpp
@@ -15,9 +15,6 @@
 	#include "daemon.h"
 	#endif
 
-#ifdef __cplusplus
-	extern "C" {
-#endif
 
 /* Version settings *****************************************************/
 
@@ -71,9 +68,4 @@
 
 /* End of the header ****************************************************/
 
-
-#ifdef __cplusplus
-	};
-#endif
-
 #endif
diff --git a/src/avp/support/trig666.hpp b/src/avp/support/trig666.hpp
index f965943..ba99d95 100644
--- a/src/avp/support/trig666.hpp
+++ b/src/avp/support/trig666.hpp
@@ -11,10 +11,6 @@
 	#include "daemon.h"
 	#endif
 
-#ifdef __cplusplus
-	extern "C" {
-#endif
-
 /* Version settings *****************************************************/
 
 /* Macros ***************************************************************/
@@ -95,9 +91,4 @@
 
 /* End of the header ****************************************************/
 
-
-#ifdef __cplusplus
-	};
-#endif
-
 #endif
diff --git a/src/avp/win95/frontend/avp_menus.c b/src/avp/win95/frontend/avp_menus.c
index 1030992..047a09c 100644
--- a/src/avp/win95/frontend/avp_menus.c
+++ b/src/avp/win95/frontend/avp_menus.c
@@ -4514,7 +4514,6 @@ void DisplayVideoModeUnavailableScreen(void)
 
 void CheckForCredits(void)
 {
-	fprintf(stderr, "CheckForCredits()\n");
 #if 0
 	FILE *fp = fopen("credits.txt","rb");
 	
diff --git a/src/avp/win95/gadgets/t_ingadg.hpp b/src/avp/win95/gadgets/t_ingadg.hpp
index 258adb0..7bbc909 100644
--- a/src/avp/win95/gadgets/t_ingadg.hpp
+++ b/src/avp/win95/gadgets/t_ingadg.hpp
@@ -7,10 +7,6 @@
 #ifndef _t_ingadg_hpp
 #define _t_ingadg_hpp 1
 
-	#if ( defined( __WATCOMC__ ) || defined( _MSC_VER ) )
-		#pragma once
-	#endif
-
 	#ifndef _gadget
 	#include "gadget.h"
 	#endif
@@ -25,10 +21,6 @@
 		#endif
 	#endif
 
-#ifdef __cplusplus
-	extern "C" {
-#endif
-
 /* Version settings *****************************************************/
 
 /* Constants  ***********************************************************/
@@ -150,8 +142,4 @@
 /* End of the header ****************************************************/
 
 
-#ifdef __cplusplus
-	};
-#endif
-
 #endif
diff --git a/src/avp/win95/gadgets/trepgadg.cpp b/src/avp/win95/gadgets/trepgadg.cpp
index b4c17ff..43539b7 100644
--- a/src/avp/win95/gadgets/trepgadg.cpp
+++ b/src/avp/win95/gadgets/trepgadg.cpp
@@ -10,6 +10,7 @@
 
 /* Includes ********************************************************/
 #include "3dc.h"
+#include "daemon.h"
 #include "trepgadg.hpp"
 #include "teletype.hpp"
 #include "coordstr.hpp"
@@ -485,13 +486,13 @@ void TextReportGadget :: ClearQueue(void)
 {
 	// clears the queue of buffered messages; could be handy if you've
 	// started a listing of 300 module names
-
-	int NumKilled = RefList_SCString_ToAppear . NumEntries();
-
+	
 	RefList_SCString_ToAppear . EmptyYourself();
 
 	#if 0
 	{
+		int NumKilled = RefList_SCString_ToAppear . NumEntries();
+		
 		SCString* pSCString_Temp1 = new SCString("CLEARED MESSAGE DISPLAY QUEUE; NUM LINES=");
 			// LOCALISEME()
 		SCString* pSCString_Temp2 = new SCString(NumKilled);
diff --git a/src/avp/win95/gadgets/trepgadg.hpp b/src/avp/win95/gadgets/trepgadg.hpp
index ef26ec8..37c8cd4 100644
--- a/src/avp/win95/gadgets/trepgadg.hpp
+++ b/src/avp/win95/gadgets/trepgadg.hpp
@@ -27,10 +27,6 @@
 
 	#endif
 
-#ifdef __cplusplus
-	extern "C" {
-#endif
-
 /* Version settings *****************************************************/
 
 /* Constants  ***********************************************************/
@@ -155,9 +151,4 @@
 
 /* End of the header ****************************************************/
 
-
-#ifdef __cplusplus
-	};
-#endif
-
 #endif