Only warnings for deprecated functions remain

Makefile

@@ -264,7 +264,9 @@ endif
 
 #################################################################
 
-clean: clean-emacs clean-build clean-test clean-obj clean-dep
+clean: clean-small clean-dep
+
+clean-small: clean-emacs clean-build clean-test clean-obj 
 	@-rm -rf bin/OpenRaider.app
 	@-rm -rf bin/OpenRaider.dmg
 

README.md

@@ -2,7 +2,9 @@
 
 [OpenRaider](http://openraider.sourceforge.net) is an Open Source implementation of the classic Tomb Raider Game Engine. It was abandoned in 2003.
 
-This project aims to get OpenRaider running in a modern Unix.
+This project aims to get OpenRaider in a more usable state.
+
+If you just want to see OpenRaider doing something, without installing any of the dependencies needed to build OpenRaider, install [XQuartz](http://xquartz.macosforge.org/trac) (if you don't have it already) and grab the Mac App Bundle from the [most recent release](https://github.com/xythobuz/OpenRaider/releases).
 
 ## Configuration
 
@@ -15,7 +17,7 @@ On Mac OS X 10.9 with [XCode](https://developer.apple.com/xcode/) and [MacPorts]
 
     sudo port install zlib cmake libsdl libsdl_ttf
 
-You also need the  [XQuartz](http://xquartz.macosforge.org/trac) X11 Server.
+You also need the [XQuartz](http://xquartz.macosforge.org/trac) X11 Server.
 
 To get Sound, you need [freealut](https://github.com/vancegroup/freealut). Get, compile and install it like this:
 

src/Emitter.cpp

@@ -210,7 +210,7 @@ void Emitter::TextureId(unsigned int particle_start,
 	unsigned int i;
 
 
-	if ((particle_start >= 0 && particle_start < _count) &&
+	if ((particle_start < _count) &&
 		 (particle_end > 0 && particle_end <= _count) &&
 		 (particle_start < particle_end))
 	{
@@ -226,7 +226,7 @@ void Emitter::Color(unsigned int particle_start, unsigned int particle_end,
 	unsigned int i;
 
 
-	if ((particle_start >= 0 && particle_start < _count) &&
+	if ((particle_start < _count) &&
 		 (particle_end > 0 && particle_end <= _count) &&
 		 (particle_start < particle_end))
 	{
@@ -242,7 +242,7 @@ void Emitter::Speed(unsigned int particle_start, unsigned int particle_end,
 	unsigned int i;
 
 
-	if ((particle_start >= 0 && particle_start < _count) &&
+	if ((particle_start < _count) &&
 		 (particle_end > 0 && particle_end <= _count) &&
 		 (particle_start < particle_end))
 	{
@@ -258,7 +258,7 @@ void Emitter::Force(unsigned int particle_start, unsigned int particle_end,
 	unsigned int i;
 
 
-	if ((particle_start >= 0 && particle_start < _count) &&
+	if ((particle_start < _count) &&
 		 (particle_end > 0 && particle_end <= _count) &&
 		 (particle_start < particle_end))
 	{

src/Light.h

@@ -81,11 +81,11 @@ class Light
 
  private:
 
-	unsigned int mFlags;        /* Flags for this light */
+	//unsigned int mFlags;        /* Flags for this light */
 
-	unsigned int mId;           /* Unique identifier of this light */
+	//unsigned int mId;           /* Unique identifier of this light */
 
-	char *mName;                /* Light name */
+	//char *mName;                /* Light name */
 };
 
 #endif

src/OpenRaider.cpp

@@ -1199,7 +1199,7 @@ void OpenRaider::gameFrame()
 				if (elapsed > mdl->rate)
 				{
 					if (mdl->getAnimation() == 0 &&
-						 mdl->getFrame() == 2 ||  mdl->getFrame() == 10)
+						 (mdl->getFrame() == 2 ||  mdl->getFrame() == 10))
 					{
 						if (m_flags & OpenRaider_EnableSound)
 						{

src/Render.cpp

@@ -1901,13 +1901,13 @@ void Render::drawSprite(sprite_t *sprite)
 	// So just draw normal texture, no case 2
 	case Render::modeSolid:
 		glBegin(GL_TRIANGLE_STRIP);
-		glColor3f(sprite->texel[0].st[0], sprite->texel[0].st[2], 0.5);
+		glColor3f(sprite->texel[0].st[0], sprite->texel[0].st[1], 0.5);
 		glVertex3fv(sprite->vertex[0].pos);
 
 		glColor3f(sprite->texel[1].st[0], sprite->texel[1].st[1], 0.5);
 		glVertex3fv(sprite->vertex[1].pos);
 
-		glColor3f(sprite->texel[3].st[0], sprite->texel[3].st[2], 0.5);
+		glColor3f(sprite->texel[3].st[0], sprite->texel[3].st[1], 0.5);
 		glVertex3fv(sprite->vertex[3].pos);
 
 		glColor3f(sprite->texel[2].st[0], sprite->texel[2].st[1], 0.5);

src/Render.h

@@ -587,7 +587,7 @@ private:
 
 	unsigned int *mNextTextureId;
 
-	float mSplash;
+	// float mSplash;
 
 	int mLock;
 

src/Sound.cpp

@@ -73,9 +73,9 @@ Sound::~Sound()
 
 int Sound::init()
 {
+#ifndef __APPLE__
 	int fd;
 
-#ifndef __APPLE__
 	fd = open("/dev/dsp", O_RDWR);
 
 	if (fd < 0)
@@ -127,7 +127,7 @@ void Sound::sourceAt(int source, float pos[3])
 int Sound::add(char *filename, int *source, unsigned int flags)
 {
 #ifdef HAVE_OPENAL
-   ALsizei size, freq, bits;
+   ALsizei size, freq;
    ALenum format;
    ALvoid *data;
    ALboolean err;
@@ -198,7 +198,7 @@ int Sound::add(char *filename, int *source, unsigned int flags)
 int Sound::add(unsigned char *wav, int *source, unsigned int flags)
 {
 #ifdef HAVE_OPENAL
-   ALsizei size, freq;
+   ALsizei size = 0, freq = 0;
    ALvoid *data;
 #endif
 

src/TombRaider.cpp

@@ -148,9 +148,6 @@ int TombRaider::NumAnimations()
 
 unsigned int TombRaider::NumFrames()
 {
-	if (_num_frames < 0)
-		return 0;
-
 	return _num_frames;
 }
 
@@ -257,8 +254,8 @@ int TombRaider::getNumAnimsForMoveable(int moveable_index)
 	tr2_moveable_t *next_moveable = 0x0;
 
 
-	if (moveable_index >= 0 &&
-		 moveable_index <= (int)_num_moveables || _num_moveables < 1)
+	if ((moveable_index >= 0 &&
+		 moveable_index <= (int)_num_moveables) || _num_moveables < 1)
 	{
 		moveable = &_moveables[moveable_index];
 	}
@@ -500,9 +497,9 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 	  l = strlen(filename);
 
 	  // Looking for pattern "filename.trc"
-	  if (filename[l-1] == 'c' || filename[l-1] == 'C' &&
-			filename[l-2] == 'r' || filename[l-2] == 'R' &&
-			filename[l-3] == 't' || filename[l-3] == 'T')
+	  if ((filename[l-1] == 'c' || filename[l-1] == 'C') &&
+			(filename[l-2] == 'r' || filename[l-2] == 'R') &&
+			(filename[l-3] == 't' || filename[l-3] == 'T'))
 	  {
 		  printDebug("Load", "This is really a TR5 pak");
 		  mEngineVersion = TR_VERSION_5;
@@ -3193,7 +3190,6 @@ unsigned int TombRaider::getRoomSectorCount(unsigned int roomIndex,
 
 		return (mRoomsTR5[roomIndex].numZSectors *
 				  mRoomsTR5[roomIndex].numXSectors);
-		break;
 	default:
 		// width of sector list
 		*zSectorsCount = _rooms[roomIndex].num_zsectors;
@@ -3203,7 +3199,7 @@ unsigned int TombRaider::getRoomSectorCount(unsigned int roomIndex,
 
 		count = _rooms[roomIndex].num_zsectors * _rooms[roomIndex].num_xsectors;
 
-		return ((count < 0) ? 0 : count);
+		return count;
 	}
 
 	return 0;

src/World.cpp

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 3; indent-tabs-mode: t; c-basic-offset: 3 -*- */
 /*================================================================
- * 
+ *
  * Project : OpenRaider
  * Author  : Terry 'Mongoose' Hendrix II
  * Website : http://www.westga.edu/~stu7440/
@@ -10,10 +10,10 @@
  * Comments: The game world ( model )
  *
  *
- *           This file was generated using Mongoose's C++ 
+ *           This file was generated using Mongoose's C++
  *           template generator script.  <stu7440@westga.edu>
- * 
- *-- History ------------------------------------------------- 
+ *
+ *-- History -------------------------------------------------
  *
  * 2002.12.16:
  * Mongoose - Created
@@ -66,7 +66,7 @@ int World::getRoomByLocation(int index, float x, float y, float z)
 				return index;
 		}
 	}
-	
+
 	return getRoomByLocation(x, y, z);
 }
 
@@ -80,17 +80,17 @@ int World::getRoomByLocation(float x, float y, float z)
 	for (mRooms.start(); mRooms.forward(); mRooms.next())
 	{
 		room = mRooms.current();
-	
+
 		if (!room)
 			continue;
 
 		if (x > room->bbox_min[0] && x < room->bbox_max[0] &&
 			 z > room->bbox_min[2] && z < room->bbox_max[2])
-		{			
+		{
 			// This room contains current position
 			if (y > room->bbox_min[1] && y < room->bbox_max[1])
 				return mRooms.getCurrentIndex();
-			
+
 			// This room is above or below current position
 			hop = mRooms.getCurrentIndex();
 		}
@@ -104,7 +104,7 @@ int World::getRoomByLocation(float x, float y, float z)
 }
 
 
-int World::getAdjoiningRoom(int index, 
+int World::getAdjoiningRoom(int index,
 									 float x, float y, float z,
 									 float x2, float y2, float z2)
 {
@@ -118,14 +118,14 @@ int World::getAdjoiningRoom(int index,
 
 	if (room)
 	{
-		for (room->portals.start(); room->portals.forward(); 
+		for (room->portals.start(); room->portals.forward();
 			  room->portals.next())
 		{
 			portal = room->portals.current();
-			
+
 			if (!portal)
 				continue;
-			
+
 			if (helIntersectionLineAndPolygon(intersect, p1, p2, 4,
 														 portal->vertices))
 			{
@@ -146,11 +146,11 @@ int World::getSector(int room, float x, float z, float *floor, float *ceiling)
 
 
 	r = mRooms[room];
-	
+
 	if (!r)
 		return -1;
 
-	sector = (((((int)x - (int)r->pos[0]) / 1024) * r->numZSectors) + 
+	sector = (((((int)x - (int)r->pos[0]) / 1024) * r->numZSectors) +
 				 (((int)z - (int)r->pos[2]) / 1024));
 
 	if (sector > -1)
@@ -169,7 +169,7 @@ int World::getSector(int room, float x, float z, float *floor, float *ceiling)
 
 
 int World::getSector(int room, float x, float z)
-{	
+{
 	int sector;
 	room_mesh_t *r;
 
@@ -181,7 +181,7 @@ int World::getSector(int room, float x, float z)
 		return -1;
 	}
 
-	sector = (((((int)x - (int)r->pos[0]) / 1024) * r->numZSectors) + 
+	sector = (((((int)x - (int)r->pos[0]) / 1024) * r->numZSectors) +
 				 (((int)z - (int)r->pos[2]) / 1024));
 
 	if (sector < 0)
@@ -247,7 +247,7 @@ bool World::getHeightAtPosition(int index, float x, float *y, float z)
 		return false;
 	}
 
-	// Mongoose 2002.08.14, It's 0302 - give me a fucking break -- 
+	// Mongoose 2002.08.14, It's 0302 - give me a fucking break --
 	//   this works albeit poorly  =)
 	for (i = 0; (int)i < room->num_boxes; ++i)
 	{
@@ -467,7 +467,7 @@ void World::moveEntity(entity_t *e, char movement)
 	{
 #define ADJ_ROOM_CHECK
 #ifdef ADJ_ROOM_CHECK
-		room = getAdjoiningRoom(e->room,  
+		room = getAdjoiningRoom(e->room,
 										e->pos[0],  e->pos[1], e->pos[2],
 										x, y, z);
 #else
@@ -491,7 +491,7 @@ void World::moveEntity(entity_t *e, char movement)
 	roomFlags = getRoomInfo(room);
 	sector = getSector(room, x, z, &floor, &ceiling);
 	wall = isWall(room, sector);
-	
+
 	// If you're underwater you may want to swim  =)
 	// ...if you're worldMoveType_walkNoSwim, you better hope it's shallow
 	if (roomFlags & roomFlag_underWater && e->moveType == worldMoveType_walk)
@@ -503,14 +503,14 @@ void World::moveEntity(entity_t *e, char movement)
 	if (!(roomFlags & roomFlag_underWater) && e->moveType == worldMoveType_swim)
 	{
 		e->moveType = worldMoveType_walk;
-	}	
+	}
 
-	// Mongoose 2002.09.02, Add check for room -> room transition 
+	// Mongoose 2002.09.02, Add check for room -> room transition
 	//   ( Only allow by movement between rooms by using portals )
-	if ((e->moveType == worldMoveType_noClipping ||
-		  e->moveType == worldMoveType_fly ||
-		  e->moveType == worldMoveType_swim) ||
-		 room > -1 && !wall)
+	if (((e->moveType == worldMoveType_noClipping) ||
+		  (e->moveType == worldMoveType_fly) ||
+		  (e->moveType == worldMoveType_swim)) ||
+		 ((room > -1) && (!wall)))
 	{
 		e->room = room;
 
@@ -576,7 +576,7 @@ void World::moveEntity(entity_t *e, char movement)
 			// This is to force false gravity, by making camera stay on ground
 			e->pos[1] = h; //roomFloor->bbox_min[1];
 
-			// Check for camera below terrian and correct 
+			// Check for camera below terrian and correct
 			if (e->pos[1] < h - camHeight)
 			{
 				e->pos[1] = h - camHeight;
@@ -637,7 +637,7 @@ void World::clear()
 	for (mRooms.start(); mRooms.forward(); mRooms.next())
 	{
 		room = mRooms.current();
-	
+
 		if (room)
 		{
 			room->portals.erase();
@@ -657,7 +657,7 @@ void World::clear()
 		if (!mesh)
 			continue;
 
-		for (mesh->texturedTriangles.start(); 
+		for (mesh->texturedTriangles.start();
 			  mesh->texturedTriangles.forward();
 			  mesh->texturedTriangles.next())
 		{
@@ -672,7 +672,7 @@ void World::clear()
 				delete mesh->coloredTriangles.current();
 		}
 
-		for (mesh->texturedRectangles.start(); 
+		for (mesh->texturedRectangles.start();
 			  mesh->texturedRectangles.forward();
 			  mesh->texturedRectangles.next())
 		{
@@ -704,7 +704,7 @@ void World::clear()
 	for (mSprites.start(); mSprites.forward(); mSprites.next())
 	{
 		sprite = mSprites.current();
-	
+
 		if (!sprite)
 			continue;
 
@@ -719,12 +719,12 @@ void World::clear()
 	for (mModels.start(); mModels.forward(); mModels.next())
 	{
 		model = mModels.current();
-	
+
 		if (!model)
 			continue;
 
 		// No smart pointers, so skip if deleted once  =)
-		if (!cache.SearchKey(model) == UINT_MAX)
+		if (!cache.SearchKey(model))
 		{
 			cache.Add(model);
 		}
@@ -733,7 +733,7 @@ void World::clear()
 			continue;
 		}
 
-		for (model->animation.start(); model->animation.forward(); 
+		for (model->animation.start(); model->animation.forward();
 			  model->animation.next())
 		{
 			animation  = model->animation.current();
@@ -741,7 +741,7 @@ void World::clear()
 			if (!animation)
 				continue;
 
-			for (animation->frame.start(); animation->frame.forward(); 
+			for (animation->frame.start(); animation->frame.forward();
 				  animation->frame.next())
 			{
 				boneframe = animation->frame.current();
@@ -749,20 +749,20 @@ void World::clear()
 				if (!boneframe)
 					continue;
 
-				for (boneframe->tag.start(); boneframe->tag.forward(); 
+				for (boneframe->tag.start(); boneframe->tag.forward();
 					  boneframe->tag.next())
 				{
 					tag = boneframe->tag.current();
-					
+
 					if (!tag)
 						continue;
 
 					delete tag;
-				}		
+				}
 
 				delete boneframe;
 			}
-			
+
 			delete animation;
 		}