[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r2707 - branches/pingus_sdl/src
From: |
jsalmon3 |
Subject: |
[Pingus-CVS] r2707 - branches/pingus_sdl/src |
Date: |
Wed, 11 Jul 2007 04:25:57 +0200 |
Author: jsalmon3
Date: 2007-07-11 04:25:50 +0200 (Wed, 11 Jul 2007)
New Revision: 2707
Modified:
branches/pingus_sdl/src/collision_mask.cpp
branches/pingus_sdl/src/pixel_buffer.cpp
branches/pingus_sdl/src/resource.cpp
Log:
Changed load_pixelbuffer to lookup the resource name, fixed delete[] in
~CollisionMask
Modified: branches/pingus_sdl/src/collision_mask.cpp
===================================================================
--- branches/pingus_sdl/src/collision_mask.cpp 2007-07-10 04:54:20 UTC (rev
2706)
+++ branches/pingus_sdl/src/collision_mask.cpp 2007-07-11 02:25:50 UTC (rev
2707)
@@ -72,7 +72,7 @@
CollisionMask::~CollisionMask()
{
- delete buffer;
+ delete[] buffer;
}
int
Modified: branches/pingus_sdl/src/pixel_buffer.cpp
===================================================================
--- branches/pingus_sdl/src/pixel_buffer.cpp 2007-07-10 04:54:20 UTC (rev
2706)
+++ branches/pingus_sdl/src/pixel_buffer.cpp 2007-07-11 02:25:50 UTC (rev
2707)
@@ -35,15 +35,9 @@
PixelBuffer::PixelBuffer(const std::string& name_)
{
- std::string name = "data/images/" + name_ + ".png";
- surface = IMG_Load(name.c_str());
+ surface = IMG_Load(name_.c_str());
if (!surface)
- {
- std::string name = "data/images/" + name_ + ".jpg";
- surface = IMG_Load(name.c_str());
- }
- if (!surface)
- std::cout << "XXXXXX Failed to load: " << name << std::endl;
+ std::cout << "XXXXXX Failed to load: " << name_ << std::endl;
///else
//std::cout << "Loaded pixelbuffer: " << name << ": " << surface->w << "x"
<< surface->h << std::endl;
Modified: branches/pingus_sdl/src/resource.cpp
===================================================================
--- branches/pingus_sdl/src/resource.cpp 2007-07-10 04:54:20 UTC (rev
2706)
+++ branches/pingus_sdl/src/resource.cpp 2007-07-11 02:25:50 UTC (rev
2707)
@@ -32,6 +32,7 @@
#include "resource.hpp"
#include "res_descriptor.hpp"
#include "blitter.hpp"
+#include "sprite_description.hpp"
#include "debug.hpp"
ResourceManager Resource::resmgr;
@@ -178,7 +179,11 @@
PixelBuffer
Resource::load_pixelbuffer(const ResDescriptor& desc_)
{
- return apply_modifier_to_pixelbuffer(PixelBuffer(desc_.res_name), desc_);
+ SpriteDescription* desc = resmgr.get_sprite_description(desc_.res_name);
+ if (desc)
+ return apply_modifier_to_pixelbuffer(PixelBuffer(desc->filename), desc_);
+ else
+ return apply_modifier_to_pixelbuffer(PixelBuffer(), desc_);
}
PixelBuffer
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r2707 - branches/pingus_sdl/src,
jsalmon3 <=