[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r2862 - branches/pingus_sdl/src
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r2862 - branches/pingus_sdl/src |
Date: |
Sun, 12 Aug 2007 18:16:54 +0200 |
Author: grumbel
Date: 2007-08-12 18:16:53 +0200 (Sun, 12 Aug 2007)
New Revision: 2862
Modified:
branches/pingus_sdl/src/blitter_impl.hpp
branches/pingus_sdl/src/resource.cpp
branches/pingus_sdl/src/resource.hpp
Log:
- some minor cleanup
- fixed colorkey handling for rotated surfaces
Modified: branches/pingus_sdl/src/blitter_impl.hpp
===================================================================
--- branches/pingus_sdl/src/blitter_impl.hpp 2007-08-12 16:00:32 UTC (rev
2861)
+++ branches/pingus_sdl/src/blitter_impl.hpp 2007-08-12 16:16:53 UTC (rev
2862)
@@ -186,7 +186,8 @@
{
PixelBuffer target_buffer(TransF::get_width (source_buffer.get_width(),
source_buffer.get_height()),
TransF::get_height(source_buffer.get_width(),
source_buffer.get_height()),
- source->format->palette,
source->format->colorkey);
+ source->format->palette,
+ (source->flags & SDL_SRCCOLORKEY) ?
source->format->colorkey : -1);
SDL_Surface* target = target_buffer.get_surface();
SDL_LockSurface(target);
Modified: branches/pingus_sdl/src/resource.cpp
===================================================================
--- branches/pingus_sdl/src/resource.cpp 2007-08-12 16:00:32 UTC (rev
2861)
+++ branches/pingus_sdl/src/resource.cpp 2007-08-12 16:16:53 UTC (rev
2862)
@@ -100,15 +100,6 @@
#endif
}
-#if 0
-CL_Surface
-Resource::load_surface(const std::string& res_name,
- ResourceModifierNS::ResourceModifier modifier)
-{
- return load_surface(ResDescriptor(res_name, modifier));
-}
-#endif
-
Sprite
Resource::load_sprite(const ResDescriptor& desc)
{
Modified: branches/pingus_sdl/src/resource.hpp
===================================================================
--- branches/pingus_sdl/src/resource.hpp 2007-08-12 16:00:32 UTC (rev
2861)
+++ branches/pingus_sdl/src/resource.hpp 2007-08-12 16:16:53 UTC (rev
2862)
@@ -63,15 +63,6 @@
/** */
static unsigned int get_mtime (const std::string& res_name);
-#if 0
- /** Load a surface with res_name from datafile */
- static CL_Surface load_surface(const std::string& res_name,
- ResourceModifierNS::ResourceModifier modifier
- = ResourceModifierNS::ROT0);
-
- /** Load a surface from the ResDescriptor */
- static CL_Surface load_surface(const ResDescriptor&);
-#endif
static Sprite load_sprite(const ResDescriptor&);
static Sprite load_sprite(const std::string& res_name);
static CollisionMask load_collision_mask(const std::string& res_name);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r2862 - branches/pingus_sdl/src,
grumbel at BerliOS <=