diff --git a/eg/proto-game.60p b/eg/proto-game.60p index 884bf34..5767a8f 100644 --- a/eg/proto-game.60p +++ b/eg/proto-game.60p @@ -307,18 +307,14 @@ define player_logic logic_routine st off, c } else { st on, c - trash n - trash a - trash z } // FIXME these trashes, strictly speaking, probably shouldn't be needed, - // but currently the compiler cares too much about values that are - // initialized in one branch of an `if`, but not the other, but trashed + // but currently the compiler cares a little too much about values that are + // initialized in one branch of an `if`, but not the other, but are trashed // at the end of the routine anyway. trash ptr trash y - trash a trash v } else { st off, c @@ -360,9 +356,6 @@ define enemy_logic logic_routine st off, c } else { st on, c - trash n - trash a - trash z } // FIXME these trashes, strictly speaking, probably shouldn't be needed, @@ -371,7 +364,6 @@ define enemy_logic logic_routine // at the end of the routine anyway. trash ptr trash y - trash a } else { copy delta, compare_target st on, c @@ -412,18 +404,6 @@ define game_state_title_screen game_state_routine call clear_screen call init_game copy forward game_state_play, dispatch_game_state - - // FIXME these trashes, strictly speaking, probably shouldn't be needed, - // but currently the compiler cares too much about values that are - // initialized in one branch of an `if`, but not the other, but trashed - // at the end of the routine anyway. - trash a - trash n - trash z - } else { - trash y - trash c - trash v } goto save_cinv @@ -448,7 +428,6 @@ define game_state_play game_state_routine ld x, 15 } else { ld x, save_x - trash c } copy pos, actor_pos + x @@ -470,18 +449,6 @@ define game_state_game_over game_state_routine call clear_screen call init_game copy game_state_title_screen, dispatch_game_state - - // FIXME these trashes, strictly speaking, probably shouldn't be needed, - // but currently the compiler cares too much about values that are - // initialized in one branch of an `if`, but not the other, but trashed - // at the end of the routine anyway. - trash a - trash n - trash z - } else { - trash y - trash c - trash v } goto save_cinv diff --git a/loadngo.sh b/loadngo.sh index eda06ea..96d2b2b 100755 --- a/loadngo.sh +++ b/loadngo.sh @@ -1,5 +1,8 @@ #!/bin/sh +if [ "X$X64" = "X" ]; then + X64=x64 +fi SRC=$1 if [ "X$1" = "X" ]; then echo "Usage: ./loadngo.sh " @@ -8,8 +11,8 @@ fi OUT=/tmp/a-out.prg bin/sixtypical --traceback --basic-prelude $SRC > $OUT || exit 1 if [ -e vicerc ]; then - x64 -config vicerc $OUT + $X64 -config vicerc $OUT else - x64 $OUT + $X64 $OUT fi rm -f $OUT