Skip to content

Commit

Permalink
finished multi-table support
Browse files Browse the repository at this point in the history
  • Loading branch information
increpare committed May 11, 2015
1 parent d3cefd3 commit c1e1783
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 6 deletions.
4 changes: 4 additions & 0 deletions help.html
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@ <h2>editor</h2>
</tr>
</table>
<p>
<h4>levels</h4>
<p>
The levels are played in order, going to the next one when you hit an exit point, until you reach a blank level - this ends the game and plays a small animation.
<p>
<h2>player</h2>
<b>F</b> : go fullscreen
<p>
Expand Down
21 changes: 16 additions & 5 deletions pinball.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@
var radius=5;
var stateIndex=0;
var canvasIndex=0;
var levelCanvasses = new Array();
var canvasses = new Array();
var VERSION=2;
for (var i=0;i<16;i++){
canvasses[i] = new Uint8Array(width*height);
levelCanvasses[i] = new Uint8Array(width*height);
}
var dirty=false;
var exitTriggered=false;
Expand All @@ -35,6 +33,12 @@
var shareLinkInner;
var mainPaletteOffset=0;
var layerCount=6;

var levelCanvasses = new Array();
for (var i=0;i<layerCount;i++){
levelCanvasses[i] = new Uint8Array(width*height);
}

var lastDrawPosX=-1;
var lastDrawPosY=-1;
var score=0;
Expand Down Expand Up @@ -355,6 +359,10 @@ function shareClick() {

}

if(PLAYER!==true){
window.history.pushState({}, "plingpling game maker", "index.html?p="+id);
}


}
}
Expand Down Expand Up @@ -397,7 +405,7 @@ function stateToString(){
state.canvasses=new Array();
state.mainPaletteOffset=mainPaletteOffset;
state.version=VERSION;
for (var i=0;i<16;i++){
for (var i=0;i<layerCount;i++){
var canvas=levelCanvasses[i];
var s="";
for (var j=0;j<width*height;j++){
Expand Down Expand Up @@ -445,9 +453,13 @@ function stringToState(str){
}

levelCanvasses = new Array();
for (var k=0;k<state.canvasses.length;k++){
for (var k=0;k<layerCount;k++){
var s = state.canvasses[k];
var ar = new Uint8Array(width*height);
levelCanvasses.push(ar);
if (state.version===1&&k>0){
continue;
}
var index=0;
for (var i=0;i<s.length;i+=2){
var count=s[i];
Expand All @@ -457,7 +469,6 @@ function stringToState(str){
index++;
}
}
levelCanvasses.push(ar);
}

setLevel(1);
Expand Down
2 changes: 1 addition & 1 deletion play_inlined.txt

Large diffs are not rendered by default.

0 comments on commit c1e1783

Please sign in to comment.