Merge branch 'master' of git://git.gamezock.de/c3d

Conflicts:
	DisplayClass.cpp

1 files changed, 3 insertions, 3 deletions

diff --git a/Trapezocube.h b/Trapezocube.h
index b2cdd9a..3d64eaa 100644
--- a/Trapezocube.h
+++ b/Trapezocube.h
@@ -9,8 +9,8 @@
 class Trapezocube
 {
   public:
-    Trapezocube(): widthfront(0), widthback(0), height(0), depth(0), x(0), y(0), z(0) {}
-    Trapezocube(float widthfront, float widthback, float height, float depth): x(0), y(0), z(0){
+    Trapezocube(): widthfront(0), widthback(0), height(0), depth(0), x(0), y(0), z(0), rotate(0) {}
+    Trapezocube(float widthfront, float widthback, float height, float depth): x(0), y(0), z(0), rotate(0){
       setSize(widthfront, widthback, height, depth);
     }
     Trapezocube(float widthfront, float widthback, float height, float depth, float x, float y, float z): rotate(0) {
@@ -45,7 +45,7 @@ class Trapezocube
     }
     void setRotate(float r) {rotate = r;}
     void setColor(Color col) {color = col;}
-    std::list<Triangle> getTriangles(const Matrix &modelview);
+    std::list<Triangle> getTriangles(/*const Matrix &modelview*/);
 
   private:
     float x, y, z, widthfront, widthback, height, depth, rotate;