Version 2.2 - retro layout + bug fixes

modules/client_entergame/characterlist.lua

@@ -30,7 +30,6 @@ local function tryLogin(charInfo, tries)
   end
 
   CharacterList.hide()
-  
   g_game.loginWorld(G.account, G.password, charInfo.worldName, charInfo.worldHost, charInfo.worldPort, charInfo.characterName, G.authenticatorToken, G.sessionKey)
   g_logger.info("Login to " .. charInfo.worldHost .. ":" .. charInfo.worldPort)
   loadBox = displayCancelBox(tr('Please wait'), tr('Connecting to game server...'))

modules/client_entergame/entergame.lua

@@ -79,12 +79,12 @@ local function validateThings(things)
     local thingsNode = {}
     for thingtype, thingdata in pairs(things) do
       thingsNode[thingtype] = thingdata[1]
-      if not g_resources.fileExists("/data/things/" .. thingdata[1]) then
+      if not g_resources.fileExists("/things/" .. thingdata[1]) then
         incorrectThings = incorrectThings .. "Missing file: " .. thingdata[1] .. "\n"
         missingFiles = true
         versionForMissingFiles = thingdata[1]:split("/")[1]
       else
-        local localChecksum = g_resources.fileChecksum("/data/things/" .. thingdata[1]):lower()
+        local localChecksum = g_resources.fileChecksum("/things/" .. thingdata[1]):lower()
         if localChecksum ~= thingdata[2]:lower() and #thingdata[2] > 1 then
           if g_resources.isLoadedFromArchive() then -- ignore checksum if it's test/debug version
             incorrectThings = incorrectThings .. "Invalid checksum of file: " .. thingdata[1] .. " (is " .. localChecksum .. ", should be " .. thingdata[2]:lower() .. ")\n"
@@ -393,8 +393,8 @@ function EnterGame.doLogin()
   g_game.setProtocolVersion(g_game.getClientProtocolVersion(G.clientVersion))
   g_game.setCustomProtocolVersion(0)
   g_game.chooseRsa(G.host)
-  if #server_params <= 3 then
-    g_game.setCustomOs(2) -- set os to windows
+  if #server_params <= 3 and not g_game.getFeature(GameExtendedOpcode) then
+    g_game.setCustomOs(2) -- set os to windows if opcodes are disabled
   end
 
   -- extra features from init.lua

modules/client_entergame/entergame.otui

@@ -1,7 +1,3 @@
-EnterGameWindow < StaticMainWindow
-  !text: tr('Enter Game')
-  size: 260 354
-
 EnterGameWindow
   id: enterGame
   @onEnter: EnterGame.doLogin()