~ubuntu-branches/ubuntu/vivid/manaplus/vivid-proposed

« back to all changes in this revision

Viewing changes to src/client.cpp

  • Committer: Package Import Robot
  • Author(s): Patrick Matthäi, Andrei Karas, Patrick Matthäi
  • Date: 2014-12-12 18:24:32 UTC
  • mfrom: (1.1.39)
  • Revision ID: package-import@ubuntu.com-20141212182432-ak7d65mkvvnie1pk
Tags: 1.4.12.6-1
[ Andrei Karas ]
* Updated debian/copyright.

[ Patrick Matthäi ]
* New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
382
382
 
383
383
    gui = new Gui();
384
384
    gui->postInit(mainGraphics);
385
 
 
 
385
    dialogsManager = new DialogsManager;
386
386
    popupManager = new PopupManager;
387
387
 
388
388
    initSoundManager();
404
404
    // Initialize default server
405
405
    mCurrentServer.hostname = settings.options.serverName;
406
406
    mCurrentServer.port = settings.options.serverPort;
 
407
    if (!settings.options.serverType.empty())
 
408
    {
 
409
        mCurrentServer.type = ServerInfo::parseType(
 
410
            settings.options.serverType);
 
411
    }
407
412
 
408
413
    loginData.username = settings.options.username;
409
414
    loginData.password = settings.options.password;
649
654
 
650
655
    delete2(mCurrentDialog);
651
656
    delete2(popupManager);
 
657
    delete2(dialogsManager);
652
658
    delete2(gui);
653
659
 
654
660
    if (inventoryHandler)