← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/resources/ambientlayer.cpp

  • Committer: Package Import Robot
  • Author(s): Patrick Matthäi
  • Date: 2013-09-17 10:35:51 UTC
  • mfrom: (1.1.10)
  • Revision ID: package-import@ubuntu.com-20130917103551-az7p3nz9jgxwqjfn
Tags: 1.3.9.15-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/resources/ambientlayer.cpp
21
21
 
22
22
#include "resources/ambientlayer.h"
23
23
 
24
 
#include "graphics.h"
 
24
#include "render/graphics.h"
25
25
 
26
26
#include "resources/image.h"
27
27
#include "resources/imagehelper.h"
40
40
    if (!mImage)
41
41
        return;
42
42
 
43
 
    if (keepRatio && !imageHelper->useOpenGL())
 
43
    if (keepRatio && imageHelper->useOpenGL() == RENDER_SOFTWARE)
44
44
    {
45
45
        const int width = mainGraphics->mWidth;
46
46
        const int height = mainGraphics->mHeight;
108
108
    if (!mImage)
109
109
        return;
110
110
 
111
 
    if (!imageHelper->useOpenGL() || !mKeepRatio)
 
111
    if (imageHelper->useOpenGL() == RENDER_SOFTWARE || !mKeepRatio)
112
112
    {
113
113
        graphics->drawImagePattern(mImage, static_cast<int>(-mPosX),
114
114
                static_cast<int>(-mPosY), x + static_cast<int>(mPosX),