From c8e6ab3876f5e9ed2def31eac35c1e00de509233 Mon Sep 17 00:00:00 2001
From: Matthias Braun <matze@braunis.de>
Date: Sun, 22 Jan 2006 18:50:02 +0000
Subject: [PATCH] scripted objects correctly slide now

SVN-Revision: 3025
---
 data/images/engine/editor/scriptedobject.xcf | Bin 0 -> 4359 bytes
 data/levels/test/default.nut                 |   2 ++
 data/levels/world1/default.nut               |   4 +++-
 data/levels/world2/dfk-level2.stl            |   2 +-
 data/levels/world2/level6.stl                |   2 +-
 src/object/scripted_object.cpp               |  21 ++++++++++++++++++---
 6 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 data/images/engine/editor/scriptedobject.xcf

diff --git a/data/images/engine/editor/scriptedobject.xcf b/data/images/engine/editor/scriptedobject.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..6e5bf84d688fd3437e72a5f19078dab4a97ee3d5
GIT binary patch
literal 4359
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
N{Wl8jf;OBb<R3Cdwr2nU

literal 0
HcmV?d00001

diff --git a/data/levels/test/default.nut b/data/levels/test/default.nut
index 0358733ff..8555cbb0e 100644
--- a/data/levels/test/default.nut
+++ b/data/levels/test/default.nut
@@ -16,6 +16,8 @@ function intro()
   wait(5);
   Text.fade_out(2);	 
   wait(4);
+
+  wait(20);
   Level.finish();
 }
 
diff --git a/data/levels/world1/default.nut b/data/levels/world1/default.nut
index 335649ceb..3ac999106 100644
--- a/data/levels/world1/default.nut
+++ b/data/levels/world1/default.nut
@@ -37,7 +37,9 @@ function intro()
 
   wait(1)
   NOLOK.set_velocity(-120, 700);
-  wait(2);
+  wait(1.2);
+  NOLOK.set_velocity(0, 0);
+  wait(1);
 
 // nolok casts his spell...
   NOLOK.set_action("throw");
diff --git a/data/levels/world2/dfk-level2.stl b/data/levels/world2/dfk-level2.stl
index 4c5337c49..f72124074 100644
--- a/data/levels/world2/dfk-level2.stl
+++ b/data/levels/world2/dfk-level2.stl
@@ -756,7 +756,7 @@
     )
 
        (background
-         (image "images/background/images/background/arctis_dark.jpg")
+         (image "images/background/arctis_dark.jpg")
          (speed 1.000000)
        )
        (spawnpoint (name "main") (x 448) (y 2976))
diff --git a/data/levels/world2/level6.stl b/data/levels/world2/level6.stl
index 4c9f4dff1..b3b6b71a0 100644
--- a/data/levels/world2/level6.stl
+++ b/data/levels/world2/level6.stl
@@ -942,7 +942,7 @@
 
        (spawnpoint (name "main") (x 64) (y 9536))
        (background
-         (image "images/background/images/background/forest1.jpg")
+         (image "images/background/forest1.jpg")
          (speed 1.000000)
        )
        (poisonivy (x 1349) (y 8844))
diff --git a/src/object/scripted_object.cpp b/src/object/scripted_object.cpp
index b9378fde5..53ef31715 100644
--- a/src/object/scripted_object.cpp
+++ b/src/object/scripted_object.cpp
@@ -1,6 +1,7 @@
 #include <config.h>
 
 #include <stdexcept>
+#include <math.h>
 
 #include "scripted_object.hpp"
 #include "video/drawing_context.hpp"
@@ -140,7 +141,7 @@ ScriptedObject::draw(DrawingContext& context)
 }
 
 HitResponse
-ScriptedObject::collision(GameObject& other, const CollisionHit& )
+ScriptedObject::collision(GameObject& other, const CollisionHit& hit)
 {
   if(!physic_enabled)
     return FORCE_MOVE;
@@ -148,8 +149,22 @@ ScriptedObject::collision(GameObject& other, const CollisionHit& )
   if(!(other.get_flags() & FLAG_SOLID))
     return FORCE_MOVE;
 
-  physic.set_velocity(0, 0);
-  return CONTINUE;
+  if(other.get_flags() & FLAG_SOLID) {
+    if(hit.normal.y < 0) { // landed on floor
+      if(physic.get_velocity_y() < 0)
+        physic.set_velocity_y(0);
+    } else if(hit.normal.y > 0) { // bumped against roof
+      physic.set_velocity_y(.1);
+    }
+
+    if(fabsf(hit.normal.x) > .9) { // hit on side?
+      physic.set_velocity_x(0);
+    }
+        
+    return CONTINUE;
+  }
+
+  return FORCE_MOVE;
 }
 
 IMPLEMENT_FACTORY(ScriptedObject, "scriptedobject");
-- 
2.11.0