[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/entrances woodthing.cxx,1.2,1.3 woodt
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/entrances woodthing.cxx,1.2,1.3 woodthing.hxx,1.3,1.4 |
Date: |
18 Sep 2002 12:07:15 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/entrances
In directory dark:/tmp/cvs-serv8439/entrances
Modified Files:
woodthing.cxx woodthing.hxx
Log Message:
- some fixes to the woodthing entrance
Index: woodthing.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/entrances/woodthing.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- woodthing.cxx 13 Jun 2002 14:25:13 -0000 1.2
+++ woodthing.cxx 18 Sep 2002 12:07:13 -0000 1.3
@@ -21,6 +21,7 @@
#include "../world.hxx"
#include "../pingus_resource.hxx"
#include "../particles/smoke_particle.hxx"
+#include "../graphic_context.hxx"
#include "../algo.hxx"
#include "woodthing.hxx"
@@ -59,20 +60,12 @@
}
void
-WoodThing::draw_offset(int x, int y, float s)
+WoodThing::draw(GraphicContext& gc)
{
- if (s == 1.0)
- {
- surface.put_screen(int(pos.x - (surface.get_width()/2) + x),
- int(pos.y - surface.get_height() + 32 + y),
- counter);
- }
- else
- {
- surface.put_screen((int)((pos.x-32 + x) * s),
- (int)((pos.y-16 + y) * s),
- s, s);
- }
+ gc.draw(surface,
+ int(pos.x - (surface.get_width()/2)),
+ int(pos.y - surface.get_height() + 32),
+ counter);
}
Index: woodthing.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/entrances/woodthing.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- woodthing.hxx 23 Aug 2002 15:49:55 -0000 1.3
+++ woodthing.hxx 18 Sep 2002 12:07:13 -0000 1.4
@@ -33,7 +33,7 @@
WoodThing(EntranceData);
void update(float delta);
- void draw_offset(int x, int y, float s = 1.0);
+ void draw(GraphicContext& gc);
private:
WoodThing (const WoodThing&);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/entrances woodthing.cxx,1.2,1.3 woodthing.hxx,1.3,1.4,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src hotspot.cxx,1.5,1.6 pingu_holder.cxx,1.8,1.9 pingu_holder.hxx,1.5,1.6
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.102,1.103 worldobj_data_factory.cxx,1.20,1.21
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src hotspot.cxx,1.5,1.6 pingu_holder.cxx,1.8,1.9 pingu_holder.hxx,1.5,1.6
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.102,1.103 worldobj_data_factory.cxx,1.20,1.21
- Index(es):