From e22e8eff6e585048d92bc92619525fc1e9122e71 Mon Sep 17 00:00:00 2001 From: Ryan Flegel Date: Thu, 13 May 2004 23:16:46 +0000 Subject: [PATCH] - added freedesktop.org .desktop file from Mike Hearn - added supertux icons as supertux.xpm and supertux.png (old ones can be [re]moved) - added TODO item SVN-Revision: 1166 --- TODO | 1 + data/Makefile.am | 8 ++++++-- data/images/supertux.png | Bin 0 -> 3159 bytes data/images/{icon.xpm => supertux.xpm} | 0 data/supertux.desktop | 10 ++++++++++ src/setup.cpp | 4 ++-- src/type.h | 3 ++- 7 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 data/images/supertux.png rename data/images/{icon.xpm => supertux.xpm} (100%) create mode 100644 data/supertux.desktop diff --git a/TODO b/TODO index 2ffb8a5b1..10a58289c 100644 --- a/TODO +++ b/TODO @@ -11,6 +11,7 @@ Todo H: high priority L: low priority +[H] AX_CHECK_GL produces an error during configure [M] Enemies can get stuck when colliding. [M] When aborting a level, lives and score should remain the same as they were before. Solution: make more dependency between the game engine and worldmap diff --git a/data/Makefile.am b/data/Makefile.am index 970cc2fe4..45281687f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,12 +1,16 @@ +iconsdir=$(datadir)/pixmaps +icons_DATA = images/supertux.xpm + +desktopdir = $(datadir)/applications +desktop_DATA = supertux.desktop + EXTRA_DIST = \ supertux.strf \ intro.txt \ extro.txt \ CREDITS \ $(wildcard sounds/*.wav) \ - images/icon.xpm \ $(wildcard images/*.png) \ - $(wildcard images/*.xpm) \ $(wildcard images/background/*.png) \ $(wildcard images/background/*.jpg) \ $(wildcard images/highscore/*.png) \ diff --git a/data/images/supertux.png b/data/images/supertux.png new file mode 100644 index 0000000000000000000000000000000000000000..bb5ad7ef0f76442bafdae0691de30fb9162da27d GIT binary patch literal 3159 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 literal 0 HcmV?d00001 diff --git a/data/images/icon.xpm b/data/images/supertux.xpm similarity index 100% rename from data/images/icon.xpm rename to data/images/supertux.xpm diff --git a/data/supertux.desktop b/data/supertux.desktop new file mode 100644 index 000000000..73a6504d5 --- /dev/null +++ b/data/supertux.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=SuperTux Platform Game +Comment=A Super Mario inspired penguin platform game +Exec=supertux +Terminal=false +Type=Application +Categories=Application;Game;ArcadeGame +Icon=supertux.png + diff --git a/src/setup.cpp b/src/setup.cpp index e124d3743..b891b49d0 100644 --- a/src/setup.cpp +++ b/src/setup.cpp @@ -895,13 +895,13 @@ void seticon(void) /* Load icon into a surface: */ - icon = IMG_Load((datadir + "/images/icon.xpm").c_str()); + icon = IMG_Load((datadir + "/images/supertux.xpm").c_str()); if (icon == NULL) { fprintf(stderr, "\nError: I could not load the icon image: %s%s\n" "The Simple DirectMedia error that occured was:\n" - "%s\n\n", datadir.c_str(), "/images/icon.xpm", SDL_GetError()); + "%s\n\n", datadir.c_str(), "/images/supertux.xpm", SDL_GetError()); exit(1); } diff --git a/src/type.h b/src/type.h index bc6e7c8ba..d9faf125f 100644 --- a/src/type.h +++ b/src/type.h @@ -65,7 +65,8 @@ public: scroll_x = tmp; base = btmp; }; -void move_to(float x, float y) { base.x = x; base.y = y; }; + + void move_to(float x, float y) { base.x = x; base.y = y; }; base_type base; base_type old_base; -- 2.11.0