← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/gui/sdlfont.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/gui/sdlfont.cpp
26
26
#include "client.h"
27
27
#include "logger.h"
28
28
#include "main.h"
29
 
#include "sdlgraphics.h"
 
29
 
 
30
#include "render/sdlgraphics.h"
30
31
 
31
32
#include "resources/image.h"
32
33
#include "resources/imagehelper.h"
47
48
const unsigned int CLEAN_TIME = 7;
48
49
const int OUTLINE_SIZE = 1;
49
50
 
50
 
bool SDLFont::mOpengl(true);
 
51
bool SDLFont::mSoftMode(false);
51
52
 
52
53
char *strBuf;
53
54
 
98
99
    if (c2.b != color2.b)
99
100
        return c2.b > color2.b;
100
101
 
101
 
    if (c.a != color.a && !SDLFont::mOpengl)
 
102
    if (c.a != color.a && SDLFont::mSoftMode)
102
103
        return c.a > color.a;
103
104
 
104
105
    return false;
346
347
 
347
348
    if (fontCounter == 0)
348
349
    {
349
 
        mOpengl = imageHelper->useOpenGL();
 
350
        mSoftMode = imageHelper->useOpenGL() == RENDER_SOFTWARE;
350
351
        if (TTF_Init() == -1)
351
352
        {
352
353
            throw GCN_EXCEPTION("Unable to initialize SDL_ttf: " +