Merge branch 'master' of github.com:FacialTurd/PowderToypp

4 files changed, 31 insertions, 13 deletions

diff --git a/src/virtualmachine/Operations.cpp b/src/virtualmachine/Operations.cpp
index dcd2cb2..0c998a8 100644
--- a/src/virtualmachine/Operations.cpp
+++ b/src/virtualmachine/Operations.cpp
@@ -353,4 +353,4 @@ namespace vm
 		Push<int4_t>(Pop<float4_t>());
 		return 0;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/virtualmachine/Syscalls.cpp b/src/virtualmachine/Syscalls.cpp
index bc88fb2..876fe52 100644
--- a/src/virtualmachine/Syscalls.cpp
+++ b/src/virtualmachine/Syscalls.cpp
@@ -68,4 +68,19 @@ namespace vm
 	{
 		sim->part_change_type(ARG(0).int4, ARG(1).int4, ARG(2).int4, ARG(3).int4);
 	}
-}
\ No newline at end of file
+
+	TRAPDEF(pmapData)
+	{
+		Push<int4_t>(sim->pmap[ARG(1).int4][ARG(0).int4]);
+	}
+
+	TRAPDEF(deletePart)
+	{
+		sim->delete_part(ARG(0).int4, ARG(1).int4, ARG(2).int4);
+	}
+
+	TRAPDEF(killPart)
+	{
+		sim->kill_part(ARG(0).int4);
+	}
+}
diff --git a/src/virtualmachine/Syscalls.inl b/src/virtualmachine/Syscalls.inl
index 6338d11..75455c1 100644
--- a/src/virtualmachine/Syscalls.inl
+++ b/src/virtualmachine/Syscalls.inl
@@ -1,11 +1,14 @@
-TRAPDEF(-104, sin)
-TRAPDEF(-105, cos)
-TRAPDEF(-106, atan2)
-TRAPDEF(-107, sqrt)
-TRAPDEF(-108, floor)
-TRAPDEF(-109, ceil)
+TRAPDEF(-1, sin)
+TRAPDEF(-2, cos)
+TRAPDEF(-3, atan2)
+TRAPDEF(-4, sqrt)
+TRAPDEF(-5, floor)
+TRAPDEF(-6, ceil)
 
-TRAPDEF(-110, error)
-TRAPDEF(-111, print)
-TRAPDEF(-112, partCreate)
-TRAPDEF(-113, partChangeType)
\ No newline at end of file
+TRAPDEF(-7, error)
+TRAPDEF(-8, print)
+TRAPDEF(-9, partCreate)
+TRAPDEF(-10, partChangeType)
+TRAPDEF(-11, pmapData)
+TRAPDEF(-12, deletePart)
+TRAPDEF(-13, killPart)
diff --git a/src/virtualmachine/VirtualMachine.h b/src/virtualmachine/VirtualMachine.h
index 04dd400..b295d02 100644
--- a/src/virtualmachine/VirtualMachine.h
+++ b/src/virtualmachine/VirtualMachine.h
@@ -279,4 +279,4 @@ public:
 		};
 	};
 
-}
\ No newline at end of file
+}