Merge branch 'master' of /home/fg/fgone/Aquaria_fg_clean

Aquaria/AnimationEditor.cpp

@@ -1311,6 +1311,8 @@ void AnimationEditor::moveNextWidgets(float dt)
 
 void AnimationEditor::toggleRenderBorders()
 {
+	if (dsq->isNested()) return;
+
 	renderBorders = !renderBorders;
 	updateRenderBorders();
 }
@@ -1336,18 +1338,24 @@ void AnimationEditor::updateEditingBone()
 
 void AnimationEditor::showAllBones()
 {
+	if (dsq->isNested()) return;
+
 	for (size_t i = 0; i < editSprite->bones.size(); ++i)
 		editSprite->bones[i]->renderQuad = true;
 }
 
 void AnimationEditor::incrTimelineUnit()
 {
+	if (dsq->isNested()) return;
+
 	TIMELINE_UNIT += TIMELINE_UNIT_STEP;
 	updateTimelineUnit();
 }
 
 void AnimationEditor::decrTimelineUnit()
 {
+	if (dsq->isNested()) return;
+
 	float t = TIMELINE_UNIT - TIMELINE_UNIT_STEP;
 	if (t >= TIMELINE_UNIT_STEP)
 		TIMELINE_UNIT = t;
@@ -1363,12 +1371,16 @@ void AnimationEditor::updateTimelineUnit()
 
 void AnimationEditor::incrTimelineGrid()
 {
+	if (dsq->isNested()) return;
+
 	TIMELINE_GRIDSIZE++;
 	updateTimelineGrid();
 }
 
 void AnimationEditor::decrTimelineGrid()
 {
+	if (dsq->isNested()) return;
+
 	int t = TIMELINE_GRIDSIZE - 1;
 	if (t > 0)
 		TIMELINE_GRIDSIZE = t;

Aquaria/Avatar.cpp

@@ -44,8 +44,6 @@ bool lastJumpOutFromWaterBubble = false;
 bool useSpiritDistance = true;
 bool inSpiritWorld = false;
 
-const int LAYER_FLOURISH = 3;
-
 const float MULT_DMG_CRABCOSTUME = 0.75;
 const float MULT_DMG_FISHFORM = 1.5;
 const float MULT_DMG_SEAHORSEARMOR = 0.6;
@@ -134,9 +132,6 @@ bool _isUnderWater;
 
 //HRECORD avatarRecord = 0;
 
-#define ANIMLAYER_OVERRIDE			4
-#define ANIMLAYER_UPPERBODYIDLE		6
-#define ANIMLAYER_HEADOVERRIDE		7
 
 Vector Target::getWorldPosition()
 {
@@ -843,7 +838,7 @@ void Avatar::startFlourish()
 		flourishTimer.start(fanim->getAnimationLength()-0.2f);
 		flourishPowerTimer.start(fanim->getAnimationLength()*0.5f);
 	}
-	skeletalSprite.transitionAnimate(anim, 0.1, 0, LAYER_FLOURISH);
+	skeletalSprite.transitionAnimate(anim, 0.1, 0, ANIMLAYER_FLOURISH);
 	flourish = true;
 
 	float rotz = rotationOffset.z;
@@ -2688,7 +2683,7 @@ bool Avatar::fireAtNearestValidEntity(const std::string &shot)
 
 		
 
-		skeletalSprite.transitionAnimate("fireBlast", 0.1, 0, 5);
+		skeletalSprite.transitionAnimate("fireBlast", 0.1, 0, ANIMLAYER_ARMOVERRIDE);
 		s->position = p;
 		//s->damageType = dt;
 		/*
@@ -2918,7 +2913,7 @@ void Avatar::formAbility(int ability)
 					else
 						doShock("EnergyTendril");
 					if (!state.lockedToWall)
-						skeletalSprite.animate("energyChargeAttack", 0, 6);
+						skeletalSprite.animate("energyChargeAttack", 0, ANIMLAYER_UPPERBODYIDLE);
 
 					/*
 					if (core->afterEffectManager)
@@ -3311,7 +3306,7 @@ void Avatar::doShock(const std::string &shotName)
 	int thits = getNumShots();
 
 	/*
-	if (skeletalSprite.getAnimationLayer(LAYER_FLOURISH)->getCurrentAnimation())
+	if (skeletalSprite.getAnimationLayer(ANIMLAYER_FLOURISH)->getCurrentAnimation())
 	{
 		thits = maxTendrilHits;
 	}
@@ -8889,7 +8884,7 @@ void Avatar::onUpdate(float dt)
 
 					std::ostringstream os;
 					os << "swimExtra-" << anim;
-					skeletalSprite.transitionAnimate(os.str(), 0.5, 0, 6);
+					skeletalSprite.transitionAnimate(os.str(), 0.5, 0, ANIMLAYER_UPPERBODYIDLE);
 				}
 			}
 		}

Aquaria/Avatar.h

@@ -59,6 +59,16 @@ enum EnableInputType
 	AVATARINPUT_MAX
 };
 
+enum AvatarAnimLayers
+{
+	ANIMLAYER_FLOURISH		= 3,
+	ANIMLAYER_OVERRIDE		= 4,
+	ANIMLAYER_ARMOVERRIDE	= 5,
+	ANIMLAYER_UPPERBODYIDLE	= 6,
+	ANIMLAYER_HEADOVERRIDE	= 7,
+	ANIMLAYER_MAX
+};
+
 class SongIconParticle : public Quad
 {
 public:

Aquaria/DSQ.cpp

@@ -1981,7 +1981,8 @@ void DSQ::setInputMode(InputMode mode)
 
 void DSQ::toggleRenderCollisionShapes()
 {
-	RenderObject::renderCollisionShape = !RenderObject::renderCollisionShape;
+	if (core->getCtrlState() && core->getShiftState())
+		RenderObject::renderCollisionShape = !RenderObject::renderCollisionShape;
 }
 
 void DSQ::takeScreenshot()
@@ -4137,13 +4138,11 @@ void DSQ::bindInput()
 #endif
 	if (isDeveloperKeys())
 	{
-#if defined(BBGE_BUILD_WINDOWS) || defined(BBGE_BUILD_UNIX)
-		addAction(MakeFunctionEvent(DSQ, instantQuit), KEY_Q, 1);
 #ifdef AQUARIA_BUILD_CONSOLE
 		addAction(MakeFunctionEvent(DSQ, toggleConsole), KEY_TILDE, 0);
 #endif
-#endif
+		addAction(MakeFunctionEvent(DSQ, instantQuit), KEY_Q, 1);
-		addAction(MakeFunctionEvent(DSQ, toggleRenderCollisionShapes), KEY_CAPSLOCK, 0);
+		addAction(MakeFunctionEvent(DSQ, toggleRenderCollisionShapes), KEY_RETURN, 0);
 	}
 	addAction(MakeFunctionEvent(DSQ, debugMenu), KEY_BACKSPACE, 0);
 #if BBGE_BUILD_SDL
@@ -4879,6 +4878,8 @@ std::string DSQ::getSaveDirectory()
 
 ParticleEffect *DSQ::spawnParticleEffect(const std::string &name, Vector position, float rotz, float t, int layer, float follow)
 {
+	if (name.empty())
+		return NULL;
 	if (t!=0)
 	{
 		PECue p(name, position, rotz, t);

Aquaria/Game.cpp

@@ -5806,7 +5806,7 @@ Entity* Game::setActivePet(int flag)
 
 void Game::createLi()
 {
-	int liFlag = dsq->continuity.getFlag(1000);
+	int liFlag = dsq->continuity.getFlag(FLAG_LI);
 	std::ostringstream os;
 	os << "liFlag: " << liFlag;
 	debugLog(os.str());

Aquaria/SceneEditor.cpp

@@ -3370,9 +3370,12 @@ void SceneEditor::updateText()
 		os << "entities (" << dsq->entities.size() << ")";
 		if (editingEntity)
 		{
-			os << " id: " << editingEntity->getID() << " name: " << editingEntity->name << " flag: " << dsq->continuity.getEntityFlag(dsq->game->sceneName, editingEntity->getID());
+			os << " id: " << editingEntity->getID()
-			os << " groupID: " << editingEntity->getGroupID() << " ";
+				<< " name: " << editingEntity->name
-			os << " state: " << editingEntity->getState();
+				<< " flag:" << dsq->continuity.getEntityFlag(dsq->game->sceneName, editingEntity->getID())
+				<< " fh:" << editingEntity->isfh()
+				<< " fv:" << editingEntity->isfv()
+				<< " state:" << editingEntity->getState();
 		}
 	break;
 	case ET_PATHS:

Aquaria/ScriptInterface.cpp

@@ -863,6 +863,12 @@ luaFunc(obj_getRotation)
 	luaReturnNum(r ? r->rotation.z : 0.0f);
 }
 
+luaFunc(obj_getRotationOffset)
+{
+	RenderObject *r = robj(L);
+	luaReturnNum(r ? r->rotationOffset.z : 0.0f);
+}
+
 luaFunc(obj_offset)
 {
 	RenderObject *r = robj(L);
@@ -887,6 +893,15 @@ luaFunc(obj_internalOffset)
 	luaReturnNil();
 }
 
+luaFunc(obj_getInternalOffset)
+{
+	RenderObject *r = robj(L);
+	Vector io;
+	if (r)
+		io = r->internalOffset;
+	luaReturnVec2(io.x, io.y);
+}
+
 luaFunc(obj_getPosition)
 {
 	float x=0,y=0;
@@ -1440,10 +1455,12 @@ luaFunc(quad_setHeight)
 	RO_FUNC(getter, prefix,  rotate			) \
 	RO_FUNC(getter, prefix,  rotateOffset	) \
 	RO_FUNC(getter, prefix,  getRotation	) \
+	RO_FUNC(getter, prefix,  getRotationOffset) \
 	RO_FUNC(getter, prefix,  isRotating		) \
 	RO_FUNC(getter, prefix,  offset			) \
 	RO_FUNC(getter, prefix,  getOffset		) \
 	RO_FUNC(getter, prefix,  internalOffset	) \
+	RO_FUNC(getter, prefix,  getInternalOffset) \
 	RO_FUNC(getter, prefix,  getPosition	) \
 	RO_FUNC(getter, prefix,  x				) \
 	RO_FUNC(getter, prefix,  y				) \
@@ -3233,16 +3250,30 @@ luaFunc(entity_initStrands)
 
 luaFunc(entity_initSkeletal)
 {
-	ScriptedEntity *e = scriptedEntity(L);
+	Entity *e = entity(L);
-	e->renderQuad = false;
+	if (e)
-	e->setWidthHeight(128, 128);
+	{
-	e->skeletalSprite.loadSkeletal(getString(L, 2));
+		e->renderQuad = false;
-	const char *s = lua_tostring(L, 3);
+		e->setWidthHeight(128, 128);
-	if (s && *s)
+		e->skeletalSprite.loadSkeletal(getString(L, 2));
-		e->skeletalSprite.loadSkin(s);
+		const char *s = lua_tostring(L, 3);
+		if (s && *s)
+			e->skeletalSprite.loadSkin(s);
+	}
 	luaReturnNil();
 }
 
+luaFunc(entity_loadSkin)
+{
+	Entity *e = entity(L);
+	if (e && e->skeletalSprite.isLoaded())
+	{
+		const char *s = lua_tostring(L, 2);
+		if (s && *s)
+			e->skeletalSprite.loadSkin(s);
+	}
+	luaReturnNil();
+}
 
 luaFunc(entity_idle)
 {
@@ -3296,6 +3327,18 @@ luaFunc(entity_animate)
 	luaReturnNum(ret);
 }
 
+luaFunc(entity_stopAnimation)
+{
+	SkeletalSprite *skel = getSkeletalSprite(entity(L));
+	if (skel)
+	{
+		AnimationLayer *animlayer = skel->getAnimationLayer(lua_tointeger(L, 2));
+		if (animlayer)
+			animlayer->stopAnimation();
+	}
+	luaReturnNil();
+}
+
 // entity, x, y, time, ease, relative
 luaFunc(entity_move)
 {
@@ -5658,7 +5701,7 @@ luaFunc(entity_pullEntities)
 	if (e)
 	{
 		Vector pos(lua_tonumber(L, 2), lua_tonumber(L, 3));
-		int range = lua_tonumber(L, 4);
+		float range = lua_tonumber(L, 4);
 		float len = lua_tonumber(L, 5);
 		float dt = lua_tonumber(L, 6);
 		FOR_ENTITIES(i)
@@ -6246,13 +6289,13 @@ luaFunc(toggleVersionLabel)
 luaFunc(setVersionLabelText)
 {
 	dsq->setVersionLabelText();
-	luaReturnPtr(NULL);
+	luaReturnNil();
 }
 
 luaFunc(setCutscene)
 {
 	dsq->setCutscene(getBool(L, 1), getBool(L, 2));
-	luaReturnPtr(NULL);
+	luaReturnNil();
 }
 
 luaFunc(isInCutscene)
@@ -6788,7 +6831,7 @@ luaFunc(entity_setWeight)
 {
 	CollideEntity *e = collideEntity(L);
 	if (e)
-		e->weight = lua_tointeger(L, 2);
+		e->weight = lua_tonumber(L, 2);
 	luaReturnNil();
 }
 
@@ -6885,6 +6928,13 @@ luaFunc(isObstructed)
 	luaReturnBool(dsq->game->isObstructed(TileVector(Vector(x,y))));
 }
 
+luaFunc(getObstruction)
+{
+	int x = lua_tonumber(L, 1);
+	int y = lua_tonumber(L, 2);
+	luaReturnInt(dsq->game->getGrid(TileVector(Vector(x,y))));
+}
+
 luaFunc(isObstructedBlock)
 {
 	int x = lua_tonumber(L, 1);
@@ -7099,21 +7149,24 @@ luaFunc(createBitmapText)
 luaFunc(text_setText)
 {
 	BaseText *txt = getText(L);
-	txt->setText(getString(L, 2));
+	if (txt)
+		txt->setText(getString(L, 2));
 	luaReturnNil();
 }
 
 luaFunc(text_setFontSize)
 {
 	BaseText *txt = getText(L);
-	txt->setFontSize(lua_tointeger(L, 2));
+	if (txt)
+		txt->setFontSize(lua_tointeger(L, 2));
 	luaReturnNil();
 }
 
 luaFunc(text_setWidth)
 {
 	BaseText *txt = getText(L);
-	txt->setWidth(lua_tointeger(L, 2));
+	if (txt)
+		txt->setWidth(lua_tointeger(L, 2));
 	luaReturnNil();
 }
 
@@ -7408,6 +7461,7 @@ static const struct {
 	luaRegister(entity_initSegments),
 	luaRegister(entity_warpSegments),
 	luaRegister(entity_initSkeletal),
+	luaRegister(entity_loadSkin),
 	luaRegister(entity_initStrands),
 
 	luaRegister(entity_hurtTarget),
@@ -7453,6 +7507,7 @@ static const struct {
 	luaRegister(entity_doCollisionAvoidance),
 	luaRegister(entity_animate),
 	luaRegister(entity_setAnimLayerTimeMult),
+	luaRegister(entity_stopAnimation),
 
 	luaRegister(entity_setCurrentTarget),
 	luaRegister(entity_stopInterpolating),
@@ -7610,6 +7665,7 @@ static const struct {
 	luaRegister(castSong),
 	luaRegister(isObstructed),
 	luaRegister(isObstructedBlock),
+	luaRegister(getObstruction),
 
 	luaRegister(isFlag),
 
@@ -8625,6 +8681,12 @@ static const struct {
 	luaConstant(INPUT_MOUSE),
 	luaConstant(INPUT_JOYSTICK),
 	luaConstant(INPUT_KEYBOARD),
+
+	luaConstant(ANIMLAYER_FLOURISH),
+	luaConstant(ANIMLAYER_OVERRIDE),
+	luaConstant(ANIMLAYER_ARMOVERRIDE),
+	luaConstant(ANIMLAYER_UPPERBODYIDLE),
+	luaConstant(ANIMLAYER_HEADOVERRIDE),
 };
 
 //============================================================================================

BBGE/Base.h

@@ -120,6 +120,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #pragma warning(disable:4189) // UqqqqSEFUL: local variable is initialized but not referenced
 #endif
 
+#undef GetCharWidth
+
 #include <string.h>
 
 #include <string>

BBGE/RenderObject.cpp

@@ -965,13 +965,15 @@ void RenderObject::renderCollision()
 	}
 	else if (collideRadius > 0)
 	{
-		/*
 		glPushMatrix();
+		glLoadIdentity();
+		core->setupRenderPositionAndScale();
 		glBindTexture(GL_TEXTURE_2D, 0);
-		//glScalef(-scale.x, -scale.y, 0);
+		glTranslatef(position.x+offset.x, position.y+offset.y, 0);
-		glTranslatef(-offset.x, -offset.y,0);
+		//glScalef(scale.x, scale.y, 0);
+		glTranslatef(internalOffset.x, internalOffset.y, 0);
 		glEnable(GL_BLEND);
-		glTranslatef(collidePosition.x, collidePosition.y,0);
+		//glTranslatef(collidePosition.x, collidePosition.y,0);
 		//glEnable(GL_ALPHA_TEST);
 		//glAlphaFunc(GL_GREATER, 0);
 		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -980,7 +982,6 @@ void RenderObject::renderCollision()
 		glDisable(GL_BLEND);
 		glTranslatef(offset.x, offset.y,0);
 		glPopMatrix();
-		*/
 	}
 }
 

