Skip to content

Commit

Permalink
Send guid 2 in SMSG_QUESTGIVER_QUEST_DETAILS if ActivateAccept disabled.
Browse files Browse the repository at this point in the history 
Fixed talentpoint calculation.
Some Cleanups.
  • Loading branch information
Fabian committed Jun 20, 2012
1 parent 5142498 commit fff52fc
Show file tree
Hide file tree
Showing 82 changed files with 8,192 additions and 8,186 deletions.
58 changes: 29 additions & 29 deletions dep/ACE_wrappers/ace/README
View file
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ ACE_HAS_PTHREADS_STD Platform supports POSIX.1c-1995 threads
ACE_HAS_PTHREADS_UNIX98_EXT Platform has the UNIX98 extensions to
Pthreads (rwlocks)
ACE_HAS_PTHREAD_ATTR_SETCREATESUSPEND_NP Platform has
pthread_attr_setcreatesuspend_np().
pthread_attr_setcreatesuspend_np().
ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP Platform has pthread_condattr_setkind_np().
ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP Platform has
pthread_mutexattr_setkind_np().
Expand Down Expand Up @@ -554,10 +554,10 @@ ACE_HAS_SIG_C_FUNC Compiler requires extern "C"
ACE_HAS_SIZET_SOCKET_LEN OS/compiler uses size_t *
rather than int * for socket
lengths
ACE_HAS_SOCKADDR_IN_SIN_LEN Platform has sin_len member in struct
sockaddr_in.
ACE_HAS_SOCKADDR_IN6_SIN_LEN Platform has sin6_len member in struct
sockaddr_in6.
ACE_HAS_SOCKADDR_IN_SIN_LEN Platform has sin_len member in struct
sockaddr_in.
ACE_HAS_SOCKADDR_IN6_SIN_LEN Platform has sin6_len member in struct
sockaddr_in6.
ACE_HAS_SOCKADDR_MSG_NAME Platform requires (struct
sockaddr *) for msg_name field
of struct msghdr.
Expand All @@ -581,13 +581,13 @@ ACE_HAS_STDCPP_STL_INCLUDES Standard C++ headers can be
ACE_HAS_STRBUF_T Compiler/platform supports
struct strbuf
ACE_HAS_STRDUP_EMULATION Use ACE's strdup() emulation (even
if platform has a native strdup()).
This is useful if you need control
over what memory allocator is used.
if platform has a native strdup()).
This is useful if you need control
over what memory allocator is used.
ACE_HAS_WCSDUP_EMULATION Use ACE's wcsdup() emulation (even
if platform has a native wcsdup()).
This is useful if you need control
over what memory allocator is used.
if platform has a native wcsdup()).
This is useful if you need control
over what memory allocator is used.
ACE_HAS_STRNLEN Platform supports strnlen(3).
ACE_HAS_STREAMS Platform supports STREAMS
ACE_HAS_STREAM_PIPES Platform supports STREAM pipes
Expand Down Expand Up @@ -713,9 +713,9 @@ ACE_HAS_VERSIONED_NAMESPACE Wrap all library code within a
ACE_VERSIONED_NAMESPACE_NAME
to desired name.
ACE_LACKS_INTMAX_T Platform lacks the intmax_t type
ACE_LACKS_UINTMAX_T Platform lacks the uintmax_t type.
ACE_LACKS_UINTMAX_T Platform lacks the uintmax_t type.
ACE_LACKS_INTPTR_T Platform lacks the intptr_t type
ACE_LACKS_UINTPTR_T Platform lacks the uintptr_t type.
ACE_LACKS_UINTPTR_T Platform lacks the uintptr_t type.

