mirror of
https://github.com/libAthena/athena.git
synced 2025-12-18 01:15:21 +00:00
Reimplement Exceptions.
This commit is contained in:
@@ -72,7 +72,7 @@ std::vector<ALTTPOverworldEvent*> ALTTPQuest::overworldEvents() const
|
||||
ALTTPOverworldEvent* ALTTPQuest::overworldEvent(atUint32 id) const
|
||||
{
|
||||
if (id > m_overworldEvents.size() - 1)
|
||||
THROW_INVALID_OPERATION_EXCEPTION("index out of range");
|
||||
THROW_INVALID_OPERATION_EXCEPTION_RETURN(nullptr, "index out of range");
|
||||
return m_overworldEvents[id];
|
||||
}
|
||||
|
||||
@@ -310,7 +310,7 @@ void ALTTPQuest::setDungeonKeys(atUint32 id, atUint8 val)
|
||||
atUint8 ALTTPQuest::dungeonKeys(atUint32 id) const
|
||||
{
|
||||
if (id > m_dungeonKeys.size() - 1)
|
||||
THROW_INVALID_OPERATION_EXCEPTION("index out of range");
|
||||
THROW_INVALID_OPERATION_EXCEPTION_RETURN(0, "index out of range");
|
||||
|
||||
return m_dungeonKeys[id];
|
||||
}
|
||||
@@ -407,7 +407,7 @@ void ALTTPQuest::setOldManFlag(atUint32 id, atUint8 val)
|
||||
atUint8 ALTTPQuest::oldManFlag(atUint32 id)
|
||||
{
|
||||
if (id > m_oldManFlags.size() - 1)
|
||||
THROW_INVALID_OPERATION_EXCEPTION("index out of range");
|
||||
THROW_INVALID_OPERATION_EXCEPTION_RETURN(0, "index out of range");
|
||||
|
||||
return m_oldManFlags[id];
|
||||
}
|
||||
@@ -443,7 +443,7 @@ void ALTTPQuest::setUnknown1(atUint32 id, atUint8 val)
|
||||
atUint8 ALTTPQuest::unknown1(atUint32 id)
|
||||
{
|
||||
if (id > m_unknown1.size())
|
||||
THROW_INVALID_OPERATION_EXCEPTION("index out of range");
|
||||
THROW_INVALID_OPERATION_EXCEPTION_RETURN(0,"index out of range");
|
||||
|
||||
return m_unknown1[id];
|
||||
}
|
||||
@@ -629,7 +629,7 @@ void ALTTPQuest::setDungeonDeathTotal(atUint32 id, atUint16 val)
|
||||
atUint16 ALTTPQuest::dungeonDeathTotal(atUint32 id) const
|
||||
{
|
||||
if (id > m_dungeonDeathTotals.size())
|
||||
THROW_INVALID_OPERATION_EXCEPTION("index out of range");
|
||||
THROW_INVALID_OPERATION_EXCEPTION_RETURN(0, "index out of range");
|
||||
|
||||
return m_dungeonDeathTotals[id];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user