mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-24 19:37:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Sync] Some minor cross project sync

Browse source
This commit is contained in:
Antz 2020-01-09 08:30:20 +00:00
parent 4f8b995d89
commit 49fe617b55
16 changed files with 212 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/shared/Auth/AuthCrypt.h
View file

@ -49,11 +49,12 @@ class AuthCrypt
*/
~AuthCrypt();
/**
* @brief
*
*/
void Init(BigNumber* K);
* @brief
*
*/
void Init(BigNumber* K);
/**
* @brief
*

4
src/shared/Database/DatabaseMysql.cpp
View file

@ -66,7 +66,9 @@ DatabaseMysql::~DatabaseMysql()
// Free Mysql library pointers for last ~DB
if (--db_count == 0)
{ mysql_library_end(); }
{
mysql_library_end();
}
}
SqlConnection* DatabaseMysql::CreateConnection()

6
src/shared/Database/SQLStorageImpl.h
View file

@ -274,7 +274,6 @@ void SQLStorageLoaderBase<DerivedLoader, StorageClass>::Load(StorageClass& store
return;
}
// sLog.outErrorDb("Total # of fields in database: %u - total # of expected fields %u", result->GetFieldCount(), store.GetSrcFieldCount());
if (store.GetSrcFieldCount() != result->GetFieldCount())
{
recordCount = 0;
@ -373,13 +372,10 @@ void SQLStorageLoaderBase<DerivedLoader, StorageClass>::Load(StorageClass& store
}
++y;
}
// check on the contents of the fields
// sLog.outErrorDb("Entry: %u - InhabitType %u - NPC Flags %u - Unit Flags %u", (*result)[0].GetUInt32(), (*result)[18].GetUInt32(), (*result)[21].GetUInt32(), (*result)[22].GetUInt32());
}
while (result->NextRow());
delete result;
}
}
#endif

3
src/shared/LockedQueue/LockedQueue.h
View file

@ -41,11 +41,8 @@ namespace ACE_Based
class LockedQueue
{
LockType _lock; /**< Lock access to the queue. */
StorageType _queue; /**< Storage backing the queue. */
/*volatile*/ bool _canceled; /**< Cancellation flag. */
public:
/**

38
src/shared/Log/Log.cpp
View file

@ -118,27 +118,21 @@ void Log::SetColor(bool stdout_stream, Color color)
static WORD WinColorFG[Color_count] =
{
0, // BLACK
FOREGROUND_RED, // RED
FOREGROUND_GREEN, // GREEN
FOREGROUND_RED | FOREGROUND_GREEN, // BROWN
FOREGROUND_BLUE, // BLUE
FOREGROUND_RED | FOREGROUND_BLUE, // MAGENTA
FOREGROUND_GREEN | FOREGROUND_BLUE, // CYAN
FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE,// WHITE
// YELLOW
FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY,
// RED_BOLD
FOREGROUND_RED | FOREGROUND_INTENSITY,
// GREEN_BOLD
FOREGROUND_GREEN | FOREGROUND_INTENSITY,
FOREGROUND_BLUE | FOREGROUND_INTENSITY, // BLUE_BOLD
// MAGENTA_BOLD
FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
// CYAN_BOLD
FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
// WHITE_BOLD
FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY
0, // BLACK
FOREGROUND_RED, // RED
FOREGROUND_GREEN, // GREEN
FOREGROUND_RED | FOREGROUND_GREEN, // BROWN
FOREGROUND_BLUE, // BLUE
FOREGROUND_RED | FOREGROUND_BLUE, // MAGENTA
FOREGROUND_GREEN | FOREGROUND_BLUE, // CYAN
FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE, // WHITE
FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY, // YELLOW
FOREGROUND_RED | FOREGROUND_INTENSITY, // RED_BOLD
FOREGROUND_GREEN | FOREGROUND_INTENSITY, // GREEN_BOLD
FOREGROUND_BLUE | FOREGROUND_INTENSITY, // BLUE_BOLD
FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY, // MAGENTA_BOLD
FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY, // CYAN_BOLD
FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY // WHITE_BOLD
};
HANDLE hConsole = GetStdHandle(stdout_stream ? STD_OUTPUT_HANDLE : STD_ERROR_HANDLE);
@ -779,6 +773,7 @@ void Log::outDetail(const char* str, ...)
void Log::outDebug(const char* str, ...)
{
#ifdef MANGOS_DEBUG
if (!str)
{ return; }
@ -815,6 +810,7 @@ void Log::outDebug(const char* str, ...)
}
fflush(stdout);
#endif
}
void Log::outCommand(uint32 account, const char* str, ...)

9
src/shared/Log/Log.h
View file

@ -495,17 +495,22 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th
sLog.outDetail(__VA_ARGS__); \
} while(0)
#define DEBUG_LOG(...) \
#ifdef MANGOS_DEBUG
#define DEBUG_LOG(...) \
do { \
if (sLog.HasLogLevelOrHigher(LOG_LVL_DEBUG)) \
sLog.outDebug(__VA_ARGS__); \
} while(0)
#define DEBUG_FILTER_LOG(F,...) \
#define DEBUG_FILTER_LOG(F,...) \
do { \
if (sLog.HasLogLevelOrHigher(LOG_LVL_DEBUG) && !sLog.HasLogFilter(F)) \
sLog.outDebug(__VA_ARGS__); \
} while(0)
#else
#define DEBUG_LOG(...)
#define DEBUG_FILTER_LOG(F,...)
#endif
#define ERROR_DB_FILTER_LOG(F,...) \
do { \

2
src/shared/SystemConfig.h.in
View file

@ -2,7 +2,7 @@
* MaNGOS is a full featured server for World of Warcraft, supporting
* the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
*
* Copyright (C) 2005-2019 MaNGOS project <https://getmangos.eu>
* Copyright (C) 2005-2020 MaNGOS <https://getmangos.eu>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

6
src/shared/Utilities/Errors.h
View file

@ -71,10 +71,6 @@
}
#endif
#ifdef MANGOS_DEBUG
# define MANGOS_ASSERT WPError
#else
# define MANGOS_ASSERT WPError // Error even if in release mode.
#endif
#define MANGOS_ASSERT WPError // Error even if in release mode.
#endif

1
src/shared/Utilities/Util.cpp
View file

@ -532,6 +532,7 @@ std::wstring GetMainPartOfName(std::wstring wname, uint32 declension)
return wname;
}
bool utf8ToConsole(const std::string& utf8str, std::string& conStr)
{
#if PLATFORM == PLATFORM_WINDOWS

2
src/shared/Utilities/Util.h
View file

@ -680,8 +680,10 @@ inline void wstrToLower(std::wstring& str)
std::transform(str.begin(), str.end(), str.begin(), wcharToLower);
}
std::wstring GetMainPartOfName(std::wstring wname, uint32 declension);
/**
* @brief
*