diff options
| author | sapier <sapier at gmx dot net> | 2012-02-04 12:41:25 +0100 |
|---|---|---|
| committer | sapier <sapier at gmx dot net> | 2012-02-04 12:41:25 +0100 |
| commit | 77df09540c4d7eadef760779e123af88a48aafaa (patch) | |
| tree | febf1009328d30c31a14a1a1ca1600e99b4c3e6b /src/tile.h | |
| parent | 3454e6779337d8523ae76c7fa16eb8c565aa2381 (diff) | |
| parent | a1eb2836c0764829ebad1462432bb3c5f32750df (diff) | |
| download | minetest-77df09540c4d7eadef760779e123af88a48aafaa.tar.xz | |
Merge remote branch 'upstream/master' into sapier_experimental
Conflicts:
src/scriptapi.cpp
Diffstat (limited to 'src/tile.h')
| -rw-r--r-- | src/tile.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/tile.h b/src/tile.h index 23849ca1f..c0d8914b0 100644 --- a/src/tile.h +++ b/src/tile.h @@ -110,6 +110,8 @@ public: {return AtlasPointer(0);} virtual video::ITexture* getTextureRaw(const std::string &name) {return NULL;} + virtual IrrlichtDevice* getDevice() + {return NULL;} virtual void updateAP(AtlasPointer &ap){}; }; @@ -126,6 +128,8 @@ public: {return AtlasPointer(0);} virtual video::ITexture* getTextureRaw(const std::string &name) {return NULL;} + virtual IrrlichtDevice* getDevice() + {return NULL;} virtual void updateAP(AtlasPointer &ap){}; virtual void processQueue()=0; |