~ubuntu-branches/ubuntu/trusty/manaplus/trusty-proposed

« back to all changes in this revision

Viewing changes to src/gui/minimap.cpp

  • Committer: Package Import Robot
  • Author(s): Patrick Matthäi, Andrei Karas, Patrick Matthäi
  • Date: 2013-05-27 09:14:03 UTC
  • mfrom: (1.1.3)
  • Revision ID: package-import@ubuntu.com-20130527091403-4b1jceqok7g2v5on
Tags: 1.3.5.26-1
[ Andrei Karas ]
* Add new files to copyright file.
* Update homepage URL.

[ Patrick Matthäi ]
* New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
47
47
Minimap::Minimap() :
48
48
    // TRANSLATORS: mini map window name
49
49
    Window(_("Map"), false, nullptr, "map.xml"),
50
 
    mMapImage(nullptr),
51
50
    mWidthProportion(0.5),
52
51
    mHeightProportion(0.5),
53
 
    mCustomMapImage(false),
 
52
    mMapImage(nullptr),
54
53
    mMapOriginX(0),
55
54
    mMapOriginY(0),
56
55
    mTextPopup(new TextPopup),
 
56
    mCustomMapImage(false),
57
57
    mAutoResize(config.getBoolValue("autoresizeminimaps"))
58
58
{
59
59
    setWindowName("Minimap");
322
322
                    type = UserPalette::NPC;
323
323
                    break;
324
324
 
 
325
                case ActorSprite::AVATAR:
325
326
                case ActorSprite::UNKNOWN:
326
327
                case ActorSprite::PLAYER:
327
328
                case ActorSprite::FLOOR_ITEM: