NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed debug lines

This commit is contained in:
Dander7BD 2014-02-18 12:59:51 +01:00
parent 2e75d168a1
commit 500ac117a7
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Code/Game/GameClient/GameClientState/GameState.cpp
View File

@ -85,11 +85,7 @@ bool GameState::Init( SharedStateContent &shared )
Graphics::API::SetProjection( this->privData->camera.GetProjectionMatrix() );
//tell server ready
//this->privData->nwClient->Send( Protocol_General_Status(Protocol_General_Status::States_ready) );
// Debugg hack
this->InitiatePlayer( 0, "crate_generic.dan",Float3( 0,132, 10), Quaternion::identity, Float3(1), true );
// end debug hack
this->privData->nwClient->Send( Protocol_General_Status(Protocol_General_Status::States_ready) );
return true;
}
@ -111,7 +107,7 @@ void GameState::InitiatePlayer( int id, const std::string &modelName, const floa
this->privData->myId = id;
this->privData->camera.SetPosition( this->privData->player.getPos() );
Float3 offset = Float3( 0.0f );
offset.y = this->privData->player.getScale().y + 0.5f; // debug hack +0.5f
offset.y = this->privData->player.getScale().y * 0.9f;
this->privData->camera.SetHeadOffset( offset );
this->privData->camera.UpdateOrientation();
}

5
Code/Game/GameClient/GameClientState/NetLoadState.cpp
View File

@ -54,11 +54,8 @@ bool NetLoadState::Init( SharedStateContent &shared )
// we may assume that nwClient is properly connected to the server
// signals querry to server for loading instructions
//this->privData->nwClient->Send( Protocol_QuerryGameType() );
this->privData->nwClient->Send( Protocol_QuerryGameType() );
// debugg
this->LoadGame( "..//Content//Worlds//2ofAll_updated.bias");
this->ChangeState( ClientState_Game );
return true;
}