r10161 - in packages/trunk/pink-pony/debian: . patches
Miriam Ruiz
miriam at alioth.debian.org
Fri Aug 21 01:07:11 UTC 2009
Author: miriam
Date: 2009-08-21 01:07:11 +0000 (Fri, 21 Aug 2009)
New Revision: 10161
Removed:
packages/trunk/pink-pony/debian/patches/pony_options.patch
Modified:
packages/trunk/pink-pony/debian/control
packages/trunk/pink-pony/debian/patches/datadir.patch
packages/trunk/pink-pony/debian/patches/series
packages/trunk/pink-pony/debian/pink-pony.install
Log:
Fix some stuff
Modified: packages/trunk/pink-pony/debian/control
===================================================================
--- packages/trunk/pink-pony/debian/control 2009-08-21 00:47:38 UTC (rev 10160)
+++ packages/trunk/pink-pony/debian/control 2009-08-21 01:07:11 UTC (rev 10161)
@@ -21,10 +21,6 @@
ponies that leave a trail of flowers everywhere they step. You have to
evade these trails and force other ponies into them. The last pony standing
wins the game.
- .
- You need an OpenGL 2.0 graphics card to play this game. For the particles
- you need an nVidia graphics card that supports SM4 (everything from GeForce
- 8xxx onwards).
Package: pink-pony-dbg
Section: debug
Modified: packages/trunk/pink-pony/debian/patches/datadir.patch
===================================================================
--- packages/trunk/pink-pony/debian/patches/datadir.patch 2009-08-21 00:47:38 UTC (rev 10160)
+++ packages/trunk/pink-pony/debian/patches/datadir.patch 2009-08-21 01:07:11 UTC (rev 10161)
@@ -3,9 +3,12 @@
--- pink-pony.orig/pony.options
+++ pink-pony/pony.options
-@@ -18,16 +18,16 @@
+@@ -16,18 +16,18 @@
- levels_file = "levels.xml";
+ // Level properties
+
+-levels_file = "levels.xml";
++levels_file = "/usr/share/games/pink-pony/levels.xml";
selected_level = 1;
-heightmap_file = "levels/heart.png";
+heightmap_file = "/usr/share/games/pink-pony/levels/heart.png";
@@ -53,9 +56,12 @@
pony_color[2] = (1 0.839844 0 1);
--- pink-pony.orig/lib/Config.cc
+++ pink-pony/lib/Config.cc
-@@ -10,7 +10,7 @@
+@@ -8,9 +8,9 @@
+ fsaa_samples(4),
+ swap_interval(1),
polygon_mode(GL_FILL),
- levels_file("levels.xml"),
+- levels_file("levels.xml"),
++ levels_file("/usr/share/games/pink-pony/levels.xml"),
selected_level(0),
- heightmap_file("levels/heightmap-heart.exr"),
+ heightmap_file("/usr/share/games/pink-pony/levels/heightmap-heart.exr"),
@@ -102,6 +108,15 @@
background_music("music/To be happy.mp3")
--- pink-pony.orig/lib/ParticleSystem.cc
+++ pink-pony/lib/ParticleSystem.cc
+@@ -46,7 +46,7 @@
+ (GLuint max_particles, Config* config)
+ : last_stat_print(glfwGetTime()),
+ draw_shader("GLSL/draw_particles_cpu"),
+- particle_tex("textures/heart-particle.png"),
++ particle_tex("/usr/share/games/pink-pony/textures/heart-particle.png"),
+ heightmap(config->heightmap_file.c_str()),
+ level_size(config->level_size),
+ water_level(config->water_level),
@@ -253,18 +253,18 @@
TransformFeedbackParticleSystem::TransformFeedbackParticleSystem
(GLuint max_particles, Config* config)
@@ -180,3 +195,107 @@
{
int human_count = m_config->player_count - m_config->ai_count;
if (human_count == 0) human_count = m_config->player_count;
+--- pink-pony.orig/Pony.cc
++++ pink-pony/Pony.cc
+@@ -14,7 +14,7 @@
+
+ int main(int argc, char** argv)
+ {
+- string config_file = "pony.options";
++ string config_file = "/usr/share/games/pink-pony/pony.options";
+ bool running = true;
+
+ Config config;
+@@ -84,7 +84,7 @@
+ // between braces, so that stack variables that need a GL context
+ // are destructed, while the context still exists.
+ {
+- Skydome skydome("textures/sky.png");
++ Skydome skydome("/usr/share/games/pink-pony/textures/sky.png");
+ Menu::MenuStatus menu_status;
+
+ {
+--- pink-pony.orig/lib/Menu.cc
++++ pink-pony/lib/Menu.cc
+@@ -87,39 +87,39 @@
+ skydome(skydome),
+ music(music),
+ heightmap(NULL),
+- logo_button("textures/logo.png"),
++ logo_button("/usr/share/games/pink-pony/textures/logo.png"),
+ start_button("Start"),
+- quit_button("textures/quit.png"),
+- options_button("textures/settings.png"),
++ quit_button("/usr/share/games/pink-pony/textures/quit.png"),
++ options_button("/usr/share/games/pink-pony/textures/settings.png"),
+ level_name_text("Lagoon"),
+- next_level_button("textures/right.png"),
+- prev_level_button("textures/left.png"),
++ next_level_button("/usr/share/games/pink-pony/textures/right.png"),
++ prev_level_button("/usr/share/games/pink-pony/textures/left.png"),
+ computer_no("0"),
+ human_no("0"),
+- computer_text("textures/computer.png"),
+- human_text("textures/human.png"),
++ computer_text("/usr/share/games/pink-pony/textures/computer.png"),
++ human_text("/usr/share/games/pink-pony/textures/human.png"),
+ computers(config->ai_count),
+ humans(config->player_count - config->ai_count),
+ settings_text("Settings"),
+- settings_done("textures/back.png"),
++ settings_done("/usr/share/games/pink-pony/textures/back.png"),
+ particles_text("Some particles", Color4f(1,1,1,0.5)),
+- prev_particles("textures/left.png"),
+- next_particles("textures/right.png"),
++ prev_particles("/usr/share/games/pink-pony/textures/left.png"),
++ next_particles("/usr/share/games/pink-pony/textures/right.png"),
+ fullscreen_text("Some particles", Color4f(1,1,1,0.5)),
+- prev_fullscreen("textures/left.png"),
+- next_fullscreen("textures/right.png"),
++ prev_fullscreen("/usr/share/games/pink-pony/textures/left.png"),
++ next_fullscreen("/usr/share/games/pink-pony/textures/right.png"),
+ minimap_text("Some particles", Color4f(1,1,1,0.5)),
+- prev_minimap("textures/left.png"),
+- next_minimap("textures/right.png"),
++ prev_minimap("/usr/share/games/pink-pony/textures/left.png"),
++ next_minimap("/usr/share/games/pink-pony/textures/right.png"),
+ antialiasing_text("Some particles", Color4f(1,1,1,0.5)),
+- prev_antialiasing("textures/left.png"),
+- next_antialiasing("textures/right.png"),
++ prev_antialiasing("/usr/share/games/pink-pony/textures/left.png"),
++ next_antialiasing("/usr/share/games/pink-pony/textures/right.png"),
+ hearts_text("Some particles", Color4f(1,1,1,0.5)),
+- prev_hearts("textures/left.png"),
+- next_hearts("textures/right.png"),
++ prev_hearts("/usr/share/games/pink-pony/textures/left.png"),
++ next_hearts("/usr/share/games/pink-pony/textures/right.png"),
+ resolution_text("Some particles", Color4f(1,1,1,0.5)),
+- prev_resolution("textures/left.png"),
+- next_resolution("textures/right.png"),
++ prev_resolution("/usr/share/games/pink-pony/textures/left.png"),
++ next_resolution("/usr/share/games/pink-pony/textures/right.png"),
+ needs_reset(false)
+ {
+
+--- pink-pony.orig/lib/Widget.cc
++++ pink-pony/lib/Widget.cc
+@@ -88,7 +88,7 @@
+ {
+ int face_size = 72;
+
+- font = new FTBufferFont("fonts/DaveDS_-_Sketchy.ttf");
++ font = new FTBufferFont("/usr/share/games/pink-pony/fonts/DaveDS_-_Sketchy.ttf");
+
+ if (font->Error()) {
+ cerr << "Something went wrong with loading the font." << endl;
+@@ -246,8 +246,8 @@
+
+ Slider::Slider()
+ : Widget(1.0),
+- up_button("textures/up.png"),
+- down_button("textures/down.png")
++ up_button("/usr/share/games/pink-pony/textures/up.png"),
++ down_button("/usr/share/games/pink-pony/textures/down.png")
+ {
+ up_button.on_click()
+ .connect(sigc::bind(sigc::mem_fun(this, &Slider::change), 1));
Deleted: packages/trunk/pink-pony/debian/patches/pony_options.patch
===================================================================
--- packages/trunk/pink-pony/debian/patches/pony_options.patch 2009-08-21 00:47:38 UTC (rev 10160)
+++ packages/trunk/pink-pony/debian/patches/pony_options.patch 2009-08-21 01:07:11 UTC (rev 10161)
@@ -1,14 +0,0 @@
-# Copyright (C) 2009 Miriam Ruiz <little_miry at yahoo.es>
-# Distributed under the same license as the game (GPL3+). See debian/copyright
-
---- pink-pony.orig/Pony.cc
-+++ pink-pony/Pony.cc
-@@ -14,7 +14,7 @@
-
- int main(int argc, char** argv)
- {
-- string config_file = "pony.options";
-+ string config_file = "/usr/share/games/pink-pony/pony.options";
- bool running = true;
-
- Config config;
Modified: packages/trunk/pink-pony/debian/patches/series
===================================================================
--- packages/trunk/pink-pony/debian/patches/series 2009-08-21 00:47:38 UTC (rev 10160)
+++ packages/trunk/pink-pony/debian/patches/series 2009-08-21 01:07:11 UTC (rev 10161)
@@ -1,3 +1,2 @@
build.patch
datadir.patch
-pony_options.patch
Modified: packages/trunk/pink-pony/debian/pink-pony.install
===================================================================
--- packages/trunk/pink-pony/debian/pink-pony.install 2009-08-21 00:47:38 UTC (rev 10160)
+++ packages/trunk/pink-pony/debian/pink-pony.install 2009-08-21 01:07:11 UTC (rev 10161)
@@ -1,7 +1,9 @@
pony.options /usr/share/games/pink-pony/
+levels.xml /usr/share/games/pink-pony/
models /usr/share/games/pink-pony/
textures /usr/share/games/pink-pony/
levels /usr/share/games/pink-pony/
GLSL /usr/share/games/pink-pony/
+fonts /usr/share/games/pink-pony/
music /usr/share/games/pink-pony/
#sounds /usr/share/games/pink-pony/
More information about the Pkg-games-commits
mailing list