summaryrefslogtreecommitdiff
path: root/src/objects
diff options
context:
space:
mode:
authortomsmeding <tom.smeding@gmail.com>2016-12-30 09:38:02 +0100
committertomsmeding <tom.smeding@gmail.com>2016-12-30 09:38:02 +0100
commitf62f270de05ebe5a71ef2e66a1a0f54b4ed9dc61 (patch)
tree19957fe8bc0e0bccbce6c73fef6b6092ed705807 /src/objects
parentc8a110cdeca8c23b88d6908f0b06231847c9e722 (diff)
Working sprites and instance_create
Diffstat (limited to 'src/objects')
-rw-r--r--src/objects/obj_control.cpp1
-rw-r--r--src/objects/obj_hoi.cpp5
2 files changed, 4 insertions, 2 deletions
diff --git a/src/objects/obj_control.cpp b/src/objects/obj_control.cpp
index 19b8b40..8f1a84b 100644
--- a/src/objects/obj_control.cpp
+++ b/src/objects/obj_control.cpp
@@ -9,6 +9,7 @@ EVENT(create){
x=10;
y=240;
log("Control object wow!");
+ instance_create<obj_hoi>(20,20);
}
EVENT(step){
diff --git a/src/objects/obj_hoi.cpp b/src/objects/obj_hoi.cpp
index fe3c3f1..314b734 100644
--- a/src/objects/obj_hoi.cpp
+++ b/src/objects/obj_hoi.cpp
@@ -1,11 +1,12 @@
EVENT(create){
x=y=10;
+ sprite_index=spr_hoi;
}
EVENT(step){
x++;
}
-EVENT(draw){
+/*EVENT(draw){
draw_text(x,y,"yay!");
-}
+}*/