Преглед на файлове

Don't include .gitkeep files in build

Clément Wolf преди 1 месец
родител
ревизия
d3cefc58a1

+ 0 - 0
resources/cfg/.gitkeep


+ 0 - 0
resources/exports/exports.folder


+ 0 - 0
resources/screenshots/screenshots.folder


BIN
resources/sounds/boom.ogg


BIN
resources/sounds/fire.ogg


BIN
resources/sounds/thrust.ogg


+ 0 - 7
src/App/Osu/Osu.cpp

@@ -515,13 +515,6 @@ Osu::Osu(int instanceID) {
     // m_editor->setVisible(true);
     // m_userStatsScreen->setVisible(true);
 
-    if(!env->directoryExists(MCENGINE_DATA_DIR "avatars")) {
-        env->createDirectory(MCENGINE_DATA_DIR "avatars");
-    }
-    if(!env->directoryExists(MCENGINE_DATA_DIR "maps")) {
-        env->createDirectory(MCENGINE_DATA_DIR "maps");
-    }
-
     // Init online functionality (multiplayer/leaderboards/etc)
     bancho.osu = this;
     init_networking_thread();

+ 14 - 0
src/Engine/Engine.cpp

@@ -247,6 +247,20 @@ Engine::~Engine() {
 }
 
 void Engine::loadApp() {
+    // create directories we will assume already exist later on
+    if(!env->directoryExists(MCENGINE_DATA_DIR "avatars")) {
+        env->createDirectory(MCENGINE_DATA_DIR "avatars");
+    }
+    if(!env->directoryExists(MCENGINE_DATA_DIR "cfg")) {
+        env->createDirectory(MCENGINE_DATA_DIR "cfg");
+    }
+    if(!env->directoryExists(MCENGINE_DATA_DIR "maps")) {
+        env->createDirectory(MCENGINE_DATA_DIR "maps");
+    }
+    if(!env->directoryExists(MCENGINE_DATA_DIR "screenshots")) {
+        env->createDirectory(MCENGINE_DATA_DIR "screenshots");
+    }
+
     // load core default resources (these are required to be able to draw the loading screen)
     if(m_iLoadingScreenDelay == 0 || m_iLoadingScreenDelay == -2) {
         debugLog("Engine: Loading default resources ...\n");

+ 0 - 2
src/Engine/ResourceManager.cpp

@@ -50,14 +50,12 @@ ConVar *ResourceManager::debug_rm = &debug_rm_;
 
 const char *ResourceManager::PATH_DEFAULT_IMAGES = "romfs:/materials/";
 const char *ResourceManager::PATH_DEFAULT_FONTS = "romfs:/fonts/";
-const char *ResourceManager::PATH_DEFAULT_SOUNDS = "romfs:/sounds/";
 const char *ResourceManager::PATH_DEFAULT_SHADERS = "romfs:/shaders/";
 
 #else
 
 const char *ResourceManager::PATH_DEFAULT_IMAGES = MCENGINE_DATA_DIR "materials/";
 const char *ResourceManager::PATH_DEFAULT_FONTS = MCENGINE_DATA_DIR "fonts/";
-const char *ResourceManager::PATH_DEFAULT_SOUNDS = MCENGINE_DATA_DIR "sounds/";
 const char *ResourceManager::PATH_DEFAULT_SHADERS = MCENGINE_DATA_DIR "shaders/";
 
 #endif

+ 0 - 1
src/Engine/ResourceManager.h

@@ -26,7 +26,6 @@ class ResourceManager {
 
     static const char *PATH_DEFAULT_IMAGES;
     static const char *PATH_DEFAULT_FONTS;
-    static const char *PATH_DEFAULT_SOUNDS;
     static const char *PATH_DEFAULT_SHADERS;
 
    public: