diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-07-11 21:19:16 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-07-11 21:19:16 +0000 |
| commit | 8f40ab49da011f6d57653afbd10d22c20309f2f6 (patch) | |
| tree | b9299d2d1fcd63f3e10dd6c9d40e87c7ccb73748 | |
| parent | d7a67cd2fcc35e0fe119bf0de304f6fb8da81229 (diff) | |
| download | mana-8f40ab49da011f6d57653afbd10d22c20309f2f6.tar.gz mana-8f40ab49da011f6d57653afbd10d22c20309f2f6.tar.bz2 mana-8f40ab49da011f6d57653afbd10d22c20309f2f6.tar.xz mana-8f40ab49da011f6d57653afbd10d22c20309f2f6.zip | |
Introducing new font, sans serif 8.
| -rw-r--r-- | data/graphics/gui/Makefile.am | 1 | ||||
| -rw-r--r-- | data/graphics/gui/sansserif8.png | bin | 0 -> 1118 bytes | |||
| -rw-r--r-- | src/graphics.cpp | 2 | ||||
| -rw-r--r-- | src/gui/gui.cpp | 30 | ||||
| -rw-r--r-- | src/main.cpp | 3 |
5 files changed, 18 insertions, 18 deletions
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am index dd1ddba2..c9704a06 100644 --- a/data/graphics/gui/Makefile.am +++ b/data/graphics/gui/Makefile.am @@ -28,6 +28,7 @@ gui_DATA = \ radioin.png \ radioout.png \ selection.png \ + sansserif8.png \ slider.png \ deepbox.png \ thickborder.png \ diff --git a/data/graphics/gui/sansserif8.png b/data/graphics/gui/sansserif8.png Binary files differnew file mode 100644 index 00000000..99fe5724 --- /dev/null +++ b/data/graphics/gui/sansserif8.png diff --git a/src/graphics.cpp b/src/graphics.cpp index 0ebacc08..37e37a79 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -36,7 +36,7 @@ Graphics::Graphics(): if (useOpenGL) { // Setup OpenGL glViewport(0, 0, 800, 600); - glClearColor(0.0f, 0.0f, 0.0f, 0.0f); + glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST); int gotDoubleBuffer; SDL_GL_GetAttribute(SDL_GL_DOUBLEBUFFER, &gotDoubleBuffer); logger->log("Using OpenGL %s double buffering.", diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index f38bb1b4..0ed123e3 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -82,26 +82,26 @@ Gui::Gui(Graphics *graphics) // Set global font try { guiFont = new gcn::ImageFont( - TMW_DATADIR "data/graphics/gui/fixedfont.png", - " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567" - "89:@!\"$%&/=?^+*#[]{}()<>_;'.,\\|-~`øå" + TMW_DATADIR "data/graphics/gui/sansserif8.png", + " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[" + "\\]^_`abcdefghijklmnopqrstuvwxyz{|}~|" ); } catch (gcn::Exception e) { - try { - guiFont = new gcn::ImageFont( - "data/graphics/gui/fixedfont.png", - " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567" - "89:@!\"$%&/=?^+*#[]{}()<>_;'.,\\|-~`øå" - ); - } - catch (gcn::Exception e) - { - logger->error("Unable to load fixedfont.png!"); - } + try { + guiFont = new gcn::ImageFont( + "data/graphics/gui/sansserif8.png", + " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVW" + "XYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~|" + ); + } + catch (gcn::Exception e) + { + logger->error("Unable to load sansserif8.png!"); + } } - + gcn::Widget::setGlobalFont(guiFont); // Load hits' colourful fonts diff --git a/src/main.cpp b/src/main.cpp index 1704b409..14191c0a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -227,11 +227,10 @@ void init_engine() screenW = (int)config.getValue("screenwidth", 800); screenH = (int)config.getValue("screenheight", 600); - bitDepth = (int)config.getValue("colordepth", 16); SDL_WM_SetIcon(IMG_Load(TMW_DATADIR "data/icons/tmw-icon.png"), NULL); - screen = SDL_SetVideoMode(screenW, screenH, bitDepth, displayFlags); + screen = SDL_SetVideoMode(screenW, screenH, 0, displayFlags); if (screen == NULL) { std::cerr << "Couldn't set " << screenW << "x" << screenH << "x" << bitDepth << " video mode: " << SDL_GetError() << std::endl; |
