Page MenuHomePhabricator (Chris)
Files F86078

No OneTemporary
Actions

Size
8 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/debian/changelog b/debian/changelog
index 04cbd68..dded670 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,13 @@
+bloonstd (1.0.1-2) groovy; urgency=medium
+
+ * Resize application icon
+ * Fix debian copyright file
+ * Fix asset paths for the linux filesystem hierarchy thing
+
+ -- Chris <dpkg@chris-nz.com> Wed, 07 Apr 2021 01:11:15 +1200
+
bloonstd (1.0.1-1) groovy; urgency=medium
* Initial release for groovy
-- Chris <dpkg@chris-nz.com> Sun, 04 Apr 2021 19:43:00 +1300
diff --git a/debian/copyright b/debian/copyright
index e475563..39a1652 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,29 +1,30 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: BloonsTD
Upstream-Contact: idomoz <ido.mozes@gmail.com>
Source: https://github.com/idomoz/BloonsTD
Files: *
Copyright: 2019 idomoz <ido.mozes@gmail.com>
-License: All Rights Reserved
+License: All-Rights-Reserved
+ The author has reserved all rights to distribute, reproduce etc.
Files: debian/*
Copyright: 2021 Chris <dpkg@chris-nz.com>
License: GPL-2
License: GPL-2
This package 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 package 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, see <https://www.gnu.org/licenses/>
.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/data/bloonstd.png b/debian/data/bloonstd.png
index 540befa..c01dc72 100644
Binary files a/debian/data/bloonstd.png and b/debian/data/bloonstd.png differ
diff --git a/debian/patches/fix-asset-paths-for-LFS b/debian/patches/fix-asset-paths-for-LFS
new file mode 100644
index 0000000..794f4e8
--- /dev/null
+++ b/debian/patches/fix-asset-paths-for-LFS
@@ -0,0 +1,93 @@
+Description: fix asset paths for LFS
+ Because the game executable has been moved for Linux Filesystem Hierarchy,
+ the assets weren't loading, which lead to a crash.
+
+--- bloonstd-1.0.1.orig/src/Game.cpp
++++ bloonstd-1.0.1/src/Game.cpp
+@@ -11,28 +11,28 @@ using namespace boost::filesystem;
+ Game::Game(bool fullscreen, float mapScale) {
+ gameData.mapScale = mapScale;
+ gameData.fullscreen = fullscreen;
+- path p = path("../assets/Bloons");
++ path p = path("/usr/share/bloonstd/assets/Bloons");
+ directory_iterator it{p};
+ for (auto &p :it) {
+ gameData.assets[p.path().filename().string().substr(0, p.path().filename().string().length() - 4)] = IMG_Load(
+ p.path().string().c_str());
+ }
+- p = path("../assets/Sprites");
++ p = path("/usr/share/bloonstd/assets/Sprites");
+ it = directory_iterator{p};
+ for (auto &p :it) {
+ gameData.assets[p.path().filename().string().substr(0, p.path().filename().string().length() - 4)] = IMG_Load(
+ p.path().string().c_str());
+ }
+- p = path("../assets/Icons");
++ p = path("/usr/share/bloonstd/assets/Icons");
+ it = directory_iterator{p};
+ for (auto &p :it) {
+ gameData.assets[p.path().filename().string().substr(0, p.path().filename().string().length() - 4)] = IMG_Load(
+ p.path().string().c_str());
+ }
+- gameData.assets["map"] = IMG_Load("../assets/map0.jpg");
+- gameData.assets["upgrade_bar"] = IMG_Load("../assets/upgrade_bar.png");
+- gameData.assets["menu"] = IMG_Load("../assets/menu.jpg");
+- gameData.assets["UpgradesBackground"] = IMG_Load("../assets/upgrade_bar_items.png");
++ gameData.assets["map"] = IMG_Load("/usr/share/bloonstd/assets/map0.jpg");
++ gameData.assets["upgrade_bar"] = IMG_Load("/usr/share/bloonstd/assets/upgrade_bar.png");
++ gameData.assets["menu"] = IMG_Load("/usr/share/bloonstd/assets/menu.jpg");
++ gameData.assets["UpgradesBackground"] = IMG_Load("/usr/share/bloonstd/assets/upgrade_bar_items.png");
+ renderSystem = new RenderSystem();
+ renderSystem->init(gameData);
+ loadMap();
+@@ -628,7 +628,7 @@ void Game::update() {
+ }
+
+ void Game::loadMap() {
+- std::string fileName = "../assets/map" + std::to_string(gameData.map);
++ std::string fileName = "/usr/share/bloonstd/assets/map" + std::to_string(gameData.map);
+ std::ifstream obstaclesFile(fileName + "_obstacles.data", std::ios::binary);
+ int x = 0, y = 0;
+ for (int i = 0; i < ceilf(MAP_WIDTH * MAP_HEIGHT / 8.0); ++i) {
+--- bloonstd-1.0.1.orig/src/systems/LoadLevelSystem.cpp
++++ bloonstd-1.0.1/src/systems/LoadLevelSystem.cpp
+@@ -9,7 +9,7 @@ void LoadLevelSystem::update(Entities *l
+ return;
+ if (gameData.level != 1)
+ gameData.cash += 100 + gameData.level - 1;
+- std::string fileName = "../assets/Levels/level" + std::to_string(gameData.level) + ".data";
++ std::string fileName = "/usr/share/bloonstd/assets/Levels/level" + std::to_string(gameData.level) + ".data";
+ std::ifstream levelFile(fileName, std::ios::binary);
+ Sequence_S sequenceS;
+ while (levelFile.peek() != EOF) {
+--- bloonstd-1.0.1.orig/src/systems/RenderSystem.cpp
++++ bloonstd-1.0.1/src/systems/RenderSystem.cpp
+@@ -29,22 +29,22 @@ void RenderSystem::init(GameData &gameDa
+ SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "2");
+
+ gameData.fonts[WHITE12] = FC_CreateFont();
+- FC_LoadFont(gameData.fonts[WHITE12], gameData.renderer, "../assets/LuckiestGuy-Regular.ttf", 12 * gameData.mapScale,
++ FC_LoadFont(gameData.fonts[WHITE12], gameData.renderer, "/usr/share/bloonstd/assets/LuckiestGuy-Regular.ttf", 12 * gameData.mapScale,
+ FC_MakeColor(255, 255, 255, 255), TTF_STYLE_NORMAL);
+ gameData.fonts[BLACK12] = FC_CreateFont();
+- FC_LoadFont(gameData.fonts[BLACK12], gameData.renderer, "../assets/LuckiestGuy-Regular.ttf", 12 * gameData.mapScale,
++ FC_LoadFont(gameData.fonts[BLACK12], gameData.renderer, "/usr/share/bloonstd/assets/LuckiestGuy-Regular.ttf", 12 * gameData.mapScale,
+ FC_MakeColor(0, 0, 0, 255), TTF_STYLE_NORMAL);
+ gameData.fonts[RED12] = FC_CreateFont();
+- FC_LoadFont(gameData.fonts[RED12], gameData.renderer, "../assets/LuckiestGuy-Regular.ttf", 12 * gameData.mapScale,
++ FC_LoadFont(gameData.fonts[RED12], gameData.renderer, "/usr/share/bloonstd/assets/LuckiestGuy-Regular.ttf", 12 * gameData.mapScale,
+ FC_MakeColor(255, 49, 49, 255), TTF_STYLE_NORMAL);
+ gameData.fonts[WHITE8] = FC_CreateFont();
+- FC_LoadFont(gameData.fonts[WHITE8], gameData.renderer, "../assets/LuckiestGuy-Regular.ttf", 10 * gameData.mapScale,
++ FC_LoadFont(gameData.fonts[WHITE8], gameData.renderer, "/usr/share/bloonstd/assets/LuckiestGuy-Regular.ttf", 10 * gameData.mapScale,
+ FC_MakeColor(255, 255, 255, 255), TTF_STYLE_NORMAL);
+ gameData.fonts[BLACK8] = FC_CreateFont();
+- FC_LoadFont(gameData.fonts[BLACK8], gameData.renderer, "../assets/LuckiestGuy-Regular.ttf", 10 * gameData.mapScale,
++ FC_LoadFont(gameData.fonts[BLACK8], gameData.renderer, "/usr/share/bloonstd/assets/LuckiestGuy-Regular.ttf", 10 * gameData.mapScale,
+ FC_MakeColor(0, 0, 0, 255), TTF_STYLE_NORMAL);
+ gameData.fonts[RED8] = FC_CreateFont();
+- FC_LoadFont(gameData.fonts[RED8], gameData.renderer, "../assets/LuckiestGuy-Regular.ttf", 10 * gameData.mapScale,
++ FC_LoadFont(gameData.fonts[RED8], gameData.renderer, "/usr/share/bloonstd/assets/LuckiestGuy-Regular.ttf", 10 * gameData.mapScale,
+ FC_MakeColor(255, 49, 49, 255), TTF_STYLE_NORMAL);
+
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 28ba509..fb12ef2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
Fix-build-on-Linux
add-install-path-for-bin
+fix-asset-paths-for-LFS

File Metadata

Mime Type
text/x-diff
Expires
Thu, Sep 11, 7:39 AM (20 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
42627
Default Alt Text
(8 KB)

Event Timeline