Merge branch 'master' of https://github.com/ralucado/WaveGGJ17
This commit is contained in:
commit
4bf3722bc1
3 changed files with 1 additions and 2 deletions
|
@ -6,7 +6,6 @@ class Character : public sf::Sprite{
|
||||||
private:
|
private:
|
||||||
//CONFIG
|
//CONFIG
|
||||||
const double frameTime = BLACKVALUE/4.0f;
|
const double frameTime = BLACKVALUE/4.0f;
|
||||||
const int numFrames = 4;
|
|
||||||
const std::string spriteFile = WORK_DIR+"Resources/spreadsheet.png";
|
const std::string spriteFile = WORK_DIR+"Resources/spreadsheet.png";
|
||||||
//POSICIO PLAYER 1
|
//POSICIO PLAYER 1
|
||||||
float posX1 = W_WIDTH*0.05f, posY1 = W_HEIGHT*0.5f - 15;
|
float posX1 = W_WIDTH*0.05f, posY1 = W_HEIGHT*0.5f - 15;
|
||||||
|
|
|
@ -20,7 +20,7 @@ Game* Game::i() {
|
||||||
// Main game loop
|
// Main game loop
|
||||||
void Game::run() {
|
void Game::run() {
|
||||||
sf::Clock c;
|
sf::Clock c;
|
||||||
sf::RenderWindow window(sf::VideoMode(W_WIDTH, W_HEIGHT), "( ( ( Radio Waves ) ) )");
|
sf::RenderWindow window(sf::VideoMode(W_WIDTH, W_HEIGHT), "( ( ( Radio Waves ) ) )", sf::Style::Close);
|
||||||
window.setKeyRepeatEnabled(false);
|
window.setKeyRepeatEnabled(false);
|
||||||
float oldTime = c.getElapsedTime().asSeconds();
|
float oldTime = c.getElapsedTime().asSeconds();
|
||||||
while (isRunning) {
|
while (isRunning) {
|
||||||
|
|
Binary file not shown.
Reference in a new issue