Attachment #97369 for bug #132389




			int FixP_Alpha
		);

		struct r2pos GetPos_Rel
		(
			const struct r2rect& R2Rect_Parent
		) const;

		r2size GetSize
		(
			const struct r2rect& R2Rect_Parent
		) const;

Lines 54-59 Link Here

(-)avp.orig/avp/win95/projload.hpp (+2 lines)
54	struct hierarchy_variant_data;	54	struct hierarchy_variant_data;
55	};	55	};
56		56
		57	class File_Chunk;
		58
57	class Global_Hierarchy_Store	59	class Global_Hierarchy_Store
58	{	60	{
59		61




CXX = g++
NASM = nasm

CFLAGS ?= -g -pipe -O2
CFLAGS += -Wall
#CFLAGS = -DNDEBUG -Wall -pipe -O6 -ffast-math -fomit-frame-pointer -march=pentium -mcpu=pentiumpro

CFLAGS += -DLINUX

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

LDFLAGS += $(shell sdl-config --libs) $(shell openal-config --libdir)/libopenal.a

AFLAGS = -g -w+macro-params -w+orphan-labels -w+number-overflow


all: AvP

AvP: $(OBJ) # depend $(OBJ)
	$(CXX) -o AvP $(OBJ) $(LDFLAGS)

compile: $(OBJ)


Lines 5-11 Link Here

(-)avp.orig/openal.c (-1 lines)
5		5
6	#include <AL/al.h>	6	#include <AL/al.h>
7	#include <AL/alc.h>	7	#include <AL/alc.h>
8	#include <AL/alut.h>
9		8
10	#include <SDL/SDL_audio.h> // For a few defines (AUDIO_*)	9	#include <SDL/SDL_audio.h> // For a few defines (AUDIO_*)
11		10

Lines 41-46 Link Here

(-)avp.orig/win95/chnkload.hpp (+2 lines)
41	const ChunkObject* object=0 //object used so that conversion from float to int can be done in world coordinates	41	const ChunkObject* object=0 //object used so that conversion from float to int can be done in world coordinates
42	);	42	);
43		43
		44	class Sprite_Header_Chunk;
		45
44	extern BOOL copy_sprite_to_shapeheader (RIFFHANDLE, SHAPEHEADER & shphd,Sprite_Header_Chunk shc, int listpos = GLS_NOTINLIST);	46	extern BOOL copy_sprite_to_shapeheader (RIFFHANDLE, SHAPEHEADER & shphd,Sprite_Header_Chunk shc, int listpos = GLS_NOTINLIST);
45		47
46		48

Lines 365-371 Link Here

(-)avp.orig/win95/chunk.hpp (-1 / +1 lines)
365	virtual void fill_data_block_for_process(char * data_start);	365	virtual void fill_data_block_for_process(char * data_start);
366		366
367		367
368	Chunk* Chunk_With_Children::DynCreate(const char* data);	368	Chunk* DynCreate(const char* data);
369		369
370	protected:	370	protected:
371		371

Lines 549-555 Link Here

