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/script/cbottoken.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/script/cbottoken.cpp')
| -rw-r--r-- | src/script/cbottoken.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/script/cbottoken.cpp b/src/script/cbottoken.cpp index 4d33bca..a9cc599 100644 --- a/src/script/cbottoken.cpp +++ b/src/script/cbottoken.cpp @@ -15,20 +15,11 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -// #include <windows.h> -// #include <stdio.h> -// #include <d3d.h> -// -// #include "common/struct.h" -// #include "old/d3dengine.h" -// #include "old/d3dmath.h" -// #include "common/language.h" -// #include "common/global.h" -// #include "common/event.h" -#include "object/object.h" -// #include "script/cbottoken.h" +#include "script/cbottoken.h" +#include "object/object.h" +#include <string.h> // Seeking the name of an object. |