From: Svjatoslav Agejenko Date: Thu, 21 Aug 2025 16:30:24 +0000 (+0300) Subject: Better code readability X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=commitdiff_plain;h=23fd9809ec1e34ffd27fd96f5c96ca86c3e7c06d;p=qbasicapps.git Better code readability --- diff --git a/Games/Pomppu Paavo.bas b/Games/Pomppu Paavo.bas index 3f9fb67..b219d31 100755 --- a/Games/Pomppu Paavo.bas +++ b/Games/Pomppu Paavo.bas @@ -10,9 +10,9 @@ ' 2025, Improved program readability -DECLARE SUB displayGameStats () -DECLARE SUB loadLevel (y%) -DECLARE SUB drawSprite (p%, o%, m%, fr%, teler%) +DECLARE SUB DisplayGameStatistics () +DECLARE SUB LoadLevel (y%) +DECLARE SUB DrawSprite (p%, o%, m%, fr%, teler%) DEFINT A-Z DIM SHARED graphicsMode @@ -93,131 +93,131 @@ currentLevelNumber = 1 REM joonist REM END GET (1, 1)-(20, 20), emptySpaceImage -drawSprite 0, 0, 1, 1, 1 +DrawSprite 0, 0, 1, 1, 1 GET (1, 1)-(20, 20), solidBlockImage -drawSprite 0, 0, 4, 1, 1 +DrawSprite 0, 0, 4, 1, 1 GET (1, 1)-(20, 20), kast PUT (1, 180), solidBlockImage, PSET PUT (300, 1), solidBlockImage, PSET PUT (300, 180), solidBlockImage, PSET -drawSprite 30, 50, 2, 1, 1 +DrawSprite 30, 50, 2, 1, 1 GET (31, 51)-(91, 76), pilv PUT (160, 10), pilv, PSET -drawSprite 20, 100, 3, 1, 1 +DrawSprite 20, 100, 3, 1, 1 GET (21, 101)-(31, 114), taht CLS -drawSprite 0, 0, 5, 1, 1 +DrawSprite 0, 0, 5, 1, 1 GET (1, 1)-(11, 8), siil CLS -drawSprite 0, 0, 6, 1, 1 +DrawSprite 0, 0, 6, 1, 1 GET (1, 1)-(8, 10), munt CLS -drawSprite 0, 0, 7, 1, 1 +DrawSprite 0, 0, 7, 1, 1 GET (1, 1)-(31, 11), poosas CLS -drawSprite 0, 0, 8, 1, 1 +DrawSprite 0, 0, 8, 1, 1 GET (1, 1)-(26, 21), aken CLS -drawSprite 0, 0, 9, 1, 1 +DrawSprite 0, 0, 9, 1, 1 GET (1, 1)-(21, 11), vedru CLS -drawSprite 0, 0, 11, 1, 1 +DrawSprite 0, 0, 11, 1, 1 GET (1, 1)-(51, 81), puu CLS -drawSprite 0, 0, 12, 1, 1 +DrawSprite 0, 0, 12, 1, 1 GET (1, 1)-(20, 20), noolt CLS -drawSprite 0, 0, 12, 50, 1 +DrawSprite 0, 0, 12, 50, 1 GET (1, 1)-(20, 20), noolt1 CLS -drawSprite 0, 0, 13, 1, 1 +DrawSprite 0, 0, 13, 1, 1 GET (1, 1)-(20, 20), auk CLS -drawSprite 0, 0, 14, 1, 1 +DrawSprite 0, 0, 14, 1, 1 GET (1, 1)-(20, 20), sipp1 CLS -drawSprite 0, 0, 15, 1, 1 +DrawSprite 0, 0, 15, 1, 1 GET (1, 1)-(20, 20), sipp2 CLS -drawSprite 0, 0, 14, 50, 1 +DrawSprite 0, 0, 14, 50, 1 GET (1, 1)-(20, 20), sipp10 CLS -drawSprite 0, 0, 15, 50, 1 +DrawSprite 0, 0, 15, 50, 1 GET (1, 1)-(20, 20), sipp20 CLS -drawSprite 0, 0, 16, 1, 1 +DrawSprite 0, 0, 16, 1, 1 GET (1, 1)-(20, 20), sipp3 CLS GET (1, 1)-(10, 10), emptySpaceImageS -drawSprite 0, 0, 1, 1, 2 +DrawSprite 0, 0, 1, 1, 2 GET (1, 1)-(10, 10), solidBlockImageS -drawSprite 0, 0, 4, 1, 2 +DrawSprite 0, 0, 4, 1, 2 GET (1, 1)-(10, 10), kastm PUT (1, 180), solidBlockImage, PSET PUT (300, 1), solidBlockImage, PSET PUT (300, 180), solidBlockImage, PSET -drawSprite 30, 50, 2, 1, 2 +DrawSprite 30, 50, 2, 1, 2 GET (16, 26)-(46, 38), pilvm -drawSprite 20, 100, 3, 1, 2 +DrawSprite 20, 100, 3, 1, 2 GET (11, 51)-(16, 72), tahtm CLS -drawSprite 0, 0, 5, 1, 2 +DrawSprite 0, 0, 5, 1, 2 GET (1, 1)-(6, 4), siilm CLS -drawSprite 0, 0, 6, 1, 2 +DrawSprite 0, 0, 6, 1, 2 GET (1, 1)-(4, 5), muntm CLS -drawSprite 0, 0, 7, 1, 2 +DrawSprite 0, 0, 7, 1, 2 GET (1, 1)-(16, 6), poosasm CLS -drawSprite 0, 0, 8, 1, 2 +DrawSprite 0, 0, 8, 1, 2 GET (1, 1)-(13, 11), akenm CLS -drawSprite 0, 0, 9, 1, 2 +DrawSprite 0, 0, 9, 1, 2 GET (1, 1)-(11, 6), vedrum CLS -drawSprite 0, 0, 11, 1, 2 +DrawSprite 0, 0, 11, 1, 2 GET (1, 1)-(26, 41), puum CLS -drawSprite 0, 0, 12, 1, 2 +DrawSprite 0, 0, 12, 1, 2 GET (1, 1)-(10, 10), nooltm CLS -drawSprite 0, 0, 12, 50, 2 +DrawSprite 0, 0, 12, 50, 2 GET (1, 1)-(10, 10), nooltm1 CLS -drawSprite 0, 0, 13, 1, 2 +DrawSprite 0, 0, 13, 1, 2 GET (1, 1)-(10, 10), aukm CLS -drawSprite 0, 0, 14, 1, 2 +DrawSprite 0, 0, 14, 1, 2 GET (1, 1)-(10, 10), sippm1 CLS -drawSprite 0, 0, 15, 1, 2 +DrawSprite 0, 0, 15, 1, 2 GET (1, 1)-(10, 10), sippm2 CLS -drawSprite 0, 0, 14, 50, 2 +DrawSprite 0, 0, 14, 50, 2 GET (1, 1)-(10, 10), sippm10 CLS -drawSprite 0, 0, 15, 50, 2 +DrawSprite 0, 0, 15, 50, 2 GET (1, 1)-(10, 10), sippm20 CLS -drawSprite 0, 0, 16, 1, 2 +DrawSprite 0, 0, 16, 1, 2 GET (1, 1)-(10, 10), sippm3 CLS -drawSprite 0, 0, 17, 1, 1 +DrawSprite 0, 0, 17, 1, 1 GET (1, 1)-(21, 31), uks CLS -drawSprite 0, 0, 17, 1, 2 +DrawSprite 0, 0, 17, 1, 2 GET (1, 1)-(11, 16), intro CLS GOTO 7 -drawSprite -1, -1, 10, 4, 1 +DrawSprite -1, -1, 10, 4, 1 GET (1, 1)-(318, 124), intro CLS SLEEP 1 PUT (1, 1), intro, PSET SLEEP 100 7 -loadLevel 1 +LoadLevel 1 a = 50 b = 50 siie = 1 @@ -250,9 +250,9 @@ IF terrainGrid((a + 37) \ 20, (b + 21) \ 20) = "z" THEN all = 0: cd = 10: lke = IF terrainGrid((a + 22) \ 20, (b + 38) \ 20) = "z" THEN all = -1: r1 = 2: lk = 1: lke = 0 IF terrainGrid((a + 37) \ 20, (b + 38) \ 20) = "z" THEN all = -1: r1 = 2: lk = 1: lke = 0 -qwer = qwer + 1: IF objectGrid((a + 30) \ 20, (b + 30) \ 20) = "q" AND qwer > 20 THEN qwer = 1: remainingLives = remainingLives - 1: eda = -10: all = -5: displayGameStats +qwer = qwer + 1: IF objectGrid((a + 30) \ 20, (b + 30) \ 20) = "q" AND qwer > 20 THEN qwer = 1: remainingLives = remainingLives - 1: eda = -10: all = -5: DisplayGameStatistics IF qwer > 100 THEN qwer = 50 - IF terrainGrid((a + 30) \ 20, (b + 30) \ 20) = "1" THEN coinCount = coinCount + 1: kustuta1 = 1: displayGameStats: terrainGrid((a + 30) \ 20, (b + 30) \ 20) = "" + IF terrainGrid((a + 30) \ 20, (b + 30) \ 20) = "1" THEN coinCount = coinCount + 1: kustuta1 = 1: DisplayGameStatistics: terrainGrid((a + 30) \ 20, (b + 30) \ 20) = "" IF terrainGrid((a + 30) \ 20, (b + 30) \ 20) = "v" THEN all = -8: sipp = 3 IF objectGrid((a + 30) \ 20, (b + 38) \ 20) = ">" THEN eda = 3 IF objectGrid((a + 30) \ 20, (b + 38) \ 20) = "<" THEN eda = -3 @@ -289,9 +289,9 @@ siiall = siiall + 1: IF siiall > 2 THEN siiall = 2 siiall1 = siiall1 + 1: IF siiall1 > 2 THEN siiall1 = 2 a = a + eda b = b + all -IF a > 297 THEN a = 2: currentLevelNumber = currentLevelNumber + 1: loadLevel currentLevelNumber: siie = 1: siie1 = 1 -IF a < 1 THEN a = 296: IF currentLevelNumber = 1 THEN loadLevel currentLevelNumber: ELSE currentLevelNumber = currentLevelNumber - 1: loadLevel currentLevelNumber: IF graphicsMode = 2 THEN a = 594 -IF b > 179 THEN remainingLives = remainingLives - 1: displayGameStats: currentLevelNumber = currentLevelNumber - 1: loadLevel currentLevelNumber: b = 100: a = 2: displayGameStats +IF a > 297 THEN a = 2: currentLevelNumber = currentLevelNumber + 1: LoadLevel currentLevelNumber: siie = 1: siie1 = 1 +IF a < 1 THEN a = 296: IF currentLevelNumber = 1 THEN LoadLevel currentLevelNumber: ELSE currentLevelNumber = currentLevelNumber - 1: LoadLevel currentLevelNumber: IF graphicsMode = 2 THEN a = 594 +IF b > 179 THEN remainingLives = remainingLives - 1: DisplayGameStatistics: currentLevelNumber = currentLevelNumber - 1: LoadLevel currentLevelNumber: b = 100: a = 2: DisplayGameStatistics IF terrainGrid((a + 30) \ 20, (b + 30) \ 20) = "u" THEN a = uks3 + 10: b = uks4: eda = 0 IF terrainGrid((a + 30) \ 20, (b + 30) \ 20) = "U" THEN a = uks1 + 10: b = uks2: eda = 0 WEND @@ -302,8 +302,8 @@ IF a$ = leftArrowKey$ THEN IF sipa = 1 THEN sipp = 10: ELSE sipp = 20 IF a$ = leftArrowKey$ THEN eda = eda - 1: IF eda < -3 THEN eda = -3: r = 0 ELSE IF lke > 10 THEN eda = -5 IF a$ = upArrowKey$ AND lk < 10 THEN all = all - 5: lk = 20: r1 = 0: sipp = 3 IF a$ = downArrowKey$ THEN all = all + 1 -IF a$ = "/" THEN a = 2: b = 50: currentLevelNumber = currentLevelNumber + 1: loadLevel currentLevelNumber: siie = 1: siie1 = 1 -IF a$ = "+" THEN a = 2: b = 50: currentLevelNumber = currentLevelNumber + 5: loadLevel currentLevelNumber: siie = 1: siie1 = 1 +IF a$ = "/" THEN a = 2: b = 50: currentLevelNumber = currentLevelNumber + 1: LoadLevel currentLevelNumber: siie = 1: siie1 = 1 +IF a$ = "+" THEN a = 2: b = 50: currentLevelNumber = currentLevelNumber + 5: LoadLevel currentLevelNumber: siie = 1: siie1 = 1 IF a$ = "q" THEN END sipa = sipa + 1 IF sipa = 3 THEN sipa = 1 @@ -338,9 +338,9 @@ IF terrainGrid((a + 37) \ 20, (b + 21) \ 20) = "z" THEN all = 0: cd = 10: lke = IF terrainGrid((a + 22) \ 20, (b + 38) \ 20) = "z" THEN all = -1: r1 = 2: lk = 1: lke = 0 IF terrainGrid((a + 37) \ 20, (b + 38) \ 20) = "z" THEN all = -1: r1 = 2: lk = 1: lke = 0 -qwer = qwer + 1: IF objectGrid((a + 30) \ 20, (b + 30) \ 20) = "q" AND qwer > 20 THEN qwer = 1: remainingLives = remainingLives - 1: eda = -5: all = -3: displayGameStats +qwer = qwer + 1: IF objectGrid((a + 30) \ 20, (b + 30) \ 20) = "q" AND qwer > 20 THEN qwer = 1: remainingLives = remainingLives - 1: eda = -5: all = -3: DisplayGameStatistics IF qwer > 100 THEN qwer = 50 -IF terrainGrid((a + 30) \ 20, (b + 30) \ 20) = "1" THEN coinCount = coinCount + 1: kustuta1 = 1: displayGameStats: terrainGrid((a + 30) \ 20, (b + 30) \ 20) = "" +IF terrainGrid((a + 30) \ 20, (b + 30) \ 20) = "1" THEN coinCount = coinCount + 1: kustuta1 = 1: DisplayGameStatistics: terrainGrid((a + 30) \ 20, (b + 30) \ 20) = "" IF terrainGrid((a + 30) \ 20, (b + 30) \ 20) = "v" THEN all = -8: sipp = 3 IF objectGrid((a + 30) \ 20, (b + 38) \ 20) = ">" THEN eda = 3 IF objectGrid((a + 30) \ 20, (b + 38) \ 20) = "<" THEN eda = -3 @@ -377,9 +377,9 @@ siiall = siiall + 1: IF siiall > 2 THEN siiall = 2 siiall1 = siiall1 + 1: IF siiall1 > 2 THEN siiall1 = 2 a = a + eda b = b + all -IF a > 594 THEN a = 2: currentLevelNumber = currentLevelNumber + 1: loadLevel currentLevelNumber: siie = 1: siie1 = 1 -IF a < 1 THEN a = 594: IF currentLevelNumber = 1 THEN loadLevel currentLevelNumber: ELSE currentLevelNumber = currentLevelNumber - 1: loadLevel currentLevelNumber: IF graphicsMode = 1 THEN a = 297 -IF b > 358 THEN remainingLives = remainingLives - 1: displayGameStats: currentLevelNumber = currentLevelNumber - 1: loadLevel currentLevelNumber: b = 100: a = 2: displayGameStats +IF a > 594 THEN a = 2: currentLevelNumber = currentLevelNumber + 1: LoadLevel currentLevelNumber: siie = 1: siie1 = 1 +IF a < 1 THEN a = 594: IF currentLevelNumber = 1 THEN LoadLevel currentLevelNumber: ELSE currentLevelNumber = currentLevelNumber - 1: LoadLevel currentLevelNumber: IF graphicsMode = 1 THEN a = 297 +IF b > 358 THEN remainingLives = remainingLives - 1: DisplayGameStatistics: currentLevelNumber = currentLevelNumber - 1: LoadLevel currentLevelNumber: b = 100: a = 2: DisplayGameStatistics IF terrainGrid((a + 30) \ 20, (b + 30) \ 20) = "u" THEN a = uks3 + 5: b = uks4: eda = 0 IF terrainGrid((a + 30) \ 20, (b + 30) \ 20) = "U" THEN a = uks1 + 5: b = uks2: eda = 0 WEND @@ -390,14 +390,14 @@ IF a$ = leftArrowKey$ THEN IF sipa = 1 THEN sipp = 10: ELSE sipp = 20 IF a$ = leftArrowKey$ THEN eda = eda - 1: IF eda < -3 THEN eda = -3: r = 0 ELSE IF lke > 10 THEN eda = -5 IF a$ = upArrowKey$ AND lk < 10 THEN all = all - 5: lk = 20: r1 = 0: sipp = 3 IF a$ = downArrowKey$ THEN all = all + 1 -IF a$ = "/" THEN a = 2: b = 50: currentLevelNumber = currentLevelNumber + 1: loadLevel currentLevelNumber: siie = 1: siie1 = 1 -IF a$ = "+" THEN a = 2: b = 50: currentLevelNumber = currentLevelNumber + 5: loadLevel currentLevelNumber: siie = 1: siie1 = 1 +IF a$ = "/" THEN a = 2: b = 50: currentLevelNumber = currentLevelNumber + 1: LoadLevel currentLevelNumber: siie = 1: siie1 = 1 +IF a$ = "+" THEN a = 2: b = 50: currentLevelNumber = currentLevelNumber + 5: LoadLevel currentLevelNumber: siie = 1: siie1 = 1 IF a$ = "q" THEN END sipa = sipa + 1 IF sipa = 3 THEN sipa = 1 GOTO 106 -SUB displayGameStats +SUB DisplayGameStatistics LOCATE 1, 1 IF graphicsMode = 2 THEN GOTO 12 PRINT " " @@ -408,7 +408,7 @@ PRINT "o "; coinCount; " Lives "; remainingLives IF remainingLives < 0 THEN END END SUB -SUB drawSprite (p, o, m, fr, teler) +SUB DrawSprite (p, o, m, fr, teler) DIM ao(1 TO 100) AS STRING SELECT CASE m CASE 1 @@ -835,7 +835,7 @@ NEXT a ERASE ao END SUB -SUB loadLevel (y) +SUB LoadLevel (y) 125 hedgehogX = 0 hedgehogY = 0 @@ -1081,7 +1081,7 @@ asciiLevelData(19) = "mmmmmmmmmmmm<