PilzAdam

diff --git a/builtin/mainmenu.lua b/builtin/mainmenu.lua
index 73f0436..d8c2b63 100644
--- a/builtin/mainmenu.lua
+++ b/builtin/mainmenu.lua
@@ -178,7 +178,7 @@ function update_menu()
        if gamedata.errormessage ~= nil then
                formspec = "size[12,5.2]" ..
                        "textarea[1,2;10,2;;ERROR: " ..
-                       gamedata.errormessage ..
+                       engine.formspec_escape(gamedata.errormessage) ..

PilzAdam

towny = {}
local function make_registration()
	local t = {}
	local registerfunc = function(func) table.insert(t, func) end
	return t, registerfunc
end

towny.registered_on_town_join, towny.register_on_town_join = make_registration()

-- wenn dann ein player einer town joined: (also wenn der spielre den button drückt oder so)

PilzAdam

local timer = 0
minetest.on_globalstep(function(dtime)
	timer = timer + dtime
	if timer < 5 then
		return
	end
	timer = 0
	
	-- do stuff
	

PilzAdam

adam@ubuntu:~/Minetest/minetest $ bin/minetest --world /home/adam/Minetest/minetest/worlds/RandomNT --gameid nodetopia --random-input --go
[...]
22:02:50: ACTION[main]: World at [/home/adam/Minetest/minetest/bin/../worlds/NodetopiaTest]

PilzAdam

diff --git a/src/porting.h b/src/porting.h
index ea7f31b..fadeea4 100644
--- a/src/porting.h
+++ b/src/porting.h
@@ -213,7 +213,17 @@
        inline u32 getTimeNs()
        {
                struct timespec ts;
-               clock_gettime(CLOCK_REALTIME, &ts);
+#ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time

PilzAdam

diff --git a/astyle.orig/src/ASBeautifier.cpp b/astyle/src/ASBeautifier.cpp
index 7a5607a..f492aa8 100755
--- a/astyle.orig/src/ASBeautifier.cpp
+++ b/astyle/src/ASBeautifier.cpp
@@ -1137,20 +1137,12 @@ void ASBeautifier::registerInStatementIndent(const string &line, int i, int spac
 			tabIncrement += convertTabToSpaces(j, tabIncrement);
 	}
 
-	inStatementIndent = i + nextNonWSChar + spaceTabCount_ + tabIncrement;
+	inStatementIndent = indentLength * 2;

PilzAdam

diff --git a/src/rollback.cpp b/src/rollback.cpp
index bae81dd..647393d 100644
--- a/src/rollback.cpp
+++ b/src/rollback.cpp
@@ -203,41 +203,41 @@ bool SQL_createDatabase(void)
 	infostream << "CreateDB:" << dbp << std::endl;
 
 	int dbs = sqlite3_exec(dbh,
-		"CREATE TABLE IF NOT EXISTS `actor` ("
-			"`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,"

PilzAdam

Program received signal SIGFPE, Arithmetic exception.
[Switching to Thread 0x7fffd97f9700 (LWP 4275)]
0x000000000078c1f7 in getContainerPos (d=0, p=<optimized out>) at /home/adam/Minetest/minetest/src/util/numeric.h:50
50              return (p>=0 ? p : p-d+1) / d;
(gdb) bt full
#0  0x000000000078c1f7 in getContainerPos (d=0, p=<optimized out>) at /home/adam/Minetest/minetest/src/util/numeric.h:50
No locals.
#1  getContainerPos (d=0, p=...) at /home/adam/Minetest/minetest/src/util/numeric.h:64
No locals.
#2  ServerMap::initBlockMake (this=0x132bf70, data=data@entry=0x7fffd97f8c70, blockpos=...)

PilzAdam

15:50:00: INFO[main]: RollbackManager::RollbackManager(/home/adam/Minetest/minetest/worlds/TestyTest/rollback.txt)
15:50:00: INFO[main]: Directory: /home/adam/Minetest/minetest/worlds/TestyTest/
15:50:00: INFO[main]: CheckFor:  /home/adam/Minetest/minetest/worlds/TestyTest/rollback.txt
15:50:00: INFO[main]: FileOld:   rollback.txt
15:50:00: INFO[main]: FileNew:   rollback.sqlite
15:50:00: INFO[main]: Database connection setup
15:50:00: INFO[main]: SQLROLLBACK: SQLite3 database failed to open: unable to open database file
terminate called after throwing an instance of 'FileNotGoodException'
  what():  Cannot open database file
Abgebrochen (Speicherabzug geschrieben)

PilzAdam

(gdb) bt
#0  0x000000000078bca7 in getContainerPos (d=0, p=<optimized out>) at /home/adam/Minetest/minetest/src/util/numeric.h:50
#1  getContainerPos (d=0, p=...) at /home/adam/Minetest/minetest/src/util/numeric.h:64
#2  ServerMap::initBlockMake (this=0x131d240, data=data@entry=0x7fffdb7fcc70, blockpos=...)
    at /home/adam/Minetest/minetest/src/map.cpp:2580
#3  0x00000000006e878b in EmergeThread::getBlockOrStartGen (this=this@entry=0x11c5a40, p=..., b=b@entry=0x7fffdb7fcbd8, 
    data=data@entry=0x7fffdb7fcc70, allow_gen=<optimized out>) at /home/adam/Minetest/minetest/src/emerge.cpp:478
#4  0x00000000006eb18e in EmergeThread::Thread (this=0x11c5a40) at /home/adam/Minetest/minetest/src/emerge.cpp:523
#5  0x00000000006004b4 in JThread::TheThread (param=0x11c5a40) at /home/adam/Minetest/minetest/src/jthread/pthread/jthread.cpp:203
#6  0x00007ffff69d5f8e in start_thread (arg=0x7fffdb7fd700) at pthread_create.c:311