Actualitzada a la ultima versió de jail_audio
This commit is contained in:
@@ -18,6 +18,7 @@
|
||||
#include <iostream> // Para basic_ostream, operator<<, cout
|
||||
#include <string> // Para basic_string, operator+, char_...
|
||||
#include <vector> // Para vector
|
||||
#include <memory>
|
||||
#include "asset.h" // Para Asset, assetType
|
||||
#include "const.h" // Para SECTION_LOGO, SECTION_TITLE
|
||||
#include "debug.h" // Para Debug
|
||||
@@ -1724,9 +1725,8 @@ void Director::runLogo()
|
||||
std::cout << "\n* SECTION: LOGO" << std::endl;
|
||||
}
|
||||
loadResources(section);
|
||||
logo = new Logo(renderer, screen, resource, asset, input, options, section);
|
||||
auto logo = std::make_unique<Logo>(renderer, screen, resource, asset, input, options, section);
|
||||
logo->run();
|
||||
delete logo;
|
||||
resource->free();
|
||||
}
|
||||
|
||||
@@ -1738,9 +1738,8 @@ void Director::runLoadingScreen()
|
||||
std::cout << "\n* SECTION: INTRO" << std::endl;
|
||||
}
|
||||
loadResources(section);
|
||||
loadingScreen = new LoadingScreen(renderer, screen, resource, asset, input, options, section);
|
||||
auto loadingScreen = std::make_unique<LoadingScreen>(renderer, screen, resource, asset, input, options, section);
|
||||
loadingScreen->run();
|
||||
delete loadingScreen;
|
||||
resource->free();
|
||||
}
|
||||
|
||||
@@ -1756,9 +1755,8 @@ void Director::runTitle()
|
||||
JA_PlayMusic(music);
|
||||
}
|
||||
loadResources(section);
|
||||
title = new Title(renderer, screen, resource, asset, input, options, section);
|
||||
auto title = std::make_unique<Title>(renderer, screen, resource, asset, input, options, section);
|
||||
title->run();
|
||||
delete title;
|
||||
resource->free();
|
||||
}
|
||||
|
||||
@@ -1770,9 +1768,8 @@ void Director::runCredits()
|
||||
std::cout << "\n* SECTION: CREDITS" << std::endl;
|
||||
}
|
||||
loadResources(section);
|
||||
credits = new Credits(renderer, screen, resource, asset, input, options, section);
|
||||
auto credits = std::make_unique<Credits>(renderer, screen, resource, asset, input, options, section);
|
||||
credits->run();
|
||||
delete credits;
|
||||
resource->free();
|
||||
}
|
||||
|
||||
@@ -1784,9 +1781,8 @@ void Director::runDemo()
|
||||
std::cout << "\n* SECTION: DEMO" << std::endl;
|
||||
}
|
||||
loadResources(section);
|
||||
demo = new Demo(renderer, screen, resource, asset, input, options, section, debug);
|
||||
auto demo = std::make_unique<Demo>(renderer, screen, resource, asset, input, options, section, debug);
|
||||
demo->run();
|
||||
delete demo;
|
||||
resource->free();
|
||||
}
|
||||
|
||||
@@ -1798,9 +1794,8 @@ void Director::runEnding()
|
||||
std::cout << "\n* SECTION: ENDING" << std::endl;
|
||||
}
|
||||
loadResources(section);
|
||||
ending = new Ending(renderer, screen, resource, asset, input, options, section);
|
||||
auto ending = std::make_unique<Ending>(renderer, screen, resource, asset, input, options, section);
|
||||
ending->run();
|
||||
delete ending;
|
||||
resource->free();
|
||||
}
|
||||
|
||||
@@ -1812,9 +1807,8 @@ void Director::runEnding2()
|
||||
std::cout << "\n* SECTION: ENDING2" << std::endl;
|
||||
}
|
||||
loadResources(section);
|
||||
ending2 = new Ending2(renderer, screen, resource, asset, input, options, section);
|
||||
auto ending2 = std::make_unique<Ending2>(renderer, screen, resource, asset, input, options, section);
|
||||
ending2->run();
|
||||
delete ending2;
|
||||
resource->free();
|
||||
}
|
||||
|
||||
@@ -1826,9 +1820,8 @@ void Director::runGameOver()
|
||||
std::cout << "\n* SECTION: GAME OVER" << std::endl;
|
||||
}
|
||||
loadResources(section);
|
||||
gameOver = new GameOver(renderer, screen, resource, asset, input, options, section);
|
||||
auto gameOver = std::make_unique<GameOver>(renderer, screen, resource, asset, input, options, section);
|
||||
gameOver->run();
|
||||
delete gameOver;
|
||||
resource->free();
|
||||
}
|
||||
|
||||
@@ -1841,9 +1834,8 @@ void Director::runGame()
|
||||
}
|
||||
JA_StopMusic();
|
||||
loadResources(section);
|
||||
game = new Game(renderer, screen, resource, asset, options, input, section, debug);
|
||||
auto game = std::make_unique<Game>(renderer, screen, resource, asset, options, input, section, debug);
|
||||
game->run();
|
||||
delete game;
|
||||
resource->free();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user