Skip to content

Commit

Permalink
fix music not stoping correctly on load, fix crash when skipautoload …
Browse files Browse the repository at this point in the history
…is used without an existing autosave.
  • Loading branch information
ThomasTheSpaceFox committed Mar 15, 2018
1 parent cbadcfb commit 34aa252
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 9 deletions.
6 changes: 5 additions & 1 deletion DZU-ENG1.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
pygame.display.init()
pygame.font.init()
pygame.mixer.init()
engversion="v1.7.0"
engversion="v1.7.1"
print("Desutezeoid arbitrary point and click engine " + engversion)
print("parsing ENGSYSTEM.xml")
conftree = ET.parse(os.path.join("xml", "ENGSYSTEM.xml"))
Expand Down Expand Up @@ -485,7 +485,9 @@ def loader(savefile="autosave.sav", returnonerror=0):
BGMtrack=mainsavroot.find('pagelink').attrib.get("musictrack")
if BGMtrack=="??none??":
BGMtrack=None
pygame.mixer.music.stop()
if BGMtrack!=None:

pygame.mixer.music.load(os.path.join(sfxpath, BGMtrack))
pygame.mixer.music.play(-1)

Expand Down Expand Up @@ -568,6 +570,8 @@ def newgame():
keylist.extend(["0"])
if not skipautoload:
loader()
else:
newgame()


timeoutlist=list()
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Desutezeoid
v1.7.0
v1.7.1
an arbitrary point and click engine.
Copyright (c) 2015-2018 Thomas Leathers and Contributors
see DZU_contributors.md for a list of contributors.
Expand Down
2 changes: 1 addition & 1 deletion manual/example_READMEs/DZU_README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{THIS IS AN EXAMPLE README FOR USE BY DEVELOPERS}
#Desutezeoid
v1.7.0 {make sure this version number matches the engine version you use.}
v1.7.1 {make sure this version number matches the engine version you use.}
an arbitrary point and click engine.
Copyright (c) 2015-2018 Thomas Leathers and Contributors
see DZU_contributors.md for a list of contributors.
Expand Down
6 changes: 3 additions & 3 deletions manual/example_READMEs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
# <game name>
<bla bla>

-----
Built on: Desutezeoid v1.7.0

Built on: Desutezeoid v1.7.1
see DZU_README.md for licensing, and a list of files covered,
see DZU_contributors.md for a list of contributors.
-----


------Below is the readme information for <game name>------

Expand Down
2 changes: 1 addition & 1 deletion xml/ENGSYSTEM.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!--window size-->
<screen x="800" y="600"/>
<!--Game/program Title/windown icon.-->
<title base="Desutezeoid v1.7.0 test program. " icon="icon.png" />
<title base="Desutezeoid v1.7.1 test program. " icon="icon.png" />
<!--page to load at engine start.-->
<beginref>startpage.xml</beginref>
<!--debug settings. used in development and testing. printkeys controls keyid list printing.
Expand Down
2 changes: 1 addition & 1 deletion xml/about.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<act type="none"/>
</label>
<!--notice how the "text" object has similar attributes to the label tag, but lacking click and hover related, attribues. It still has onkey and offkey though. do note this can take longer to process than other core objects.-->
<text x="10" y="30" size="20" transp="1" FGCOLOR="#000000">v1.7.0
<text x="10" y="30" size="20" transp="1" FGCOLOR="#000000">v1.7.1
an arbitrary point and click engine.
Copyright (c) 2015-2018 Thomas Leathers and Contributors

Expand Down
2 changes: 1 addition & 1 deletion xml/startpage.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</pagekeys>
<forks>
<anim keyid="fallcat" anim="catanim1.dza" layer="1"/>
<uipop keyid="aboutdiag" msg="A Point and Click Adventure game Engine. - V1.7.0" img="dzu_logo1.png" okkey="0"/>
<uipop keyid="aboutdiag" msg="A Point and Click Adventure game Engine. - V1.7.1" img="dzu_logo1.png" okkey="0"/>
</forks>
<core>
<label x="0" y="10" size="30" transp="1" FGCOLOR="#000000">
Expand Down

0 comments on commit 34aa252

Please sign in to comment.