[Super-tux-commit] supertux/src door.cpp,NONE,1.1 door.h,NONE,1.1 interactive_object.cpp,NONE,1.1 in
Brought to you by:
wkendrick
Menu
▾
▴
[Super-tux-commit] supertux/src door.cpp,NONE,1.1 door.h,NONE,1.1 interactive_object.cpp,NONE,1.1 interactive_object.h,NONE,1.1 Makefile.am,1.30,1.31 badguy.cpp,1.100,1.101 configfile.cpp,1.5,1.6 gameloop.cpp,1.141,1.142 gameloop.h,1.51,1.52 moving_object.cpp,1.2,1.3 moving_object.h,1.2,1.3 player.cpp,1.132,1.133 player.h,1.66,1.67 sector.cpp,1.1,1.2 sector.h,1.1,1.2 setup.cpp,1.87,1.88 vector.cpp,1.1,1.2 vector.h,1.3,1.4
|
From: Matze B. <mat...@us...> - 2004-05-31 13:43:50
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4137/src Modified Files: Makefile.am badguy.cpp configfile.cpp gameloop.cpp gameloop.h moving_object.cpp moving_object.h player.cpp player.h sector.cpp sector.h setup.cpp vector.cpp vector.h Added Files: door.cpp door.h interactive_object.cpp interactive_object.h Log Message: a first implementation of doors to switch between sectors Index: moving_object.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/moving_object.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- moving_object.cpp 20 May 2004 23:07:25 -0000 1.2 +++ moving_object.cpp 31 May 2004 13:43:30 -0000 1.3 @@ -1,3 +1,21 @@ +// $Id$ +// +// SuperTux - A Jump'n Run +// Copyright (C) 2004 Matthias Braun <ma...@br... +// +// 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 distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// 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. #include "moving_object.h" MovingObject::MovingObject() Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- player.h 31 May 2004 02:40:30 -0000 1.66 +++ player.h 31 May 2004 13:43:30 -0000 1.67 @@ -52,6 +52,7 @@ { public: int jump; + int activate; int duck; int left; int right; @@ -71,6 +72,7 @@ int down; int fire; int old_fire; + int activate; }; void player_input_init(player_input_type* pplayer_input); --- NEW FILE: door.h --- // $Id: door.h,v 1.1 2004/05/31 13:43:30 matzebraun Exp $ // // SuperTux - A Jump'n Run // Copyright (C) 2004 Matthias Braun <ma...@br... // // 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 distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // 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 __DOOR_H__ #define __DOOR_H__ #include <string> #include "interactive_object.h" #include "serializable.h" class Sprite; class LispReader; class Door : public InteractiveObject, public Serializable { public: Door(LispReader& reader); virtual ~Door(); virtual void write(LispWriter& writer); virtual void action(float elapsed_time); virtual void draw(DrawingContext& context); virtual void interaction(InteractionType type); private: Sprite* sprite; std::string target_sector; std::string target_spawnpoint; }; #endif Index: sector.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- sector.cpp 31 May 2004 02:40:30 -0000 1.1 +++ sector.cpp 31 May 2004 13:43:30 -0000 1.2 @@ -1,3 +1,21 @@ +// $Id$ +// +// SuperTux - A Jump'n Run +// Copyright (C) 2004 Matthias Braun <ma...@br... +// +// 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 distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// 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. #include "sector.h" #include <memory> @@ -18,6 +36,8 @@ #include "music_manager.h" #include "gameloop.h" #include "resources.h" +#include "interactive_object.h" +#include "door.h" Sector* Sector::_current = 0; @@ -78,6 +98,7 @@ reader.read_string("name", sp->name); reader.read_float("x", sp->pos.x); reader.read_float("y", sp->pos.y); + spawnpoints.push_back(sp); } else if(token == "tilemap") { TileMap* tilemap = new TileMap(reader); add_object(tilemap); @@ -103,12 +124,17 @@ CloudParticleSystem* partsys = new CloudParticleSystem(); partsys->parse(reader); add_object(partsys); + } else if(token == "door") { + add_object(new Door(reader)); + } else { + std::cerr << "Unknown object type '" << token << "'.\n"; } } if(!camera) { - std::cerr << "sector does not contain a camera.\n"; + std::cerr << "sector '" << name << "' does not contain a camera.\n"; camera = new Camera(this); + add_object(camera); } if(!solids) throw std::runtime_error("sector does not contain a solid tile layer."); @@ -264,9 +290,10 @@ FlyingPlatform* flying_platform = dynamic_cast<FlyingPlatform*> (object); if(flying_platform) flying_platforms.push_back(flying_platform); - Background* background = dynamic_cast<Background*> (object); - if(background) - this->background = background; + InteractiveObject* interactive_object + = dynamic_cast<InteractiveObject*> (object); + if(interactive_object) + interactive_objects.push_back(interactive_object); gameobjects.push_back(object); } @@ -338,6 +365,13 @@ std::remove(bullets.begin(), bullets.end(), bullet), bullets.end()); } + InteractiveObject* interactive_object = + dynamic_cast<InteractiveObject*> (*i); + if(interactive_object) { + interactive_objects.erase( + std::remove(interactive_objects.begin(), interactive_objects.end(), + interactive_object), interactive_objects.end()); + } Upgrade* upgrade = dynamic_cast<Upgrade*> (*i); if(upgrade) { upgrades.erase( Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v retrieving revision 1.87 retrieving revision 1.88 diff -u -d -r1.87 -r1.88 --- setup.cpp 30 May 2004 01:08:49 -0000 1.87 +++ setup.cpp 31 May 2004 13:43:30 -0000 1.88 @@ -424,6 +424,8 @@ options_keys_menu->additem(MN_CONTROLFIELD_KB,"Right move", 0,0, 0,&keymap.right); options_keys_menu->additem(MN_CONTROLFIELD_KB,"Jump", 0,0, 0,&keymap.jump); options_keys_menu->additem(MN_CONTROLFIELD_KB,"Duck", 0,0, 0,&keymap.duck); + options_keys_menu->additem(MN_CONTROLFIELD_KB,"Activate", 0, 0, 0, + &keymap.activate); options_keys_menu->additem(MN_CONTROLFIELD_KB,"Power/Run", 0,0, 0,&keymap.fire); options_keys_menu->additem(MN_HL,"",0,0); options_keys_menu->additem(MN_BACK,"Back",0,0); Index: moving_object.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/moving_object.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- moving_object.h 20 May 2004 23:07:25 -0000 1.2 +++ moving_object.h 31 May 2004 13:43:30 -0000 1.3 @@ -1,3 +1,21 @@ +// $Id$ +// +// SuperTux - A Jump'n Run +// Copyright (C) 2004 Matthias Braun <ma...@br... +// +// 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 distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// 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 __MOVING_OBJECT_H__ #define __MOVING_OBJECT_H__ Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- badguy.cpp 31 May 2004 13:02:21 -0000 1.100 +++ badguy.cpp 31 May 2004 13:43:28 -0000 1.101 @@ -989,12 +989,9 @@ else sprite->draw(context, Vector(base.x, base.y), LAYER_OBJECTS); - if(debug_mode) // draw hotpoint - { - float scroll_x = context.get_translation().x; - float scroll_y = context.get_translation().y; - fillrect(base.x - scroll_x, base.y - scroll_y, base.width, base.height, 75,0,75, 150); - } + if(debug_mode) + context.draw_filled_rect(Vector(base.x, base.y), + Vector(base.width, base.height), Color(75,0,75, 150), LAYER_OBJECTS+1); } void Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.141 retrieving revision 1.142 diff -u -d -r1.141 -r1.142 --- gameloop.cpp 31 May 2004 02:40:30 -0000 1.141 +++ gameloop.cpp 31 May 2004 13:43:30 -0000 1.142 @@ -316,6 +316,19 @@ switch(key) { + case SDLK_a: + if(debug_mode) + { + char buf[160]; + snprintf(buf, sizeof(buf), "P: %4.1f,%4.1f", + tux.base.x, tux.base.y); + context->draw_text(white_text, buf, + Vector(0, screen->h - white_text->get_height()), + LAYER_FOREGROUND1); + context->do_drawing(); + SDL_Delay(1000); + } + break; case SDLK_p: if(!Menu::current()) { @@ -334,13 +347,7 @@ case SDLK_TAB: if(debug_mode) { - tux.size = !tux.size; - if(tux.size == BIG) - { - tux.base.height = 64; - } - else - tux.base.height = 32; + tux.grow(false); } break; case SDLK_END: @@ -437,19 +444,9 @@ Player* tux = currentsector->player; /* End of level? */ - int endpos = (currentsector->solids->get_width() - 5) * 32; Tile* endtile = collision_goal(tux->base); - // fallback in case the other endpositions don't trigger - if (!end_sequence && tux->base.x >= endpos) - { - end_sequence = ENDSEQUENCE_WAITING; - last_x_pos = -1; - music_manager->play_music(level_end_song, 0); - endsequence_timer.start(7000); - tux->invincible_timer.start(7000); //FIXME: Implement a winning timer for the end sequence (with special winning animation etc.) - } - else if(end_sequence && !endsequence_timer.check()) + if(end_sequence && !endsequence_timer.check()) { exit_status = ES_LEVEL_FINISHED; return; @@ -491,6 +488,15 @@ // Update Tux and the World currentsector->action(frame_ratio); } + + // respawning in new sector? + if(newsector != "" && newspawnpoint != "") { + Sector* sector = level->get_sector(newsector); + currentsector = sector; + currentsector->activate(newspawnpoint); + currentsector->play_music(LEVEL_MUSIC); + newsector = newspawnpoint = ""; + } } void @@ -670,6 +676,13 @@ return exit_status; } +void +GameSession::respawn(const std::string& sector, const std::string& spawnpoint) +{ + newsector = sector; + newspawnpoint = spawnpoint; +} + /* Bounce a brick: */ void bumpbrick(float x, float y) { Index: gameloop.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.h,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- gameloop.h 31 May 2004 02:40:30 -0000 1.51 +++ gameloop.h 31 May 2004 13:43:30 -0000 1.52 @@ -72,6 +72,10 @@ bool game_pause; std::string levelname; + + // the sector and spawnpoint we shoudl spawn after this frame + std::string newsector; + std::string newspawnpoint; public: enum ExitStatus { ES_NONE, ES_LEVEL_FINISHED, ES_GAME_OVER, ES_LEVEL_ABORT }; private: @@ -93,6 +97,8 @@ { current_ = this; } static GameSession* current() { return current_; } + void respawn(const std::string& sectorname, + const std::string& spawnpointname); Sector* get_current_sector() { return currentsector; } Index: vector.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/vector.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- vector.h 30 May 2004 01:08:49 -0000 1.3 +++ vector.h 31 May 2004 13:43:30 -0000 1.4 @@ -1,3 +1,21 @@ +// $Id$ +// +// SuperTux - A Jump'n Run +// Copyright (C) 2004 Matthias Braun <ma...@br... +// +// 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 distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// 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 __VECTOR_HPP__ #define __VECTOR_HPP__ Index: sector.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sector.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- sector.h 31 May 2004 02:40:30 -0000 1.1 +++ sector.h 31 May 2004 13:43:30 -0000 1.2 @@ -1,3 +1,21 @@ +// $Id$ +// +// SuperTux - A Jump'n Run +// Copyright (C) 2004 Matthias Braun <ma...@br... +// +// 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 distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// 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 __SECTOR_H__ #define __SECTOR_H__ @@ -10,6 +28,7 @@ #include "screen/drawing_context.h" class GameObject; +class InteractiveObject; class Background; class Player; class Camera; @@ -125,6 +144,8 @@ std::vector<Bullet*> bullets; public: // ugly + typedef std::vector<InteractiveObject*> InteractiveObjects; + InteractiveObjects interactive_objects; typedef std::vector<GameObject*> GameObjects; GameObjects gameobjects; --- NEW FILE: interactive_object.cpp --- // $Id: interactive_object.cpp,v 1.1 2004/05/31 13:43:30 matzebraun Exp $ // // SuperTux - A Jump'n Run // Copyright (C) 2004 Matthias Braun <ma...@br... // // 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 distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // 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. #include "interactive_object.h" InteractiveObject::InteractiveObject() { } InteractiveObject::~InteractiveObject() { } Index: configfile.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/configfile.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- configfile.cpp 31 May 2004 02:40:29 -0000 1.5 +++ configfile.cpp 31 May 2004 13:43:30 -0000 1.6 @@ -100,6 +100,7 @@ reader.read_int ("joystick-deadzone", joystick_keymap.dead_zone); reader.read_int ("keyboard-jump", keymap.jump); + reader.read_int ("keyboard-activate", keymap.activate); reader.read_int ("keyboard-duck", keymap.duck); reader.read_int ("keyboard-left", keymap.left); reader.read_int ("keyboard-right", keymap.right); --- NEW FILE: door.cpp --- // $Id: door.cpp,v 1.1 2004/05/31 13:43:30 matzebraun Exp $ // // SuperTux - A Jump'n Run // Copyright (C) 2004 Matthias Braun <ma...@br... // // 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 distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // 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. #include "door.h" #include "lispreader.h" #include "lispwriter.h" #include "gameloop.h" #include "resources.h" #include "sprite.h" #include "sprite_manager.h" #include "screen/drawing_context.h" Door::Door(LispReader& reader) { reader.read_float("x", area.x); reader.read_float("y", area.y); area.width = 32; area.height = 64; reader.read_string("sector", target_sector); reader.read_string("spawnpoint", target_spawnpoint); sprite = sprite_manager->load("door"); } void Door::write(LispWriter& writer) { writer.start_list("door"); writer.write_float("x", area.x); writer.write_float("y", area.y); writer.write_float("width", area.width); writer.write_float("height", area.height); writer.write_string("sector", target_sector); writer.write_string("spawnpoint", target_spawnpoint); writer.end_list("door"); } Door::~Door() { } void Door::action(float ) { } void Door::draw(DrawingContext& context) { sprite->draw(context, Vector(area.x, area.y), LAYER_TILES); } void Door::interaction(InteractionType type) { if(type == INTERACTION_ACTIVATE) { GameSession::current()->respawn(target_sector, target_spawnpoint); } } Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.132 retrieving revision 1.133 diff -u -d -r1.132 -r1.133 --- player.cpp 31 May 2004 02:40:30 -0000 1.132 +++ player.cpp 31 May 2004 13:43:30 -0000 1.133 @@ -31,6 +31,7 @@ #include "tilemap.h" #include "camera.h" #include "gameobjs.h" +#include "interactive_object.h" #include "screen/screen.h" // behavior definitions: @@ -57,7 +58,8 @@ PlayerKeymap::PlayerKeymap() { - keymap.jump = SDLK_UP; + keymap.jump = SDLK_SPACE; + keymap.activate = SDLK_UP; keymap.duck = SDLK_DOWN; keymap.left = SDLK_LEFT; keymap.right = SDLK_RIGHT; @@ -73,6 +75,7 @@ pplayer_input->right = UP; pplayer_input->up = UP; pplayer_input->old_up = UP; + pplayer_input->activate = UP; } Player::Player() @@ -156,6 +159,23 @@ input.fire = state; return true; } + else if(key == keymap.activate) + { + input.activate = state; + + if(state == DOWN) { + /** check for interactive objects */ + for(Sector::InteractiveObjects::iterator i + = Sector::current()->interactive_objects.begin(); + i != Sector::current()->interactive_objects.end(); ++i) { + if(rectcollision(base, (*i)->get_area())) { + (*i)->interaction(INTERACTION_ACTIVATE); + } + } + } + + return true; + } else return false; } @@ -751,12 +771,9 @@ largetux_star->draw(context, pos, LAYER_OBJECTS + 2); } -#if 0 // TODO if (debug_mode) - fillrect(base.x - viewport.get_translation().x, - base.y - viewport.get_translation().y, - base.width, base.height, 75,75,75, 150); -#endif + context.draw_filled_rect(Vector(base.x, base.y), + Vector(base.width, base.height), Color(75,75,75, 150), LAYER_OBJECTS+1); } void --- NEW FILE: interactive_object.h --- // $Id: interactive_object.h,v 1.1 2004/05/31 13:43:30 matzebraun Exp $ // // SuperTux - A Jump'n Run // Copyright (C) 2004 Matthias Braun <ma...@br... // // 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 distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // 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 __INTERACTIVE_OBJECT_H__ #define __INTERACTIVE_OBJECT_H__ #include "game_object.h" #include "type.h" enum InteractionType { INTERACTION_TOUCH, INTERACTION_ACTIVATE // more to come }; /** This class is the base class for all objects you can interact with in some * way. There are several interaction types defined like touch and activate */ class InteractiveObject : public GameObject { public: InteractiveObject(); virtual ~InteractiveObject(); /** this function is called when an interaction has taken place */ virtual void interaction(InteractionType type) = 0; const base_type& get_area() const { return area; } protected: base_type area; }; #endif Index: vector.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/vector.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- vector.cpp 25 May 2004 00:28:24 -0000 1.1 +++ vector.cpp 31 May 2004 13:43:30 -0000 1.2 @@ -1,3 +1,21 @@ +// $Id$ +// +// SuperTux - A Jump'n Run +// Copyright (C) 2004 Matthias Braun <ma...@br... +// +// 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 distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// 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. #include "vector.h" #include <math.h> Index: Makefile.am =================================================================== RCS file: /cvsroot/super-tux/supertux/src/Makefile.am,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- Makefile.am 31 May 2004 02:40:29 -0000 1.30 +++ Makefile.am 31 May 2004 13:43:28 -0000 1.31 @@ -17,10 +17,14 @@ bitmask.h \ button.cpp \ button.h \ +camera.cpp \ +camera.h \ collision.cpp \ collision.h \ configfile.cpp \ configfile.h \ +door.cpp \ +door.h \ intro.cpp \ intro.h \ defines.h \ @@ -30,6 +34,8 @@ globals.h \ high_scores.cpp \ high_scores.h \ +interactive_object.cpp \ +interactive_object.h \ level.cpp \ level.h \ leveleditor.cpp \ @@ -38,6 +44,12 @@ lispreader.h \ menu.cpp \ menu.h \ +mousecursor.cpp \ +mousecursor.h \ +music_manager.cpp \ +music_manager.h \ +musicref.cpp \ +musicref.h \ particlesystem.cpp \ particlesystem.h \ physic.cpp \ @@ -52,6 +64,10 @@ sound.h \ special.cpp \ special.h \ +sprite.h \ +sprite.cpp \ +sprite_manager.cpp \ +sprite_manager.h \ supertux.cpp \ timer.cpp \ timer.h \ @@ -63,22 +79,10 @@ worldmap.h \ tile.h \ tile.cpp \ -mousecursor.cpp \ -mousecursor.h \ resources.h \ resources.cpp \ gameobjs.h \ gameobjs.cpp \ -sprite.h \ -sprite.cpp \ -sprite_manager.cpp \ -sprite_manager.h \ -music_manager.cpp \ -music_manager.h \ -musicref.cpp \ -musicref.h \ -camera.cpp \ -camera.h \ game_object.cpp \ game_object.h \ drawable.h \ @@ -92,6 +96,6 @@ vector.cpp \ vector.h \ sector.cpp \ -sector.h +sector.h # EOF # |
