Commit 3c2c612e authored by Ricardo Mones's avatar Ricardo Mones

Import Debian changes 0.7.0+0-3

epiphany (0.7.0+0-3) unstable; urgency=medium

  * patches/unravel-sprintf.diff
  - Patch to simplify string handling (Closes: #767904)
parent 298bfdd2
epiphany (0.7.0+0-3) unstable; urgency=medium
* patches/unravel-sprintf.diff
- Patch to simplify string handling (Closes: #767904)
-- Ricardo Mones <mones@debian.org> Tue, 04 Nov 2014 01:43:33 +0100
epiphany (0.7.0+0-2) unstable; urgency=medium
* debian/rules, epiphany.install, epiphany-data.install
......
use-shared-tinyxml.diff
unravel-sprintf.diff
Subject: Unravel level path construction which seems to
be optimized out by current C++ compiler
From: Ricardo Mones <mones@debian.org>
Forwarded: no
Last-Update: 2014-11-04
Bug-Debian: https://bugs.debian.org/767904
diff --git a/src/game.cpp b/src/game.cpp
index e3c8bc7..2a8a70a 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -413,14 +413,10 @@ void Game::go()
m_level=new Level();
char current_level_path[255];
-
- sprintf(current_level_path, "%s", (Resource_Factory::instance()->get_resource_path().c_str()));
-
- sprintf(current_level_path, "%s%s", current_level_path, "/maps/level");
-
- sprintf(current_level_path, "%s%d", current_level_path, (menu.get_current_level()));
-
- sprintf(current_level_path, "%s%s", current_level_path, ".map");
+
+ sprintf(current_level_path, "%s/maps/level%d.map",
+ Resource_Factory::instance()->get_resource_path().c_str(),
+ menu.get_current_level());
DEBOUT("Loading map: "<<current_level_path<<"\n");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment