Skip to content

Commit 7c3691a

Browse files
author
onaluf
committed
corrected a few bug found by Andrey Zamkovenko (https://plus.google.com/+AndreyZamkovenko)
1 parent 62cb50b commit 7c3691a

File tree

9 files changed

+31
-40
lines changed

9 files changed

+31
-40
lines changed

‎chapter 10/gameFramework.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -549,9 +549,8 @@ gf.imagesToPreload = [];
549549
**/
550550
gf.addImage = function(url) {
551551
if ($.inArray(url, gf.imagesToPreload) < 0) {
552-
gf.imagesToPreload.push();
552+
gf.imagesToPreload.push(url);
553553
}
554-
gf.imagesToPreload.push(url);
555554
};
556555

557556
gf.callbacks = [];
@@ -634,8 +633,8 @@ gf.startGame = function(endCallback, progressCallback) {
634633
gf.time = (new Date()).getTime();
635634
} else {
636635
if (progressCallback) {
637-
count++;
638-
progressCallback((count / total) * 100);
636+
counter++;
637+
progressCallback((counter / total) * 100);
639638
}
640639
}
641640
}, 100);

‎chapter 2/gameFramework.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,8 @@ gf.imagesToPreload = [];
9393
**/
9494
gf.addImage = function(url) {
9595
if ($.inArray(url, gf.imagesToPreload) < 0) {
96-
gf.imagesToPreload.push();
96+
gf.imagesToPreload.push(url);
9797
}
98-
gf.imagesToPreload.push(url);
9998
};
10099

101100

@@ -125,8 +124,8 @@ gf.startPreloading = function(endCallback, progressCallback) {
125124
endCallback();
126125
} else {
127126
if (progressCallback) {
128-
count++;
129-
progressCallback((count / total) * 100);
127+
counter++;
128+
progressCallback((counter / total) * 100);
130129
}
131130
}
132131
}, 100);

‎chapter 3/gameFramework.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,8 @@ gf.imagesToPreload = [];
115115
**/
116116
gf.addImage = function(url) {
117117
if ($.inArray(url, gf.imagesToPreload) < 0) {
118-
gf.imagesToPreload.push();
118+
gf.imagesToPreload.push(url);
119119
}
120-
gf.imagesToPreload.push(url);
121120
};
122121

123122
gf.callbacks = [];
@@ -193,8 +192,8 @@ gf.startGame = function(endCallback, progressCallback) {
193192
setInterval(gf.refreshGame, gf.baseRate);
194193
} else {
195194
if (progressCallback) {
196-
count++;
197-
progressCallback((count / total) * 100);
195+
counter++;
196+
progressCallback((counter / total) * 100);
198197
}
199198
}
200199
}, 100);

‎chapter 4/gameFramework.js

+7-8
Original file line numberDiff line numberDiff line change
@@ -270,17 +270,17 @@ gf.transform = function(div, options){
270270

271271
gf.width = function(div,dimension) {
272272
if(dimension) {
273-
div.css("width", position);
274-
div.data("gf").width = position;
273+
div.css("width", dimension);
274+
div.data("gf").width = dimension;
275275
} else {
276276
return div.data("gf").width;
277277
}
278278
}
279279

280280
gf.height = function(div,dimension) {
281281
if(dimension) {
282-
div.css("height", position);
283-
div.data("gf").height = position;
282+
div.css("height", dimension);
283+
div.data("gf").height = dimension;
284284
} else {
285285
return div.data("gf").height;
286286
}
@@ -293,9 +293,8 @@ gf.imagesToPreload = [];
293293
**/
294294
gf.addImage = function(url) {
295295
if ($.inArray(url, gf.imagesToPreload) < 0) {
296-
gf.imagesToPreload.push();
296+
gf.imagesToPreload.push(url);
297297
}
298-
gf.imagesToPreload.push(url);
299298
};
300299

301300
gf.callbacks = [];
@@ -375,8 +374,8 @@ gf.startGame = function(endCallback, progressCallback) {
375374
gf.time = (new Date()).getTime();
376375
} else {
377376
if (progressCallback) {
378-
count++;
379-
progressCallback((count / total) * 100);
377+
counter++;
378+
progressCallback((counter / total) * 100);
380379
}
381380
}
382381
}, 100);

