diff --git a/Code/Game/DanBiasGame/DanBiasGame.vcxproj b/Code/Game/DanBiasGame/DanBiasGame.vcxproj
index 0b9d07d3..255f03bf 100644
--- a/Code/Game/DanBiasGame/DanBiasGame.vcxproj
+++ b/Code/Game/DanBiasGame/DanBiasGame.vcxproj
@@ -71,7 +71,7 @@
$(SolutionDir)..\Bin\DLL\
$(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\
$(ProjectName)_$(PlatformShortName)D
- C:\Program Files %28x86%29\Visual Leak Detector\lib\Win32;$(LibraryPath)$(SolutionDir)..\External\Lib\Input;$(SolutionDir)..\Bin\DLL;
+ $(LibraryPath)$(SolutionDir)..\External\Lib\Input;$(SolutionDir)..\Bin\DLL;
$(SolutionDir)..\External\Include\;$(IncludePath)
@@ -106,12 +106,12 @@
Disabled
DANBIAS_CLIENT;DANBIAS_GAME_DLL_EXPORT;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
true
- $(SolutionDir)GameLogic;$(SolutionDir)Input;$(SolutionDir)OysterGraphics;$(SolutionDir)Misc;$(SolutionDir)OysterMath;%(AdditionalIncludeDirectories)
+ $(SolutionDir)Input;$(SolutionDir)OysterGraphics;$(SolutionDir)Misc;$(SolutionDir)OysterMath;%(AdditionalIncludeDirectories)
Windows
true
- OysterGraphics_$(PlatformShortName)D.lib;Input_$(PlatformShortName)D.lib;GameLogic_$(PlatformShortName)D.lib;%(AdditionalDependencies)
+ OysterGraphics_$(PlatformShortName)D.lib;Input_$(PlatformShortName)D.lib;%(AdditionalDependencies)
OysterGraphics_$(PlatformShortName)D.dll;%(DelayLoadDLLs)
@@ -181,9 +181,6 @@
{0ec83e64-230e-48ef-b08c-6ac9651b4f82}
-
- {b1195bb9-b3a5-47f0-906c-8dea384d1520}
-
diff --git a/Code/Game/DanBiasLauncher/DanBiasLauncher.vcxproj b/Code/Game/DanBiasLauncher/DanBiasLauncher.vcxproj
index 5a4ebeb6..0e97666f 100644
--- a/Code/Game/DanBiasLauncher/DanBiasLauncher.vcxproj
+++ b/Code/Game/DanBiasLauncher/DanBiasLauncher.vcxproj
@@ -110,8 +110,8 @@
Windows
true
- GameLogic_$(PlatformShortName)D.dll;OysterGraphics_$(PlatformShortName)D.dll;DanBiasServer_$(PlatformShortName)D.dll;DanBiasGame_$(PlatformShortName)D.dll;%(DelayLoadDLLs)
- Input_$(PlatformShortName)D.lib;GameLogic_$(PlatformShortName)D.lib;DanBiasServer_$(PlatformShortName)D.lib;DanBiasGame_$(PlatformShortName)D.lib;%(AdditionalDependencies)
+ DanBiasServer_$(PlatformShortName)D.dll;DanBiasGame_$(PlatformShortName)D.dll;%(DelayLoadDLLs)
+ Input_$(PlatformShortName)D.lib;DanBiasServer_$(PlatformShortName)D.lib;DanBiasGame_$(PlatformShortName)D.lib;%(AdditionalDependencies)
@@ -195,9 +195,6 @@
{52380daa-0f4a-4d97-8e57-98df39319caf}
-
- {b1195bb9-b3a5-47f0-906c-8dea384d1520}
-
diff --git a/Code/Game/DanBiasLauncher/Launcher.cpp b/Code/Game/DanBiasLauncher/Launcher.cpp
index 28b89485..0440d973 100644
--- a/Code/Game/DanBiasLauncher/Launcher.cpp
+++ b/Code/Game/DanBiasLauncher/Launcher.cpp
@@ -4,8 +4,8 @@
#define NOMINMAX
#include
-#define DANBIAS_SERVER
-//#define DANBIAS_CLIENT
+//#define DANBIAS_SERVER
+#define DANBIAS_CLIENT
#if defined(DANBIAS_SERVER)
diff --git a/Code/Game/GameLogic/AttatchmentMassDriver.cpp b/Code/Game/GameLogic/AttatchmentMassDriver.cpp
index fcee6afb..18324149 100644
--- a/Code/Game/GameLogic/AttatchmentMassDriver.cpp
+++ b/Code/Game/GameLogic/AttatchmentMassDriver.cpp
@@ -26,13 +26,20 @@ AttatchmentMassDriver::~AttatchmentMassDriver(void)
{
}
-
-void AttatchmentMassDriver::ForcePush(const GameLogic::WEAPON_FIRE &fireInput)
-{
-
-}
-
+/********************************************************
+* Uses the attatchment and will from here switch case the different WEAPON_FIRE's that are to be used
+********************************************************/
void AttatchmentMassDriver::UseAttatchment(const GameLogic::WEAPON_FIRE &fireInput)
{
-
+ ForcePush(fireInput);
}
+
+/********************************************************
+* This is a specific functionallity of the weapon
+********************************************************/
+void AttatchmentMassDriver::ForcePush(const GameLogic::WEAPON_FIRE &fireInput)
+{
+
+}
+
+
diff --git a/Code/Game/GameLogic/GameLogic.vcxproj b/Code/Game/GameLogic/GameLogic.vcxproj
index 33fd6c92..8f77f0d6 100644
--- a/Code/Game/GameLogic/GameLogic.vcxproj
+++ b/Code/Game/GameLogic/GameLogic.vcxproj
@@ -194,7 +194,6 @@
-
diff --git a/Code/Game/GameLogic/Player.cpp b/Code/Game/GameLogic/Player.cpp
index 01046143..9bc9d752 100644
--- a/Code/Game/GameLogic/Player.cpp
+++ b/Code/Game/GameLogic/Player.cpp
@@ -32,7 +32,7 @@ struct Player::PrivateData
PLAYER_STATE playerState;
ICustomBody *rigidBody;
-
+
}myData;
Player::Player()
@@ -110,10 +110,10 @@ bool Player::IsIdle()
return (myData->playerState == PLAYER_STATE_IDLE);
}
-//Oyster::Math::Float3 Player::GetPos()
-//{
-// return myData->rigidBody->GetCenter();
-//}
+Oyster::Math::Float3 Player::GetPos()
+{
+ return myData->rigidBody->GetCenter();
+}
/********************************************************
* Respawns the player on a new chosen position
diff --git a/Code/Game/GameLogic/Player.h b/Code/Game/GameLogic/Player.h
index d4ce0a8d..20fc8de6 100644
--- a/Code/Game/GameLogic/Player.h
+++ b/Code/Game/GameLogic/Player.h
@@ -4,6 +4,7 @@
#ifndef PLAYER_H
#define PLAYER_H
#include "GameLogicStates.h"
+#include "OysterMath.h"
namespace GameLogic
{
@@ -23,7 +24,7 @@ namespace GameLogic
bool IsJumping();
bool IsIdle();
- //Oyster::Math::Float3 GetPos();
+ Oyster::Math::Float3 GetPos();
void Respawn();
private:
diff --git a/Code/Game/GameLogic/Weapon.cpp b/Code/Game/GameLogic/Weapon.cpp
index b7a47998..2a575039 100644
--- a/Code/Game/GameLogic/Weapon.cpp
+++ b/Code/Game/GameLogic/Weapon.cpp
@@ -14,7 +14,7 @@ struct Weapon::PrivateData
~PrivateData()
{
-
+ delete SelectedAttatchment;
}
WEAPON_STATE weaponState;
@@ -38,7 +38,7 @@ Weapon::~Weapon(void)
}
/********************************************************
-* Uses the weapon based on the input given and the current state of the weapon
+* Uses the weapon based on the input given and the current chosen attatchment
********************************************************/
void Weapon::UseWeapon(const WEAPON_FIRE &fireInput)
{