projects
/
matthijs
/
ABM2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Make the InputTask quit the program on escape.
[matthijs/ABM2.git]
/
ABM2
/
Amaltheia
/
Sprite.cpp
diff --git
a/ABM2/Amaltheia/Sprite.cpp
b/ABM2/Amaltheia/Sprite.cpp
index 0f9309fec69d452a6a02bca91e0684a4aaa1004c..155960e3db36de859b13464dc3aa4e3d7272c8cb 100644
(file)
--- a/
ABM2/Amaltheia/Sprite.cpp
+++ b/
ABM2/Amaltheia/Sprite.cpp
@@
-77,8
+77,8
@@
Sprite::Sprite( char * filename, colour key, int tw, int th, Graphics *g)
tileHeight=th;
glAlphaFunc(GL_NOTEQUAL, 0);
tileHeight=th;
glAlphaFunc(GL_NOTEQUAL, 0);
-
glEnable(GL_ALPHA_TEST);
-
tex = new Texture(filename, key, g);
+ glEnable(GL_ALPHA_TEST);
+ tex = new Texture(filename, key, g);
texW = tex->getWidth();
texH = tex->getHeight();
texW = tex->getWidth();
texH = tex->getHeight();
@@
-98,7
+98,7
@@
Sprite::~Sprite(void)
void Sprite::blit(int x, int y, float scalex, float scaley, int dx, int dy, colour col)
{
void Sprite::blit(int x, int y, float scalex, float scaley, int dx, int dy, colour col)
{
- z_order-=0.000
00
1;
+ z_order-=0.0001;
glEnter2DMode();
// glColor4ub((colour & 0x00FF0000) >> 16, (colour & 0x0000FF00) >> 8,
// (colour & 0x000000FF), (colour & 0xFF000000) >> 24);
glEnter2DMode();
// glColor4ub((colour & 0x00FF0000) >> 16, (colour & 0x0000FF00) >> 8,
// (colour & 0x000000FF), (colour & 0xFF000000) >> 24);