Some structure Changes

diff --git a/bin/dont_delete.txt b/bin/dont_delete.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/bin/dragonblocks b/bin/dragonblocks
new file mode 100644 (file)
index 0000000..13db1f5
Binary files /dev/null and b/bin/dragonblocks differ

diff --git a/builtin/cpp.lua b/builtin/cpp.lua
deleted file mode 100644 (file)
index a6cd19d..0000000
--- a/builtin/cpp.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-local cpp_last_node = 0
-function cpp_get_next_node()
-    cpp_last_node = cpp_last_node + 1
-    return core.nodes[cpp_last_node]           
-end

diff --git a/builtin/init.lua b/builtin/init.lua
index 1b179599bdb4564eb177e7671723240dcd6b832d..297b256f81f2d40c8df8abff069a617b2eacf0e6 100644 (file)
--- a/builtin/init.lua
+++ b/builtin/init.lua
@@ -4,8 +4,6 @@ dragonblocks.settings = {}
 dofile("builtin/register.lua")
 dofile("builtin/functions.lua")
 
-dofile("game/init.lua")
-
 local popenfile = io.popen("ls mods")
 for modname in popenfile:lines() do
        dofile("mods/" .. modname .. "/init.lua")

diff --git a/game/config.lua b/game/config.lua
deleted file mode 100644 (file)
index cb31b65..0000000
--- a/game/config.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-dragonblocks.settings.display_width = 25                       -- nodes        
-dragonblocks.settings.display_height = 25                      -- nodes
-dragonblocks.settings.player_speed = 4                         -- m/s
-dragonblocks.settings.entity_update_frequency = 60     -- hz
-dragonblocks.settings.map_backup_interval = 60                 -- s

diff --git a/game/init.lua b/game/init.lua
deleted file mode 100644 (file)
index 00e904c..0000000
--- a/game/init.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-dragonblocks.log(" ____                              _     _            _         ")
-dragonblocks.log("|  _ \\ _ __ __ _  __ _  ___  _ __ | |__ | | ___   ___| | _____  ")
-dragonblocks.log("| | | | '__/ _` |/ _` |/ _ \\| '_ \\| '_ \\| |/ _ \\ / __| |/ / __| ")
-dragonblocks.log("| |_| | | | (_| | (_| | (_) | | | | |_) | | (_) | (__|   <\\__ \\ ")
-dragonblocks.log("|____/|_|  \\__,_|\\__, |\\___/|_| |_|_.__/|_|\\___/ \\___|_|\\_\\___/ ")
-dragonblocks.log("                 |___/                                          ")
-dofile("game/nodes.lua")

diff --git a/game/nodes.lua b/game/nodes.lua
deleted file mode 100644 (file)
index e9c6645..0000000
--- a/game/nodes.lua
+++ /dev/null
@@ -1,54 +0,0 @@
-dragonblocks.register_node({
-       name = "dragonblocks:air",
-       texture = "textures/air.png",
-       stable = false,
-       hidden = true,
-       translucent = true,
-})
-dragonblocks.register_node({
-       name = "dragonblocks:stone",
-       texture = "textures/stone.png"
-})
-dragonblocks.register_node({
-       name = "dragonblocks:dirt",
-       texture = "textures/dirt.png"
-})
-dragonblocks.register_node({
-       name = "dragonblocks:grass", 
-       texture = "textures/grass.png"
-})
-dragonblocks.register_node({
-       name = "dragonblocks:wood", 
-       texture = "textures/wood.png"
-})
-dragonblocks.register_node({
-       name = "dragonblocks:water", 
-       texture = "textures/water.png",
-       stable = false,
-       translucent = true,
-})
-dragonblocks.register_node({
-       name = "dragonblocks:leaves", 
-       texture = "textures/leaves.png",
-       translucent = true,
-})
-dragonblocks.register_node({
-       name = "dragonblocks:bedrock", 
-       texture = "textures/bedrock.png"
-})
-dragonblocks.register_node({
-       name = "dragonblocks:mese", 
-       texture = "textures/mese.png"
-})
-dragonblocks.register_node({
-       name = "dragonblocks:sand", 
-       texture = "textures/sand.png"
-})
-dragonblocks.register_node({
-       name = "dragonblocks:cobble", 
-       texture = "textures/cobble.png"
-})
-dragonblocks.register_node({
-       name = "dragonblocks:wood_planks", 
-       texture = "textures/wood_planks.png"
-})

