From: Clyne Sullivan <tullivan99@gmail.com>
Date: Tue, 7 Jun 2016 11:39:47 +0000 (-0400)
Subject: merge fix
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=5e4b825513aee44afc1342e5c390e80d3a1fdd15;p=clyne%2Fgamedev.git

merge fix
---

5e4b825513aee44afc1342e5c390e80d3a1fdd15
diff --cc brice.dat
index bda8adc,e69de29..61d57c2
--- a/brice.dat
+++ b/brice.dat
@@@ -1,5 -1,0 +1,5 @@@
 +2
- canSprint
- 1
 +canJump
- 1
++0
++canSprint
++0
diff --cc src/world.cpp
index b096180,698db7c..11bd671
--- a/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) {