(-)avp.orig/win95/chunkpal.hpp (-1 / +1 lines)
549	class Environment_Game_Mode_Chunk;	549	class Environment_Game_Mode_Chunk;
550	class Environment_Game_Mode_Header_Chunk;	550	class Environment_Game_Mode_Header_Chunk;
551		551
552		552	class Environment_Data_Chunk;
553		553
554	class Environment_Game_Mode_Chunk : public Chunk_With_Children	554	class Environment_Game_Mode_Chunk : public Chunk_With_Children
555	{	555	{

Lines 231-238 Link Here

(-)avp.orig/win95/hash_tem.hpp (-1 / +6 lines)
231	// HashFunction(unsigned), HashFunction(void const ), HashFunction(char const )	231	// HashFunction(unsigned), HashFunction(void const ), HashFunction(char const )
232	// you can disable the default hash functions by defining HT_NODEFAULTFNS	232	// you can disable the default hash functions by defining HT_NODEFAULTFNS
233		233
		234	namespace IFF {
		235	class RegEntry;
		236	};
		237
234	#ifndef HT_NODEFAULTFNS	238	#ifndef HT_NODEFAULTFNS
235	// a hash function for integral (unsigned) values	239	// a hash function for integral (unsigned) values
		240	inline unsigned int HashFunction(const IFF::RegEntry& rEntry);
236	inline unsigned HashFunction(unsigned const _i)	241	inline unsigned HashFunction(unsigned const _i)
237	{	242	{
238	return _i ^ _i>>4 ^ _i>>9 ^ _i>>15 ^ _i>>22;	243	return _i ^ _i>>4 ^ _i>>9 ^ _i>>15 ^ _i>>22;
Lines 418-424 Link Here
418	};	423	};
419		424
420	// a _base_HashTable non-const iterator - can remove entry pointed to	425	// a _base_HashTable non-const iterator - can remove entry pointed to
421	class Iterator : public ConstIterator	426	class Iterator : public _base_HashTable::ConstIterator
422	{	427	{
423	// Nested class functions apparently have to be declared here for MSVC compatability	428	// Nested class functions apparently have to be declared here for MSVC compatability
424	public:	429	public:

Lines 219-225 Link Here

(-)avp.orig/win95/iff.cpp (-1 / +1 lines)
219		219
220	} // namespace IFF	220	} // namespace IFF
221		221
222	inline unsigned HashFunction(IFF::RegEntry const & rEntry)	222	inline unsigned int HashFunction(const IFF::RegEntry& rEntry)
223	{	223	{
224	return HashFunction(rEntry.m_idChunk.m_nID);	224	return HashFunction(rEntry.m_idChunk.m_nID);
225	}	225	}

Return to bug 132389

Lines 56-67 Link Here

(-)avp.orig/avp/win95/gadgets/trepgadg.hpp (-2 / +2 lines)
56	int FixP_Alpha	56	int FixP_Alpha
57	);	57	);
58		58
59	struct r2pos TextReportGadget :: GetPos_Rel	59	struct r2pos GetPos_Rel
60	(	60	(
61	const struct r2rect& R2Rect_Parent	61	const struct r2rect& R2Rect_Parent
62	) const;	62	) const;
63		63
64	r2size TextReportGadget :: GetSize	64	r2size GetSize
65	(	65	(
66	const struct r2rect& R2Rect_Parent	66	const struct r2rect& R2Rect_Parent
67	) const;	67	) const;

Lines 2-9 Link Here

(-)avp.orig/Makefile (-4 / +4 lines)
2	CXX = g++	2	CXX = g++
3	NASM = nasm	3	NASM = nasm
4		4
5	#CFLAGS = -g -Wall -pipe	5	CFLAGS ?= -g -pipe -O2
6	CFLAGS = -g -Wall -pipe -O2	6	CFLAGS += -Wall
7	#CFLAGS = -DNDEBUG -Wall -pipe -O6 -ffast-math -fomit-frame-pointer -march=pentium -mcpu=pentiumpro	7	#CFLAGS = -DNDEBUG -Wall -pipe -O6 -ffast-math -fomit-frame-pointer -march=pentium -mcpu=pentiumpro
8		8
9	CFLAGS += -DLINUX	9	CFLAGS += -DLINUX
Lines 12-18 Link Here
12	CFLAGS += $(shell sdl-config --cflags)	12	CFLAGS += $(shell sdl-config --cflags)
13	CXXFLAGS = $(CFLAGS)	13	CXXFLAGS = $(CFLAGS)
14		14
15	LDLIBS = $(shell sdl-config --libs) -lopenal	15	LDFLAGS += $(shell sdl-config --libs) $(shell openal-config --libdir)/libopenal.a
16		16
17	AFLAGS = -g -w+macro-params -w+orphan-labels -w+number-overflow	17	AFLAGS = -g -w+macro-params -w+orphan-labels -w+number-overflow
18		18
Lines 56-62 Link Here
56	all: AvP	56	all: AvP
57		57
58	AvP: $(OBJ) # depend $(OBJ)	58	AvP: $(OBJ) # depend $(OBJ)
59	$(CXX) -o AvP $(OBJ) $(LDLIBS)	59	$(CXX) -o AvP $(OBJ) $(LDFLAGS)
60		60
61	compile: $(OBJ)	61	compile: $(OBJ)
62		62