Fix loading

This commit is contained in:
DenialMC 2015-04-04 07:57:23 +03:00
parent acfdd18629
commit 7065e2b06f

View file

@ -12,7 +12,8 @@ from toontown.suit import SuitDNA
from toontown.toon import ToonHeadFrame
from toontown.toonbase import TTLocalizer
from toontown.toonbase import ToontownBattleGlobals
import copy, os, re, sys, token, tokenize, QuestScripts, BlinkingArrows
from toontown.quest import QuestScripts
import copy, re, tokenize, BlinkingArrows, StringIO
notify = DirectNotifyGlobal.directNotify.newCategory('QuestParser')
lineDict = {}
@ -43,11 +44,12 @@ def clear():
def readFile():
global curId
script = StringIO.StringIO(QuestScripts.script)
for line in QuestScripts.script.split('\n'):
def readline():
return line
gen = tokenize.generate_tokens(readline)
def readLine():
return script.readline().replace('\r', '')
gen = tokenize.generate_tokens(readLine)
line = getLineOfTokens(gen)
while line is not None:
@ -57,11 +59,13 @@ def readFile():
if line[0] == 'ID':
parseId(line)
elif curId is None:
notify.error('Every script must begin with an ID')
notify.error('A script must begin with an ID')
else:
lineDict[curId].append(line)
line = getLineOfTokens(gen)
script.close()
def getLineOfTokens(gen):
tokens = []
nextNeg = 0