Added more monster patrol paths

blakserv/astar.h

@@ -0,0 +1,67 @@
+// Meridian 59, Copyright 1994-2012 Andrew Kirmse and Chris Kirmse.
+// All rights reserved.
+//
+// This software is distributed under a license that is described in
+// the LICENSE file that accompanies it.
+//
+// Meridian is a registered trademark.
+/*
+* astar.h:
+*/
+
+#ifndef _ASTAR_H
+#define _ASTAR_H
+
+#define CLOSEENOUGHDIST   3
+#define DESTBLOCKIGNORE   3
+#define ASTARENABLED      1
+
+#define LCHILD(x) (2 * x + 1)
+#define RCHILD(x) (2 * x + 2)
+#define PARENT(x) ((x-1) / 2)
+
+#define COST       1.0f
+#define COST_DIAG  ((float)M_SQRT2)
+
+typedef struct room_type room_type;
+typedef struct BspLeaf BspLeaf;
+typedef struct astar_node_data astar_node_data;
+typedef struct astar_node astar_node;
+
+typedef struct astar_node_data
+{
+   float       cost;
+   float       heuristic;
+   float       combined;
+   astar_node* parent;
+   astar_node* heapslot;
+   int         heapindex;
+   bool        isInClosedList;
+   bool        isBlocked;
+} astar_node_data;
+
+typedef struct astar_node
+{
+   int              Row;
+   int              Col;
+   V2               Location;
+   BspLeaf*         Leaf;
+   astar_node_data* Data;
+} astar_node;
+
+typedef struct astar
+{
+   astar_node_data* NodesData;
+   int              NodesDataSize;
+   astar_node**     Grid;
+   astar_node*      EndNode;
+   astar_node*      LastNode;
+   int              ObjectID;
+   int              HeapSize;
+} astar;
+
+void AStarGenerateGrid(room_type* Room);
+void AStarFreeGrid(room_type* Room);
+bool AStarGetStepTowards(room_type* Room, V2* S, V2* E, V2* P, unsigned int* Flags, int ObjectID);
+
+#endif /*#ifndef _ASTAR_H */

blakserv/blakserv.h

@@ -241,6 +241,8 @@ char * GetLastErrorStr();
 #include "stringinthash.h"
 #include "intstringhash.h"
 
+#include "geometry.h"
+
 #include "blakres.h"
 #include "channel.h"
 #include "kodbase.h"
@@ -257,6 +259,7 @@ char * GetLastErrorStr();
 #include "system.h"
 #include "loadrsc.h"
 #include "loadgame.h"
+#include "astar.h"
 #include "roofile.h"
 #include "roomdata.h"
 #include "files.h"

blakserv/blakserv.vcxproj

@@ -168,6 +168,7 @@ copy $(SolutionDir)bin\libcurl.dll $(SolutionDir)run\server</Command>
     <ClInclude Include="admincons.h" />
     <ClInclude Include="adminfn.h" />
     <ClInclude Include="apndfile.h" />
+    <ClInclude Include="astar.h" />
     <ClInclude Include="async.h" />
     <ClInclude Include="blakres.h" />
     <ClInclude Include="blakserv.h" />
@@ -242,6 +243,7 @@ copy $(SolutionDir)bin\libcurl.dll $(SolutionDir)run\server</Command>
     <ClCompile Include="admincons.c" />
     <ClCompile Include="adminfn.c" />
     <ClCompile Include="apndfile.c" />
+    <ClCompile Include="astar.c" />
     <ClCompile Include="async.c" />
     <ClCompile Include="blakres.c" />
     <ClCompile Include="block.c" />

blakserv/blakserv.vcxproj.filters

@@ -230,6 +230,9 @@
     <ClInclude Include="geometry.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="astar.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="account.c">
@@ -436,6 +439,9 @@
     <ClCompile Include="database.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="astar.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Image Include="logo.ico">

blakserv/ccode.c

@@ -2675,7 +2675,7 @@ int C_CanMoveInRoomBSP(int object_id, local_var_type *local_vars,
 	e.Y = GRIDCOORDTOROO(row_dest.v.data, finerow_dest.v.data);
 
 	Wall* blockWall;
-	ret_val.v.data = BSPCanMoveInRoom(&r->data, &s, &e, objectid.v.data, (move_outside_bsp.v.data != 0), &blockWall);
+	ret_val.v.data = BSPCanMoveInRoom(&r->data, &s, &e, objectid.v.data, (move_outside_bsp.v.data != 0), &blockWall, false);
 
 #if DEBUGMOVE
 	//dprintf("MOVE:%i R:%i S:(%1.2f/%1.2f) E:(%1.2f/%1.2f)", ret_val.v.data, r->data.roomdata_id, s.X, s.Y, e.X, e.Y);

blakserv/makefile

@@ -91,7 +91,8 @@ OBJS =  \
     $(OUTDIR)\files.obj \
     $(OUTDIR)\sprocket.obj \
     $(OUTDIR)\database.obj \
-
+    $(OUTDIR)\astar.obj \
+
 all : makedirs $(OUTDIR)\blakserv.exe
 
 $(OUTDIR)\rscload.obj : $(TOPDIR)\util\rscload.c

blakserv/memory.c

@@ -247,7 +247,7 @@ const char *memory_stat_names[] =
 		"Systimer", "Nameid",
 		"Class", "Message", "Object",
 		"List", "Object properties",
-		"Configuration", "Rooms",
+		"Configuration", "Rooms", "Astar",
 		"Admin constants", "Buffers", "Game loading",
 		"Tables", "Socket blocks", "Game saving",
 

blakserv/memory.h

@@ -21,7 +21,7 @@ enum
    MALLOC_ID_SYSTIMER, MALLOC_ID_NAMEID,
    MALLOC_ID_CLASS, MALLOC_ID_MESSAGE, MALLOC_ID_OBJECT,
    MALLOC_ID_LIST, MALLOC_ID_OBJECT_PROPERTIES,
-   MALLOC_ID_CONFIG, MALLOC_ID_ROOM,
+   MALLOC_ID_CONFIG, MALLOC_ID_ROOM, MALLOC_ID_ASTAR,
    MALLOC_ID_ADMIN_CONSTANTS, MALLOC_ID_BUFFER, MALLOC_ID_LOAD_GAME,
    MALLOC_ID_TABLE, MALLOC_ID_BLOCK, MALLOC_ID_SAVE_GAME,