Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Commander-Genius
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
24
Issues
24
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Security & Compliance
Security & Compliance
Dependency List
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Gerhard Stein
Commander-Genius
Commits
c16e2fe0
Commit
c16e2fe0
authored
Jun 25, 2012
by
Gerhard Stein
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:gerstrong/Commander-Genius into saves
parents
825293bf
bc8689d8
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
12 deletions
+34
-12
README
README
+1
-1
build/Xcode/CommanderGenius.xcodeproj/project.pbxproj
build/Xcode/CommanderGenius.xcodeproj/project.pbxproj
+27
-8
src/common/CSpriteObject.h
src/common/CSpriteObject.h
+6
-3
No files found.
README
View file @
c16e2fe0
...
...
@@ -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 av
a
alable
In Keen 4 this feature is not av
i
alable
- FAQ -
...
...
build/Xcode/CommanderGenius.xcodeproj/project.pbxproj
View file @
c16e2fe0
This diff is collapsed.
Click to expand it.
src/common/CSpriteObject.h
View file @
c16e2fe0
...
...
@@ -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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment