[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] rev 2330 - in trunk/src: . actions
From: |
Ingo Ruhnke |
Subject: |
[Pingus-CVS] rev 2330 - in trunk/src: . actions |
Date: |
Mon, 10 May 2004 20:48:30 +0200 |
Author: grumbel
Date: 2004-05-10 20:48:30 +0200 (Mon, 10 May 2004)
New Revision: 2330
Modified:
trunk/src/actions/bomber.cxx
trunk/src/actions/bridger.cxx
trunk/src/actions/drown.cxx
trunk/src/actions/exiter.cxx
trunk/src/actions/floater.cxx
trunk/src/actions/laser_kill.cxx
trunk/src/actions/rocket_launcher.cxx
trunk/src/actions/splashed.cxx
trunk/src/actions/waiter.cxx
trunk/src/actions/walker.cxx
trunk/src/resource.cxx
Log:
- fixed resources a little bit again
Modified: trunk/src/actions/bomber.cxx
===================================================================
--- trunk/src/actions/bomber.cxx 2004-05-10 18:13:58 UTC (rev 2329)
+++ trunk/src/actions/bomber.cxx 2004-05-10 18:48:30 UTC (rev 2330)
@@ -46,7 +46,7 @@
sound_played(false),
gfx_exploded(false),
colmap_exploded(false),
- sprite("pingus/bomber", "pingus", 17.0f, Sprite::NONE, Sprite::ONCE),
+ sprite("pingus/bomber", "", 17.0f, Sprite::NONE, Sprite::ONCE),
explo_surf(Resource::load_sprite("other/explo"))
{
// Only load the surface again if no static_surface is available
Modified: trunk/src/actions/bridger.cxx
===================================================================
--- trunk/src/actions/bridger.cxx 2004-05-10 18:13:58 UTC (rev 2329)
+++ trunk/src/actions/bridger.cxx 2004-05-10 18:48:30 UTC (rev 2330)
@@ -41,8 +41,8 @@
Bridger::Bridger (Pingu* p)
: PinguAction(p),
mode(B_BUILDING),
- walk_sprite(Sprite("pingus/bridger_walk", "pingus", 15.0f, Sprite::NONE,
Sprite::ONCE)),
- build_sprite(Sprite("pingus/bridger_build", "pingus", 15.0f, Sprite::NONE,
Sprite::ONCE)),
+ walk_sprite(Sprite("pingus/bridger_walk", "", 15.0f, Sprite::NONE,
Sprite::ONCE)),
+ build_sprite(Sprite("pingus/bridger_build", "", 15.0f, Sprite::NONE,
Sprite::ONCE)),
bricks(MAX_BRICKS),
block_build(false),
name(_("Bridger") + std::string(" (") + to_string(bricks) + ")")
Modified: trunk/src/actions/drown.cxx
===================================================================
--- trunk/src/actions/drown.cxx 2004-05-10 18:13:58 UTC (rev 2329)
+++ trunk/src/actions/drown.cxx 2004-05-10 18:48:30 UTC (rev 2330)
@@ -27,7 +27,7 @@
Drown::Drown (Pingu* p)
: PinguAction(p),
- sprite(Sprite("pingus/drownfall0", "pingus", 60.0f, Sprite::NONE,
Sprite::ONCE))
+ sprite(Sprite("pingus/drownfall0", "", 60.0f, Sprite::NONE, Sprite::ONCE))
{
sprite.set_align_center_bottom();
}
Modified: trunk/src/actions/exiter.cxx
===================================================================
--- trunk/src/actions/exiter.cxx 2004-05-10 18:13:58 UTC (rev 2329)
+++ trunk/src/actions/exiter.cxx 2004-05-10 18:48:30 UTC (rev 2330)
@@ -28,7 +28,7 @@
Exiter::Exiter (Pingu* p)
: PinguAction(p),
- sprite(Sprite("pingus/exit0", "pingus", 15.0f, Sprite::NONE,
Sprite::ONCE)),
+ sprite(Sprite("pingus/exit0", "", 15.0f, Sprite::NONE, Sprite::ONCE)),
sound_played(false)
{
sprite.set_align_center_bottom();
Modified: trunk/src/actions/floater.cxx
===================================================================
--- trunk/src/actions/floater.cxx 2004-05-10 18:13:58 UTC (rev 2329)
+++ trunk/src/actions/floater.cxx 2004-05-10 18:48:30 UTC (rev 2330)
@@ -29,7 +29,7 @@
: PinguAction(p),
falling_depth(0),
step(0),
- sprite(Sprite ("pingus/floater0", "pingus"))
+ sprite(Sprite ("pingus/floater0"))
{
sprite.set_align_center_bottom();
}
Modified: trunk/src/actions/laser_kill.cxx
===================================================================
--- trunk/src/actions/laser_kill.cxx 2004-05-10 18:13:58 UTC (rev 2329)
+++ trunk/src/actions/laser_kill.cxx 2004-05-10 18:48:30 UTC (rev 2330)
@@ -27,7 +27,7 @@
LaserKill::LaserKill(Pingu* p)
: PinguAction(p),
- sprite(Sprite ("other/laser_kill", "pingus", 20.0f, Sprite::NONE,
Sprite::ONCE))
+ sprite(Sprite ("other/laser_kill", "", 20.0f, Sprite::NONE, Sprite::ONCE))
{
sprite.set_align_center_bottom();
}
Modified: trunk/src/actions/rocket_launcher.cxx
===================================================================
--- trunk/src/actions/rocket_launcher.cxx 2004-05-10 18:13:58 UTC (rev
2329)
+++ trunk/src/actions/rocket_launcher.cxx 2004-05-10 18:48:30 UTC (rev
2330)
@@ -32,7 +32,7 @@
RocketLauncher::RocketLauncher (Pingu* p)
: PinguAction(p),
- sprite("pingus/rocketlauncher", "pingus", 10.0f, Sprite::NONE,
Sprite::ONCE),
+ sprite("pingus/rocketlauncher", "", 10.0f, Sprite::NONE, Sprite::ONCE),
launched(false)
{
sprite.set_align_center_bottom();
Modified: trunk/src/actions/splashed.cxx
===================================================================
--- trunk/src/actions/splashed.cxx 2004-05-10 18:13:58 UTC (rev 2329)
+++ trunk/src/actions/splashed.cxx 2004-05-10 18:48:30 UTC (rev 2330)
@@ -31,7 +31,7 @@
: PinguAction(p),
particle_thrown(false),
sound_played(false),
- sprite("pingus/splat", "pingus", 30.0f, Sprite::NONE, Sprite::ONCE)
+ sprite("pingus/splat", "", 30.0f, Sprite::NONE, Sprite::ONCE)
{
sprite.set_align_center_bottom();
}
Modified: trunk/src/actions/waiter.cxx
===================================================================
--- trunk/src/actions/waiter.cxx 2004-05-10 18:13:58 UTC (rev 2329)
+++ trunk/src/actions/waiter.cxx 2004-05-10 18:48:30 UTC (rev 2330)
@@ -29,7 +29,7 @@
Waiter::Waiter (Pingu* p)
: PinguAction(p),
countdown(2.0f),
- sprite("pingus/waiter", "pingus", 5.0f)
+ sprite("pingus/waiter", "", 5.0f)
{
sprite.set_align_center_bottom();
}
Modified: trunk/src/actions/walker.cxx
===================================================================
--- trunk/src/actions/walker.cxx 2004-05-10 18:13:58 UTC (rev 2329)
+++ trunk/src/actions/walker.cxx 2004-05-10 18:48:30 UTC (rev 2330)
@@ -32,8 +32,8 @@
Walker::Walker (Pingu* p)
: PinguAction(p)
{
- walker.load(Direction::LEFT, Resource::load_sprite("pingus/walker/left",
"pingus"));
- walker.load(Direction::RIGHT, Resource::load_sprite("pingus/walker/right" ,
"pingus"));
+ walker.load(Direction::LEFT, Resource::load_sprite("pingus/walker/left"));
+ walker.load(Direction::RIGHT, Resource::load_sprite("pingus/walker/right"));
floaterlayer.load(Direction::LEFT,
Resource::load_sprite("pingus/floaterlayer/left"));
floaterlayer.load(Direction::RIGHT,
Resource::load_sprite("pingus/floaterlayer/right"));
Modified: trunk/src/resource.cxx
===================================================================
--- trunk/src/resource.cxx 2004-05-10 18:13:58 UTC (rev 2329)
+++ trunk/src/resource.cxx 2004-05-10 18:48:30 UTC (rev 2330)
@@ -41,6 +41,23 @@
std::map<std::string, CL_ResourceManager> Resource::resource_map;
std::map<ResDescriptor, CL_Surface> Resource::surface_map;
+std::string
+fix_file(std::string res_name, std::string datafile)
+{
+ if (datafile.empty())
+ {
+ return res_name;
+ }
+ else
+ {
+ for (std::string::size_type i = 0; i != datafile.size(); ++i)
+ if (datafile[i] == '-')
+ datafile[i] = '/';
+
+ return datafile + "/" + res_name;
+ }
+}
+
void
Resource::init()
{
@@ -82,33 +99,33 @@
}
else
{
- std::string filename = arg_filename + ".xml";
+ std::string filename = arg_filename + ".xml";
- std::map<std::string, CL_ResourceManager>::iterator i =
resource_map.find(filename);
+ std::map<std::string, CL_ResourceManager>::iterator i =
resource_map.find(filename);
- if (i != resource_map.end())
- {
- return i->second;
- }
- else
- {
- std::string res_filename;
+ if (i != resource_map.end())
+ {
+ return i->second;
+ }
+ else
+ {
+ std::string res_filename;
- res_filename = "data/" + filename;
+ res_filename = "data/" + filename;
- CL_ResourceManager res_manager =
CL_ResourceManager(path_manager.complete(res_filename));
+ CL_ResourceManager res_manager =
CL_ResourceManager(path_manager.complete(res_filename));
- resource_map[filename] = res_manager;
+ resource_map[filename] = res_manager;
- return res_manager;
+ return res_manager;
+ }
}
- }
}
CL_Surface
Resource::load_surface(const std::string& res_name,
- const std::string& datafile,
- ResourceModifierNS::ResourceModifier modifier)
+ const std::string& datafile,
+ ResourceModifierNS::ResourceModifier modifier)
{
return load_surface(ResDescriptor(res_name, datafile,
modifier));
@@ -122,17 +139,14 @@
CL_Sprite
Resource::load_sprite(const std::string& res_name,
- const std::string& datafile)
+ const std::string& datafile)
{
- CL_ResourceManager res = get(datafile);
try {
- CL_Sprite sprite(res_name, &res);
- return sprite;
+ return CL_Sprite(fix_file(res_name, datafile), &resmgr);
} catch (CL_Error& err) {
- std::cout << "Resource::load_sprite: CL_Error: '" << res_name << "', '"
<< datafile << "'" << std::endl;
- std::cout << "CL_Error: " << err.message << std::endl;
- CL_ResourceManager res_mgr = get("core");
- return CL_Sprite("core/misc/404sprite", &res_mgr);
+ std::cout << "Resource::load_sprite: CL_Error: '" << res_name << "', '" <<
datafile << "'" << std::endl;
+ std::cout << "CL_Error: " << err.message << std::endl;
+ return CL_Sprite("core/misc/404sprite", &resmgr);
}
}
@@ -140,15 +154,12 @@
Resource::load_sprite_desc(const std::string& res_name,
const std::string& datafile)
{
- CL_ResourceManager res = get(datafile);
try {
- CL_SpriteDescription desc(res_name, &res);
- return desc;
+ return CL_SpriteDescription(fix_file(res_name, datafile), &resmgr);
} catch(CL_Error& err) {
std::cout << "Resource::load_sprite_desc: CL_Error: '" << res_name << "',
'" << datafile << "'" << std::endl;
std::cout << "CL_Error: " << err.message << std::endl;
- res = get("core");
- return CL_SpriteDescription("core/misc/404sprite", &res);
+ return CL_SpriteDescription("core/misc/404sprite", &resmgr);
}
}
@@ -168,7 +179,7 @@
CL_PixelBuffer
Resource::load_pixelbuffer(const std::string& res_name,
- const std::string& datafile)
+ const std::string& datafile)
{
return load_pixelbuffer(ResDescriptor(res_name, datafile));
}
@@ -305,8 +316,7 @@
Resource::load_from_source (const ResDescriptor& res_desc)
{
try {
- CL_ResourceManager res_mgr = get(res_desc.datafile);
- return CL_Surface(res_desc.res_name.c_str(), &res_mgr);
+ return CL_Surface(fix_file(res_desc.res_name, res_desc.datafile), &resmgr);
} catch (CL_Error err) {
pout << "CL_Error: " << err.message << std::endl;
pout << "Resource:" << res_desc
@@ -336,8 +346,8 @@
for (std::map<ResDescriptor, CL_Surface>::iterator i = surface_map.begin ();
i != surface_map.end (); ++i)
{
- pout(PINGUS_DEBUG_RESOURCES) << "XXXX Lookat Resource : " << i->first
- << " => " <<
i->second.get_reference_count () << std::endl;
+ pout(PINGUS_DEBUG_RESOURCES) << "XXXX Lookat Resource : " << i->first
+ << " => " << i->second.get_reference_count
() << std::endl;
if (i->first.type == ResDescriptor::RD_FILE
&& i->second.get_reference_count () == 1)
{
@@ -359,7 +369,7 @@
unsigned int
Resource::get_mtime (const std::string& res_name,
- const std::string& datafile)
+ const std::string& datafile)
{
#ifdef CLANLIB_0_6
try
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] rev 2330 - in trunk/src: . actions,
Ingo Ruhnke <=