Commit c16e2fe0 authored by Gerhard Stein's avatar Gerhard Stein

Merge branch 'master' of github.com:gerstrong/Commander-Genius into saves

parents 825293bf bc8689d8
......@@ -191,7 +191,7 @@ F+I+X Restore Restores the settings as they were in the first time. Use thi
The game can be saved from the menu at any time. Keen will be saved at the exact position it was left.
(unlike in the original game which only allowed save on the map).
In Keen 4 this feature is not avaalable
In Keen 4 this feature is not avialable
- FAQ -
......
......@@ -32,7 +32,8 @@
const int COLISION_RES = (1<<STC);
// The bouncing box used by the object which is used to determine the collisions
struct BoundingBox{
struct BoundingBox
{
unsigned int x1, x2, y1, y2;
BoundingBox(unsigned int l_x1 = 0, unsigned int l_x2 = 0,
unsigned int l_y1 = 0, unsigned int l_y2 = 0 ) :
......@@ -50,10 +51,10 @@ struct BoundingBox{
unsigned int Width()
{ return (x2-x1); }
{ return (x2-x1); }
unsigned int Height()
{ return (y2-y1); }
{ return (y2-y1); }
};
......@@ -233,6 +234,8 @@ public:
void draw();
virtual ~CSpriteObject();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment