josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/scripts/World/action_ip_logger.cpp
This commit is contained in:
Vincent-Michael
2014-06-24 18:26:52 +02:00
parent 1ed38faeac 7f0d283599
commit f0c366141b
16 changed files with 1926 additions and 966 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dep/PackageList.txt
+1 -1
View File
@@ -34,7 +34,7 @@ zlib (A Massively Spiffy Yet Delicately Unobtrusive Compression Library)
gSOAP (a portable development toolkit for C and C++ XML Web services and XML data bindings)
http://gsoap2.sourceforge.net/
Version: 2.8.10
Version: 2.8.17r
recastnavigation (Recast is state of the art navigation mesh construction toolset for games)
https://github.com/memononen/recastnavigation
dep/gsoap/soapC.cpp
+77 -66
View File
@@ -1,9 +1,9 @@
/* soapC.cpp
Generated by gSOAP 2.8.10 from gsoap.stub
Generated by gSOAP 2.8.17r from gsoap.stub
Copyright(C) 2000-2012, Robert van Engelen, Genivia Inc. All Rights Reserved.
Copyright(C) 2000-2013, Robert van Engelen, Genivia Inc. All Rights Reserved.
The generated code is released under one of the following licenses:
1) GPL or 2) Genivia's license for commercial use.
GPL or Genivia's license for commercial use.
This program is released under the GPL with the additional exemption that
compiling, linking, and/or using OpenSSL is allowed.
*/
@@ -15,7 +15,7 @@ compiling, linking, and/or using OpenSSL is allowed.
#include "soapH.h"
SOAP_SOURCE_STAMP("@(#) soapC.cpp ver 2.8.10 2012-09-02 20:48:00 GMT")
SOAP_SOURCE_STAMP("@(#) soapC.cpp ver 2.8.17r 2014-06-21 21:43:17 GMT")
#ifndef WITH_NOGLOBAL
@@ -30,7 +30,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_getheader(struct soap *soap)
SOAP_FMAC3 int SOAP_FMAC4 soap_putheader(struct soap *soap)
{
if (soap->header)
if (soap->version && soap->header)
{ soap->part = SOAP_IN_HEADER;
if (soap_out_SOAP_ENV__Header(soap, "SOAP-ENV:Header", 0, soap->header, NULL))
return soap->error;
@@ -41,13 +41,13 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putheader(struct soap *soap)
SOAP_FMAC3 void SOAP_FMAC4 soap_serializeheader(struct soap *soap)
{
if (soap->header)
if (soap->version && soap->header)
soap_serialize_SOAP_ENV__Header(soap, soap->header);
}
SOAP_FMAC3 void SOAP_FMAC4 soap_header(struct soap *soap)
{
if (!soap->header)
if (soap->header == NULL)
{ if ((soap->header = soap_new_SOAP_ENV__Header(soap, -1)))
soap_default_SOAP_ENV__Header(soap, soap->header);
}
@@ -55,9 +55,9 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_header(struct soap *soap)
SOAP_FMAC3 void SOAP_FMAC4 soap_fault(struct soap *soap)
{
if (!soap->fault)
if (soap->fault == NULL)
{ soap->fault = soap_new_SOAP_ENV__Fault(soap, -1);
if (!soap->fault)
if (soap->fault == NULL)
return;
soap_default_SOAP_ENV__Fault(soap, soap->fault);
}
@@ -102,7 +102,7 @@ SOAP_FMAC3 const char ** SOAP_FMAC4 soap_faultsubcode(struct soap *soap)
{
soap_fault(soap);
if (soap->version == 2)
{ if (!soap->fault->SOAP_ENV__Code->SOAP_ENV__Subcode)
{ if (soap->fault->SOAP_ENV__Code->SOAP_ENV__Subcode == NULL)
{ soap->fault->SOAP_ENV__Code->SOAP_ENV__Subcode = soap_new_SOAP_ENV__Code(soap, -1);
soap_default_SOAP_ENV__Code(soap, soap->fault->SOAP_ENV__Code->SOAP_ENV__Subcode);
}
@@ -133,18 +133,18 @@ SOAP_FMAC3 const char ** SOAP_FMAC4 soap_faultstring(struct soap *soap)
SOAP_FMAC3 const char ** SOAP_FMAC4 soap_faultdetail(struct soap *soap)
{
soap_fault(soap);
if (soap->version == 1)
{ if (!soap->fault->detail)
{ soap->fault->detail = (struct SOAP_ENV__Detail*)soap_malloc(soap, sizeof(struct SOAP_ENV__Detail));
soap_default_SOAP_ENV__Detail(soap, soap->fault->detail);
if (soap->version == 2)
{ if (soap->fault->SOAP_ENV__Detail == NULL)
{ soap->fault->SOAP_ENV__Detail = soap_new_SOAP_ENV__Detail(soap, -1);
soap_default_SOAP_ENV__Detail(soap, soap->fault->SOAP_ENV__Detail);
}
return (const char**)&soap->fault->detail->__any;
return (const char**)&soap->fault->SOAP_ENV__Detail->__any;
}
if (!soap->fault->SOAP_ENV__Detail)
{ soap->fault->SOAP_ENV__Detail = soap_new_SOAP_ENV__Detail(soap, -1);
soap_default_SOAP_ENV__Detail(soap, soap->fault->SOAP_ENV__Detail);
if (soap->fault->detail == NULL)
{ soap->fault->detail = soap_new_SOAP_ENV__Detail(soap, -1);
soap_default_SOAP_ENV__Detail(soap, soap->fault->detail);
}
return (const char**)&soap->fault->SOAP_ENV__Detail->__any;
return (const char**)&soap->fault->detail->__any;
}
SOAP_FMAC3 const char * SOAP_FMAC4 soap_check_faultdetail(struct soap *soap)
@@ -176,8 +176,6 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_getindependent(struct soap *soap)
}
#endif
#ifndef WITH_NOIDREF
#ifdef __cplusplus
extern "C" {
#endif
@@ -185,6 +183,7 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
{ (void)type;
if (soap_peek_element(soap))
return NULL;
#ifndef WITH_NOIDREF
if (!*soap->id || !(*type = soap_lookup_type(soap, soap->id)))
*type = soap_lookup_type(soap, soap->href);
switch (*type)
@@ -210,6 +209,9 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
return s ? *s : NULL;
}
default:
#else
*type = 0;
#endif
{ const char *t = soap->type;
if (!*t)
t = soap->tag;
@@ -242,7 +244,9 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
return s ? *s : NULL;
}
t = soap->tag;
#ifndef WITH_NOIDREF
}
#endif
}
soap->error = SOAP_TAG_MISMATCH;
return NULL;
@@ -251,7 +255,6 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
#ifdef __cplusplus
}
#endif
#endif
SOAP_FMAC3 int SOAP_FMAC4 soap_ignore_element(struct soap *soap)
{
@@ -298,8 +301,6 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putindependent(struct soap *soap)
}
#endif
#ifndef WITH_NOIDREF
#ifdef __cplusplus
extern "C" {
#endif
@@ -328,7 +329,6 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
#ifdef __cplusplus
}
#endif
#endif
#ifndef WITH_NOIDREF
@@ -551,6 +551,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Fault(struct soap *soap, struc
SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_SOAP_ENV__Fault(struct soap *soap, const struct SOAP_ENV__Fault *a)
{
#ifndef WITH_NOIDREF
(void)soap; (void)a; /* appease -Wall -Werror */
soap_serialize__QName(soap, &a->faultcode);
soap_serialize_string(soap, &a->faultstring);
@@ -561,6 +562,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_SOAP_ENV__Fault(struct soap *soap, con
soap_serialize_string(soap, &a->SOAP_ENV__Node);
soap_serialize_string(soap, &a->SOAP_ENV__Role);
soap_serialize_PointerToSOAP_ENV__Detail(soap, &a->SOAP_ENV__Detail);
#endif
}
SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Fault(struct soap *soap, const char *tag, int id, const struct SOAP_ENV__Fault *a, const char *type)
@@ -703,15 +705,13 @@ SOAP_FMAC1 struct SOAP_ENV__Fault * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Fault(
*size = sizeof(struct SOAP_ENV__Fault);
}
else
{ cp->ptr = (void*)SOAP_NEW(struct SOAP_ENV__Fault[n]);
if (!cp->ptr)
{ soap->error = SOAP_EOM;
return NULL;
}
{ cp->ptr = (void*)SOAP_NEW_ARRAY(struct SOAP_ENV__Fault, n);
if (size)
*size = n * sizeof(struct SOAP_ENV__Fault);
}
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
if (!cp->ptr)
soap->error = SOAP_EOM;
return (struct SOAP_ENV__Fault*)cp->ptr;
}
@@ -734,8 +734,10 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Reason(struct soap *soap, stru
SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_SOAP_ENV__Reason(struct soap *soap, const struct SOAP_ENV__Reason *a)
{
#ifndef WITH_NOIDREF
(void)soap; (void)a; /* appease -Wall -Werror */
soap_serialize_string(soap, &a->SOAP_ENV__Text);
#endif
}
SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Reason(struct soap *soap, const char *tag, int id, const struct SOAP_ENV__Reason *a, const char *type)
@@ -815,15 +817,13 @@ SOAP_FMAC1 struct SOAP_ENV__Reason * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Reaso
*size = sizeof(struct SOAP_ENV__Reason);
}
else
{ cp->ptr = (void*)SOAP_NEW(struct SOAP_ENV__Reason[n]);
if (!cp->ptr)
{ soap->error = SOAP_EOM;
return NULL;
}
{ cp->ptr = (void*)SOAP_NEW_ARRAY(struct SOAP_ENV__Reason, n);
if (size)
*size = n * sizeof(struct SOAP_ENV__Reason);
}
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
if (!cp->ptr)
soap->error = SOAP_EOM;
return (struct SOAP_ENV__Reason*)cp->ptr;
}
@@ -848,8 +848,10 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Detail(struct soap *soap, stru
SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_SOAP_ENV__Detail(struct soap *soap, const struct SOAP_ENV__Detail *a)
{
#ifndef WITH_NOIDREF
(void)soap; (void)a; /* appease -Wall -Werror */
soap_markelement(soap, a->fault, a->__type);
#endif
}
SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Detail(struct soap *soap, const char *tag, int id, const struct SOAP_ENV__Detail *a, const char *type)
@@ -934,15 +936,13 @@ SOAP_FMAC1 struct SOAP_ENV__Detail * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Detai
*size = sizeof(struct SOAP_ENV__Detail);
}
else
{ cp->ptr = (void*)SOAP_NEW(struct SOAP_ENV__Detail[n]);
if (!cp->ptr)
{ soap->error = SOAP_EOM;
return NULL;
}
{ cp->ptr = (void*)SOAP_NEW_ARRAY(struct SOAP_ENV__Detail, n);
if (size)
*size = n * sizeof(struct SOAP_ENV__Detail);
}
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
if (!cp->ptr)
soap->error = SOAP_EOM;
return (struct SOAP_ENV__Detail*)cp->ptr;
}
@@ -966,9 +966,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Code(struct soap *soap, struct
SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_SOAP_ENV__Code(struct soap *soap, const struct SOAP_ENV__Code *a)
{
#ifndef WITH_NOIDREF
(void)soap; (void)a; /* appease -Wall -Werror */
soap_serialize__QName(soap, &a->SOAP_ENV__Value);
soap_serialize_PointerToSOAP_ENV__Code(soap, &a->SOAP_ENV__Subcode);
#endif
}
SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Code(struct soap *soap, const char *tag, int id, const struct SOAP_ENV__Code *a, const char *type)
@@ -1055,15 +1057,13 @@ SOAP_FMAC1 struct SOAP_ENV__Code * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Code(st
*size = sizeof(struct SOAP_ENV__Code);
}
else
{ cp->ptr = (void*)SOAP_NEW(struct SOAP_ENV__Code[n]);
if (!cp->ptr)
{ soap->error = SOAP_EOM;
return NULL;
}
{ cp->ptr = (void*)SOAP_NEW_ARRAY(struct SOAP_ENV__Code, n);
if (size)
*size = n * sizeof(struct SOAP_ENV__Code);
}
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
if (!cp->ptr)
soap->error = SOAP_EOM;
return (struct SOAP_ENV__Code*)cp->ptr;
}
@@ -1085,7 +1085,9 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Header(struct soap *soap, stru
SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_SOAP_ENV__Header(struct soap *soap, const struct SOAP_ENV__Header *a)
{
#ifndef WITH_NOIDREF
(void)soap; (void)a; /* appease -Wall -Werror */
#endif
}
SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Header(struct soap *soap, const char *tag, int id, const struct SOAP_ENV__Header *a, const char *type)
@@ -1155,15 +1157,13 @@ SOAP_FMAC1 struct SOAP_ENV__Header * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Heade
*size = sizeof(struct SOAP_ENV__Header);
}
else
{ cp->ptr = (void*)SOAP_NEW(struct SOAP_ENV__Header[n]);
if (!cp->ptr)
{ soap->error = SOAP_EOM;
return NULL;
}
{ cp->ptr = (void*)SOAP_NEW_ARRAY(struct SOAP_ENV__Header, n);
if (size)
*size = n * sizeof(struct SOAP_ENV__Header);
}
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
if (!cp->ptr)
soap->error = SOAP_EOM;
return (struct SOAP_ENV__Header*)cp->ptr;
}
@@ -1184,8 +1184,10 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__executeCommand(struct soap *soap, s
SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__executeCommand(struct soap *soap, const struct ns1__executeCommand *a)
{
#ifndef WITH_NOIDREF
(void)soap; (void)a; /* appease -Wall -Werror */
soap_serialize_string(soap, &a->command);
#endif
}
SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__executeCommand(struct soap *soap, const char *tag, int id, const struct ns1__executeCommand *a, const char *type)
@@ -1263,15 +1265,13 @@ SOAP_FMAC1 struct ns1__executeCommand * SOAP_FMAC2 soap_instantiate_ns1__execute
*size = sizeof(struct ns1__executeCommand);
}
else
{ cp->ptr = (void*)SOAP_NEW(struct ns1__executeCommand[n]);
if (!cp->ptr)
{ soap->error = SOAP_EOM;
return NULL;
}
{ cp->ptr = (void*)SOAP_NEW_ARRAY(struct ns1__executeCommand, n);
if (size)
*size = n * sizeof(struct ns1__executeCommand);
}
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
if (!cp->ptr)
soap->error = SOAP_EOM;
return (struct ns1__executeCommand*)cp->ptr;
}
@@ -1290,8 +1290,10 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__executeCommandResponse(struct soap
SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__executeCommandResponse(struct soap *soap, const struct ns1__executeCommandResponse *a)
{
#ifndef WITH_NOIDREF
(void)soap; (void)a; /* appease -Wall -Werror */
soap_serialize_PointerTostring(soap, &a->result);
#endif
}
SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__executeCommandResponse(struct soap *soap, const char *tag, int id, const struct ns1__executeCommandResponse *a, const char *type)
@@ -1369,15 +1371,13 @@ SOAP_FMAC1 struct ns1__executeCommandResponse * SOAP_FMAC2 soap_instantiate_ns1_
*size = sizeof(struct ns1__executeCommandResponse);
}
else
{ cp->ptr = (void*)SOAP_NEW(struct ns1__executeCommandResponse[n]);
if (!cp->ptr)
{ soap->error = SOAP_EOM;
return NULL;
}
{ cp->ptr = (void*)SOAP_NEW_ARRAY(struct ns1__executeCommandResponse, n);
if (size)
*size = n * sizeof(struct ns1__executeCommandResponse);
}
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
if (!cp->ptr)
soap->error = SOAP_EOM;
return (struct ns1__executeCommandResponse*)cp->ptr;
}
@@ -1392,8 +1392,10 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns1__executeCommandResponse(struct soap *so
SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Reason(struct soap *soap, struct SOAP_ENV__Reason *const*a)
{
#ifndef WITH_NOIDREF
if (!soap_reference(soap, *a, SOAP_TYPE_SOAP_ENV__Reason))
soap_serialize_SOAP_ENV__Reason(soap, *a);
#endif
}
SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerToSOAP_ENV__Reason(struct soap *soap, const char *tag, int id, struct SOAP_ENV__Reason *const*a, const char *type)
@@ -1414,8 +1416,6 @@ SOAP_FMAC3 struct SOAP_ENV__Reason ** SOAP_FMAC4 soap_in_PointerToSOAP_ENV__Reas
*a = NULL;
if (!soap->null && *soap->href != '#')
{ soap_revert(soap);
*a = (struct SOAP_ENV__Reason *)soap_malloc(soap, sizeof(struct SOAP_ENV__Reason));
soap_default_SOAP_ENV__Reason(soap, *a);
if (!(*a = soap_in_SOAP_ENV__Reason(soap, tag, *a, type)))
return NULL;
}
@@ -1449,8 +1449,10 @@ SOAP_FMAC3 struct SOAP_ENV__Reason ** SOAP_FMAC4 soap_get_PointerToSOAP_ENV__Rea
SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Detail(struct soap *soap, struct SOAP_ENV__Detail *const*a)
{
#ifndef WITH_NOIDREF
if (!soap_reference(soap, *a, SOAP_TYPE_SOAP_ENV__Detail))
soap_serialize_SOAP_ENV__Detail(soap, *a);
#endif
}
SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerToSOAP_ENV__Detail(struct soap *soap, const char *tag, int id, struct SOAP_ENV__Detail *const*a, const char *type)
@@ -1471,8 +1473,6 @@ SOAP_FMAC3 struct SOAP_ENV__Detail ** SOAP_FMAC4 soap_in_PointerToSOAP_ENV__Deta
*a = NULL;
if (!soap->null && *soap->href != '#')
{ soap_revert(soap);
*a = (struct SOAP_ENV__Detail *)soap_malloc(soap, sizeof(struct SOAP_ENV__Detail));
soap_default_SOAP_ENV__Detail(soap, *a);
if (!(*a = soap_in_SOAP_ENV__Detail(soap, tag, *a, type)))
return NULL;
}
@@ -1506,8 +1506,10 @@ SOAP_FMAC3 struct SOAP_ENV__Detail ** SOAP_FMAC4 soap_get_PointerToSOAP_ENV__Det
SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Code(struct soap *soap, struct SOAP_ENV__Code *const*a)
{
#ifndef WITH_NOIDREF
if (!soap_reference(soap, *a, SOAP_TYPE_SOAP_ENV__Code))
soap_serialize_SOAP_ENV__Code(soap, *a);
#endif
}
SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerToSOAP_ENV__Code(struct soap *soap, const char *tag, int id, struct SOAP_ENV__Code *const*a, const char *type)
@@ -1528,8 +1530,6 @@ SOAP_FMAC3 struct SOAP_ENV__Code ** SOAP_FMAC4 soap_in_PointerToSOAP_ENV__Code(s
*a = NULL;
if (!soap->null && *soap->href != '#')
{ soap_revert(soap);
*a = (struct SOAP_ENV__Code *)soap_malloc(soap, sizeof(struct SOAP_ENV__Code));
soap_default_SOAP_ENV__Code(soap, *a);
if (!(*a = soap_in_SOAP_ENV__Code(soap, tag, *a, type)))
return NULL;
}
@@ -1561,8 +1561,10 @@ SOAP_FMAC3 struct SOAP_ENV__Code ** SOAP_FMAC4 soap_get_PointerToSOAP_ENV__Code(
SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTostring(struct soap *soap, char **const*a)
{
#ifndef WITH_NOIDREF
if (!soap_reference(soap, *a, SOAP_TYPE_string))
soap_serialize_string(soap, *a);
#endif
}
SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTostring(struct soap *soap, const char *tag, int id, char **const*a, const char *type)
@@ -1610,6 +1612,13 @@ SOAP_FMAC3 char *** SOAP_FMAC4 soap_get_PointerTostring(struct soap *soap, char
return p;
}
SOAP_FMAC3 void SOAP_FMAC4 soap_serialize__QName(struct soap *soap, char *const*a)
{
#ifndef WITH_NOIDREF
soap_reference(soap, *a, SOAP_TYPE__QName);
#endif
}
SOAP_FMAC3 int SOAP_FMAC4 soap_out__QName(struct soap *soap, const char *tag, int id, char *const*a, const char *type)
{
return soap_outstring(soap, tag, id, a, type, SOAP_TYPE__QName);
@@ -1649,7 +1658,9 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default_string(struct soap *soap, char **a)
SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_string(struct soap *soap, char *const*a)
{
#ifndef WITH_NOIDREF
soap_reference(soap, *a, SOAP_TYPE_string);
#endif
}
SOAP_FMAC3 int SOAP_FMAC4 soap_out_string(struct soap *soap, const char *tag, int id, char *const*a, const char *type)
dep/gsoap/soapH.h
+170 -141
View File
@@ -1,9 +1,9 @@
/* soapH.h
Generated by gSOAP 2.8.10 from gsoap.stub
Generated by gSOAP 2.8.17r from gsoap.stub
Copyright(C) 2000-2012, Robert van Engelen, Genivia Inc. All Rights Reserved.
Copyright(C) 2000-2013, Robert van Engelen, Genivia Inc. All Rights Reserved.
The generated code is released under one of the following licenses:
1) GPL or 2) Genivia's license for commercial use.
GPL or Genivia's license for commercial use.
This program is released under the GPL with the additional exemption that
compiling, linking, and/or using OpenSSL is allowed.
*/
@@ -17,8 +17,6 @@ compiling, linking, and/or using OpenSSL is allowed.
extern "C" {
#endif
SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap*, const void*, int);
SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap*, const void*, const char*, int, int);
SOAP_FMAC3 void *SOAP_FMAC4 soap_getelement(struct soap*, int*);
#ifdef __cplusplus
}
@@ -26,8 +24,20 @@ SOAP_FMAC3 void *SOAP_FMAC4 soap_getelement(struct soap*, int*);
SOAP_FMAC3 int SOAP_FMAC4 soap_putindependent(struct soap*);
SOAP_FMAC3 int SOAP_FMAC4 soap_getindependent(struct soap*);
#endif
#ifdef __cplusplus
extern "C" {
#endif
SOAP_FMAC3 void *SOAP_FMAC4 soap_getelement(struct soap*, int*);
SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap*, const void*, const char*, int, int);
#ifdef __cplusplus
}
#endif
SOAP_FMAC3 int SOAP_FMAC4 soap_ignore_element(struct soap*);
SOAP_FMAC3 const char ** SOAP_FMAC4 soap_faultcode(struct soap *soap);
SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap*, int, const char*, const char*, size_t*);
SOAP_FMAC3 int SOAP_FMAC4 soap_fdelete(struct soap_clist*);
SOAP_FMAC3 void* SOAP_FMAC4 soap_class_id_enter(struct soap*, const char*, void*, int, size_t, const char*, const char*);
@@ -39,19 +49,19 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default_byte(struct soap*, char *);
SOAP_FMAC3 int SOAP_FMAC4 soap_out_byte(struct soap*, const char*, int, const char *, const char*);
SOAP_FMAC3 char * SOAP_FMAC4 soap_in_byte(struct soap*, const char*, char *, const char*);
#ifndef soap_write_byte
#define soap_write_byte(soap, data) ( soap_begin_send(soap) || soap_put_byte(soap, data, "byte", NULL) || soap_end_send(soap) )
#endif
SOAP_FMAC3 int SOAP_FMAC4 soap_put_byte(struct soap*, const char *, const char*, const char*);
#ifndef soap_read_byte
#define soap_read_byte(soap, data) ( soap_begin_recv(soap) || !soap_get_byte(soap, data, NULL, NULL) || soap_end_recv(soap) )
#ifndef soap_write_byte
#define soap_write_byte(soap, data) ( soap_free_temp(soap), soap_begin_send(soap) || (soap_serialize_byte(soap, data),0) || soap_put_byte(soap, data, "byte", NULL) || soap_end_send(soap), (soap)->error )
#endif
SOAP_FMAC3 char * SOAP_FMAC4 soap_get_byte(struct soap*, char *, const char*, const char*);
#ifndef soap_read_byte
#define soap_read_byte(soap, data) ( soap_begin_recv(soap) || !soap_get_byte(soap, data, NULL, NULL) || soap_end_recv(soap), (soap)->error )
#endif
#ifndef SOAP_TYPE_int
#define SOAP_TYPE_int (1)
#endif
@@ -59,19 +69,19 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default_int(struct soap*, int *);
SOAP_FMAC3 int SOAP_FMAC4 soap_out_int(struct soap*, const char*, int, const int *, const char*);
SOAP_FMAC3 int * SOAP_FMAC4 soap_in_int(struct soap*, const char*, int *, const char*);
#ifndef soap_write_int
#define soap_write_int(soap, data) ( soap_begin_send(soap) || soap_put_int(soap, data, "int", NULL) || soap_end_send(soap) )
#endif
SOAP_FMAC3 int SOAP_FMAC4 soap_put_int(struct soap*, const int *, const char*, const char*);
#ifndef soap_read_int
#define soap_read_int(soap, data) ( soap_begin_recv(soap) || !soap_get_int(soap, data, NULL, NULL) || soap_end_recv(soap) )
#ifndef soap_write_int
#define soap_write_int(soap, data) ( soap_free_temp(soap), soap_begin_send(soap) || (soap_serialize_int(soap, data),0) || soap_put_int(soap, data, "int", NULL) || soap_end_send(soap), (soap)->error )
#endif
SOAP_FMAC3 int * SOAP_FMAC4 soap_get_int(struct soap*, int *, const char*, const char*);
#ifndef soap_read_int
#define soap_read_int(soap, data) ( soap_begin_recv(soap) || !soap_get_int(soap, data, NULL, NULL) || soap_end_recv(soap), (soap)->error )
#endif
#ifndef WITH_NOGLOBAL
#ifndef SOAP_TYPE_SOAP_ENV__Fault
@@ -82,25 +92,28 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_SOAP_ENV__Fault(struct soap*, const st
SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Fault(struct soap*, const char*, int, const struct SOAP_ENV__Fault *, const char*);
SOAP_FMAC3 struct SOAP_ENV__Fault * SOAP_FMAC4 soap_in_SOAP_ENV__Fault(struct soap*, const char*, struct SOAP_ENV__Fault *, const char*);
#ifndef soap_write_SOAP_ENV__Fault
#define soap_write_SOAP_ENV__Fault(soap, data) ( soap_begin_send(soap) || (soap_serialize_SOAP_ENV__Fault(soap, data), 0) || soap_put_SOAP_ENV__Fault(soap, data, "SOAP-ENV:Fault", NULL) || soap_end_send(soap) )
#endif
SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Fault(struct soap*, const struct SOAP_ENV__Fault *, const char*, const char*);
#ifndef soap_read_SOAP_ENV__Fault
#define soap_read_SOAP_ENV__Fault(soap, data) ( soap_begin_recv(soap) || !soap_get_SOAP_ENV__Fault(soap, data, NULL, NULL) || soap_end_recv(soap) )
#ifndef soap_write_SOAP_ENV__Fault
#define soap_write_SOAP_ENV__Fault(soap, data) ( soap_free_temp(soap), soap_begin_send(soap) || (soap_serialize_SOAP_ENV__Fault(soap, data),0) || soap_put_SOAP_ENV__Fault(soap, data, "SOAP-ENV:Fault", NULL) || soap_end_send(soap), (soap)->error )
#endif
SOAP_FMAC3 struct SOAP_ENV__Fault * SOAP_FMAC4 soap_get_SOAP_ENV__Fault(struct soap*, struct SOAP_ENV__Fault *, const char*, const char*);
#define soap_new_SOAP_ENV__Fault(soap, n) soap_instantiate_SOAP_ENV__Fault(soap, n, NULL, NULL, NULL)
#define soap_delete_SOAP_ENV__Fault(soap, p) soap_delete(soap, p)
#ifndef soap_read_SOAP_ENV__Fault
#define soap_read_SOAP_ENV__Fault(soap, data) ( soap_begin_recv(soap) || !soap_get_SOAP_ENV__Fault(soap, data, NULL, NULL) || soap_end_recv(soap), (soap)->error )
#endif
SOAP_FMAC1 struct SOAP_ENV__Fault * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Fault(struct soap*, int, const char*, const char*, size_t*);
inline struct SOAP_ENV__Fault * soap_new_SOAP_ENV__Fault(struct soap *soap, int n = -1) { return soap_instantiate_SOAP_ENV__Fault(soap, n, NULL, NULL, NULL); }
inline struct SOAP_ENV__Fault * soap_new_req_SOAP_ENV__Fault(struct soap *soap) { struct SOAP_ENV__Fault *_p = soap_instantiate_SOAP_ENV__Fault(soap, -1, NULL, NULL, NULL); if (_p) { soap_default_SOAP_ENV__Fault(soap, _p); } return _p; }
inline struct SOAP_ENV__Fault * soap_new_set_SOAP_ENV__Fault(struct soap *soap, char *faultcode, char *faultstring, char *faultactor, struct SOAP_ENV__Detail *detail, struct SOAP_ENV__Code *SOAP_ENV__Code, struct SOAP_ENV__Reason *SOAP_ENV__Reason, char *SOAP_ENV__Node, char *SOAP_ENV__Role, struct SOAP_ENV__Detail *SOAP_ENV__Detail) { struct SOAP_ENV__Fault *_p = soap_instantiate_SOAP_ENV__Fault(soap, -1, NULL, NULL, NULL); if (_p) { soap_default_SOAP_ENV__Fault(soap, _p); _p->faultcode = faultcode; _p->faultstring = faultstring; _p->faultactor = faultactor; _p->detail = detail; _p->SOAP_ENV__Code = SOAP_ENV__Code; _p->SOAP_ENV__Reason = SOAP_ENV__Reason; _p->SOAP_ENV__Node = SOAP_ENV__Node; _p->SOAP_ENV__Role = SOAP_ENV__Role; _p->SOAP_ENV__Detail = SOAP_ENV__Detail; } return _p; }
inline void soap_delete_SOAP_ENV__Fault(struct soap *soap, struct SOAP_ENV__Fault *p) { soap_delete(soap, p); }
SOAP_FMAC3 void SOAP_FMAC4 soap_copy_SOAP_ENV__Fault(struct soap*, int, int, void*, size_t, const void*, size_t);
#endif
@@ -115,25 +128,28 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_SOAP_ENV__Reason(struct soap*, const s
SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Reason(struct soap*, const char*, int, const struct SOAP_ENV__Reason *, const char*);
SOAP_FMAC3 struct SOAP_ENV__Reason * SOAP_FMAC4 soap_in_SOAP_ENV__Reason(struct soap*, const char*, struct SOAP_ENV__Reason *, const char*);
#ifndef soap_write_SOAP_ENV__Reason
#define soap_write_SOAP_ENV__Reason(soap, data) ( soap_begin_send(soap) || (soap_serialize_SOAP_ENV__Reason(soap, data), 0) || soap_put_SOAP_ENV__Reason(soap, data, "SOAP-ENV:Reason", NULL) || soap_end_send(soap) )
#endif
SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Reason(struct soap*, const struct SOAP_ENV__Reason *, const char*, const char*);
#ifndef soap_read_SOAP_ENV__Reason
#define soap_read_SOAP_ENV__Reason(soap, data) ( soap_begin_recv(soap) || !soap_get_SOAP_ENV__Reason(soap, data, NULL, NULL) || soap_end_recv(soap) )
#ifndef soap_write_SOAP_ENV__Reason
#define soap_write_SOAP_ENV__Reason(soap, data) ( soap_free_temp(soap), soap_begin_send(soap) || (soap_serialize_SOAP_ENV__Reason(soap, data),0) || soap_put_SOAP_ENV__Reason(soap, data, "SOAP-ENV:Reason", NULL) || soap_end_send(soap), (soap)->error )
#endif
SOAP_FMAC3 struct SOAP_ENV__Reason * SOAP_FMAC4 soap_get_SOAP_ENV__Reason(struct soap*, struct SOAP_ENV__Reason *, const char*, const char*);
#define soap_new_SOAP_ENV__Reason(soap, n) soap_instantiate_SOAP_ENV__Reason(soap, n, NULL, NULL, NULL)
#define soap_delete_SOAP_ENV__Reason(soap, p) soap_delete(soap, p)
#ifndef soap_read_SOAP_ENV__Reason
#define soap_read_SOAP_ENV__Reason(soap, data) ( soap_begin_recv(soap) || !soap_get_SOAP_ENV__Reason(soap, data, NULL, NULL) || soap_end_recv(soap), (soap)->error )
#endif
SOAP_FMAC1 struct SOAP_ENV__Reason * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Reason(struct soap*, int, const char*, const char*, size_t*);
inline struct SOAP_ENV__Reason * soap_new_SOAP_ENV__Reason(struct soap *soap, int n = -1) { return soap_instantiate_SOAP_ENV__Reason(soap, n, NULL, NULL, NULL); }
inline struct SOAP_ENV__Reason * soap_new_req_SOAP_ENV__Reason(struct soap *soap) { struct SOAP_ENV__Reason *_p = soap_instantiate_SOAP_ENV__Reason(soap, -1, NULL, NULL, NULL); if (_p) { soap_default_SOAP_ENV__Reason(soap, _p); } return _p; }
inline struct SOAP_ENV__Reason * soap_new_set_SOAP_ENV__Reason(struct soap *soap, char *SOAP_ENV__Text) { struct SOAP_ENV__Reason *_p = soap_instantiate_SOAP_ENV__Reason(soap, -1, NULL, NULL, NULL); if (_p) { soap_default_SOAP_ENV__Reason(soap, _p); _p->SOAP_ENV__Text = SOAP_ENV__Text; } return _p; }
inline void soap_delete_SOAP_ENV__Reason(struct soap *soap, struct SOAP_ENV__Reason *p) { soap_delete(soap, p); }
SOAP_FMAC3 void SOAP_FMAC4 soap_copy_SOAP_ENV__Reason(struct soap*, int, int, void*, size_t, const void*, size_t);
#endif
@@ -148,25 +164,28 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_SOAP_ENV__Detail(struct soap*, const s
SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Detail(struct soap*, const char*, int, const struct SOAP_ENV__Detail *, const char*);
SOAP_FMAC3 struct SOAP_ENV__Detail * SOAP_FMAC4 soap_in_SOAP_ENV__Detail(struct soap*, const char*, struct SOAP_ENV__Detail *, const char*);
#ifndef soap_write_SOAP_ENV__Detail
#define soap_write_SOAP_ENV__Detail(soap, data) ( soap_begin_send(soap) || (soap_serialize_SOAP_ENV__Detail(soap, data), 0) || soap_put_SOAP_ENV__Detail(soap, data, "SOAP-ENV:Detail", NULL) || soap_end_send(soap) )
#endif
SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Detail(struct soap*, const struct SOAP_ENV__Detail *, const char*, const char*);
#ifndef soap_read_SOAP_ENV__Detail
#define soap_read_SOAP_ENV__Detail(soap, data) ( soap_begin_recv(soap) || !soap_get_SOAP_ENV__Detail(soap, data, NULL, NULL) || soap_end_recv(soap) )
#ifndef soap_write_SOAP_ENV__Detail
#define soap_write_SOAP_ENV__Detail(soap, data) ( soap_free_temp(soap), soap_begin_send(soap) || (soap_serialize_SOAP_ENV__Detail(soap, data),0) || soap_put_SOAP_ENV__Detail(soap, data, "SOAP-ENV:Detail", NULL) || soap_end_send(soap), (soap)->error )
#endif
SOAP_FMAC3 struct SOAP_ENV__Detail * SOAP_FMAC4 soap_get_SOAP_ENV__Detail(struct soap*, struct SOAP_ENV__Detail *, const char*, const char*);
#define soap_new_SOAP_ENV__Detail(soap, n) soap_instantiate_SOAP_ENV__Detail(soap, n, NULL, NULL, NULL)
#define soap_delete_SOAP_ENV__Detail(soap, p) soap_delete(soap, p)
#ifndef soap_read_SOAP_ENV__Detail
#define soap_read_SOAP_ENV__Detail(soap, data) ( soap_begin_recv(soap) || !soap_get_SOAP_ENV__Detail(soap, data, NULL, NULL) || soap_end_recv(soap), (soap)->error )
#endif
SOAP_FMAC1 struct SOAP_ENV__Detail * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Detail(struct soap*, int, const char*, const char*, size_t*);
inline struct SOAP_ENV__Detail * soap_new_SOAP_ENV__Detail(struct soap *soap, int n = -1) { return soap_instantiate_SOAP_ENV__Detail(soap, n, NULL, NULL, NULL); }
inline struct SOAP_ENV__Detail * soap_new_req_SOAP_ENV__Detail(struct soap *soap, int __type, void *fault) { struct SOAP_ENV__Detail *_p = soap_instantiate_SOAP_ENV__Detail(soap, -1, NULL, NULL, NULL); if (_p) { soap_default_SOAP_ENV__Detail(soap, _p); _p->__type = __type; _p->fault = fault; } return _p; }
inline struct SOAP_ENV__Detail * soap_new_set_SOAP_ENV__Detail(struct soap *soap, char *__any, int __type, void *fault) { struct SOAP_ENV__Detail *_p = soap_instantiate_SOAP_ENV__Detail(soap, -1, NULL, NULL, NULL); if (_p) { soap_default_SOAP_ENV__Detail(soap, _p); _p->__any = __any; _p->__type = __type; _p->fault = fault; } return _p; }
inline void soap_delete_SOAP_ENV__Detail(struct soap *soap, struct SOAP_ENV__Detail *p) { soap_delete(soap, p); }
SOAP_FMAC3 void SOAP_FMAC4 soap_copy_SOAP_ENV__Detail(struct soap*, int, int, void*, size_t, const void*, size_t);
#endif
@@ -181,25 +200,28 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_SOAP_ENV__Code(struct soap*, const str
SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Code(struct soap*, const char*, int, const struct SOAP_ENV__Code *, const char*);
SOAP_FMAC3 struct SOAP_ENV__Code * SOAP_FMAC4 soap_in_SOAP_ENV__Code(struct soap*, const char*, struct SOAP_ENV__Code *, const char*);
#ifndef soap_write_SOAP_ENV__Code
#define soap_write_SOAP_ENV__Code(soap, data) ( soap_begin_send(soap) || (soap_serialize_SOAP_ENV__Code(soap, data), 0) || soap_put_SOAP_ENV__Code(soap, data, "SOAP-ENV:Code", NULL) || soap_end_send(soap) )
#endif
SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Code(struct soap*, const struct SOAP_ENV__Code *, const char*, const char*);
#ifndef soap_read_SOAP_ENV__Code
#define soap_read_SOAP_ENV__Code(soap, data) ( soap_begin_recv(soap) || !soap_get_SOAP_ENV__Code(soap, data, NULL, NULL) || soap_end_recv(soap) )
#ifndef soap_write_SOAP_ENV__Code
#define soap_write_SOAP_ENV__Code(soap, data) ( soap_free_temp(soap), soap_begin_send(soap) || (soap_serialize_SOAP_ENV__Code(soap, data),0) || soap_put_SOAP_ENV__Code(soap, data, "SOAP-ENV:Code", NULL) || soap_end_send(soap), (soap)->error )
#endif
SOAP_FMAC3 struct SOAP_ENV__Code * SOAP_FMAC4 soap_get_SOAP_ENV__Code(struct soap*, struct SOAP_ENV__Code *, const char*, const char*);
#define soap_new_SOAP_ENV__Code(soap, n) soap_instantiate_SOAP_ENV__Code(soap, n, NULL, NULL, NULL)
#define soap_delete_SOAP_ENV__Code(soap, p) soap_delete(soap, p)
#ifndef soap_read_SOAP_ENV__Code
#define soap_read_SOAP_ENV__Code(soap, data) ( soap_begin_recv(soap) || !soap_get_SOAP_ENV__Code(soap, data, NULL, NULL) || soap_end_recv(soap), (soap)->error )
#endif
SOAP_FMAC1 struct SOAP_ENV__Code * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Code(struct soap*, int, const char*, const char*, size_t*);
inline struct SOAP_ENV__Code * soap_new_SOAP_ENV__Code(struct soap *soap, int n = -1) { return soap_instantiate_SOAP_ENV__Code(soap, n, NULL, NULL, NULL); }
inline struct SOAP_ENV__Code * soap_new_req_SOAP_ENV__Code(struct soap *soap) { struct SOAP_ENV__Code *_p = soap_instantiate_SOAP_ENV__Code(soap, -1, NULL, NULL, NULL); if (_p) { soap_default_SOAP_ENV__Code(soap, _p); } return _p; }
inline struct SOAP_ENV__Code * soap_new_set_SOAP_ENV__Code(struct soap *soap, char *SOAP_ENV__Value, struct SOAP_ENV__Code *SOAP_ENV__Subcode) { struct SOAP_ENV__Code *_p = soap_instantiate_SOAP_ENV__Code(soap, -1, NULL, NULL, NULL); if (_p) { soap_default_SOAP_ENV__Code(soap, _p); _p->SOAP_ENV__Value = SOAP_ENV__Value; _p->SOAP_ENV__Subcode = SOAP_ENV__Subcode; } return _p; }
inline void soap_delete_SOAP_ENV__Code(struct soap *soap, struct SOAP_ENV__Code *p) { soap_delete(soap, p); }
SOAP_FMAC3 void SOAP_FMAC4 soap_copy_SOAP_ENV__Code(struct soap*, int, int, void*, size_t, const void*, size_t);
#endif
@@ -214,25 +236,28 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_SOAP_ENV__Header(struct soap*, const s
SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Header(struct soap*, const char*, int, const struct SOAP_ENV__Header *, const char*);
SOAP_FMAC3 struct SOAP_ENV__Header * SOAP_FMAC4 soap_in_SOAP_ENV__Header(struct soap*, const char*, struct SOAP_ENV__Header *, const char*);
#ifndef soap_write_SOAP_ENV__Header
#define soap_write_SOAP_ENV__Header(soap, data) ( soap_begin_send(soap) || (soap_serialize_SOAP_ENV__Header(soap, data), 0) || soap_put_SOAP_ENV__Header(soap, data, "SOAP-ENV:Header", NULL) || soap_end_send(soap) )
#endif
SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Header(struct soap*, const struct SOAP_ENV__Header *, const char*, const char*);
#ifndef soap_read_SOAP_ENV__Header
#define soap_read_SOAP_ENV__Header(soap, data) ( soap_begin_recv(soap) || !soap_get_SOAP_ENV__Header(soap, data, NULL, NULL) || soap_end_recv(soap) )
#ifndef soap_write_SOAP_ENV__Header
#define soap_write_SOAP_ENV__Header(soap, data) ( soap_free_temp(soap), soap_begin_send(soap) || (soap_serialize_SOAP_ENV__Header(soap, data),0) || soap_put_SOAP_ENV__Header(soap, data, "SOAP-ENV:Header", NULL) || soap_end_send(soap), (soap)->error )
#endif
SOAP_FMAC3 struct SOAP_ENV__Header * SOAP_FMAC4 soap_get_SOAP_ENV__Header(struct soap*, struct SOAP_ENV__Header *, const char*, const char*);
#define soap_new_SOAP_ENV__Header(soap, n) soap_instantiate_SOAP_ENV__Header(soap, n, NULL, NULL, NULL)
#define soap_delete_SOAP_ENV__Header(soap, p) soap_delete(soap, p)
#ifndef soap_read_SOAP_ENV__Header
#define soap_read_SOAP_ENV__Header(soap, data) ( soap_begin_recv(soap) || !soap_get_SOAP_ENV__Header(soap, data, NULL, NULL) || soap_end_recv(soap), (soap)->error )
#endif
SOAP_FMAC1 struct SOAP_ENV__Header * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Header(struct soap*, int, const char*, const char*, size_t*);
inline struct SOAP_ENV__Header * soap_new_SOAP_ENV__Header(struct soap *soap, int n = -1) { return soap_instantiate_SOAP_ENV__Header(soap, n, NULL, NULL, NULL); }
inline struct SOAP_ENV__Header * soap_new_req_SOAP_ENV__Header(struct soap *soap) { struct SOAP_ENV__Header *_p = soap_instantiate_SOAP_ENV__Header(soap, -1, NULL, NULL, NULL); if (_p) { soap_default_SOAP_ENV__Header(soap, _p); } return _p; }
inline struct SOAP_ENV__Header * soap_new_set_SOAP_ENV__Header(struct soap *soap) { struct SOAP_ENV__Header *_p = soap_instantiate_SOAP_ENV__Header(soap, -1, NULL, NULL, NULL); if (_p) { soap_default_SOAP_ENV__Header(soap, _p); } return _p; }
inline void soap_delete_SOAP_ENV__Header(struct soap *soap, struct SOAP_ENV__Header *p) { soap_delete(soap, p); }
SOAP_FMAC3 void SOAP_FMAC4 soap_copy_SOAP_ENV__Header(struct soap*, int, int, void*, size_t, const void*, size_t);
#endif
@@ -245,25 +270,28 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__executeCommand(struct soap*, cons
SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__executeCommand(struct soap*, const char*, int, const struct ns1__executeCommand *, const char*);
SOAP_FMAC3 struct ns1__executeCommand * SOAP_FMAC4 soap_in_ns1__executeCommand(struct soap*, const char*, struct ns1__executeCommand *, const char*);
#ifndef soap_write_ns1__executeCommand
#define soap_write_ns1__executeCommand(soap, data) ( soap_begin_send(soap) || (soap_serialize_ns1__executeCommand(soap, data), 0) || soap_put_ns1__executeCommand(soap, data, "ns1:executeCommand", NULL) || soap_end_send(soap) )
#endif
SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__executeCommand(struct soap*, const struct ns1__executeCommand *, const char*, const char*);
#ifndef soap_read_ns1__executeCommand
#define soap_read_ns1__executeCommand(soap, data) ( soap_begin_recv(soap) || !soap_get_ns1__executeCommand(soap, data, NULL, NULL) || soap_end_recv(soap) )
#ifndef soap_write_ns1__executeCommand
#define soap_write_ns1__executeCommand(soap, data) ( soap_free_temp(soap), soap_begin_send(soap) || (soap_serialize_ns1__executeCommand(soap, data),0) || soap_put_ns1__executeCommand(soap, data, "ns1:executeCommand", NULL) || soap_end_send(soap), (soap)->error )
#endif
SOAP_FMAC3 struct ns1__executeCommand * SOAP_FMAC4 soap_get_ns1__executeCommand(struct soap*, struct ns1__executeCommand *, const char*, const char*);
#define soap_new_ns1__executeCommand(soap, n) soap_instantiate_ns1__executeCommand(soap, n, NULL, NULL, NULL)
#define soap_delete_ns1__executeCommand(soap, p) soap_delete(soap, p)
#ifndef soap_read_ns1__executeCommand
#define soap_read_ns1__executeCommand(soap, data) ( soap_begin_recv(soap) || !soap_get_ns1__executeCommand(soap, data, NULL, NULL) || soap_end_recv(soap), (soap)->error )
#endif
SOAP_FMAC1 struct ns1__executeCommand * SOAP_FMAC2 soap_instantiate_ns1__executeCommand(struct soap*, int, const char*, const char*, size_t*);
inline struct ns1__executeCommand * soap_new_ns1__executeCommand(struct soap *soap, int n = -1) { return soap_instantiate_ns1__executeCommand(soap, n, NULL, NULL, NULL); }
inline struct ns1__executeCommand * soap_new_req_ns1__executeCommand(struct soap *soap) { struct ns1__executeCommand *_p = soap_instantiate_ns1__executeCommand(soap, -1, NULL, NULL, NULL); if (_p) { soap_default_ns1__executeCommand(soap, _p); } return _p; }
inline struct ns1__executeCommand * soap_new_set_ns1__executeCommand(struct soap *soap, char *command) { struct ns1__executeCommand *_p = soap_instantiate_ns1__executeCommand(soap, -1, NULL, NULL, NULL); if (_p) { soap_default_ns1__executeCommand(soap, _p); _p->command = command; } return _p; }
inline void soap_delete_ns1__executeCommand(struct soap *soap, struct ns1__executeCommand *p) { soap_delete(soap, p); }
SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns1__executeCommand(struct soap*, int, int, void*, size_t, const void*, size_t);
#ifndef SOAP_TYPE_ns1__executeCommandResponse
@@ -274,25 +302,28 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__executeCommandResponse(struct soa
SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__executeCommandResponse(struct soap*, const char*, int, const struct ns1__executeCommandResponse *, const char*);
SOAP_FMAC3 struct ns1__executeCommandResponse * SOAP_FMAC4 soap_in_ns1__executeCommandResponse(struct soap*, const char*, struct ns1__executeCommandResponse *, const char*);
#ifndef soap_write_ns1__executeCommandResponse
#define soap_write_ns1__executeCommandResponse(soap, data) ( soap_begin_send(soap) || (soap_serialize_ns1__executeCommandResponse(soap, data), 0) || soap_put_ns1__executeCommandResponse(soap, data, "ns1:executeCommandResponse", NULL) || soap_end_send(soap) )
#endif
SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__executeCommandResponse(struct soap*, const struct ns1__executeCommandResponse *, const char*, const char*);
#ifndef soap_read_ns1__executeCommandResponse
#define soap_read_ns1__executeCommandResponse(soap, data) ( soap_begin_recv(soap) || !soap_get_ns1__executeCommandResponse(soap, data, NULL, NULL) || soap_end_recv(soap) )
#ifndef soap_write_ns1__executeCommandResponse
#define soap_write_ns1__executeCommandResponse(soap, data) ( soap_free_temp(soap), soap_begin_send(soap) || (soap_serialize_ns1__executeCommandResponse(soap, data),0) || soap_put_ns1__executeCommandResponse(soap, data, "ns1:executeCommandResponse", NULL) || soap_end_send(soap), (soap)->error )
#endif
SOAP_FMAC3 struct ns1__executeCommandResponse * SOAP_FMAC4 soap_get_ns1__executeCommandResponse(struct soap*, struct ns1__executeCommandResponse *, const char*, const char*);
#define soap_new_ns1__executeCommandResponse(soap, n) soap_instantiate_ns1__executeCommandResponse(soap, n, NULL, NULL, NULL)
#define soap_delete_ns1__executeCommandResponse(soap, p) soap_delete(soap, p)
#ifndef soap_read_ns1__executeCommandResponse
#define soap_read_ns1__executeCommandResponse(soap, data) ( soap_begin_recv(soap) || !soap_get_ns1__executeCommandResponse(soap, data, NULL, NULL) || soap_end_recv(soap), (soap)->error )
#endif
SOAP_FMAC1 struct ns1__executeCommandResponse * SOAP_FMAC2 soap_instantiate_ns1__executeCommandResponse(struct soap*, int, const char*, const char*, size_t*);
inline struct ns1__executeCommandResponse * soap_new_ns1__executeCommandResponse(struct soap *soap, int n = -1) { return soap_instantiate_ns1__executeCommandResponse(soap, n, NULL, NULL, NULL); }
inline struct ns1__executeCommandResponse * soap_new_req_ns1__executeCommandResponse(struct soap *soap) { struct ns1__executeCommandResponse *_p = soap_instantiate_ns1__executeCommandResponse(soap, -1, NULL, NULL, NULL); if (_p) { soap_default_ns1__executeCommandResponse(soap, _p); } return _p; }
inline struct ns1__executeCommandResponse * soap_new_set_ns1__executeCommandResponse(struct soap *soap, char **result) { struct ns1__executeCommandResponse *_p = soap_instantiate_ns1__executeCommandResponse(soap, -1, NULL, NULL, NULL); if (_p) { soap_default_ns1__executeCommandResponse(soap, _p); _p->result = result; } return _p; }
inline void soap_delete_ns1__executeCommandResponse(struct soap *soap, struct ns1__executeCommandResponse *p) { soap_delete(soap, p); }
SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns1__executeCommandResponse(struct soap*, int, int, void*, size_t, const void*, size_t);
#ifndef WITH_NOGLOBAL
@@ -303,19 +334,19 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns1__executeCommandResponse(struct soap*, i
SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Reason(struct soap*, struct SOAP_ENV__Reason *const*);
SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerToSOAP_ENV__Reason(struct soap*, const char *, int, struct SOAP_ENV__Reason *const*, const char *);
SOAP_FMAC3 struct SOAP_ENV__Reason ** SOAP_FMAC4 soap_in_PointerToSOAP_ENV__Reason(struct soap*, const char*, struct SOAP_ENV__Reason **, const char*);
#ifndef soap_write_PointerToSOAP_ENV__Reason
#define soap_write_PointerToSOAP_ENV__Reason(soap, data) ( soap_begin_send(soap) || (soap_serialize_PointerToSOAP_ENV__Reason(soap, data), 0) || soap_put_PointerToSOAP_ENV__Reason(soap, data, "SOAP-ENV:Reason", NULL) || soap_end_send(soap) )
#endif
SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerToSOAP_ENV__Reason(struct soap*, struct SOAP_ENV__Reason *const*, const char*, const char*);
#ifndef soap_read_PointerToSOAP_ENV__Reason
#define soap_read_PointerToSOAP_ENV__Reason(soap, data) ( soap_begin_recv(soap) || !soap_get_PointerToSOAP_ENV__Reason(soap, data, NULL, NULL) || soap_end_recv(soap) )
#ifndef soap_write_PointerToSOAP_ENV__Reason
#define soap_write_PointerToSOAP_ENV__Reason(soap, data) ( soap_free_temp(soap), soap_begin_send(soap) || (soap_serialize_PointerToSOAP_ENV__Reason(soap, data),0) || soap_put_PointerToSOAP_ENV__Reason(soap, data, "SOAP-ENV:Reason", NULL) || soap_end_send(soap), (soap)->error )
#endif
SOAP_FMAC3 struct SOAP_ENV__Reason ** SOAP_FMAC4 soap_get_PointerToSOAP_ENV__Reason(struct soap*, struct SOAP_ENV__Reason **, const char*, const char*);
#ifndef soap_read_PointerToSOAP_ENV__Reason
#define soap_read_PointerToSOAP_ENV__Reason(soap, data) ( soap_begin_recv(soap) || !soap_get_PointerToSOAP_ENV__Reason(soap, data, NULL, NULL) || soap_end_recv(soap), (soap)->error )
#endif
#endif
#ifndef WITH_NOGLOBAL
@@ -326,19 +357,19 @@ SOAP_FMAC3 struct SOAP_ENV__Reason ** SOAP_FMAC4 soap_get_PointerToSOAP_ENV__Rea
SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Detail(struct soap*, struct SOAP_ENV__Detail *const*);
SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerToSOAP_ENV__Detail(struct soap*, const char *, int, struct SOAP_ENV__Detail *const*, const char *);
SOAP_FMAC3 struct SOAP_ENV__Detail ** SOAP_FMAC4 soap_in_PointerToSOAP_ENV__Detail(struct soap*, const char*, struct SOAP_ENV__Detail **, const char*);
#ifndef soap_write_PointerToSOAP_ENV__Detail
#define soap_write_PointerToSOAP_ENV__Detail(soap, data) ( soap_begin_send(soap) || (soap_serialize_PointerToSOAP_ENV__Detail(soap, data), 0) || soap_put_PointerToSOAP_ENV__Detail(soap, data, "SOAP-ENV:Detail", NULL) || soap_end_send(soap) )
#endif
SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerToSOAP_ENV__Detail(struct soap*, struct SOAP_ENV__Detail *const*, const char*, const char*);
#ifndef soap_read_PointerToSOAP_ENV__Detail
#define soap_read_PointerToSOAP_ENV__Detail(soap, data) ( soap_begin_recv(soap) || !soap_get_PointerToSOAP_ENV__Detail(soap, data, NULL, NULL) || soap_end_recv(soap) )
#ifndef soap_write_PointerToSOAP_ENV__Detail
#define soap_write_PointerToSOAP_ENV__Detail(soap, data) ( soap_free_temp(soap), soap_begin_send(soap) || (soap_serialize_PointerToSOAP_ENV__Detail(soap, data),0) || soap_put_PointerToSOAP_ENV__Detail(soap, data, "SOAP-ENV:Detail", NULL) || soap_end_send(soap), (soap)->error )
#endif
SOAP_FMAC3 struct SOAP_ENV__Detail ** SOAP_FMAC4 soap_get_PointerToSOAP_ENV__Detail(struct soap*, struct SOAP_ENV__Detail **, const char*, const char*);
#ifndef soap_read_PointerToSOAP_ENV__Detail
#define soap_read_PointerToSOAP_ENV__Detail(soap, data) ( soap_begin_recv(soap) || !soap_get_PointerToSOAP_ENV__Detail(soap, data, NULL, NULL) || soap_end_recv(soap), (soap)->error )
#endif
#endif
#ifndef WITH_NOGLOBAL
@@ -349,19 +380,19 @@ SOAP_FMAC3 struct SOAP_ENV__Detail ** SOAP_FMAC4 soap_get_PointerToSOAP_ENV__Det
SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Code(struct soap*, struct SOAP_ENV__Code *const*);
SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerToSOAP_ENV__Code(struct soap*, const char *, int, struct SOAP_ENV__Code *const*, const char *);
SOAP_FMAC3 struct SOAP_ENV__Code ** SOAP_FMAC4 soap_in_PointerToSOAP_ENV__Code(struct soap*, const char*, struct SOAP_ENV__Code **, const char*);
#ifndef soap_write_PointerToSOAP_ENV__Code
#define soap_write_PointerToSOAP_ENV__Code(soap, data) ( soap_begin_send(soap) || (soap_serialize_PointerToSOAP_ENV__Code(soap, data), 0) || soap_put_PointerToSOAP_ENV__Code(soap, data, "SOAP-ENV:Code", NULL) || soap_end_send(soap) )
#endif
SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerToSOAP_ENV__Code(struct soap*, struct SOAP_ENV__Code *const*, const char*, const char*);
#ifndef soap_read_PointerToSOAP_ENV__Code
#define soap_read_PointerToSOAP_ENV__Code(soap, data) ( soap_begin_recv(soap) || !soap_get_PointerToSOAP_ENV__Code(soap, data, NULL, NULL) || soap_end_recv(soap) )
#ifndef soap_write_PointerToSOAP_ENV__Code
#define soap_write_PointerToSOAP_ENV__Code(soap, data) ( soap_free_temp(soap), soap_begin_send(soap) || (soap_serialize_PointerToSOAP_ENV__Code(soap, data),0) || soap_put_PointerToSOAP_ENV__Code(soap, data, "SOAP-ENV:Code", NULL) || soap_end_send(soap), (soap)->error )
#endif
SOAP_FMAC3 struct SOAP_ENV__Code ** SOAP_FMAC4 soap_get_PointerToSOAP_ENV__Code(struct soap*, struct SOAP_ENV__Code **, const char*, const char*);
#ifndef soap_read_PointerToSOAP_ENV__Code
#define soap_read_PointerToSOAP_ENV__Code(soap, data) ( soap_begin_recv(soap) || !soap_get_PointerToSOAP_ENV__Code(soap, data, NULL, NULL) || soap_end_recv(soap), (soap)->error )
#endif
#endif
#ifndef SOAP_TYPE_PointerTostring
@@ -370,43 +401,41 @@ SOAP_FMAC3 struct SOAP_ENV__Code ** SOAP_FMAC4 soap_get_PointerToSOAP_ENV__Code(
SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTostring(struct soap*, char **const*);
SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTostring(struct soap*, const char *, int, char **const*, const char *);
SOAP_FMAC3 char *** SOAP_FMAC4 soap_in_PointerTostring(struct soap*, const char*, char ***, const char*);
#ifndef soap_write_PointerTostring
#define soap_write_PointerTostring(soap, data) ( soap_begin_send(soap) || (soap_serialize_PointerTostring(soap, data), 0) || soap_put_PointerTostring(soap, data, "byte", NULL) || soap_end_send(soap) )
#endif
SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTostring(struct soap*, char **const*, const char*, const char*);
#ifndef soap_read_PointerTostring
#define soap_read_PointerTostring(soap, data) ( soap_begin_recv(soap) || !soap_get_PointerTostring(soap, data, NULL, NULL) || soap_end_recv(soap) )
#ifndef soap_write_PointerTostring
#define soap_write_PointerTostring(soap, data) ( soap_free_temp(soap), soap_begin_send(soap) || (soap_serialize_PointerTostring(soap, data),0) || soap_put_PointerTostring(soap, data, "byte", NULL) || soap_end_send(soap), (soap)->error )
#endif
SOAP_FMAC3 char *** SOAP_FMAC4 soap_get_PointerTostring(struct soap*, char ***, const char*, const char*);
#ifndef soap_read_PointerTostring
#define soap_read_PointerTostring(soap, data) ( soap_begin_recv(soap) || !soap_get_PointerTostring(soap, data, NULL, NULL) || soap_end_recv(soap), (soap)->error )
#endif
#ifndef SOAP_TYPE__QName
#define SOAP_TYPE__QName (5)
#endif
#define soap_default__QName(soap, a) soap_default_string(soap, a)
#define soap_serialize__QName(soap, a) soap_serialize_string(soap, a)
SOAP_FMAC3 void SOAP_FMAC4 soap_serialize__QName(struct soap*, char *const*);
SOAP_FMAC3 int SOAP_FMAC4 soap_out__QName(struct soap*, const char*, int, char*const*, const char*);
SOAP_FMAC3 char * * SOAP_FMAC4 soap_in__QName(struct soap*, const char*, char **, const char*);
#ifndef soap_write__QName
#define soap_write__QName(soap, data) ( soap_begin_send(soap) || (soap_serialize__QName(soap, data), 0) || soap_put__QName(soap, data, "byte", NULL) || soap_end_send(soap) )
#endif
SOAP_FMAC3 int SOAP_FMAC4 soap_put__QName(struct soap*, char *const*, const char*, const char*);
#ifndef soap_read__QName
#define soap_read__QName(soap, data) ( soap_begin_recv(soap) || !soap_get__QName(soap, data, NULL, NULL) || soap_end_recv(soap) )
#ifndef soap_write__QName
#define soap_write__QName(soap, data) ( soap_free_temp(soap), soap_begin_send(soap) || (soap_serialize__QName(soap, data),0) || soap_put__QName(soap, data, "byte", NULL) || soap_end_send(soap), (soap)->error )
#endif
SOAP_FMAC3 char ** SOAP_FMAC4 soap_get__QName(struct soap*, char **, const char*, const char*);
#ifndef soap_read__QName
#define soap_read__QName(soap, data) ( soap_begin_recv(soap) || !soap_get__QName(soap, data, NULL, NULL) || soap_end_recv(soap), (soap)->error )
#endif
#ifndef SOAP_TYPE_string
#define SOAP_TYPE_string (4)
#endif
@@ -414,19 +443,19 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default_string(struct soap*, char **);
SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_string(struct soap*, char *const*);
SOAP_FMAC3 int SOAP_FMAC4 soap_out_string(struct soap*, const char*, int, char*const*, const char*);
SOAP_FMAC3 char * * SOAP_FMAC4 soap_in_string(struct soap*, const char*, char **, const char*);
#ifndef soap_write_string
#define soap_write_string(soap, data) ( soap_begin_send(soap) || (soap_serialize_string(soap, data), 0) || soap_put_string(soap, data, "byte", NULL) || soap_end_send(soap) )
#endif
SOAP_FMAC3 int SOAP_FMAC4 soap_put_string(struct soap*, char *const*, const char*, const char*);
#ifndef soap_read_string
#define soap_read_string(soap, data) ( soap_begin_recv(soap) || !soap_get_string(soap, data, NULL, NULL) || soap_end_recv(soap) )
#ifndef soap_write_string
#define soap_write_string(soap, data) ( soap_free_temp(soap), soap_begin_send(soap) || (soap_serialize_string(soap, data),0) || soap_put_string(soap, data, "byte", NULL) || soap_end_send(soap), (soap)->error )
#endif
SOAP_FMAC3 char ** SOAP_FMAC4 soap_get_string(struct soap*, char **, const char*, const char*);
#ifndef soap_read_string
#define soap_read_string(soap, data) ( soap_begin_recv(soap) || !soap_get_string(soap, data, NULL, NULL) || soap_end_recv(soap), (soap)->error )
#endif
#endif
/* End of soapH.h */
dep/gsoap/soapServer.cpp
+7 -7
View File
@@ -1,9 +1,9 @@
/* soapServer.cpp
Generated by gSOAP 2.8.10 from gsoap.stub
Generated by gSOAP 2.8.17r from gsoap.stub
Copyright(C) 2000-2012, Robert van Engelen, Genivia Inc. All Rights Reserved.
Copyright(C) 2000-2013, Robert van Engelen, Genivia Inc. All Rights Reserved.
The generated code is released under one of the following licenses:
1) GPL or 2) Genivia's license for commercial use.
GPL or Genivia's license for commercial use.
This program is released under the GPL with the additional exemption that
compiling, linking, and/or using OpenSSL is allowed.
*/
@@ -14,10 +14,10 @@ compiling, linking, and/or using OpenSSL is allowed.
#endif
#include "soapH.h"
SOAP_SOURCE_STAMP("@(#) soapServer.cpp ver 2.8.10 2012-09-02 20:48:00 GMT")
SOAP_SOURCE_STAMP("@(#) soapServer.cpp ver 2.8.17r 2014-06-21 21:43:17 GMT")
SOAP_FMAC5 int SOAP_FMAC6 soap_serve(struct soap *soap)
extern "C" SOAP_FMAC5 int SOAP_FMAC6 soap_serve(struct soap *soap)
{
#ifndef WITH_FASTCGI
unsigned int k = soap->max_keep_alive;
@@ -53,7 +53,7 @@ SOAP_FMAC5 int SOAP_FMAC6 soap_serve(struct soap *soap)
}
#ifndef WITH_NOSERVEREQUEST
SOAP_FMAC5 int SOAP_FMAC6 soap_serve_request(struct soap *soap)
extern "C" SOAP_FMAC5 int SOAP_FMAC6 soap_serve_request(struct soap *soap)
{
soap_peek_element(soap);
if (!soap_match_tag(soap, soap->tag, "ns1:executeCommand"))
@@ -70,7 +70,6 @@ SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__executeCommand(struct soap *soap)
soap_tmp_string = NULL;
soap_tmp_ns1__executeCommandResponse.result = &soap_tmp_string;
soap_default_ns1__executeCommand(soap, &soap_tmp_ns1__executeCommand);
soap->encodingStyle = NULL;
if (!soap_get_ns1__executeCommand(soap, &soap_tmp_ns1__executeCommand, "ns1:executeCommand", NULL))
return soap->error;
if (soap_body_end_in(soap)
@@ -80,6 +79,7 @@ SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__executeCommand(struct soap *soap)
soap->error = ns1__executeCommand(soap, soap_tmp_ns1__executeCommand.command, soap_tmp_ns1__executeCommandResponse.result);
if (soap->error)
return soap->error;
soap->encodingStyle = NULL;
soap_serializeheader(soap);
soap_serialize_ns1__executeCommandResponse(soap, &soap_tmp_ns1__executeCommandResponse);
if (soap_begin_count(soap))
dep/gsoap/soapStub.h
+20 -6
View File
@@ -1,9 +1,9 @@
/* soapStub.h
Generated by gSOAP 2.8.10 from gsoap.stub
Generated by gSOAP 2.8.17r from gsoap.stub
Copyright(C) 2000-2012, Robert van Engelen, Genivia Inc. All Rights Reserved.
Copyright(C) 2000-2013, Robert van Engelen, Genivia Inc. All Rights Reserved.
The generated code is released under one of the following licenses:
1) GPL or 2) Genivia's license for commercial use.
GPL or Genivia's license for commercial use.
This program is released under the GPL with the additional exemption that
compiling, linking, and/or using OpenSSL is allowed.
*/
@@ -11,7 +11,7 @@ compiling, linking, and/or using OpenSSL is allowed.
#ifndef soapStub_H
#define soapStub_H
#include "stdsoap2.h"
#if GSOAP_VERSION != 20810
#if GSOAP_VERSION != 20817
# error "GSOAP VERSION MISMATCH IN GENERATED CODE: PLEASE REINSTALL PACKAGE"
#endif
@@ -48,6 +48,8 @@ struct ns1__executeCommandResponse
{
public:
char **result; /* SOAP 1.2 RPC return element (when namespace qualified) */ /* optional element of type xsd:string */
public:
int soap_type() const { return 9; } /* = unique type id SOAP_TYPE_ns1__executeCommandResponse */
};
#endif
@@ -58,6 +60,8 @@ struct ns1__executeCommand
{
public:
char *command; /* optional element of type xsd:string */
public:
int soap_type() const { return 10; } /* = unique type id SOAP_TYPE_ns1__executeCommand */
};
#endif
@@ -68,6 +72,8 @@ public:
/* SOAP Header: */
struct SOAP_ENV__Header
{
public:
int soap_type() const { return 11; } /* = unique type id SOAP_TYPE_SOAP_ENV__Header */
#ifdef WITH_NOEMPTYSTRUCT
private:
char dummy; /* dummy member to enable compilation */
@@ -87,6 +93,8 @@ struct SOAP_ENV__Code
public:
char *SOAP_ENV__Value; /* optional element of type xsd:QName */
struct SOAP_ENV__Code *SOAP_ENV__Subcode; /* optional element of type SOAP-ENV:Code */
public:
int soap_type() const { return 12; } /* = unique type id SOAP_TYPE_SOAP_ENV__Code */
};
#endif
@@ -103,6 +111,8 @@ public:
char *__any;
int __type; /* any type of element <fault> (defined below) */
void *fault; /* transient */
public:
int soap_type() const { return 14; } /* = unique type id SOAP_TYPE_SOAP_ENV__Detail */
};
#endif
@@ -117,6 +127,8 @@ struct SOAP_ENV__Reason
{
public:
char *SOAP_ENV__Text; /* optional element of type xsd:string */
public:
int soap_type() const { return 17; } /* = unique type id SOAP_TYPE_SOAP_ENV__Reason */
};
#endif
@@ -139,6 +151,8 @@ public:
char *SOAP_ENV__Node; /* optional element of type xsd:string */
char *SOAP_ENV__Role; /* optional element of type xsd:string */
struct SOAP_ENV__Detail *SOAP_ENV__Detail; /* optional element of type SOAP-ENV:Detail */
public:
int soap_type() const { return 18; } /* = unique type id SOAP_TYPE_SOAP_ENV__Fault */
};
#endif
@@ -183,9 +197,9 @@ SOAP_FMAC5 int SOAP_FMAC6 ns1__executeCommand(struct soap*, char *command, char
* *
\******************************************************************************/
SOAP_FMAC5 int SOAP_FMAC6 soap_serve(struct soap*);
extern "C" SOAP_FMAC5 int SOAP_FMAC6 soap_serve(struct soap*);
SOAP_FMAC5 int SOAP_FMAC6 soap_serve_request(struct soap*);
extern "C" SOAP_FMAC5 int SOAP_FMAC6 soap_serve_request(struct soap*);
SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__executeCommand(struct soap*);
dep/gsoap/stdsoap2.cpp
+1212 -546
View File
File diff suppressed because it is too large Load Diff
dep/gsoap/stdsoap2.h
+193 -67
View File
@@ -1,10 +1,10 @@
/*
stdsoap2.h 2.8.10
stdsoap2.h 2.8.17r
gSOAP runtime engine
gSOAP XML Web services tools
Copyright (C) 2000-2012, Robert van Engelen, Genivia Inc., All Rights Reserved.
Copyright (C) 2000-2013, Robert van Engelen, Genivia Inc., All Rights Reserved.
This part of the software is released under ONE of the following licenses:
GPL, or the gSOAP public license, or Genivia's license for commercial use.
--------------------------------------------------------------------------------
@@ -24,7 +24,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
for the specific language governing rights and limitations under the License.
The Initial Developer of the Original Code is Robert A. van Engelen.
Copyright (C) 2000-2012, Robert van Engelen, Genivia Inc., All Rights Reserved.
Copyright (C) 2000-2013, Robert van Engelen, Genivia Inc., All Rights Reserved.
--------------------------------------------------------------------------------
GPL license.
@@ -51,7 +51,7 @@ A commercial use license is available from Genivia, Inc., [email protected]
--------------------------------------------------------------------------------
*/
#define GSOAP_VERSION 20810
#define GSOAP_VERSION 20817
#ifdef WITH_SOAPDEFS_H
# include "soapdefs.h" /* include user-defined stuff */
@@ -216,7 +216,9 @@ A commercial use license is available from Genivia, Inc., [email protected]
# define WITH_LEAN
# define HAVE_SSCANF
# elif defined(WIN32)
# define HAVE_SNPRINTF
# if _MSC_VER >= 1400
# define HAVE_SNPRINTF
# endif
# define HAVE_STRRCHR
# define HAVE_STRTOD
# define HAVE_SSCANF
@@ -225,8 +227,8 @@ A commercial use license is available from Genivia, Inc., [email protected]
# define HAVE_STRTOL
# define HAVE_STRTOUL
# if _MSC_VER >= 1300
# define HAVE_STRTOLL // use _strtoi64
# define HAVE_STRTOULL // use _strtoui64
# define HAVE_STRTOLL /* use _strtoi64 */
# define HAVE_STRTOULL /* use _strtoui64 */
# endif
# define HAVE_SYS_TIMEB_H
# define HAVE_FTIME
@@ -264,11 +266,14 @@ A commercial use license is available from Genivia, Inc., [email protected]
# define HAVE_STRTOUL
# define HAVE_RAND_R
# define HAVE_GMTIME_R
# define HAVE_TM_GMTOFF
# define HAVE_GETTIMEOFDAY
# define HAVE_LOCALTIME_R
# define HAVE_STRERROR_R
# define HAVE_TIMEGM
# define HAVE_WCTOMB
# define HAVE_MBTOWC
# define HAVE_INTTYPES_H
# elif defined(_AIX43)
# define HAVE_SNPRINTF
# define HAVE_STRRCHR
@@ -482,10 +487,6 @@ A commercial use license is available from Genivia, Inc., [email protected]
# define HAVE_STRERROR_R
# define HAVE_WCTOMB
# define HAVE_MBTOWC
# define LONG64 long
# define ULONG64 unsigned LONG64
# define SOAP_LONG_FORMAT "%ld"
# define SOAP_ULONG_FORMAT "%lu"
# elif defined(SUN_OS)
# define HAVE_SNPRINTF
# define HAVE_STRRCHR
@@ -543,7 +544,7 @@ A commercial use license is available from Genivia, Inc., [email protected]
#endif
/* native Win, HP-UX, and AIX compilers don't like empty structs */
#if defined(WIN32) || defined(HP_UX) || defined(_AIX41) || defined(_AIX43) || defined(VXWORKS)
#if defined(WIN32) || defined(HP_UX) || defined(_AIX) || defined(AIX) || defined(VXWORKS)
# define WITH_NOEMPTYSTRUCT
#endif
@@ -579,7 +580,7 @@ A commercial use license is available from Genivia, Inc., [email protected]
# undef HAVE_SPRINTF_L
#endif
#ifdef TANDEM_NONSTOP
#ifdef TANDEM_NONSTOP /* Support for Guardian */
# define SOAP_BUFLEN (32767)
/*# define WITH_NOSTDLIB */ /* uncommment to remove stdlib dependences */
# define WITH_NOIO /* no IO dependences, e.g. remove TCP/IP */
@@ -610,6 +611,9 @@ A commercial use license is available from Genivia, Inc., [email protected]
# include <cextdecs.h(TIME,FILE_CLOSE_,AWAITIOX,DELAY,FILEINFO,FILE_GETINFO_)>
# define INET_ERROR 4294967295
#pragma list
#elif defined(__TANDEM) /* Support for OSS */
# define int32_t int
# define SOAP_BUFLEN (32767)
#endif
#ifndef WITH_NOSTDLIB
@@ -723,17 +727,18 @@ A commercial use license is available from Genivia, Inc., [email protected]
# include <io.h>
# include <fcntl.h>
# endif
// When you get macro redefinition errors when compiling the code below:
// try arrange your include list that <windows.h> is included after "stdsoap2.h"
// or define _WINSOCKAPI_ first:
// #define _WINSOCKAPI_ // stops windows.h including winsock.h
// #include <windows.h>
// #include "stdsoap2.h"
# include <winsock2.h> /* Visual Studio 2005 users: install Platform SDK (R2) */
// When you get macro redefinition errors when compiling the code below, then:
// a) try arrange your includes so <windows.h> is included after "stdsoap2.h"
// b) or define _WINSOCKAPI_ first:
// #define _WINSOCKAPI_ // stops windows.h including winsock.h
// #include <windows.h>
// #include "stdsoap2.h"
// c) or compile with the -DWIN32_LEAN_AND_MEAN switch
# include <winsock2.h> // Visual Studio 2005 users: install Platform SDK (R2)
# include <ws2tcpip.h>
// # define _WSPIAPI_COUNTOF /* DEV NOTE: enble to fix problems with VC6 */
// # define _WSPIAPI_COUNTOF // DEV NOTE: enble to fix problems with VC6
// # include <wspiapi.h>
# include <ws2spi.h> /* DEV NOTE: replaces older wspiapi.h above */
# include <ws2spi.h> // DEV NOTE: replaces older wspiapi.h above
# ifdef WITH_IPV6
# define SOAP_GAI_STRERROR gai_strerrorA
# endif
@@ -815,14 +820,16 @@ A commercial use license is available from Genivia, Inc., [email protected]
# endif
#endif
/* #define DEBUG */ /* Uncomment to debug sending (in file SENT.log) receiving (in file RECV.log) and messages (in file TEST.log) */
/* #define DEBUG */ /* Uncomment to debug sending (in file SENT.log) receiving (in file RECV.log) and internal operations (in file TEST.log) */
/* #define DEBUG_STAMP */ /* Uncomment to debug sending (in file SENT.log) receiving (in file RECV.log) and time-stamped operations (in file TEST.log) */
#ifdef __cplusplus
extern "C" {
#endif
/* Portability: define SOAP_SOCKLEN_T */
#if defined(_AIX)
#if defined(_AIX) || defined(AIX)
# if defined(_AIX43)
# define SOAP_SOCKLEN_T socklen_t
# else
@@ -830,7 +837,7 @@ extern "C" {
# endif
#elif defined(SOCKLEN_T)
# define SOAP_SOCKLEN_T SOCKLEN_T
#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(OPENBSD) || defined(__QNX__) || defined(QNX) || defined(OS390)
#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(OPENBSD) || defined(__QNX__) || defined(QNX) || defined(OS390) || defined(__ANDROID__)
# define SOAP_SOCKLEN_T socklen_t
#elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS) || defined(HP_UX)
# define SOAP_SOCKLEN_T int
@@ -868,12 +875,29 @@ extern "C" {
# define SOAP_CHK_EOF (soap->error ? soap->error : SOAP_EOF)
#endif
#ifdef __cplusplus
# ifndef __STDC_FORMAT_MACROS
# define __STDC_FORMAT_MACROS
# endif
#endif
#if defined(SYMBIAN)
# define LONG64 long
# define ULONG64 unsigned LONG64
#elif !defined(WIN32) || defined(CYGWIN) || defined(__GLIBC__) || defined(__GNU__)
# ifndef LONG64
# if defined(HAVE_STDINT_H)
# if defined(HAVE_INTTYPES_H)
# ifdef HAVE_STDINT_H
# include <stdint.h>
# endif
# include <inttypes.h>
# define LONG64 int64_t
# define ULONG64 uint64_t
# elif defined(HAVE_SYS_INTTYPES_H)
# include <sys/inttypes.h>
# define LONG64 int64_t
# define ULONG64 uint64_t
# elif defined(HAVE_STDINT_H)
# include <stdint.h>
# define LONG64 int64_t
# define ULONG64 uint64_t
@@ -905,6 +929,18 @@ extern "C" {
# define ULONG64 unsigned LONG64
#endif
#ifdef PRId64
# ifndef SOAP_LONG_FORMAT
# define SOAP_LONG_FORMAT "%" PRId64
# endif
#endif
#ifdef PRIu64
# ifndef SOAP_ULONG_FORMAT
# define SOAP_ULONG_FORMAT "%" PRIu64
# endif
#endif
#ifndef SOAP_LONG_FORMAT
# define SOAP_LONG_FORMAT "%lld" /* printf format for 64 bit ints */
#endif
@@ -919,7 +955,7 @@ extern "C" {
# define soap_int32 long
#elif defined(PALM)
# define soap_int32 Int32
#elif defined(_AIX)
#elif defined(_AIX) || defined(AIX)
# if defined(_AIX43)
# define soap_int32 int32_t
# else
@@ -1035,6 +1071,12 @@ extern "C" {
# define SOAP_INDEX_TEST (2)
#endif
/* Max number of EINTR while poll/select on a socket */
/* Each EINTR can lengthen the I/O blocking time by at most one second */
#ifndef SOAP_MAXEINTR
# define SOAP_MAXEINTR (10)
#endif
/* Max iterations in soap_serve() to keep server connection alive */
#ifndef SOAP_MAXKEEPALIVE
# define SOAP_MAXKEEPALIVE (100)
@@ -1047,6 +1089,14 @@ extern "C" {
# define SOAP_MAXARRAYSIZE (1000000)
#endif
/* Trusted max size of inbound DIME data.
Increase if necessary to allow larger attachments, or decrease when server
resources are limited.
*/
#ifndef SOAP_MAXDIMESIZE
# define SOAP_MAXDIMESIZE (8388608) /* 8 MB */
#endif
#ifdef VXWORKS
# ifdef WMW_RPM_IO
# include "httpLib.h"
@@ -1180,13 +1230,15 @@ extern const char soap_base64o[], soap_base64i[];
#ifdef HAVE_SNPRINTF
# ifdef WIN32
# define soap_snprintf _snprintf
# define soap_snprintf(buf, len, ...) (_snprintf((buf), (len), __VA_ARGS__), (buf)[(len)-1] = '\0')
# else
# define soap_snprintf snprintf
# endif
#endif
/* gSOAP error codes */
/* gSOAP status/error codes */
typedef soap_int32 soap_status;
#define SOAP_EOF EOF
#define SOAP_ERR EOF
@@ -1306,14 +1358,14 @@ typedef soap_int32 soap_mode;
#define SOAP_ENC_ZLIB 0x00000400
#define SOAP_ENC_SSL 0x00000800
#define SOAP_XML_STRICT 0x00001000 /* in: strict validation */
#define SOAP_XML_STRICT 0x00001000 /* in: strict validation */
#define SOAP_XML_INDENT 0x00002000 /* out: emit indented XML */
#define SOAP_XML_IGNORENS 0x00004000 /* in: ignore namespaces */
#define SOAP_XML_IGNORENS 0x00004000 /* in: ignore namespaces */
#define SOAP_XML_DEFAULTNS 0x00008000 /* out: emit xmlns="..." */
#define SOAP_XML_CANONICAL 0x00010000 /* out: excC14N canonical XML */
#define SOAP_XML_TREE 0x00020000 /* out: XML tree (no id/ref) */
#define SOAP_XML_TREE 0x00020000 /* in/out: XML tree (no id/ref) */
#define SOAP_XML_NIL 0x00040000 /* out: NULLs as xsi:nil */
#define SOAP_XML_NOTYPE 0x00080000 /* out: NULLs as xsi:nil */
#define SOAP_XML_NOTYPE 0x00080000 /* out: do not add xsi:type */
#define SOAP_DOM_TREE 0x00100000 /* see DOM manual */
#define SOAP_DOM_NODE 0x00200000
@@ -1325,7 +1377,7 @@ typedef soap_int32 soap_mode;
#define SOAP_C_NILSTRING 0x08000000 /* serialize empty strings as nil (omitted) */
#define SOAP_XML_DOM 0x10000000 /* enable internal DOM */
#define SOAP_XML_GRAPH 0x20000000 /* id-ref graph in DOM */
#define SOAP_XML_GRAPH 0x20000000 /* force id-ref XML graph */
#define SOAP_MIME_POSTCHECK 0x40000000 /* MIME flag (internal) */
@@ -1383,6 +1435,11 @@ typedef soap_int32 soap_mode;
/* DEBUG macros */
#ifndef WITH_LEAN
# ifdef DEBUG_STAMP
# ifndef DEBUG
# define DEBUG
# endif
# endif
# ifdef DEBUG
# ifndef SOAP_DEBUG
# define SOAP_DEBUG
@@ -1410,20 +1467,40 @@ typedef soap_int32 soap_mode;
# define SOAP_FREE(soap, ptr) free(ptr)
#endif
#ifndef SOAP_NEW /* use C++ new operator */
# if (defined(__GNUC__) && (__GNUC__ <= 2) && !defined(__BORLANDC__)) || defined(__clang__) || defined(_AIX)
# define SOAP_NEW(type) new type /* old form w/o parenthesis */
# else
# define SOAP_NEW(type) new (type) /* prefer with parenthesis */
#if defined(__GNUC__) && (__GNUC__ <= 2)
# define SOAP_NOTHROW
#elif !defined(WITH_LEAN) && !defined(WITH_COMPAT) && !defined(SOAP_NOTHROW)
# define SOAP_NOTHROW (std::nothrow)
#else
# define SOAP_NOTHROW
#endif
#if (defined(__GNUC__) && (__GNUC__ <= 2) && !defined(__BORLANDC__)) || defined(__clang__) || defined(_AIX) || defined(AIX)
/* old form w/o parenthesis */
# ifndef SOAP_NEW
# define SOAP_NEW(type) new SOAP_NOTHROW type
# endif
# ifndef SOAP_NEW_ARRAY
# define SOAP_NEW_ARRAY(type, n) new SOAP_NOTHROW type[n]
# endif
# ifndef SOAP_PLACEMENT_NEW
# define SOAP_PLACEMENT_NEW(buf, type) new (buf) type
# endif
#else
/* new form with parenthesis */
# ifndef SOAP_NEW
# define SOAP_NEW(type) new SOAP_NOTHROW (type)
# endif
# ifndef SOAP_NEW_ARRAY
# define SOAP_NEW_ARRAY(type, n) new SOAP_NOTHROW type[n]
# endif
# ifndef SOAP_PLACEMENT_NEW
# define SOAP_PLACEMENT_NEW(buf, type) new (buf) (type)
# endif
#endif
#ifndef SOAP_PLACEMENT_NEW
# define SOAP_PLACEMENT_NEW(buf, type) new (buf) type
#endif
#ifndef SOAP_NEW_COPY /* use C++ new operator for ::copy() */
# define SOAP_NEW_COPY(clas) new clas /* prefer w/o parenthesis */
# define SOAP_NEW_COPY(clas) new SOAP_NOTHROW clas
#endif
#ifndef SOAP_DELETE /* use C++ delete operator */
@@ -1439,7 +1516,42 @@ typedef soap_int32 soap_mode;
# define SOAP_MESSAGE fprintf
# endif
# ifndef DBGLOG
# define DBGLOG(DBGFILE, CMD) \
# ifdef DEBUG_STAMP
# ifdef WIN32
# define DBGLOG(DBGFILE, CMD) \
{ if (soap)\
{ if (!soap->fdebug[SOAP_INDEX_##DBGFILE])\
soap_open_logfile((struct soap*)soap, SOAP_INDEX_##DBGFILE);\
if (soap->fdebug[SOAP_INDEX_##DBGFILE])\
{ FILE *fdebug = soap->fdebug[SOAP_INDEX_##DBGFILE];\
SYSTEMTIME _localTime;\
::GetLocalTime(&_localTime); \
fprintf(fdebug, "%02d%02d%02d %02d:%02d:%02d.%03d|", _localTime.wYear%100, _localTime.wMonth, _localTime.wDay, _localTime.wHour, _localTime.wMinute, _localTime.wSecond, _localTime.wMilliseconds);\
CMD;\
fflush(fdebug);\
}\
}\
}
# else
# define DBGLOG(DBGFILE, CMD) \
{ if (soap)\
{ if (!soap->fdebug[SOAP_INDEX_##DBGFILE])\
soap_open_logfile((struct soap*)soap, SOAP_INDEX_##DBGFILE);\
if (soap->fdebug[SOAP_INDEX_##DBGFILE])\
{ FILE *fdebug = soap->fdebug[SOAP_INDEX_##DBGFILE];\
struct timeval _tv;\
struct tm _tm;\
gettimeofday(&_tv, NULL);\
localtime_r(&_tv.tv_sec, &_tm);\
fprintf(fdebug, "%02d%02d%02d %02d:%02d:%02d.%06d|", _tm.tm_year%100, _tm.tm_mon+1, _tm.tm_mday, _tm.tm_hour, _tm.tm_min, _tm.tm_sec, _tv.tv_usec);\
CMD;\
fflush(fdebug);\
}\
}\
}
# endif
# else
# define DBGLOG(DBGFILE, CMD) \
{ if (soap)\
{ if (!soap->fdebug[SOAP_INDEX_##DBGFILE])\
soap_open_logfile((struct soap*)soap, SOAP_INDEX_##DBGFILE);\
@@ -1450,6 +1562,7 @@ typedef soap_int32 soap_mode;
}\
}\
}
# endif
# endif
# ifndef DBGMSG
# define DBGMSG(DBGFILE, MSG, LEN) \
@@ -1465,9 +1578,9 @@ typedef soap_int32 soap_mode;
# endif
# ifndef DBGFUN
# define DBGFUN(FNAME) DBGLOG(TEST, SOAP_MESSAGE(fdebug, "%s(%d): %s()\n", __FILE__, __LINE__, FNAME))
# define DBGFUN1(FNAME, FMT, ARG) DBGLOG(TEST, SOAP_MESSAGE(fdebug, "%s(%d): %s("FMT")\n", __FILE__, __LINE__, FNAME, (ARG)))
# define DBGFUN2(FNAME, FMT1, ARG1, FMT2, ARG2) DBGLOG(TEST, SOAP_MESSAGE(fdebug, "%s(%d): %s("FMT1", "FMT2")\n", __FILE__, __LINE__, FNAME, (ARG1), (ARG2)))
# define DBGFUN3(FNAME, FMT1, ARG1, FMT2, ARG2, FMT3, ARG3) DBGLOG(TEST, SOAP_MESSAGE(fdebug, "%s(%d): %s("FMT1", "FMT2", "FMT3")\n", __FILE__, __LINE__, FNAME, (ARG1), (ARG2), (ARG3)))
# define DBGFUN1(FNAME, FMT, ARG) DBGLOG(TEST, SOAP_MESSAGE(fdebug, "%s(%d): %s(" FMT ")\n", __FILE__, __LINE__, FNAME, (ARG)))
# define DBGFUN2(FNAME, FMT1, ARG1, FMT2, ARG2) DBGLOG(TEST, SOAP_MESSAGE(fdebug, "%s(%d): %s(" FMT1 ", " FMT2 ")\n", __FILE__, __LINE__, FNAME, (ARG1), (ARG2)))
# define DBGFUN3(FNAME, FMT1, ARG1, FMT2, ARG2, FMT3, ARG3) DBGLOG(TEST, SOAP_MESSAGE(fdebug, "%s(%d): %s(" FMT1 ", " FMT2 ", " FMT3 ")\n", __FILE__, __LINE__, FNAME, (ARG1), (ARG2), (ARG3)))
# endif
# ifndef DBGHEX
# define DBGHEX(DBGFILE, MSG, LEN) \
@@ -1533,7 +1646,7 @@ struct soap_plist
const struct soap_array *array;
int type;
int id;
char mark1;
char mark1; /* 0=single-ref, 1=embedded-multi-ref (SOAP1.1), 2=multi-ref, 3=attachment */
char mark2;
};
@@ -1819,7 +1932,7 @@ extern "C" {
struct SOAP_STD_API soap
{ short state; /* 0 = uninitialized, 1 = initialized, 2 = copy of another soap struct */
short version; /* 1 = SOAP1.1 and 2 = SOAP1.2 (set automatically from namespace URI in nsmap table) */
short version; /* 1 = SOAP1.1 and 2 = SOAP1.2 (set automatically from namespace URI in nsmap table), 0 indicates non-SOAP content */
soap_mode mode;
soap_mode imode;
soap_mode omode;
@@ -1828,7 +1941,7 @@ struct SOAP_STD_API soap
const char *dime_id_format; /* user-definable format string for integer DIME id (<SOAP_TAGLEN chars) */
const char *http_version; /* HTTP version used "1.0" or "1.1" */
const char *http_content; /* optional custom response content type (with SOAP_FILE) */
const char *encodingStyle; /* default = NULL which means that SOAP encoding is used */
const char *encodingStyle; /* default = "" which means that SOAP encoding is used */
const char *actor; /* SOAP-ENV:actor or role attribute value */
const char *lang; /* xml:lang attribute value of SOAP-ENV:Text */
int recv_timeout; /* when > 0, gives socket recv timeout in seconds, < 0 in usec */
@@ -1846,10 +1959,12 @@ struct SOAP_STD_API soap
struct soap_blist *blist; /* block allocation stack */
struct soap_clist *clist; /* class instance allocation list */
void *alist; /* memory allocation (malloc) list */
#if !defined(WITH_LEAN) || !defined(WITH_NOIDREF)
struct soap_ilist *iht[SOAP_IDHASH];
struct soap_plist *pht[SOAP_PTRHASH];
struct soap_pblk *pblk; /* plist block allocation */
short pidx; /* plist block allocation */
#endif
struct SOAP_ENV__Header *header;
struct SOAP_ENV__Fault *fault;
int idnum;
@@ -1941,7 +2056,7 @@ struct SOAP_STD_API soap
size_t buflen; /* length of soap.buf[] content */
soap_wchar ahead; /* parser lookahead */
short cdata; /* CDATA parser state */
short body; /* parsed XML element has a body or not */
short body; /* HTTP or XML element has a body (1) or not (0) */
unsigned int level; /* XML nesting level */
size_t count; /* message length counter */
size_t length; /* message length as set by HTTP header */
@@ -2017,7 +2132,7 @@ struct SOAP_STD_API soap
int cookie_max;
#endif
#ifndef WITH_NOIO
int ipv6_multicast_if; /* in6addr->sin6_scope_id IPv6 value */
unsigned int ipv6_multicast_if; /* in_addr_t in6addr->sin6_scope_id IPv6 value */
char* ipv4_multicast_if; /* IP_MULTICAST_IF IPv4 setsockopt interface_addr */
unsigned char ipv4_multicast_ttl; /* IP_MULTICAST_TTL value 0..255 */
#ifdef WITH_IPV6
@@ -2057,6 +2172,7 @@ struct SOAP_STD_API soap
#endif
unsigned short ssl_flags;
const char *keyfile;
const char *keyid;
const char *password;
const char *cafile;
const char *capath;
@@ -2139,9 +2255,7 @@ struct soap_plugin
void (*fdelete)(struct soap *soap, struct soap_plugin *p); /* should delete fields of plugin only and not free(p) */
};
#ifndef WITH_NONAMESPACES
extern SOAP_NMAC struct Namespace namespaces[];
#endif
#ifndef WITH_LEAN
# define soap_get0(soap) (((soap)->bufidx>=(soap)->buflen && soap_recv(soap)) ? EOF : (unsigned char)(soap)->buf[(soap)->bufidx])
@@ -2151,6 +2265,9 @@ soap_wchar soap_get0(struct soap*);
soap_wchar soap_get1(struct soap*);
#endif
#define SOAP_XSTRINGIFY(s) SOAP_STRINGIFY(s)
#define SOAP_STRINGIFY(s) #s
#define soap_versioning_paste(name, ext) name##_LIBRARY_VERSION_REQUIRED_##ext
#define soap_versioning_ext(name, ext) soap_versioning_paste(name, ext)
#define soap_versioning(name) soap_versioning_ext(name, GSOAP_VERSION)
@@ -2195,13 +2312,13 @@ soap_wchar soap_get1(struct soap*);
SOAP_FMAC1 unsigned long SOAP_FMAC2 soap_strtoul(const char *s, char **t, int b);
#endif
#ifdef WIN32
#if defined(WIN32) && !defined(__MINGW32__)
# define soap_strtoll _strtoi64
#else
# define soap_strtoll strtoll
#endif
#ifdef WIN32
#if defined(WIN32) && !defined(__MINGW32__)
# define soap_strtoull _strtoui64
#else
# define soap_strtoull strtoull
@@ -2229,8 +2346,6 @@ SOAP_FMAC1 int SOAP_FMAC2 soap_rand(void);
# define soap_lookup_type(s, i) (0)
# define soap_getindependent(s) (0)
# define soap_putindependent(s) (0)
# define soap_getelement(s, n) (n)
# define soap_putelement(s, p, t, i, n) (0)
# define soap_markelement(s, p, n) (0)
#endif
@@ -2240,7 +2355,6 @@ typedef void soap_walker(struct soap*, void*, int, const char*, const char*);
SOAP_FMAC5 int SOAP_FMAC6 soap_serve(struct soap *soap);
SOAP_FMAC5 int SOAP_FMAC6 soap_serve_request(struct soap *soap);
#ifndef WITH_NOGLOBAL
SOAP_FMAC3 void SOAP_FMAC4 soap_header(struct soap*);
SOAP_FMAC3 void SOAP_FMAC4 soap_fault(struct soap*);
SOAP_FMAC3 const char** SOAP_FMAC4 soap_faultcode(struct soap*);
@@ -2250,7 +2364,6 @@ SOAP_FMAC3 const char** SOAP_FMAC4 soap_faultdetail(struct soap*);
SOAP_FMAC3 const char* SOAP_FMAC4 soap_check_faultsubcode(struct soap*);
SOAP_FMAC3 const char* SOAP_FMAC4 soap_check_faultdetail(struct soap*);
SOAP_FMAC3 void SOAP_FMAC4 soap_serializefault(struct soap*);
#endif
SOAP_FMAC1 void SOAP_FMAC2 soap_serializeheader(struct soap*);
SOAP_FMAC1 int SOAP_FMAC2 soap_getheader(struct soap*);
@@ -2267,8 +2380,16 @@ SOAP_FMAC1 SOAP_SOCKET SOAP_FMAC2 soap_accept(struct soap*);
SOAP_FMAC1 int SOAP_FMAC2 soap_ssl_accept(struct soap*);
SOAP_FMAC1 const char * SOAP_FMAC2 soap_ssl_error(struct soap*, int);
SOAP_FMAC1 int SOAP_FMAC2 soap_ssl_server_context(struct soap*, unsigned short, const char*, const char*, const char*, const char*, const char*, const char*, const char*);
SOAP_FMAC1 int SOAP_FMAC2 soap_ssl_client_context(struct soap*, unsigned short, const char*, const char*, const char*, const char*, const char*);
#if defined(VXWORKS) && defined(WM_SECURE_KEY_STORAGE)
SOAP_FMAC1 int SOAP_FMAC2 soap_ssl_server_context(struct soap *soap, unsigned short flags, const char *keyfile, const char *keyid, const char *password, const char *cafile, const char *capath, const char *dhfile, const char *randfile, const char *sid);
#else
SOAP_FMAC1 int SOAP_FMAC2 soap_ssl_server_context(struct soap *soap, unsigned short flags, const char *keyfile, const char *password, const char *cafile, const char *capath, const char *dhfile, const char *randfile, const char *sid);
#endif
#if defined(VXWORKS) && defined(WM_SECURE_KEY_STORAGE)
SOAP_FMAC1 int SOAP_FMAC2 soap_ssl_client_context(struct soap *soap, unsigned short flags, const char *keyfile, const char *keyid, const char *password, const char *cafile, const char *capath, const char *randfile);
#else
SOAP_FMAC1 int SOAP_FMAC2 soap_ssl_client_context(struct soap *soap, unsigned short flags, const char *keyfile, const char *password, const char *cafile, const char *capath, const char *randfile);
#endif
SOAP_FMAC1 int SOAP_FMAC2 soap_puthttphdr(struct soap*, int status, size_t count);
@@ -2333,6 +2454,7 @@ SOAP_FMAC1 int SOAP_FMAC2 soap_begin_count(struct soap*);
SOAP_FMAC1 int SOAP_FMAC2 soap_end_count(struct soap*);
SOAP_FMAC1 int SOAP_FMAC2 soap_begin_send(struct soap*);
SOAP_FMAC1 int SOAP_FMAC2 soap_end_send(struct soap*);
SOAP_FMAC1 int SOAP_FMAC2 soap_end_send_flush(struct soap*);
SOAP_FMAC1 const struct soap_code_map* SOAP_FMAC2 soap_code(const struct soap_code_map*, const char*);
SOAP_FMAC1 long SOAP_FMAC2 soap_code_int(const struct soap_code_map*, const char*, long);
@@ -2385,6 +2507,7 @@ SOAP_FMAC1 struct soap *SOAP_FMAC2 soap_copy_context(struct soap*, const struct
SOAP_FMAC1 void SOAP_FMAC2 soap_copy_stream(struct soap*, struct soap*);
SOAP_FMAC1 void SOAP_FMAC2 soap_free_stream(struct soap*);
SOAP_FMAC1 void SOAP_FMAC2 soap_versioning(soap_init)(struct soap*, soap_mode, soap_mode);
SOAP_FMAC1 void SOAP_FMAC2 soap_initialize(struct soap*);
SOAP_FMAC1 void SOAP_FMAC2 soap_done(struct soap*);
SOAP_FMAC1 void SOAP_FMAC2 soap_cleanup(struct soap*);
SOAP_FMAC1 void SOAP_FMAC2 soap_begin(struct soap*);
@@ -2443,6 +2566,7 @@ SOAP_FMAC1 wchar_t* SOAP_FMAC2 soap_wstring_in(struct soap*, int, long, long);
SOAP_FMAC1 int SOAP_FMAC2 soap_match_namespace(struct soap*, const char *, const char*, size_t n1, size_t n2);
SOAP_FMAC1 void SOAP_FMAC2 soap_set_version(struct soap*, short);
SOAP_FMAC1 int SOAP_FMAC2 soap_set_namespaces(struct soap*, const struct Namespace*);
SOAP_FMAC1 void SOAP_FMAC2 soap_set_local_namespaces(struct soap*);
@@ -2467,9 +2591,9 @@ SOAP_FMAC1 void SOAP_FMAC2 soap_end_block(struct soap*, struct soap_blist*);
SOAP_FMAC1 void SOAP_FMAC2 soap_update_pointers(struct soap *soap, char *start, char *end, char *p1, char *p2);
SOAP_FMAC1 int SOAP_FMAC2 soap_envelope_begin_out(struct soap*);
SOAP_FMAC1 int soap_envelope_end_out(struct soap*);
SOAP_FMAC1 int SOAP_FMAC2 soap_envelope_end_out(struct soap*);
SOAP_FMAC1 char * SOAP_FMAC2 soap_get_http_body(struct soap*);
SOAP_FMAC1 char * SOAP_FMAC2 soap_get_http_body(struct soap*, size_t *len);
SOAP_FMAC1 int SOAP_FMAC2 soap_envelope_begin_in(struct soap*);
SOAP_FMAC1 int SOAP_FMAC2 soap_envelope_end_in(struct soap*);
@@ -2598,7 +2722,7 @@ SOAP_FMAC1 int SOAP_FMAC2 soap_outwliteral(struct soap*, const char *tag, wchar_
#ifndef WITH_LEANER
SOAP_FMAC1 int SOAP_FMAC2 soap_attachment(struct soap *, const char*, int, const void*, const struct soap_array*, const char*, const char*, const char*, int, const char*, int);
SOAP_FMAC1 int SOAP_FMAC2 soap_move(struct soap*, long);
SOAP_FMAC1 int SOAP_FMAC2 soap_move(struct soap*, size_t);
SOAP_FMAC1 size_t SOAP_FMAC2 soap_tell(struct soap*);
SOAP_FMAC1 char* SOAP_FMAC2 soap_dime_option(struct soap*, unsigned short, const char*);
SOAP_FMAC1 int SOAP_FMAC2 soap_getdimehdr(struct soap*);
@@ -2628,9 +2752,11 @@ SOAP_FMAC1 const char* SOAP_FMAC2 soap_attr_value(struct soap *soap, const char
SOAP_FMAC1 int SOAP_FMAC2 soap_set_attr(struct soap *soap, const char *name, const char *value, int flag);
SOAP_FMAC1 void SOAP_FMAC2 soap_clr_attr(struct soap *soap);
SOAP_FMAC1 const char* SOAP_FMAC2 soap_url(struct soap *soap, const char*, const char*);
SOAP_FMAC1 size_t SOAP_FMAC2 soap_encode_url(const char*, char*, size_t);
SOAP_FMAC1 const char* SOAP_FMAC2 soap_encode_url_string(struct soap*, const char*);
#ifdef WITH_COOKIES
SOAP_FMAC1 void SOAP_FMAC2 soap_getcookies(struct soap *soap, const char *val);
SOAP_FMAC1 size_t SOAP_FMAC2 soap_encode_cookie(const char*, char*, size_t);
SOAP_FMAC1 extern struct soap_cookie* SOAP_FMAC2 soap_set_cookie(struct soap*, const char*, const char*, const char*, const char*);
SOAP_FMAC1 extern struct soap_cookie* SOAP_FMAC2 soap_cookie(struct soap*, const char*, const char*, const char*);
SOAP_FMAC1 extern char* SOAP_FMAC2 soap_cookie_value(struct soap*, const char*, const char*, const char*);
sql/updates/world/2014_06_24_00_world_quest_template.sql
+1
View File
@@ -0,0 +1 @@
UPDATE `quest_template` SET `SpecialFlags`=2 WHERE `Id` IN (9611, 9625, 9678, 9713, 9926, 10299, 10344);
sql/updates/world/2014_06_24_01_world_misc.sql
+119
View File
@@ -0,0 +1,119 @@
-- Q: The Forgotten Tale (12291) & The Truth Shall Set Us Free (12301), & Frostmourne Cavern.
SET @Valonforth := 27476; -- Captain Luc Valonforth
SET @FPeasant := 27226; -- Forgotten Peasant -- Ya tiene SAI
SET @FFootman := 27229; -- Forgotten Footman -- Ya tiene SAI
SET @FCaptain := 27220; -- Forgotten Captain -- Ya tiene SAI
SET @FKnight := 27224; -- Forgotten Knight -- Ya tiene SAI
SET @FRifleman := 27225; -- Forgotten Rifleman -- Ya tiene SAI
SET @Emissary := 27492; -- Alliance Emissary
SET @PrinceArthas := 27455; -- Prince Arthas
SET @Muradin := 27480; -- Muradin
SET @OrbItem := 37577; -- Orik's Crystalline Orb (Item)
SET @AuraForgotten := 48864; -- Aura of the Forgotten
SET @OrikSpell := 48866; -- Orik's Song (Spell) -- Send Script Event (18014)
SET @ArthasSpell := 48882; -- Spirit Redeemed (Spell)
SET @ForgottenSoul := 27465; -- Forgotten Soul (npc)
SET @DespawnSoul := 48811; -- Despawn Forgotten Soul (Spell) -- Mata soul?
DELETE FROM creature_summon_groups WHERE `summonerId`=@Valonforth;
INSERT INTO `creature_summon_groups` (`summonerId`, `summonerType`, `groupId`, `entry`, `position_x`, `position_y`, `position_z`, `orientation`, `summonType`, `summonTime`) VALUES
(@Valonforth,0,1,@Ffootman,3093.6093,-1248.6965,10.7540,0.6420,3,42300),
(@Valonforth,0,1,@Ffootman,3091.3823,-1245.5709,10.4475,0.0712,3,42300),
(@Valonforth,0,1,@Ffootman,3089.9931,-1248.9025,10.5483,0.0712,3,42300),
(@Valonforth,0,1,@Ffootman,3088.4882,-1245.6225,10.3214,0.5183,3,42300),
(@Valonforth,0,1,@Ffootman,3086.1555,-1242.1805,10.3200,0.3025,3,42300),
(@Valonforth,0,1,@Ffootman,3101.2993,-1231.2617,10.2738,4.8548,3,42300),
(@Valonforth,0,1,@Ffootman,3096.5869,-1232.9973,9.9625,4.8965,3,42300),
(@Valonforth,0,1,@Ffootman,3092.5539,-1251.9555,11.0228,0.7564,3,42300),
(@Valonforth,0,1,@Ffootman,3089.5644,-1239.8127,10.3610,6.0050,3,42300),
(@Valonforth,0,1,@Ffootman,3095.2739,-1250.8770,10.9930,0.9054,3,42300),
(@Valonforth,0,1,@FRifleman,3089.7722,-1242.4241,10.3311,0.3176,3,110000),
(@Valonforth,0,1,@FRifleman,3099.4746,-1234.2282,10.0952,4.8548,3,110000),
(@Valonforth,0,1,@FKnight,3088.7661,-1237.4055,10.4127,0.1172,3,110000),
(@Valonforth,0,1,@FKnight,3094.5632,-1233.2812,9.9865,5.0920,3,110000),
(@Valonforth,0,1,@FCaptain,3085.7636,-1224.5657,12.4462,5.2552,3,110000),
(@Valonforth,0,1,@FCaptain,3083.3088,-1238.1966,10.9768,6.0426,3,110000),
(@Valonforth,0,1,@Emissary,3087.9968,-1223.3319,11.3495,6.0426,3,40000);
UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `id`=@THELZAN;
DELETE FROM event_scripts WHERE id IN (18014); -- Evento 'The Truth...'
INSERT INTO event_scripts VALUES
(18014,0,10,@Valonforth,90000,0,3100.3500,-1252.466,11.6589,2.165); -- Event The Truth...
UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (@Valonforth,@Emissary);
UPDATE `creature_template` SET `InhabitType`=1 WHERE `entry` IN (@MURADIN,@PrinceArthas);
DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`= @MURADIN AND `id`=2;
DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`= @PrinceArthas AND `id`=1;
DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`= @FCaptain AND `id`>2;
DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`= @FKnight AND `id`>14;
DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`= @FRifleman AND `id`>21;
DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (@Valonforth,@Emissary,@FFootman);
DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (@PrinceArthas*100+1,@MURADIN*100+2,@Emissary*100,@Valonforth*100);
INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
(@PrinceArthas,0,1,0,38,0,100,0,1,1,0,0,80,@PrinceArthas*100+1,2,0,0,0,0,1,0,0,0,0,0,0,0,'Prince Arthas - On dataset - Run script The Truth Shall Set...'),
(@MURADIN,0,2,0,38,0,100,0,2,1,0,0,80,@MURADIN*100+2,2,0,0,0,0,1,0,0,0,0,0,0,0,'Muradin - On dataset - Run script The Truth Shall Set...'),
(@Valonforth,0,0,1,54,0,100,0,0,0,0,0,107,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Valonforth - Just Spawned - Summon Group"),
(@Valonforth,0,1,0,61,0,100,0,0,0,0,0,80,@Valonforth*100,2,0,0,0,0,1,0,0,0,0,0,0,0,"Valonforth - Link - Run Script"),
(@Emissary,0,0,0,54,0,100,0,0,0,0,0,53,0,@Emissary,0,0,0,0,1,0,0,0,0,0,0,0,"Alliance Emissary - Just Spawned - Start Waypoint"),
(@Emissary,0,1,2,40,0,100,0,2,@Emissary,0,0,54,30000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Alliance Emissary - On reached WP2 - Pause Event'),
(@Emissary,0,2,0,61,0,100,0,0,0,0,0,80,@Emissary*100,2,0,0,0,0,1,0,0,0,0,0,0,0,'Alliance Emissary - Link - Run script'),
-- The Truth Shall Set Us Free - scripts
(@Valonforth*100,9,0,0,0,0,100,0,5000,5000,0,0,1,0,7000,0,0,0,0,1,0,0,0,0,0,0,0,"Valonforth - Script - Say 0"),
(@Valonforth*100,9,1,0,0,0,100,0,15500,15500,0,0,1,1,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Valonforth - Script - Say 1"),
(@Valonforth*100,9,2,0,0,0,100,0,13000,13000,0,0,1,2,8000,0,0,0,0,1,0,0,0,0,0,0,0,"Valonforth - Script - Say 2"),
(@Valonforth*100,9,3,0,0,0,100,0,12000,12000,0,0,1,3,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Valonforth - Script - Say 3"),
(@Emissary*100,9,0,0,0,0,100,0,3500,3500,0,0,1,0,8500,0,0,0,0,1,0,0,0,0,0,0,0,'Alliance Emissary - Script - Says 0'),
(@Emissary*100,9,1,0,0,0,100,0,13000,13000,0,0,1,1,9000,0,0,0,0,1,0,0,0,0,0,0,0,'Alliance Emissary - Script - Says 1'),
(@Emissary*100,9,2,0,0,0,100,0,7000,7000,0,0,69,0,0,0,0,0,0,8,0,0,0,3087.9968,-1223.3319,11.3495,0,'Alliance Emissary - Script - moveto'),
(@Emissary*100,9,3,0,0,0,100,0,6000,6000,0,0,45,3,1,0,0,0,0,11,@FFootman,30,0,0,0,0,0,"Alliance Emissary - Script - Set Data 3 1 Forgotten Footman"),
(@Emissary*100,9,4,0,0,0,100,0,0,0,0,0,12,@PrinceArthas,3,63000,0,0,0,8,0,0,0,3104.5910,-1226.6417,12.0252,4.4519,"Alliance Emissary - Script - Summon Prince Arthas"),
(@Emissary*100,9,5,0,0,0,100,0,0,0,0,0,12,@Muradin,3,63000,0,0,0,8,0,0,0,3105.9204,-1228.2515,11.6541,11.6541,"Alliance Emissary - Script - Summon Muradin"),
(@Emissary*100,9,6,0,0,0,100,0,0,0,0,0,45,1,1,0,0,0,0,11,@PrinceArthas,20,0,0,0,0,0,"Alliance Emissary - Script - Set Data 1 1 Prince Arthas"),
(@Emissary*100,9,7,0,0,0,100,0,0,0,0,0,45,2,1,0,0,0,0,11,@Muradin,20,0,0,0,0,0,"Alliance Emissary - Script - Set Data 2 1 Muradin"),
(@Emissary*100,9,8,0,0,0,100,0,0,0,0,0,41,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Alliance Emissary - Script - Despawn"),
(@PrinceArthas*100+1,9,0,0,0,0,100,0,0,0,0,0,69,0,0,0,0,0,0,8,0,0,0,3101.1733,-1238.0469,10.3770,0,'Prince Arthas - Script - moveto'),
(@PrinceArthas*100+1,9,1,0,0,0,100,0,2000,2000,0,0,1,0,9000,0,0,0,0,1,0,0,0,0,0,0,0,'Prince Arthas - Script - Says 0'),
(@PrinceArthas*100+1,9,2,0,0,0,100,0,14000,14000,0,0,1,1,11000,0,0,0,0,1,0,0,0,0,0,0,0,'Prince Arthas - Script - Says 1'),
(@PrinceArthas*100+1,9,3,0,0,0,100,0,15000,15000,0,0,1,2,6000,0,0,0,0,1,0,0,0,0,0,0,0,'Prince Arthas - Script - Says 2'),
(@PrinceArthas*100+1,9,4,0,0,0,100,0,18000,18000,0,0,1,3,3000,0,0,0,0,1,0,0,0,0,0,0,0,'Prince Arthas - Script - Says 3'),
(@PrinceArthas*100+1,9,5,0,0,0,100,0,11000,11000,0,0,11,@ArthasSpell,0,0,0,0,0,11,0,35,0,0,0,0,0,'Prince Arthas - Script - Cast Spirit Redeemed'),
(@Muradin*100+2,9,0,0,0,0,100,0,0,0,0,0,69,0,0,0,0,0,0,8,0,0,0,3103.4113,-1238.8131,10.6220,0,"Muradin - Script - Moveto"),
(@Muradin*100+2,9,1,0,0,0,100,0,28000,28000,0,0,1,0,2500,0,0,0,0,1,0,0,0,0,0,0,0,'Muradin - Script - Says 0'),
(@Muradin*100+2,9,2,0,0,0,100,0,10000,10000,0,0,1,1,10000,0,0,0,0,1,0,0,0,0,0,0,0,'Muradin - Script - Says 1'),
-- The Forgotten Tale & normal SAI
-- Forgottens: Captain
(@FCaptain,0,3,4,8,0,100,0,@ArthasSpell,0,0,0,3,27465,0,0,0,0,0,1,0,0,0,0,0,0,0,'Forgotten Captain - Spell Hit - Morph to Forgotten Soul'),
(@FCaptain,0,4,0,61,0,100,0,0,0,0,0,37,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Forgotten Captain - Link - Die'),
-- Knight
(@FKnight,0,15,16,8,0,100,0,@ArthasSpell,0,0,0,3,27465,0,0,0,0,0,1,0,0,0,0,0,0,0,'Forgotten Knight - Spell Hit - Morph to Forgotten Soul'),
(@FKnight,0,16,0,61,0,100,0,0,0,0,0,51,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Forgotten Knight - Link - Die'),
-- Rifleman
(@FRifleman,0,22,23,8,0,100,0,@ArthasSpell,0,0,0,3,27465,0,0,0,0,0,1,0,0,0,0,0,0,0,'Forgotten Rifleman - Morph to Forgotten Soul'),
(@FRifleman,0,23,0,61,0,100,0,0,0,0,0,51,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Forgotten Rifleman - Link - Die'),
-- Footman
(@FFootman,0,0,1,62,0,100,0,9545,0,0,0,33,27474,0,0,0,0,0,21,10,0,0,0,0,0,0,'Forgotten Footman - On gossip option select quest credit'), -- deberia Cast 48832
(@FFootman,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Forgotten Footman - Close Gossip'),
(@FFootman,0,2,0,23,0,100,0,48143,0,0,0,11,48143,0,0,0,0,0,1,0,0,0,0,0,0,0,'Forgotten Footman - Add Forgotten Aura if missing'),
(@FFootman,0,3,0,0,0,100,0,3000,7000,9000,12000,11,32587,0,0,0,0,0,2,0,0,0,0,0,0,0,'Forgotten Footman - Cast Shield Block'),
(@FFootman,0,4,0,38,0,100,0,3,1,0,0,53,1,@FFootman,0,0,0,0,1,0,0,0,0,0,0,0,"Forgotten Footman - On Data set 3 1 - Start Waypoint");
DELETE FROM `creature_text` WHERE `entry` IN (@Valonforth,@Emissary);
INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`, `BroadcastTextID`) VALUES
(27492, 1, 0, 'That\'s correct. My men report that the roads from here to the shore are held by the undead. You\'ll need to find an alternate route back to your ships.', 12, 0, 100, 378, 4000, 12724, 'Alliance Emissary 1 - Q: The Truth Shall Set Us Free', 26712),
(27492, 0, 0, 'By royal edict, you men are to return to Lordaeron immediately. Lord Uther has convinced the king to recall this expedition.', 12, 0, 100, 25, 3500, 12723, 'Alliance Emissary 0 - Q: The Truth Shall Set Us Free', 26710),
(27476, 2, 0, 'To hell with the undead! We\'ll cut our way through the woods, men!', 12, 0, 100, 22, 3000, 12721, 'Valonforth 2 - Q: The Truth Shall Set Us Free', 26713),
(27476, 3, 0, 'Well, milord, your father had our troops recalled at Lord Uther\'s request.', 12, 0, 100, 1, 3000, 12722, 'Valonforth 3 - Q: The Truth Shall Set Us Free', 26715),
(27476, 0, 0, 'I apologize, emissary, but the prince is away on an errand. Wha brings you to this desolate place?', 12, 0, 100, 1, 3000, 12719, 'Valonforth 0 - Q: The Truth Shall Set Us Free', 26709),
(27476, 1, 0, 'We\'re to just pick up and leave?', 12, 0, 100, 6, 1500, 12720, 'Valonforth 1 - Q: The Truth Shall Set Us Free', 26711);
DELETE FROM `waypoints` WHERE entry IN (@Emissary,@FFootman);
INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
(@Emissary,1,3087.9968,-1223.3319,11.3495,'Emissary Spawn - Q: The Truth Shall Set Us Free'),
(@Emissary,2,3094.6638,-1241.1671,10.3504,'Emissary Talk - Q: The Truth Shall Set Us Free'),
(@Emissary,3,3087.9968,-1223.3319,11.3495,'Emissary Despawn - Q: The Truth Shall Set Us Free'),
(@FFootman,1,3061.2832,-1241.4072,11.5542,'Forgotten Footman Runaway - Q: The Truth Shall Set Us Free');
UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid` IN (5082,5083,5084) AND `source_type`=2 AND `id`=0 AND `link`=1;
UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=-126866 AND `source_type`=0 AND `id`=15 AND `link`=29;
sql/updates/world/2014_06_24_02_world_misc.sql
+19
View File
@@ -0,0 +1,19 @@
--
UPDATE `creature_template` SET `ainame`='SmartAI' WHERE `entry` IN (24786,24797);
DELETE FROM `smart_scripts` WHERE `entryorguid` IN (24786,24797) AND `source_type`=0;
INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
(24786, 0, 0, 1, 8, 0, 100, 0, 44454, 0, 0, 0, 29, 0, 0, 24797, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Reef Bull - On Spell Hit - Follow Invoker'),
(24786, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Reef Bull - Link - Store Target List'),
(24786, 0, 2, 3, 65, 0, 100, 0, 0, 0, 0, 0, 11, 52148, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Reef Bull - On Follow Complete - Cast 52148'),
(24786, 0, 3, 4, 61, 0, 100, 0, 0, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 19, 24797, 10, 0, 0, 0, 0, 0, 'Reef Bull - Link With Event 1 - Follow Reef Cow'),
(24786, 0, 4, 5, 61, 0, 100, 0, 0, 0, 0, 0, 45, 0, 1, 0, 0, 0, 0, 19, 24797, 10, 0, 0, 0, 0, 0, 'Reef Bull - Link With Event 2 - Set Data 0 1'),
(24786, 0, 5, 0, 61, 0, 100, 0, 0, 0, 0, 0, 15, 11472, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 'Reef Bull -Link With Event 3 - Give Quest Credit'),
(24797, 0, 0, 1, 38, 0, 100, 0, 0, 1, 0, 0, 11, 52148, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Reef Cow - On Data Set 0 1 - Cast 52148'),
(24797, 0, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 19, 24786, 0, 0, 0, 0, 0, 0, 'Reef Cow - Link With Event 0 - Set orientation'),
(24797, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 41, 4200, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Reef Cow - Link With Event 2 - Despawn');
DELETE FROM `spell_scripts` WHERE `id`=21014;
INSERT INTO `spell_scripts` (`id`, `effIndex`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`) VALUES
(21014, 0, 0, 17, 34127, 1, 0, 0, 0, 0, 0);
sql/updates/world/2014_06_24_03_world_misc.sql
+37
View File
@@ -0,0 +1,37 @@
--
UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry` =26570;
UPDATE `creature` SET `spawndist`=20, `MovementType`=1 WHERE `id` =26570;
DELETE FROM `smart_scripts` WHERE `entryorguid` =26570;
INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
(26570, 0, 0, 1, 8, 0, 100, 0, 47214, 0, 0, 0, 11, 47208, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Famished Scourge Troll - On Spell Hit Burninate - Give Quest Credit'),
(26570, 0, 1, 2,61, 0, 100, 0, 0, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Famished Scourge Troll - Linked with Previous Event - Die'),
(26570, 0, 2, 0,61, 0, 100, 0, 0, 0, 0, 0, 41, 20000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Famished Scourge Troll - Linked with Previous Event - Despawn After 20 seconds'),
(26570, 0, 3, 0,11, 0, 100, 0, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Famished Scourge Troll - On Spawn - Set Run');
DELETE FROM `gossip_menu_option` WHERE `menu_id`=9416;
INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `OptionBroadcastTextID`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`, `BoxBroadcastTextID`) VALUES
(9416, 0, 0, 'I need some more of your fine grog, Mack.', 25821, 1, 1, 0, 0, 0, 0, '', 0);
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN(9416);
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
(15, 9416, 0, 0, 0, 9, 0, 12038, 0, 0, 0, 0, 0, '', 'Gossip Option requires Seared Scourge Taken'),
(15, 9416, 0, 0, 0, 2, 0, 35908, 1, 0, 1, 0, 0, '', 'Gossip Option requires Player does not have Macks Dark Grog'),
(15, 9416, 0, 0, 1, 9, 0, 12029, 0, 0, 0, 0, 0, '', 'Gossip Option requires Seared Scourge Taken'),
(15, 9416, 0, 0, 1, 2, 0, 35908, 1, 0, 1, 0, 0, '', 'Gossip Option requires Player does not have Macks Dark Grog');
UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN(26604);
DELETE FROM `smart_scripts` WHERE `entryorguid` IN(26604) AND `source_type`=0;
INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
(26604,0,0,1,62,0,100,0,9416,0,0,0,85,47244,2,0,0,0,0,7,0,0,0,0,0,0,0,'Mack Fearsen - On Gossip Option 0 Selected - Invoker cast Create Macks Dark Grog'),
(26604,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Mack Fearsen - Link - Close Gossip'),
(26604,0,2,0,1,0,100,0,10000,10000,90000,90000,1,0,10000,0,0,0,0,1,0,0,0,0,0,0,0,'Mack Fearsen - On OOC LOS - Say Line 0'),
(26604,0,3,0,52,0,100,0,0,26604,0,0,1,1,10000,0,0,0,0,1,0,0,0,0,0,0,0,'Mack Fearsen - On Text Over line 0 - Say Line 1'),
(26604,0,4,0,52,0,100,0,1,26604,0,0,1,2,10000,0,0,0,0,1,0,0,0,0,0,0,0,'Mack Fearsen - On Text Over line 1 - Say Line 2');
DELETE FROM `creature_text` WHERE `entry`=26604;
INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`, `BroadcastTextID`) VALUES
(26604, 0, 0, 'Shcourged trooolls roashting....', 12, 0, 100, 0, 0, 0, 'Mack Fearsen', 27290),
(26604, 1, 0, '...on an open fire.....', 12, 0, 100, 0, 0, 0, 'Mack Fearsen', 27291),
(26604, 2, 0, 'That''s it! Far as I got... Whatd''ya think?', 12, 0, 100, 0, 0, 0, 'Mack Fearsen', 27292);
sql/updates/world/2014_06_24_04_world_misc.sql
+46
View File
@@ -0,0 +1,46 @@
--
UPDATE `creature` SET `spawntimesecs`=300 WHERE `guid`=86749;
UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`= 21057;
DELETE FROM `smart_scripts` WHERE `entryorguid`=21057;
INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
(21057, 0, 0, 1,38, 0, 100, 0, 1, 1, 45000, 45000, 45, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Nexus-Prince Razaan - On Data Set 1 1 - Set Data 10'),
(21057, 0, 1, 2,61, 0, 100, 0, 0, 0, 0, 0, 19, 756, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Nexus-Prince Razaan - Linked with Previous Event - Remove unit flags'),
(21057, 0, 2, 3,61, 0, 100, 0, 0, 0, 0, 0, 47, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Nexus-Prince Razaan - Linked with Previous Event - Set Visible'),
(21057, 0, 3, 0,61, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Nexus-Prince Razaan - Linked with Previous Event - Say'),
(21057, 0, 4, 5,25, 0, 100, 0, 0, 0, 0, 0, 18, 756, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Nexus-Prince Razaan - On spawn - Add unit flags'),
(21057, 0, 5, 0,61, 0, 100, 0, 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Nexus-Prince Razaan - Linked with Previous Event - Set Invisible'),
(21057, 0, 6, 7,21, 0, 100, 0, 0, 0, 0, 0, 18, 756, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Nexus-Prince Razaan - On Creature reached home - Add unit flags'),
(21057, 0, 7, 0,61, 0, 100, 0, 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Nexus-Prince Razaan - Linked with Previous Event - Set Invisible'),
(21057, 0, 8, 0,9, 0, 100, 0, 0, 8, 8000, 11000, 11, 35924, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Nexus-Prince Razaan - On Range - Cast Energy Flux'),
(21057, 0, 9, 10,6, 0, 100, 0, 0, 0, 0, 0, 11, 37957, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Nexus-Prince Razaan - On Death - Spawn Collection of Souls');
UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`= 20609;
DELETE FROM `smart_scripts` WHERE `entryorguid`=20609;
INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
(20609, 0, 0, 0, 0, 0, 100 , 0, 0, 0, 8000, 11000, 85, 36513, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Razaani Nexus Stalker - IC - Cast Intangible Presence'),
(20609, 0, 1, 0, 9, 0, 100 , 0, 0, 10, 6000, 10000, 11, 11975, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Razaani Nexus Stalker - On Range - Cast Arcane Explosion'),
(20609, 0, 2, 0, 6, 0, 25 , 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 10, 86749, 21057, 0, 0, 0, 0, 0, 'Razaani Nexus Stalker - On Death - Set Data on Nexus-Prince Razaan');
UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`= 20614;
DELETE FROM `smart_scripts` WHERE `entryorguid`=20614;
INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
(20614, 0, 0, 0, 9, 0, 100 , 0, 0, 8, 5000, 8000, 11, 36508, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Razaani Spell-Thief - On Range - Cast Arcane Explosion'),
(20614, 0, 1, 0, 6, 0, 25 , 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 10, 86749, 21057, 0, 0, 0, 0, 0, 'Razaani Spell-Thief - On Death - Set Data on Nexus-Prince Razaan');
UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`= 20601;
DELETE FROM `smart_scripts` WHERE `entryorguid`=20601;
INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
(20601, 0, 0, 0, 9, 0, 100 , 0, 0,10, 5000, 8000, 11, 35922, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Razaani Raider - On Range - Cast Energy Flare'),
(20601, 0, 1, 0, 0, 0, 100 , 0, 0,5000, 8000, 15000, 11, 32920, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Razaani Raider - IC - Cast Warp'),
(20601, 0, 2, 0, 6, 0, 25 , 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 10, 86749, 21057, 0, 0, 0, 0, 0, 'Razaani Raider - On Death - Set Data on Nexus-Prince Razaan');
DELETE FROM `creature_text` WHERE `entry` =21057;
INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`, `BroadcastTextID`) VALUES (21057, 0, 0, 'Who dares to interrupt my operation?', 14, 0, 100, 0, 0, 0, 'Nexus-Prince Razaan', 18714);
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=21057;
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
(22, 1, 21057, 0, 0, 36, 1, 0, 0, 0, 0, 0, '','Only execute SAI if Nexus-Prince Razaan alive');
src/server/game/Spells/Auras/SpellAuras.cpp
+11 -19
View File
@@ -703,21 +703,12 @@ void Aura::Update(uint32 diff, Unit* caster)
if (int32(caster->GetHealth()) > manaPerSecond)
caster->ModifyHealth(-manaPerSecond);
else
{
Remove();
return;
}
}
else if (int32(caster->GetPower(powertype)) >= manaPerSecond)
caster->ModifyPower(powertype, -manaPerSecond);
else
{
if (int32(caster->GetPower(powertype)) >= manaPerSecond)
caster->ModifyPower(powertype, -manaPerSecond);
else
{
Remove();
return;
}
}
Remove();
}
}
}
@@ -743,17 +734,17 @@ int32 Aura::CalcMaxDuration(Unit* caster) const
// IsPermanent() checks max duration (which we are supposed to calculate here)
if (maxDuration != -1 && modOwner)
modOwner->ApplySpellMod(GetId(), SPELLMOD_DURATION, maxDuration);
return maxDuration;
}
void Aura::SetDuration(int32 duration, bool withMods)
{
if (withMods)
{
if (Unit* caster = GetCaster())
if (Player* modOwner = caster->GetSpellModOwner())
modOwner->ApplySpellMod(GetId(), SPELLMOD_DURATION, duration);
}
m_duration = duration;
SetNeedClientUpdateForTargets();
}
@@ -808,6 +799,7 @@ void Aura::SetCharges(uint8 charges)
{
if (m_procCharges == charges)
return;
m_procCharges = charges;
m_isUsingCharges = m_procCharges != 0;
SetNeedClientUpdateForTargets();
@@ -822,6 +814,7 @@ uint8 Aura::CalcMaxCharges(Unit* caster) const
if (caster)
if (Player* modOwner = caster->GetSpellModOwner())
modOwner->ApplySpellMod(GetId(), SPELLMOD_CHARGES, maxProcCharges);
return uint8(maxProcCharges);
}
@@ -844,6 +837,7 @@ bool Aura::ModCharges(int32 num, AuraRemoveMode removeMode)
SetCharges(charges);
}
return false;
}
@@ -912,6 +906,7 @@ bool Aura::ModStackAmount(int32 num, AuraRemoveMode removeMode)
if (SpellModifier* mod = aurEff->GetSpellModifier())
mod->charges = GetCharges();
}
SetNeedClientUpdateForTargets();
return false;
}
@@ -927,10 +922,8 @@ bool Aura::HasMoreThanOneEffectForType(AuraType auraType) const
{
uint32 count = 0;
for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i)
{
if (HasEffect(i) && GetSpellInfo()->Effects[i].ApplyAuraName == auraType)
if (HasEffect(i) && AuraType(GetSpellInfo()->Effects[i].ApplyAuraName) == auraType)
++count;
}
return count > 1;
}
@@ -938,10 +931,9 @@ bool Aura::HasMoreThanOneEffectForType(AuraType auraType) const
bool Aura::IsArea() const
{
for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
{
if (HasEffect(i) && GetSpellInfo()->Effects[i].IsAreaAuraEffect())
return true;
}
return false;
}
src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
-100
View File
@@ -129,106 +129,6 @@ class npc_risen_husk_spirit : public CreatureScript
}
};
/*######
## npc_theramor_guard
######*/
enum TheramoreGuard
{
QUEST_DISCREDITING_THE_DESERTERS = 11133,
NPC_THERAMORE_GUARD = 4979,
SPELL_DOCTORED_LEAFLET = 42725,
SPELL_PROPAGANDIZED = 42246,
SAY_QUEST1 = 0,
SAY_QUEST2 = 1,
SAY_QUEST3 = 2
};
#define GOSSIP_ITEM_THERAMORE_GUARD "You look like an intelligent person. Why don't you read one of these leaflets and give it some thought?"
class npc_theramore_guard : public CreatureScript
{
public:
npc_theramore_guard() : CreatureScript("npc_theramore_guard") { }
bool OnGossipHello(Player* player, Creature* creature) override
{
if (player->GetQuestStatus(QUEST_DISCREDITING_THE_DESERTERS) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_THERAMORE_GUARD, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO);
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true;
}
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override
{
player->PlayerTalkClass->ClearMenus();
if (action == GOSSIP_SENDER_INFO)
{
player->CLOSE_GOSSIP_MENU();
player->KilledMonsterCredit(NPC_THERAMORE_GUARD, 0);
creature->AI()->Talk(SAY_QUEST1);
creature->CastSpell(creature, SPELL_DOCTORED_LEAFLET, false);
creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
CAST_AI(npc_theramore_guard::npc_theramore_guardAI, creature->AI())->YellTimer = 4000;
CAST_AI(npc_theramore_guard::npc_theramore_guardAI, creature->AI())->bYellTimer = true;
}
return true;
}
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_theramore_guardAI(creature);
}
struct npc_theramore_guardAI : public ScriptedAI
{
npc_theramore_guardAI(Creature* creature) : ScriptedAI(creature) { }
uint32 YellTimer;
uint32 Step;
bool bYellTimer;
void Reset() override
{
bYellTimer = false;
Step = 0;
}
void UpdateAI(uint32 Diff) override
{
if (!me->HasAura(SPELL_PROPAGANDIZED))
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
if (bYellTimer && YellTimer <= Diff)
{
switch (Step)
{
case 0:
Talk(SAY_QUEST2);
YellTimer = 3000;
++Step;
break;
case 1:
Talk(SAY_QUEST3);
me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH);
Step = 0;
bYellTimer = false;
break;
}
}
else
YellTimer -= Diff;
}
};
};
/*######
## npc_lady_jaina_proudmoore
######*/
src/server/scripts/World/action_ip_logger.cpp
+12 -12
View File
@@ -49,39 +49,39 @@ class AccountActionIpLogger : public AccountScript
// We log last_ip instead of last_attempt_ip, as login was successful
// ACCOUNT_LOGIN = 0
void OnAccountLogin(uint32 accountId)
void OnAccountLogin(uint32 accountId) override
{
AccountIPLogAction(accountId, ACCOUNT_LOGIN);
}
// We log last_attempt_ip instead of last_ip, as failed login doesn't necessarily mean approperiate user
// ACCOUNT_FAIL_LOGIN = 1
void OnFailedAccountLogin(uint32 accountId)
void OnFailedAccountLogin(uint32 accountId) override
{
AccountIPLogAction(accountId, ACCOUNT_FAIL_LOGIN);
}
// ACCOUNT_CHANGE_PW = 2
void OnPasswordChange(uint32 accountId)
void OnPasswordChange(uint32 accountId) override
{
AccountIPLogAction(accountId, ACCOUNT_CHANGE_PW);
}
// ACCOUNT_CHANGE_PW_FAIL = 3
void OnFailedPasswordChange(uint32 accountId)
void OnFailedPasswordChange(uint32 accountId) override
{
AccountIPLogAction(accountId, ACCOUNT_CHANGE_PW_FAIL);
}
// Registration Email can NOT be changed apart from GM level users. Thus, we do not require to log them...
// ACCOUNT_CHANGE_EMAIL = 4
void OnEmailChange(uint32 accountId)
// ACCOUNT_CHANGE_EMAIL = 4
void OnEmailChange(uint32 accountId) override
{
AccountIPLogAction(accountId, ACCOUNT_CHANGE_EMAIL); // ... they get logged by gm command logger anyway
}
// ACCOUNT_CHANGE_EMAIL_FAIL = 5
void OnFailedEmailChange(uint32 accountId)
void OnFailedEmailChange(uint32 accountId) override
{
AccountIPLogAction(accountId, ACCOUNT_CHANGE_EMAIL_FAIL);
}
@@ -168,19 +168,19 @@ class CharacterActionIpLogger : public PlayerScript
CharacterActionIpLogger() : PlayerScript("CharacterActionIpLogger") { }
// CHARACTER_CREATE = 7
void OnCreate(Player* player)
void OnCreate(Player* player) override
{
CharacterIPLogAction(player, CHARACTER_CREATE);
}
// CHARACTER_LOGIN = 8
void OnLogin(Player* player, bool /*firstLogin*/)
void OnLogin(Player* player, bool /*firstLogin*/) override
{
CharacterIPLogAction(player, CHARACTER_LOGIN);
}
// CHARACTER_LOGOUT = 9
void OnLogout(Player* player)
void OnLogout(Player* player) override
{
CharacterIPLogAction(player, CHARACTER_LOGOUT);
}
@@ -252,13 +252,13 @@ public:
CharacterDeleteActionIpLogger() : PlayerScript("CharacterDeleteActionIpLogger") { }
// CHARACTER_DELETE = 10
void OnDelete(uint64 guid, uint32 accountId)
void OnDelete(uint64 guid, uint32 accountId) override
{
DeleteIPLogAction(guid, accountId, CHARACTER_DELETE);
}
// CHARACTER_FAILED_DELETE = 11
void OnFailedDelete(uint64 guid, uint32 accountId)
void OnFailedDelete(uint64 guid, uint32 accountId) override
{
DeleteIPLogAction(guid, accountId, CHARACTER_FAILED_DELETE);
}
src/server/shared/Debugging/WheatyExceptionReport.cpp
+1 -1
View File
@@ -877,7 +877,7 @@ unsigned nestingLevel,
DWORD_PTR offset,
bool & bHandled,
const char* Name,
char* suffix,
char* /*suffix*/,
bool newSymbol,
bool logChildren)
{