ACE_HAS_INT8_T Platform provides the int8_t type.
ACE_HAS_INT16_T Platform provides the int16_t type.
Expand Down Expand Up @@ -910,7 +910,7 @@ ACE_LACKS_MKTEMP Platform lacks the mktemp() function.
ACE_LACKS_MKTEMP_PROTOTYPE Platform/compiler lacks the
mktemp() prototype (e.g.,
LynxOS)
ACE_LACKS_MKSTEMP Platform lacks the mkstemp() function.
ACE_LACKS_MKSTEMP Platform lacks the mkstemp() function.
ACE_LACKS_MKSTEMP_PROTOTYPE Platform/compiler lacks the
mkstemp() prototype (e.g.,
LynxOS)
Expand Down Expand Up @@ -945,7 +945,7 @@ ACE_LACKS_NEW_H OS doesn't have, or we don't want to
use, new.h.
ACE_LACKS_NULL_PTHREAD_STATUS OS requires non-null status pointer
for ::pthread_join ().
ACE_LACKS_NUMERIC_LIMITS Platform lacks std::numeric_limits<>.
ACE_LACKS_NUMERIC_LIMITS Platform lacks std::numeric_limits<>.
ACE_LACKS_PERFECT_MULTICAST_FILTERING Platform lacks IGMPv3 "perfect" filtering
of multicast dgrams at the socket level.
If == 1, ACE_SOCK_Dgram_Mcast will bind
Expand Down Expand Up @@ -1017,9 +1017,9 @@ ACE_LACKS_SIGSET Platform lacks signal sets
(e.g., Chorus and Win32)
ACE_LACKS_STRPTIME Platform/compiler lacks the strptime()
function.
ACE_LACKS_WCSCHR Platform/compiler lacks wcschr()
ACE_LACKS_STRDUP Platform/compiler lacks strdup()
ACE_LACKS_WCSDUP Platform/compiler lacks wcsdup()
ACE_LACKS_WCSCHR Platform/compiler lacks wcschr()
ACE_LACKS_STRDUP Platform/compiler lacks strdup()
ACE_LACKS_WCSDUP Platform/compiler lacks wcsdup()
ACE_LACKS_STRRCHR Platform/compiler lacks strrchr()
ACE_LACKS_WCSRCHR Platform/compiler lacks wcsrchr()
ACE_LACKS_SWAB Platform/compiler lacks
Expand Down Expand Up @@ -1067,17 +1067,17 @@ ACE_LACKS_TELLDIR Platform uses ACE_HAS_DIRENT
ACE_LACKS_THREAD_STACK_SIZE Platform lacks
pthread_attr_setstacksize()
(e.g., Linux pthreads)
ACE_LACKS_THR_CONCURRENCY_FUNCS (ONLY APPLIES TO SOLARIS)
Platform does not support
thr_getconcurrency/thr_setconcurrency
functions, or their implementation
is effectively a "no-op". This
notably applies for Solaris >= 5.9.
Note that if you build on Solaris 8
and run on Solaris 9+, you can
encounter thread creation errors
unless you rebuild on the target
platform.
ACE_LACKS_THR_CONCURRENCY_FUNCS (ONLY APPLIES TO SOLARIS)
Platform does not support
thr_getconcurrency/thr_setconcurrency
functions, or their implementation
is effectively a "no-op". This
notably applies for Solaris >= 5.9.
Note that if you build on Solaris 8
and run on Solaris 9+, you can
encounter thread creation errors
unless you rebuild on the target
platform.
ACE_LACKS_TIMEDWAIT_PROTOTYPES MIT pthreads platform lacks
the timedwait prototypes
ACE_LACKS_TIMESPEC_T Platform does not define
Expand Down
44 changes: 22 additions & 22 deletions dep/include/g3dlite/G3D/AABox.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,46 +139,46 @@ class AABox {
*/
void split(const Vector3::Axis& axis, float location, AABox& low, AABox& high) const;

/**
Conservative culling test for up to 32 planes.
Returns true if there exists a <CODE>plane[p]</CODE> for
/**
Conservative culling test for up to 32 planes.
Returns true if there exists a <CODE>plane[p]</CODE> for
which the entire object is in the negative half space
(opposite the plane normal).
<CODE>testMask</CODE> and <CODE>childMask</CODE>
are used for optimizing bounding volume hierarchies.
<CODE>testMask</CODE> and <CODE>childMask</CODE>
are used for optimizing bounding volume hierarchies.
The version of this method that produces childMask
is slower than the version without; it should only
be used for parent nodes.
@param cullingPlaneIndex The index of the first plane for which
the entire object is in the negative half-space. The function
exits early when one plane is found. -1 when the function
returns false (i.e. when no plane culls the whole object).
@param cullingPlaneIndex The index of the first plane for which
the entire object is in the negative half-space. The function
exits early when one plane is found. -1 when the function
returns false (i.e. when no plane culls the whole object).
@param testMask If bit <I>p</I> is 0, the
bounding volume automatically passes the culling test for
<CODE>plane[p]</CODE> (i.e. it is known that the volume
is entirely within the positive half space). The function
@param testMask If bit <I>p</I> is 0, the
bounding volume automatically passes the culling test for
<CODE>plane[p]</CODE> (i.e. it is known that the volume
is entirely within the positive half space). The function
must return false if testMask is 0 and test all planes
when testMask is -1 (0xFFFFFFFF).
@param childMask Test mask for the children of this volume.
*/
bool culledBy(
const Array<Plane>& plane,
int32& cullingPlaneIndex,
const uint32 testMask,
*/
bool culledBy(
const Array<Plane>& plane,
int32& cullingPlaneIndex,
const uint32 testMask,
uint32& childMask) const;

/**
Conservative culling test that does not produce a mask for children.
*/
bool culledBy(
const Array<Plane>& plane,
int32& cullingPlaneIndex = dummy,
const uint32 testMask = 0xFFFFFFFF) const;
bool culledBy(
const Array<Plane>& plane,
int32& cullingPlaneIndex = dummy,
const uint32 testMask = 0xFFFFFFFF) const;

/** less than or equal to containment */
inline bool contains(const AABox& other) const {
Expand Down
6 changes: 3 additions & 3 deletions dep/include/g3dlite/G3D/Array.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,15 +224,15 @@ class Array {

/**
The array returned is only valid until the next append() or resize call, or
the Array is deallocated.
the Array is deallocated.
*/
T* getCArray() {
return data;
}

/**
The array returned is only valid until the next append() or resize call, or
the Array is deallocated.
the Array is deallocated.
*/
const T* getCArray() const {
return data;
Expand Down Expand Up @@ -310,7 +310,7 @@ class Array {
m_memoryManager->free(data);
// Set to 0 in case this Array is global and gets referenced during app exit
data = NULL;
num = 0;
num = 0;
numAllocated = 0;
}

Expand Down
18 changes: 9 additions & 9 deletions dep/include/g3dlite/G3D/Box.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@ class Box {

static Box inf();

Box(class BinaryInput& b);
Box(class BinaryInput& b);

Box(const class AABox& b);

void serialize(class BinaryOutput& b) const;
void deserialize(class BinaryInput& b);
void serialize(class BinaryOutput& b) const;
void deserialize(class BinaryInput& b);

/**
Returns the object to world transformation for
Expand Down Expand Up @@ -150,24 +150,24 @@ class Box {
Vector3& v3) const;


/**
/**
See AABox::culledBy
*/
*/
bool culledBy
(
const Array<Plane>& plane,
const Array<Plane>& plane,
int32& cullingPlaneIndex,
const uint32 testMask,
const uint32 testMask,
uint32& childMask) const;

/**
Conservative culling test that does not produce a mask for children.
*/
bool culledBy
(
const Array<Plane>& plane,
const Array<Plane>& plane,
int32& cullingPlaneIndex = dummy,
const uint32 testMask = -1) const;
const uint32 testMask = -1) const;

bool contains(
const Vector3& point) const;
Expand Down
Loading

0 comments on commit fff52fc

Please sign in to comment.