Compiles, removed a lot of code, do not run it...HEADmaster

1 files changed, 28 insertions, 49 deletions

diff --git a/src/Makefile b/src/Makefile
index 28c7cf6..efd780a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -84,7 +84,6 @@ CLIENT_OBJS= \
 	shared/tools.o \
 	shared/zip.o \
 	engine/3dgui.o \
-	engine/bih.o \
 	engine/client.o	\
 	engine/command.o \
 	engine/console.o \
@@ -106,7 +105,6 @@ CLIENT_OBJS= \
 	engine/server.o	\
 	engine/serverbrowser.o \
 	engine/shader.o \
-	engine/shadowmap.o \
 	engine/sound.o \
 	engine/texture.o \
 	engine/world.o \
@@ -200,12 +198,6 @@ server: $(SERVER_OBJS)
 master: $(MASTER_OBJS)
 	$(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)
 
-shared/cube2font.o: shared/cube2font.c
-	$(CXX) $(CXXFLAGS) -c -o $@ $< `freetype-config --cflags`
-
-cube2font: shared/cube2font.o
-	$(CXX) $(CXXFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz
-
 ifneq (,$(findstring DARWIN,$(PLATFORM)))
 install: client
 	cp sauer_client ../sauerbraten.app/Contents/MacOS/sauerbraten_universal
@@ -248,147 +240,137 @@ shared/zip.o: shared/iengine.h shared/igame.h
 engine/3dgui.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
 engine/3dgui.o: shared/ents.h shared/command.h shared/glexts.h shared/glemu.h
 engine/3dgui.o: shared/iengine.h shared/igame.h engine/world.h engine/octa.h
-engine/3dgui.o: engine/lightmap.h engine/bih.h engine/texture.h
+engine/3dgui.o: engine/lightmap.h  engine/texture.h
 engine/3dgui.o: engine/model.h engine/textedit.h
-engine/bih.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
-engine/bih.o: shared/ents.h shared/command.h shared/glexts.h shared/glemu.h
-engine/bih.o: shared/iengine.h shared/igame.h engine/world.h engine/octa.h
-engine/bih.o: engine/lightmap.h engine/bih.h engine/texture.h engine/model.h
 engine/client.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
 engine/client.o: shared/ents.h shared/command.h shared/glexts.h
 engine/client.o: shared/glemu.h shared/iengine.h shared/igame.h
-engine/client.o: engine/world.h engine/octa.h engine/lightmap.h engine/bih.h
+engine/client.o: engine/world.h engine/octa.h engine/lightmap.h
 engine/client.o: engine/texture.h engine/model.h
 engine/command.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
 engine/command.o: shared/ents.h shared/command.h shared/glexts.h
 engine/command.o: shared/glemu.h shared/iengine.h shared/igame.h
-engine/command.o: engine/world.h engine/octa.h engine/lightmap.h engine/bih.h
+engine/command.o: engine/world.h engine/octa.h engine/lightmap.h
 engine/command.o: engine/texture.h engine/model.h
 engine/console.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
 engine/console.o: shared/ents.h shared/command.h shared/glexts.h
 engine/console.o: shared/glemu.h shared/iengine.h shared/igame.h
-engine/console.o: engine/world.h engine/octa.h engine/lightmap.h engine/bih.h
+engine/console.o: engine/world.h engine/octa.h engine/lightmap.h
 engine/console.o: engine/texture.h engine/model.h
 engine/decal.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
 engine/decal.o: shared/ents.h shared/command.h shared/glexts.h shared/glemu.h
 engine/decal.o: shared/iengine.h shared/igame.h engine/world.h engine/octa.h
-engine/decal.o: engine/lightmap.h engine/bih.h engine/texture.h
+engine/decal.o: engine/lightmap.h  engine/texture.h
 engine/decal.o: engine/model.h
 engine/lightmap.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
 engine/lightmap.o: shared/ents.h shared/command.h shared/glexts.h
 engine/lightmap.o: shared/glemu.h shared/iengine.h shared/igame.h
 engine/lightmap.o: engine/world.h engine/octa.h engine/lightmap.h
-engine/lightmap.o: engine/bih.h engine/texture.h engine/model.h
+engine/lightmap.o:  engine/texture.h engine/model.h
 engine/main.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
 engine/main.o: shared/ents.h shared/command.h shared/glexts.h shared/glemu.h
 engine/main.o: shared/iengine.h shared/igame.h engine/world.h engine/octa.h
-engine/main.o: engine/lightmap.h engine/bih.h engine/texture.h engine/model.h
+engine/main.o: engine/lightmap.h  engine/texture.h engine/model.h
 engine/material.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
 engine/material.o: shared/ents.h shared/command.h shared/glexts.h
 engine/material.o: shared/glemu.h shared/iengine.h shared/igame.h
 engine/material.o: engine/world.h engine/octa.h engine/lightmap.h
-engine/material.o: engine/bih.h engine/texture.h engine/model.h
+engine/material.o:  engine/texture.h engine/model.h
 engine/menus.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
 engine/menus.o: shared/ents.h shared/command.h shared/glexts.h shared/glemu.h
 engine/menus.o: shared/iengine.h shared/igame.h engine/world.h engine/octa.h
-engine/menus.o: engine/lightmap.h engine/bih.h engine/texture.h
+engine/menus.o: engine/lightmap.h  engine/texture.h
 engine/menus.o: engine/model.h
 engine/normal.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
 engine/normal.o: shared/ents.h shared/command.h shared/glexts.h
 engine/normal.o: shared/glemu.h shared/iengine.h shared/igame.h
-engine/normal.o: engine/world.h engine/octa.h engine/lightmap.h engine/bih.h
+engine/normal.o: engine/world.h engine/octa.h engine/lightmap.h
 engine/normal.o: engine/texture.h engine/model.h
 engine/octa.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
 engine/octa.o: shared/ents.h shared/command.h shared/glexts.h shared/glemu.h
 engine/octa.o: shared/iengine.h shared/igame.h engine/world.h engine/octa.h
-engine/octa.o: engine/lightmap.h engine/bih.h engine/texture.h engine/model.h
+engine/octa.o: engine/lightmap.h  engine/texture.h engine/model.h
 engine/octaedit.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
 engine/octaedit.o: shared/ents.h shared/command.h shared/glexts.h
 engine/octaedit.o: shared/glemu.h shared/iengine.h shared/igame.h
 engine/octaedit.o: engine/world.h engine/octa.h engine/lightmap.h
-engine/octaedit.o: engine/bih.h engine/texture.h engine/model.h
+engine/octaedit.o:  engine/texture.h engine/model.h
 engine/octarender.o: engine/engine.h shared/cube.h shared/tools.h
 engine/octarender.o: shared/geom.h shared/ents.h shared/command.h
 engine/octarender.o: shared/glexts.h shared/glemu.h shared/iengine.h
 engine/octarender.o: shared/igame.h engine/world.h engine/octa.h
-engine/octarender.o: engine/lightmap.h engine/bih.h engine/texture.h
+engine/octarender.o: engine/lightmap.h  engine/texture.h
 engine/octarender.o: engine/model.h
 engine/physics.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
 engine/physics.o: shared/ents.h shared/command.h shared/glexts.h
 engine/physics.o: shared/glemu.h shared/iengine.h shared/igame.h
-engine/physics.o: engine/world.h engine/octa.h engine/lightmap.h engine/bih.h
+engine/physics.o: engine/world.h engine/octa.h engine/lightmap.h
 engine/physics.o: engine/texture.h engine/model.h engine/mpr.h
 engine/rendergl.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
 engine/rendergl.o: shared/ents.h shared/command.h shared/glexts.h
 engine/rendergl.o: shared/glemu.h shared/iengine.h shared/igame.h
 engine/rendergl.o: engine/world.h engine/octa.h engine/lightmap.h
-engine/rendergl.o: engine/bih.h engine/texture.h engine/model.h
+engine/rendergl.o:  engine/texture.h engine/model.h
 engine/rendermodel.o: engine/engine.h shared/cube.h shared/tools.h
 engine/rendermodel.o: shared/geom.h shared/ents.h shared/command.h
 engine/rendermodel.o: shared/glexts.h shared/glemu.h shared/iengine.h
 engine/rendermodel.o: shared/igame.h engine/world.h engine/octa.h
-engine/rendermodel.o: engine/lightmap.h engine/bih.h engine/texture.h
-engine/rendermodel.o: engine/model.h engine/ragdoll.h engine/animmodel.h
+engine/rendermodel.o: engine/lightmap.h  engine/texture.h
+engine/rendermodel.o: engine/model.h engine/animmodel.h
 engine/rendermodel.o: engine/skelmodel.h
 engine/rendermodel.o: engine/md5.h engine/iqm.h
 engine/renderparticles.o: engine/engine.h shared/cube.h shared/tools.h
 engine/renderparticles.o: shared/geom.h shared/ents.h shared/command.h
 engine/renderparticles.o: shared/glexts.h shared/glemu.h shared/iengine.h
 engine/renderparticles.o: shared/igame.h engine/world.h engine/octa.h
-engine/renderparticles.o: engine/lightmap.h engine/bih.h engine/texture.h
+engine/renderparticles.o: engine/lightmap.h  engine/texture.h
 engine/renderparticles.o: engine/model.h engine/rendertarget.h
 engine/rendertext.o: engine/engine.h shared/cube.h shared/tools.h
 engine/rendertext.o: shared/geom.h shared/ents.h shared/command.h
 engine/rendertext.o: shared/glexts.h shared/glemu.h shared/iengine.h
 engine/rendertext.o: shared/igame.h engine/world.h engine/octa.h
-engine/rendertext.o: engine/lightmap.h engine/bih.h engine/texture.h
+engine/rendertext.o: engine/lightmap.h  engine/texture.h
 engine/rendertext.o: engine/model.h
 engine/renderva.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
 engine/renderva.o: shared/ents.h shared/command.h shared/glexts.h
 engine/renderva.o: shared/glemu.h shared/iengine.h shared/igame.h
 engine/renderva.o: engine/world.h engine/octa.h engine/lightmap.h
-engine/renderva.o: engine/bih.h engine/texture.h engine/model.h
+engine/renderva.o:  engine/texture.h engine/model.h
 engine/server.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
 engine/server.o: shared/ents.h shared/command.h shared/glexts.h
 engine/server.o: shared/glemu.h shared/iengine.h shared/igame.h
-engine/server.o: engine/world.h engine/octa.h engine/lightmap.h engine/bih.h
+engine/server.o: engine/world.h engine/octa.h engine/lightmap.h
 engine/server.o: engine/texture.h engine/model.h
 engine/serverbrowser.o: engine/engine.h shared/cube.h shared/tools.h
 engine/serverbrowser.o: shared/geom.h shared/ents.h shared/command.h
 engine/serverbrowser.o: shared/glexts.h shared/glemu.h shared/iengine.h
 engine/serverbrowser.o: shared/igame.h engine/world.h engine/octa.h
-engine/serverbrowser.o: engine/lightmap.h engine/bih.h engine/texture.h
+engine/serverbrowser.o: engine/lightmap.h  engine/texture.h
 engine/serverbrowser.o: engine/model.h
 engine/shader.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
 engine/shader.o: shared/ents.h shared/command.h shared/glexts.h
 engine/shader.o: shared/glemu.h shared/iengine.h shared/igame.h
-engine/shader.o: engine/world.h engine/octa.h engine/lightmap.h engine/bih.h
+engine/shader.o: engine/world.h engine/octa.h engine/lightmap.h
 engine/shader.o: engine/texture.h engine/model.h
-engine/shadowmap.o: engine/engine.h shared/cube.h shared/tools.h
-engine/shadowmap.o: shared/geom.h shared/ents.h shared/command.h
-engine/shadowmap.o: shared/glexts.h shared/glemu.h shared/iengine.h
-engine/shadowmap.o: shared/igame.h engine/world.h engine/octa.h
-engine/shadowmap.o: engine/lightmap.h engine/bih.h engine/texture.h
-engine/shadowmap.o: engine/model.h engine/rendertarget.h
 engine/sound.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
 engine/sound.o: shared/ents.h shared/command.h shared/glexts.h shared/glemu.h
 engine/sound.o: shared/iengine.h shared/igame.h engine/world.h engine/octa.h
-engine/sound.o: engine/lightmap.h engine/bih.h engine/texture.h
+engine/sound.o: engine/lightmap.h  engine/texture.h
 engine/sound.o: engine/model.h
 engine/texture.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
 engine/texture.o: shared/ents.h shared/command.h shared/glexts.h
 engine/texture.o: shared/glemu.h shared/iengine.h shared/igame.h
-engine/texture.o: engine/world.h engine/octa.h engine/lightmap.h engine/bih.h
+engine/texture.o: engine/world.h engine/octa.h engine/lightmap.h
 engine/texture.o: engine/texture.h engine/model.h
 engine/world.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
 engine/world.o: shared/ents.h shared/command.h shared/glexts.h shared/glemu.h
 engine/world.o: shared/iengine.h shared/igame.h engine/world.h engine/octa.h
-engine/world.o: engine/lightmap.h engine/bih.h engine/texture.h
+engine/world.o: engine/lightmap.h  engine/texture.h
 engine/world.o: engine/model.h
 engine/worldio.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
 engine/worldio.o: shared/ents.h shared/command.h shared/glexts.h
 engine/worldio.o: shared/glemu.h shared/iengine.h shared/igame.h
-engine/worldio.o: engine/world.h engine/octa.h engine/lightmap.h engine/bih.h
+engine/worldio.o: engine/world.h engine/octa.h engine/lightmap.h
 engine/worldio.o: engine/texture.h engine/model.h
 fpsgame/ai.o: fpsgame/game.h shared/cube.h shared/tools.h shared/geom.h
 fpsgame/ai.o: shared/ents.h shared/command.h shared/glexts.h shared/glemu.h
@@ -413,7 +395,6 @@ fpsgame/scoreboard.o: shared/igame.h fpsgame/ai.h
 fpsgame/server.o: fpsgame/game.h shared/cube.h shared/tools.h shared/geom.h
 fpsgame/server.o: shared/ents.h shared/command.h shared/glexts.h
 fpsgame/server.o: shared/glemu.h shared/iengine.h shared/igame.h fpsgame/ai.h
-fpsgame/server.o: fpsgame/extinfo.h fpsgame/aiman.h
 fpsgame/waypoint.o: fpsgame/game.h shared/cube.h shared/tools.h shared/geom.h
 fpsgame/waypoint.o: shared/ents.h shared/command.h shared/glexts.h
 fpsgame/waypoint.o: shared/glemu.h shared/iengine.h shared/igame.h
@@ -428,7 +409,7 @@ shared/cube.h.gch: shared/iengine.h shared/igame.h
 engine/engine.h.gch: shared/cube.h shared/tools.h shared/geom.h shared/ents.h
 engine/engine.h.gch: shared/command.h shared/glexts.h shared/glemu.h
 engine/engine.h.gch: shared/iengine.h shared/igame.h engine/world.h
-engine/engine.h.gch: engine/octa.h engine/lightmap.h engine/bih.h
+engine/engine.h.gch: engine/octa.h engine/lightmap.h
 engine/engine.h.gch: engine/texture.h engine/model.h
 fpsgame/game.h.gch: shared/cube.h shared/tools.h shared/geom.h shared/ents.h
 fpsgame/game.h.gch: shared/command.h shared/glexts.h shared/glemu.h
@@ -458,8 +439,6 @@ fpsgame/entities-standalone.o: shared/iengine.h shared/igame.h fpsgame/ai.h
 fpsgame/server-standalone.o: fpsgame/game.h shared/cube.h shared/tools.h
 fpsgame/server-standalone.o: shared/geom.h shared/ents.h shared/command.h
 fpsgame/server-standalone.o: shared/iengine.h shared/igame.h fpsgame/ai.h
-fpsgame/server-standalone.o: fpsgame/extinfo.h
-fpsgame/server-standalone.o: fpsgame/aiman.h
 engine/master-standalone.o: shared/cube.h shared/tools.h shared/geom.h
 engine/master-standalone.o: shared/ents.h shared/command.h shared/iengine.h
 engine/master-standalone.o: shared/igame.h