Skip to content

Fixed UseItem function (#1480) #1495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fixed UseItem function (#1480) #1495

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions src/game/CObjBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ TRIGRET_TYPE CObjBase::OnHearTrigger( CResourceLock & s, lpctstr pszCmd, CChar *
pScriptArgs->m_iN1 = iModeRef;
pScriptArgs->m_iN2 = wHue;
TRIGRET_TYPE iRet = CObjBase::OnTriggerRunVal( s, TRIGRUN_SECTION_EXEC, pScriptArgs, pSrc );

if ( iRet != TRIGRET_RET_FALSE )
return iRet;

Expand Down Expand Up @@ -2980,23 +2980,25 @@ bool CObjBase::r_Verb( CScript & s, CTextConsole * pSrc ) // Execute command fro

case OV_USEITEM:
EXC_SET_BLOCK("USEITEM");
if ( ! pCharSrc )
if (!pCharSrc)
return false;
if ( s.HasArgs() )
if (s.HasArgs())
{
if (!IsChar())
return false;

CChar* pChar = CUID::CharFindFromUID(s.GetArgDWVal());
if (!pChar)
return false;
// Find the item character is trying to use.
CItem* pItem = CUID::ItemFindFromUID(s.GetArgDWVal());
if (!pItem)
return false;

return pChar->Use_Obj( pChar, false, true );
auto* pChar = dynamic_cast<CChar*>(this);
return pChar->Use_Obj(pItem, false, true);
}
else
return pCharSrc->Use_Obj( this, false, true );

case OV_FIX:
return pCharSrc->Use_Obj(this, false, true);

case OV_FIX:
s.GetArgStr()[0] = '\0';
FALLTHROUGH;
case OV_Z: // ussually in "SETZ" form
Expand Down