diff --git a/code/backgroundGenerator.js b/code/backgroundGenerator.js index 1672a3d..967e204 100755 --- a/code/backgroundGenerator.js +++ b/code/backgroundGenerator.js @@ -35,7 +35,7 @@ Mario.BackgroundGenerator.prototype = { }, GenerateOverground: function(level) { - var range = this.Distant ? 4 : 6; + var range = this.Distant ? 3 : 6; var offs = this.Distant ? 2 : 1; var oh = Math.floor(Math.random() * range) + offs; var h = Math.floor(Math.random() * range) + offs; @@ -55,9 +55,9 @@ Mario.BackgroundGenerator.prototype = { if (this.Distant){ s = 2; if (y < 2) { s = y; } - level.SetBlock(x, y, 4 + s * 8); + level.SetBlock(x, y, 3 + s * 8); } else { - level.SetBlock(x, y, 5); + level.SetBlock(x, y, 2); } } else if (y === h0) { s = h0 === h ? 0 : 1; diff --git a/code/fireball.js b/code/fireball.js index 65a2955..2340055 100755 --- a/code/fireball.js +++ b/code/fireball.js @@ -14,7 +14,7 @@ Mario.Fireball = function(world, x, y, facing) { this.Y = y; this.Facing = facing; - this.XPicO = 4; + this.XPicO = 5; this.YPicO = 4; this.YPic = 3; this.XPic = 4; diff --git a/code/midi.js b/code/midi.js deleted file mode 100644 index 1a9221c..0000000 --- a/code/midi.js +++ /dev/null @@ -1,2 +0,0 @@ -!function(e){function n(){var e,n,t,r=navigator.userAgent,i=navigator.appName,o=""+parseFloat(navigator.appVersion),a=parseInt(navigator.appVersion,10);(n=r.indexOf("Opera"))!=-1?(i="Opera",o=r.substring(n+6),(n=r.indexOf("Version"))!=-1&&(o=r.substring(n+8))):(n=r.indexOf("MSIE"))!=-1?(i="Microsoft Internet Explorer",o=r.substring(n+5)):(n=r.indexOf("Trident"))!=-1?(i="Microsoft Internet Explorer",o=(n=r.indexOf("rv:"))!=-1?r.substring(n+3):"0.0"):(n=r.indexOf("Chrome"))!=-1?(i="Chrome",o=r.substring(n+7)):(n=r.indexOf("Android"))!=-1?(i="Android",o=r.substring(n+8)):(n=r.indexOf("Safari"))!=-1?(i="Safari",o=r.substring(n+7),(n=r.indexOf("Version"))!=-1&&(o=r.substring(n+8))):(n=r.indexOf("Firefox"))!=-1?(i="Firefox",o=r.substring(n+8)):(e=r.lastIndexOf(" ")+1)<(n=r.lastIndexOf("/"))&&(i=r.substring(e,n),o=r.substring(n+1),i.toLowerCase()==i.toUpperCase()&&(i=navigator.appName)),(t=o.indexOf(";"))!=-1&&(o=o.substring(0,t)),(t=o.indexOf(" "))!=-1&&(o=o.substring(0,t)),a=parseInt(""+o,10),isNaN(a)&&(o=""+parseFloat(navigator.appVersion),a=parseInt(navigator.appVersion,10));var s=new Object;return s.browserName=i,s.fullVersion=o,s.majorVersion=a,s.appName=navigator.appName,s.userAgent=navigator.userAgent,s.platform=navigator.platform,s}function t(e,n){var t=document.getElementsByTagName("script")[0],r=document.createElement("script");r.onreadystatechange=function(){"loaded"!==r.readyState&&"complete"!==r.readyState||(r.onreadystatechange=null,n())},r.onload=function(){n()},r.onerror=function(){j("Error: Cannot load JavaScript file "+e)},r.src=e,r.type="text/javascript",t.parentNode.insertBefore(r,t)}function r(e){if(T=Module.ccall("mid_song_read_wave","number",["number","number","number","number"],[L,w,2*N,H]),0==T)return void f();for(var n=Math.pow(2,15),t=0;t0&&MIDIjs.message_callback("Loading instruments: "+num_missing),j("Loading instruments: "+num_missing),0==num_missing){stream=Module.ccall("mid_istream_open_mem","number",["number","number","number"],[x,midiFileArray.length,!1]);var o=32784,a=Module.ccall("mid_create_options","number",["number","number","number","number"],[E.sampleRate,o,1,2*N]);L=Module.ccall("mid_song_load","number",["number","number"],[stream,a]),rval=Module.ccall("mid_istream_close","number",["number"],[stream]),Module.ccall("mid_song_start","void",["number"],[L]),P=E.createScriptProcessor(N,0,1),w=Module._malloc(2*N),P.onaudioprocess=r,P.connect(E.destination),C=setInterval(s,q),MIDIjs.message_callback&&MIDIjs.message_callback("Playing: "+e),j("Playing: "+e+" ...")}},i.send()}function a(){var e=E.createBuffer(1,44100,44100);for(freq=440,i=0;i<48e3;i++)e.getChannelData(0)[i]=0;var n=E.createBufferSource();n.buffer=e,n.connect(E.destination),n.start(0)}function s(){var e=new Object;0!=F?e.time=E.currentTime-F:e.time=0,MIDIjs.player_callback&&MIDIjs.player_callback(e)}function u(e){b(),H=!1,N=S,l(e)}function l(e){F=0,s(),libtimidity_url=B+"libtimidity.js";for(var n=0;n',document.body.appendChild(n)),C=setInterval(I,q),F=0,P=n,j("Playing "+e+" ...")}function v(){if(P){var e=P;e.lastChild.setAttribute("src","midi/silence.mid"),clearInterval(C),P=0}j(V)}function _(e){y();var n=document.getElementById("scorioMIDI");n?n.lastChild.setAttribute("data",e):(n=document.createElement("div"),n.setAttribute("id","scorioMIDI"),n.innerHTML='',document.body&&document.body.appendChild(n)),C=setInterval(I,q),F=0,P=n,j("Playing "+e+" ...")}function y(){if(P){var e=P;e.parentNode.removeChild(e),clearInterval(C),P=0}j(V)}function h(){for(var e=0;e