‎chapter 5/gameFramework.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -505,9 +505,8 @@ gf.imagesToPreload = [];
505505
**/
506506
gf.addImage = function(url) {
507507
if ($.inArray(url, gf.imagesToPreload) < 0) {
508-
gf.imagesToPreload.push();
508+
gf.imagesToPreload.push(url);
509509
}
510-
gf.imagesToPreload.push(url);
511510
};
512511

513512
gf.callbacks = [];
@@ -590,8 +589,8 @@ gf.startGame = function(endCallback, progressCallback) {
590589
gf.time = (new Date()).getTime();
591590
} else {
592591
if (progressCallback) {
593-
count++;
594-
progressCallback((count / total) * 100);
592+
counter++;
593+
progressCallback((counter / total) * 100);
595594
}
596595
}
597596
}, 100);

‎chapter 6/gameFramework.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -549,9 +549,8 @@ gf.imagesToPreload = [];
549549
**/
550550
gf.addImage = function(url) {
551551
if ($.inArray(url, gf.imagesToPreload) < 0) {
552-
gf.imagesToPreload.push();
552+
gf.imagesToPreload.push(url);
553553
}
554-
gf.imagesToPreload.push(url);
555554
};
556555

557556
gf.callbacks = [];
@@ -634,8 +633,8 @@ gf.startGame = function(endCallback, progressCallback) {
634633
gf.time = (new Date()).getTime();
635634
} else {
636635
if (progressCallback) {
637-
count++;
638-
progressCallback((count / total) * 100);
636+
counter++;
637+
progressCallback((counter / total) * 100);
639638
}
640639
}
641640
}, 100);

‎chapter 7/gameFramework.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -505,9 +505,8 @@ gf.imagesToPreload = [];
505505
**/
506506
gf.addImage = function(url) {
507507
if ($.inArray(url, gf.imagesToPreload) < 0) {
508-
gf.imagesToPreload.push();
508+
gf.imagesToPreload.push(url);
509509
}
510-
gf.imagesToPreload.push(url);
511510
};
512511

513512
gf.callbacks = [];
@@ -590,8 +589,8 @@ gf.startGame = function(endCallback, progressCallback) {
590589
gf.time = (new Date()).getTime();
591590
} else {
592591
if (progressCallback) {
593-
count++;
594-
progressCallback((count / total) * 100);
592+
counter++;
593+
progressCallback((counter / total) * 100);
595594
}
596595
}
597596
}, 100);

‎chapter 8/gameFramework.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -549,9 +549,8 @@ gf.imagesToPreload = [];
549549
**/
550550
gf.addImage = function(url) {
551551
if ($.inArray(url, gf.imagesToPreload) < 0) {
552-
gf.imagesToPreload.push();
552+
gf.imagesToPreload.push(url);
553553
}
554-
gf.imagesToPreload.push(url);
555554
};
556555

557556
gf.callbacks = [];
@@ -634,8 +633,8 @@ gf.startGame = function(endCallback, progressCallback) {
634633
gf.time = (new Date()).getTime();
635634
} else {
636635
if (progressCallback) {
637-
count++;
638-
progressCallback((count / total) * 100);
636+
counter++;
637+
progressCallback((counter / total) * 100);
639638
}
640639
}
641640
}, 100);

‎chapter 9/gameFramework.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -505,9 +505,8 @@ gf.imagesToPreload = [];
505505
**/
506506
gf.addImage = function(url) {
507507
if ($.inArray(url, gf.imagesToPreload) < 0) {
508-
gf.imagesToPreload.push();
508+
gf.imagesToPreload.push(url);
509509
}
510-
gf.imagesToPreload.push(url);
511510
};
512511

513512
gf.callbacks = [];
@@ -590,8 +589,8 @@ gf.startGame = function(endCallback, progressCallback) {
590589
gf.time = (new Date()).getTime();
591590
} else {
592591
if (progressCallback) {
593-
count++;
594-
progressCallback((count / total) * 100);
592+
counter++;
593+
progressCallback((counter / total) * 100);
595594
}
596595
}
597596
}, 100);

0 commit comments

Comments
 (0)