summaryrefslogtreecommitdiff
path: root/src/environment.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-07-23 19:04:37 +0300
committerPerttu Ahola <celeron55@gmail.com>2011-07-23 19:04:37 +0300
commit2587bb361cfc96b3a695d1476e39b9c0ecaa6553 (patch)
tree6e6a35e0ee35883201189df9c545cc44b7a06658 /src/environment.cpp
parent90d793f8f369bf1431d7a915198cd49b98bbe2d7 (diff)
parent976ec31c1faedc3a34935c3aafd6a868e222d1ad (diff)
downloadminetest-2587bb361cfc96b3a695d1476e39b9c0ecaa6553.tar.gz
minetest-2587bb361cfc96b3a695d1476e39b9c0ecaa6553.tar.bz2
minetest-2587bb361cfc96b3a695d1476e39b9c0ecaa6553.zip
merged the content type extension and delta
Diffstat (limited to 'src/environment.cpp')
-rw-r--r--src/environment.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/environment.cpp b/src/environment.cpp
index b16ee59ab..f5e4b071a 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -976,7 +976,8 @@ void ServerEnvironment::step(float dtime)
//TestSAO *obj = new TestSAO(this, 0, pos);
//ServerActiveObject *obj = new ItemSAO(this, 0, pos, "CraftItem Stick 1");
//ServerActiveObject *obj = new RatSAO(this, 0, pos);
- ServerActiveObject *obj = new Oerkki1SAO(this, 0, pos);
+ //ServerActiveObject *obj = new Oerkki1SAO(this, 0, pos);
+ ServerActiveObject *obj = new FireflySAO(this, 0, pos);
addActiveObject(obj);
}
#endif