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

Fixed minor formatting issues from #682

Browse Source 
- Removed unused PlaySoundEffect
* Simplified and parenthesised code
This commit is contained in:
Tiger Wang 2014-02-16 13:37:36 +00:00
parent 16df93c500
commit 4908b6f500
3 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Entities/ExpOrb.cpp
View File

@ -52,11 +52,9 @@ void cExpOrb::Tick(float a_Dt, cChunk & a_Chunk)
LOGD("Player %s picked up an ExpOrb. His reward is %i", a_ClosestPlayer->GetName().c_str(), m_Reward); LOGD("Player %s picked up an ExpOrb. His reward is %i", a_ClosestPlayer->GetName().c_str(), m_Reward);
a_ClosestPlayer->DeltaExperience(m_Reward); a_ClosestPlayer->DeltaExperience(m_Reward);
float r1 = (float) (0.75 + ((float)((GetUniqueID() * 23) % 32)) / 64); // Random Float Value m_World->BroadcastSoundEffect("random.orb", (int)GetPosX() * 8, (int)GetPosY() * 8, (int)GetPosZ() * 8, 0.5f, (float)(0.75 + ((float)((GetUniqueID() * 23) % 32)) / 64));
float r2 = (float) (0.75 + ((float)((GetUniqueID() * 23) % 32)) / 64); // Random Float Value
m_World->BroadcastSoundEffect("random.orb", (int) (GetPosX() * 8.0F), (int) (GetPosY() * 8.0F), (int) (GetPosZ() * 8.0F), 0.1F, 0.5F * ((r1 - r2) * 0.7F + 1.8F));
Destroy(true); Destroy();
} }
a_Distance.Normalize(); a_Distance.Normalize();
a_Distance *= ((float) (5.5 - Distance)); a_Distance *= ((float) (5.5 - Distance));

11
src/Entities/Player.cpp
View File

@ -1059,15 +1059,6 @@ void cPlayer::CloseWindowIfID(char a_WindowID, bool a_CanRefuse)
void cPlayer::PlaySoundEffect(const AString & a_SoundName, float a_Volume, float a_Pitch)
{
m_ClientHandle->SendSoundEffect(a_SoundName, (int) (GetPosX() * 8.0), (int) (GetPosY() * 8.0), (int) (GetPosZ() * 8.0), a_Volume, a_Pitch);
}
void cPlayer::SetLastBlockActionTime() void cPlayer::SetLastBlockActionTime()
{ {
if (m_World != NULL) if (m_World != NULL)
@ -1796,7 +1787,7 @@ void cPlayer::HandleFood(void)
Heal(1); Heal(1);
m_FoodExhaustionLevel += 3; m_FoodExhaustionLevel += 3;
} }
else if (m_FoodLevel <= 0 && m_Health > 1) else if ((m_FoodLevel <= 0) && (m_Health > 1))
{ {
// Damage from starving // Damage from starving
TakeDamage(dtStarving, NULL, 1, 1, 0); TakeDamage(dtStarving, NULL, 1, 1, 0);

2
src/Entities/Player.h
View File

@ -208,8 +208,6 @@ public:
const AString & GetName(void) const { return m_PlayerName; } const AString & GetName(void) const { return m_PlayerName; }
void SetName(const AString & a_Name) { m_PlayerName = a_Name; } void SetName(const AString & a_Name) { m_PlayerName = a_Name; }
void PlaySoundEffect(const AString & a_SoundName, float a_Volume, float a_Pitch);
// tolua_end // tolua_end
typedef std::list< cGroup* > GroupList; typedef std::list< cGroup* > GroupList;