change file:// to asset:// to indicate that they aren't arbitrary files

refs #579
2014-12-17 14:59:05 +01:00
parent 936e096514
commit b5e9998b15
13 changed files with 114 additions and 66 deletions
--- a/linux/main.cpp
+++ b/linux/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char *argv[]) {
            // handle fullscreen_flag
            break;
        case 's':
-            style = std::string("file://") + std::string(optarg);
+            style = std::string("asset://") + std::string(optarg);
        default:
            break;
        }
@@ -83,7 +83,7 @@ int main(int argc, char *argv[]) {

    // Load style
    if (style.empty())
-        style = std::string("file://") + uv::cwd() + std::string("/styles/bright-v6.json");
+        style = std::string("asset://") + std::string("styles/bright-v6.json");

    map.setStyleURL(style);