Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

[supertux.git] / src / video / video_systems.hpp

diff --git a/src/video/video_systems.hpp b/src/video/video_systems.hpp
index 1347f54..c4e79b1 100644 (file)
--- a/src/video/video_systems.hpp
+++ b/src/video/video_systems.hpp
@@ -1,12 +1,10 @@
-//  $Id: video_systems.hpp 5138 2007-08-15 01:02:22Z tuxdev $
-//
 //  SuperTux
 //  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
-//  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,16 +12,15 @@
 //  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.
-#ifndef __RENDER_SYTSTEMS_HPP__
-#define __RENDER_SYTSTEMS_HPP__
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef HEADER_SUPERTUX_VIDEO_VIDEO_SYSTEMS_HPP
+#define HEADER_SUPERTUX_VIDEO_VIDEO_SYSTEMS_HPP
 
 #include <config.h>
 
-#include <string>
 #include <SDL.h>
+#include <string>
 
 class Renderer;
 class Lightmap;
@@ -37,12 +34,14 @@ enum VideoSystem {
   NUM_SYSTEMS
 };
 
-Renderer *new_renderer();
-Lightmap *new_lightmap();
-Texture *new_texture(SDL_Surface *image);
-void *new_surface_data(const Surface &surface);
-void free_surface_data(void *surface_data);
+Renderer* new_renderer();
+Lightmap* new_lightmap();
+Texture*  new_texture(SDL_Surface *image);
+void*     new_surface_data(const Surface &surface);
+void      free_surface_data(void *surface_data);
 VideoSystem get_video_system(const std::string &video);
 std::string get_video_string(VideoSystem video);
 
 #endif
+
+/* EOF */