projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Big CMakeLists update.
[supertux.git]
/
src
/
trigger
/
scripttrigger.hpp
diff --git
a/src/trigger/scripttrigger.hpp
b/src/trigger/scripttrigger.hpp
index
a5ded1d
..
7394734
100644
(file)
--- a/
src/trigger/scripttrigger.hpp
+++ b/
src/trigger/scripttrigger.hpp
@@
-1,7
+1,7
@@
// $Id$
//
// SuperTux
// $Id$
//
// 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
@@
-15,8
+15,7
@@
//
// 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.
#ifndef __SCRIPTTRIGGER_H__
#define __SCRIPTTRIGGER_H__
#ifndef __SCRIPTTRIGGER_H__
#define __SCRIPTTRIGGER_H__
@@
-30,10
+29,10
@@
public:
ScriptTrigger(const lisp::Lisp& reader);
ScriptTrigger(const Vector& pos, const std::string& script);
~ScriptTrigger();
ScriptTrigger(const lisp::Lisp& reader);
ScriptTrigger(const Vector& pos, const std::string& script);
~ScriptTrigger();
-
+
void write(lisp::Writer& writer);
void event(Player& player, EventType type);
void write(lisp::Writer& writer);
void event(Player& player, EventType type);
-
+
private:
EventType triggerevent;
std::string script;
private:
EventType triggerevent;
std::string script;