super-tux-commit

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux/src/trigger
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29597/src/trigger

Modified Files:
	door.cpp sequence_trigger.cpp sequence_trigger.h 
	trigger_base.cpp 
Log Message:
added jam build system, please try it out - the advantage would be that it already supports all the stuff we need

Index: door.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/trigger/door.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- door.cpp	20 Nov 2004 22:14:40 -0000	1.1
+++ door.cpp	23 Nov 2004 16:47:26 -0000	1.2
@@ -87,7 +87,7 @@
 }
 
 void
-Door::event(Player& player, EventType type)
+Door::event(Player& , EventType type)
 {
   if(type == EVENT_ACTIVATE) {
     sprite->set_action("open");

Index: sequence_trigger.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/trigger/sequence_trigger.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sequence_trigger.h	20 Nov 2004 22:14:40 -0000	1.1
+++ sequence_trigger.h	23 Nov 2004 16:47:26 -0000	1.2
@@ -7,7 +7,7 @@
 class SequenceTrigger : public TriggerBase, public Serializable
 {
 public:
-  SequenceTrigger(LispReader& reader, const std::string& sequence);
+  SequenceTrigger(LispReader& reader);
   SequenceTrigger(const Vector& pos, const std::string& sequence);
   ~SequenceTrigger();
  

Index: trigger_base.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/trigger/trigger_base.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- trigger_base.cpp	20 Nov 2004 22:14:40 -0000	1.1
+++ trigger_base.cpp	23 Nov 2004 16:47:26 -0000	1.2
@@ -48,7 +48,7 @@
 }
 
 HitResponse
-TriggerBase::collision(GameObject& other, const CollisionHit& collhit)
+TriggerBase::collision(GameObject& other, const CollisionHit& )
 {
   Player* player = dynamic_cast<Player*> (&other);
   if(player) {

Index: sequence_trigger.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/trigger/sequence_trigger.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sequence_trigger.cpp	20 Nov 2004 22:14:40 -0000	1.1
+++ sequence_trigger.cpp	23 Nov 2004 16:47:26 -0000	1.2
@@ -4,9 +4,9 @@
 #include "utils/lispwriter.h"
 #include "gameloop.h"
 
-SequenceTrigger::SequenceTrigger(LispReader& reader,
-    const std::string& sequence)
+SequenceTrigger::SequenceTrigger(LispReader& reader)
 {
+  (void) reader;
   // TODO
 }
 
@@ -38,7 +38,7 @@
 }
 
 void
-SequenceTrigger::event(Player& player, EventType type)
+SequenceTrigger::event(Player& , EventType type)
 {
   if(type == triggerevent) {
     GameSession::current()->start_sequence(sequence_name);