[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/editor sprite_editorobj.cxx,1.1,1.2
From: |
torangan |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/editor sprite_editorobj.cxx,1.1,1.2 |
Date: |
27 Jun 2002 17:16:42 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv5316/editor
Modified Files:
sprite_editorobj.cxx
Log Message:
removed obsolte workaround for ClanLib bug
Index: sprite_editorobj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/sprite_editorobj.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sprite_editorobj.cxx 12 Jun 2002 19:11:31 -0000 1.1
+++ sprite_editorobj.cxx 27 Jun 2002 17:16:40 -0000 1.2
@@ -81,30 +81,9 @@
CL_Vector provider_pos = pos;
provider_pos -= pos_ref;
- if (provider->is_indexed ())
- {
- unsigned int color = provider->get_pixel (int(provider_pos.x) -
sprite.get_x_align (),
- int(provider_pos.y) -
sprite.get_y_align ());
-
- //std::cout << "Pos: " << int(provider_pos.x) - sprite.get_x_align ()
<< " "
- // << int(provider_pos.y) - sprite.get_y_align () << std::endl;
-
- //std::cout << provider->uses_src_colorkey () << " Src: "
- // << provider->get_src_colorkey ()
- // << " Color: " << color << std::endl;
-
- if (provider->uses_src_colorkey ())
- return color != provider->get_src_colorkey ();
- else // Surface is completly filled
- return true;
- }
- else
- {
- provider->get_pixel (int(provider_pos.x), int(provider_pos.y),
- &r, &g, &b, &a);
- //std::cout << "Color: " << r << " " << g << " " << b << " " << a <<
std::endl;
- return (a >= 0.5);
- }
+ provider->get_pixel (int(provider_pos.x), int(provider_pos.y), &r, &g,
&b, &a);
+ //std::cout << "Color: " << r << " " << g << " " << b << " " << a <<
std::endl;
+ return (a >= 0.5);
}
else
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/editor sprite_editorobj.cxx,1.1,1.2,
torangan <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/actions angel.hxx,1.2,1.3 basher.hxx,1.3,1.4 blocker.hxx,1.2,1.3 boarder.hxx,1.3,1.4 bomber.hxx,1.3,1.4 bridger.hxx,1.5,1.6 climber.hxx,1.2,1.3 digger.hxx,1.2,1.3 drown.cxx,1.2,1.3 drown.hxx,1.2,1.3 exiter.hxx,1.2,1.3 faller.cxx,1.9,1.10 faller.hxx,1.4,1.5 floater.cxx,1.5,1.6 floater.hxx,1.2,1.3 jumper.hxx,1.2,1.3 laser_kill.hxx,1.2,1.3 miner.hxx,1.2,1.3 rocket_launcher.hxx,1.2,1.3 slider.hxx,1.2,1.3 smashed.hxx,1.2,1.3 splashed.hxx,1.2,1.3 superman.hxx,1.2,1.3 teleported.hxx,1.2,1.3 waiter.hxx,1.2,1.3 walker.cxx,1.8,1.9 walker.hxx,1.2,1.3
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs ice_block.cxx,1.3,1.4
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/actions angel.hxx,1.2,1.3 basher.hxx,1.3,1.4 blocker.hxx,1.2,1.3 boarder.hxx,1.3,1.4 bomber.hxx,1.3,1.4 bridger.hxx,1.5,1.6 climber.hxx,1.2,1.3 digger.hxx,1.2,1.3 drown.cxx,1.2,1.3 drown.hxx,1.2,1.3 exiter.hxx,1.2,1.3 faller.cxx,1.9,1.10 faller.hxx,1.4,1.5 floater.cxx,1.5,1.6 floater.hxx,1.2,1.3 jumper.hxx,1.2,1.3 laser_kill.hxx,1.2,1.3 miner.hxx,1.2,1.3 rocket_launcher.hxx,1.2,1.3 slider.hxx,1.2,1.3 smashed.hxx,1.2,1.3 splashed.hxx,1.2,1.3 superman.hxx,1.2,1.3 teleported.hxx,1.2,1.3 waiter.hxx,1.2,1.3 walker.cxx,1.8,1.9 walker.hxx,1.2,1.3
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs ice_block.cxx,1.3,1.4
- Index(es):