openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Mac: Make preset sounds and graphics show as file packages

Browse Source 
- Remove legacy sound/graphic file definitions
- Fix a couple of compiler warnings
This commit is contained in:
Celtic Minstrel
2015-06-09 11:31:59 -04:00
parent 233a50a1e2
commit dd5faacd4f
3 changed files with 54 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/fileio_scen.cpp
View File

@@ -451,7 +451,7 @@ static void readQuestFromXml(ticpp::Element& data, cQuest& quest) {
}
}
static void readShopFromXml(ticpp::Element& data, cShop& shop, cScenario& scen) {
static void readShopFromXml(ticpp::Element& data, cShop& shop) {
using namespace ticpp;
std::string type, name, val, fname;
data.GetDocument()->GetValue(&fname);
@@ -733,7 +733,7 @@ static void readScenarioFromXml(ticpp::Document&& data, cScenario& scenario) {
quests++;
} else if(type == "shop") {
scenario.shops.emplace_back();
readShopFromXml(*game, scenario.shops[shops], scenario);
readShopFromXml(*game, scenario.shops[shops]);
shops++;
} else if(type == "timer") {
if(timers >= 20)