Merge upstream master

This commit is contained in:
Peace-Maker 2019-08-19 16:53:55 +02:00
commit a6b21e56fa
2 changed files with 4 additions and 4 deletions

View File

@ -1,2 +1,2 @@
pushduckspushrr12quackquack pushduckspushrr12quackquack
Triggerrrrds Trigggerrrrdd

View File

@ -784,7 +784,7 @@ SDKVector *Callback_vector(DHooksCallback *dg, void **argStack)
{ {
if(returnStruct->isChanged) if(returnStruct->isChanged)
{ {
*vec_result = **(SDKVector **)returnStruct->newResult; *vec_result = *(SDKVector *)returnStruct->newResult;
} }
else //Throw an error if no override was set else //Throw an error if no override was set
{ {
@ -806,7 +806,7 @@ SDKVector *Callback_vector(DHooksCallback *dg, void **argStack)
{ {
g_SHPtr->SetRes(MRES_OVERRIDE); g_SHPtr->SetRes(MRES_OVERRIDE);
mres = MRES_OVERRIDE; mres = MRES_OVERRIDE;
*vec_result = **(SDKVector **)returnStruct->newResult; *vec_result = *(SDKVector *)returnStruct->newResult;
} }
else //Throw an error if no override was set else //Throw an error if no override was set
{ {
@ -823,7 +823,7 @@ SDKVector *Callback_vector(DHooksCallback *dg, void **argStack)
{ {
g_SHPtr->SetRes(MRES_SUPERCEDE); g_SHPtr->SetRes(MRES_SUPERCEDE);
mres = MRES_SUPERCEDE; mres = MRES_SUPERCEDE;
*vec_result = **(SDKVector **)returnStruct->newResult; *vec_result = *(SDKVector *)returnStruct->newResult;
} }
else //Throw an error if no override was set else //Throw an error if no override was set
{ {