aboutsummaryrefslogtreecommitdiff
path: root/games/devtest
diff options
context:
space:
mode:
Diffstat (limited to 'games/devtest')
-rw-r--r--games/devtest/mods/callbacks/entities.lua (renamed from games/devtest/mods/testentities/callbacks.lua)8
-rw-r--r--games/devtest/mods/callbacks/init.lua1
-rw-r--r--games/devtest/mods/callbacks/textures/callbacks_callback_entity.png (renamed from games/devtest/mods/testentities/textures/testentities_callback.png)bin156 -> 156 bytes
-rw-r--r--games/devtest/mods/callbacks/textures/callbacks_callback_entity_step.png (renamed from games/devtest/mods/testentities/textures/testentities_callback_step.png)bin166 -> 166 bytes
-rw-r--r--games/devtest/mods/testentities/init.lua1
5 files changed, 5 insertions, 5 deletions
diff --git a/games/devtest/mods/testentities/callbacks.lua b/games/devtest/mods/callbacks/entities.lua
index a212fbfbe..6a7f13d75 100644
--- a/games/devtest/mods/testentities/callbacks.lua
+++ b/games/devtest/mods/callbacks/entities.lua
@@ -22,10 +22,10 @@ local spos = function(self)
end
-- Callback test entity (all callbacks except on_step)
-minetest.register_entity("testentities:callback", {
+minetest.register_entity("callbacks:callback", {
initial_properties = {
visual = "upright_sprite",
- textures = { "testentities_callback.png" },
+ textures = { "callbacks_callback_entity.png" },
},
on_activate = function(self, staticdata, dtime_s)
@@ -69,9 +69,9 @@ minetest.register_entity("testentities:callback", {
})
-- Only test on_step callback
-minetest.register_entity("testentities:callback_step", {
+minetest.register_entity("callbacks:callback_step", {
visual = "upright_sprite",
- textures = { "testentities_callback_step.png" },
+ textures = { "callbacks_callback_entity_step.png" },
on_step = function(self, dtime)
message("on_step callback entity: on_step! pos="..spos(self).."; dtime="..dtime)
end,
diff --git a/games/devtest/mods/callbacks/init.lua b/games/devtest/mods/callbacks/init.lua
index c5b0984d5..8f719a3f8 100644
--- a/games/devtest/mods/callbacks/init.lua
+++ b/games/devtest/mods/callbacks/init.lua
@@ -1,2 +1,3 @@
dofile(minetest.get_modpath("callbacks").."/items.lua")
dofile(minetest.get_modpath("callbacks").."/nodes.lua")
+dofile(minetest.get_modpath("callbacks").."/entities.lua")
diff --git a/games/devtest/mods/testentities/textures/testentities_callback.png b/games/devtest/mods/callbacks/textures/callbacks_callback_entity.png
index c4c9066d1..c4c9066d1 100644
--- a/games/devtest/mods/testentities/textures/testentities_callback.png
+++ b/games/devtest/mods/callbacks/textures/callbacks_callback_entity.png
Binary files differ
diff --git a/games/devtest/mods/testentities/textures/testentities_callback_step.png b/games/devtest/mods/callbacks/textures/callbacks_callback_entity_step.png
index b67506a97..b67506a97 100644
--- a/games/devtest/mods/testentities/textures/testentities_callback_step.png
+++ b/games/devtest/mods/callbacks/textures/callbacks_callback_entity_step.png
Binary files differ
diff --git a/games/devtest/mods/testentities/init.lua b/games/devtest/mods/testentities/init.lua
index df8c72ea7..94d8d47c2 100644
--- a/games/devtest/mods/testentities/init.lua
+++ b/games/devtest/mods/testentities/init.lua
@@ -1,3 +1,2 @@
dofile(minetest.get_modpath("testentities").."/visuals.lua")
dofile(minetest.get_modpath("testentities").."/armor.lua")
-dofile(minetest.get_modpath("testentities").."/callbacks.lua")