Merge branch 'master' of github.com:ralucado/WaveGGJ17

This commit is contained in:
Ralusama19 2017-01-22 00:30:12 +01:00
commit b42413dd77
2 changed files with 0 additions and 1 deletions

View file

@ -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;