Skip to content

Commit 9efee44

Browse files
authored
Merge pull request Beherith#2 from TurBoss/Slash
Fix linux slash type
2 parents 2f4194a + 91b9167 commit 9efee44

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

pymapconv.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -427,15 +427,15 @@ def compileSMF(myargs):
427427
tileindex=tiley*(springmapx/2)+tilex
428428
newtile=intex.crop((1024*tilex, 1024*tiley, 1024*(tilex+1),1024*(tiley+1))) # The box is a 4-tuple defining the left, upper, right, and lower pixel coordinate.
429429
print '.',
430-
newtile.save('temp\\temp%i.%s'%(tileindex,extension))
430+
newtile.save(os.path.join('temp','temp%i.%s'%(tileindex,extension)))
431431
print ''
432432

433433
print 'Converting to dds',
434434
if myargs.linux:
435435
for tilex in range(springmapx/2):
436436
for tiley in range(springmapx/2):
437437
tileindex=tiley*(springmapx/2)+tilex
438-
cmd='convert -format dds -define dds:mipmaps=3 -define dds:compression=dxt1 temp\\temp%i.%s temp%i.dds'%(tileindex,extension,tileindex)
438+
cmd='convert -format dds -define dds:mipmaps=3 -define dds:compression=dxt1 temp/temp%i.%s temp/temp%i.dds'%(tileindex,extension,tileindex)
439439
os.system(cmd)
440440
print '.',
441441
else:
@@ -482,7 +482,7 @@ def ReadTile(xpos, ypos, sourcebuf): #xpos and ypos aremultiples of 32
482482
for tilex in range(springmapx/2):
483483
for tiley in range(springmapx/2):
484484
tileindex=tiley*(springmapx/2)+tilex
485-
ddsfile=open('temp\\temp%i.dds'%(tileindex),'rb')
485+
ddsfile=open(os.path.join('temp', 'temp%i.dds' % (tileindex)),'rb')
486486
ddsdata=ddsfile.read()[128:]
487487
for x in range(32):
488488
for y in range(32):

0 commit comments

Comments
 (0)