thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-02-21 20:27:13 +01:00
Code Releases Activity

Update the IRC module to comply with the new StackStrF changes.

Browse Source
This commit is contained in:
Sandu Liviu Catalin 2018-07-30 01:03:28 +03:00
parent 3f8e95fabc
commit d39c08fe71
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/irc/Common.cpp
View File

@ -33,9 +33,9 @@ void IrcFreeMem(void * p)
static SQInteger SqGetNick(HSQUIRRELVM vm) static SQInteger SqGetNick(HSQUIRRELVM vm)
{ {
// Attempt to retrieve the value from the stack as a string // Attempt to retrieve the value from the stack as a string
StackStrF val(vm, 2, true); StackStrF val(vm, 2);
// Have we failed to retrieve the string? // Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes)) if (SQ_FAILED(val.Proc(true)))
{ {
return val.mRes; // Propagate the error! return val.mRes; // Propagate the error!
} }
@ -51,9 +51,9 @@ static SQInteger SqGetNick(HSQUIRRELVM vm)
static SQInteger SqGetHost(HSQUIRRELVM vm) static SQInteger SqGetHost(HSQUIRRELVM vm)
{ {
// Attempt to retrieve the value from the stack as a string // Attempt to retrieve the value from the stack as a string
StackStrF val(vm, 2, true); StackStrF val(vm, 2);
// Have we failed to retrieve the string? // Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes)) if (SQ_FAILED(val.Proc(true)))
{ {
return val.mRes; // Propagate the error! return val.mRes; // Propagate the error!
} }
@ -69,9 +69,9 @@ static SQInteger SqGetHost(HSQUIRRELVM vm)
static SQInteger SqStripColorFromMIRC(HSQUIRRELVM vm) static SQInteger SqStripColorFromMIRC(HSQUIRRELVM vm)
{ {
// Attempt to retrieve the value from the stack as a string // Attempt to retrieve the value from the stack as a string
StackStrF val(vm, 2, true); StackStrF val(vm, 2);
// Have we failed to retrieve the string? // Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes)) if (SQ_FAILED(val.Proc(true)))
{ {
return val.mRes; // Propagate the error! return val.mRes; // Propagate the error!
} }
@ -94,9 +94,9 @@ static SQInteger SqStripColorFromMIRC(HSQUIRRELVM vm)
static SQInteger SqConvertColorFromMIRC(HSQUIRRELVM vm) static SQInteger SqConvertColorFromMIRC(HSQUIRRELVM vm)
{ {
// Attempt to retrieve the value from the stack as a string // Attempt to retrieve the value from the stack as a string
StackStrF val(vm, 2, true); StackStrF val(vm, 2);
// Have we failed to retrieve the string? // Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes)) if (SQ_FAILED(val.Proc(true)))
{ {
return val.mRes; // Propagate the error! return val.mRes; // Propagate the error!
} }
@ -119,9 +119,9 @@ static SQInteger SqConvertColorFromMIRC(HSQUIRRELVM vm)
static SQInteger SqConvertColorToMIRC(HSQUIRRELVM vm) static SQInteger SqConvertColorToMIRC(HSQUIRRELVM vm)
{ {
// Attempt to retrieve the value from the stack as a string // Attempt to retrieve the value from the stack as a string
StackStrF val(vm, 2, true); StackStrF val(vm, 2);
// Have we failed to retrieve the string? // Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes)) if (SQ_FAILED(val.Proc(true)))
{ {
return val.mRes; // Propagate the error! return val.mRes; // Propagate the error!
} }

12
modules/irc/Session.cpp
View File

@ -700,7 +700,7 @@ void Session::ForwardEvent(Function & listener, CCStr event, CCStr origin, CCStr
// Attempt top execute the callback with the obtained values // Attempt top execute the callback with the obtained values
try try
{ {
listener.Execute< CSStr, CSStr, Array & >(event, origin, parameters); listener.Execute(event, origin, parameters);
} }
catch (const Sqrat::Exception & e) catch (const Sqrat::Exception & e)
{ {
@ -744,7 +744,7 @@ void Session::ForwardEvent(Function & listener, Uint32 event,
// Attempt top execute the callback with the obtained values // Attempt top execute the callback with the obtained values
try try
{ {
listener.Execute< Uint32, CSStr, Array & >(event, origin, parameters); listener.Execute(event, origin, parameters);
} }
catch (const Sqrat::Exception & e) catch (const Sqrat::Exception & e)
{ {
@ -1040,17 +1040,17 @@ static SQInteger FormattedIrcMessageCmd(HSQUIRRELVM vm, SendIrcMessageFunc send_
} }
// Attempt to retrieve the target from the stack as a string // Attempt to retrieve the target from the stack as a string
StackStrF target(vm, 2, false); StackStrF target(vm, 2);
// Have we failed to retrieve the string? // Have we failed to retrieve the string?
if (SQ_FAILED(target.mRes)) if (SQ_FAILED(target.Proc(false)))
{ {
return target.mRes; // Propagate the error! return target.mRes; // Propagate the error!
} }
// Attempt to retrieve the value from the stack as a string // Attempt to retrieve the value from the stack as a string
StackStrF message(vm, 3, true); StackStrF message(vm, 3);
// Have we failed to retrieve the string? // Have we failed to retrieve the string?
if (SQ_FAILED(message.mRes)) if (SQ_FAILED(message.Proc(true)))
{ {
return message.mRes; // Propagate the error! return message.mRes; // Propagate the error!
} }