Add map component

[hydra-dragonfire.git] / auth.go

diff --git a/auth.go b/auth.go
index 07599e726d961e3269e7c5b1dea2cc85831d9b3a..93af0ee4274db3ffbff35afa59b57579339557c7 100644 (file)
--- a/auth.go
+++ b/auth.go
@@ -3,7 +3,7 @@ package main
 import (
        "github.com/HimbeerserverDE/srp"
        "github.com/anon55555/mt"
-       "github.com/dragonfireclient/hydra-dragonfire/tolua"
+       "github.com/dragonfireclient/hydra-dragonfire/convert"
        "github.com/yuin/gopher-lua"
        "strings"
        "time"
@@ -57,7 +57,7 @@ func (auth *Auth) create(client *Client, l *lua.LState) {
        l.SetMetatable(auth.userdata, l.GetTypeMetatable("hydra.auth"))
 }
 
-func (auth *Auth) tolua() lua.LValue {
+func (auth *Auth) push() lua.LValue {
        return auth.userdata
 }
 
@@ -69,9 +69,9 @@ func (auth *Auth) connect() {
        go func() {
                for auth.client.state == csConnected && auth.state == asInit {
                        auth.client.conn.SendCmd(&mt.ToSrvInit{
-                               SerializeVer: 28,
-                               MinProtoVer:  39,
-                               MaxProtoVer:  39,
+                               SerializeVer: serializeVer,
+                               MinProtoVer:  protoVer,
+                               MaxProtoVer:  protoVer,
                                PlayerName:   auth.username,
                        })
                        time.Sleep(500 * time.Millisecond)
@@ -82,7 +82,7 @@ func (auth *Auth) connect() {
 func (auth *Auth) fail(err string) {
        auth.err = err
        auth.state = asError
-       auth.client.disconnect()
+       auth.client.closeConn()
 }
 
 func (auth *Auth) checkState(state authState, pkt *mt.Pkt) bool {
@@ -90,7 +90,7 @@ func (auth *Auth) checkState(state authState, pkt *mt.Pkt) bool {
                return true
        }
 
-       auth.fail("received " + string(tolua.PktType(pkt)) + " in invalid state")
+       auth.fail("received " + string(convert.PushPktType(pkt)) + " in invalid state")
        return false
 }