diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2017-06-03 14:55:10 -0400 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2017-06-03 14:55:10 -0400 |
| commit | caecdb681c428c1aab9c0f7eec2570c0460f995c (patch) | |
| tree | e5115982ea59bbf2343ba9b35bc4a0cfbb56f407 /src/content_cso.cpp | |
| parent | 81d56b94919dceb7b2e51d70b21a7ca22f852bd5 (diff) | |
| parent | 80dc961d24e1964e25d57039ddb2ba639f9f4d22 (diff) | |
| download | minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.gz minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.bz2 minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.zip | |
Merge 0.4.16 into stable-0.4
Diffstat (limited to 'src/content_cso.cpp')
| -rw-r--r-- | src/content_cso.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/content_cso.cpp b/src/content_cso.cpp index 0790024fc..aca71212b 100644 --- a/src/content_cso.cpp +++ b/src/content_cso.cpp @@ -20,22 +20,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "content_cso.h" #include <IBillboardSceneNode.h> #include "client/tile.h" -#include "environment.h" -#include "gamedef.h" -#include "log.h" +#include "clientenvironment.h" +#include "client.h" #include "map.h" -/* -static void setBillboardTextureMatrix(scene::IBillboardSceneNode *bill, - float txs, float tys, int col, int row) -{ - video::SMaterial& material = bill->getMaterial(0); - core::matrix4& matrix = material.getTextureMatrix(0); - matrix.setTextureTranslate(txs*col, tys*row); - matrix.setTextureScale(txs, tys); -} -*/ - class SmokePuffCSO: public ClientSimpleObject { float m_age; |