jann/m2dev-client-src
1
0
Fork 0
forked from metin-server/m2dev-client-src
Code Pull Requests Activity

Merge pull request #73 from d1str4ught/rtw1x1-patch-1

Browse Source 
Reverted horse rotation speed
This commit is contained in:
rtw1x1
2026-01-05 15:29:28 +00:00
committed by GitHub
parent 625849e0e4 d5c659d404
commit dbdfd57c41
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/UserInterface/InstanceBase.cpp
View File

@@ -15,7 +15,7 @@ BOOL HAIR_COLOR_ENABLE=FALSE;
BOOL USE_ARMOR_SPECULAR=FALSE; BOOL USE_ARMOR_SPECULAR=FALSE;
BOOL RIDE_HORSE_ENABLE=TRUE; BOOL RIDE_HORSE_ENABLE=TRUE;
const float c_fDefaultRotationSpeed = 1200.0f; const float c_fDefaultRotationSpeed = 1200.0f;
const float c_fDefaultHorseRotationSpeed = 1800.0f; const float c_fDefaultHorseRotationSpeed = 300.0f;
bool IsWall(unsigned race) bool IsWall(unsigned race)
@@ -2116,6 +2116,7 @@ void CInstanceBase::SetStateFlags(DWORD dwStateFlags)
// MR-4: Fix PK Mode Bug // MR-4: Fix PK Mode Bug
// Prevent killer mode for same-guild attacks in GUILD PK mode // Prevent killer mode for same-guild attacks in GUILD PK mode
bool skipKiller = false; bool skipKiller = false;
if ((dwStateFlags & ADD_CHARACTER_STATE_KILLER) && PK_MODE_GUILD == GetPKMode()) { if ((dwStateFlags & ADD_CHARACTER_STATE_KILLER) && PK_MODE_GUILD == GetPKMode()) {
CPythonPlayer& rkPlayer = CPythonPlayer::Instance(); CPythonPlayer& rkPlayer = CPythonPlayer::Instance();
@@ -2224,7 +2225,6 @@ bool CInstanceBase::IsAttackableInstance(CInstanceBase& rkInstVictim)
return false; return false;
} }
} }
if (PK_MODE_GUILD == GetPKMode()) if (PK_MODE_GUILD == GetPKMode())
if (GetGuildID() == rkInstVictim.GetGuildID()) if (GetGuildID() == rkInstVictim.GetGuildID())
return false; return false;
@@ -2255,9 +2255,6 @@ bool CInstanceBase::IsAttackableInstance(CInstanceBase& rkInstVictim)
if (IsPVPInstance(rkInstVictim)) if (IsPVPInstance(rkInstVictim))
return true; return true;
if (rkInstVictim.GetPKMode() == PK_MODE_PROTECT)
return false;
// MR-4: Fix PK Mode Bug // MR-4: Fix PK Mode Bug
if (PK_MODE_REVENGE == GetPKMode()) if (PK_MODE_REVENGE == GetPKMode())
{ {
@@ -2265,13 +2262,12 @@ bool CInstanceBase::IsAttackableInstance(CInstanceBase& rkInstVictim)
{ {
if ( if (
(GetGuildID() == 0 || GetGuildID() != rkInstVictim.GetGuildID()) && (GetGuildID() == 0 || GetGuildID() != rkInstVictim.GetGuildID()) &&
IsConflictAlignmentInstance(rkInstVictim) &&
rkInstVictim.GetAlignment() < 0 rkInstVictim.GetAlignment() < 0
) )
return true; return true;
} }
} }
return false;
// MR-4: -- END OF -- Fix PK Mode Bug // MR-4: -- END OF -- Fix PK Mode Bug
} }
else else