diff --git a/mods/demo/init.lua b/mods/demo/init.lua
deleted file mode 100644 (file)
index 2f674a2..0000000
--- a/mods/demo/init.lua
+++ /dev/null
@@ -1 +0,0 @@
-dragonblocks.log("Demo Mod loaded") 

diff --git a/mods/dragonblocks/config.lua b/mods/dragonblocks/config.lua
new file mode 100644 (file)
index 0000000..cb31b65
--- /dev/null
+++ b/mods/dragonblocks/config.lua
@@ -0,0 +1,5 @@
+dragonblocks.settings.display_width = 25                       -- nodes        
+dragonblocks.settings.display_height = 25                      -- nodes
+dragonblocks.settings.player_speed = 4                         -- m/s
+dragonblocks.settings.entity_update_frequency = 60     -- hz
+dragonblocks.settings.map_backup_interval = 60                 -- s

diff --git a/mods/dragonblocks/init.lua b/mods/dragonblocks/init.lua
new file mode 100644 (file)
index 0000000..0931692
--- /dev/null
+++ b/mods/dragonblocks/init.lua
@@ -0,0 +1,7 @@
+dragonblocks.log(" ____                              _     _            _         ")
+dragonblocks.log("|  _ \\ _ __ __ _  __ _  ___  _ __ | |__ | | ___   ___| | _____  ")
+dragonblocks.log("| | | | '__/ _` |/ _` |/ _ \\| '_ \\| '_ \\| |/ _ \\ / __| |/ / __| ")
+dragonblocks.log("| |_| | | | (_| | (_| | (_) | | | | |_) | | (_) | (__|   <\\__ \\ ")
+dragonblocks.log("|____/|_|  \\__,_|\\__, |\\___/|_| |_|_.__/|_|\\___/ \\___|_|\\_\\___/ ")
+dragonblocks.log("                 |___/                                          ")
+dofile("mods/dragonblocks/nodes.lua")

diff --git a/mods/dragonblocks/nodes.lua b/mods/dragonblocks/nodes.lua
new file mode 100644 (file)
index 0000000..e9c6645
--- /dev/null
+++ b/mods/dragonblocks/nodes.lua
@@ -0,0 +1,54 @@
+dragonblocks.register_node({
+       name = "dragonblocks:air",
+       texture = "textures/air.png",
+       stable = false,
+       hidden = true,
+       translucent = true,
+})
+dragonblocks.register_node({
+       name = "dragonblocks:stone",
+       texture = "textures/stone.png"
+})
+dragonblocks.register_node({
+       name = "dragonblocks:dirt",
+       texture = "textures/dirt.png"
+})
+dragonblocks.register_node({
+       name = "dragonblocks:grass", 
+       texture = "textures/grass.png"
+})
+dragonblocks.register_node({
+       name = "dragonblocks:wood", 
+       texture = "textures/wood.png"
+})
+dragonblocks.register_node({
+       name = "dragonblocks:water", 
+       texture = "textures/water.png",
+       stable = false,
+       translucent = true,
+})
+dragonblocks.register_node({
+       name = "dragonblocks:leaves", 
+       texture = "textures/leaves.png",
+       translucent = true,
+})
+dragonblocks.register_node({
+       name = "dragonblocks:bedrock", 
+       texture = "textures/bedrock.png"
+})
+dragonblocks.register_node({
+       name = "dragonblocks:mese", 
+       texture = "textures/mese.png"
+})
+dragonblocks.register_node({
+       name = "dragonblocks:sand", 
+       texture = "textures/sand.png"
+})
+dragonblocks.register_node({
+       name = "dragonblocks:cobble", 
+       texture = "textures/cobble.png"
+})
+dragonblocks.register_node({
+       name = "dragonblocks:wood_planks", 
+       texture = "textures/wood_planks.png"
+})

diff --git a/src/game.h b/src/game.h
index 9814442b204759f4ca6210426469b7172bb8a482..995410c84970565ddf6804dfaeb10bfa77b3230d 100644 (file)
--- a/src/game.h
+++ b/src/game.h
@@ -21,7 +21,7 @@
 #define CODE_LIGHTBLUE 6
 #define CODE_GREY 7
 
-#define VERSION "3.1"
+#define VERSION "3.2-dev"
 
 class Game{
        public: