summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortom <tom@ground-control>2016-05-02 18:15:26 -0500
committertom <tom@ground-control>2016-05-02 18:15:26 -0500
commit4bb5b05443c36bc6e0a164bc7e324a5486be45ff (patch)
tree460cad1b8dac8d0af64b936f02447a832fbc625a /src
parentb5b0644cf5ca8f5a35c023a1b87a3e28ff33fc51 (diff)
commiting before refractoring type out of location and into entity
Diffstat (limited to 'src')
-rw-r--r--src/resource.cpp6
-rw-r--r--src/timer.cpp6
2 files changed, 2 insertions, 10 deletions
diff --git a/src/resource.cpp b/src/resource.cpp
index 9583f14..8b00e0a 100644
--- a/src/resource.cpp
+++ b/src/resource.cpp
@@ -24,12 +24,6 @@ Resource::Resource(Window m, std::string s, Location z)
amount = 100;
}
-Location Resource::getLocation()
-{
- //Location L(xPosition,yPosition,2);
- return L;
-}
-
void Resource::eat()
{
amount-=10;
diff --git a/src/timer.cpp b/src/timer.cpp
index b59bec8..3a0b55e 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -31,8 +31,7 @@ void Timer::Pause()
void Timer::unPause()
{
- if (paused)
- {
+ if (paused){
paused = false;
startTicks = SDL_GetTicks() - pausedTicks;
pausedTicks = 0;
@@ -41,8 +40,7 @@ void Timer::unPause()
int Timer::getTicks()
{
- if(started)
- {
+ if(started){
if (paused)
return pausedTicks;
else