Skip to content

Commit

Permalink
change answer to mvalue
Browse files Browse the repository at this point in the history
  • Loading branch information
FabianTerhorst committed Sep 24, 2023
1 parent f119fa3 commit 91be63b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion ICore.h
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ namespace alt
* @param args answer args
* @param error error string
*/
virtual void TriggerClientRPCAnswer(IPlayer* target, uint16_t answerID, MValueArgs args, const std::string& error) = 0;
virtual void TriggerClientRPCAnswer(IPlayer* target, uint16_t answerID, MValue args, const std::string& error) = 0;
virtual void TriggerClientEvent(std::vector<IPlayer*> targets, const std::string& ev, MValueArgs args) = 0;
virtual void TriggerClientEventForAll(const std::string& ev, MValueArgs args) = 0;

Expand Down
6 changes: 3 additions & 3 deletions events/CClientScriptRPCEvent.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ namespace alt
return true;
}

bool Answer(MValueArgs _answer)
bool Answer(MValue _answer)
{
if (state == State::ANSWERED)
{
Expand All @@ -67,7 +67,7 @@ namespace alt

State GetState() const { return state; }

MValueArgs GetAnswer() const { return answer; }
MValue GetAnswer() const { return answer; }

std::string GetAnswerError() const { return answerError; }

Expand All @@ -77,7 +77,7 @@ namespace alt
std::string name;
MValueArgs args;
uint16_t answerID;
MValueArgs answer;
MValue answer;
std::string answerError;
};
#endif
Expand Down
6 changes: 3 additions & 3 deletions events/CServerScriptRPCAnswerEvent.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace alt
class CServerScriptRPCAnswerEvent : public CEvent
{
public:
CServerScriptRPCAnswerEvent(uint16_t _answerID, const MValueArgs& _answer, const std::string& _error) :
CServerScriptRPCAnswerEvent(uint16_t _answerID, const MValue& _answer, const std::string& _error) :
CEvent(Type::SERVER_SCRIPT_RPC_ANSWER_EVENT),
answer(_answer),
answerError(_error)
Expand All @@ -21,12 +21,12 @@ namespace alt
}

uint16_t GetAnswerID() const { return answerID; }
MValueArgs GetAnswer() const { return answer; }
MValue GetAnswer() const { return answer; }
std::string GetAnswerError() const { return answerError; }

private:
uint16_t answerID;
MValueArgs answer;
MValue answer;
std::string answerError;
};
#endif
Expand Down

0 comments on commit 91be63b

Please sign in to comment.