Skip to content

Commit

Permalink
Fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
vircung committed Aug 8, 2018
1 parent 15c3922 commit 82b1739
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
3 changes: 3 additions & 0 deletions Cataclysm-DDA.sublime-project
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@
},
{
"path": "~/.cataclysm-dda"
},
{
"path": "~/Library/Application Support/Cataclysm"
}
],
"settings":
Expand Down
8 changes: 4 additions & 4 deletions src/options.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -818,10 +818,10 @@ std::vector<std::pair<std::string, std::string>> options_manager::load_soundpack
std::map<std::string, std::string> local_soundpacks;
auto soundpack_names = build_resource_list(local_soundpacks, "soundpack", path, "soundpack-conf");

// Copy over found shoundpacks
// Copy over found soundpacks
SOUNDPACKS.insert(local_soundpacks.begin(), local_soundpacks.end());

// Return found soundpack names for fruther processing
// Return found soundpack names for further processing
return soundpack_names;
}

Expand All @@ -831,15 +831,15 @@ std::vector<std::pair<std::string, std::string>> options_manager::build_soundpac
SOUNDPACKS.clear();
std::vector<std::pair<std::string, std::string>> result;

// Search user direcotry for sound packs
// Search user directory for sound packs
auto user_soundpacks = load_soundpack_from("user_sound");
result.insert(result.end(), user_soundpacks.begin(), user_soundpacks.end());

if( !result.empty() ) {
return result;
}

// Search data direcotry for sound packs
// Search data directory for sound packs
auto data_soundpacks = load_soundpack_from("data_sound");
result.insert(result.end(), data_soundpacks.begin(), data_soundpacks.end());

Expand Down

0 comments on commit 82b1739

Please sign in to comment.