From fb1e500e572774131d0891018332fc625b6a4c52 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Mon, 5 Aug 2013 18:31:50 -0700
Subject: Use attoconf and proper versions

---
 src/ladmin/ladmin.cpp | 39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

(limited to 'src/ladmin/ladmin.cpp')

diff --git a/src/ladmin/ladmin.cpp b/src/ladmin/ladmin.cpp
index 2581456..9f4691c 100644
--- a/src/ladmin/ladmin.cpp
+++ b/src/ladmin/ladmin.cpp
@@ -1942,28 +1942,18 @@ void parse_fromlogin(int fd)
             case 0x7531:       // Displaying of the version of the login-server
                 if (RFIFOREST(fd) < 10)
                     return;
+            {
                 Iprintf("  Login-Server [%s:%d]\n", loginserverip,
                          loginserverport);
-                if (RFIFOB(login_fd, 5) == 0)
-                {
-                    Iprintf("  eAthena version stable-%d.%d",
-                            RFIFOB(login_fd, 2),
-                            RFIFOB(login_fd, 3));
-                }
-                else
-                {
-                    Iprintf("  eAthena version dev-%d.%d",
-                            RFIFOB(login_fd, 2),
-                            RFIFOB(login_fd, 3));
-                }
-                if (RFIFOB(login_fd, 4) == 0)
-                    Iprintf(" revision %d", RFIFOB(login_fd, 4));
-                if (RFIFOB(login_fd, 6) == 0)
-                {
-                    Iprintf("%d.\n", RFIFOW(login_fd, 8));
-                }
-                else
-                    Iprintf("-mod%d.\n", RFIFOW(login_fd, 8));
+                Version version;
+                RFIFO_STRUCT(login_fd, 2, version);
+                Iprintf("  tmwA version %hhu.%hhu.%hhu (dev? %hhu) (flags %hhx) (which %hhx) (vend %hu)\n",
+                        version.major, version.minor, version.patch,
+                        version.devel,
+
+                        version.flags, version.which,
+                        version.vend);
+            }
                 bytes_to_read = 0;
                 RFIFOSKIP(fd, 10);
                 break;
@@ -2872,8 +2862,13 @@ int do_init(int argc, ZString *argv)
     set_defaultparse(parse_fromlogin);
 
     Iprintf("EAthena login-server administration tool.\n");
-    Iprintf("(for eAthena version %d.%d.%d.)\n", ATHENA_MAJOR_VERSION,
-             ATHENA_MINOR_VERSION, ATHENA_REVISION);
+    Version version = CURRENT_LOGIN_SERVER_VERSION;
+    Iprintf("for tmwA version %hhu.%hhu.%hhu (dev? %hhu) (flags %hhx) (which %hhx) (vend %hu)\n",
+            version.major, version.minor, version.patch,
+            version.devel,
+
+            version.flags, version.which,
+            version.vend);
 
     LADMIN_LOG("Ladmin is ready.\n");
     Iprintf("Ladmin is \033[1;32mready\033[0m.\n\n");
-- 
cgit v1.2.3-70-g09d2