projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The BIG COMMIT(tm)
[supertux.git]
/
src
/
particlesystem.cpp
diff --git
a/src/particlesystem.cpp
b/src/particlesystem.cpp
index
c21d109
..
5bda1bc
100644
(file)
--- a/
src/particlesystem.cpp
+++ b/
src/particlesystem.cpp
@@
-17,14
+17,17
@@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include "particlesystem.h"
+
+#include <config.h>
#include <iostream>
#include <iostream>
-#include <math.h>
-#include "globals.h"
-#include "lispreader.h"
-#include "lispwriter.h"
-#include "screen/drawing_context.h"
+#include <cmath>
+
+#include "particlesystem.h"
+#include "app/globals.h"
+#include "utils/lispreader.h"
+#include "utils/lispwriter.h"
+#include "video/drawing_context.h"
ParticleSystem::ParticleSystem()
{
ParticleSystem::ParticleSystem()
{
@@
-70,9
+73,9
@@
void ParticleSystem::draw(DrawingContext& context)
SnowParticleSystem::SnowParticleSystem()
{
SnowParticleSystem::SnowParticleSystem()
{
- snowimages[0] = new Surface(datadir+"/images/shared/snow0.png",
USE_ALPHA
);
- snowimages[1] = new Surface(datadir+"/images/shared/snow1.png",
USE_ALPHA
);
- snowimages[2] = new Surface(datadir+"/images/shared/snow2.png",
USE_ALPHA
);
+ snowimages[0] = new Surface(datadir+"/images/shared/snow0.png",
true
);
+ snowimages[1] = new Surface(datadir+"/images/shared/snow1.png",
true
);
+ snowimages[2] = new Surface(datadir+"/images/shared/snow2.png",
true
);
virtual_width = screen->w * 2;
virtual_width = screen->w * 2;
@@
-127,7
+130,7
@@
void SnowParticleSystem::action(float elapsed_time)
CloudParticleSystem::CloudParticleSystem()
{
CloudParticleSystem::CloudParticleSystem()
{
- cloudimage = new Surface(datadir + "/images/shared/cloud.png",
USE_ALPHA
);
+ cloudimage = new Surface(datadir + "/images/shared/cloud.png",
true
);
virtual_width = 2000.0;
virtual_width = 2000.0;