flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Implemented fall damage for mobs

Browse Source 
+ Implemented mobile fall damage
* Formatting fixes
+ Defined new Position->Integer macros
This commit is contained in:
Tiger Wang
2014-01-25 19:02:13 +00:00
parent 60b7f5f23d
commit 7468ba0f10
5 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Entities/Player.cpp
View File

@@ -26,8 +26,6 @@
#include "inifile/iniFile.h"
#include "json/json.h"
#define float2int(x) ((x)<0 ? ((int)(x))-1 : (int)(x))
@@ -440,7 +438,7 @@ void cPlayer::SetTouchGround(bool a_bTouchGround)
cWorld * World = GetWorld();
if ((GetPosY() >= 0) && (GetPosY() < cChunkDef::Height))
{
BLOCKTYPE BlockType = World->GetBlock(float2int(GetPosX()), float2int(GetPosY()), float2int(GetPosZ()));
BLOCKTYPE BlockType = World->GetBlock((int)floor(GetPosX()), (int)floor(GetPosY()), (int)floor(GetPosZ()));
if (BlockType != E_BLOCK_AIR)
{
m_bTouchGround = true;
@@ -470,7 +468,7 @@ void cPlayer::SetTouchGround(bool a_bTouchGround)
TakeDamage(dtFalling, NULL, Damage, Damage, 0);
}
// Mojang uses floor() to get X and Z positions, instead of just casting it to an (int)
// Fall particles
GetWorld()->BroadcastSoundParticleEffect(2006, (int)floor(GetPosX()), (int)GetPosY() - 1, (int)floor(GetPosZ()), Damage /* Used as particle effect speed modifier */);
}