Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-10-08 18:28:21 +0000
committerStijn Buys <ingar@osirion.org>2008-10-08 18:28:21 +0000
commit4331f5c17901f46693dcb5c2df96276f6851be25 (patch)
tree903f70d18c7842121c5409a5ec121e0a565fd5ef /src/ui/bitmap.cc
parente3b810e1fe8ced1e0245f8d999bdc9136cfcdc70 (diff)
libui updates, paint namespace, font and palette fixes, button sound
Diffstat (limited to 'src/ui/bitmap.cc')
-rw-r--r--src/ui/bitmap.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/bitmap.cc b/src/ui/bitmap.cc
index d848a52..c14ccff 100644
--- a/src/ui/bitmap.cc
+++ b/src/ui/bitmap.cc
@@ -4,9 +4,9 @@
the terms of the GNU General Public License version 2
*/
-#include "ui/bitmap.h"
#include "auxiliary/functions.h"
-#include "render/primitives.h"
+#include "ui/bitmap.h"
+#include "ui/paint.h"
#include "sys/sys.h"
namespace ui
@@ -46,8 +46,8 @@ void Bitmap::set_texture(const char *texture)
void Bitmap::draw_background()
{
if (bitmap_texture.size()) {
- render::gl::color(1.0f, 1.0f, 1.0f, 1.0f);
- render::primitives::bitmap(global_location(), size(), bitmap_texture);
+ paint::color(1.0f, 1.0f, 1.0f, 1.0f);
+ paint::bitmap(global_location(), size(), bitmap_texture);
}
}