port 2V2-d.1: ActorInstance/InstanceBase closure creates the main character
Port the ActorInstance*/InstanceBase* siblings plus GameUtil, FlyTarget, PhysicsObject, GameEventManager, WeaponTrace, MapUtil and lineintersect_utils verbatim and drop their pending stand-ins; CGameEventManager and CPythonSystem join PythonBoot in CPythonApplication member order. Root cause of the intermittent Loading-phase header 7: TPlayerSkill::tNextRead is time_t, 32-bit in 40250 (_USE_32BIT_TIME_T) but 64-bit on LP64, so SKILL_LEVEL (76) was read as 2551 bytes instead of 1531. Packet.h now uses LONG with a static_assert, and the fake server sends SKILL_LEVEL in Loading. The fake server's CHARACTER_ADD now uses CHAR_TYPE_PC; port.login_flow asserts the main instance exists with race 0. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
shenlei
co-authored by
Claude Opus 5.5
Claude Opus 5.5
parent
996d793f0c
commit
5266b00c6e
@@ -0,0 +1,719 @@
|
||||
#include "StdAfx.h"
|
||||
#include "InstanceBase.h"
|
||||
#include "PythonBackground.h"
|
||||
#include "PythonCharacterManager.h"
|
||||
#include "../PRTerrainLib/Terrain.h"
|
||||
|
||||
float NEW_UnsignedDegreeToSignedDegree(float fUD)
|
||||
{
|
||||
float fSD;
|
||||
if (fUD>180.0f)
|
||||
fSD=-(360.0f-fUD);
|
||||
else if (fUD<-180.0f)
|
||||
fSD=+(360.0f+fUD);
|
||||
else
|
||||
fSD=fUD;
|
||||
|
||||
return fSD;
|
||||
}
|
||||
|
||||
float NEW_GetSignedDegreeFromDirPixelPosition(const TPixelPosition& kPPosDir)
|
||||
{
|
||||
D3DXVECTOR3 vtDir(kPPosDir.x, -kPPosDir.y, kPPosDir.z);
|
||||
D3DXVECTOR3 vtDirNormal;
|
||||
D3DXVec3Normalize(&vtDirNormal, &vtDir);
|
||||
|
||||
D3DXVECTOR3 vtDirNormalStan(0, -1, 0);
|
||||
float fDirRot = D3DXToDegree(acosf(D3DXVec3Dot(&vtDirNormal, &vtDirNormalStan)));
|
||||
|
||||
if (vtDirNormal.x<0.0f)
|
||||
fDirRot=-fDirRot;
|
||||
|
||||
return fDirRot;
|
||||
}
|
||||
|
||||
bool CInstanceBase::IsFlyTargetObject()
|
||||
{
|
||||
return m_GraphicThingInstance.IsFlyTargetObject();
|
||||
}
|
||||
|
||||
float CInstanceBase::GetFlyTargetDistance()
|
||||
{
|
||||
return m_GraphicThingInstance.GetFlyTargetDistance();
|
||||
}
|
||||
|
||||
void CInstanceBase::ClearFlyTargetInstance()
|
||||
{
|
||||
m_GraphicThingInstance.ClearFlyTarget();
|
||||
}
|
||||
|
||||
void CInstanceBase::SetFlyTargetInstance(CInstanceBase& rkInstDst)
|
||||
{
|
||||
// NOTE : NEW_Attack 때 Target을 바꿀때 여기서 리턴 되어버림 - [levites]
|
||||
// if (isLock())
|
||||
// return;
|
||||
|
||||
m_GraphicThingInstance.SetFlyTarget(rkInstDst.GetGraphicThingInstancePtr());
|
||||
}
|
||||
|
||||
void CInstanceBase::AddFlyTargetPosition(const TPixelPosition& c_rkPPosDst)
|
||||
{
|
||||
m_GraphicThingInstance.AddFlyTarget(c_rkPPosDst);
|
||||
}
|
||||
|
||||
void CInstanceBase::AddFlyTargetInstance(CInstanceBase& rkInstDst)
|
||||
{
|
||||
m_GraphicThingInstance.AddFlyTarget(rkInstDst.GetGraphicThingInstancePtr());
|
||||
}
|
||||
|
||||
|
||||
float CInstanceBase::NEW_GetDistanceFromDestInstance(CInstanceBase& rkInstDst)
|
||||
{
|
||||
TPixelPosition kPPosDst;
|
||||
rkInstDst.NEW_GetPixelPosition(&kPPosDst);
|
||||
|
||||
return NEW_GetDistanceFromDestPixelPosition(kPPosDst);
|
||||
}
|
||||
|
||||
float CInstanceBase::NEW_GetDistanceFromDestPixelPosition(const TPixelPosition& c_rkPPosDst)
|
||||
{
|
||||
TPixelPosition kPPosCur;
|
||||
NEW_GetPixelPosition(&kPPosCur);
|
||||
|
||||
TPixelPosition kPPosDir;
|
||||
kPPosDir=c_rkPPosDst-kPPosCur;
|
||||
|
||||
return NEW_GetDistanceFromDirPixelPosition(kPPosDir);
|
||||
}
|
||||
|
||||
float CInstanceBase::NEW_GetDistanceFromDirPixelPosition(const TPixelPosition& c_rkPPosDir)
|
||||
{
|
||||
return sqrtf(c_rkPPosDir.x*c_rkPPosDir.x+c_rkPPosDir.y*c_rkPPosDir.y);
|
||||
}
|
||||
|
||||
float CInstanceBase::NEW_GetRotation()
|
||||
{
|
||||
float fCurRot=GetRotation();
|
||||
return NEW_UnsignedDegreeToSignedDegree(fCurRot);
|
||||
}
|
||||
|
||||
float CInstanceBase::NEW_GetRotationFromDirPixelPosition(const TPixelPosition& c_rkPPosDir)
|
||||
{
|
||||
return NEW_GetSignedDegreeFromDirPixelPosition(c_rkPPosDir);
|
||||
}
|
||||
|
||||
float CInstanceBase::NEW_GetRotationFromDestPixelPosition(const TPixelPosition& c_rkPPosDst)
|
||||
{
|
||||
TPixelPosition kPPosCur;
|
||||
NEW_GetPixelPosition(&kPPosCur);
|
||||
|
||||
TPixelPosition kPPosDir;
|
||||
kPPosDir=c_rkPPosDst-kPPosCur;
|
||||
|
||||
return NEW_GetRotationFromDirPixelPosition(kPPosDir);
|
||||
}
|
||||
|
||||
float CInstanceBase::NEW_GetRotationFromDestInstance(CInstanceBase& rkInstDst)
|
||||
{
|
||||
TPixelPosition kPPosDst;
|
||||
rkInstDst.NEW_GetPixelPosition(&kPPosDst);
|
||||
|
||||
return NEW_GetRotationFromDestPixelPosition(kPPosDst);
|
||||
}
|
||||
|
||||
void CInstanceBase::NEW_GetRandomPositionInFanRange(CInstanceBase& rkInstTarget, TPixelPosition* pkPPosDst)
|
||||
{
|
||||
float fDstDirRot=NEW_GetRotationFromDestInstance(rkInstTarget);
|
||||
|
||||
float fRot=frandom(fDstDirRot-10.0f, fDstDirRot+10.0f);
|
||||
|
||||
D3DXMATRIX kMatRot;
|
||||
D3DXMatrixRotationZ(&kMatRot, D3DXToRadian(-fRot));
|
||||
|
||||
D3DXVECTOR3 v3Src(0.0f, 8000.0f, 0.0f);
|
||||
D3DXVECTOR3 v3Pos;
|
||||
D3DXVec3TransformCoord(&v3Pos, &v3Src, &kMatRot);
|
||||
|
||||
const TPixelPosition& c_rkPPosCur=NEW_GetCurPixelPositionRef();
|
||||
//const TPixelPosition& c_rkPPosFront=rkInstTarget.NEW_GetCurPixelPositionRef();
|
||||
|
||||
pkPPosDst->x=c_rkPPosCur.x+v3Pos.x;
|
||||
pkPPosDst->y=c_rkPPosCur.y+v3Pos.y;
|
||||
pkPPosDst->z=__GetBackgroundHeight(c_rkPPosCur.x, c_rkPPosCur.y);
|
||||
}
|
||||
|
||||
bool CInstanceBase::NEW_GetFrontInstance(CInstanceBase ** ppoutTargetInstance, float fDistance)
|
||||
{
|
||||
const float HALF_FAN_ROT_MIN = 10.0f;
|
||||
const float HALF_FAN_ROT_MAX = 50.0f;
|
||||
const float HALF_FAN_ROT_MIN_DISTANCE = 1000.0f;
|
||||
const float RPM = (HALF_FAN_ROT_MAX-HALF_FAN_ROT_MIN)/HALF_FAN_ROT_MIN_DISTANCE;
|
||||
|
||||
float fDstRot=NEW_GetRotation();
|
||||
|
||||
std::multimap<float, CInstanceBase*> kMap_pkInstNear;
|
||||
{
|
||||
CPythonCharacterManager& rkChrMgr=CPythonCharacterManager::Instance();
|
||||
CPythonCharacterManager::CharacterIterator i;
|
||||
for(i = rkChrMgr.CharacterInstanceBegin(); i!=rkChrMgr.CharacterInstanceEnd(); ++i)
|
||||
{
|
||||
CInstanceBase* pkInstEach=*i;
|
||||
if (pkInstEach==this)
|
||||
continue;
|
||||
|
||||
if (!IsAttackableInstance(*pkInstEach))
|
||||
continue;
|
||||
|
||||
if (NEW_GetDistanceFromDestInstance(*pkInstEach) > fDistance)
|
||||
continue;
|
||||
|
||||
float fEachInstDistance=min(NEW_GetDistanceFromDestInstance(*pkInstEach), HALF_FAN_ROT_MIN_DISTANCE);
|
||||
float fEachInstDirRot=NEW_GetRotationFromDestInstance(*pkInstEach);
|
||||
|
||||
float fHalfFanRot=(HALF_FAN_ROT_MAX-HALF_FAN_ROT_MIN)-RPM*fEachInstDistance+HALF_FAN_ROT_MIN;
|
||||
|
||||
float fMinDstDirRot=fDstRot-fHalfFanRot;
|
||||
float fMaxDstDirRot=fDstRot+fHalfFanRot;
|
||||
|
||||
if (fEachInstDirRot>=fMinDstDirRot && fEachInstDirRot<=fMaxDstDirRot)
|
||||
kMap_pkInstNear.insert(std::multimap<float, CInstanceBase*>::value_type(fEachInstDistance, pkInstEach));
|
||||
}
|
||||
}
|
||||
|
||||
if (kMap_pkInstNear.empty())
|
||||
return false;
|
||||
|
||||
*ppoutTargetInstance = kMap_pkInstNear.begin()->second;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
// 2004.07.21.levites - 비파부 다중 타겟 지원
|
||||
bool CInstanceBase::NEW_GetInstanceVectorInFanRange(float fSkillDistance, CInstanceBase& rkInstTarget, std::vector<CInstanceBase*>* pkVct_pkInst)
|
||||
{
|
||||
const float HALF_FAN_ROT_MIN = 20.0f;
|
||||
const float HALF_FAN_ROT_MAX = 40.0f;
|
||||
const float HALF_FAN_ROT_MIN_DISTANCE = 1000.0f;
|
||||
const float RPM = (HALF_FAN_ROT_MAX-HALF_FAN_ROT_MIN)/HALF_FAN_ROT_MIN_DISTANCE;
|
||||
|
||||
float fDstDirRot=NEW_GetRotationFromDestInstance(rkInstTarget);
|
||||
|
||||
// 2004.07.24.myevan - 비파부 가까이 있는 적부터 공격
|
||||
std::multimap<float, CInstanceBase*> kMap_pkInstNear;
|
||||
{
|
||||
CPythonCharacterManager& rkChrMgr=CPythonCharacterManager::Instance();
|
||||
CPythonCharacterManager::CharacterIterator i;
|
||||
for(i = rkChrMgr.CharacterInstanceBegin(); i!=rkChrMgr.CharacterInstanceEnd(); ++i)
|
||||
{
|
||||
CInstanceBase* pkInstEach=*i;
|
||||
if (pkInstEach==this)
|
||||
continue;
|
||||
|
||||
// 2004.07.25.myevan - 적인 경우만 추가한다
|
||||
if (!IsAttackableInstance(*pkInstEach))
|
||||
continue;
|
||||
|
||||
// 2004.07.21.levites - 비파부 다중 타겟 지원
|
||||
if (m_GraphicThingInstance.IsClickableDistanceDestInstance(pkInstEach->m_GraphicThingInstance, fSkillDistance))
|
||||
{
|
||||
float fEachInstDistance=min(NEW_GetDistanceFromDestInstance(*pkInstEach), HALF_FAN_ROT_MIN_DISTANCE);
|
||||
float fEachInstDirRot=NEW_GetRotationFromDestInstance(*pkInstEach);
|
||||
|
||||
float fHalfFanRot=(HALF_FAN_ROT_MAX-HALF_FAN_ROT_MIN)-RPM*fEachInstDistance+HALF_FAN_ROT_MIN;
|
||||
|
||||
float fMinDstDirRot=fDstDirRot-fHalfFanRot;
|
||||
float fMaxDstDirRot=fDstDirRot+fHalfFanRot;
|
||||
|
||||
if (fEachInstDirRot>=fMinDstDirRot && fEachInstDirRot<=fMaxDstDirRot)
|
||||
kMap_pkInstNear.insert(std::multimap<float, CInstanceBase*>::value_type(fEachInstDistance, pkInstEach));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
std::multimap<float, CInstanceBase*>::iterator i=kMap_pkInstNear.begin();
|
||||
for (i=kMap_pkInstNear.begin(); i!=kMap_pkInstNear.end(); ++i)
|
||||
pkVct_pkInst->push_back(i->second);
|
||||
}
|
||||
|
||||
if (pkVct_pkInst->empty())
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool CInstanceBase::NEW_GetInstanceVectorInCircleRange(float fSkillDistance, std::vector<CInstanceBase*>* pkVct_pkInst)
|
||||
{
|
||||
std::multimap<float, CInstanceBase*> kMap_pkInstNear;
|
||||
|
||||
{
|
||||
CPythonCharacterManager& rkChrMgr=CPythonCharacterManager::Instance();
|
||||
CPythonCharacterManager::CharacterIterator i;
|
||||
for(i = rkChrMgr.CharacterInstanceBegin(); i!=rkChrMgr.CharacterInstanceEnd(); ++i)
|
||||
{
|
||||
CInstanceBase* pkInstEach=*i;
|
||||
|
||||
// 자신인 경우 추가하지 않는다
|
||||
if (pkInstEach==this)
|
||||
continue;
|
||||
|
||||
// 적인 경우만 추가한다
|
||||
if (!IsAttackableInstance(*pkInstEach))
|
||||
continue;
|
||||
|
||||
if (m_GraphicThingInstance.IsClickableDistanceDestInstance(pkInstEach->m_GraphicThingInstance, fSkillDistance))
|
||||
{
|
||||
float fEachInstDistance=NEW_GetDistanceFromDestInstance(*pkInstEach);
|
||||
kMap_pkInstNear.insert(std::make_pair(fEachInstDistance, pkInstEach));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
std::multimap<float, CInstanceBase*>::iterator i=kMap_pkInstNear.begin();
|
||||
for (i=kMap_pkInstNear.begin(); i!=kMap_pkInstNear.end(); ++i)
|
||||
pkVct_pkInst->push_back(i->second);
|
||||
}
|
||||
|
||||
if (pkVct_pkInst->empty())
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
BOOL CInstanceBase::NEW_IsClickableDistanceDestPixelPosition(const TPixelPosition& c_rkPPosDst)
|
||||
{
|
||||
float fDistance=NEW_GetDistanceFromDestPixelPosition(c_rkPPosDst);
|
||||
|
||||
if (fDistance>150.0f)
|
||||
return FALSE;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
BOOL CInstanceBase::NEW_IsClickableDistanceDestInstance(CInstanceBase& rkInstDst)
|
||||
{
|
||||
float fDistance = 150.0f;
|
||||
|
||||
if (IsBowMode())
|
||||
fDistance = __GetBowRange();
|
||||
|
||||
if (rkInstDst.IsNPC())
|
||||
fDistance = 500.0f;
|
||||
|
||||
if (rkInstDst.IsResource())
|
||||
fDistance = 100.0f;
|
||||
|
||||
return m_GraphicThingInstance.IsClickableDistanceDestInstance(rkInstDst.m_GraphicThingInstance, fDistance);
|
||||
}
|
||||
|
||||
bool CInstanceBase::NEW_UseSkill(UINT uSkill, UINT uMot, UINT uMotLoopCount, bool isMovingSkill)
|
||||
{
|
||||
if (IsDead())
|
||||
return false;
|
||||
|
||||
if (IsStun())
|
||||
return false;
|
||||
|
||||
if (IsKnockDown())
|
||||
return false;
|
||||
|
||||
if (isMovingSkill)
|
||||
{
|
||||
if (!IsWalking())
|
||||
StartWalking();
|
||||
|
||||
m_isGoing = TRUE;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (IsWalking())
|
||||
EndWalking();
|
||||
|
||||
m_isGoing = FALSE;
|
||||
}
|
||||
|
||||
float fCurRot=m_GraphicThingInstance.GetTargetRotation();
|
||||
SetAdvancingRotation(fCurRot);
|
||||
|
||||
m_GraphicThingInstance.InterceptOnceMotion(CRaceMotionData::NAME_SKILL + uMot, 0.1f, uSkill, 1.0f);
|
||||
|
||||
m_GraphicThingInstance.__OnUseSkill(uMot, uMotLoopCount, isMovingSkill);
|
||||
|
||||
if (uMotLoopCount > 0)
|
||||
m_GraphicThingInstance.SetMotionLoopCount(uMotLoopCount);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void CInstanceBase::NEW_Attack()
|
||||
{
|
||||
float fDirRot=GetRotation();
|
||||
NEW_Attack(fDirRot);
|
||||
}
|
||||
|
||||
void CInstanceBase::NEW_Attack(float fDirRot)
|
||||
{
|
||||
if (IsDead())
|
||||
return;
|
||||
|
||||
if (IsStun())
|
||||
return;
|
||||
|
||||
if (IsKnockDown())
|
||||
return;
|
||||
|
||||
if (IsUsingSkill())
|
||||
return;
|
||||
|
||||
if (IsWalking())
|
||||
EndWalking();
|
||||
|
||||
m_isGoing = FALSE;
|
||||
|
||||
if (IsPoly())
|
||||
{
|
||||
InputNormalAttack(fDirRot);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (m_kHorse.IsMounting())
|
||||
{
|
||||
InputComboAttack(fDirRot);
|
||||
}
|
||||
else
|
||||
{
|
||||
InputComboAttack(fDirRot);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void CInstanceBase::NEW_AttackToDestPixelPositionDirection(const TPixelPosition& c_rkPPosDst)
|
||||
{
|
||||
float fDirRot=NEW_GetRotationFromDestPixelPosition(c_rkPPosDst);
|
||||
|
||||
NEW_Attack(fDirRot);
|
||||
}
|
||||
|
||||
bool CInstanceBase::NEW_AttackToDestInstanceDirection(CInstanceBase& rkInstDst, IFlyEventHandler* pkFlyHandler)
|
||||
{
|
||||
return NEW_AttackToDestInstanceDirection(rkInstDst);
|
||||
}
|
||||
|
||||
bool CInstanceBase::NEW_AttackToDestInstanceDirection(CInstanceBase& rkInstDst)
|
||||
{
|
||||
TPixelPosition kPPosDst;
|
||||
rkInstDst.NEW_GetPixelPosition(&kPPosDst);
|
||||
NEW_AttackToDestPixelPositionDirection(kPPosDst);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void CInstanceBase::AttackProcess()
|
||||
{
|
||||
if (!m_GraphicThingInstance.CanCheckAttacking())
|
||||
return;
|
||||
|
||||
CInstanceBase * pkInstLast = NULL;
|
||||
CPythonCharacterManager& rkChrMgr = CPythonCharacterManager::Instance();
|
||||
CPythonCharacterManager::CharacterIterator i = rkChrMgr.CharacterInstanceBegin();
|
||||
while (rkChrMgr.CharacterInstanceEnd()!=i)
|
||||
{
|
||||
CInstanceBase* pkInstEach=*i;
|
||||
++i;
|
||||
|
||||
// 서로간의 InstanceType 비교
|
||||
if (!IsAttackableInstance(*pkInstEach))
|
||||
continue;
|
||||
|
||||
if (pkInstEach!=this)
|
||||
{
|
||||
if (CheckAttacking(*pkInstEach))
|
||||
{
|
||||
pkInstLast=pkInstEach;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (pkInstLast)
|
||||
{
|
||||
m_dwLastDmgActorVID=pkInstLast->GetVirtualID();
|
||||
}
|
||||
}
|
||||
|
||||
void CInstanceBase::InputNormalAttack(float fAtkDirRot)
|
||||
{
|
||||
m_GraphicThingInstance.InputNormalAttackCommand(fAtkDirRot);
|
||||
}
|
||||
|
||||
void CInstanceBase::InputComboAttack(float fAtkDirRot)
|
||||
{
|
||||
m_GraphicThingInstance.InputComboAttackCommand(fAtkDirRot);
|
||||
__ComboProcess();
|
||||
}
|
||||
|
||||
void CInstanceBase::RunNormalAttack(float fAtkDirRot)
|
||||
{
|
||||
EndGoing();
|
||||
m_GraphicThingInstance.NormalAttack(fAtkDirRot);
|
||||
}
|
||||
|
||||
void CInstanceBase::RunComboAttack(float fAtkDirRot, DWORD wMotionIndex)
|
||||
{
|
||||
EndGoing();
|
||||
m_GraphicThingInstance.ComboAttack(wMotionIndex, fAtkDirRot);
|
||||
}
|
||||
|
||||
// 리턴값 TRUE가 무엇인가가 있다
|
||||
BOOL CInstanceBase::CheckAdvancing()
|
||||
{
|
||||
#ifdef __MOVIE_MODE__
|
||||
if (IsMovieMode())
|
||||
return FALSE;
|
||||
#endif
|
||||
if (!__IsMainInstance() && !IsAttacking())
|
||||
{
|
||||
if (IsPC() && IsWalking())
|
||||
{
|
||||
CPythonCharacterManager& rkChrMgr=CPythonCharacterManager::Instance();
|
||||
for(CPythonCharacterManager::CharacterIterator i = rkChrMgr.CharacterInstanceBegin(); i!=rkChrMgr.CharacterInstanceEnd();++i)
|
||||
{
|
||||
CInstanceBase* pkInstEach=*i;
|
||||
if (pkInstEach==this)
|
||||
continue;
|
||||
if (!pkInstEach->IsDoor())
|
||||
continue;
|
||||
|
||||
if (m_GraphicThingInstance.TestActorCollision(pkInstEach->GetGraphicThingInstanceRef()))
|
||||
{
|
||||
BlockMovement();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (m_GraphicThingInstance.CanSkipCollision())
|
||||
{
|
||||
//Tracenf("%x VID %d 충돌 스킵", ELTimer_GetMSec(), GetVirtualID());
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
BOOL bUsingSkill = m_GraphicThingInstance.IsUsingSkill();
|
||||
|
||||
m_dwAdvActorVID = 0;
|
||||
UINT uCollisionCount=0;
|
||||
|
||||
CPythonCharacterManager& rkChrMgr=CPythonCharacterManager::Instance();
|
||||
for(CPythonCharacterManager::CharacterIterator i = rkChrMgr.CharacterInstanceBegin(); i!=rkChrMgr.CharacterInstanceEnd();++i)
|
||||
{
|
||||
CInstanceBase* pkInstEach=*i;
|
||||
if (pkInstEach==this)
|
||||
continue;
|
||||
|
||||
CActorInstance& rkActorSelf=m_GraphicThingInstance;
|
||||
CActorInstance& rkActorEach=pkInstEach->GetGraphicThingInstanceRef();
|
||||
|
||||
//NOTE : Skil을 쓰더라도 Door Type과는 Collision체크 한다.
|
||||
if( bUsingSkill && !rkActorEach.IsDoor() )
|
||||
continue;
|
||||
|
||||
// 앞으로 전진할수 있는가?
|
||||
if (rkActorSelf.TestActorCollision(rkActorEach))
|
||||
{
|
||||
uCollisionCount++;
|
||||
if (uCollisionCount==2)
|
||||
{
|
||||
rkActorSelf.BlockMovement();
|
||||
return TRUE;
|
||||
}
|
||||
rkActorSelf.AdjustDynamicCollisionMovement(&rkActorEach);
|
||||
|
||||
if (rkActorSelf.TestActorCollision(rkActorEach))
|
||||
{
|
||||
rkActorSelf.BlockMovement();
|
||||
return TRUE;
|
||||
}
|
||||
else
|
||||
{
|
||||
NEW_MoveToDestPixelPositionDirection(NEW_GetDstPixelPositionRef());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 맵속성 체크
|
||||
CPythonBackground& rkBG=CPythonBackground::Instance();
|
||||
const D3DXVECTOR3 & rv3Position = m_GraphicThingInstance.GetPosition();
|
||||
const D3DXVECTOR3 & rv3MoveDirection = m_GraphicThingInstance.GetMovementVectorRef();
|
||||
|
||||
// NOTE : 만약 이동 거리가 크다면 쪼개서 구간 별로 속성을 체크해 본다
|
||||
// 현재 설정해 놓은 10.0f는 임의의 거리 - [levites]
|
||||
int iStep = int(D3DXVec3Length(&rv3MoveDirection) / 10.0f);
|
||||
D3DXVECTOR3 v3CheckStep = rv3MoveDirection / float(iStep);
|
||||
D3DXVECTOR3 v3CheckPosition = rv3Position;
|
||||
for (int j = 0; j < iStep; ++j)
|
||||
{
|
||||
v3CheckPosition += v3CheckStep;
|
||||
|
||||
// Check
|
||||
if (rkBG.isAttrOn(v3CheckPosition.x, -v3CheckPosition.y, CTerrainImpl::ATTRIBUTE_BLOCK))
|
||||
{
|
||||
BlockMovement();
|
||||
//return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
// Check
|
||||
D3DXVECTOR3 v3NextPosition = rv3Position + rv3MoveDirection;
|
||||
if (rkBG.isAttrOn(v3NextPosition.x, -v3NextPosition.y, CTerrainImpl::ATTRIBUTE_BLOCK))
|
||||
{
|
||||
BlockMovement();
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
BOOL CInstanceBase::CheckAttacking(CInstanceBase& rkInstVictim)
|
||||
{
|
||||
if (IsInSafe())
|
||||
return FALSE;
|
||||
|
||||
if (rkInstVictim.IsInSafe())
|
||||
return FALSE;
|
||||
|
||||
#ifdef __MOVIE_MODE__
|
||||
return FALSE;
|
||||
#endif
|
||||
|
||||
if (!m_GraphicThingInstance.AttackingProcess(rkInstVictim.m_GraphicThingInstance))
|
||||
return FALSE;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
BOOL CInstanceBase::isNormalAttacking()
|
||||
{
|
||||
return m_GraphicThingInstance.isNormalAttacking();
|
||||
}
|
||||
|
||||
BOOL CInstanceBase::isComboAttacking()
|
||||
{
|
||||
return m_GraphicThingInstance.isComboAttacking();
|
||||
}
|
||||
|
||||
BOOL CInstanceBase::IsUsingSkill()
|
||||
{
|
||||
return m_GraphicThingInstance.IsUsingSkill();
|
||||
}
|
||||
|
||||
BOOL CInstanceBase::IsUsingMovingSkill()
|
||||
{
|
||||
return m_GraphicThingInstance.IsUsingMovingSkill();
|
||||
}
|
||||
|
||||
BOOL CInstanceBase::CanCancelSkill()
|
||||
{
|
||||
return m_GraphicThingInstance.CanCancelSkill();
|
||||
}
|
||||
|
||||
BOOL CInstanceBase::CanAttackHorseLevel()
|
||||
{
|
||||
if (!IsMountingHorse())
|
||||
return FALSE;
|
||||
|
||||
return m_kHorse.CanAttack();
|
||||
}
|
||||
|
||||
bool CInstanceBase::IsAffect(UINT uAffect)
|
||||
{
|
||||
return m_kAffectFlagContainer.IsSet(uAffect);
|
||||
}
|
||||
|
||||
MOTION_KEY CInstanceBase::GetNormalAttackIndex()
|
||||
{
|
||||
return m_GraphicThingInstance.GetNormalAttackIndex();
|
||||
}
|
||||
|
||||
DWORD CInstanceBase::GetComboIndex()
|
||||
{
|
||||
return m_GraphicThingInstance.GetComboIndex();
|
||||
}
|
||||
|
||||
float CInstanceBase::GetAttackingElapsedTime()
|
||||
{
|
||||
return m_GraphicThingInstance.GetAttackingElapsedTime();
|
||||
}
|
||||
|
||||
void CInstanceBase::ProcessHitting(DWORD dwMotionKey, CInstanceBase * pVictimInstance)
|
||||
{
|
||||
assert(!"-_-" && "CInstanceBase::ProcessHitting");
|
||||
//m_GraphicThingInstance.ProcessSucceedingAttacking(dwMotionKey, pVictimInstance->m_GraphicThingInstance);
|
||||
}
|
||||
|
||||
void CInstanceBase::ProcessHitting(DWORD dwMotionKey, BYTE byEventIndex, CInstanceBase * pVictimInstance)
|
||||
{
|
||||
assert(!"-_-" && "CInstanceBase::ProcessHitting");
|
||||
//m_GraphicThingInstance.ProcessSucceedingAttacking(dwMotionKey, byEventIndex, pVictimInstance->m_GraphicThingInstance);
|
||||
}
|
||||
|
||||
void CInstanceBase::GetBlendingPosition(TPixelPosition * pPixelPosition)
|
||||
{
|
||||
m_GraphicThingInstance.GetBlendingPosition(pPixelPosition);
|
||||
}
|
||||
|
||||
void CInstanceBase::SetBlendingPosition(const TPixelPosition & c_rPixelPosition)
|
||||
{
|
||||
m_GraphicThingInstance.SetBlendingPosition(c_rPixelPosition);
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
void CInstanceBase::Revive()
|
||||
{
|
||||
m_isGoing=FALSE;
|
||||
m_GraphicThingInstance.Revive();
|
||||
|
||||
__AttachHorseSaddle();
|
||||
}
|
||||
|
||||
void CInstanceBase::Stun()
|
||||
{
|
||||
NEW_Stop();
|
||||
m_GraphicThingInstance.Stun();
|
||||
|
||||
__AttachEffect(EFFECT_STUN);
|
||||
}
|
||||
|
||||
void CInstanceBase::Die()
|
||||
{
|
||||
__DetachHorseSaddle();
|
||||
|
||||
if (IsAffect(AFFECT_SPAWN))
|
||||
__AttachEffect(EFFECT_SPAWN_DISAPPEAR);
|
||||
|
||||
// 2004.07.25.이펙트 안붙는 문제해결
|
||||
////////////////////////////////////////
|
||||
__ClearAffects();
|
||||
////////////////////////////////////////
|
||||
|
||||
OnUnselected();
|
||||
OnUntargeted();
|
||||
|
||||
m_GraphicThingInstance.Die();
|
||||
}
|
||||
|
||||
void CInstanceBase::Hide()
|
||||
{
|
||||
m_GraphicThingInstance.SetAlphaValue(0.0f);
|
||||
m_GraphicThingInstance.BlendAlphaValue(0.0f, 0.1f);
|
||||
}
|
||||
|
||||
void CInstanceBase::Show()
|
||||
{
|
||||
m_GraphicThingInstance.SetAlphaValue(1.0f);
|
||||
m_GraphicThingInstance.BlendAlphaValue(1.0f, 0.1f);
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,17 @@
|
||||
#include "StdAfx.h"
|
||||
#include "InstanceBase.h"
|
||||
|
||||
CActorInstance::IEventHandler& CInstanceBase::GetEventHandlerRef()
|
||||
{
|
||||
return m_GraphicThingInstance.__GetEventHandlerRef();
|
||||
}
|
||||
|
||||
CActorInstance::IEventHandler* CInstanceBase::GetEventHandlerPtr()
|
||||
{
|
||||
return m_GraphicThingInstance.__GetEventHandlerPtr();
|
||||
}
|
||||
|
||||
void CInstanceBase::SetEventHandler(CActorInstance::IEventHandler* pkEventHandler)
|
||||
{
|
||||
m_GraphicThingInstance.SetEventHandler(pkEventHandler);
|
||||
}
|
||||
@@ -0,0 +1,165 @@
|
||||
#include "StdAfx.h"
|
||||
#include "InstanceBase.h"
|
||||
#include "AbstractPlayer.h"
|
||||
#include "../GameLib/ActorInstance.h"
|
||||
|
||||
const int c_iFishingRotStep = 8;
|
||||
const float c_fFishingDistance = 600.0f;
|
||||
|
||||
void CInstanceBase::SetMotionMode(int iMotionMode)
|
||||
{
|
||||
m_GraphicThingInstance.SetMotionMode(iMotionMode);
|
||||
}
|
||||
|
||||
int CInstanceBase::GetMotionMode(DWORD dwMotionIndex)
|
||||
{
|
||||
return m_GraphicThingInstance.GetMotionMode();
|
||||
}
|
||||
|
||||
void CInstanceBase::SetLoopMotion(WORD wMotion, float fBlendTime/* =0.1f */, float fSpeedRatio)
|
||||
{
|
||||
m_GraphicThingInstance.SetLoopMotion(wMotion, fBlendTime, fSpeedRatio);
|
||||
}
|
||||
|
||||
void CInstanceBase::PushOnceMotion(WORD wMotion, float fBlendTime, float fSpeedRatio)
|
||||
{
|
||||
m_GraphicThingInstance.PushOnceMotion(wMotion, fBlendTime, fSpeedRatio);
|
||||
}
|
||||
|
||||
void CInstanceBase::PushLoopMotion(WORD wMotion, float fBlendTime, float fSpeedRatio)
|
||||
{
|
||||
m_GraphicThingInstance.PushLoopMotion(wMotion, fBlendTime, fSpeedRatio);
|
||||
}
|
||||
|
||||
void CInstanceBase::ResetLocalTime()
|
||||
{
|
||||
m_GraphicThingInstance.ResetLocalTime();
|
||||
}
|
||||
|
||||
void CInstanceBase::SetEndStopMotion()
|
||||
{
|
||||
m_GraphicThingInstance.SetEndStopMotion();
|
||||
}
|
||||
|
||||
BOOL CInstanceBase::isLock()
|
||||
{
|
||||
return m_GraphicThingInstance.isLock();
|
||||
}
|
||||
|
||||
void CInstanceBase::StartFishing(float frot)
|
||||
{
|
||||
BlendRotation(frot);
|
||||
|
||||
const TPixelPosition& c_rkPPosCur=m_GraphicThingInstance.NEW_GetCurPixelPositionRef();
|
||||
float fRot = m_GraphicThingInstance.GetTargetRotation();
|
||||
//float fPlainCoordRot=ELRightCoord_ConvertToPlainCoordDegree(fRightCoordRot);
|
||||
|
||||
TPixelPosition kPPosFishing;
|
||||
ELPlainCoord_GetRotatedPixelPosition(c_rkPPosCur.x, c_rkPPosCur.y, c_fFishingDistance, fRot, &kPPosFishing.x, &kPPosFishing.y);
|
||||
if (!__Background_GetWaterHeight(kPPosFishing, &kPPosFishing.z))
|
||||
kPPosFishing.z=c_rkPPosCur.z;
|
||||
|
||||
D3DXVECTOR3 v3Fishing;
|
||||
PixelPositionToD3DXVECTOR3(kPPosFishing, &v3Fishing);
|
||||
m_GraphicThingInstance.SetFishingPosition(v3Fishing);
|
||||
|
||||
PushOnceMotion(CRaceMotionData::NAME_FISHING_THROW);
|
||||
PushLoopMotion(CRaceMotionData::NAME_FISHING_WAIT);
|
||||
}
|
||||
void CInstanceBase::StopFishing()
|
||||
{
|
||||
m_GraphicThingInstance.InterceptOnceMotion(CRaceMotionData::NAME_FISHING_STOP);
|
||||
PushLoopMotion(CRaceMotionData::NAME_WAIT);
|
||||
}
|
||||
void CInstanceBase::ReactFishing()
|
||||
{
|
||||
PushOnceMotion(CRaceMotionData::NAME_FISHING_REACT);
|
||||
PushLoopMotion(CRaceMotionData::NAME_FISHING_WAIT);
|
||||
}
|
||||
void CInstanceBase::CatchSuccess()
|
||||
{
|
||||
m_GraphicThingInstance.InterceptOnceMotion(CRaceMotionData::NAME_FISHING_CATCH);
|
||||
PushLoopMotion(CRaceMotionData::NAME_WAIT);
|
||||
}
|
||||
void CInstanceBase::CatchFail()
|
||||
{
|
||||
m_GraphicThingInstance.InterceptOnceMotion(CRaceMotionData::NAME_FISHING_FAIL);
|
||||
PushLoopMotion(CRaceMotionData::NAME_WAIT);
|
||||
}
|
||||
|
||||
BOOL CInstanceBase::GetFishingRot(int * pirot)
|
||||
{
|
||||
const TPixelPosition& c_rkPPosCur=m_GraphicThingInstance.NEW_GetCurPixelPositionRef();
|
||||
float fCharacterRot = m_GraphicThingInstance.GetRotation();
|
||||
|
||||
//float frot = fCharacterRot;
|
||||
|
||||
for (float fRot=0.0f; fRot<=180.0f; fRot+=10.0f)
|
||||
{
|
||||
TPixelPosition kPPosFishingRight;
|
||||
ELPlainCoord_GetRotatedPixelPosition(c_rkPPosCur.x, c_rkPPosCur.y, c_fFishingDistance, fCharacterRot+fRot, &kPPosFishingRight.x, &kPPosFishingRight.y);
|
||||
if (__Background_IsWaterPixelPosition(kPPosFishingRight))
|
||||
{
|
||||
*pirot = fCharacterRot+fRot;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
TPixelPosition kPPosFishingLeft;
|
||||
ELPlainCoord_GetRotatedPixelPosition(c_rkPPosCur.x, c_rkPPosCur.y, c_fFishingDistance, fCharacterRot-fRot, &kPPosFishingLeft.x, &kPPosFishingLeft.y);
|
||||
if (__Background_IsWaterPixelPosition(kPPosFishingLeft))
|
||||
{
|
||||
*pirot = fCharacterRot-fRot;
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void CInstanceBase::__EnableChangingTCPState()
|
||||
{
|
||||
m_bEnableTCPState = TRUE;
|
||||
}
|
||||
|
||||
void CInstanceBase::__DisableChangingTCPState()
|
||||
{
|
||||
m_bEnableTCPState = FALSE;
|
||||
}
|
||||
|
||||
void CInstanceBase::ActDualEmotion(CInstanceBase & rkDstInst, WORD wMotionNumber1, WORD wMotionNumber2)
|
||||
{
|
||||
if (!IsWaiting())
|
||||
{
|
||||
m_GraphicThingInstance.SetLoopMotion(CRaceMotionData::NAME_WAIT, 0.05f);
|
||||
}
|
||||
if (!rkDstInst.IsWaiting())
|
||||
{
|
||||
rkDstInst.m_GraphicThingInstance.SetLoopMotion(CRaceMotionData::NAME_WAIT, 0.05f);
|
||||
}
|
||||
|
||||
const float c_fEmotionDistance = 100.0f;
|
||||
const TPixelPosition & c_rMainPosition = NEW_GetCurPixelPositionRef();
|
||||
const TPixelPosition & c_rTargetPosition = rkDstInst.NEW_GetCurPixelPositionRef();
|
||||
TPixelPosition kDirection = c_rMainPosition - c_rTargetPosition;
|
||||
float fDistance = sqrtf((kDirection.x*kDirection.x) + (kDirection.y*kDirection.y));
|
||||
TPixelPosition kDstPosition;
|
||||
kDstPosition.x = c_rTargetPosition.x + (kDirection.x/fDistance)*c_fEmotionDistance;
|
||||
kDstPosition.y = c_rTargetPosition.y + (kDirection.y/fDistance)*c_fEmotionDistance;
|
||||
|
||||
DWORD dwCurTime = ELTimer_GetServerMSec() + 500;
|
||||
PushTCPStateExpanded(dwCurTime, kDstPosition, 0.0f, FUNC_EMOTION, MAKELONG(wMotionNumber1, wMotionNumber2), rkDstInst.GetVirtualID());
|
||||
|
||||
__DisableChangingTCPState();
|
||||
rkDstInst.__DisableChangingTCPState();
|
||||
|
||||
if (__IsMainInstance() || rkDstInst.__IsMainInstance())
|
||||
{
|
||||
IAbstractPlayer & rPlayer=IAbstractPlayer::GetSingleton();
|
||||
rPlayer.StartEmotionProcess();
|
||||
}
|
||||
}
|
||||
|
||||
void CInstanceBase::ActEmotion(DWORD dwMotionNumber)
|
||||
{
|
||||
PushOnceMotion(dwMotionNumber);
|
||||
}
|
||||
@@ -0,0 +1,93 @@
|
||||
#include "StdAfx.h"
|
||||
#include "InstanceBase.h"
|
||||
#include "PythonBackground.h"
|
||||
|
||||
|
||||
|
||||
|
||||
void CInstanceBase::SCRIPT_SetPixelPosition(float fx, float fy)
|
||||
{
|
||||
float fz = __GetBackgroundHeight(fx, fy);
|
||||
NEW_SetPixelPosition(TPixelPosition(fx, fy, fz));
|
||||
}
|
||||
|
||||
void CInstanceBase::NEW_SetPixelPosition(const TPixelPosition & c_rPixelPosition)
|
||||
{
|
||||
m_GraphicThingInstance.SetCurPixelPosition(c_rPixelPosition);
|
||||
}
|
||||
|
||||
void CInstanceBase::NEW_GetPixelPosition(TPixelPosition * pPixelPosition)
|
||||
{
|
||||
*pPixelPosition=m_GraphicThingInstance.NEW_GetCurPixelPositionRef();
|
||||
}
|
||||
|
||||
void CInstanceBase::SetRotation(float fRotation)
|
||||
{
|
||||
m_GraphicThingInstance.SetRotation(fRotation);
|
||||
}
|
||||
|
||||
void CInstanceBase::BlendRotation(float fRotation, float fBlendTime)
|
||||
{
|
||||
m_GraphicThingInstance.BlendRotation(fRotation, fBlendTime);
|
||||
}
|
||||
|
||||
void CInstanceBase::NEW_LookAtFlyTarget()
|
||||
{
|
||||
m_GraphicThingInstance.LookAtFlyTarget();
|
||||
}
|
||||
|
||||
void CInstanceBase::NEW_LookAtDestPixelPosition(const TPixelPosition& c_rkPPosDst)
|
||||
{
|
||||
m_GraphicThingInstance.LookAt(c_rkPPosDst.x, -c_rkPPosDst.y);
|
||||
}
|
||||
|
||||
void CInstanceBase::NEW_LookAtDestInstance(CInstanceBase& rkInstDst)
|
||||
{
|
||||
m_GraphicThingInstance.LookAt(&rkInstDst.m_GraphicThingInstance);
|
||||
// Tracenf("LookAt %f", m_GraphicThingInstance.GetTargetRotation());
|
||||
}
|
||||
|
||||
float CInstanceBase::GetRotation()
|
||||
{
|
||||
return m_GraphicThingInstance.GetRotation();
|
||||
}
|
||||
|
||||
float CInstanceBase::GetAdvancingRotation()
|
||||
{
|
||||
return m_GraphicThingInstance.GetAdvancingRotation();
|
||||
}
|
||||
|
||||
void CInstanceBase::SetDirection(int dir)
|
||||
{
|
||||
float fDegree = GetDegreeFromDirection(dir);
|
||||
SetRotation(fDegree);
|
||||
SetAdvancingRotation(fDegree);
|
||||
}
|
||||
|
||||
void CInstanceBase::BlendDirection(int dir, float blendTime)
|
||||
{
|
||||
m_GraphicThingInstance.BlendRotation(GetDegreeFromDirection(dir), blendTime);
|
||||
}
|
||||
|
||||
float CInstanceBase::GetDegreeFromDirection(int dir)
|
||||
{
|
||||
if (dir < 0)
|
||||
return 0.0f;
|
||||
|
||||
if (dir >= DIR_MAX_NUM)
|
||||
return 0.0f;
|
||||
|
||||
static float s_dirRot[DIR_MAX_NUM]=
|
||||
{
|
||||
+45.0f * 4,
|
||||
+45.0f * 3,
|
||||
+45.0f * 2,
|
||||
+45.0f,
|
||||
+0.0f,
|
||||
360.0f-45.0f,
|
||||
360.0f-45.0f * 2,
|
||||
360.0f-45.0f * 3,
|
||||
};
|
||||
|
||||
return s_dirRot[dir];
|
||||
}
|
||||
@@ -2050,7 +2050,7 @@ typedef struct SPlayerSkill
|
||||
{
|
||||
BYTE bMasterType;
|
||||
BYTE bLevel;
|
||||
time_t tNextRead;
|
||||
LONG tNextRead; // PORT: time_t is 32-bit under 40250's _USE_32BIT_TIME_T; 64-bit on LP64 hosts
|
||||
} TPlayerSkill;
|
||||
|
||||
typedef struct packet_skill_level_new
|
||||
@@ -2058,6 +2058,7 @@ typedef struct packet_skill_level_new
|
||||
BYTE bHeader;
|
||||
TPlayerSkill skills[SKILL_MAX_NUM];
|
||||
} TPacketGCSkillLevelNew;
|
||||
static_assert(sizeof(TPacketGCSkillLevelNew) == 1 + SKILL_MAX_NUM * 6);
|
||||
|
||||
// fly
|
||||
typedef struct packet_fly
|
||||
|
||||
Reference in New Issue
Block a user