mirror of
https://github.com/mangosfour/server.git
synced 2025-12-26 07:37:02 +00:00
Merge commit 'origin/master' into 310 (at [7360])
This commit is contained in:
commit
ce8bd43bef
69 changed files with 2352 additions and 1751 deletions
|
|
@ -27,13 +27,13 @@ AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(sr
|
|||
noinst_LIBRARIES = libmangosauth.a
|
||||
|
||||
libmangosauth_a_SOURCES = \
|
||||
AuthCrypt.cpp \
|
||||
AuthCrypt.h \
|
||||
BigNumber.cpp \
|
||||
BigNumber.h \
|
||||
Hmac.cpp \
|
||||
Hmac.h \
|
||||
Sha1.cpp \
|
||||
Sha1.h \
|
||||
md5.c \
|
||||
md5.h
|
||||
AuthCrypt.cpp \
|
||||
AuthCrypt.h \
|
||||
BigNumber.cpp \
|
||||
BigNumber.h \
|
||||
Hmac.cpp \
|
||||
Hmac.h \
|
||||
Sha1.cpp \
|
||||
Sha1.h \
|
||||
md5.c \
|
||||
md5.h
|
||||
|
|
|
|||
|
|
@ -157,7 +157,8 @@ enum TimeConstants
|
|||
MINUTE = 60,
|
||||
HOUR = MINUTE*60,
|
||||
DAY = HOUR*24,
|
||||
MONTH = DAY*30
|
||||
MONTH = DAY*30,
|
||||
IN_MILISECONDS = 1000
|
||||
};
|
||||
|
||||
enum AccountTypes
|
||||
|
|
|
|||
|
|
@ -27,38 +27,38 @@ AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(sr
|
|||
noinst_LIBRARIES = libmangosdatabase.a
|
||||
|
||||
libmangosdatabase_a_SOURCES = \
|
||||
DBCStores.cpp \
|
||||
DBCStores.h \
|
||||
DBCStructure.h \
|
||||
DBCfmt.cpp \
|
||||
Database.cpp \
|
||||
Database.h \
|
||||
DatabaseEnv.h \
|
||||
DatabaseImpl.h \
|
||||
DatabaseMysql.cpp \
|
||||
DatabasePostgre.cpp \
|
||||
DatabaseMysql.h \
|
||||
DatabasePostgre.h \
|
||||
DatabaseSqlite.cpp \
|
||||
DatabaseSqlite.h \
|
||||
DBCEnums.h \
|
||||
Field.cpp \
|
||||
Field.h \
|
||||
MySQLDelayThread.h \
|
||||
PGSQLDelayThread.h \
|
||||
QueryResult.h \
|
||||
QueryResultMysql.cpp \
|
||||
QueryResultMysql.h \
|
||||
QueryResultPostgre.cpp \
|
||||
QueryResultPostgre.h \
|
||||
QueryResultSqlite.cpp \
|
||||
QueryResultSqlite.h \
|
||||
SQLStorage.cpp \
|
||||
SQLStorage.h \
|
||||
SQLStorageImpl.h \
|
||||
SqlDelayThread.cpp \
|
||||
SqlDelayThread.h \
|
||||
SqlOperations.cpp \
|
||||
SqlOperations.h \
|
||||
dbcfile.cpp \
|
||||
dbcfile.h
|
||||
DBCStores.cpp \
|
||||
DBCStores.h \
|
||||
DBCStructure.h \
|
||||
DBCfmt.cpp \
|
||||
Database.cpp \
|
||||
Database.h \
|
||||
DatabaseEnv.h \
|
||||
DatabaseImpl.h \
|
||||
DatabaseMysql.cpp \
|
||||
DatabasePostgre.cpp \
|
||||
DatabaseMysql.h \
|
||||
DatabasePostgre.h \
|
||||
DatabaseSqlite.cpp \
|
||||
DatabaseSqlite.h \
|
||||
DBCEnums.h \
|
||||
Field.cpp \
|
||||
Field.h \
|
||||
MySQLDelayThread.h \
|
||||
PGSQLDelayThread.h \
|
||||
QueryResult.h \
|
||||
QueryResultMysql.cpp \
|
||||
QueryResultMysql.h \
|
||||
QueryResultPostgre.cpp \
|
||||
QueryResultPostgre.h \
|
||||
QueryResultSqlite.cpp \
|
||||
QueryResultSqlite.h \
|
||||
SQLStorage.cpp \
|
||||
SQLStorage.h \
|
||||
SQLStorageImpl.h \
|
||||
SqlDelayThread.cpp \
|
||||
SqlDelayThread.h \
|
||||
SqlOperations.cpp \
|
||||
SqlOperations.h \
|
||||
dbcfile.cpp \
|
||||
dbcfile.h
|
||||
|
|
|
|||
|
|
@ -30,24 +30,24 @@ noinst_LIBRARIES = libmangosshared.a
|
|||
|
||||
# libmangosshared library will later be reused by ...
|
||||
libmangosshared_a_SOURCES = \
|
||||
Base.cpp \
|
||||
Base.h \
|
||||
ByteBuffer.h \
|
||||
Common.cpp \
|
||||
Common.h \
|
||||
Errors.h \
|
||||
Log.cpp \
|
||||
Log.h \
|
||||
MemoryLeaks.cpp \
|
||||
MemoryLeaks.h \
|
||||
ProgressBar.cpp \
|
||||
ProgressBar.h \
|
||||
Timer.h \
|
||||
Util.cpp \
|
||||
Util.h \
|
||||
WorldPacket.h \
|
||||
revision_nr.h \
|
||||
revision.h
|
||||
Base.cpp \
|
||||
Base.h \
|
||||
ByteBuffer.h \
|
||||
Common.cpp \
|
||||
Common.h \
|
||||
Errors.h \
|
||||
Log.cpp \
|
||||
Log.h \
|
||||
MemoryLeaks.cpp \
|
||||
MemoryLeaks.h \
|
||||
ProgressBar.cpp \
|
||||
ProgressBar.h \
|
||||
Timer.h \
|
||||
Util.cpp \
|
||||
Util.h \
|
||||
WorldPacket.h \
|
||||
revision_nr.h \
|
||||
revision.h
|
||||
|
||||
# Get revision (git or svn)
|
||||
REVISION_FILE = revision.h
|
||||
|
|
@ -63,16 +63,16 @@ $(REVISION_FILE) : $(top_builddir)/src/tools/genrevision/genrevision FORCE
|
|||
## Additional files to include when running 'make dist'
|
||||
# Disabled packet logger
|
||||
EXTRA_DIST = \
|
||||
PacketLog.cpp \
|
||||
PacketLog.h
|
||||
PacketLog.cpp \
|
||||
PacketLog.h
|
||||
|
||||
# System configuration
|
||||
EXTRA_DIST += \
|
||||
SystemConfig.h
|
||||
SystemConfig.h
|
||||
|
||||
# System Win32 files
|
||||
EXTRA_DIST += \
|
||||
ServiceWin32.cpp \
|
||||
ServiceWin32.h \
|
||||
WheatyExceptionReport.cpp \
|
||||
WheatyExceptionReport.h
|
||||
ServiceWin32.cpp \
|
||||
ServiceWin32.h \
|
||||
WheatyExceptionReport.cpp \
|
||||
WheatyExceptionReport.h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#ifndef __REVISION_NR_H__
|
||||
#define __REVISION_NR_H__
|
||||
#define REVISION_NR "7331"
|
||||
#define REVISION_NR "7360"
|
||||
#endif // __REVISION_NR_H__
|
||||
|
|
|
|||
|
|
@ -27,30 +27,30 @@ AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(sr
|
|||
noinst_LIBRARIES = libmangosvmaps.a
|
||||
|
||||
libmangosvmaps_a_SOURCES = \
|
||||
AABSPTree.h \
|
||||
BaseModel.cpp \
|
||||
BaseModel.h \
|
||||
CoordModelMapping.cpp \
|
||||
CoordModelMapping.h \
|
||||
DebugCmdLogger.cpp \
|
||||
DebugCmdLogger.h \
|
||||
IVMapManager.h \
|
||||
ManagedModelContainer.cpp \
|
||||
ManagedModelContainer.h \
|
||||
ModelContainer.cpp \
|
||||
ModelContainer.h \
|
||||
NodeValueAccess.h \
|
||||
ShortBox.h \
|
||||
ShortVector.h \
|
||||
SubModel.cpp \
|
||||
SubModel.h \
|
||||
TileAssembler.cpp \
|
||||
TileAssembler.h \
|
||||
TreeNode.cpp \
|
||||
TreeNode.h \
|
||||
VMapDefinitions.h \
|
||||
VMapFactory.cpp \
|
||||
VMapFactory.h \
|
||||
VMapManager.cpp \
|
||||
VMapManager.h \
|
||||
VMapTools.h
|
||||
AABSPTree.h \
|
||||
BaseModel.cpp \
|
||||
BaseModel.h \
|
||||
CoordModelMapping.cpp \
|
||||
CoordModelMapping.h \
|
||||
DebugCmdLogger.cpp \
|
||||
DebugCmdLogger.h \
|
||||
IVMapManager.h \
|
||||
ManagedModelContainer.cpp \
|
||||
ManagedModelContainer.h \
|
||||
ModelContainer.cpp \
|
||||
ModelContainer.h \
|
||||
NodeValueAccess.h \
|
||||
ShortBox.h \
|
||||
ShortVector.h \
|
||||
SubModel.cpp \
|
||||
SubModel.h \
|
||||
TileAssembler.cpp \
|
||||
TileAssembler.h \
|
||||
TreeNode.cpp \
|
||||
TreeNode.h \
|
||||
VMapDefinitions.h \
|
||||
VMapFactory.cpp \
|
||||
VMapFactory.h \
|
||||
VMapManager.cpp \
|
||||
VMapManager.h \
|
||||
VMapTools.h
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue