From 25a8fbeacdbf0e3054bd257be87849566b5af91e Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Thu, 8 Jul 2021 00:13:26 -0400 Subject: [PATCH] Display a better message when a score upload fails so it is more clear what happened. --- BuGS.xcodeproj/project.pbxproj | 2 +- BuGS/score.s | 53 +++++++++++++++++++++++++++++++--- 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/BuGS.xcodeproj/project.pbxproj b/BuGS.xcodeproj/project.pbxproj index 93bb0c2..1bbdeb3 100644 --- a/BuGS.xcodeproj/project.pbxproj +++ b/BuGS.xcodeproj/project.pbxproj @@ -116,7 +116,7 @@ 9DE37B3E2694E0B0005FC562 /* globalScores.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = globalScores.h; sourceTree = ""; }; 9DE37B3F2694E0B0005FC562 /* globals.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = globals.s; sourceTree = ""; }; 9DE37B402694E0B0005FC562 /* gameSegments.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = gameSegments.s; sourceTree = ""; }; - 9DE37B412694E0B0005FC562 /* score.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = score.s; sourceTree = ""; }; + 9DE37B412694E0B0005FC562 /* score.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = score.s; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.asm.orcam; }; 9DE37B422694E0B0005FC562 /* gamePlayer.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = gamePlayer.s; sourceTree = ""; }; 9DE37B432694E0B0005FC562 /* Read.Me.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = Read.Me.md; sourceTree = ""; }; 9DE37B442694E0B0005FC562 /* global.macros */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = global.macros; sourceTree = ""; }; diff --git a/BuGS/score.s b/BuGS/score.s index 4548b26..f3a4dff 100644 --- a/BuGS/score.s +++ b/BuGS/score.s @@ -821,6 +821,18 @@ checkHighScore_retry anop checkHighScore_retryPrompt anop ldx #GAME_NUM_TILES_WIDE*22+2 _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_LETTER_S + _overwriteGameTile TILE_LETTER_C + _overwriteGameTile TILE_LETTER_O + _overwriteGameTile TILE_LETTER_R + _overwriteGameTile TILE_LETTER_E + _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_LETTER_U + _overwriteGameTile TILE_LETTER_P + _overwriteGameTile TILE_LETTER_L + _overwriteGameTile TILE_LETTER_O + _overwriteGameTile TILE_LETTER_A + _overwriteGameTile TILE_LETTER_D _overwriteGameTile TILE_EMPTY _overwriteGameTile TILE_LETTER_F _overwriteGameTile TILE_LETTER_A @@ -828,7 +840,9 @@ checkHighScore_retryPrompt anop _overwriteGameTile TILE_LETTER_L _overwriteGameTile TILE_LETTER_E _overwriteGameTile TILE_LETTER_D - _overwriteGameTile TILE_SYMBOL_COLON + _overwriteGameTile TILE_EMPTY + + ldx #GAME_NUM_TILES_WIDE*24+2 _overwriteGameTile TILE_EMPTY _overwriteGameTile TILE_LETTER_R _overwriteGameTile TILE_LETTER_E @@ -836,10 +850,19 @@ checkHighScore_retryPrompt anop _overwriteGameTile TILE_LETTER_R _overwriteGameTile TILE_LETTER_Y _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_LETTER_U + _overwriteGameTile TILE_LETTER_P + _overwriteGameTile TILE_LETTER_L + _overwriteGameTile TILE_LETTER_O + _overwriteGameTile TILE_LETTER_A + _overwriteGameTile TILE_LETTER_D + _overwriteGameTile TILE_SYMBOL_COLON + _overwriteGameTile TILE_EMPTY _overwriteGameTile TILE_LETTER_Y _overwriteGameTile TILE_SYMBOL_COLON _overwriteGameTile TILE_LETTER_N _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_SOLID2 _overwriteGameTile TILE_EMPTY jsl waitForKey @@ -847,15 +870,37 @@ checkHighScore_retryPrompt anop cmp #'N' beq checkHighScore_doneNetwork cmp #'Y' - bne checkHighScore_doRetry - brl checkHighScore_retry -checkHighScore_doRetry anop + beq checkHighScore_doRetry brl checkHighScore_retryPrompt checkHighScore_doneNetwork anop jsl updateHighScore sec rtl +checkHighScore_doRetry anop + ldx #GAME_NUM_TILES_WIDE*24+2 + _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_EMPTY + _overwriteGameTile TILE_EMPTY + brl checkHighScore_retry uploadSpin1 entry