Some work-in-progress in hp and mobs and a frightening amount of rand…

…om fixes.
minetest · Apr 21, 2011 · c638442 · c638442
1 parent 3c61d57
commit c638442
Show file tree

Hide file tree

Showing 40 changed files with 1,872 additions and 955 deletions.
diff --git a/data/heart.png b/data/heart.png
diff --git a/data/oerkki1.png b/data/oerkki1.png
diff --git a/data/stick.png b/data/stick.png
diff --git a/data/tool_mesepick.png b/data/tool_mesepick.png
diff --git a/data/tool_steelaxe.png b/data/tool_steelaxe.png
diff --git a/data/tool_steelpick.png b/data/tool_steelpick.png
diff --git a/data/tool_steelshovel.png b/data/tool_steelshovel.png
diff --git a/data/tool_stoneaxe.png b/data/tool_stoneaxe.png
diff --git a/data/tool_stonepick.png b/data/tool_stonepick.png
diff --git a/data/tool_stoneshovel.png b/data/tool_stoneshovel.png
diff --git a/data/tool_woodaxe.png b/data/tool_woodaxe.png
diff --git a/data/tool_woodpick.png b/data/tool_woodpick.png
diff --git a/data/tool_woodshovel.png b/data/tool_woodshovel.png
diff --git a/minetest.conf.example b/minetest.conf.example
@@ -52,6 +52,8 @@
 # Set to true to enable creative mode (unlimited inventory)
 #creative_mode = false
 
+#enable_damage = false
+
 # Player and object positions are sent at intervals specified by this
 #objectdata_inverval = 0.2
 

diff --git a/src/activeobject.h b/src/activeobject.h
@@ -40,6 +40,7 @@ struct ActiveObjectMessage
 #define ACTIVEOBJECT_TYPE_TEST 1
 #define ACTIVEOBJECT_TYPE_ITEM 2
 #define ACTIVEOBJECT_TYPE_RAT 3
+#define ACTIVEOBJECT_TYPE_OERKKI1 4
 
 /*
 	Parent class for ServerActiveObject and ClientActiveObject