From aeb31f0669a263600f47fa75a090ea9178f60a79 Mon Sep 17 00:00:00 2001
From: Eduardo Bart <edub4rt@gmail.com>
Date: Wed, 9 Jan 2013 14:57:18 -0200
Subject: [PATCH] Fix boost locale linkage

---
 .travis.yml                  | 4 +++-
 modules/gamelib/const.lua    | 5 +----
 src/client/const.h           | 4 ++--
 src/client/declarations.h    | 4 ++--
 src/client/game.cpp          | 1 -
 src/client/global.h          | 4 ++--
 src/framework/CMakeLists.txt | 7 +++++--
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index faa3c992..dfa54a95 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,9 @@ language: cpp
 compiler:
   - gcc
 before_script:
-  - sudo apt-get install libboost-all-dev libphysfs-dev libssl-dev liblua5.1-dev libglew1.6-dev libvorbis-dev libopenal-dev libz-dev
+  - sudo apt-add-repository ppa:28msec/boost
+  - sudo apt-get update
+  - sudo apt-get install libboost1.50 libphysfs-dev libssl-dev liblua5.1-dev libglew1.6-dev libvorbis-dev libopenal-dev libz-dev
 script: |
   cmake . -DCMAKE_BUILD_TYPE=Release
   make
diff --git a/modules/gamelib/const.lua b/modules/gamelib/const.lua
index 6a5e70e4..815a3493 100644
--- a/modules/gamelib/const.lua
+++ b/modules/gamelib/const.lua
@@ -148,10 +148,7 @@ CIPSOFT_RSA = "1321277432058722840622950990822933849527763264961655079678763618"
               "88792221429527047321331896351555606801473202394175817"
 
 -- set to the latest Tibia.pic signature to make otclient compatible with official tibia
-PIC_SIGNATURE = 1337606793
-if g_game.getClientVersion() < 970 then
-  PIC_SIGNATURE = 1353074333
-end
+PIC_SIGNATURE = 0x50a6469d
 
 OsTypes = {
   Linux = 1,
diff --git a/src/client/const.h b/src/client/const.h
index 4fb9cade..722490d7 100644
--- a/src/client/const.h
+++ b/src/client/const.h
@@ -20,8 +20,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef OTCLIENT_CONST_H
-#define OTCLIENT_CONST_H
+#ifndef CLIENT_CONST_H
+#define CLIENT_CONST_H
 
 namespace Otc
 {
diff --git a/src/client/declarations.h b/src/client/declarations.h
index 476a61a0..a6c09b21 100644
--- a/src/client/declarations.h
+++ b/src/client/declarations.h
@@ -20,8 +20,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef OTCLIENT_DECLARATIONS_H
-#define OTCLIENT_DECLARATIONS_H
+#ifndef CLIENT_DECLARATIONS_H
+#define CLIENT_DECLARATIONS_H
 
 #include "global.h"
 #include <framework/net/declarations.h>
diff --git a/src/client/game.cpp b/src/client/game.cpp
index 7d82ea1c..bb0c2cbb 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -38,7 +38,6 @@ Game g_game;
 
 Game::Game()
 {
-    resetGameStates();
     m_protocolVersion = 0;
     m_clientVersion = 0;
     m_online = false;
diff --git a/src/client/global.h b/src/client/global.h
index e4e1932b..f4eb6f88 100644
--- a/src/client/global.h
+++ b/src/client/global.h
@@ -20,8 +20,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef OTCLIENT_GLOBAL_H
-#define OTCLIENT_GLOBAL_H
+#ifndef CLIENT_GLOBAL_H
+#define CLIENT_GLOBAL_H
 
 #include <framework/global.h>
 
diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt
index 18609330..a87f51eb 100644
--- a/src/framework/CMakeLists.txt
+++ b/src/framework/CMakeLists.txt
@@ -169,11 +169,14 @@ message(STATUS "Build revision: ${BUILD_REVISION}")
 add_definitions(-D"BUILD_REVISION=\\\"${BUILD_REVISION}\\\"")
 
 # find boost
-set(REQUIRED_BOOST_COMPONENTS system filesystem regex locale)
+set(REQUIRED_BOOST_COMPONENTS locale system filesystem regex thread)
 if(WIN32)
     set(Boost_THREADAPI win32)
     set(framework_DEFINITIONS ${framework_DEFINITIONS} -DBOOST_THREAD_USE_LIB) # fix boost thread linkage
-    set(REQUIRED_BOOST_COMPONENTS ${REQUIRED_BOOST_COMPONENTS} thread chrono) # mingw32 does not have std::thread
+    set(REQUIRED_BOOST_COMPONENTS ${REQUIRED_BOOST_COMPONENTS} chrono) # mingw32 does not have std::thread
+else()
+    find_package(ICU)
+    set(Boost_LIBRARIES ${Boost_LIBRARIES} ${ICU_LIBRARIES})
 endif()
 set(Boost_USE_MULTITHREADED ON)
 set(Boost_USE_STATIC_LIBS ${USE_STATIC_LIBS})