diff --git a/Resources/Sounds/clicks.wav b/Resources/Sounds/clicks.wav new file mode 100644 index 0000000..8940b06 Binary files /dev/null and b/Resources/Sounds/clicks.wav differ diff --git a/Resources/Sounds/wave.wav b/Resources/Sounds/intro.wav similarity index 100% rename from Resources/Sounds/wave.wav rename to Resources/Sounds/intro.wav diff --git a/VaporWaveWars/combat.cpp b/VaporWaveWars/combat.cpp index 3d1155d..48f2489 100644 --- a/VaporWaveWars/combat.cpp +++ b/VaporWaveWars/combat.cpp @@ -8,7 +8,7 @@ Combat::Combat() { // enemy = new IaEnemy(1); enemy = new Player(1); initShader(); - SoundManager::playMusic("music"); + } Combat::Combat(bool ia) { diff --git a/VaporWaveWars/commons.hpp b/VaporWaveWars/commons.hpp index e23f46b..f80accd 100644 --- a/VaporWaveWars/commons.hpp +++ b/VaporWaveWars/commons.hpp @@ -14,8 +14,8 @@ const int SCENE_NUM = 4; #define MARGEERR 0.05f #define BLACKVALUE 0.60f -#define W_WIDTH 800 -#define W_HEIGHT 600 +#define W_WIDTH 1024 +#define W_HEIGHT 768 const std::string WORK_DIR(getenv("WORK_DIR")); diff --git a/VaporWaveWars/game.cpp b/VaporWaveWars/game.cpp index 3cfb4e8..5c55c67 100644 --- a/VaporWaveWars/game.cpp +++ b/VaporWaveWars/game.cpp @@ -20,7 +20,7 @@ Game* Game::i() { // Main game loop void Game::run() { sf::Clock c; - sf::RenderWindow window(sf::VideoMode(W_WIDTH, W_HEIGHT), "SFML window"); + sf::RenderWindow window(sf::VideoMode(W_WIDTH, W_HEIGHT), "( ( ( Radio Waves ) ) )"); float oldTime = c.getElapsedTime().asSeconds(); while (isRunning) { float time = c.getElapsedTime().asSeconds(); diff --git a/VaporWaveWars/menu.cpp b/VaporWaveWars/menu.cpp index 09fb668..f08a43b 100644 --- a/VaporWaveWars/menu.cpp +++ b/VaporWaveWars/menu.cpp @@ -8,6 +8,7 @@ Menu::Menu() { _exit.turnOn(); _buttons.push_back(&_start); _buttons.push_back(&_exit); + } void Menu::update(float deltaTime, sf::RenderWindow*window){ diff --git a/VaporWaveWars/mygame.cpp b/VaporWaveWars/mygame.cpp index 3608816..7b6a4e1 100644 --- a/VaporWaveWars/mygame.cpp +++ b/VaporWaveWars/mygame.cpp @@ -10,6 +10,8 @@ MyGame::MyGame() { _scenes[GameScene::credits] = _menu; std::cout << "in menu" << std::endl; SoundManager::load(); + SoundManager::setLoop(true, "intro"); + SoundManager::playMusic("intro"); } MyGame::~MyGame() { @@ -24,8 +26,11 @@ void MyGame::changeScene(GameScene::gameScene n){ _scene = n; if(_scenes[_scene] == NULL){ if(_scene == GameScene::inGame){ + SoundManager::stopMusic("intro"); _combat = new Combat; _scenes[_scene] = _combat; + SoundManager::setLoop(true, "clicks"); + SoundManager::playMusic("clicks"); } } } diff --git a/VaporWaveWars/soundmanager.cpp b/VaporWaveWars/soundmanager.cpp index 5e0ff9c..c9a61c9 100644 --- a/VaporWaveWars/soundmanager.cpp +++ b/VaporWaveWars/soundmanager.cpp @@ -7,6 +7,8 @@ /* Example: sf::Music SoundManager::overWorldMusic;*/ sf::Music SoundManager::worldMusic; +sf::Music SoundManager::clickTrack; + sf::SoundBuffer SoundManager::atk1; sf::SoundBuffer SoundManager::atk2; sf::SoundBuffer SoundManager::atk3; @@ -39,8 +41,8 @@ void SoundManager::load(){ //LOAD HERE YOUR SOUNDS AND MUSIC /* Example: */ - musicMap["music"].openFromFile(WORK_DIR+"Resources/Sounds/wave.wav"); - + musicMap["intro"].openFromFile(WORK_DIR+"Resources/Sounds/intro.wav"); + musicMap["clicks"].openFromFile(WORK_DIR+"Resources/Sounds/clicks.wav"); ASSERT(atk1.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/1.wav")); soundMap["atk1"].setBuffer(atk1); ASSERT(atk2.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/2.wav")); diff --git a/VaporWaveWars/soundmanager.hpp b/VaporWaveWars/soundmanager.hpp index 8c8a3ac..64492de 100644 --- a/VaporWaveWars/soundmanager.hpp +++ b/VaporWaveWars/soundmanager.hpp @@ -28,6 +28,7 @@ class SoundManager { //INITIALIZE YOUR VARIABLES AS STATIC sf::Music or sf::SoundBuffer /* Example:*/ static sf::Music worldMusic; + static sf::Music clickTrack; static sf::SoundBuffer atk1; static sf::SoundBuffer atk2; static sf::SoundBuffer atk3;