From a6fc88d88521fed947967ed85b2e05e936a2c296 Mon Sep 17 00:00:00 2001 From: fgenesis Date: Wed, 13 Jun 2012 23:37:21 +0200 Subject: [PATCH] Two little localzation patch additions, by Henrik Holst. --- Aquaria/AquariaSaveSlot.cpp | 6 +----- Aquaria/Continuity.cpp | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Aquaria/AquariaSaveSlot.cpp b/Aquaria/AquariaSaveSlot.cpp index d0f4fec..b311411 100644 --- a/Aquaria/AquariaSaveSlot.cpp +++ b/Aquaria/AquariaSaveSlot.cpp @@ -220,11 +220,7 @@ void AquariaSaveSlot::onUpdate(float dt) else if ((!core->mouse.buttons.left && !core->mouse.buttons.right) && mbDown) { mbDown = false; - if (text1->getText().find(dsq->continuity.stringBank.get(2003))!=std::string::npos && dsq->saveSlotMode == SSM_LOAD) - { - - } - else + if (!(empty && dsq->saveSlotMode == SSM_LOAD)) { selected = true; // pick this file diff --git a/Aquaria/Continuity.cpp b/Aquaria/Continuity.cpp index 2572966..71ac4e4 100644 --- a/Aquaria/Continuity.cpp +++ b/Aquaria/Continuity.cpp @@ -1200,11 +1200,11 @@ void Continuity::loadSongBank() songSlotNames.clear(); songBank.clear(); - loadIntoSongBank("data/songs.xml"); + loadIntoSongBank(dsq->user.localisePath("data/songs.xml")); if (dsq->mod.isActive()) { - loadIntoSongBank(dsq->mod.getPath() + "scripts/songs.xml"); + loadIntoSongBank(dsq->user.localisePath(dsq->mod.getPath() + "scripts/songs.xml", dsq->mod.getPath())); } }