pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 14:41:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merc message removed.

Browse Source 
VLD removed, oops.
This commit is contained in:
SecretsOTheP 2013-03-20 04:02:33 -04:00
parent 5c76297e5f
commit 549455b3df
3 changed files with 1 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
zone/CMakeLists.txt
View File

@ -155,82 +155,12 @@ ADD_EXECUTABLE(zone ${zone_sources} ${zone_headers})
ADD_DEFINITIONS(-DZONE) ADD_DEFINITIONS(-DZONE)
TARGET_LINK_LIBRARIES(zone Common ${PERL_LIBRARY} debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE} ${ZLIB_LIBRARY} ${VLD_LIBRARY_VLD}) TARGET_LINK_LIBRARIES(zone Common ${PERL_LIBRARY} debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE} ${ZLIB_LIBRARY})
IF(MSVC) IF(MSVC)
SET_TARGET_PROPERTIES(zone PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") SET_TARGET_PROPERTIES(zone PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF")
TARGET_LINK_LIBRARIES(zone "Ws2_32.lib") TARGET_LINK_LIBRARIES(zone "Ws2_32.lib")
ENDIF(MSVC) ENDIF(MSVC)
SET(VLD_FOUND FALSE)
## VLD works only in Microsoft Visual Studio on Windows:
IF(WIN32)
IF(CMAKE_BUILD_TOOL MATCHES "(msdev|devenv)")
FIND_PATH(VLD_INCLUDE_DIR vld.h
$ENV{VLD_HOME}/include
$ENV{VLD_HOME}
"$ENV{ProgramFiles}/Microsoft Visual Studio .NET 2003/Vc7/include"
)
#MESSAGE("VLD_INCLUDE_DIR=${VLD_INCLUDE_DIR}")
## this is just required for runtim enabling/disabling:
FIND_PATH(VLD_INCLUDE_DIR_API vldapi.h
$ENV{VLD_HOME}/include
$ENV{VLD_HOME}
"$ENV{ProgramFiles}/Microsoft Visual Studio .NET 2003/Vc7/include"
)
#MESSAGE("VLD_INCLUDE_DIR_API=${VLD_INCLUDE_DIR}")
FIND_LIBRARY(VLD_LIBRARY_VLD
NAMES vld
PATHS
$ENV{VLD_HOME}/lib
$ENV{VLD_HOME}
"$ENV{ProgramFiles}/Microsoft Visual Studio .NET 2003/Vc7/lib"
DOC "Visual Leak Debugger multithreaded library"
)
#MESSAGE("VLD_LIBRARY_VLD=${VLD_LIBRARY_VLD}")
FIND_LIBRARY(VLD_LIBRARY_VLDMT
NAMES vldmt
PATHS
$ENV{VLD_HOME}/lib
$ENV{VLD_HOME}
"$ENV{ProgramFiles}/Microsoft Visual Studio .NET 2003/Vc7/lib"
DOC "Visual Leak Debugger multithreaded library"
)
#MESSAGE("VLD_LIBRARY_VLDMT=${VLD_LIBRARY_VLDMT}")
FIND_LIBRARY(VLD_LIBRARY_VLDMTDLL
NAMES vldmtdll
PATHS
$ENV{VLD_HOME}/lib
$ENV{VLD_HOME}
"$ENV{ProgramFiles}/Microsoft Visual Studio .NET 2003/Vc7/lib"
DOC "Visual Leak Debugger multithreaded library"
)
#MESSAGE("VLD_LIBRARY_VLDMTDLL=${VLD_LIBRARY_VLDMTDLL}")
IF(VLD_INCLUDE_DIR)
IF (VLD_LIBRARY_VLD OR VLD_LIBRARY_VLDMT OR VLD_LIBRARY_VLDMTDLL)
## do NOT add LIBRARIES because dependencies are handled through pragmas.
SET(VLD_FOUND TRUE)
# MESSAGE("found VLD.")
ENDIF (VLD_LIBRARY_VLD OR VLD_LIBRARY_VLDMT OR VLD_LIBRARY_VLDMTDLL)
ENDIF(VLD_INCLUDE_DIR)
MARK_AS_ADVANCED(
VLD_INCLUDE_DIR
VLD_INCLUDE_DIR_API
VLD_LIBRARY_VLD
VLD_LIBRARY_VLDMT
VLD_LIBRARY_VLDMTDLL
VLD_LIBRARIES
)
ENDIF(CMAKE_BUILD_TOOL MATCHES "(msdev|devenv)")
ENDIF(WIN32)
IF(MINGW) IF(MINGW)
TARGET_LINK_LIBRARIES(zone "WS2_32") TARGET_LINK_LIBRARIES(zone "WS2_32")

2
zone/merc.cpp
View File

@ -5660,8 +5660,6 @@ bool Merc::Unsuspend(bool setMaxStats) {
if(g->GetID() == 0) { if(g->GetID() == 0) {
delete g; delete g;
g = NULL; g = NULL;
Message(13, "Unable to get new group id. Cannot create group.");
mercOwner->Message(13, "Unable to get new group id. Cannot create group.");
return false; return false;
} }

1
zone/net.cpp
View File

@ -20,7 +20,6 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
#include "../common/features.h" #include "../common/features.h"
#include <iostream> #include <iostream>
using namespace std; using namespace std;
#include <vld.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>