merge fix

diff --cc brice.dat
index bda8adcb6642decd7a089554d88b1583f814346b,e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..61d57c2785952fa6cb22f35f6db947ff5ddf91d2
--- 1/brice.dat
--- 2/brice.dat
+++ b/brice.dat
@@@ -1,5 -1,0 +1,5 @@@
- canSprint
- 1
 +2
- 1
 +canJump
++0
++canSprint
++0

diff --cc main.cpp
Simple merge

diff --cc src/world.cpp
index b0961802504ad0337e273811b0319ab09684997b,698db7cb76f39b9c36a838a11fdc4c410a714b1a..11bd6719e17684c3dde9faca724778ae7d0a2a16
--- 1/src/world.cpp
--- 2/src/world.cpp
+++ b/src/world.cpp
@@@ -712,13 -712,13 +712,13 @@@ void World::draw(Player *p
      glEnableVertexAttribArray(worldShader_attribute_coord);
      glEnableVertexAttribArray(worldShader_attribute_tex);
  
 -    uint ps = 0;particles.size();
 +    uint ps = particles.size();
      uint pss = ps * 6 * 5;    
 -      //uint pc = 0;
 +      uint pc = 0;
        
        std::vector<GLfloat> partVec(pss);
 -      /*GLfloat *pIndex = &partVec[0];
 -   
 +      GLfloat *pIndex = &partVec[0];
- 
++  
        for (const auto &p : particles) {
          pc += 30;
                if (pc > pss) {