← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/map.cpp

  • Committer: Package Import Robot
  • Author(s): Patrick Matthäi
  • Date: 2013-09-17 10:35:51 UTC
  • mto: This revision was merged to the branch mainline in revision 12.
  • Revision ID: package-import@ubuntu.com-20130917103551-g4o65c0mtfpg5r8m
Tags: upstream-1.3.9.15
Import upstream version 1.3.9.15

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/map.cpp
24
24
 
25
25
#include "client.h"
26
26
#include "configuration.h"
27
 
#include "localplayer.h"
 
27
#include "render/graphics.h"
28
28
#include "maplayer.h"
 
29
#include "notifications.h"
29
30
#include "notifymanager.h"
30
 
#include "particle.h"
31
31
#include "simpleanimation.h"
32
32
#include "tileset.h"
33
33
#include "walklayer.h"
34
34
 
 
35
#include "being/localplayer.h"
 
36
 
 
37
#include "particle/particle.h"
 
38
 
35
39
#include "resources/ambientlayer.h"
36
40
#include "resources/image.h"
37
41
#include "resources/resourcemanager.h"
38
42
#include "resources/subimage.h"
39
43
 
40
 
#include "gui/widgets/chattab.h"
41
 
 
42
44
#include "utils/dtor.h"
43
45
#include "utils/mkdir.h"
44
46
#include "utils/physfstools.h"
146
148
    mOverlayDetail(config.getIntValue("OverlayDetail")),
147
149
    mOpacity(config.getFloatValue("guialpha")),
148
150
#ifdef USE_OPENGL
149
 
    mOpenGL(config.getIntValue("opengl")),
 
151
    mOpenGL(intToRenderType(config.getIntValue("opengl"))),
150
152
#else
151
 
    mOpenGL(0),
 
153
    mOpenGL(RENDER_SOFTWARE),
152
154
#endif
153
155
    mPvp(0),
154
156
    mTilesetsIndexed(false),
382
384
#ifdef USE_OPENGL
383
385
    int updateFlag = 0;
384
386
 
385
 
    if (mOpenGL == 1 || mOpenGL == 3)
 
387
    if (mOpenGL == RENDER_NORMAL_OPENGL || mOpenGL == RENDER_GLES_OPENGL)
386
388
    {
387
389
        if (mLastX != startX || mLastY != startY || mLastScrollX != scrollX
388
390
            || mLastScrollY != scrollY)
437
439
            else
438
440
            {
439
441
#ifdef USE_OPENGL
440
 
//                if ((mOpenGL == 1 || mOpenGL == 3) && updateFlag != 2)
441
 
                if (mOpenGL == 1 || mOpenGL == 3)
 
442
                if (mOpenGL == RENDER_NORMAL_OPENGL
 
443
                    || mOpenGL == RENDER_GLES_OPENGL)
442
444
                {
443
445
                    if (updateFlag)
444
446
                    {
478
480
        {
479
481
            if (Actor *const actor = *ai)
480
482
            {
481
 
                if (!mOpenGL)
 
483
                if (mOpenGL == RENDER_SOFTWARE)
482
484
                {
483
485
                    const int x = actor->getTileX();
484
486
                    const int y = actor->getTileY();
1442
1444
#ifdef USE_SDL2
1443
1445
    return;
1444
1446
#else
1445
 
    if (!mFringeLayer || mOpenGL > 0 ||
 
1447
    if (!mFringeLayer || mOpenGL != RENDER_SOFTWARE ||
1446
1448
        !config.getBoolValue("enableMapReduce"))
1447
1449
    {
1448
1450
        return;