# HG changeset patch
# User David Boddie <david@boddie.org.uk>
# Date 1317577554 -7200
# Node ID aa9f056241825a23ac922f3c11242d2d246626f4
# Parent  c0287a81583a8a4ca946e2482c3d35556ea67afc
Ensured that the keyboard controls cannot be used if the game is
started with the joystick's Fire button.
Fixed use of incorrectly initialised zero page memory when moving
the projectile - this could cause an enemy to be destroyed if the
player stood by a wall and fired a projectile at it.
Added a *TAPE call to the loader to ensure that DFS workspace is
no longer in use.

diff -r c0287a81583a -r aa9f05624182 loader.oph
--- a/loader.oph	Sat Oct 01 18:19:29 2011 +0200
+++ b/loader.oph	Sun Oct 02 19:45:54 2011 +0200
@@ -83,6 +83,9 @@
     ldy #>code_block
     jsr $ffdd
 
+    lda #140
+    jsr $fff4   ; *TAPE
+
     jsr copy_title_down
     jsr move_completed_screen_down
 
@@ -114,8 +117,8 @@
 code_block: .byte <code_file_name, >code_file_name
                .byte $00, $1e, 0, 0
                .byte $00, $1e, 0, 0
-               .byte $22, $20, 0, 0
-               .byte $22, $3e, 0, 0
+               .byte $32, $20, 0, 0
+               .byte $32, $3e, 0, 0
 
 init_load_window_vdu_bytes: .byte 28,0,30,19,27
 
diff -r c0287a81583a -r aa9f05624182 mapcode.oph
--- a/mapcode.oph	Sat Oct 01 18:19:29 2011 +0200
+++ b/mapcode.oph	Sun Oct 02 19:45:54 2011 +0200
@@ -1778,9 +1778,13 @@
 
     move_player_check_joystick_up:
     cpy #144
-    bcc move_player_handle_left_key
+    bcc move_player_no_joystick_input
     jmp move_player_up      ; >= 16
 
+    move_player_no_joystick_input:
+    clc
+    rts
+
     move_player_handle_left_key:
 
     ; Handle the left key.
@@ -2203,6 +2207,9 @@
     and #1
     bne check_fire_key_fire
 
+    clc
+    rts
+
     check_fire_key_no_joystick:
 
     ldx #182            ; (Return)
@@ -2272,7 +2279,12 @@
 
     ; Move the projectile away from the player.
 
+    lda #$86
+    sta $74
+    lda #$52
+    sta $75
     jsr move_projectile_after_unplot
+
     jsr move_projectile
 
     clc