projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix issue with action not being updated when typing grow()/fire()/etc in console...
[supertux.git]
/
src
/
object
/
fireworks.cpp
diff --git
a/src/object/fireworks.cpp
b/src/object/fireworks.cpp
index
62904c5
..
d3037ea
100644
(file)
--- a/
src/object/fireworks.cpp
+++ b/
src/object/fireworks.cpp
@@
-1,7
+1,7
@@
// $Id$
// $Id$
-//
+//
// SuperTux
// SuperTux
-// Copyright (C) 200
5
Matthias Braun <matze@braunis.de>
+// Copyright (C) 200
6
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
@@
-12,25
+12,27
@@
// 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 "fireworks.hpp"
#include "resources.hpp"
#include "sector.hpp"
#include "camera.hpp"
#include <config.h>
#include "fireworks.hpp"
#include "resources.hpp"
#include "sector.hpp"
#include "camera.hpp"
-#include "
gameobj
s.hpp"
+#include "
particle
s.hpp"
#include "main.hpp"
#include "video/drawing_context.hpp"
#include "audio/sound_manager.hpp"
#include "main.hpp"
#include "video/drawing_context.hpp"
#include "audio/sound_manager.hpp"
+#include "random_generator.hpp"
Fireworks::Fireworks()
{
Fireworks::Fireworks()
{
- timer.start(.2);
+ timer.start(.2f);
+ sound_manager->preload("sounds/fireworks.wav");
}
Fireworks::~Fireworks()
}
Fireworks::~Fireworks()
@@
-43,16
+45,20
@@
Fireworks::update(float )
if(timer.check()) {
Sector* sector = Sector::current();
Vector pos = sector->camera->get_translation();
if(timer.check()) {
Sector* sector = Sector::current();
Vector pos = sector->camera->get_translation();
- pos += Vector(
SCREEN_WIDTH * ((float) rand() / RAND_MAX
),
-
SCREEN_HEIGHT/2 * ((float) rand() / RAND_MAX
));
+ pos += Vector(
systemRandom.randf(SCREEN_WIDTH
),
+
systemRandom.randf(SCREEN_HEIGHT/2
));
- int red = rand() % 255;
- int green = rand() % red;
+ float red = systemRandom.randf(1.0);
+ float green = systemRandom.randf(1.0);
+ //float red = 0.7;
+ //float green = 0.9;
+ (void) red;
+ (void) green;
sector->add_object(new Particles(pos, 0, 360, Vector(140, 140),
sector->add_object(new Particles(pos, 0, 360, Vector(140, 140),
- Vector(0, 0), 45, Color(red, green, 0), 3, 1.3,
+ Vector(0, 0), 45, Color(red, green, 0), 3, 1.3
f
,
LAYER_FOREGROUND1+1));
sound_manager->play("sounds/fireworks.wav");
LAYER_FOREGROUND1+1));
sound_manager->play("sounds/fireworks.wav");
- timer.start(
((float) rand() / RAND_MAX) + .5
);
+ timer.start(
systemRandom.randf(1.0, 1.5)
);
}
}
}
}