View | Details | Raw Unified
Collapse All | Expand All

(-) avp.orig/avp/win95/gadgets/trepgadg.hpp (-2 / +2 lines)
 Lines 56-67    Link Here  
			int FixP_Alpha
			int FixP_Alpha
		);
		);

            

              
		struct r2pos TextReportGadget :: GetPos_Rel

              
		struct r2pos GetPos_Rel

            

        
		(
		(

        
			const struct r2rect& R2Rect_Parent
			const struct r2rect& R2Rect_Parent

        
		) const;
		) const;

        

            

              
		r2size TextReportGadget :: GetSize

              
		r2size GetSize

            

        
		(
		(

        
			const struct r2rect& R2Rect_Parent
			const struct r2rect& R2Rect_Parent

        
		) const;
		) const;



(-) avp.orig/avp/win95/projload.hpp
      (+2 lines)




  

    

    

       Lines 54-59
       
    
  Link Here 
    

  

        
struct hierarchy_variant_data;
struct hierarchy_variant_data;

        
};
};

        

            

              
              
class File_Chunk;

            

            

              
              

            

        
class Global_Hierarchy_Store
class Global_Hierarchy_Store

        
{
{

        



(-) avp.orig/Makefile
      (-1 / +2 lines)




  

    

    

       Lines 12-18
       
    
  Link Here 
    

  

        
CFLAGS += $(shell sdl-config --cflags)
CFLAGS += $(shell sdl-config --cflags)

        
CXXFLAGS = $(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
AFLAGS = -g -w+macro-params -w+orphan-labels -w+number-overflow

        



(-) avp.orig/win95/chnkload.hpp
      (+2 lines)




  

    

    

       Lines 41-46
       
    
  Link Here 
    

  

        
							const ChunkObject* object=0	  //object used so that conversion from float to int can be done in world coordinates
							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);
extern BOOL copy_sprite_to_shapeheader (RIFFHANDLE, SHAPEHEADER *& shphd,Sprite_Header_Chunk* shc, int listpos = GLS_NOTINLIST);

        

        



(-) avp.orig/win95/chunk.hpp
      (-1 / +1 lines)




  

    

    

       Lines 365-371
       
    
  Link Here 
    

  

        
	virtual void fill_data_block_for_process(char * data_start);	
	virtual void fill_data_block_for_process(char * data_start);	

        

        

            

              
	Chunk* Chunk_With_Children::DynCreate(const char* data);

              
	Chunk* DynCreate(const char* data);

            

        

        
protected:
protected:

        



(-) avp.orig/win95/chunkpal.hpp
      (-1 / +1 lines)




  

    

    

       Lines 549-555
       
    
  Link Here 
    

  

        
class Environment_Game_Mode_Chunk;
class Environment_Game_Mode_Chunk;

        
class Environment_Game_Mode_Header_Chunk;
class Environment_Game_Mode_Header_Chunk;

        

            

              

              
class Environment_Data_Chunk;

            

        

        
class Environment_Game_Mode_Chunk : public Chunk_With_Children
class Environment_Game_Mode_Chunk : public Chunk_With_Children

        
{
{



(-) avp.orig/win95/hash_tem.hpp
      (-11 / +16 lines)




  

    

    

       Lines 231-238
       
    
  Link Here 
    

  

        
// HashFunction(unsigned), HashFunction(void const *), HashFunction(char const *)
// HashFunction(unsigned), HashFunction(void const *), HashFunction(char const *)

        
// you can disable the default hash functions by defining HT_NODEFAULTFNS
// you can disable the default hash functions by defining HT_NODEFAULTFNS

        

            

              
              
namespace IFF {

            

            

              
              
class RegEntry;

            

            

              
              
};

            

            

              
              

            

        
#ifndef HT_NODEFAULTFNS
#ifndef HT_NODEFAULTFNS

        
	// a hash function for integral (unsigned) values
	// a hash function for integral (unsigned) values

            

              
              
    inline unsigned int HashFunction(const IFF::RegEntry& rEntry);

            

        
	inline unsigned HashFunction(unsigned const _i)
	inline unsigned HashFunction(unsigned const _i)

        
	{
	{

        
		return _i ^ _i>>4 ^ _i>>9 ^ _i>>15 ^ _i>>22;
		return _i ^ _i>>4 ^ _i>>9 ^ _i>>15 ^ _i>>22;

  

    

    

       Lines 418-424
       
    
  Link Here 
    

  

        
		};
		};

        

        
		// a _base_HashTable non-const iterator - can remove entry pointed to
		// 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
				// Nested class functions apparently have to be declared here for MSVC compatability

        
			public:
			public:

  

    

    

       Lines 432-455
       
    
  Link Here 
    

  

        
				// remove the current entry pointed to, advancing to the next
				// remove the current entry pointed to, advancing to the next

        
				void Remove()
				void Remove()

        
				{
				{

            

              
					if (!nEntriesRemaining)

              
					if (!ConstIterator::nEntriesRemaining)

            

        
					{
					{

        
						HT_FAIL("HTT: Tried to Remove() via an iterator which was Done()");
						HT_FAIL("HTT: Tried to Remove() via an iterator which was Done()");

        
					}
					}

            

              
					Node * oldP = *nodePP;

              
					Node * oldP = *ConstIterator::nodePP;

            

            

              
					*nodePP = oldP->nextP;

              
					*ConstIterator::nodePP = oldP->nextP;

            

        
					delete oldP;
					delete oldP;

            

              
					if (!*nodePP)

              
					if (!*ConstIterator::nodePP)

            

        
					{
					{

        
						do
						do

        
						{
						{

            

              
							++ chainPP;

              
							++ ConstIterator::chainPP;

            

            

              
							-- nChainsRemaining;

              
							-- ConstIterator::nChainsRemaining;

            

        
						}
						}

            

              
						while (nChainsRemaining && !*chainPP);

              
						while (ConstIterator::nChainsRemaining && !*ConstIterator::chainPP);

            

            

              
						nodePP = chainPP;

              
						ConstIterator::nodePP = ConstIterator::chainPP;

            

        
					}
					}

            

              
					-- nEntriesRemaining;

              
					-- ConstIterator::nEntriesRemaining;

            

        
					-- *tableNEntriesP;
					-- *tableNEntriesP;

        
				}
				}

        

  

    

    

       Lines 702-708
       
    
  Link Here 
    

  

        

        
	
	

        
//	for(HashTable<TYPE>::ConstIterator it(ht); !it.Done(); it.Next() )
//	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() );
		AddRegardless( it.Get() );

        
	}
	}



(-) avp.orig/win95/iff.cpp
      (-1 / +1 lines)




  

    

    

       Lines 219-225
       
    
  Link Here 
    

  

        

        
} // namespace IFF
} // namespace IFF

        

            

              
inline unsigned HashFunction(IFF::RegEntry const & rEntry)

              
inline unsigned int HashFunction(const IFF::RegEntry& rEntry)

            

        
{
{

        
	return HashFunction(rEntry.m_idChunk.m_nID);
	return HashFunction(rEntry.m_idChunk.m_nID);

        
}
}