diff --git a/Platform/Apple/virtual/src/plasma/gameloop.pla b/Platform/Apple/virtual/src/plasma/gameloop.pla index ceab8753..380fb498 100644 --- a/Platform/Apple/virtual/src/plasma/gameloop.pla +++ b/Platform/Apple/virtual/src/plasma/gameloop.pla @@ -82,7 +82,7 @@ byte inScript = FALSE export word skyNum = 9 export word groundNum = 10 -export byte portraitNum = 46 +export byte portraitNum = 0 word triggerOriginX, triggerOriginY word triggerTbl @@ -1381,8 +1381,7 @@ export def lookupResourcePart(sectionNum, resourceNum)#1 if curMapPartition > 0; return curMapPartition; fin return 2 fin - printf1("n=%d\n", n) - if n < 0 or n > 20; fatal("lkupFail2"); fin + if n < 0 or n > 20; fatal("lkupFail2"); fin // allow zero (e.g. portrait not used so not packed) return n end diff --git a/Platform/Apple/virtual/src/plasma/godmode.pla b/Platform/Apple/virtual/src/plasma/godmode.pla index 01d95760..c91a075a 100644 --- a/Platform/Apple/virtual/src/plasma/godmode.pla +++ b/Platform/Apple/virtual/src/plasma/godmode.pla @@ -77,27 +77,28 @@ def showPos()#1 end /////////////////////////////////////////////////////////////////////////////////////////////////// -def nextPortrait()#1 +def advPortrait(dir)#1 while TRUE - portraitNum = portraitNum + 1 - if portraitNum > PO_LAST; portraitNum = 1; fin - printf1("portrait %d\n", portraitNum) + portraitNum = portraitNum + dir + if portraitNum > PO_LAST + portraitNum = 1 + elsif portraitNum < 1 + portraitNum = PO_LAST + fin if lookupResourcePart(3, portraitNum); break; fin loop setPortrait(portraitNum) return 0 end +/////////////////////////////////////////////////////////////////////////////////////////////////// +def nextPortrait()#1 + return advPortrait(1) +end + /////////////////////////////////////////////////////////////////////////////////////////////////// def prevPortrait()#1 - while TRUE - portraitNum = portraitNum - 1 - if portraitNum < 1; portraitNum = PO_LAST; fin - printf1("portrait %d\n", portraitNum) - if lookupResourcePart(3, portraitNum); break; fin - loop - setPortrait(portraitNum) - return 0 + return advPortrait(-1) end ///////////////////////////////////////////////////////////////////////////////////////////////////