Version 1.8

modules/client_entergame/characterlist.lua

@@ -176,6 +176,7 @@ end
 
 -- public functions
 function CharacterList.init()
+  if USE_NEW_ENERGAME then return end
   connect(g_game, { onLoginError = onGameLoginError })
   connect(g_game, { onLoginToken = onGameLoginToken })
   connect(g_game, { onUpdateNeeded = onGameUpdateNeeded })
@@ -191,6 +192,7 @@ function CharacterList.init()
 end
 
 function CharacterList.terminate()
+ if USE_NEW_ENERGAME then return end
   disconnect(g_game, { onLoginError = onGameLoginError })
   disconnect(g_game, { onLoginToken = onGameLoginToken })
   disconnect(g_game, { onUpdateNeeded = onGameUpdateNeeded })

modules/client_entergame/entergame.lua

@@ -186,6 +186,7 @@ end
 
 -- public functions
 function EnterGame.init()
+  if USE_NEW_ENERGAME then return end
   enterGame = g_ui.displayUI('entergame')
   
   serverSelectorPanel = enterGame:getChildById('serverSelectorPanel')
@@ -246,6 +247,7 @@ function EnterGame.init()
 end
 
 function EnterGame.terminate()
+  if USE_NEW_ENERGAME then return end
   g_keyboard.unbindKeyDown('Ctrl+G')
   
   enterGame:destroy()

modules/client_entergame/entergame_new.otui

@@ -1,50 +0,0 @@
-StaticWindow
-  anchors.right: parent.right
-  anchors.verticalCenter: parent.verticalCenter
-  margin-right: 20
-  id: newLoginPanel
-  width: 240
-  height: 320
-  !text: tr('Quick Login & Registration')
-  
-  UIButton
-    id: qrcode
-    width: 200
-    height: 200
-    anchors.top: parent.top
-    anchors.horizontalCenter: parent.horizontalCenter
-    image-fixed-ratio: true
-    image-smooth: false
-    margin-top: 5
-    
-  UIButton
-    id: quathlogo
-    width: 66
-    height: 40
-    anchors.verticalCenter: prev.verticalCenter
-    anchors.horizontalCenter: prev.horizontalCenter
-    image-fixed-ratio: true
-    image-smooth: false
-    image-source: /images/ui/qauth
-    
-  Label
-    anchors.top: qrcode.bottom
-    anchors.left: qrcode.left
-    anchors.right: qrcode.right
-    text-align: center
-    text-auto-resize: true
-    !text: tr("Scan or click QR code\nto register or login")
-    height: 40
-    margin-top: 10
-    margin-bottom: 5
-    
-  Button
-    anchors.top: prev.bottom
-    anchors.left: parent.left
-    anchors.right: parent.right
-    text-align: center
-    !text: tr("Click to get PC/Android/iOS app")
-    height: 20
-    margin-top: 10
-    color: #FFFFFF
-    @onClick: g_platform.openUrl("http://qauth.co")