X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fthunderstorm.cpp;h=61e60df30b58caf2b7d3f0437da586467858fea3;hb=78ac7aef674f518549f96160c6354b589553f952;hp=1253b352f76beb282d8b7b1157adeacb561e0ba5;hpb=8a627e73d824b5a14249cfe066dc2fdc643ce28d;p=supertux.git

diff --git a/src/object/thunderstorm.cpp b/src/object/thunderstorm.cpp
index 1253b352f..61e60df30 100644
--- a/src/object/thunderstorm.cpp
+++ b/src/object/thunderstorm.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - Thunderstorm Game Object
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
 //
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,35 +12,30 @@
 //  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
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <config.h>
+#include "object/thunderstorm.hpp"
 
-#include "thunderstorm.hpp"
-#include "scripting/squirrel_util.hpp"
 #include "audio/sound_manager.hpp"
-#include "video/drawing_context.hpp"
-#include "object_factory.hpp"
 #include "object/electrifier.hpp"
-
-#include <stdexcept>
-#include <iostream>
-#include "main.hpp"
-#include "resources.hpp"
-#include "sector.hpp"
-#include "gettext.hpp"
-#include "object/player.hpp"
-#include "lisp/list_iterator.hpp"
-#include "log.hpp"
+#include "scripting/squirrel_util.hpp"
+#include "supertux/globals.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
+#include "util/reader.hpp"
 
 namespace {
-	const float LIGHTNING_DELAY = 2.0;
-	const float FLASH_DISPLAY_TIME = 0.1;
+const float LIGHTNING_DELAY = 2.0f;
+const float FLASH_DISPLAY_TIME = 0.1f;
 }
 
-Thunderstorm::Thunderstorm(const lisp::Lisp& reader)
-	: GameObject(reader), running(true), interval(10.0f)
+Thunderstorm::Thunderstorm(const Reader& reader) :
+  running(true),
+  interval(10.0f), 
+  layer(LAYER_BACKGROUNDTILES-1),
+  time_to_thunder(),
+  time_to_lightning(),
+  flash_display_timer()
 {
   reader.get("name", name);
   reader.get("running", running);
@@ -50,6 +43,7 @@ Thunderstorm::Thunderstorm(const lisp::Lisp& reader)
   if(interval <= 0) {
     log_warning << "Running a thunderstorm with non-positive time interval is a bad idea" << std::endl;
   }
+  reader.get("layer", layer);
 
   sound_manager->preload("sounds/explosion.wav");
   sound_manager->preload("sounds/upgrade.wav");
@@ -82,7 +76,7 @@ Thunderstorm::draw(DrawingContext& context)
   float alpha = 0.33f;
   context.push_transform();
   context.set_translation(Vector(0, 0));
-  context.draw_filled_rect(Vector(0, 0), Vector(SCREEN_WIDTH, SCREEN_HEIGHT), Color(1, 1, 1, alpha), LAYER_BACKGROUNDTILES-1);
+  context.draw_filled_rect(Vector(0, 0), Vector(SCREEN_WIDTH, SCREEN_HEIGHT), Color(1, 1, 1, alpha), layer);
   context.pop_transform();
 
 }
@@ -149,3 +143,5 @@ Thunderstorm::electrify()
 }
 
 IMPLEMENT_FACTORY(Thunderstorm, "thunderstorm");
+
+/* EOF */