Joe Shochet пре 23 година
родитељ
комит
7f3419e591

+ 5 - 4
direct/src/leveleditor/Configrc

@@ -2,6 +2,7 @@
 want-tk 1
 want-directtools 1
 level-editor-hoods TT
+# level-editor-hoods TT DD DG MM BR DL
 style-path-prefix /i
 
 load-display pandadx
@@ -14,14 +15,14 @@ sync-video #t
 
 # Configrc for running the level editor
 
-# model-path     $TTMODELS
-# sound-path     $TTMODELS
+model-path     $TTMODELS
+model-path     $DMODELS
+sound-path     $TTMODELS
 dna-preload    phase_4/dna/storage.dna
 
 load-file-type toontown
 
 window-title Toontown
-win32-window-icon $TTMODELS/phase_3/models/gui/toontown.ico
 
 compress-channels #t
 text-encoding utf8
@@ -57,6 +58,6 @@ egg-object-type-shadow          <Scalar> bin { shadow } <Scalar> alpha { blend-n
 cull-bin shadow 25 unsorted
 
 # The ID of the server that we are compatible with
-server-version sv1.0.13
+server-version sv1.0.14
 
 

+ 1 - 1
direct/src/leveleditor/LevelEditor.py

@@ -2464,7 +2464,7 @@ class LevelEditor(NodePath, PandaObject):
                    fUpdateExplorer = 0)
         # Now load in new file
         self.cvsUpdate(filename)
-        node = loadDNAFile(DNASTORE, filename, CSDefault, 1)
+        node = loadDNAFile(DNASTORE, Filename.fromOsSpecific(filename).cStr(), CSDefault, 1)
         if node.getNumParents() == 1:
             # If the node already has a parent arc when it's loaded, we must
             # be using the level editor and we want to preserve that arc.

+ 5 - 14
direct/src/leveleditor/printfiles

@@ -7,8 +7,13 @@ echo $DIRECT/src/leveleditor/Configrc
 # Python files
 echo $WINTOOLS/bin/python.exe
 echo $WINTOOLS/sdk/python/Python-2.2/DLLs/python22.dll
+echo $WINTOOLS/sdk/python/Python-2.2/DLLs/PyWinTypes22.dll
 echo $WINTOOLS/sdk/python/Python-2.2/DLLs/_sre.pyd
 echo $WINTOOLS/sdk/python/Python-2.2/DLLs/_tkinter.pyd
+echo $WINTOOLS/sdk/python/Python-2.2/DLLs/zlib.pyd
+echo $WINTOOLS/sdk/python/Python-2.2/DLLs/win32api.pyd
+echo $WINTOOLS/sdk/python/Python-2.2/DLLs/_socket.pyd
+
 echo $WINTOOLS/sdk/python/Python-2.2/Lib/lib-tk
 echo $WINTOOLS/sdk/python/Python-2.2/Lib/Pmw
 echo $WINTOOLS/sdk/python/Python-2.2/Lib/linecache.py
@@ -86,17 +91,3 @@ echo $PANDA/etc/window_db
 
 # Generated code for libpanda
 echo $DIRECT/lib/py/PandaModules.py
-
-# Models, textures, audio
-echo $DMODELS/models
-echo $DMODELS/icons
-echo $DMODELS/maps
-echo $TTMODELS/phase_3
-echo $TTMODELS/phase_4
-echo $TTMODELS/phase_5
-echo $TTMODELS/phase_6
-echo $TTMODELS/phase_7
-echo $TTMODELS/phase_8
-
-
-

+ 3 - 1
direct/src/leveleditor/run.bat

@@ -1,3 +1,5 @@
-
 set PATH=lib
+set PYTHONPATH=.;lib-tk
+set TTMODELS=/i/alpha/player/install/ttmodels
+set DMODELS=/i/alpha/player/install/dmodels
 python.exe LevelEditor.py