[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src pingus_resource.cxx,1.14,1.15
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src pingus_resource.cxx,1.14,1.15 |
Date: |
10 Sep 2002 15:36:46 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv27925
Modified Files:
pingus_resource.cxx
Log Message:
- fixed bug in the trap writing
- fixed fakeexit position bug
- fixed bug in resource modifier
Index: pingus_resource.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_resource.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- pingus_resource.cxx 28 Jun 2002 17:48:42 -0000 1.14
+++ pingus_resource.cxx 10 Sep 2002 15:36:44 -0000 1.15
@@ -152,7 +152,7 @@
surf = load_from_source (desc);
surface_map[desc] = surf; // add to cache
- surf = apply_modifier (surf, desc);
+ surf = apply_modifier (surf, res_desc);
surface_map[res_desc] = surf; // add modified version to cache
}
}
@@ -174,8 +174,8 @@
PingusResource::apply_modifier (const CL_Surface& surf, const ResDescriptor&
res_desc)
{
if (res_desc.modifier != ROT0)
- std::cout << "Using expensive blitting" << std::endl;
-
+ pout << "PingusResource::apply_modifier: Using expensive blitting" <<
std::endl;
+
switch (res_desc.modifier)
{
// FIXME: muahhhaa... I write slower code than you....
@@ -204,7 +204,7 @@
return
Blitter::flip_horizontal(Blitter::rotate_90(Blitter::rotate_90(Blitter::rotate_90(surf))));
default:
- std::cout << "PingusResource: Unhandled modifier: " << res_desc.modifier
<< std::endl;
+ perr << "PingusResource: Unhandled modifier: " << res_desc.modifier <<
std::endl;
return surf;
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src pingus_resource.cxx,1.14,1.15,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor_groundpiece_obj.cxx,1.10,1.11 plfobj.cxx,1.10,1.11 sprite_editorobj.cxx,1.4,1.5 sprite_editorobj.hxx,1.4,1.5 start_pos.cxx,1.5,1.6 weather_obj.cxx,1.6,1.7
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs fake_exit.cxx,1.2,1.3
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor_groundpiece_obj.cxx,1.10,1.11 plfobj.cxx,1.10,1.11 sprite_editorobj.cxx,1.4,1.5 sprite_editorobj.hxx,1.4,1.5 start_pos.cxx,1.5,1.6 weather_obj.cxx,1.6,1.7
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs fake_exit.cxx,1.2,1.3
- Index(es):