From ed38f262a42e70200778212a34eb4b97d836db8a Mon Sep 17 00:00:00 2001 From: Alexey Nurgaliev Date: Fri, 1 Sep 2023 12:45:03 +0300 Subject: [PATCH] disable default cue file generation for genesis_plus_gx, picodrive and mednafen_pce --- data/emulator.js | 21 +++++++++++---------- data/emulator.min.js | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/data/emulator.js b/data/emulator.js index 3f76ffe..fa0de55 100644 --- a/data/emulator.js +++ b/data/emulator.js @@ -884,7 +884,7 @@ class EmulatorJS { const altName = this.config.gameUrl.startsWith("blob:") ? (this.config.gameName || "game") : extractFileNameFromUrl(this.config.gameUrl); let disableCue = false; - if (this.getCore() === 'pcsx_rearmed' && this.config.disableCue === undefined) { + if (['pcsx_rearmed', 'genesis_plus_gx', 'picodrive', 'mednafen_pce'].includes(this.getCore()) && this.config.disableCue === undefined) { disableCue = true; } else { disableCue = this.config.disableCue; @@ -947,19 +947,20 @@ class EmulatorJS { } } }); - if (isoFile !== null && (supportsExt('iso') || supportsExt('cso') || supportsExt('chd') || supportsExt('elf'))) { - this.fileName = isoFile; - } else if (!disableCue && (supportsExt('cue') || supportsExt('ccd') || supportsExt('toc') || supportsExt('m3u'))) { - if (cueFile !== null) { - this.fileName = cueFile; - } else { - this.fileName = this.gameManager.createCueFile(fileNames); - } - } else if (supportedFile !== null) { + if (supportedFile !== null) { this.fileName = supportedFile; } else { this.fileName = fileNames[0]; } + if (isoFile !== null && (supportsExt('iso') || supportsExt('cso') || supportsExt('chd') || supportsExt('elf'))) { + this.fileName = isoFile; + } else if (supportsExt('cue') || supportsExt('ccd') || supportsExt('toc') || supportsExt('m3u')) { + if (cueFile !== null) { + this.fileName = cueFile; + } else if (!disableCue) { + this.fileName = this.gameManager.createCueFile(fileNames); + } + } resolve(); }); } diff --git a/data/emulator.min.js b/data/emulator.min.js index a95334d..cfe1401 100644 --- a/data/emulator.min.js +++ b/data/emulator.min.js @@ -1 +1 @@ -!function(){var e,t;e=window,t=function(){return n=[function(e,t,n){"use strict";n.r(t);function b(e,t){var n=t.x-e.x,t=t.y-e.y;return Math.sqrt(n*n+t*t)}function _(e){return e*(Math.PI/180)}function o(e){f.has(e)&&clearTimeout(f.get(e)),f.set(e,setTimeout(e,100))}function a(e,t,n){for(var i,o=t.split(/[ ,]+/g),a=0;athis.options.threshold){var r,l={};for(r in this.direction)this.direction.hasOwnProperty(r)&&(l[r]=this.direction[r]);var c={};for(r in this.direction={x:n,y:i,angle:t},e.direction=this.direction,l)l[r]===this.direction[r]&&(c[r]=!0);if(c.x&&c.y&&c.angle)return e;c.x&&c.y||this.trigger("plain",e),c.x||this.trigger("plain:"+n,e),c.y||this.trigger("plain:"+i,e),c.angle||this.trigger("dir dir:"+t,e)}else this.resetDirection();return e};var x=w;function E(e,t){this.nipples=[],this.idles=[],this.actives=[],this.ids=[],this.pressureIntervals={},this.manager=e,this.id=E.id,E.id+=1,this.defaults={zone:document.body,multitouch:!1,maxNumberOfNipples:10,mode:"dynamic",position:{top:0,left:0},catchDistance:200,size:100,threshold:.1,color:"white",fadeTime:250,dataOnly:!1,restJoystick:!0,restOpacity:.5,lockX:!1,lockY:!1,shape:"circle",dynamicPage:!1,follow:!1},this.config(t),"static"!==this.options.mode&&"semi"!==this.options.mode||(this.options.multitouch=!1),this.options.multitouch||(this.options.maxNumberOfNipples=1);e=getComputedStyle(this.options.zone.parentElement);return e&&"flex"===e.display&&(this.parentIsFlex=!0),this.updateBox(),this.prepareNipples(),this.bindings(),this.begin(),this.nipples}E.prototype=new m,(E.constructor=E).id=0,E.prototype.prepareNipples=function(){var i=this.nipples;i.on=this.on.bind(this),i.off=this.off.bind(this),i.options=this.options,i.destroy=this.destroy.bind(this),i.ids=this.ids,i.id=this.id,i.processOnMove=this.processOnMove.bind(this),i.processOnEnd=this.processOnEnd.bind(this),i.get=function(e){if(void 0===e)return i[0];for(var t=0,n=i.length;t