Better code readability

diff --git a/Games/Pomppu Paavo.bas b/Games/Pomppu Paavo.bas
index a7cc2b0..7e4949d 100755 (executable)
--- a/Games/Pomppu Paavo.bas
+++ b/Games/Pomppu Paavo.bas
@@ -6,8 +6,8 @@
 DECLARE SUB norm (nrm%)\r
 DECLARE SUB displayGameStats ()\r
 DEFINT A-Z\r
-DECLARE SUB level (y%)\r
-DECLARE SUB pildid (p%, o%, m%, fr%, teler%)\r
+DECLARE SUB loadLevel (y%)\r
+DECLARE SUB drawSprite (p%, o%, m%, fr%, teler%)\r
 DECLARE SUB wiew (r$, a%, b%)\r
 DECLARE SUB joonist ()\r
 DECLARE SUB save (y$)\r
@@ -84,131 +84,131 @@ maa = 1
 REM joonist\r
 REM END\r
 GET (1, 1)-(20, 20), tuhi\r
-pildid 0, 0, 1, 1, 1\r
+drawSprite 0, 0, 1, 1, 1\r
 GET (1, 1)-(20, 20), ruut\r
-pildid 0, 0, 4, 1, 1\r
+drawSprite 0, 0, 4, 1, 1\r
 GET (1, 1)-(20, 20), kast\r
 PUT (1, 180), ruut, PSET\r
 PUT (300, 1), ruut, PSET\r
 PUT (300, 180), ruut, PSET\r
-pildid 30, 50, 2, 1, 1\r
+drawSprite 30, 50, 2, 1, 1\r
 GET (31, 51)-(91, 76), pilv\r
 PUT (160, 10), pilv, PSET\r
-pildid 20, 100, 3, 1, 1\r
+drawSprite 20, 100, 3, 1, 1\r
 GET (21, 101)-(31, 114), taht\r
 CLS\r
-pildid 0, 0, 5, 1, 1\r
+drawSprite 0, 0, 5, 1, 1\r
 GET (1, 1)-(11, 8), siil\r
 CLS\r
-pildid 0, 0, 6, 1, 1\r
+drawSprite 0, 0, 6, 1, 1\r
 GET (1, 1)-(8, 10), munt\r
 CLS\r
-pildid 0, 0, 7, 1, 1\r
+drawSprite 0, 0, 7, 1, 1\r
 GET (1, 1)-(31, 11), poosas\r
 CLS\r
-pildid 0, 0, 8, 1, 1\r
+drawSprite 0, 0, 8, 1, 1\r
 GET (1, 1)-(26, 21), aken\r
 CLS\r
-pildid 0, 0, 9, 1, 1\r
+drawSprite 0, 0, 9, 1, 1\r
 GET (1, 1)-(21, 11), vedru\r
 CLS\r
-pildid 0, 0, 11, 1, 1\r
+drawSprite 0, 0, 11, 1, 1\r
 GET (1, 1)-(51, 81), puu\r
 CLS\r
-pildid 0, 0, 12, 1, 1\r
+drawSprite 0, 0, 12, 1, 1\r
 GET (1, 1)-(20, 20), noolt\r
 CLS\r
-pildid 0, 0, 12, 50, 1\r
+drawSprite 0, 0, 12, 50, 1\r
 GET (1, 1)-(20, 20), noolt1\r
 CLS\r
-pildid 0, 0, 13, 1, 1\r
+drawSprite 0, 0, 13, 1, 1\r
 GET (1, 1)-(20, 20), auk\r
 CLS\r
-pildid 0, 0, 14, 1, 1\r
+drawSprite 0, 0, 14, 1, 1\r
 GET (1, 1)-(20, 20), sipp1\r
 CLS\r
-pildid 0, 0, 15, 1, 1\r
+drawSprite 0, 0, 15, 1, 1\r
 GET (1, 1)-(20, 20), sipp2\r
 CLS\r
-pildid 0, 0, 14, 50, 1\r
+drawSprite 0, 0, 14, 50, 1\r
 GET (1, 1)-(20, 20), sipp10\r
 CLS\r
-pildid 0, 0, 15, 50, 1\r
+drawSprite 0, 0, 15, 50, 1\r
 GET (1, 1)-(20, 20), sipp20\r
 CLS\r
-pildid 0, 0, 16, 1, 1\r
+drawSprite 0, 0, 16, 1, 1\r
 GET (1, 1)-(20, 20), sipp3\r
 CLS\r
 GET (1, 1)-(10, 10), tuhim\r
-pildid 0, 0, 1, 1, 2\r
+drawSprite 0, 0, 1, 1, 2\r
 GET (1, 1)-(10, 10), ruutm\r
-pildid 0, 0, 4, 1, 2\r
+drawSprite 0, 0, 4, 1, 2\r
 GET (1, 1)-(10, 10), kastm\r
 PUT (1, 180), ruut, PSET\r
 PUT (300, 1), ruut, PSET\r
 PUT (300, 180), ruut, PSET\r
-pildid 30, 50, 2, 1, 2\r
+drawSprite 30, 50, 2, 1, 2\r
 GET (16, 26)-(46, 38), pilvm\r
-pildid 20, 100, 3, 1, 2\r
+drawSprite 20, 100, 3, 1, 2\r
 GET (11, 51)-(16, 72), tahtm\r
 CLS\r
-pildid 0, 0, 5, 1, 2\r
+drawSprite 0, 0, 5, 1, 2\r
 GET (1, 1)-(6, 4), siilm\r
 CLS\r
-pildid 0, 0, 6, 1, 2\r
+drawSprite 0, 0, 6, 1, 2\r
 GET (1, 1)-(4, 5), muntm\r
 CLS\r
-pildid 0, 0, 7, 1, 2\r
+drawSprite 0, 0, 7, 1, 2\r
 GET (1, 1)-(16, 6), poosasm\r
 CLS\r
-pildid 0, 0, 8, 1, 2\r
+drawSprite 0, 0, 8, 1, 2\r
 GET (1, 1)-(13, 11), akenm\r
 CLS\r
-pildid 0, 0, 9, 1, 2\r
+drawSprite 0, 0, 9, 1, 2\r
 GET (1, 1)-(11, 6), vedrum\r
 CLS\r
-pildid 0, 0, 11, 1, 2\r
+drawSprite 0, 0, 11, 1, 2\r
 GET (1, 1)-(26, 41), puum\r
 CLS\r
-pildid 0, 0, 12, 1, 2\r
+drawSprite 0, 0, 12, 1, 2\r
 GET (1, 1)-(10, 10), nooltm\r
 CLS\r
-pildid 0, 0, 12, 50, 2\r
+drawSprite 0, 0, 12, 50, 2\r
 GET (1, 1)-(10, 10), nooltm1\r
 CLS\r
-pildid 0, 0, 13, 1, 2\r
+drawSprite 0, 0, 13, 1, 2\r
 GET (1, 1)-(10, 10), aukm\r
 CLS\r
-pildid 0, 0, 14, 1, 2\r
+drawSprite 0, 0, 14, 1, 2\r
 GET (1, 1)-(10, 10), sippm1\r
 CLS\r
-pildid 0, 0, 15, 1, 2\r
+drawSprite 0, 0, 15, 1, 2\r
 GET (1, 1)-(10, 10), sippm2\r
 CLS\r
-pildid 0, 0, 14, 50, 2\r
+drawSprite 0, 0, 14, 50, 2\r
 GET (1, 1)-(10, 10), sippm10\r
 CLS\r
-pildid 0, 0, 15, 50, 2\r
+drawSprite 0, 0, 15, 50, 2\r
 GET (1, 1)-(10, 10), sippm20\r
 CLS\r
-pildid 0, 0, 16, 1, 2\r
+drawSprite 0, 0, 16, 1, 2\r
 GET (1, 1)-(10, 10), sippm3\r
 CLS\r
-pildid 0, 0, 17, 1, 1\r
+drawSprite 0, 0, 17, 1, 1\r
 GET (1, 1)-(21, 31), uks\r
 CLS\r
-pildid 0, 0, 17, 1, 2\r
+drawSprite 0, 0, 17, 1, 2\r
 GET (1, 1)-(11, 16), intro\r
 CLS\r
 GOTO 7\r
-pildid -1, -1, 10, 4, 1\r
+drawSprite -1, -1, 10, 4, 1\r
 GET (1, 1)-(318, 124), intro\r
 CLS\r
 SLEEP 1\r
 PUT (1, 1), intro, PSET\r
 SLEEP 100\r
 7\r
-level 1\r
+loadLevel 1\r
 a = 50\r
 b = 50\r
 siie = 1\r
@@ -280,9 +280,9 @@ siiall = siiall + 1: IF siiall > 2 THEN siiall = 2
 siiall1 = siiall1 + 1: IF siiall1 > 2 THEN siiall1 = 2\r
 a = a + eda\r
 b = b + all\r
-IF a > 297 THEN a = 2: maa = maa + 1: level maa: siie = 1: siie1 = 1\r
-IF a < 1 THEN a = 296: IF maa = 1 THEN level maa:  ELSE maa = maa - 1: level maa: IF voolual = 2 THEN a = 594\r
-IF b > 179 THEN elu = elu - 1: displayGameStats: maa = maa - 1: level maa: b = 100: a = 2: displayGameStats\r
+IF a > 297 THEN a = 2: maa = maa + 1: loadLevel maa: siie = 1: siie1 = 1\r
+IF a < 1 THEN a = 296: IF maa = 1 THEN loadLevel maa:  ELSE maa = maa - 1: loadLevel maa: IF voolual = 2 THEN a = 594\r
+IF b > 179 THEN elu = elu - 1: displayGameStats: maa = maa - 1: loadLevel maa: b = 100: a = 2: displayGameStats\r
 IF asend((a + 30) \ 20, (b + 30) \ 20) = "u" THEN a = uks3 + 10: b = uks4: eda = 0\r
 IF asend((a + 30) \ 20, (b + 30) \ 20) = "U" THEN a = uks1 + 10: b = uks2: eda = 0\r
 WEND\r
