Unfinished npc object thingy

samp-npcs/NPC.cpp

@@ -0,0 +1 @@
+#include "NPC.h"

samp-npcs/NPC.h

@@ -0,0 +1,7 @@
+#pragma once
+class NPC
+{
+public:
+	virtual void Update() = 0;
+};
+

samp-npcs/NPCManager.cpp

@@ -0,0 +1,13 @@
+#include "NPCManager.h"
+
+NPCZone::NPCZone(float radius) {
+	this->radius = radius;
+}
+
+NPCZone::~NPCZone() {
+
+}
+
+void NPCZone::Update() {
+	this->npcs.push_back(new NPCVehicle());
+}

samp-npcs/NPCManager.h

@@ -0,0 +1,23 @@
+#pragma once
+#include <vector>
+#include "NPC.h"
+#include "NPCVehicle.h"
+
+#define SPAWN_RADIUS 300
+#define DESPAWN_RADIUS SPAWN_RADIUS + 100
+
+class NPCManager
+{
+
+};
+
+class NPCZone {
+public:
+	NPCZone(float radius);
+	~NPCZone();
+	void Update();
+
+private:
+	float radius;
+	std::vector<NPC*> npcs;
+};

samp-npcs/NPCVehicle.cpp

@@ -0,0 +1,13 @@
+#include "NPCVehicle.h"
+
+NPCVehicle::NPCVehicle() {
+
+}
+
+NPCVehicle::~NPCVehicle() {
+
+}
+
+void NPCVehicle::Update() {
+
+}

samp-npcs/NPCVehicle.h

@@ -0,0 +1,11 @@
+#pragma once
+#include "NPC.h"
+
+class NPCVehicle : public NPC
+{
+public:
+	NPCVehicle();
+	~NPCVehicle();
+	void Update();
+};
+

samp-npcs/paths.cpp

@@ -97,7 +97,7 @@ void parseNode(FILE* file, PathNode* node) {
 	node->node = serializedNode.node;
 	node->width = serializedNode.width;
 	node->flood_fill = serializedNode.flood_fill;
-	node->flags = serializedNode.flags;
+	node->flags = *(NodeFlags*)&serializedNode.flags;
 }
 
 void parseNav(FILE* file, NavNode* node) {
@@ -109,7 +109,7 @@ void parseNav(FILE* file, NavNode* node) {
 	node->node = serializedNode.node;
 	node->direction_x = serializedNode.direction_x / 100.f;
 	node->direction_y = serializedNode.direction_y / 100.f;
-	node->flags = serializedNode.flags;
+	node->flags = *(NavNodeFlags*)&serializedNode.flags;
 }
 
 void parseLink(FILE* file, Link* link) {

samp-npcs/paths.h

@@ -6,6 +6,9 @@
 
 #define PATH "plugins/samp-npcs/Paths/"
 
+#define STATIC_ASSERT(E) typedef char __static_assert_[(E)?1:-1]
+#define EXPECT_SIZE(S,SIZE) STATIC_ASSERT(sizeof(S)==(SIZE))
+
 #pragma pack(push, 1)
 struct SerializedHeader {
 	unsigned int num_nodes;
@@ -49,6 +52,40 @@ struct SerializedIntersectionFlags {
 	bool road_cross : 1;
 	bool ped_traffic_light : 1;
 };
+
+struct NodeFlags {
+	unsigned char link_count : 4;
+	unsigned char traffic_level : 2;
+	unsigned char roadblocks : 1;
+	unsigned char boats : 1;
+	unsigned char emergency_vehicles_only : 1;
+	unsigned char _unknown_D : 1;
+	unsigned char _unknown_E : 1;
+	unsigned char _unknown_F : 1;
+	unsigned char not_highway : 1;
+	unsigned char highway : 1;
+	unsigned char _unknown_I : 1;
+	unsigned char _unknown_J : 1;
+	unsigned char spawn_probability : 4;
+	unsigned char _unknown_roadblock_O : 1;
+	unsigned char parking : 1;
+	unsigned char _unknown_Q : 1;
+	unsigned char _unknown_R : 1;
+	unsigned char _unknown_S : 8;
+};
+EXPECT_SIZE(NodeFlags, 4);
+
+struct NavNodeFlags {
+	unsigned int width : 8;
+	unsigned int num_left_lanes : 3;
+	unsigned int num_right_lanes : 3;
+	unsigned int traffic_lights_direction_behavior : 1;
+	unsigned int _unused_F : 1;
+	unsigned int traffic_lights_behavior : 2;
+	unsigned int train_crossing : 1;
+	unsigned int _unused_M : 13;
+};
+EXPECT_SIZE(NavNodeFlags, 4);
 #pragma pack(pop)
 
 struct PathNode {
@@ -57,14 +94,14 @@ struct PathNode {
 	unsigned short link, area, node;
 	unsigned char width;
 	unsigned char flood_fill;
-	unsigned int flags;
+	NodeFlags flags;
 };
 
 struct NavNode {
 	float position_x, position_y;
 	unsigned short area, node;
 	float direction_x, direction_y;
-	unsigned int flags;
+	NavNodeFlags flags;
 };
 
 struct Link : SerializedLink {};

samp-npcs/samp-npcs.vcxproj

@@ -20,12 +20,18 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp" />
+    <ClCompile Include="NPC.cpp" />
+    <ClCompile Include="NPCManager.cpp" />
+    <ClCompile Include="NPCVehicle.cpp" />
     <ClCompile Include="paths.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="DEFINE.def" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="NPC.h" />
+    <ClInclude Include="NPCManager.h" />
+    <ClInclude Include="NPCVehicle.h" />
     <ClInclude Include="paths.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">

samp-npcs/samp-npcs.vcxproj.filters

@@ -21,6 +21,15 @@
     <ClCompile Include="paths.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="NPCManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="NPCVehicle.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="NPC.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="DEFINE.def">
@@ -31,5 +40,14 @@
     <ClInclude Include="paths.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="NPCManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="NPCVehicle.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="NPC.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>