diff options
| author | Weblate <42@minetest.ru> | 2013-02-28 18:03:28 +0100 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-02-28 18:03:28 +0100 |
| commit | 22e186b4aa88b585e71500c4e9a03bf69b0b6191 (patch) | |
| tree | 14c5b7a73cf144ba7cf3066caac088a200f81a72 /src/content_cso.cpp | |
| parent | 372acf7b8eca0614a4a0da93cfbaccbcd459b36b (diff) | |
| parent | d31f07bd4b83f858cce589faac56922e12ba670f (diff) | |
| download | minetest-22e186b4aa88b585e71500c4e9a03bf69b0b6191.tar.gz minetest-22e186b4aa88b585e71500c4e9a03bf69b0b6191.tar.bz2 minetest-22e186b4aa88b585e71500c4e9a03bf69b0b6191.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/content_cso.cpp')
| -rw-r--r-- | src/content_cso.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/content_cso.cpp b/src/content_cso.cpp index 666f17734..73d5f2b48 100644 --- a/src/content_cso.cpp +++ b/src/content_cso.cpp @@ -1,6 +1,6 @@ /* -Minetest-c55 -Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com> +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com> This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -25,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "log.h" #include "map.h" +/* static void setBillboardTextureMatrix(scene::IBillboardSceneNode *bill, float txs, float tys, int col, int row) { @@ -33,6 +34,7 @@ static void setBillboardTextureMatrix(scene::IBillboardSceneNode *bill, matrix.setTextureTranslate(txs*col, tys*row); matrix.setTextureScale(txs, tys); } +*/ class SmokePuffCSO: public ClientSimpleObject { |