← Back to branch summary

~ubuntu-branches/ubuntu/quantal/mupen64plus/quantal

« back to all changes in this revision

Viewing changes to opengl/osd.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Sven Eckelmann, Sven Eckelmann, Piotr Ożarowski
  • Date: 2010-05-06 11:34:46 UTC
  • mfrom: (3.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20100506113446-jfcd6uk7waudel82
Tags: 1.5+dfsg1-10
http://bugs.debian.org/580480
https://launchpad.net/bugs/575968
[ Sven Eckelmann ]
* debian/patches:
  - Add rsp_ucode2_reset.patch, Reset status of specific ucode2 hacks after
    starting again
  - Add rsp_hle_bigendian.patch, Fix wrong high level emulation of rsp on big
    endian systems
  - Add rice-crash-vendorstring.patch, Don't crash on long OpenGL vendor
    string (Closes: #580480, LP: #575968)

[ Piotr Ożarowski ]
* DMUA flag set to yes

Show diffs side-by-side

added added

removed removed

Lines of Context:
opengl/osd.cpp
31
31
    #include "../main/util.h"
32
32
}
33
33
 
34
 
#define FONT_FILENAME "font.ttf"
 
34
#define FONT_FILENAME "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf"
35
35
 
36
36
#ifdef __WIN32__
37
37
# warning This hack should be fixed at some point
206
206
extern "C"
207
207
void osd_init(int width, int height)
208
208
{
209
 
    char fontpath[PATH_MAX];
210
 
 
211
 
    snprintf(fontpath, PATH_MAX, "%sfonts/%s", get_installpath(), FONT_FILENAME);
212
 
    l_font = new OGLFT::Monochrome(fontpath, height / 35);  // make font size proportional to screen height
 
209
    l_font = new OGLFT::Monochrome(FONT_FILENAME, height / 35);  // make font size proportional to screen height
213
210
 
214
211
    if(!l_font || !l_font->isValid())
215
212
    {
216
 
        printf("Could not construct face from %s\n", fontpath);
 
213
        printf("Could not construct face from %s\n", FONT_FILENAME);
217
214
        return;
218
215
    }
219
216