[patch] Extended version of previous patch

avp.diff (text/plain), 5.17 KB, created by Michal Sylwester on 2006-09-12 10:17:23 UTC

diff -NurB -Nurb avp.orig/avp/win95/gadgets/trepgadg.hpp avp/avp/win95/gadgets/trepgadg.hpp
--- avp.orig/avp/win95/gadgets/trepgadg.hpp	2001-12-09 02:21:49.000000000 +0100
+++ avp/avp/win95/gadgets/trepgadg.hpp	2006-09-04 22:01:38.206519629 +0200
@@ -56,12 +56,12 @@
 			int FixP_Alpha
 		);
 
-		struct r2pos TextReportGadget :: GetPos_Rel
+		struct r2pos GetPos_Rel
 		(
 			const struct r2rect& R2Rect_Parent
 		) const;
 
-		r2size TextReportGadget :: GetSize
+		r2size GetSize
 		(
 			const struct r2rect& R2Rect_Parent
 		) const;
diff -NurB -Nurb avp.orig/avp/win95/projload.hpp avp/avp/win95/projload.hpp
--- avp.orig/avp/win95/projload.hpp	2001-08-03 07:30:40.000000000 +0200
+++ avp/avp/win95/projload.hpp	2006-09-04 22:03:50.855607023 +0200
@@ -54,6 +54,8 @@
 struct hierarchy_variant_data;
 };
 
+class File_Chunk;
+
 class Global_Hierarchy_Store
 {
 
diff -NurB -Nurb avp.orig/Makefile avp/Makefile
--- avp.orig/Makefile	2003-10-15 08:10:42.000000000 +0200
+++ avp/Makefile	2006-09-05 09:32:54.815474264 +0200
@@ -12,7 +12,8 @@
 CFLAGS += $(shell sdl-config --cflags)
 CXXFLAGS = $(CFLAGS)
 
-LDLIBS = $(shell sdl-config --libs) -lopenal
+#LDLIBS = $(shell sdl-config --libs) $(shell openal-config --libs)
+LDLIBS = $(shell sdl-config --libs) /usr/lib/libopenal.a
 
 AFLAGS = -g -w+macro-params -w+orphan-labels -w+number-overflow
 
diff -NurB -Nurb avp.orig/win95/chnkload.hpp avp/win95/chnkload.hpp
--- avp.orig/win95/chnkload.hpp	2001-08-07 04:38:43.000000000 +0200
+++ avp/win95/chnkload.hpp	2006-09-04 22:03:13.398217577 +0200
@@ -41,6 +41,8 @@
 							const ChunkObject* object=0	  //object used so that conversion from float to int can be done in world coordinates
 							);
 							
+class Sprite_Header_Chunk;
+
 extern BOOL copy_sprite_to_shapeheader (RIFFHANDLE, SHAPEHEADER *& shphd,Sprite_Header_Chunk* shc, int listpos = GLS_NOTINLIST);
 
 
diff -NurB -Nurb avp.orig/win95/chunk.hpp avp/win95/chunk.hpp
--- avp.orig/win95/chunk.hpp	2001-07-28 06:44:27.000000000 +0200
+++ avp/win95/chunk.hpp	2006-09-04 22:02:40.920985329 +0200
@@ -365,7 +365,7 @@
 	virtual void fill_data_block_for_process(char * data_start);	
 
 
-	Chunk* Chunk_With_Children::DynCreate(const char* data);
+	Chunk* DynCreate(const char* data);
 
 protected:
 
diff -NurB -Nurb avp.orig/win95/chunkpal.hpp avp/win95/chunkpal.hpp
--- avp.orig/win95/chunkpal.hpp	2001-12-18 03:23:41.000000000 +0100
+++ avp/win95/chunkpal.hpp	2006-09-04 22:04:24.580843751 +0200
@@ -549,7 +549,7 @@
 class Environment_Game_Mode_Chunk;
 class Environment_Game_Mode_Header_Chunk;
 
-
+class Environment_Data_Chunk;
 
 class Environment_Game_Mode_Chunk : public Chunk_With_Children
 {
diff -NurB -Nurb avp.orig/win95/hash_tem.hpp avp/win95/hash_tem.hpp
--- avp.orig/win95/hash_tem.hpp	2003-01-14 06:43:38.000000000 +0100
+++ avp/win95/hash_tem.hpp	2006-09-05 06:37:15.327428984 +0200
@@ -231,8 +231,13 @@
 // HashFunction(unsigned), HashFunction(void const *), HashFunction(char const *)
 // you can disable the default hash functions by defining HT_NODEFAULTFNS
 
+namespace IFF {
+class RegEntry;
+};
+
 #ifndef HT_NODEFAULTFNS
 	// a hash function for integral (unsigned) values
+    inline unsigned int HashFunction(const IFF::RegEntry& rEntry);
 	inline unsigned HashFunction(unsigned const _i)
 	{
 		return _i ^ _i>>4 ^ _i>>9 ^ _i>>15 ^ _i>>22;
@@ -418,7 +423,7 @@
 		};
 
 		// a _base_HashTable non-const iterator - can remove entry pointed to
-		class Iterator : public ConstIterator
+		class Iterator : public _base_HashTable::ConstIterator
 		{
 				// Nested class functions apparently have to be declared here for MSVC compatability
 			public:
@@ -432,24 +437,24 @@
 				// remove the current entry pointed to, advancing to the next
 				void Remove()
 				{
-					if (!nEntriesRemaining)
+					if (!ConstIterator::nEntriesRemaining)
 					{
 						HT_FAIL("HTT: Tried to Remove() via an iterator which was Done()");
 					}
-					Node * oldP = *nodePP;
-					*nodePP = oldP->nextP;
+					Node * oldP = *ConstIterator::nodePP;
+					*ConstIterator::nodePP = oldP->nextP;
 					delete oldP;
-					if (!*nodePP)
+					if (!*ConstIterator::nodePP)
 					{
 						do
 						{
-							++ chainPP;
-							-- nChainsRemaining;
+							++ ConstIterator::chainPP;
+							-- ConstIterator::nChainsRemaining;
 						}
-						while (nChainsRemaining && !*chainPP);
-						nodePP = chainPP;
+						while (ConstIterator::nChainsRemaining && !*ConstIterator::chainPP);
+						ConstIterator::nodePP = ConstIterator::chainPP;
 					}
-					-- nEntriesRemaining;
+					-- ConstIterator::nEntriesRemaining;
 					-- *tableNEntriesP;
 				}
 
@@ -702,7 +707,7 @@
 
 	
 //	for(HashTable<TYPE>::ConstIterator it(ht); !it.Done(); it.Next() )
-	for (_base_HashTable::ConstIterator it(ht); !it.Done(); it.Next() )
+	for (class _base_HashTable::ConstIterator it(ht); !it.Done(); it.Next() )
 	{
 		AddRegardless( it.Get() );
 	}
diff -NurB -Nurb avp.orig/win95/iff.cpp avp/win95/iff.cpp
--- avp.orig/win95/iff.cpp	2001-12-06 01:22:49.000000000 +0100
+++ avp/win95/iff.cpp	2006-09-04 22:16:58.897734696 +0200
@@ -219,7 +219,7 @@
 
 } // namespace IFF
 
-inline unsigned HashFunction(IFF::RegEntry const & rEntry)
+inline unsigned int HashFunction(const IFF::RegEntry& rEntry)
 {
 	return HashFunction(rEntry.m_idChunk.m_nID);
 }