From bab38f82e17cd0cf5379cc627df354672ba4bb53 Mon Sep 17 00:00:00 2001
From: maride <martin.dessauer@hhu.de>
Date: Mon, 4 Apr 2016 23:17:52 +0200
Subject: [PATCH] Fix includes

---
 source/mactexturesimport.cpp |  1 +
 source/rendercar.cpp         | 20 +++++++++++---------
 source/renderframe.cpp       |  4 +++-
 source/sound_ST.cpp          |  2 +-
 source/tracker.cpp           |  9 ++++-----
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/source/mactexturesimport.cpp b/source/mactexturesimport.cpp
index 6aee8f9..35e1fa2 100644
--- a/source/mactexturesimport.cpp
+++ b/source/mactexturesimport.cpp
@@ -5,6 +5,7 @@
 #include <QuickTime/QuickTime.h>
 #include <QD/QD.h>
 #include <QD/Quickdraw.h>
+#include <ApplicationServices/ApplicationServices.h>
 #include <string.h>
 #include "fileio.h"
 #include "error.h"
diff --git a/source/rendercar.cpp b/source/rendercar.cpp
index e8b1f4e..70d432c 100755
--- a/source/rendercar.cpp
+++ b/source/rendercar.cpp
@@ -25,6 +25,8 @@
 #include "stencil.h"
 #include "random.h"
 
+#include "mVertex.h"
+
 #define sign(x) ((x)<0?-1:1)
 
 
@@ -194,20 +196,20 @@ void RenderArm(tVector3 point1,tVector3 point2,tVector3 point3)
 		glBegin(GL_TRIANGLE_STRIP);
 		glVertex3fv(&(point1).x);
 		glNormal3fv(&dir1.x);
-		glVertex3fv(&(point1+dir1*kArmRadius).x);
+		mVertex3fv((point1+dir1*kArmRadius));
 		dir1=dir1*mat1;
 		glNormal3fv(&dir1.x);
-		glVertex3fv(&(point1+dir1*kArmRadius).x);
+		mVertex3fv((point1+dir1*kArmRadius));
 		glNormal3fv(&dir2.x);
-		glVertex3fv(&(point2+dir2*kArmRadius).x);
+		mVertex3fv((point2+dir2*kArmRadius));
 		dir2=dir2*mat2;
 		glNormal3fv(&dir2.x);
-		glVertex3fv(&(point2+dir2*kArmRadius).x);
+		mVertex3fv((point2+dir2*kArmRadius));
 		glNormal3fv(&dir3.x);
-		glVertex3fv(&(point3+dir3*kArmRadius).x);
+		mVertex3fv((point3+dir3*kArmRadius));
 		dir3=dir3*mat3;
 		glNormal3fv(&dir3.x);
-		glVertex3fv(&(point3+dir3*kArmRadius).x);
+		mVertex3fv((point3+dir3*kArmRadius));
 		glVertex3fv(&(point3).x);
 		glEnd();
 	}
@@ -575,7 +577,7 @@ void CarRenderWheelShadowPass(float width,float radius,float shadowLength,int cw
 			float c=cos(f);
 			tVector3 v=Vector(dir,c*normal.y+s*lightDirFlat.y,c*normal.z+s*lightDirFlat.z);
 			glVertex3fv(&v.x);
-			glVertex3fv(&(v-shadowVector).x);			
+			mVertex3fv((v-shadowVector));
 		}		
 		for(int i=kNumWheelSides/2;i<=kNumWheelSides;i++)
 		{
@@ -584,11 +586,11 @@ void CarRenderWheelShadowPass(float width,float radius,float shadowLength,int cw
 			float c=cos(f);
 			tVector3 v=Vector(-dir,c*normal.y+s*lightDirFlat.y,c*normal.z+s*lightDirFlat.z);
 			glVertex3fv(&v.x);
-			glVertex3fv(&(v-shadowVector).x);
+			mVertex3fv((v-shadowVector));
 		}	
 		tVector3 v=Vector(dir,normal.y,normal.z);
 		glVertex3fv(&v.x);
-		glVertex3fv(&(v-shadowVector).x);			
+		mVertex3fv((v-shadowVector));
 		glEnd();
 	}	
 	
diff --git a/source/renderframe.cpp b/source/renderframe.cpp
index 1780757..5662292 100755
--- a/source/renderframe.cpp
+++ b/source/renderframe.cpp
@@ -27,6 +27,8 @@
 #include "textures.h"
 #include "lights.h"
 
+#include "mVertex.h"
+
 #ifdef __POLYCOUNT
 int gPolyCount;
 #endif
@@ -587,7 +589,7 @@ void RenderVisWalls()
 
 		glVertex3fv(&(gMapInfo->visWalls[i].b.x));
 		glVertex3fv(&(gMapInfo->visWalls[i].c.x));
-		glVertex3fv(&((gMapInfo->visWalls[i].c+(gMapInfo->visWalls[i].b-gMapInfo->visWalls[i].a)).x));
+		mVertex3fv(((gMapInfo->visWalls[i].c+(gMapInfo->visWalls[i].b-gMapInfo->visWalls[i].a))));
 		glEnd();
 	}
 	glEnable(GL_CULL_FACE);
diff --git a/source/sound_ST.cpp b/source/sound_ST.cpp
index 9a1a506..9dfe4e9 100644
--- a/source/sound_ST.cpp
+++ b/source/sound_ST.cpp
@@ -1,4 +1,4 @@
-#include <sound_tool.h>
+#include <AmbrosiaTools/sound_tool.h>
 #include <math.h>
 #include "gamemem.h"
 #include "vectors.h"
diff --git a/source/tracker.cpp b/source/tracker.cpp
index e4734ce..9e04ff9 100644
--- a/source/tracker.cpp
+++ b/source/tracker.cpp
@@ -1,7 +1,7 @@
-#include <reggie.h>
-#include <network_tool.h>
-#include <platform.h>
-#include <lsockets.h>
+#include <AmbrosiaTools/reggie.h>
+#include <AmbrosiaTools/network_tool.h>
+#include <AmbrosiaTools/platform.h>
+#include <AmbrosiaTools/lsockets.h>
 #include <stdio.h>
 #include <string.h>
 #include "tracker.h"
@@ -15,7 +15,6 @@
 #include "initexit.h"
 #include "network.h"
 #include "interfaceutil.h"
-#include "reg_tool_3.h"
 #include "gamesystem.h"
 #include "screen.h"