From 6a40b6279511924d24b5975f1219908918f912a4 Mon Sep 17 00:00:00 2001 From: Patrik Gornicz Date: Fri, 22 Aug 2008 12:42:16 -0400 Subject: [PATCH] start balls now weigh more --- src/Makefile | 1 + src/entityCreator.cpp | 33 +++++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/Makefile b/src/Makefile index 2fae2ba..c9f8c86 100644 --- a/src/Makefile +++ b/src/Makefile @@ -46,6 +46,7 @@ SRCS += Effects/GravityWell.cpp SRCS += Effects/Screen.cpp SRCS += config/config.cpp +SRCS += config/reader.cpp SRCS += input/inputManager.cpp diff --git a/src/entityCreator.cpp b/src/entityCreator.cpp index b0c034c..c015136 100644 --- a/src/entityCreator.cpp +++ b/src/entityCreator.cpp @@ -47,14 +47,31 @@ void removeAllBalls(queBall& que); void creator::init() { - addBall(Vector2(50, 50), 20, cWhite, startBalls); - addBall(Vector2(150, 50), 20, cGrey, startBalls); - addBall(Vector2(50, 100), 20, cRed, startBalls); - addBall(Vector2(100, 100), 20, cGreen, startBalls); - addBall(Vector2(150, 100), 20, cBlue, startBalls); - addBall(Vector2(50, 150), 20, cYellow, startBalls); - addBall(Vector2(100, 150), 20, cMagenta, startBalls); - addBall(Vector2(150, 150), 20, cCyan, startBalls); + Ball* ball; + + ball = addBall(Vector2(50, 50), 20, cWhite, startBalls); + ball->mass = 10; + + ball = addBall(Vector2(150, 50), 20, cGrey, startBalls); + ball->mass = 10; + + ball = addBall(Vector2(50, 100), 20, cRed, startBalls); + ball->mass = 10; + + ball = addBall(Vector2(100, 100), 20, cGreen, startBalls); + ball->mass = 10; + + ball = addBall(Vector2(150, 100), 20, cBlue, startBalls); + ball->mass = 10; + + ball = addBall(Vector2(50, 150), 20, cYellow, startBalls); + ball->mass = 10; + + ball = addBall(Vector2(100, 150), 20, cMagenta, startBalls); + ball->mass = 10; + + ball = addBall(Vector2(150, 150), 20, cCyan, startBalls); + ball->mass = 10; } void creator::clean() { -- 2.10.2