BBGE/Texture.cpp

@@ -69,7 +69,6 @@ Texture::Texture() : Resource()
 	repeat = false;
 	repeating = false;
 	pngSetStandardOrientation(0);
-	imageData = 0;
 
 	ow = oh = -1;
 }
@@ -318,6 +317,7 @@ void Texture::load(std::string file)
 	file = core->adjustFilenameCase(file);
 
 	loadName = file;
+	repeating = false;
 
 	size_t pos = file.find_last_of('.');
 

BBGE/Texture.h

@@ -73,9 +73,7 @@ public:
 #ifdef BBGE_BUILD_DIRECTX
 	LPDIRECT3DTEXTURE9 d3dTexture;
 #endif
-	//void setImageData(imageData);
+
-	// HACK:
-	unsigned char *imageData;
 	void reload();
 
 	static TexErr textureError;

ExternalLibs/glfont2/glfont2.cpp

@@ -19,7 +19,6 @@ using namespace std;
 #endif
 #include <OpenGL/gl.h>
 */
-#include "Base.h"
 
 #include "SDL_endian.h"
 
@@ -91,10 +90,6 @@ bool GLFont::Create (const char *file_name, int tex, bool loadTexture)
 	header.end_char = read_int(input);
 	input.seekg(4, ios::cur); // skip chars field
 	
