diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-15 18:50:51 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-15 18:50:51 +0200 |
| commit | ad6bc13dc2b70741ee3f006e321ba46dd421b9b5 (patch) | |
| tree | 72540c0d47f5501f6080f7b03de600daed0a029a /src/object/auto/autoegg.cpp | |
| parent | 95d2f8da2c1df9a02fc1d668f2ce9c0b64c4bf65 (diff) | |
| parent | 94e7fd920353c39471d8836a8bf87ffb113f1349 (diff) | |
| download | colobot-ad6bc13dc2b70741ee3f006e321ba46dd421b9b5.tar.gz colobot-ad6bc13dc2b70741ee3f006e321ba46dd421b9b5.tar.bz2 colobot-ad6bc13dc2b70741ee3f006e321ba46dd421b9b5.zip | |
Merge dev-common and various fixes to achieve compilation
- merged changes from dev-common
- fixed many compilation errors (CBrain, UI, ...)
- temporarily commented out some problematic code (e.g. input bindings)
- (partially) fixed #include styling
- everything compiles except for CRobotMain, CMainDialog and CStudio
Diffstat (limited to 'src/object/auto/autoegg.cpp')
| -rw-r--r-- | src/object/auto/autoegg.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/object/auto/autoegg.cpp b/src/object/auto/autoegg.cpp index 04d03f9..35a6add 100644 --- a/src/object/auto/autoegg.cpp +++ b/src/object/auto/autoegg.cpp @@ -16,15 +16,14 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autoegg.h" #include "math/geometry.h" #include "common/iman.h" #include "script/cmdtoken.h" - +#include <stdio.h> +#include <string.h> // Object's constructor. |