Merge branch 'master' into tmw2

8 files changed, 39 insertions, 9 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 87bb6fd..4002c7e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,13 +48,13 @@ gcc-6:
   stage: build
   script:
   - ./tools/ci/jobs/gcc6.sh --enable-werror
-  image: debian:unstable
+  image: debian:stretch
 
 .gcc-6-i386:
   stage: build
   script:
   - ./tools/ci/jobs/gcc6.sh --enable-werror
-  image: vicamo/debian:sid-i386
+  image: i386/debian:stretch
 
 gcc-7:
   stage: build
@@ -141,7 +141,7 @@ gcc-6-sanitize:
   stage: test
   script:
   - ./tools/ci/jobs/gcc6.sh --enable-werror --enable-sanitize
-  image: debian:unstable
+  image: debian:stretch
 
 gcc-7-sanitize:
   stage: test
@@ -165,7 +165,7 @@ gcc-6_lto-sanitize:
   stage: test
   script:
   - ./tools/ci/jobs/gcc6.sh --enable-werror --enable-lto --enable-sanitize
-  image: debian:unstable
+  image: debian:stretch
 
 gcc-7_lto-sanitize:
   stage: test
@@ -195,7 +195,7 @@ gcc-6_lto:
   stage: test
   script:
   - ./tools/ci/jobs/gcc6.sh --enable-werror --enable-lto
-  image: debian:unstable
+  image: debian:stretch
 
 gcc-7_lto:
   stage: test
@@ -229,4 +229,4 @@ gcc-6_unstable_lto-sanitize:
   stage: legacy
   script:
   - ./tools/ci/jobs/gcc6.sh --enable-werror --enable-lto --enable-sanitize
-  image: debian:unstable
+  image: debian:stretch
diff --git a/src/echar/char.c b/src/echar/char.c
index 037aa05..c0d80ba 100644
--- a/src/echar/char.c
+++ b/src/echar/char.c
@@ -177,11 +177,18 @@ void echar_parse_login_password_change_ack(int charFd)
     }
 }
 
-void echar_send_HC_ACK_CHARINFO_PER_PAGE_post(int fd, struct char_session_data *sd)
+void echar_send_HC_ACK_CHARINFO_PER_PAGE_post(int fd,
+                                              struct char_session_data *sd)
 {
     send_additional_slots(fd, sd);
 }
 
+void echar_send_HC_ACK_CHARINFO_PER_PAGE_tail_pre(int *fdPtr __attribute__ ((unused)),
+                                                  struct char_session_data **sdPtr __attribute__ ((unused)))
+{
+    hookStop();
+}
+
 int echar_mmo_char_send_characters_post(int retVal,
                                         int fd,
                                         struct char_session_data* sd)
diff --git a/src/echar/char.h b/src/echar/char.h
index 708a558..23a9a4d 100644
--- a/src/echar/char.h
+++ b/src/echar/char.h
@@ -15,6 +15,8 @@ void echar_parse_login_password_change_ack(int charFd);
 
 void echar_send_HC_ACK_CHARINFO_PER_PAGE_post(int fd, struct char_session_data *sd);
 
+void echar_send_HC_ACK_CHARINFO_PER_PAGE_tail_pre(int *fdPtr, struct char_session_data **sdPtr);
+
 int echar_mmo_char_send_characters_post(int retVal, int fd, struct char_session_data *sd);
 
 void send_additional_slots(int fd, struct char_session_data* sd);
diff --git a/src/echar/init.c b/src/echar/init.c
index 4e9faa6..5d55735 100644
--- a/src/echar/init.c
+++ b/src/echar/init.c
@@ -60,6 +60,7 @@ HPExport void plugin_init (void)
     addHookPre(chr, parse_char_create_new_char, echar_parse_char_create_new_char);
     addHookPre(chr, creation_failed, echar_creation_failed);
     addHookPre(chr, parse_char_connect, echar_parse_char_connect_pre);
+    addHookPre(chr, send_HC_ACK_CHARINFO_PER_PAGE_tail, echar_send_HC_ACK_CHARINFO_PER_PAGE_tail_pre);
 
     addHookPost(chr, send_HC_ACK_CHARINFO_PER_PAGE, echar_send_HC_ACK_CHARINFO_PER_PAGE_post);
     addHookPost(chr, mmo_char_send_characters, echar_mmo_char_send_characters_post);
diff --git a/src/emap/atcommand.c b/src/emap/atcommand.c
index e7f97b3..f71698f 100644
--- a/src/emap/atcommand.c
+++ b/src/emap/atcommand.c
@@ -243,7 +243,6 @@ ACMD0(log)
 ACMD4(tee)
 {
     clif->disp_overhead(&sd->bl, message, AREA_CHAT_WOC, NULL);
-    
     return true;
 }
 
@@ -271,3 +270,22 @@ ACMD1(serverExit)
 
     return true;
 }
+
+ACMD1(getName)
+{
+    int id = 0;
+    if (!*message || sscanf(message, "%10d", &id) < 1)
+        return false;
+
+    const struct block_list* bl = map->id2bl(id);
+    if (bl == NULL)
+    {
+        clif->message(fd, "Unit not found");
+    }
+    else
+    {
+        clif->message(fd, status->get_name(bl));
+    }
+
+    return true;
+}
diff --git a/src/emap/atcommand.h b/src/emap/atcommand.h
index 5b8588b..50a92df 100644
--- a/src/emap/atcommand.h
+++ b/src/emap/atcommand.h
@@ -41,5 +41,6 @@ ACMD1(mapExit);
 ACMD1(serverExit);
 ACMD0(log);
 ACMD4(tee);
+ACMD4(getName);
 
 #endif  // EVOL_MAP_ATCOMMAND
diff --git a/src/emap/init.c b/src/emap/init.c
index e09d551..01e5e19 100644
--- a/src/emap/init.c
+++ b/src/emap/init.c
@@ -108,6 +108,7 @@ HPExport void plugin_init (void)
     addAtcommand("linus", linus);
     addAtcommand("tee", tee);
     addAtcommand("log", log);
+    addAtcommand("getname", getName);
 
     addCPCommand("serverexit", serverExit);
 
diff --git a/tools/ci/jobs/gcc6.sh b/tools/ci/jobs/gcc6.sh
index 85f6748..d9a9aac 100755
--- a/tools/ci/jobs/gcc6.sh
+++ b/tools/ci/jobs/gcc6.sh
@@ -9,7 +9,7 @@ source ./tools/ci/scripts/init.sh
 aptget_install gcc-6 \
     git-core \
     make autoconf automake autopoint \
-    libtool libmysqlclient-dev libz-dev libpcre3-dev
+    libtool mariadb-client libmariadbclient-dev-compat libz-dev libpcre3-dev
 
 do_init
 build_init