From acc05564a1dca0206754891be87281615b86e788 Mon Sep 17 00:00:00 2001 From: Steven Hugg Date: Fri, 27 Dec 2019 10:27:29 -0600 Subject: [PATCH] fixed typescript 'finally' error --- src/ide/ui.ts | 8 +++++--- src/machine/astrocade.ts | 5 ++++- test/web/testallpresets.js | 2 -- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/ide/ui.ts b/src/ide/ui.ts index f833f02d..e35a0846 100644 --- a/src/ide/ui.ts +++ b/src/ide/ui.ts @@ -339,11 +339,13 @@ function reloadProject(id:string) { gotoNewLocation(); } -function getSkeletonFile(fileid:string) : Promise { +async function getSkeletonFile(fileid:string) : Promise { var ext = platform.getToolForFilename(fileid); - return $.get( "presets/"+getBasePlatform(platform_id)+"/skeleton."+ext, 'text').catch((e) => { + try { + return await $.get( "presets/"+getBasePlatform(platform_id)+"/skeleton."+ext, 'text'); + } catch(e) { alertError("Could not load skeleton for " + platform_id + "/" + ext + "; using blank file"); - }); + } } function checkEnteredFilename(fn : string) : boolean { diff --git a/src/machine/astrocade.ts b/src/machine/astrocade.ts index 76e89e04..a032e8d0 100644 --- a/src/machine/astrocade.ts +++ b/src/machine/astrocade.ts @@ -7,9 +7,12 @@ import { hex, rgb2bgr, lzgmini, stringToByteArray } from "../common/util"; // http://metopal.com/projects/ballybook/doku.php -// TODO: fix keys, more controllers, vibrato/noise, border color, debug info, rotate +// TODO: fix keys, more controllers, vibrato/noise, border color // http://atariage.com/forums/topic/251416-programming-the-bally-arcadeastrocade/ // https://ballyalley.com/faqs/BPA%20Video%20Hardware%20FAQ/Bally_Professional_Arcade_Video_Hardware%20(2001)(Tony%20Miller).pdf +// https://atariage.com/forums/topic/290858-notes-from-a-2019-interview-with-jamie-fenton/ (http://www.fentonia.com/bio/) +// https://thehistoryofhowweplay.wordpress.com/2018/04/03/interview-tom-mchugh/ +// https://ballyalley.com/faqs/Programmers%20of%20the%20Astrocade%20Built-In%20Programs.txt const ASTROCADE_KEYCODE_MAP = makeKeycodeMap([ // player 1 diff --git a/test/web/testallpresets.js b/test/web/testallpresets.js index fac99e2e..a8115547 100644 --- a/test/web/testallpresets.js +++ b/test/web/testallpresets.js @@ -74,14 +74,12 @@ function testPlatform(exports, platform_id, platform_name, numPresets) { /// -/* testPlatform(this, 'vcs', 'Atari 2600', 35); testPlatform(this, 'nes', 'NES', 30); testPlatform(this, 'vicdual', 'VIC Dual', 7); testPlatform(this, 'mw8080bw', 'Midway 8080', 3); testPlatform(this, 'galaxian-scramble', 'Galaxian/Scramble', 3); testPlatform(this, 'vector-z80color', 'Atari Color Vector (Z80)', 3); -*/ testPlatform(this, 'williams-z80', 'Williams (Z80)', 3); // TODO testPlatform(this, 'sound_williams-z80', 'Williams Sound (Z80)', 1); testPlatform(this, 'coleco', 'ColecoVision', 12);