From f19648f615fd3c7214aabf04eebb52c418f72bd8 Mon Sep 17 00:00:00 2001 From: KimLS Date: Sat, 10 Oct 2015 22:06:54 -0700 Subject: [PATCH 1/4] Will prefer libmysql(dynamic) over mysqlclient(static) library for linking. Update travis.yml for new travis-ci container types. --- .travis.yml | 14 ++++++++++---- cmake/FindMySQL.cmake | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 71606e74c..74e5701ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,17 @@ language: cpp compiler: gcc -before_install: - - sudo apt-get update -qq - - sudo apt-get install -y libmysqlclient-dev libperl-dev libboost-dev liblua5.1-0-dev zlib1g-dev +sudo: false +addons: + apt: + packages: + - libmysqlclient-dev + - libperl-dev + - libboost-dev + - liblua5.1-0-dev + - zlib1g-dev script: - cmake -G "Unix Makefiles" -DEQEMU_BUILD_TESTS=ON -DEQEMU_ENABLE_BOTS=ON - - make + - make -j8 - ./bin/tests branches: only: diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index 14d08b695..0578c8b0c 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake @@ -30,7 +30,7 @@ ELSE(MYSQL_ROOT) ENDIF(MYSQL_ROOT) # Library -SET(MySQL_NAMES mysqlclient_r mysqlclient) +SET(MySQL_NAMES libmysql mysqlclient_r mysqlclient) IF(MYSQL_ROOT) FIND_LIBRARY(MySQL_LIBRARY_DEBUG NAMES ${MySQL_NAMES} From 71d36af3efcdfcb88f4a1578a5b3450d01265f2a Mon Sep 17 00:00:00 2001 From: Akkadius Date: Sun, 11 Oct 2015 17:10:10 -0500 Subject: [PATCH 2/4] eqemu_update.pl minor fix [skip ci] --- utils/scripts/eqemu_update.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/scripts/eqemu_update.pl b/utils/scripts/eqemu_update.pl index 9c1556d21..3a7c956a7 100644 --- a/utils/scripts/eqemu_update.pl +++ b/utils/scripts/eqemu_update.pl @@ -842,7 +842,7 @@ sub get_bots_db_version{ sub bots_db_management{ #::: Main Binary Database version - $bin_db_ver = trim($db_version[2]); + $bin_db_ver = trim($db_version[1]); #::: If we have stale data from main db run if($db_run_stage > 0 && $bots_db_management == 0){ From eb4e970c303f1029e310ed02ac5d89b48b82716c Mon Sep 17 00:00:00 2001 From: Akkadius Date: Sun, 11 Oct 2015 21:59:16 -0500 Subject: [PATCH 3/4] Unfix the fix [skip ci] --- utils/scripts/eqemu_update.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/scripts/eqemu_update.pl b/utils/scripts/eqemu_update.pl index 3a7c956a7..9c1556d21 100644 --- a/utils/scripts/eqemu_update.pl +++ b/utils/scripts/eqemu_update.pl @@ -842,7 +842,7 @@ sub get_bots_db_version{ sub bots_db_management{ #::: Main Binary Database version - $bin_db_ver = trim($db_version[1]); + $bin_db_ver = trim($db_version[2]); #::: If we have stale data from main db run if($db_run_stage > 0 && $bots_db_management == 0){ From 8ed255ad01db54a53aa099ce303fd1ff4a843942 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Mon, 12 Oct 2015 14:07:14 -0400 Subject: [PATCH 4/4] Fix expansionless AAs --- zone/aa.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zone/aa.cpp b/zone/aa.cpp index 84fc4a1f4..7e00da07c 100644 --- a/zone/aa.cpp +++ b/zone/aa.cpp @@ -1419,11 +1419,11 @@ bool Mob::CanUseAlternateAdvancementRank(AA::Rank *rank) { } if(IsClient()) { - if(!(CastToClient()->GetPP().expansions & (1 << (rank->expansion - 1)))) { + if(rank->expansion && !(CastToClient()->GetPP().expansions & (1 << (rank->expansion - 1)))) { return false; } } else { - if(!(RuleI(World, ExpansionSettings) & (1 << (rank->expansion - 1)))) { + if(rank->expansion && !(RuleI(World, ExpansionSettings) & (1 << (rank->expansion - 1)))) { return false; } }