pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-03 11:12:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Chris M 2014-07-03 04:15:00 -05:00
parent 90f74d6847
commit 7ec0994433
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -299,10 +299,8 @@ IF(EQEMU_BUILD_LUA)
ENDIF(EQEMU_BUILD_LUA) ENDIF(EQEMU_BUILD_LUA)
IF(EQEMU_BUILD_SOCKET_SERVER) IF(EQEMU_BUILD_SOCKET_SERVER)
FIND_PACKAGE(Boost COMPONENTS system filesystem thread REQUIRED)
INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/websocketpp") INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/websocketpp")
ADD_DEFINITIONS(-D_WEBSOCKETPP_CPP11_STL_) ADD_DEFINITIONS(-D_WEBSOCKETPP_CPP11_STL_)
ENDIF(EQEMU_BUILD_SOCKET_SERVER) ENDIF(EQEMU_BUILD_SOCKET_SERVER)
INCLUDE_DIRECTORIES("${ZLIB_INCLUDE_DIRS}" "${MySQL_INCLUDE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/common/glm/glm") INCLUDE_DIRECTORIES("${ZLIB_INCLUDE_DIRS}" "${MySQL_INCLUDE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/common/glm/glm")

6
socket_server/socket_server.cpp
View File

@ -64,7 +64,7 @@ void CatchSignal(int sig_num) {
worldserver->Disconnect(); worldserver->Disconnect();
} }
/* Web Sockets Start Shit */ /* Web Sockets Start */
enum action_type { enum action_type {
SUBSCRIBE, SUBSCRIBE,
@ -135,7 +135,7 @@ public:
void on_message(connection_hdl hdl, server::message_ptr msg) { void on_message(connection_hdl hdl, server::message_ptr msg) {
// queue message up for sending by processing thread // queue message up for sending by processing thread
unique_lock<mutex> lock(m_action_lock); unique_lock<mutex> lock(m_action_lock);
msg->set_payload("Niggers"); msg->set_payload("Test Message");
// std::cout << "on_message" << std::endl; // std::cout << "on_message" << std::endl;
m_actions.push(action(MESSAGE, hdl, msg)); m_actions.push(action(MESSAGE, hdl, msg));
lock.unlock(); lock.unlock();
@ -188,7 +188,7 @@ private:
condition_variable m_action_cond; condition_variable m_action_cond;
}; };
/* Web Sockets Shit End*/ /* Web Sockets Shit */
int main() { int main() {