From: Svjatoslav Agejenko Date: Thu, 21 Aug 2025 16:33:59 +0000 (+0300) Subject: Better code readability X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=commitdiff_plain;h=bbb1b5eb435ef0a9305be6ecdd2e98e8953bdc4d;p=qbasicapps.git Better code readability --- diff --git a/Games/Pomppu Paavo.bas b/Games/Pomppu Paavo.bas index b219d31..4b56e5b 100755 --- a/Games/Pomppu Paavo.bas +++ b/Games/Pomppu Paavo.bas @@ -17,7 +17,7 @@ DECLARE SUB DrawSprite (p%, o%, m%, fr%, teler%) DEFINT A-Z DIM SHARED graphicsMode DIM SHARED asciiLevelData(1 TO 20) AS STRING * 31 -DIM SHARED hedgehogY, hedgehogX, secondHedgehogY, secondHedgehogX +DIM SHARED FirstCompanionY%, FirstCompanionX%, SecondCompanionY%, SecondCompanionX% DIM SHARED remainingLives, coinCount DIM SHARED uks1, uks2, uks3, uks4 DIM SHARED currentLevelNumber @@ -233,10 +233,10 @@ IF b > 0 THEN IF sipp = 10 THEN PUT (a, b), sipp10, OR IF b > 0 THEN IF sipp = 20 THEN PUT (a, b), sipp20, OR IF b > 0 THEN IF sipp = 3 THEN PUT (a, b), sipp3, OR -GET (hedgehogX, hedgehogY)-(hedgehogX + 10, hedgehogY + 10), siil1 -PUT (hedgehogX, hedgehogY), siil, OR -GET (secondHedgehogX, secondHedgehogY)-(secondHedgehogX + 10, secondHedgehogY + 10), siil2 -PUT (secondHedgehogX, secondHedgehogY), siil, OR +GET (FirstCompanionX%, FirstCompanionY%)-(FirstCompanionX% + 10, FirstCompanionY% + 10), siil1 +PUT (FirstCompanionX%, FirstCompanionY%), siil, OR +GET (SecondCompanionX%, SecondCompanionY%)-(SecondCompanionX% + 10, SecondCompanionY% + 10), siil2 +PUT (SecondCompanionX%, SecondCompanionY%), siil, OR SOUND 0, .8 IF terrainGrid((a + 38) \ 20, (b + 37) \ 20) = "z" THEN eda = -1: r = 9: lke = 0 IF terrainGrid((a + 38) \ 20, (b + 22) \ 20) = "z" THEN eda = -1: r = 9: lke = 0 @@ -262,29 +262,29 @@ r1 = r1 + 1: IF r1 > 3 THEN r1 = 0: all = all + 1 lk = lk + 1: cd = cd - 1 IF objectGrid((a + 30) \ 20, (b + 21) \ 20) = "o" THEN terrainGrid((a + 30) \ 20, (b + 21) \ 20) = "": objectGrid((a + 30) \ 20, (b + 21) \ 20) = "": kustuta = 1 IF objectGrid((a + 30) \ 20, (b + 38) \ 20) = "a" THEN terrainGrid((a + 30) \ 20, (b + 38) \ 20) = "": objectGrid((a + 30) \ 20, (b + 38) \ 20) = "": kustuta2 = 1 -IF terrainGrid((hedgehogX + 25) \ 20, (hedgehogY + 25) \ 20) = "z" THEN siiall = -1 -IF terrainGrid((hedgehogX + 30) \ 20, (hedgehogY + 10) \ 20) = "z" THEN siie = -1 -IF terrainGrid((hedgehogX + 20) \ 20, (hedgehogY + 10) \ 20) = "z" THEN siie = 1 -IF terrainGrid((secondHedgehogX + 25) \ 20, (secondHedgehogY + 25) \ 20) = "z" THEN siiall1 = -1 -IF terrainGrid((secondHedgehogX + 30) \ 20, (secondHedgehogY + 10) \ 20) = "z" THEN siie1 = -1 -IF terrainGrid((secondHedgehogX + 20) \ 20, (secondHedgehogY + 10) \ 20) = "z" THEN siie1 = 1 -IF hedgehogX > 300 THEN siie = -1 -IF hedgehogX < 3 THEN siie = 1 -IF secondHedgehogX > 300 THEN siie1 = -1 -IF secondHedgehogX < 3 THEN siie1 = 1 -PUT (secondHedgehogX, secondHedgehogY), siil2, PSET -PUT (hedgehogX, hedgehogY), siil1, PSET +IF terrainGrid((FirstCompanionX% + 25) \ 20, (FirstCompanionY% + 25) \ 20) = "z" THEN siiall = -1 +IF terrainGrid((FirstCompanionX% + 30) \ 20, (FirstCompanionY% + 10) \ 20) = "z" THEN siie = -1 +IF terrainGrid((FirstCompanionX% + 20) \ 20, (FirstCompanionY% + 10) \ 20) = "z" THEN siie = 1 +IF terrainGrid((SecondCompanionX% + 25) \ 20, (SecondCompanionY% + 25) \ 20) = "z" THEN siiall1 = -1 +IF terrainGrid((SecondCompanionX% + 30) \ 20, (SecondCompanionY% + 10) \ 20) = "z" THEN siie1 = -1 +IF terrainGrid((SecondCompanionX% + 20) \ 20, (SecondCompanionY% + 10) \ 20) = "z" THEN siie1 = 1 +IF FirstCompanionX% > 300 THEN siie = -1 +IF FirstCompanionX% < 3 THEN siie = 1 +IF SecondCompanionX% > 300 THEN siie1 = -1 +IF SecondCompanionX% < 3 THEN siie1 = 1 +PUT (SecondCompanionX%, SecondCompanionY%), siil2, PSET +PUT (FirstCompanionX%, FirstCompanionY%), siil1, PSET IF b > 0 THEN PUT (a, b), mar1, PSET IF kustuta = 1 THEN kustuta = 0: PUT (((a + 10) \ 20) * 20, (b \ 20) * 20), emptySpaceImage, PSET IF kustuta1 = 1 THEN kustuta1 = 0: PUT (((a + 10) \ 20) * 20, ((b + 10) \ 20) * 20), emptySpaceImage, PSET IF kustuta2 = 1 THEN kustuta2 = 0: PUT (((a + 10) \ 20) * 20, ((b + 28) \ 20) * 20), emptySpaceImage, PSET IF makk = 1 THEN makk = 0: a = a - 20 -objectGrid((secondHedgehogX + 25) \ 20, (secondHedgehogY + 8) \ 20) = "": objectGrid((hedgehogX + 25) \ 20, (hedgehogY + 8) \ 20) = "" -hedgehogX = hedgehogX + siie -hedgehogY = hedgehogY + siiall -secondHedgehogX = secondHedgehogX + siie1 -secondHedgehogY = secondHedgehogY + siiall1 -objectGrid((secondHedgehogX + 25) \ 20, (secondHedgehogY + 8) \ 20) = "q": objectGrid((hedgehogX + 25) \ 20, (hedgehogY + 8) \ 20) = "q" +objectGrid((SecondCompanionX% + 25) \ 20, (SecondCompanionY% + 8) \ 20) = "": objectGrid((FirstCompanionX% + 25) \ 20, (FirstCompanionY% + 8) \ 20) = "" +FirstCompanionX% = FirstCompanionX% + siie +FirstCompanionY% = FirstCompanionY% + siiall +SecondCompanionX% = SecondCompanionX% + siie1 +SecondCompanionY% = SecondCompanionY% + siiall1 +objectGrid((SecondCompanionX% + 25) \ 20, (SecondCompanionY% + 8) \ 20) = "q": objectGrid((FirstCompanionX% + 25) \ 20, (FirstCompanionY% + 8) \ 20) = "q" siiall = siiall + 1: IF siiall > 2 THEN siiall = 2 siiall1 = siiall1 + 1: IF siiall1 > 2 THEN siiall1 = 2 a = a + eda @@ -321,10 +321,10 @@ IF b > 0 THEN IF sipp = 10 THEN PUT (a \ 2, b \ 2), sippm10, OR IF b > 0 THEN IF sipp = 20 THEN PUT (a \ 2, b \ 2), sippm20, OR IF b > 0 THEN IF sipp = 3 THEN PUT (a \ 2, b \ 2), sippm3, OR -GET (hedgehogX \ 2, hedgehogY \ 2)-((hedgehogX + 10) \ 2, (hedgehogY + 10) \ 2), siilm1 -PUT (hedgehogX \ 2, hedgehogY \ 2), siilm, OR -GET (secondHedgehogX \ 2, secondHedgehogY \ 2)-((siia1 + 10) \ 2, (secondHedgehogY + 10) \ 2), siilm2 -PUT (secondHedgehogX \ 2, secondHedgehogY \ 2), siilm, OR +GET (FirstCompanionX% \ 2, FirstCompanionY% \ 2)-((FirstCompanionX% + 10) \ 2, (FirstCompanionY% + 10) \ 2), siilm1 +PUT (FirstCompanionX% \ 2, FirstCompanionY% \ 2), siilm, OR +GET (SecondCompanionX% \ 2, SecondCompanionY% \ 2)-((siia1 + 10) \ 2, (SecondCompanionY% + 10) \ 2), siilm2 +PUT (SecondCompanionX% \ 2, SecondCompanionY% \ 2), siilm, OR SOUND 0, .8 IF terrainGrid((a + 38) \ 20, (b + 37) \ 20) = "z" THEN eda = -1: r = 9: lke = 0 IF terrainGrid((a + 38) \ 20, (b + 22) \ 20) = "z" THEN eda = -1: r = 9: lke = 0 @@ -350,29 +350,29 @@ r1 = r1 + 1: IF r1 > 3 THEN r1 = 0: all = all + 1 lk = lk + 1: cd = cd - 1 IF objectGrid((a + 30) \ 20, (b + 21) \ 20) = "o" THEN terrainGrid((a + 30) \ 20, (b + 21) \ 20) = "": objectGrid((a + 30) \ 20, (b + 21) \ 20) = "": kustuta = 1 IF objectGrid((a + 30) \ 20, (b + 38) \ 20) = "a" THEN terrainGrid((a + 30) \ 20, (b + 38) \ 20) = "": objectGrid((a + 30) \ 20, (b + 38) \ 20) = "": kustuta2 = 1 -IF terrainGrid((hedgehogX + 25) \ 20, (hedgehogY + 25) \ 20) = "z" THEN siiall = -1 -IF terrainGrid((hedgehogX + 30) \ 20, (hedgehogY + 10) \ 20) = "z" THEN siie = -1 -IF terrainGrid((hedgehogX + 20) \ 20, (hedgehogY + 10) \ 20) = "z" THEN siie = 1 -IF terrainGrid((secondHedgehogX + 25) \ 20, (secondHedgehogY + 25) \ 20) = "z" THEN siiall1 = -1 -IF terrainGrid((secondHedgehogX + 30) \ 20, (secondHedgehogY + 10) \ 20) = "z" THEN siie1 = -1 -IF terrainGrid((secondHedgehogX + 20) \ 20, (secondHedgehogY + 10) \ 20) = "z" THEN siie1 = 1 -IF hedgehogX > 600 THEN siie = -1 -IF hedgehogX < 3 THEN siie = 1 -IF secondHedgehogX > 600 THEN siie1 = -1 -IF secondHedgehogX < 3 THEN siie1 = 1 -PUT (secondHedgehogX \ 2, secondHedgehogY \ 2), siilm2, PSET -PUT (hedgehogX \ 2, hedgehogY \ 2), siilm1, PSET +IF terrainGrid((FirstCompanionX% + 25) \ 20, (FirstCompanionY% + 25) \ 20) = "z" THEN siiall = -1 +IF terrainGrid((FirstCompanionX% + 30) \ 20, (FirstCompanionY% + 10) \ 20) = "z" THEN siie = -1 +IF terrainGrid((FirstCompanionX% + 20) \ 20, (FirstCompanionY% + 10) \ 20) = "z" THEN siie = 1 +IF terrainGrid((SecondCompanionX% + 25) \ 20, (SecondCompanionY% + 25) \ 20) = "z" THEN siiall1 = -1 +IF terrainGrid((SecondCompanionX% + 30) \ 20, (SecondCompanionY% + 10) \ 20) = "z" THEN siie1 = -1 +IF terrainGrid((SecondCompanionX% + 20) \ 20, (SecondCompanionY% + 10) \ 20) = "z" THEN siie1 = 1 +IF FirstCompanionX% > 600 THEN siie = -1 +IF FirstCompanionX% < 3 THEN siie = 1 +IF SecondCompanionX% > 600 THEN siie1 = -1 +IF SecondCompanionX% < 3 THEN siie1 = 1 +PUT (SecondCompanionX% \ 2, SecondCompanionY% \ 2), siilm2, PSET +PUT (FirstCompanionX% \ 2, FirstCompanionY% \ 2), siilm1, PSET IF b > 0 THEN PUT (a \ 2, b \ 2), marm1, PSET IF kustuta = 1 THEN kustuta = 0: PUT (((a + 10) \ 20) * 10, (b \ 20) * 10), emptySpaceImageS, PSET IF kustuta1 = 1 THEN kustuta1 = 0: PUT (((a + 10) \ 20) * 10, ((b + 10) \ 20) * 10), emptySpaceImageS, PSET IF kustuta2 = 1 THEN kustuta2 = 0: PUT (((a + 10) \ 20) * 10, ((b + 28) \ 20) * 10), emptySpaceImageS, PSET IF makk = 1 THEN makk = 0: a = a - 20 -objectGrid((secondHedgehogX + 25) \ 20, (secondHedgehogY + 8) \ 20) = "": objectGrid((hedgehogX + 25) \ 20, (hedgehogY + 8) \ 20) = "" -hedgehogX = hedgehogX + siie -hedgehogY = hedgehogY + siiall -secondHedgehogX = secondHedgehogX + siie1 -secondHedgehogY = secondHedgehogY + siiall1 -objectGrid((secondHedgehogX + 25) \ 20, (secondHedgehogY + 8) \ 20) = "q": objectGrid((hedgehogX + 25) \ 20, (hedgehogY + 8) \ 20) = "q" +objectGrid((SecondCompanionX% + 25) \ 20, (SecondCompanionY% + 8) \ 20) = "": objectGrid((FirstCompanionX% + 25) \ 20, (FirstCompanionY% + 8) \ 20) = "" +FirstCompanionX% = FirstCompanionX% + siie +FirstCompanionY% = FirstCompanionY% + siiall +SecondCompanionX% = SecondCompanionX% + siie1 +SecondCompanionY% = SecondCompanionY% + siiall1 +objectGrid((SecondCompanionX% + 25) \ 20, (SecondCompanionY% + 8) \ 20) = "q": objectGrid((FirstCompanionX% + 25) \ 20, (FirstCompanionY% + 8) \ 20) = "q" siiall = siiall + 1: IF siiall > 2 THEN siiall = 2 siiall1 = siiall1 + 1: IF siiall1 > 2 THEN siiall1 = 2 a = a + eda @@ -837,10 +837,10 @@ END SUB SUB LoadLevel (y) 125 -hedgehogX = 0 -hedgehogY = 0 +FirstCompanionX% = 0 +FirstCompanionY% = 0 aiia1 = 0 -secondHedgehogY = 0 +SecondCompanionY% = 0 FOR a1 = 1 TO 32 FOR b1 = 1 TO 20 terrainGrid(a1, b1) = "" @@ -1134,8 +1134,8 @@ IF q$ = "m" THEN PUT (D * 20, e * 20), solidBlockImage, PSET: terrainGrid(D + 1, IF q$ = "o" THEN PUT (D * 20, e * 20), kast, PSET: terrainGrid(D + 1, e + 1) = "z": objectGrid(D + 1, e + 1) = "o" IF q$ = "." THEN PUT (D * 20, e * 20), taht, PSET IF q$ = "-" THEN PUT (D * 20, e * 20), pilv, PSET -IF q$ = "x" THEN hedgehogX = D * 20: hedgehogY = (e + 1) * 20 -IF q$ = "y" THEN secondHedgehogX = D * 20: secondHedgehogY = (e + 1) * 20 +IF q$ = "x" THEN FirstCompanionX% = D * 20: FirstCompanionY% = (e + 1) * 20 +IF q$ = "y" THEN SecondCompanionX% = D * 20: SecondCompanionY% = (e + 1) * 20 IF q$ = "1" THEN PUT (D * 20, e * 20), munt, PSET: terrainGrid(D + 1, e + 1) = "1" IF q$ = "p" THEN PUT (D * 20, (e * 20) + 10), poosas, PSET IF q$ = "h" THEN PUT (D * 20, e * 20), aken, PSET @@ -1157,8 +1157,8 @@ IF q$ = "m" THEN PUT (D * 10, e * 10), solidBlockImageS, PSET: terrainGrid(D + 1 IF q$ = "o" THEN PUT (D * 10, e * 10), kastm, PSET: terrainGrid(D + 1, e + 1) = "z": objectGrid(D + 1, e + 1) = "o" IF q$ = "." THEN PUT (D * 10, e * 10), tahtm, PSET IF q$ = "-" THEN PUT (D * 10, e * 10), pilvm, PSET -IF q$ = "x" THEN hedgehogX = D * 20: hedgehogY = (e + 1) * 20 -IF q$ = "y" THEN secondHedgehogX = D * 20: secondHedgehogY = (e + 1) * 20 +IF q$ = "x" THEN FirstCompanionX% = D * 20: FirstCompanionY% = (e + 1) * 20 +IF q$ = "y" THEN SecondCompanionX% = D * 20: SecondCompanionY% = (e + 1) * 20 IF q$ = "1" THEN PUT (D * 10, e * 10), muntm, PSET: terrainGrid(D + 1, e + 1) = "1" IF q$ = "p" THEN PUT (D * 10, (e * 10) + 5), poosasm, PSET IF q$ = "h" THEN PUT (D * 10, e * 10), akenm, PSET