[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs exit.cxx, 1.10, 1.11 hotspo
From: |
Ingo Ruhnke |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs exit.cxx, 1.10, 1.11 hotspot.cxx, 1.8, 1.9 liquid.cxx, 1.11, 1.12 |
Date: |
Wed, 22 Oct 2003 14:35:49 +0200 |
Update of /var/lib/cvs/Games/Pingus/src/worldobjs
In directory dark:/tmp/cvs-serv20509/worldobjs
Modified Files:
exit.cxx hotspot.cxx liquid.cxx
Log Message:
- removed a few unnedded constructors from Sprite
Index: exit.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/exit.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- exit.cxx 21 Oct 2003 11:01:52 -0000 1.10
+++ exit.cxx 22 Oct 2003 12:35:47 -0000 1.11
@@ -34,7 +34,8 @@
Exit::Exit (const WorldObjsData::ExitData& data_)
: data(new WorldObjsData::ExitData(data_)),
- sprite(data->desc, 10.0f),
+ sprite(data->desc.res_name, data->desc.datafile,
+ 10.0f),
flag("misc/flag" + to_string(data->owner_id), "core"),
smallmap_symbol("misc/smallmap_exit", "core")
{
Index: hotspot.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/hotspot.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- hotspot.cxx 19 Oct 2003 12:25:47 -0000 1.8
+++ hotspot.cxx 22 Oct 2003 12:35:47 -0000 1.9
@@ -28,7 +28,7 @@
Hotspot::Hotspot (const WorldObjsData::HotspotData& data_)
: data(new WorldObjsData::HotspotData(data_)),
- sprite(data->desc)
+ sprite(data->desc.res_name, data->desc.datafile)
{
if (verbose > 2)
std::cout << "Creating Hotspot" << std::endl;
Index: liquid.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/liquid.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- liquid.cxx 20 Oct 2003 13:11:09 -0000 1.11
+++ liquid.cxx 22 Oct 2003 12:35:47 -0000 1.12
@@ -30,7 +30,9 @@
Liquid::Liquid (const WorldObjsData::LiquidData& data_) :
data(new WorldObjsData::LiquidData(data_)),
- sur(data->desc, (data->speed == 0) ? 30 : 1000.0f/data->speed)
+ sur(data->desc.res_name,
+ data->desc.datafile,
+ (data->speed == 0) ? 30 : 1000.0f/data->speed)
{
if (!data->old_width_handling)
data->width *= sur.get_width();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/worldobjs exit.cxx, 1.10, 1.11 hotspot.cxx, 1.8, 1.9 liquid.cxx, 1.11, 1.12,
Ingo Ruhnke <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src menu_button.cxx, 1.14, 1.15 sprite.cxx, 1.18, 1.19 sprite.hxx, 1.14, 1.15
- Next by Date:
[Pingus-CVS] [bug #6235] Crash at startup
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src menu_button.cxx, 1.14, 1.15 sprite.cxx, 1.18, 1.19 sprite.hxx, 1.14, 1.15
- Next by thread:
[Pingus-CVS] [bug #6235] Crash at startup
- Index(es):