sciuro
/
Turkey-Cooking-Simulator
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Removed unused files

Load_Fix
Robert Chen 11 years ago
parent
c36aac6cef
commit
731c9c0f97
3 changed files with 2 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      js/main.js
  2. 2
      js/screens.js
  3. 4
      js/soundmanager.js

2
js/main.js
Unescape View File

@ -92,11 +92,9 @@ function GameState(){
// Load sound assets // Load sound assets
queue.loadFile( {id: "TitleMusicFile", src:"res/sound/turkey_in_the_straw.mp3"} ); queue.loadFile( {id: "TitleMusicFile", src:"res/sound/turkey_in_the_straw.mp3"} );
queue.loadFile( {id: "MarketBackgroundSoundFile", src:"res/sound/Store/supermarket.mp3"} );
queue.loadFile( {id: "MarketSoundFile", src:"res/sound/Store/Waterford.mp3"} ); queue.loadFile( {id: "MarketSoundFile", src:"res/sound/Store/Waterford.mp3"} );
// UI sounds // UI sounds
queue.loadFile( {id: "UIPopFile", src:"res/sound/GUI/pop.mp3"} );
queue.loadFile( {id: "UILowClickFile", src:"res/sound/GUI/lowclick.mp3"} ); queue.loadFile( {id: "UILowClickFile", src:"res/sound/GUI/lowclick.mp3"} );
queue.loadFile( {id: "UIClickFile", src:"res/sound/GUI/click.mp3"} ); queue.loadFile( {id: "UIClickFile", src:"res/sound/GUI/click.mp3"} );
queue.loadFile( {id: "UIBuzzFile", src:"res/sound/GUI/buzz.mp3"} ); queue.loadFile( {id: "UIBuzzFile", src:"res/sound/GUI/buzz.mp3"} );

2
js/screens.js
Unescape View File

@ -272,7 +272,7 @@ function KitchenScreen( stage, gameState ){
// If player did not buy a turkey, tell them // If player did not buy a turkey, tell them
if( !gameState.turkeyBought ){ if( !gameState.turkeyBought ){
gameState.pubsub.publish( "ShowDialog", {seq:"KitchenInitial", autoAdvance:true} ); gameState.pubsub.publish( "ShowDialog", {seq:"KitchenInitial", autoAdvance:false} );
} }
return { return {

4
js/soundmanager.js
Unescape View File

@ -13,9 +13,7 @@ function SoundManager( gameState ){
// Register all sounds loaded in gameState // Register all sounds loaded in gameState
createjs.Sound.registerSound("res/sound/turkey_in_the_straw.mp3", "TitleMusic"); createjs.Sound.registerSound("res/sound/turkey_in_the_straw.mp3", "TitleMusic");
createjs.Sound.registerSound("res/sound/Store/supermarket.mp3", "MarketBackgroundSound");
createjs.Sound.registerSound("res/sound/Store/Waterford.mp3", "MarketMusic"); createjs.Sound.registerSound("res/sound/Store/Waterford.mp3", "MarketMusic");
createjs.Sound.registerSound("res/sound/GUI/pop.mp3", "Pop");
createjs.Sound.registerSound("res/sound/GUI/lowclick.mp3", "LowClick"); createjs.Sound.registerSound("res/sound/GUI/lowclick.mp3", "LowClick");
createjs.Sound.registerSound("res/sound/GUI/click.mp3", "Click"); createjs.Sound.registerSound("res/sound/GUI/click.mp3", "Click");
createjs.Sound.registerSound("res/sound/GUI/buzz.mp3", "Error"); createjs.Sound.registerSound("res/sound/GUI/buzz.mp3", "Error");
@ -43,7 +41,7 @@ function SoundManager( gameState ){
} }
}; };
this.play = function( soundName ){ this.play = function( soundName ){
var channel = createjs.Sound.createInstance("Pop"); var channel = createjs.Sound.createInstance("Click");
if( typeof soundName != "object" ){ if( typeof soundName != "object" ){
channel = ( soundCache[soundName] ? soundCache[soundName] : soundCache[soundName] = createjs.Sound.createInstance(soundName) ); channel = ( soundCache[soundName] ? soundCache[soundName] : soundCache[soundName] = createjs.Sound.createInstance(soundName) );

Write Preview
Loading…
Cancel
Save