summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar jonas <himself@jonasgunz.de> 2019-02-01 13:38:56 +0100
committerGravatar jonas <himself@jonasgunz.de> 2019-02-01 13:38:56 +0100
commit989f19b01fad019d143403210a72e47ae88e3180 (patch)
tree1b3e30fb5ad34f4c6ce1c65a70cebaf88d8492eb
parentb59b93d3943262cb66e3355e0c9ce0ea672ff196 (diff)
parent058313fff11605da8ee58f621a4fa8237feec705 (diff)
downloadtermgl-989f19b01fad019d143403210a72e47ae88e3180.tar.gz
Merge branch 'master' of gitlab.lrz.de:ge49jic/engine
-rw-r--r--.gitignore1
-rw-r--r--Readme.md1
-rw-r--r--cObject.cpp1
3 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 79beff7..df22484 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
*.o
+*.so*
build/*
bin/*
doc/*
diff --git a/Readme.md b/Readme.md
index 80eb513..fa9be1a 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,4 +1,5 @@
[![Build Status](https://travis-ci.org/kompetenzbolzen/engine.svg?branch=master)](https://travis-ci.org/kompetenzbolzen/engine)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/9b19f9f7a8d241368f6ee640d824b293)](https://www.codacy.com/app/kompetenzbolzen/engine?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=kompetenzbolzen/engine&amp;utm_campaign=Badge_Grade)
## Compiling
diff --git a/cObject.cpp b/cObject.cpp
index 118fe6f..8f9f6fa 100644
--- a/cObject.cpp
+++ b/cObject.cpp
@@ -4,6 +4,7 @@ cObject::cObject(int _sx, int _sy)
{
bSizeSet = false;
+ pos = {0,0};
setSize(_sx, _sy);
}