From 0846d5802965d257f176e033d7a6ac353ed648f3 Mon Sep 17 00:00:00 2001 From: majortom6 Date: Sun, 19 Feb 2017 12:00:52 -0600 Subject: -speedcaps now working again -creatures now randomize target better again -thats enough for today, src is still a mess and main can be cleaned a bit --- src/resource.cpp | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'src/resource.cpp') diff --git a/src/resource.cpp b/src/resource.cpp index 9933c4f..81fd6b7 100644 --- a/src/resource.cpp +++ b/src/resource.cpp @@ -2,23 +2,23 @@ Resource::Resource(Rectangle t) { - rect = t; - - if(rect.x == 0 && rect.y == 0){ - rect.x = -30 + static_cast (rand()) / (static_cast (RAND_MAX/(30.0-(-30.0)))); - rect.y = -30 + static_cast (rand()) / (static_cast (RAND_MAX/(30.0-(-30.0)))); - } + rect = t; - gfxData.x = rect.x; - gfxData.y = rect.y; - gfxData.r = 0.0; - gfxData.g = 1.0; - gfxData.b = 0.0; - gfxData.sides = 10.0; + if(rect.x == 0 && rect.y == 0){ + rect.x = getRandom(50); + rect.y = getRandom(50); + } - type = RESOURCE_TYPE; - amount = RESOURCE_AMOUNT_START; - growAmount = RESOURCE_GROW; + gfxData.x = rect.x; + gfxData.y = rect.y; + gfxData.r = 0.0; + gfxData.g = 1.0; + gfxData.b = 0.0; + gfxData.sides = 10.0; + + type = RESOURCE_TYPE; + amount = RESOURCE_AMOUNT_START; + growAmount = RESOURCE_GROW; } void Resource::eat(int bite) @@ -28,8 +28,8 @@ void Resource::eat(int bite) void Resource::grow() { - if(amount < RESOURCE_AMOUNT_MAX){ - amount+=growAmount; - rect.h = rect.w = map(amount,0,RESOURCE_AMOUNT_MAX,0,RESOURCE_SIZE_MAX); - } + if(amount < RESOURCE_AMOUNT_MAX){ + amount+=growAmount; + rect.h = rect.w = map(amount,0,RESOURCE_AMOUNT_MAX,0,RESOURCE_SIZE_MAX); + } } -- cgit v1.2.3