diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-08-11 13:51:32 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-08-11 13:51:32 +0200 |
| commit | ecf6217ae9bbc4ecfac9fb1ac4f9a7e72b19fdcb (patch) | |
| tree | 06972e32286c2709790c0dac31f436d49a8d3fc1 | |
| parent | Use named constants instead of magic values - block digging direction and torch placement (diff) | |
| download | cuberite-ecf6217ae9bbc4ecfac9fb1ac4f9a7e72b19fdcb.tar cuberite-ecf6217ae9bbc4ecfac9fb1ac4f9a7e72b19fdcb.tar.gz cuberite-ecf6217ae9bbc4ecfac9fb1ac4f9a7e72b19fdcb.tar.bz2 cuberite-ecf6217ae9bbc4ecfac9fb1ac4f9a7e72b19fdcb.tar.lz cuberite-ecf6217ae9bbc4ecfac9fb1ac4f9a7e72b19fdcb.tar.xz cuberite-ecf6217ae9bbc4ecfac9fb1ac4f9a7e72b19fdcb.tar.zst cuberite-ecf6217ae9bbc4ecfac9fb1ac4f9a7e72b19fdcb.zip | |
| -rw-r--r-- | source/FileDefine.h | 21 | ||||
| -rw-r--r-- | source/cFurnaceEntity.h | 2 | ||||
| -rw-r--r-- | source/cInventory.h | 5 | ||||
| -rw-r--r-- | source/cLog.h | 2 |
4 files changed, 5 insertions, 25 deletions
diff --git a/source/FileDefine.h b/source/FileDefine.h deleted file mode 100644 index c75fb3110..000000000 --- a/source/FileDefine.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -// So we don't have to include fstream :P -#ifdef _WIN32 -#ifndef _FILE_DEFINED -struct _iobuf { - char *_ptr; - int _cnt; - char *_base; - int _flag; - int _file; - int _charbuf; - int _bufsiz; - char *_tmpfname; -}; -typedef struct _iobuf FILE; -#define _FILE_DEFINED -#endif -#else -#include <stdio.h> -#endif
\ No newline at end of file diff --git a/source/cFurnaceEntity.h b/source/cFurnaceEntity.h index 2a8581eb9..d133561a1 100644 --- a/source/cFurnaceEntity.h +++ b/source/cFurnaceEntity.h @@ -3,7 +3,6 @@ #include "cBlockEntity.h" #include "cWindowOwner.h" -#include "FileDefine.h" #include "cItem.h" @@ -21,6 +20,7 @@ class cServer; + class cFurnaceEntity : public cBlockEntity, public cBlockEntityWindowOwner diff --git a/source/cInventory.h b/source/cInventory.h index f795a9898..2336df57f 100644 --- a/source/cInventory.h +++ b/source/cInventory.h @@ -2,7 +2,10 @@ #pragma once #include "cWindowOwner.h" -#include "FileDefine.h" + + + + namespace Json { diff --git a/source/cLog.h b/source/cLog.h index f48dae822..b405b52a4 100644 --- a/source/cLog.h +++ b/source/cLog.h @@ -1,8 +1,6 @@ #pragma once -#include "FileDefine.h" - |