diff --git a/build/Lol (vs2013).sln b/build/Lol (vs2013).sln
index 61a3c495..2efa7bab 100644
--- a/build/Lol (vs2013).sln
+++ b/build/Lol (vs2013).sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
+VisualStudioVersion = 12.0.30723.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deushax", "..\games\deushax\deushax.vcxproj", "{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}"
EndProject
@@ -136,6 +136,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "The Pimp", "The Pimp", "{21
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pimp", "..\tools\pimp\pimp.vcxproj", "{FFF58874-D460-41E6-AD65-DBFEC6E47A94}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Unit Test", "Unit Test", "{E4DFEBF9-C310-462F-9876-7EB59C1E4D4E}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ORBIS = Debug|ORBIS
@@ -239,6 +241,116 @@ Global
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|x64.ActiveCfg = Release|x64
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|x64.Build.0 = Release|x64
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Xbox 360.ActiveCfg = Release|Win32
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|ORBIS.Build.0 = Debug|ORBIS
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|PS3.ActiveCfg = Debug|PS3
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|PS3.Build.0 = Debug|PS3
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Win32.Build.0 = Debug|Win32
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|x64.ActiveCfg = Debug|x64
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|x64.Build.0 = Debug|x64
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|ORBIS.ActiveCfg = Release|ORBIS
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|ORBIS.Build.0 = Release|ORBIS
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|PS3.ActiveCfg = Release|PS3
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|PS3.Build.0 = Release|PS3
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Win32.ActiveCfg = Release|Win32
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Win32.Build.0 = Release|Win32
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|x64.ActiveCfg = Release|x64
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|x64.Build.0 = Release|x64
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Xbox 360.Build.0 = Release|Xbox 360
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|ORBIS.Build.0 = Debug|ORBIS
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|PS3.ActiveCfg = Debug|PS3
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|PS3.Build.0 = Debug|PS3
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Win32.ActiveCfg = Debug|Win32
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Win32.Build.0 = Debug|Win32
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|x64.ActiveCfg = Debug|x64
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|x64.Build.0 = Debug|x64
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|ORBIS.ActiveCfg = Release|ORBIS
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|ORBIS.Build.0 = Release|ORBIS
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|PS3.ActiveCfg = Release|PS3
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|PS3.Build.0 = Release|PS3
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Win32.ActiveCfg = Release|Win32
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Win32.Build.0 = Release|Win32
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|x64.ActiveCfg = Release|x64
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|x64.Build.0 = Release|x64
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Xbox 360.Build.0 = Release|Xbox 360
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|ORBIS.Build.0 = Debug|ORBIS
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|PS3.ActiveCfg = Debug|PS3
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|PS3.Build.0 = Debug|PS3
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Win32.Build.0 = Debug|Win32
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|x64.ActiveCfg = Debug|x64
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|x64.Build.0 = Debug|x64
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|ORBIS.ActiveCfg = Release|ORBIS
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|ORBIS.Build.0 = Release|ORBIS
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|PS3.ActiveCfg = Release|PS3
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|PS3.Build.0 = Release|PS3
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Win32.ActiveCfg = Release|Win32
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Win32.Build.0 = Release|Win32
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|x64.ActiveCfg = Release|x64
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|x64.Build.0 = Release|x64
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Xbox 360.Build.0 = Release|Xbox 360
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|ORBIS.Build.0 = Debug|ORBIS
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|PS3.ActiveCfg = Debug|PS3
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|PS3.Build.0 = Debug|PS3
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Win32.ActiveCfg = Debug|Win32
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Win32.Build.0 = Debug|Win32
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|x64.ActiveCfg = Debug|x64
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|x64.Build.0 = Debug|x64
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|ORBIS.ActiveCfg = Release|ORBIS
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|ORBIS.Build.0 = Release|ORBIS
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|PS3.ActiveCfg = Release|PS3
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|PS3.Build.0 = Release|PS3
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Win32.ActiveCfg = Release|Win32
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Win32.Build.0 = Release|Win32
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|x64.ActiveCfg = Release|x64
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|x64.Build.0 = Release|x64
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Xbox 360.Build.0 = Release|Xbox 360
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|ORBIS.Build.0 = Debug|ORBIS
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|PS3.ActiveCfg = Debug|PS3
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|PS3.Build.0 = Debug|PS3
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Win32.Build.0 = Debug|Win32
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|x64.ActiveCfg = Debug|x64
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|x64.Build.0 = Debug|x64
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|ORBIS.ActiveCfg = Release|ORBIS
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|ORBIS.Build.0 = Release|ORBIS
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|PS3.ActiveCfg = Release|PS3
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|PS3.Build.0 = Release|PS3
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Win32.ActiveCfg = Release|Win32
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Win32.Build.0 = Release|Win32
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|x64.ActiveCfg = Release|x64
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|x64.Build.0 = Release|x64
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Xbox 360.Build.0 = Release|Xbox 360
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|ORBIS.ActiveCfg = Debug|Win32
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|PS3.ActiveCfg = Debug|Win32
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -252,19 +364,6 @@ Global
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|x64.ActiveCfg = Release|x64
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|x64.Build.0 = Release|x64
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Xbox 360.ActiveCfg = Release|Win32
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|ORBIS.ActiveCfg = Debug|Win32
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|PS3.ActiveCfg = Debug|Win32
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|Win32.ActiveCfg = Debug|Win32
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|x64.ActiveCfg = Debug|x64
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|x64.Build.0 = Debug|x64
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|Xbox 360.ActiveCfg = Debug|Win32
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|ORBIS.ActiveCfg = Release|Win32
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|PS3.ActiveCfg = Release|Win32
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|Win32.ActiveCfg = Release|Win32
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|Win32.Build.0 = Release|Win32
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|x64.ActiveCfg = Release|x64
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|x64.Build.0 = Release|x64
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|Xbox 360.ActiveCfg = Release|Win32
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|ORBIS.ActiveCfg = Debug|Win32
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|PS3.ActiveCfg = Debug|Win32
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -717,11 +816,12 @@ Global
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {1AFD580B-98B8-4689-B661-38C41132C60E}
{83D3B207-C601-4025-8F41-01DEDC354661} = {1AFD580B-98B8-4689-B661-38C41132C60E}
{D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {1AFD580B-98B8-4689-B661-38C41132C60E}
- {8F59A635-0240-4D7F-A80D-050C3F1670C2} = {1AFD580B-98B8-4689-B661-38C41132C60E}
- {962D4E25-45D3-4ACE-8C02-69FA3713ABD4} = {1AFD580B-98B8-4689-B661-38C41132C60E}
- {1782F849-B6E1-466D-9F02-A751F3F8712C} = {1AFD580B-98B8-4689-B661-38C41132C60E}
- {5A27FF18-A1EC-49BE-9455-415F1C701153} = {1AFD580B-98B8-4689-B661-38C41132C60E}
- {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3} = {1AFD580B-98B8-4689-B661-38C41132C60E}
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E}
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E}
+ {1782F849-B6E1-466D-9F02-A751F3F8712C} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E}
+ {5A27FF18-A1EC-49BE-9455-415F1C701153} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E}
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E}
+ {E0491194-35E3-4513-9D31-608EA3165ECF} = {E5C5E320-C077-4362-9A3F-3920C6447601}
{B1E10086-A1DA-401A-834D-969C9DBB5CC1} = {E0491194-35E3-4513-9D31-608EA3165ECF}
{E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} = {E5C5E320-C077-4362-9A3F-3920C6447601}
{B92ABADC-45BE-4CC5-B724-9426053123A1} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
@@ -768,5 +868,6 @@ Global
{DB344310-4938-4294-AEE2-18512454585D} = {9EA99B18-D352-47F6-BC04-A0B49CAA2772}
{2195FB18-53BF-48AF-96B6-9BD242924EA5} = {3D341D8A-E400-4B1D-BC05-B5C35487D9B5}
{FFF58874-D460-41E6-AD65-DBFEC6E47A94} = {2195FB18-53BF-48AF-96B6-9BD242924EA5}
+ {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E} = {1AFD580B-98B8-4689-B661-38C41132C60E}
EndGlobalSection
EndGlobal
diff --git a/build/Lol (vs2014).sln b/build/Lol (vs2014).sln
index 61a3c495..2efa7bab 100644
--- a/build/Lol (vs2014).sln
+++ b/build/Lol (vs2014).sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
+VisualStudioVersion = 12.0.30723.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deushax", "..\games\deushax\deushax.vcxproj", "{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}"
EndProject
@@ -136,6 +136,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "The Pimp", "The Pimp", "{21
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pimp", "..\tools\pimp\pimp.vcxproj", "{FFF58874-D460-41E6-AD65-DBFEC6E47A94}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Unit Test", "Unit Test", "{E4DFEBF9-C310-462F-9876-7EB59C1E4D4E}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ORBIS = Debug|ORBIS
@@ -239,6 +241,116 @@ Global
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|x64.ActiveCfg = Release|x64
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|x64.Build.0 = Release|x64
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Xbox 360.ActiveCfg = Release|Win32
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|ORBIS.Build.0 = Debug|ORBIS
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|PS3.ActiveCfg = Debug|PS3
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|PS3.Build.0 = Debug|PS3
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Win32.Build.0 = Debug|Win32
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|x64.ActiveCfg = Debug|x64
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|x64.Build.0 = Debug|x64
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|ORBIS.ActiveCfg = Release|ORBIS
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|ORBIS.Build.0 = Release|ORBIS
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|PS3.ActiveCfg = Release|PS3
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|PS3.Build.0 = Release|PS3
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Win32.ActiveCfg = Release|Win32
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Win32.Build.0 = Release|Win32
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|x64.ActiveCfg = Release|x64
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|x64.Build.0 = Release|x64
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Xbox 360.Build.0 = Release|Xbox 360
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|ORBIS.Build.0 = Debug|ORBIS
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|PS3.ActiveCfg = Debug|PS3
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|PS3.Build.0 = Debug|PS3
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Win32.ActiveCfg = Debug|Win32
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Win32.Build.0 = Debug|Win32
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|x64.ActiveCfg = Debug|x64
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|x64.Build.0 = Debug|x64
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|ORBIS.ActiveCfg = Release|ORBIS
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|ORBIS.Build.0 = Release|ORBIS
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|PS3.ActiveCfg = Release|PS3
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|PS3.Build.0 = Release|PS3
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Win32.ActiveCfg = Release|Win32
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Win32.Build.0 = Release|Win32
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|x64.ActiveCfg = Release|x64
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|x64.Build.0 = Release|x64
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Xbox 360.Build.0 = Release|Xbox 360
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|ORBIS.Build.0 = Debug|ORBIS
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|PS3.ActiveCfg = Debug|PS3
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|PS3.Build.0 = Debug|PS3
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Win32.Build.0 = Debug|Win32
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|x64.ActiveCfg = Debug|x64
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|x64.Build.0 = Debug|x64
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|ORBIS.ActiveCfg = Release|ORBIS
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|ORBIS.Build.0 = Release|ORBIS
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|PS3.ActiveCfg = Release|PS3
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|PS3.Build.0 = Release|PS3
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Win32.ActiveCfg = Release|Win32
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Win32.Build.0 = Release|Win32
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|x64.ActiveCfg = Release|x64
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|x64.Build.0 = Release|x64
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Xbox 360.Build.0 = Release|Xbox 360
+ {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|ORBIS.Build.0 = Debug|ORBIS
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|PS3.ActiveCfg = Debug|PS3
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|PS3.Build.0 = Debug|PS3
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Win32.ActiveCfg = Debug|Win32
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Win32.Build.0 = Debug|Win32
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|x64.ActiveCfg = Debug|x64
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|x64.Build.0 = Debug|x64
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|ORBIS.ActiveCfg = Release|ORBIS
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|ORBIS.Build.0 = Release|ORBIS
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|PS3.ActiveCfg = Release|PS3
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|PS3.Build.0 = Release|PS3
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Win32.ActiveCfg = Release|Win32
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Win32.Build.0 = Release|Win32
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|x64.ActiveCfg = Release|x64
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|x64.Build.0 = Release|x64
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Xbox 360.Build.0 = Release|Xbox 360
+ {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|ORBIS.Build.0 = Debug|ORBIS
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|PS3.ActiveCfg = Debug|PS3
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|PS3.Build.0 = Debug|PS3
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Win32.Build.0 = Debug|Win32
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|x64.ActiveCfg = Debug|x64
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|x64.Build.0 = Debug|x64
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|ORBIS.ActiveCfg = Release|ORBIS
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|ORBIS.Build.0 = Release|ORBIS
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|PS3.ActiveCfg = Release|PS3
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|PS3.Build.0 = Release|PS3
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Win32.ActiveCfg = Release|Win32
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Win32.Build.0 = Release|Win32
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|x64.ActiveCfg = Release|x64
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|x64.Build.0 = Release|x64
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Xbox 360.Build.0 = Release|Xbox 360
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|ORBIS.ActiveCfg = Debug|Win32
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|PS3.ActiveCfg = Debug|Win32
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -252,19 +364,6 @@ Global
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|x64.ActiveCfg = Release|x64
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|x64.Build.0 = Release|x64
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Xbox 360.ActiveCfg = Release|Win32
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|ORBIS.ActiveCfg = Debug|Win32
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|PS3.ActiveCfg = Debug|Win32
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|Win32.ActiveCfg = Debug|Win32
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|x64.ActiveCfg = Debug|x64
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|x64.Build.0 = Debug|x64
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|Xbox 360.ActiveCfg = Debug|Win32
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|ORBIS.ActiveCfg = Release|Win32
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|PS3.ActiveCfg = Release|Win32
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|Win32.ActiveCfg = Release|Win32
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|Win32.Build.0 = Release|Win32
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|x64.ActiveCfg = Release|x64
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|x64.Build.0 = Release|x64
- {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|Xbox 360.ActiveCfg = Release|Win32
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|ORBIS.ActiveCfg = Debug|Win32
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|PS3.ActiveCfg = Debug|Win32
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -717,11 +816,12 @@ Global
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {1AFD580B-98B8-4689-B661-38C41132C60E}
{83D3B207-C601-4025-8F41-01DEDC354661} = {1AFD580B-98B8-4689-B661-38C41132C60E}
{D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {1AFD580B-98B8-4689-B661-38C41132C60E}
- {8F59A635-0240-4D7F-A80D-050C3F1670C2} = {1AFD580B-98B8-4689-B661-38C41132C60E}
- {962D4E25-45D3-4ACE-8C02-69FA3713ABD4} = {1AFD580B-98B8-4689-B661-38C41132C60E}
- {1782F849-B6E1-466D-9F02-A751F3F8712C} = {1AFD580B-98B8-4689-B661-38C41132C60E}
- {5A27FF18-A1EC-49BE-9455-415F1C701153} = {1AFD580B-98B8-4689-B661-38C41132C60E}
- {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3} = {1AFD580B-98B8-4689-B661-38C41132C60E}
+ {8F59A635-0240-4D7F-A80D-050C3F1670C2} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E}
+ {962D4E25-45D3-4ACE-8C02-69FA3713ABD4} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E}
+ {1782F849-B6E1-466D-9F02-A751F3F8712C} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E}
+ {5A27FF18-A1EC-49BE-9455-415F1C701153} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E}
+ {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E}
+ {E0491194-35E3-4513-9D31-608EA3165ECF} = {E5C5E320-C077-4362-9A3F-3920C6447601}
{B1E10086-A1DA-401A-834D-969C9DBB5CC1} = {E0491194-35E3-4513-9D31-608EA3165ECF}
{E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} = {E5C5E320-C077-4362-9A3F-3920C6447601}
{B92ABADC-45BE-4CC5-B724-9426053123A1} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
@@ -768,5 +868,6 @@ Global
{DB344310-4938-4294-AEE2-18512454585D} = {9EA99B18-D352-47F6-BC04-A0B49CAA2772}
{2195FB18-53BF-48AF-96B6-9BD242924EA5} = {3D341D8A-E400-4B1D-BC05-B5C35487D9B5}
{FFF58874-D460-41E6-AD65-DBFEC6E47A94} = {2195FB18-53BF-48AF-96B6-9BD242924EA5}
+ {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E} = {1AFD580B-98B8-4689-B661-38C41132C60E}
EndGlobalSection
EndGlobal
diff --git a/src/commandstack.h b/src/commandstack.h
index bf35be45..6fba1d13 100644
--- a/src/commandstack.h
+++ b/src/commandstack.h
@@ -32,8 +32,8 @@ private:
public:
//GET/SET exec
- int GetCmdNb() { return m_commands.Count(); }
- int GetCmd(int i)
+ ptrdiff_t GetCmdNb() { return m_commands.Count(); }
+ ptrdiff_t GetCmd(int i)
{
ASSERT(0 <= i && i < m_commands.Count());
m_f_cur = m_commands[i].m2;
@@ -42,7 +42,7 @@ public:
}
//cmd storage
- void AddCmd(int cmd) { m_commands.Push(cmd, m_floats.Count(), m_ints.Count()); }
+ void AddCmd(int cmd) { m_commands.Push(cmd, (int)m_floats.Count(), (int)m_ints.Count()); }
//GETTER
inline float F() { return m_floats[m_f_cur++]; }
diff --git a/src/easymesh/easymesh.h b/src/easymesh/easymesh.h
index e381ac2a..1869cf04 100644
--- a/src/easymesh/easymesh.h
+++ b/src/easymesh/easymesh.h
@@ -374,7 +374,7 @@ public:
//Convenience functions
public:
- int GetVertexCount() { return m_vert.Count(); }
+ ptrdiff_t GetVertexCount() { return m_vert.Count(); }
vec3 const &GetVertexLocation(int i) { return m_vert[i].m_coord; }
//private:
diff --git a/src/input/controller.h b/src/input/controller.h
index 79b9faef..21c0dea4 100644
--- a/src/input/controller.h
+++ b/src/input/controller.h
@@ -45,7 +45,7 @@ public:
/** Clear current binding */
void ClearBindings();
/** Indicate wheither a physical device and key has been bound. Returns the number of bindings set. */
- int IsBound() const { return m_keybindings.Count(); }
+ ptrdiff_t IsBound() const { return m_keybindings.Count(); }
protected:
/** Update the binding value. Called internally by the controller, once per frame */
@@ -104,7 +104,7 @@ public:
/** Clear current binding */
void ClearBindings();
/** Indicate wheither a physical device and axis has been bound. Returns the number of bindings set. */
- int IsBound() const { return m_axisbindings.Count() + m_keybindings.Count(); }
+ ptrdiff_t IsBound() const { return m_axisbindings.Count() + m_keybindings.Count(); }
protected:
diff --git a/src/t/test-base.vcxproj b/src/t/test-base.vcxproj
index 8ce6f7ff..002027a9 100644
--- a/src/t/test-base.vcxproj
+++ b/src/t/test-base.vcxproj
@@ -49,28 +49,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/t/test-entity.vcxproj b/src/t/test-entity.vcxproj
index 079c40e5..81b31c4e 100644
--- a/src/t/test-entity.vcxproj
+++ b/src/t/test-entity.vcxproj
@@ -44,32 +44,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/t/test-image.vcxproj b/src/t/test-image.vcxproj
index 13a3c171..03a92237 100644
--- a/src/t/test-image.vcxproj
+++ b/src/t/test-image.vcxproj
@@ -44,33 +44,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/t/test-math.vcxproj b/src/t/test-math.vcxproj
index 42af848b..8a1fbbbc 100644
--- a/src/t/test-math.vcxproj
+++ b/src/t/test-math.vcxproj
@@ -44,12 +44,6 @@
-
-
-
-
-
-
@@ -64,13 +58,6 @@
-
-
-
-
-
-
-
diff --git a/src/t/test-sys.vcxproj b/src/t/test-sys.vcxproj
index 1f76aa81..11a4bc6a 100644
--- a/src/t/test-sys.vcxproj
+++ b/src/t/test-sys.vcxproj
@@ -44,33 +44,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-