From: Ondřej Hošek Date: Mon, 16 May 2005 12:13:59 +0000 (+0000) Subject: * svn:ignored .externalToolBuilders in root directory (Eclipse+CDT) X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=0676f7c09ab0d99e5b6a3bf74b9e2b62aaa885d4;p=supertux.git * svn:ignored .externalToolBuilders in root directory (Eclipse+CDT) * Updated dependencies in scripting Jamfile (no more "using independent target") * Added a badguy variable that can be set to true to avoid being counted by the statistics system (by default, immortal badguys like the stalactite or the fireball and bosses like Nolok or the Yeti are ignored) * Renamed supertux.apsepc to supertux.apspec * Updated Czech translation again * Fixed Jamfiles to enable a working "install" target SVN-Revision: 2494 --- diff --git a/Jamfile b/Jamfile index 3c40e4a42..6aaabd60b 100644 --- a/Jamfile +++ b/Jamfile @@ -13,6 +13,6 @@ Package INSTALL NEWS README COPYING AUTHORS ChangeLog ; MakePot data/locale/messages.pot : $(TRANSLATABLE_SOURCES) ; XGETTEXT_FLAGS on data/locale/messages.pot += --language=C++ ; -InstallPixmap data/images/supertux.png data/images/supertux.xpm ; +InstallPixmap data/images/engine/icons/supertux.png data/images/engine/icons/supertux.xpm ; InstallDesktop supertux.desktop ; InstallDoc NEWS README COPYING AUTHORS ChangeLog ; diff --git a/data/Jamfile b/data/Jamfile index 923d1b831..c61c3188a 100644 --- a/data/Jamfile +++ b/data/Jamfile @@ -1,21 +1,71 @@ SubDir TOP data ; IMAGEPATHS = - images - images/background - images/fonts - images/highscore - images/icons - images/intro - images/leveleditor - images/map - images/shared - images/shared/smalltux - images/shared/bigtux - images/status - images/tilesets - images/title - images/worldmap + images/tiles + images/tiles/goal + images/tiles/grey + images/tiles/lava + images/tiles/pipe + images/tiles/pole + images/tiles/snow + images/tiles/darksnow + images/tiles/signs + images/tiles/water + images/tiles/doodads + images/tiles/waterfall + images/tiles/auxiliary + images/tiles/background + images/tiles/blocks + images/tiles/forest + images/tiles/jungle + images/tiles/worldmap + images/background + images/powerups + images/powerups/1up + images/powerups/egg + images/powerups/star + images/powerups/ice_flower + images/powerups/fire_flower + images/engine + images/engine/menu + images/engine/fonts + images/engine/icons + images/engine/editor + images/objects + images/objects/bell + images/objects/coin + images/objects/door + images/objects/particles + images/objects/hatch + images/objects/flying_platform + images/objects/bonus_block + images/objects/unstable_tile + images/objects/trampoline + images/objects/bullets + images/creatures + images/creatures/fish + images/creatures/yeti + images/creatures/snowball + images/creatures/tux_small + images/creatures/dispenser + images/creatures/mr_iceblock + images/creatures/flame + images/creatures/jumpy + images/creatures/nolok + images/creatures/spike + images/creatures/spiky + images/creatures/stalactite + images/creatures/mr_bomb + images/creatures/mr_tree + images/creatures/flying_snowball + images/creatures/tux_big + images/creatures/flame_fish + images/creatures/tux_grow + images/creatures/poison_ivy + images/creatures/zeekling + images/creatures/mr_rocket + images/creatures/bouncing_snowball + images/creatures/dummyguy ; for p in $(IMAGEPATHS) { @@ -44,5 +94,5 @@ for p in $(LEVELPATHS) { } InstallData [ Wildcard *.txt ] ; InstallData [ Wildcard music : *.mod *.ogg ] : music ; -InstallData [ Wildcard sound : *.wav ] : sound ; +InstallData [ Wildcard sounds : *.wav ] : sounds ; InstallData [ Wildcard locale : *.po ] : locale ; diff --git a/data/cs.po b/data/cs.po index e869af1a9..9c37d7566 100644 --- a/data/cs.po +++ b/data/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: SuperTux 0.2\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2005-05-13 17:34+0100\n" +"PO-Revision-Date: 2005-05-15 14:52+0100\n" "Last-Translator: Ondřej HoÅ¡ek \n" "Language-Team: Czech\n" "MIME-Version: 1.0\n" @@ -16,7 +16,7 @@ msgstr "" #: data/credits.txt:6 msgid "" "-- SuperTux -\n" -"\tOn the way to Milestone 2\n" +"\tMilestone 2\n" "\n" "\n" "-Maintainer\n" @@ -24,7 +24,7 @@ msgid "" "\tTobias (tobgle) Glaesser\n" "\n" "\n" -"-Originally developed by\n" +"-Original Developer\n" "\n" "\tBill Kendrick\n" "\n" @@ -61,6 +61,8 @@ msgid "" "\n" "\tBenjamin P. (litespeed) Jung\n" "\n" +"\tStephen Groundwater\n" +"\n" "\n" "-Level Design\n" "\n" @@ -89,6 +91,19 @@ msgid "" "\tCDROMs and FTP sites\n" "\n" "\n" +"-Translation\n" +"\n" +"\tAntoni Villalonga\n" +"\tOndra Hosek\n" +"\tMatthias Braun\n" +"\tJavier Beaumont\n" +"\tFrederic Rodrigo\n" +"\tIknos\n" +"\tFrank van der Loo\n" +"\tKarl Ove Hufthammer\n" +"\tRicardo Cruz\n" +"\n" +"\n" "-Thanks to\n" "\n" "\tLarry Ewing\n" @@ -124,10 +139,10 @@ msgid "" "\n" "\n" "\n" -"\tSee you soon in Milestone 2!" +"\tSee you soon in Milestone 3!" msgstr "" "-- SuperTux -\n" -"\tNa cestě k druhému milníku\n" +"\tDruhý milník\n" "\n" "\n" "-Udržovatel\n" @@ -135,7 +150,7 @@ msgstr "" "\tTobias (tobgle) Glaesser\n" "\n" "\n" -"-Původní udržovatel\n" +"-Původní vývojář\n" "\n" "\tBill Kendrick\n" "\n" @@ -172,6 +187,8 @@ msgstr "" "\n" "\tBenjamin P. (litespeed) Jung\n" "\n" +"\tStephen Groundwater\n" +"\n" "\n" "-Úrovně\n" "\n" @@ -200,6 +217,19 @@ msgstr "" "\tCD-ROMy a servery FTP\n" "\n" "\n" +"-Překlad\n" +"\n" +"\tAntoni Villalonga\n" +"*Ondra HoÅ¡ek\n" +"\tMatthias Braun\n" +"\tJavier Beaumont\n" +"\tFrederic Rodrigo\n" +"\tIknos\n" +"\tFrank van der Loo\n" +"\tKarl Ove Hufthammer\n" +"\tRicardo Cruz\n" +"\n" +"\n" "-Děkujeme\n" "\n" "\tLarrymu Ewingovi\n" @@ -235,5 +265,5 @@ msgstr "" "\n" "\n" "\n" -"\tNa shledanou u druhého milníku!" +"\tNa shledanou u třetího milníku!" diff --git a/data/locale/cs.po b/data/locale/cs.po index 0e6eb72da..a0d5d1428 100644 --- a/data/locale/cs.po +++ b/data/locale/cs.po @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: SuperTux 0.2\n" -"POT-Creation-Date: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-05-16 13:28+0200\n" "PO-Revision-Date: 2005-05-12 20:08+0100\n" "Last-Translator: Ondřej HoÅ¡ek \n" "Language-Team: Czech\n" @@ -15,65 +16,50 @@ msgstr "" "X-Poedit-Language: Czech\n" "X-Poedit-Country: CZECH REPUBLIC\n" -#: src/worldmap.cpp:756 +#: src/worldmap.cpp:813 msgid "GAMEOVER" msgstr "KONEC HRY" -#: src/worldmap.cpp:759 -#: src/game_session.cpp:799 +#: src/worldmap.cpp:816 src/game_session.cpp:748 #, c-format msgid "COINS: %d" msgstr "MINCE: %d" -#: src/worldmap.cpp:764 +#: src/worldmap.cpp:821 msgid "Total Statistics" msgstr "Celková statistika" -#: src/worldmap.cpp:894 -#: src/game_session.cpp:720 -msgid "SCORE" -msgstr "SKÓRÉ" - -#: src/worldmap.cpp:898 -#: src/game_session.cpp:741 -#: src/game_session.cpp:742 +#: src/player_status.cpp:132 msgid "COINS" msgstr "MINCE" -#: src/worldmap.cpp:919 -#: src/worldmap.cpp:920 -#: src/game_session.cpp:763 -#: src/game_session.cpp:764 +#: src/player_status.cpp:155 msgid "LIVES" msgstr "ŽIVOTY" -#: src/title.cpp:122 -#: src/misc.cpp:80 +#: src/title.cpp:122 src/misc.cpp:80 msgid "Contrib Levels" msgstr "Přispěné úrovně" -#: src/title.cpp:141 -#: src/title.cpp:214 -#: src/misc.cpp:96 -#: src/misc.cpp:106 -#: src/leveleditor.cpp:86 -#: src/leveleditor.cpp:96 -#: src/control/joystickkeyboardcontroller.cpp:539 -#: src/control/joystickkeyboardcontroller.cpp:623 +#: src/title.cpp:141 src/title.cpp:212 src/misc.cpp:96 src/misc.cpp:106 +#: src/control/joystickkeyboardcontroller.cpp:554 +#: src/control/joystickkeyboardcontroller.cpp:638 msgid "Back" msgstr "Zpět" -#: src/title.cpp:341 +#: src/title.cpp:339 msgid "" "Copyright (c) 2005 SuperTux Devel Team\n" -"This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to\n" +"This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you " +"are welcome to\n" "redistribute it under certain conditions; see the file COPYING for details.\n" msgstr "" "Copyright (c) 2005 Tým vývojářů SuperTuxu\n" -"Tato hra přichází BEZ JAKÉKOLIV ZÁRUKY. Tento program je volný software, smíš jej\n" +"Tato hra přichází BEZ JAKÉKOLIV ZÁRUKY. Tento program je volný software, " +"smíš jej\n" "distribuovat dle pokynů v souboru COPYING.\n" -#: src/title.cpp:402 +#: src/title.cpp:400 msgid "Are you sure you want to delete slot" msgstr "Opravdu chcete smazat uloženou hru" @@ -149,20 +135,15 @@ msgstr "Nejvíce zneÅ¡kod. protivníků: %d / %d" msgid "Min time needed: %d / %d" msgstr "Nejméně upotřebeného času: %d / %d" -#: src/misc.cpp:79 -#: src/misc.cpp:98 +#: src/misc.cpp:79 src/misc.cpp:98 msgid "Start Game" msgstr "Spustit hru" -#: src/misc.cpp:81 -#: src/misc.cpp:86 -#: src/misc.cpp:111 -#: src/misc.cpp:118 +#: src/misc.cpp:81 src/misc.cpp:86 src/misc.cpp:111 src/misc.cpp:118 msgid "Options" msgstr "Nastavení" #: src/misc.cpp:82 -#: src/leveleditor.cpp:578 msgid "Level Editor" msgstr "Editor úrovní" @@ -194,13 +175,11 @@ msgstr "Nastavit ovládání" msgid "Setup Joystick" msgstr "Nastavit joystick" -#: src/misc.cpp:108 -#: src/misc.cpp:115 +#: src/misc.cpp:108 src/misc.cpp:115 msgid "Pause" msgstr "Pauza" -#: src/misc.cpp:110 -#: src/misc.cpp:117 +#: src/misc.cpp:110 src/misc.cpp:117 msgid "Continue" msgstr "Pokračovat" @@ -220,40 +199,28 @@ msgstr "Autor: " msgid "Best Level Statistics" msgstr "Statistika nejlepších v úrovni" -#: src/game_session.cpp:468 +#: src/game_session.cpp:462 msgid "PAUSE - Press 'P' To Play" msgstr "PAUZA - Stiskněte 'P' k pokračování" -#: src/game_session.cpp:471 +#: src/game_session.cpp:465 msgid "Playing: " msgstr "Úroveň: " -#: src/game_session.cpp:724 -msgid "Press ESC To Return" -msgstr "Stiskněte ESC k návratu" - -#: src/game_session.cpp:729 -msgid "TIME's UP" -msgstr "ČAS VYPRÅ EL" - -#: src/game_session.cpp:734 -msgid "TIME" -msgstr "ČAS" - -#: src/game_session.cpp:793 +#: src/game_session.cpp:742 msgid "Result:" msgstr "Výsledek:" -#: src/game_session.cpp:796 +#: src/game_session.cpp:745 #, c-format msgid "SCORE: %d" msgstr "SKÓRÉ: %d" -#: src/game_session.cpp:826 +#: src/game_session.cpp:775 msgid "Slot" msgstr "Hra" -#: src/game_session.cpp:827 +#: src/game_session.cpp:776 msgid "Free" msgstr "Volná" @@ -265,106 +232,113 @@ msgstr "Ano" msgid "No" msgstr "Ne" -#: src/control/joystickkeyboardcontroller.cpp:530 +#: src/object/level_time.cpp:56 +msgid "TIME's UP" +msgstr "ČAS VYPRÅ EL" + +#: src/object/level_time.cpp:61 +msgid "TIME" +msgstr "ČAS" + +#: src/control/joystickkeyboardcontroller.cpp:545 msgid "Keyboard Setup" msgstr "Nastavení ovládání" -#: src/control/joystickkeyboardcontroller.cpp:532 +#: src/control/joystickkeyboardcontroller.cpp:547 msgid "Up" msgstr "Nahoru" -#: src/control/joystickkeyboardcontroller.cpp:533 +#: src/control/joystickkeyboardcontroller.cpp:548 msgid "Down" msgstr "Dolů" -#: src/control/joystickkeyboardcontroller.cpp:534 +#: src/control/joystickkeyboardcontroller.cpp:549 msgid "Left" msgstr "Vlevo" -#: src/control/joystickkeyboardcontroller.cpp:535 +#: src/control/joystickkeyboardcontroller.cpp:550 msgid "Right" msgstr "Vpravo" -#: src/control/joystickkeyboardcontroller.cpp:536 -#: src/control/joystickkeyboardcontroller.cpp:616 +#: src/control/joystickkeyboardcontroller.cpp:551 +#: src/control/joystickkeyboardcontroller.cpp:631 msgid "Jump" msgstr "Skok" -#: src/control/joystickkeyboardcontroller.cpp:537 -#: src/control/joystickkeyboardcontroller.cpp:617 +#: src/control/joystickkeyboardcontroller.cpp:552 +#: src/control/joystickkeyboardcontroller.cpp:632 msgid "Shoot/Run" msgstr "Střela/Běh" -#: src/control/joystickkeyboardcontroller.cpp:551 -#: src/control/joystickkeyboardcontroller.cpp:634 +#: src/control/joystickkeyboardcontroller.cpp:566 +#: src/control/joystickkeyboardcontroller.cpp:649 msgid "None" msgstr "Nic" -#: src/control/joystickkeyboardcontroller.cpp:553 +#: src/control/joystickkeyboardcontroller.cpp:568 msgid "Up cursor" msgstr "Å ipka nahoru" -#: src/control/joystickkeyboardcontroller.cpp:555 +#: src/control/joystickkeyboardcontroller.cpp:570 msgid "Down cursor" msgstr "Å ipka dolů" -#: src/control/joystickkeyboardcontroller.cpp:557 +#: src/control/joystickkeyboardcontroller.cpp:572 msgid "Left cursor" msgstr "Å ipka vlevo" -#: src/control/joystickkeyboardcontroller.cpp:559 +#: src/control/joystickkeyboardcontroller.cpp:574 msgid "Right cursor" msgstr "Å ipka vpravo" -#: src/control/joystickkeyboardcontroller.cpp:561 +#: src/control/joystickkeyboardcontroller.cpp:576 msgid "Return" msgstr "Enter" -#: src/control/joystickkeyboardcontroller.cpp:563 +#: src/control/joystickkeyboardcontroller.cpp:578 msgid "Space" msgstr "Mezerník" -#: src/control/joystickkeyboardcontroller.cpp:565 +#: src/control/joystickkeyboardcontroller.cpp:580 msgid "Right Shift" msgstr "Pravý shift" -#: src/control/joystickkeyboardcontroller.cpp:567 +#: src/control/joystickkeyboardcontroller.cpp:582 msgid "Left Shift" msgstr "Levý shift" -#: src/control/joystickkeyboardcontroller.cpp:569 +#: src/control/joystickkeyboardcontroller.cpp:584 msgid "Right Control" msgstr "Pravý Ctrl" -#: src/control/joystickkeyboardcontroller.cpp:571 +#: src/control/joystickkeyboardcontroller.cpp:586 msgid "Left Control" msgstr "Levý Ctrl" -#: src/control/joystickkeyboardcontroller.cpp:573 +#: src/control/joystickkeyboardcontroller.cpp:588 msgid "Right Alt" msgstr "Pravý Alt" -#: src/control/joystickkeyboardcontroller.cpp:575 +#: src/control/joystickkeyboardcontroller.cpp:590 msgid "Left Alt" msgstr "Levý Alt" -#: src/control/joystickkeyboardcontroller.cpp:585 +#: src/control/joystickkeyboardcontroller.cpp:600 msgid "Press Key" msgstr "Stiskněte klávesu" -#: src/control/joystickkeyboardcontroller.cpp:613 +#: src/control/joystickkeyboardcontroller.cpp:628 msgid "Joystick Setup" msgstr "Nastavení joysticku" -#: src/control/joystickkeyboardcontroller.cpp:618 +#: src/control/joystickkeyboardcontroller.cpp:633 msgid "Pause/Menu" msgstr "Pauza/Menu" -#: src/control/joystickkeyboardcontroller.cpp:620 +#: src/control/joystickkeyboardcontroller.cpp:635 msgid "No Joysticks found" msgstr "Nenalezen žádný joystick" -#: src/control/joystickkeyboardcontroller.cpp:645 +#: src/control/joystickkeyboardcontroller.cpp:660 msgid "Press Button" msgstr "Stiskněte tlačítko" - diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp index 7dcb5c850..aa0af892a 100644 --- a/src/badguy/badguy.cpp +++ b/src/badguy/badguy.cpp @@ -21,13 +21,14 @@ #include "badguy.h" #include "object/camera.h" +#include "statistics.h" static const float SQUISH_TIME = 2; static const float X_OFFSCREEN_DISTANCE = 1600; static const float Y_OFFSCREEN_DISTANCE = 1200; BadGuy::BadGuy() - : sprite(0), dir(LEFT), state(STATE_INIT) + : countMe(true), sprite(0), dir(LEFT), state(STATE_INIT) { } @@ -185,6 +186,7 @@ BadGuy::kill_squished(Player& player) physic.set_velocity_x(0); physic.set_velocity_y(0); set_state(STATE_SQUISHED); + global_stats.add_points(BADGUYS_KILLED_STAT, 1); player.bounce(*this); } @@ -193,6 +195,7 @@ BadGuy::kill_fall() { sound_manager->play_sound("fall", this, Sector::current()->player->get_pos()); + global_stats.add_points(BADGUYS_KILLED_STAT, 1); physic.set_velocity_y(0); physic.enable_gravity(true); set_state(STATE_FALLING); diff --git a/src/badguy/badguy.h b/src/badguy/badguy.h index 257065c2f..b6a1d0661 100644 --- a/src/badguy/badguy.h +++ b/src/badguy/badguy.h @@ -72,6 +72,10 @@ public: { start_position = vec; } + + /** Count this badguy to the statistics? This value should not be changed + * during runtime. */ + bool countMe; protected: enum State { diff --git a/src/badguy/bomb.cpp b/src/badguy/bomb.cpp index 2eadc6c1b..848e62da1 100644 --- a/src/badguy/bomb.cpp +++ b/src/badguy/bomb.cpp @@ -35,6 +35,7 @@ Bomb::Bomb(const Vector& pos, Direction dir) timer.start(TICKINGTIME); this->dir = dir; sprite->set_action(dir == LEFT ? "ticking-left" : "ticking-right"); + countMe = false; } void diff --git a/src/badguy/dispenser.cpp b/src/badguy/dispenser.cpp index 0858bc038..6f83ee7d0 100644 --- a/src/badguy/dispenser.cpp +++ b/src/badguy/dispenser.cpp @@ -40,6 +40,7 @@ Dispenser::Dispenser(const lisp::Lisp& reader) sprite->set_action(dir == LEFT ? "working-left" : "working-right"); } else {sprite->set_action("dropper");} + countMe = false; } void diff --git a/src/badguy/flame.cpp b/src/badguy/flame.cpp index 7e98cb4c7..cd60f20ea 100644 --- a/src/badguy/flame.cpp +++ b/src/badguy/flame.cpp @@ -33,6 +33,7 @@ Flame::Flame(const lisp::Lisp& reader) start_position.y + sin(angle) * radius)); bbox.set_size(32, 32); sprite = sprite_manager->create("flame"); + countMe = false; } void diff --git a/src/badguy/nolok_01.cpp b/src/badguy/nolok_01.cpp index f54cabbc9..255cee575 100644 --- a/src/badguy/nolok_01.cpp +++ b/src/badguy/nolok_01.cpp @@ -39,6 +39,7 @@ Nolok_01::Nolok_01(const lisp::Lisp& reader) reader.get("y", start_position.y); bbox.set_size(31.8, 63.8); sprite = sprite_manager->create("dummyguy"); + countMe = false; } Nolok_01::Nolok_01(float pos_x, float pos_y) @@ -47,6 +48,7 @@ Nolok_01::Nolok_01(float pos_x, float pos_y) start_position.y = pos_y; bbox.set_size(31.8, 63.8); sprite = sprite_manager->create("dummyguy"); + countMe = false; } void diff --git a/src/badguy/rocketexplosion.cpp b/src/badguy/rocketexplosion.cpp index ded99d37e..c20571f3d 100644 --- a/src/badguy/rocketexplosion.cpp +++ b/src/badguy/rocketexplosion.cpp @@ -31,6 +31,7 @@ RocketExplosion::RocketExplosion(const Vector& pos, Direction dir) bbox.set_size(31.8, 31.8); sprite = sprite_manager->create("rocketexplosion"); this->dir = dir; + countMe = false; explode(); } diff --git a/src/badguy/spike.cpp b/src/badguy/spike.cpp index b2ca23735..0858c5659 100644 --- a/src/badguy/spike.cpp +++ b/src/badguy/spike.cpp @@ -27,6 +27,7 @@ Spike::Spike(const Vector& pos, Direction dir) bbox.set_pos(Vector(0, 0)); bbox.set_size(32, 32); set_direction(dir); + countMe = false; } Spike::Spike(const lisp::Lisp& reader) @@ -38,6 +39,7 @@ Spike::Spike(const lisp::Lisp& reader) int idir = 0; reader.get("direction", idir); set_direction((Direction) idir); + countMe = false; } void diff --git a/src/badguy/stalactite.cpp b/src/badguy/stalactite.cpp index d8e3f4eb0..82d47f22e 100644 --- a/src/badguy/stalactite.cpp +++ b/src/badguy/stalactite.cpp @@ -33,6 +33,7 @@ Stalactite::Stalactite(const lisp::Lisp& lisp) bbox.set_size(31.8, 31.8); sprite = sprite_manager->create("stalactite"); state = STALACTITE_HANGING; + countMe = false; } void diff --git a/src/badguy/yeti.cpp b/src/badguy/yeti.cpp index c38c3ac4d..daa9cf677 100644 --- a/src/badguy/yeti.cpp +++ b/src/badguy/yeti.cpp @@ -50,6 +50,7 @@ Yeti::Yeti(const lisp::Lisp& reader) sound_manager->preload_sound("yeti_roar"); hit_points = INITIAL_HITPOINTS; reader.get("dead-script", dead_script); + countMe = false; } Yeti::~Yeti() diff --git a/src/scripting/Jamfile b/src/scripting/Jamfile index 64d4e0934..27116aa4a 100644 --- a/src/scripting/Jamfile +++ b/src/scripting/Jamfile @@ -7,9 +7,10 @@ if $(MINISWIG) { local sources = [ SearchSource $(>) ] ; local cppfile = [ LocateTarget $(<) : $(SUBDIR) ] ; - local headerfile = [ LocateTarget $(<:S=.h) : $(SUBDIR) ] ; + local headerfile = [ LocateTarget $(<:S=.h) : $(SUBDIR) ] ; SEARCH on $(headerfile) = $(SOURCH_SOURCE) ; - + + Depends $(cppfile) : $(headerfile) ; MiniSwig $(cppfile) : $(sources) ; CPPFLAGS on $(cppfile) = $(CPPFLAGS) -DSCRIPTING_API ; headerfile on $(cppfile) = $(headerfile) ; diff --git a/src/sector.cpp b/src/sector.cpp index d911c4a4d..69bac3551 100644 --- a/src/sector.cpp +++ b/src/sector.cpp @@ -821,7 +821,7 @@ Sector::get_total_badguys() for(GameObjects::iterator i = gameobjects.begin(); i != gameobjects.end(); ++i) { BadGuy* badguy = dynamic_cast (*i); - if(badguy) + if (badguy && badguy->countMe) total_badguys++; } diff --git a/tools/supertux.apsepc b/tools/supertux.apsepc deleted file mode 100644 index 5d1c65ea7..000000000 --- a/tools/supertux.apsepc +++ /dev/null @@ -1,53 +0,0 @@ -# -*-shell-script-*- -# Autopackage spec file - -[Meta] -RootName: @supertux.berlios.de/supertux:$SOFTWAREVERSION -DisplayName: SuperTux platform game -ShortName: supertux -Maintainer: SuperTux Development Team -Packager: Matthis Braun -Summary: The SuperTux platform game is a cute penguin-oriented clone of Super Mario Bros -SoftwareVersion: 0.1.2 -PackageVersion: 1 -AutopackageTarget: 1.0 - -[Description] -SuperTux is a jump'n run like game, with strong inspiration from the -Super Mario Bros games for Nintendo. - -Run and jump through multiple worlds, fighting off enemies by jumping -on them or bumping them from below. Grabbing power-ups and other stuff -on the way. - -[BuildPrepare] -old_build_root="$build_root" -APKG_BUILD_SKIP_MAKE=1 -APKG_BUILD_ROOT=0 -prepareBuild -jam -jam "-sDESTDIR=$old_build_root" install - -[BuildUnprepare] -unprepareBuild - -[Imports] -echo '*' | import - -[Prepare] -# Dependency checking -require @libsdl.org/sdl 1.2 -require @gnu.org/libstdc++ 3 -require @opengl.org/opengl - -[Install] -# Put your installation script here -installExe bin/* -installData share/supertux -installIcon share/pixmaps/*.png -installIcon share/pixmaps/*.xpm -installDesktop "Games" share/applications/supertux.desktop - -[Uninstall] -# Usually just the following line is enough to uninstall everything -uninstallFromLog diff --git a/tools/supertux.apspec b/tools/supertux.apspec new file mode 100644 index 000000000..5d1c65ea7 --- /dev/null +++ b/tools/supertux.apspec @@ -0,0 +1,53 @@ +# -*-shell-script-*- +# Autopackage spec file + +[Meta] +RootName: @supertux.berlios.de/supertux:$SOFTWAREVERSION +DisplayName: SuperTux platform game +ShortName: supertux +Maintainer: SuperTux Development Team +Packager: Matthis Braun +Summary: The SuperTux platform game is a cute penguin-oriented clone of Super Mario Bros +SoftwareVersion: 0.1.2 +PackageVersion: 1 +AutopackageTarget: 1.0 + +[Description] +SuperTux is a jump'n run like game, with strong inspiration from the +Super Mario Bros games for Nintendo. + +Run and jump through multiple worlds, fighting off enemies by jumping +on them or bumping them from below. Grabbing power-ups and other stuff +on the way. + +[BuildPrepare] +old_build_root="$build_root" +APKG_BUILD_SKIP_MAKE=1 +APKG_BUILD_ROOT=0 +prepareBuild +jam +jam "-sDESTDIR=$old_build_root" install + +[BuildUnprepare] +unprepareBuild + +[Imports] +echo '*' | import + +[Prepare] +# Dependency checking +require @libsdl.org/sdl 1.2 +require @gnu.org/libstdc++ 3 +require @opengl.org/opengl + +[Install] +# Put your installation script here +installExe bin/* +installData share/supertux +installIcon share/pixmaps/*.png +installIcon share/pixmaps/*.xpm +installDesktop "Games" share/applications/supertux.desktop + +[Uninstall] +# Usually just the following line is enough to uninstall everything +uninstallFromLog