From 08ca47f23da5f31ad9c2444f76f4311c8b6de685 Mon Sep 17 00:00:00 2001 From: Loudrob Date: Tue, 3 Mar 2015 17:14:57 -0500 Subject: [PATCH] Ah, almost forgot. Don't change it unless you create a new system for it yourself. --- config/release/dev.prc | 2 +- toontown/chat/TTWhiteList.py | 2 +- toontown/dna/DNAParser.py | 6 +++--- toontown/makeatoon/NameGenerator.py | 2 +- toontown/quest/QuestParser.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/release/dev.prc b/config/release/dev.prc index 01346dac..ea637aa7 100644 --- a/config/release/dev.prc +++ b/config/release/dev.prc @@ -2,7 +2,7 @@ distribution dev # Art assets: -model-path resources/ +model-path ../resources/ # Server: server-version ttu-dev diff --git a/toontown/chat/TTWhiteList.py b/toontown/chat/TTWhiteList.py index 8e61937d..c0a1dea4 100644 --- a/toontown/chat/TTWhiteList.py +++ b/toontown/chat/TTWhiteList.py @@ -25,7 +25,7 @@ class TTWhiteList(WhiteList, DistributedObject.DistributedObject): searchPath = DSearchPath() searchPath.appendDirectory(Filename('/phase_4/etc')) if __debug__: - searchPath.appendDirectory(Filename('resources/phase_4/etc')) + searchPath.appendDirectory(Filename('../resources/phase_4/etc')) found = vfs.resolveFilename(filename, searchPath) if not found: self.notify.info("Couldn't find whitelist data file!") diff --git a/toontown/dna/DNAParser.py b/toontown/dna/DNAParser.py index e44e78d7..d31ff15d 100644 --- a/toontown/dna/DNAParser.py +++ b/toontown/dna/DNAParser.py @@ -21,14 +21,14 @@ class DNABulkLoader: def loadDNABulk(dnaStorage, file): dnaLoader = DNALoader.DNALoader() - file = 'resources/' + file + file = '../resources/' + file dnaLoader.loadDNAFile(dnaStorage, file) dnaLoader.destroy() def loadDNAFile(dnaStorage, file): print 'Reading DNA file...', file dnaLoader = DNALoader.DNALoader() - file = 'resources/' + file + file = '../resources/' + file node = dnaLoader.loadDNAFile(dnaStorage, file) dnaLoader.destroy() if node.node().getNumChildren() > 0: @@ -37,7 +37,7 @@ def loadDNAFile(dnaStorage, file): def loadDNAFileAI(dnaStorage, file): dnaLoader = DNALoader.DNALoader() - file = 'resources/' + file + file = '../resources/' + file data = dnaLoader.loadDNAFileAI(dnaStorage, file) dnaLoader.destroy() return data diff --git a/toontown/makeatoon/NameGenerator.py b/toontown/makeatoon/NameGenerator.py index 104521c5..8bb36c7d 100644 --- a/toontown/makeatoon/NameGenerator.py +++ b/toontown/makeatoon/NameGenerator.py @@ -39,7 +39,7 @@ class NameGenerator: self.nameDictionary = {} searchPath = DSearchPath() if __debug__: - searchPath.appendDirectory(Filename('resources/phase_3/etc')) + searchPath.appendDirectory(Filename('../resources/phase_3/etc')) searchPath.appendDirectory(Filename('/phase_3/etc')) filename = Filename(TTLocalizer.NameShopNameMaster) found = vfs.resolveFilename(filename, searchPath) diff --git a/toontown/quest/QuestParser.py b/toontown/quest/QuestParser.py index 6d8294d0..59d064fd 100644 --- a/toontown/quest/QuestParser.py +++ b/toontown/quest/QuestParser.py @@ -1086,7 +1086,7 @@ class NPCMoviePlayer(DirectObject.DirectObject): searchPath = DSearchPath() if __debug__: - searchPath.appendDirectory(Filename('resources/phase_3/etc')) + searchPath.appendDirectory(Filename('../resources/phase_3/etc')) searchPath.appendDirectory(Filename('/phase_3/etc')) scriptFile = Filename('QuestScripts.txt') found = vfs.resolveFilename(scriptFile, searchPath)