-	std::ostringstream os;
-	os << "tex_width: " << header.tex_width << " tex_height: " << header.tex_height;
-	debugLog(os.str());
-	
 	//Allocate space for character array
 	num_chars = header.end_char - header.start_char + 1;
 	if ((header.chars = new GLFontChar[num_chars]) == NULL)

aquaria.rc

@@ -0,0 +1 @@
+IDI_ICON1   ICON  DISCARDABLE  "aquaria.ico"

win/Aquaria_vc90.sln

@@ -0,0 +1,38 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Aquaria", "vc90\Aquaria.vcproj", "{4DB6D5AA-4EAD-4195-9B54-389B558036D8}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4C2AD812-6776-4728-A4B0-ABA397224152} = {4C2AD812-6776-4728-A4B0-ABA397224152}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BBGE", "vc90\BBGE.vcproj", "{4C2AD812-6776-4728-A4B0-ABA397224152}"
+	ProjectSection(ProjectDependencies) = postProject
+		{6A2DACD7-DA30-49A1-9214-CCDEB48E6050} = {6A2DACD7-DA30-49A1-9214-CCDEB48E6050}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external", "vc90\external.vcproj", "{6A2DACD7-DA30-49A1-9214-CCDEB48E6050}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4DB6D5AA-4EAD-4195-9B54-389B558036D8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4DB6D5AA-4EAD-4195-9B54-389B558036D8}.Debug|Win32.Build.0 = Debug|Win32
+		{4DB6D5AA-4EAD-4195-9B54-389B558036D8}.Release|Win32.ActiveCfg = Release|Win32
+		{4DB6D5AA-4EAD-4195-9B54-389B558036D8}.Release|Win32.Build.0 = Release|Win32
+		{4C2AD812-6776-4728-A4B0-ABA397224152}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4C2AD812-6776-4728-A4B0-ABA397224152}.Debug|Win32.Build.0 = Debug|Win32
+		{4C2AD812-6776-4728-A4B0-ABA397224152}.Release|Win32.ActiveCfg = Release|Win32
+		{4C2AD812-6776-4728-A4B0-ABA397224152}.Release|Win32.Build.0 = Release|Win32
+		{6A2DACD7-DA30-49A1-9214-CCDEB48E6050}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6A2DACD7-DA30-49A1-9214-CCDEB48E6050}.Debug|Win32.Build.0 = Debug|Win32
+		{6A2DACD7-DA30-49A1-9214-CCDEB48E6050}.Release|Win32.ActiveCfg = Release|Win32
+		{6A2DACD7-DA30-49A1-9214-CCDEB48E6050}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

win/vc90/Aquaria.vcproj

@@ -0,0 +1,556 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="Aquaria"
+	ProjectGUID="{4DB6D5AA-4EAD-4195-9B54-389B558036D8}"
+	RootNamespace="Aquaria_vc90"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)\..\bin"
+			IntermediateDirectory="$(SolutionDir)\temp\$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\ExternalLibs\freetype2\include\freetype\config&quot;;&quot;$(SolutionDir)\..\ExternalLibs\gl&quot;;&quot;$(SolutionDir)\..\ExternalLibs\glpng\zlib&quot;;&quot;$(SolutionDir)\..\ExternalLibs\glpng\png&quot;;&quot;$(SolutionDir)\..\ExternalLibs\libogg-1.3.0\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\libvorbis-1.3.2\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\freetype2\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\FTGL\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\SDL12\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\AL\include&quot;;&quot;$(SolutionDir)\..\BBGE&quot;;&quot;$(SolutionDir)\..\ExternalLibs\lua-5.1.4\src&quot;;&quot;$(SolutionDir)\..\ExternalLibs\lvpa\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\lvpa&quot;;&quot;$(SolutionDir)\..\ExternalLibs\ttvfs&quot;;&quot;$(SolutionDir)\..\ExternalLibs&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;GL_GLEXT_LEGACY=1;TIXML_USE_STL=1;HAVE_PUTENV=1;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;BBGE_BUILD_WINDOWS=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\$(ProjectName)d.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""
+				IgnoreDefaultLibraryNames="msvcrt.lib"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)\..\bin"
+			IntermediateDirectory="$(SolutionDir)\temp\$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\ExternalLibs\freetype2\include\freetype\config&quot;;&quot;$(SolutionDir)\..\ExternalLibs\gl&quot;;&quot;$(SolutionDir)\..\ExternalLibs\glpng\zlib&quot;;&quot;$(SolutionDir)\..\ExternalLibs\glpng\png&quot;;&quot;$(SolutionDir)\..\ExternalLibs\libogg-1.3.0\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\libvorbis-1.3.2\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\freetype2\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\FTGL\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\SDL12\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\AL\include&quot;;&quot;$(SolutionDir)\..\BBGE&quot;;&quot;$(SolutionDir)\..\ExternalLibs\lua-5.1.4\src&quot;;&quot;$(SolutionDir)\..\ExternalLibs\lvpa\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\lvpa&quot;;&quot;$(SolutionDir)\..\ExternalLibs\ttvfs&quot;;&quot;$(SolutionDir)\..\ExternalLibs&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;GL_GLEXT_LEGACY=1;TIXML_USE_STL=1;HAVE_PUTENV=1;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;BBGE_BUILD_WINDOWS=1;_HAS_EXCEPTIONS=0"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="false"
+				EnableEnhancedInstructionSet="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				IgnoreDefaultLibraryNames="msvcrt.lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\Aquaria\AnimationEditor.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\AquariaComboBox.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\AquariaMenuItem.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\AquariaMenuItem.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\AquariaProgressBar.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\AquariaProgressBar.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\AquariaSaveSlot.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\AStar.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\AutoMap.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\AutoMap.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Avatar.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Avatar.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Beam.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\BitBlotLogo.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\CollideEntity.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\CollideEntity.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Continuity.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Credits.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\CurrentRender.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Demo.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\DSQ.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\DSQ.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Element.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Element.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Emote.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Entity.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Entity.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\FlockEntity.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\FlockEntity.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Game.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Game.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\GameplayVariables.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\GasCloud.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\GridRender.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\GridRender.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Hair.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Hair.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Ingredient.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Intro.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Main.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\ManaBall.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\MiniMapRender.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Mod.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\ModSelector.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\ParticleEditor.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Path.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Path.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\PathFinding.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\PathFinding.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\PathRender.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\RecipeMenuEntry.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\resource.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\SceneEditor.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\SchoolFish.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\SchoolFish.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\ScriptedEntity.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\ScriptedEntity.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\ScriptInterface.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\ScriptInterface.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Segmented.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Segmented.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\SFXLoops.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Shot.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Shot.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Spore.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\States.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\States.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\StatsAndAchievements.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\StatsAndAchievements.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\SteamRender.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Strand.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\StringBank.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\SubtitlePlayer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\TileVector.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\ToolTip.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\ToolTip.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\UserSettings.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\UserSettings.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\WaterFont.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\WaterFont.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\WaterSurfaceRender.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\WaterSurfaceRender.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Web.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\Web.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\WorldMapRender.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Aquaria\WorldMapTiles.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\Aquaria\AquariaCompileConfig.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\..\Aquaria\Aquaria.rc"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

win/vc90/BBGE.vcproj

@@ -0,0 +1,558 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="BBGE"
+	ProjectGUID="{4C2AD812-6776-4728-A4B0-ABA397224152}"
+	RootNamespace="Aquaria_vc90"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)\temp\$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory="$(SolutionDir)\temp\$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\ExternalLibs\freetype2\include\freetype\config&quot;;&quot;$(SolutionDir)\..\ExternalLibs\gl&quot;;&quot;$(SolutionDir)\..\ExternalLibs\glpng\zlib&quot;;&quot;$(SolutionDir)\..\ExternalLibs\glpng\png&quot;;&quot;$(SolutionDir)\..\ExternalLibs\libogg-1.3.0\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\libvorbis-1.3.2\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\freetype2\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\FTGL\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\SDL12\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\AL\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\ttvfs&quot;;&quot;$(SolutionDir)\..\ExternalLibs\lvpa&quot;;&quot;$(SolutionDir)\..\ExternalLibs\lvpa\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;GL_GLEXT_LEGACY=1;TIXML_USE_STL=1;HAVE_PUTENV=1;FTGL_LIBRARY_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;BBGE_BUILD_WINDOWS=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalDependencies="SDL.lib SDLmain.lib OpenAL32.lib"
+				AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\ExternalLibs\AL\lib\win32&quot;;&quot;$(SolutionDir)\..\ExternalLibs\SDL12\lib\win32&quot;"
+				IgnoreAllDefaultLibraries="true"
+				IgnoreDefaultLibraryNames=""
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)\temp\$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory="$(SolutionDir)\temp\$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\ExternalLibs\freetype2\include\freetype\config&quot;;&quot;$(SolutionDir)\..\ExternalLibs\gl&quot;;&quot;$(SolutionDir)\..\ExternalLibs\glpng\zlib&quot;;&quot;$(SolutionDir)\..\ExternalLibs\glpng\png&quot;;&quot;$(SolutionDir)\..\ExternalLibs\libogg-1.3.0\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\libvorbis-1.3.2\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\freetype2\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\FTGL\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\SDL12\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\AL\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs\ttvfs&quot;;&quot;$(SolutionDir)\..\ExternalLibs\lvpa&quot;;&quot;$(SolutionDir)\..\ExternalLibs\lvpa\include&quot;;&quot;$(SolutionDir)\..\ExternalLibs&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GL_GLEXT_LEGACY=1;TIXML_USE_STL=1;HAVE_PUTENV=1;FTGL_LIBRARY_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;BBGE_BUILD_WINDOWS=1;_HAS_EXCEPTIONS=0"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="false"
+				EnableEnhancedInstructionSet="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalDependencies="SDL.lib SDLmain.lib OpenAL32.lib"
+				AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\ExternalLibs\AL\lib\win32&quot;;&quot;$(SolutionDir)\..\ExternalLibs\SDL12\lib\win32&quot;"
+				IgnoreAllDefaultLibraries="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\BBGE\ActionInput.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\ActionInput.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\ActionMapper.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\ActionMapper.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\ActionSet.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\ActionSet.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\AfterEffect.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\AfterEffect.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\AnimatedSprite.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\AnimatedSprite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Base.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Base.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\BaseText.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\BitmapFont.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\BitmapFont.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\ByteBuffer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Collision.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Collision.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\CommonEvents.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Core.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Core.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\DarkLayer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\DarkLayer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\DebugFont.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\DebugFont.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\DeflateCompressor.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\DeflateCompressor.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Effects.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Effects.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Emitter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Event.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Event.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Flags.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Flags.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\FmodOpenALBridge.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\FmodOpenALBridge.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\FrameBuffer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\FrameBuffer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Gradient.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Gradient.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Interpolator.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Interpolator.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Joystick.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\LensFlare.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Math.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\MathFunctions.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\OpenGLStubs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\ParticleEffect.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\ParticleManager.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Particles.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Particles.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Precacher.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Precacher.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Quad.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Quad.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\QuadTrail.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\QuadTrail.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Rect.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\RenderObject.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\RenderObject.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\RenderObject_inline.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\RenderObjectLayer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\RenderRect.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Resource.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Resource.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\RoundedRect.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\RoundedRect.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\ScreenTransition.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\ScreenTransition.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\ScriptObject.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\ScriptObject.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Shader.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Shader.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\SimpleIStringStream.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\SkeletalSprite.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\SkeletalSprite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Slider.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Slider.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\SoundManager.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\SoundManager.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\SpawnParticleData.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\StateMachine.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\StateMachine.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\StateManager.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\StateManager.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Strings.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Texture.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Texture.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\TTFFont.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\TTFFont.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Vector.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Vector.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\BBGE\BBGECompileConfig.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>