projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Magic Blocks. (DrawingContext::get_light is not working yet.)
[supertux.git]
/
src
/
object
/
gameobjs.cpp
diff --git
a/src/object/gameobjs.cpp
b/src/object/gameobjs.cpp
index
7e4a983
..
bcbbdd5
100644
(file)
--- a/
src/object/gameobjs.cpp
+++ b/
src/object/gameobjs.cpp
@@
-1,8
+1,7
@@
// $Id$
// $Id$
-//
+//
// SuperTux
// SuperTux
-// Copyright (C) 2000 Bill Kendrick <bill@newbreedsoftware.com>
-// Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
+// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@
-13,11
+12,11
@@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
+
#include <config.h>
#include <algorithm>
#include <config.h>
#include <algorithm>
@@
-36,6
+35,7
@@
#include "video/drawing_context.hpp"
#include "camera.hpp"
#include "main.hpp"
#include "video/drawing_context.hpp"
#include "camera.hpp"
#include "main.hpp"
+#include "random_generator.hpp"
BouncyCoin::BouncyCoin(const Vector& pos)
: position(pos)
BouncyCoin::BouncyCoin(const Vector& pos)
: position(pos)
@@
-62,7
+62,7
@@
BouncyCoin::update(float elapsed_time)
void
BouncyCoin::draw(DrawingContext& context)
{
void
BouncyCoin::draw(DrawingContext& context)
{
- sprite->draw(context, position, LAYER_OBJECTS);
+ sprite->draw(context, position, LAYER_OBJECTS
+ 5
);
}
//---------------------------------------------------------------------------
}
//---------------------------------------------------------------------------
@@
-92,7
+92,7
@@
void
BrokenBrick::draw(DrawingContext& context)
{
sprite->draw_part(context,
BrokenBrick::draw(DrawingContext& context)
{
sprite->draw_part(context,
- Vector(
rand() % 16, rand() % 16
), Vector(16, 16),
+ Vector(
systemRandom.rand(16), systemRandom.rand(16)
), Vector(16, 16),
position, LAYER_OBJECTS + 1);
}
position, LAYER_OBJECTS + 1);
}
@@
-175,4
+175,3
@@
SmokeCloud::draw(DrawingContext& context)
{
sprite->draw(context, position, LAYER_OBJECTS+1);
}
{
sprite->draw(context, position, LAYER_OBJECTS+1);
}
-