Changeset 3562

Timestamp:

2012-07-04 18:29:51 (11 years ago)

Author:

dezhidki

Message:

Made player really go through the door, nor just spawn in the middle of the room when going through door

Location:

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame

Files:

• Player.cs (modified) (5 diffs)
• Room.cs (modified) (2 diffs)
• TheDungeonGame.cs (modified) (4 diffs)

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame/Player.cs

@@ -28 +28 @@
             keyboard = game.Keyboard;
             CanRotate = false;
-            currentRoom =  game.LevelGen.getRoomAt(game.LevelGen.CenterRoom);
             setupKeys();
         }
@@ -51 +50 @@
             {
                 room = game.LevelGen.getRoomAt(currentRoom.PosOnGrid + RoomDirection.getOffsetFromDir(RoomDirection.North));
-                game.moveToRoom(room);
+                game.moveToRoom(room, RoomDirection.North);
                 currentRoom = room;
             }else
@@ -57 +56 @@
                 {
                     room = game.LevelGen.getRoomAt(currentRoom.PosOnGrid + RoomDirection.getOffsetFromDir(RoomDirection.East));
-                    game.moveToRoom(room);
+                    game.moveToRoom(room, RoomDirection.East);
                     currentRoom = room;
                 }
@@ -64 +63 @@
                     {
                         room = game.LevelGen.getRoomAt(currentRoom.PosOnGrid + RoomDirection.getOffsetFromDir(RoomDirection.South));
-                        game.moveToRoom(room);
+                        game.moveToRoom(room, RoomDirection.South);
                         currentRoom = room;
                     }
@@ -71 +70 @@
                         {
                             room = game.LevelGen.getRoomAt(currentRoom.PosOnGrid + RoomDirection.getOffsetFromDir(RoomDirection.West));
-                            game.moveToRoom(room);
+                            game.moveToRoom(room, RoomDirection.West);
                             currentRoom = room;
                         }

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame/Room.cs

@@ -17 +17 @@
         private bool isBuilt = false;
         protected IPhysicsObject[,] insideObjects;
-        protected IPhysicsObject[] doors = new IPhysicsObject[4];
+        protected PhysicsObject[] doors = new PhysicsObject[4];
         protected double blockWidth, blockHeight;
         protected double insideWidth, insideHeight;
@@ -155 +155 @@
         }
 
+        public PhysicsObject getDoor(int dir)
+        {
+            PhysicsObject result = null;
+            for (int i = 0; i < doors.Length; i++ )
+            {
+                PhysicsObject door = doors[i];
+                if (door != null && (int)door.Tag == dir)
+                {
+                    result = door;
+                    return result;
+                }
+
+            }
+            return result;
+        }
+
         public void createBorders()
         {

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame/TheDungeonGame.cs

@@ -45 +45 @@
     }
 
-    public void moveToRoom(Room room)
+    public void moveToRoom(Room room, int dir)
     {
         currentPos = player.currentRoom.Position + new Vector(ROOMWIDTH / 2 + ROOMTHICKNESS / 2, -ROOMHEIGHT / 2 + ROOMTHICKNESS / 4);
         newPos = room.Position + new Vector(ROOMWIDTH / 2 + ROOMTHICKNESS / 2, -ROOMHEIGHT / 2 + ROOMTHICKNESS / 4);
         moveCameraTo(newPos - currentPos);
-        player.Position = generator.getRoomAt(room.PosOnGrid).Position + new Vector(ROOMWIDTH / 2, -ROOMHEIGHT / 2);
+        player.Position = player.currentRoom.getDoor(dir).Position + RoomDirection.getOffsetFromWorldDir(dir) * 130;
     }
 
@@ -64 +64 @@
         Camera.Velocity = cameraVelocity;
         Vector remainingLenght = Camera.Position - newPos;
-        // Console.WriteLine(Math.Abs(remainingLenght.X)+", " + Math.Abs(remainingLenght.Y));
         if (Math.Abs((int)remainingLenght.X) < 20 && Math.Abs((int)remainingLenght.Y) < 20)
         {
@@ -73 +72 @@
             moveCamera = false;
         }
-
     }
 
     private void setupPlayer()
     {
-        player.Position = generator.getRoomAt((int)(generator.CenterRoom.X), (int)(generator.CenterRoom.Y)).Position + new Vector(ROOMWIDTH / 2, -ROOMHEIGHT / 2);
+        player.Position = generator.getRoomAt(generator.CenterRoom).Position + new Vector(ROOMWIDTH / 2, -ROOMHEIGHT / 2);
+        player.currentRoom = generator.getRoomAt(generator.CenterRoom);
         Add(player, 1);
     }
@@ -88 +87 @@
         generator.generateRandomLevel(10, 15);
         generator.buildDungeon();
+        player.currentRoom = generator.getRoomAt(generator.CenterRoom);
     }