Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic

Code/Game/GameClient/GameClientState/C_Object.cpp

@@ -91,7 +91,10 @@ void C_Object::Render()
 {
 	if( this->model )
 	{
-		Oyster::Graphics::API::RenderModel(model);
+		if(this->model->Visible)
+		{
+			Oyster::Graphics::API::RenderModel(model);
+		}
 	}
 }
 void C_Object::Release()

Code/Game/GameClient/GameClientState/GameState.cpp

@@ -142,8 +142,8 @@ void GameState::InitiatePlayer( int id, const std::string &modelName, const floa
 			this->privData->camera.SetPosition( p->getPos() );
 			Float3 offset = Float3( 0.0f );
 			// DEBUG position of camera so we can see the player model
-			offset.y = p->getScale().y * 5.0f;
+			//offset.y = p->getScale().y * 5.0f;
-			offset.z = p->getScale().z * -5.0f;
+			//offset.z = p->getScale().z * -5.0f;
 			// !DEBUG
 			this->privData->camera.SetHeadOffset( offset );
 			this->privData->camera.UpdateOrientation();
@@ -187,7 +187,7 @@ bool GameState::Render()
 	{
 		if(playerObject->second)
 		{
-			//if( this->privData->myId != playerObject->second->GetId() )
+			if( this->privData->myId != playerObject->second->GetId() )
 			{
 				playerObject->second->Render();
 			}
@@ -596,6 +596,12 @@ const GameClientState::NetEvent & GameState::DataRecieved( const GameClientState
 				{
 					// if it is not a player 
 					object = (*this->privData->dynamicObjects)[decoded.objectID];
+
+					if(!object)
+					{
+						//If it is a static object
+						object = (*this->privData->staticObjects)[decoded.objectID];
+					}
 				}
 
 				if( object )
@@ -613,6 +619,12 @@ const GameClientState::NetEvent & GameState::DataRecieved( const GameClientState
 				{
 					// if it is not a player 
 					object = (*this->privData->dynamicObjects)[decoded.objectID];
+					
+					if(!object)
+					{
+						//If it is a static object
+						object = (*this->privData->staticObjects)[decoded.objectID];
+					}
 				}
 
 				if( object )

Code/Game/GameLogic/CollisionManager.cpp

@@ -44,7 +44,6 @@ using namespace GameLogic;
 			realObjB = realObjA;
 		}
 
-
 		switch (realObjB->GetObjectType())
 		{
 		case ObjectSpecialType::ObjectSpecialType_Generic:
@@ -369,14 +368,19 @@ using namespace GameLogic;
 		Object* a = (Object*)objA->GetCustomTag();
 		Object* b = (Object*)objB->GetCustomTag();
 
-		if(!a)	
+		if(!a)
 			return;
-		if(!b)		
+		if(!b)
 			return;
 
 		if(b->GetObjectType() == ObjectSpecialType_Player)
 		{
-			((Pickup*)a)->OnCollision((Player*)(b));
+			//Only update if it is active. And if the player is alive
+			if(((Pickup*)a)->IsActive() && ((Player*)b)->GetState() != PLAYER_STATE_DEAD && ((Player*)b)->GetState() != PLAYER_STATE_DIED)
+			{
+				((Pickup*)a)->OnCollision((Player*)(b));
+			}
+			return;
 		}
 		else if(a->GetObjectType() != ObjectSpecialType_Player)
 		{
@@ -384,6 +388,10 @@ using namespace GameLogic;
 			//Do nothing.
 			return;
 		}
-
+		
-		((Pickup*)b)->OnCollision((Player*)a);
+		//Only update if it is active. And if the player is alive
+		if(((Pickup*)b)->IsActive() && ((Player*)a)->GetState() != PLAYER_STATE_DEAD && ((Player*)a)->GetState() != PLAYER_STATE_DIED)
+		{
+			((Pickup*)b)->OnCollision((Player*)a);
+		}
 	}

Code/Game/GameLogic/Level.cpp

@@ -239,7 +239,11 @@ bool Level::InitiateLevel(std::wstring levelPath)
 			{
 				LevelMetaData* LevelObjData = ((LevelMetaData*)obj);
 				std::string levelName = LevelObjData->levelName;
+
 				// LevelObjData->worldSize;
+
+				//LevelMetaData is not an object.
+				--this->objID;
 			}
 			break;
 		case ObjectType::ObjectType_Static:

Code/Game/GameLogic/PickupSystem/Pickup.cpp

@@ -9,6 +9,7 @@ Pickup::Pickup(Oyster::Physics::ICustomBody *rigidBody, EventOnCollision collisi
 	this->active = true;
 	this->spawnTime = spawnTime;
 	timer.reset();
+	this->GetRigidBody()->MoveToLimbo();
 }
 
 Pickup::~Pickup()

Code/Game/GameLogic/PickupSystem/PickupHealth.cpp

@@ -1,4 +1,5 @@
 #include "PickupHealth.h"
+#include "../Game.h"
 
 using namespace GameLogic;
 
@@ -14,5 +15,8 @@ PickupHealth::~PickupHealth()
 void PickupHealth::OnCollision(Player *player)
 {
 	timer.reset();
+	((Game*)&Game::Instance())->onDisableFnc(this);
+
+	this->active = false;
 	player->DamageLife(-hpValue);
 }

Code/Game/GameLogic/Player.cpp

@@ -342,16 +342,22 @@ PLAYER_STATE Player::GetState() const
 
 void Player::DamageLife(int damage)
 {
-	this->playerStats.hp -= damage;
+	if(damage != 0)
-	// send hp to client
-	this->gameInstance->onDamageTakenFnc( this, this->playerStats.hp);
-
-	if(this->playerStats.hp <= 0)
 	{
-		this->playerStats.hp = 0;
+		this->playerStats.hp -= damage;
-		this->playerState = PLAYER_STATE_DIED;
-	}
 
+		if(this->playerStats.hp > 100)
+			this->playerStats.hp = 100;
+
+		// send hp to client
+		this->gameInstance->onDamageTakenFnc( this, this->playerStats.hp);
+
+		if(this->playerStats.hp <= 0)
+		{
+			this->playerStats.hp = 0;
+			this->playerState = PLAYER_STATE_DIED;
+		}
+	}
 }
 
 void Player::AddAffectedObject(DynamicObject &AffectedObject)

Code/Game/GameServer/Implementation/GameSession_Gameplay.cpp

@@ -152,7 +152,7 @@ using namespace DanBias;
 	}
 	void GameSession::ObjectEnabled( GameLogic::IObjectData* movedObject )
 	{
-		GameSession::gameSession->Send(Protocol_ObjectDisable(movedObject->GetID()).GetProtocol());
+		GameSession::gameSession->Send(Protocol_ObjectEnable(movedObject->GetID()).GetProtocol());
 	}
 	void GameSession::ObjectDamaged( GameLogic::IObjectData* movedObject, float hp )
 	{

Code/Game/LevelLoader/LevelParser.cpp

@@ -167,6 +167,14 @@ std::vector<SmartPointer<ObjectTypeHeader>> LevelParser::Parse(std::string filen
 
 							ParseObject(&buffer[counter], &header->healthValue, 4);
 							counter += 4;
+							
+							// DEBUG
+							header->position[1] = 150;
+							header->spawnTime = 5;
+							header->boundingVolume.box.mass = 0;
+							header->typeID = ObjectType_Static;
+							header->healthValue = 50;
+							// !DEBUG
 
 							objects.push_back(header);
 							break;