Skip to content

Commit

Permalink
fix bug
Browse files Browse the repository at this point in the history
  • Loading branch information
viticm committed Nov 14, 2013
1 parent 1316e06 commit b78985f
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions gbk/server/Server/Server/AI/AI_Human.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,6 @@ __ENTER_FUNCTION
// 检测玩家身上的任务个数是否已达上限
if( !pCharacter->getScene()->OnAcceptMissionCheck((Obj_Human*)pCharacter,idMissionScript) )
{
LERR("quest is full");
return OR_OK ;
}

Expand All @@ -835,7 +834,6 @@ __ENTER_FUNCTION
ORESULT oRes = Validate_Event( pNPC );
if( oRes != OR_OK )
{
LERR("oResult: %d", oRes);
return oRes;
}

Expand Down Expand Up @@ -878,11 +876,9 @@ __ENTER_FUNCTION
pCharacter->getScene()->SceneID(),
pCharacter->GetID(),
(INT)pNPC->GetID());
LERR( "ret: %d", ret );

if(ret>0)
{
LERR( "file: %s, line: %d", __FILE__, __LINE__ );
pCharacter->getScene()->GetLuaInterface()->ExeScript_DD(
idMissionScript,
"OnAccept",
Expand Down Expand Up @@ -912,7 +908,6 @@ __ENTER_FUNCTION
pCharacter->getScene()->SceneID(),
pCharacter->GetID());

LERR( "ret: %d", ret );

if(ret>0)
{
Expand Down Expand Up @@ -1034,13 +1029,11 @@ __ENTER_FUNCTION
// 使得Human停下来
Stop();

LERR("FILE: %s, LINE: %d", __FILE__, __LINE__) ;
Obj_Character *pCharacter = GetCharacter();
Assert( pCharacter != NULL );
if ( pCharacter == NULL )
return OR_ERROR;

LERR("FILE: %s, LINE: %d", __FILE__, __LINE__) ;
Obj* pNPC = pCharacter->getScene()->GetObjManager()->GetObj(idNPC);

ORESULT oRes = Validate_Event( pNPC );
Expand All @@ -1049,7 +1042,6 @@ __ENTER_FUNCTION
return oRes;
}

LERR("FILE: %s, LINE: %d", __FILE__, __LINE__) ;
/*
ScriptID_t idScript = pNPC->GetScriptID();
if ( idScript == (ScriptID_t)(0xFFFFFFFF) )
Expand All @@ -1065,7 +1057,6 @@ __ENTER_FUNCTION
(INT)uSelectRadioID );
*/

LERR("FILE: %s, LINE: %d", __FILE__, __LINE__) ;
BOOL bVerifyEvent = FALSE;
if(pNPC->GetObjType() == Obj::OBJ_TYPE_MONSTER)
{
Expand All @@ -1084,7 +1075,6 @@ __ENTER_FUNCTION
}
}

LERR("FILE: %s, LINE: %d", __FILE__, __LINE__) ;
if(bVerifyEvent)
{
pCharacter->getScene()->GetLuaInterface()->ExeScript_DDDD(
Expand All @@ -1096,7 +1086,6 @@ __ENTER_FUNCTION
uSelectRadioID);

}
LERR("FILE: %s, LINE: %d", __FILE__, __LINE__) ;
return OR_OK;

__LEAVE_FUNCTION
Expand Down Expand Up @@ -2386,15 +2375,13 @@ VOID AI_Human::Penalty_Money_After_Die(const _DIE_PENALTY_INFO* pPenaltyInfo, Ob
MoneyLogParam.XPos = pHuman->getWorldPos()->m_fX;
MoneyLogParam.ZPos = pHuman->getWorldPos()->m_fZ;

LERR("do the function: %s", __func__) ;
SaveMoneyLog(&MoneyLogParam);
}
else
{
if(pHuman->GetMoney()>0)
{

LERR("do the function: %s", __func__) ;
MONEY_LOG_PARAM MoneyLogParam;
MoneyLogParam.CharGUID = pHuman->GetGUID();
MoneyLogParam.OPType = MONEY_DIE_COST;
Expand Down

0 comments on commit b78985f

Please sign in to comment.