@@ -293,8 +293,8 @@ IF a$ = vas7$ THEN IF sipa = 1 THEN sipp = 10:  ELSE sipp = 20
 IF a$ = vas7$ THEN eda = eda - 1: IF eda < -3 THEN eda = -3: r = 0 ELSE IF lke > 10 THEN eda = -5\r
 IF a$ = ule7$ AND lk < 10 THEN all = all - 5: lk = 20: r1 = 0: sipp = 3\r
 IF a$ = all7$ THEN all = all + 1\r
-IF a$ = "/" THEN a = 2: b = 50: maa = maa + 1: level maa: siie = 1: siie1 = 1\r
-IF a$ = "+" THEN a = 2: b = 50: maa = maa + 5: level maa: siie = 1: siie1 = 1\r
+IF a$ = "/" THEN a = 2: b = 50: maa = maa + 1: loadLevel maa: siie = 1: siie1 = 1\r
+IF a$ = "+" THEN a = 2: b = 50: maa = maa + 5: loadLevel maa: siie = 1: siie1 = 1\r
 IF a$ = "q" THEN END\r
 sipa = sipa + 1\r
 IF sipa = 3 THEN sipa = 1\r
@@ -368,9 +368,9 @@ siiall = siiall + 1: IF siiall > 2 THEN siiall = 2
 siiall1 = siiall1 + 1: IF siiall1 > 2 THEN siiall1 = 2\r
 a = a + eda\r
 b = b + all\r
-IF a > 594 THEN a = 2: maa = maa + 1: level maa: siie = 1: siie1 = 1\r
-IF a < 1 THEN a = 594: IF maa = 1 THEN level maa:  ELSE maa = maa - 1: level maa: IF voolual = 1 THEN a = 297\r
-IF b > 358 THEN elu = elu - 1: displayGameStats: maa = maa - 1: level maa: b = 100: a = 2: displayGameStats\r
+IF a > 594 THEN a = 2: maa = maa + 1: loadLevel maa: siie = 1: siie1 = 1\r
+IF a < 1 THEN a = 594: IF maa = 1 THEN loadLevel maa:  ELSE maa = maa - 1: loadLevel maa: IF voolual = 1 THEN a = 297\r
+IF b > 358 THEN elu = elu - 1: displayGameStats: maa = maa - 1: loadLevel maa: b = 100: a = 2: displayGameStats\r
 IF asend((a + 30) \ 20, (b + 30) \ 20) = "u" THEN a = uks3 + 5: b = uks4: eda = 0\r
 IF asend((a + 30) \ 20, (b + 30) \ 20) = "U" THEN a = uks1 + 5: b = uks2: eda = 0\r
 WEND\r
@@ -381,8 +381,8 @@ IF a$ = vas7$ THEN IF sipa = 1 THEN sipp = 10:  ELSE sipp = 20
 IF a$ = vas7$ THEN eda = eda - 1: IF eda < -3 THEN eda = -3: r = 0 ELSE IF lke > 10 THEN eda = -5\r
 IF a$ = ule7$ AND lk < 10 THEN all = all - 5: lk = 20: r1 = 0: sipp = 3\r
 IF a$ = all7$ THEN all = all + 1\r
-IF a$ = "/" THEN a = 2: b = 50: maa = maa + 1: level maa: siie = 1: siie1 = 1\r
-IF a$ = "+" THEN a = 2: b = 50: maa = maa + 5: level maa: siie = 1: siie1 = 1\r
+IF a$ = "/" THEN a = 2: b = 50: maa = maa + 1: loadLevel maa: siie = 1: siie1 = 1\r
+IF a$ = "+" THEN a = 2: b = 50: maa = maa + 5: loadLevel maa: siie = 1: siie1 = 1\r
 IF a$ = "q" THEN END\r
 sipa = sipa + 1\r
 IF sipa = 3 THEN sipa = 1\r
@@ -399,7 +399,7 @@ PRINT "o "; raha; "  Elu "; elu
 IF elu < 0 THEN END\r
 END SUB\r
 \r
-SUB level (y)\r
+SUB loadLevel (y)\r
 125\r
 siia = 0\r
 siib = 0\r
@@ -645,7 +645,7 @@ uun(19) = "mmmmmmmmmmmm<<mmmaaaaammmmmmmmm"
 voolual = 2\r
 CASE 19\r
 CLS\r
-pildid 1, 1, 10, 3, 1\r
+drawSprite 1, 1, 10, 3, 1\r
 LOCATE 20, 1\r
 PRINT "end"\r
 FOR a = 1 TO 50\r
@@ -738,7 +738,7 @@ NEXT e
 123\r
 END SUB\r
 \r
-SUB pildid (p, o, m, fr, teler)\r
+SUB drawSprite (p, o, m, fr, teler)\r
 DIM ao(1 TO 100) AS STRING\r
 SELECT CASE m\r
 CASE 1\r