From 650e659ee82739889f219526476198e7e3148a5a Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Fri, 21 Jun 2013 14:33:01 -0700 Subject: [PATCH] Fixed includes, pointer warning. --- interface/src/Balls.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/interface/src/Balls.cpp b/interface/src/Balls.cpp index 49932c84ce..76d966cd2f 100644 --- a/interface/src/Balls.cpp +++ b/interface/src/Balls.cpp @@ -10,11 +10,13 @@ // #include -#include "Util.h" -#include "sharedUtil.h" -#include "world.h" + +#include + #include "InterfaceConfig.h" #include "Balls.h" +#include "Util.h" +#include "world.h" const float INITIAL_AREA = 0.2f; const float BALL_RADIUS = 0.025f; @@ -29,7 +31,7 @@ Balls::Balls(int numberOfBalls) { _balls[i].velocity = glm::vec3(0, 0, 0); _balls[i].radius = BALL_RADIUS; for (unsigned int j = 0; j < NUMBER_SPRINGS; ++j) { - _balls[i].links[j] = NULL; + _balls[i].links[j] = 0; } } _color = INITIAL_COLOR;