From 8d6f6d29702ee74081fb0f9b858e1ea691a0f162 Mon Sep 17 00:00:00 2001
From: Adam <adambh@outlook.com>
Date: Fri, 3 Aug 2018 22:35:48 +0300
Subject: [PATCH] Implement GetPlayerName and misc

---
 .gitignore                        |  2 ++
 RagePawn/RagePawn.vcxproj         |  4 +++-
 RagePawn/RagePawn.vcxproj.filters | 10 ++++++++--
 RagePawn/natives.hpp              | 16 ----------------
 RagePawn/pawn.cpp                 | 12 +++++++-----
 RagePawn/pawn.hpp                 |  4 +++-
 RagePawn/player_natives.cpp       | 27 +++++++++++++++++++++++++++
 RagePawn/util_natives.cpp         | 13 +++++++++++++
 8 files changed, 63 insertions(+), 25 deletions(-)
 delete mode 100644 RagePawn/natives.hpp
 create mode 100644 RagePawn/player_natives.cpp
 create mode 100644 RagePawn/util_natives.cpp

diff --git a/.gitignore b/.gitignore
index 3e759b7..f95179b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -328,3 +328,5 @@ ASALocalRun/
 
 # MFractors (Xamarin productivity tool) working folder 
 .mfractor/
+
+api.hpp
\ No newline at end of file
diff --git a/RagePawn/RagePawn.vcxproj b/RagePawn/RagePawn.vcxproj
index 62f2ec7..ac2dd8c 100644
--- a/RagePawn/RagePawn.vcxproj
+++ b/RagePawn/RagePawn.vcxproj
@@ -159,14 +159,16 @@
   <ItemGroup>
     <ClCompile Include="format.cpp" />
     <ClCompile Include="main.cpp" />
+    <ClCompile Include="player_natives.cpp" />
     <ClCompile Include="pawn.cpp" />
+    <ClCompile Include="util_natives.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="api.hpp" />
     <ClInclude Include="callbacks.hpp" />
     <ClInclude Include="format.hpp" />
     <ClInclude Include="main.hpp" />
     <ClInclude Include="pawn.hpp" />
-    <ClInclude Include="natives.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\amxlib\amxlib.vcxproj">
diff --git a/RagePawn/RagePawn.vcxproj.filters b/RagePawn/RagePawn.vcxproj.filters
index 9419d89..28c28e4 100644
--- a/RagePawn/RagePawn.vcxproj.filters
+++ b/RagePawn/RagePawn.vcxproj.filters
@@ -23,6 +23,12 @@
     <ClCompile Include="format.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="player_natives.cpp">
+      <Filter>API</Filter>
+    </ClCompile>
+    <ClCompile Include="util_natives.cpp">
+      <Filter>API</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pawn.hpp">
@@ -37,8 +43,8 @@
     <ClInclude Include="callbacks.hpp">
       <Filter>API</Filter>
     </ClInclude>
-    <ClInclude Include="natives.hpp">
-      <Filter>API</Filter>
+    <ClInclude Include="api.hpp">
+      <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/RagePawn/natives.hpp b/RagePawn/natives.hpp
deleted file mode 100644
index aeaba16..0000000
--- a/RagePawn/natives.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-#include "main.hpp"
-#include "../amxlib/amx.h"
-#include "format.hpp"
-
-const AMX_NATIVE_INFO rage_Natives[] =
-{
-	{ "format", n_format },
-	{ NULL, NULL }
-};
-
-class natives 
-{
-	public:
-	
-};
diff --git a/RagePawn/pawn.cpp b/RagePawn/pawn.cpp
index 1d8a41f..a1fe892 100644
--- a/RagePawn/pawn.cpp
+++ b/RagePawn/pawn.cpp
@@ -8,13 +8,10 @@
 #pragma comment( lib, "winmm.lib")  // amx_TimeInit(&amx); 
 #pragma comment( lib, "ws2_32.lib")  // amx_DGramInit(&amx); 
 
-#include "natives.hpp"
 #include "callbacks.hpp"
 
 namespace fs = std::experimental::filesystem;
 
-// Discontinued Open Source support
-
 extern "C" {
 	int AMXEXPORT AMXAPI amx_ConsoleInit(AMX *amx);
 	int AMXEXPORT AMXAPI amx_ConsoleCleanup(AMX *amx);
@@ -38,6 +35,9 @@ extern "C" {
 	int AMXEXPORT AMXAPI amx_ArgsCleanup(AMX *amx);
 }
 
+int amx_playerInit(AMX *amx);
+int amx_utilInit(AMX *amx);
+
 Pawn::Pawn()
 {
 	std::cout << "Initializing RagePawn.." << std::endl;
@@ -83,7 +83,9 @@ void Pawn::RunAMX(const std::string& path, const bool fs)
 	amx_ProcessInit(&amx);
 	amx_ArgsInit(&amx);
 
-	amx_Register(&amx, rage_Natives, -1);
+	amx_utilInit(&amx);
+	amx_playerInit(&amx);
+	
 
 	//int count;
 	//amx_NumNatives(&amx, &count);
@@ -203,4 +205,4 @@ void Pawn::CallPublicEx(AMX *amx, const char *name, const char *fmt, ...)
 	va_end(args);
 
 	std::cout << "Finished callback..." << std::endl;
-}
\ No newline at end of file
+}
diff --git a/RagePawn/pawn.hpp b/RagePawn/pawn.hpp
index 8cd737d..f267cca 100644
--- a/RagePawn/pawn.hpp
+++ b/RagePawn/pawn.hpp
@@ -9,7 +9,7 @@ typedef struct {
 
 static std::vector<script> scripts;
 
-class Pawn
+class Pawn : public rage::IPlugin
 {
 	public:
 		Pawn();
@@ -26,6 +26,8 @@ class Pawn
 		static int TerminateLoad(const std::string& filename);
 		static int Terminate(int err);
 		static void TerminateScript(AMX *amx);
+
+		rage::IEntity *GetEntity(rage::entityId_t id, rage::entity_t type) const;
 			
 	private:
 		rage::IMultiplayer *m_mp;
diff --git a/RagePawn/player_natives.cpp b/RagePawn/player_natives.cpp
new file mode 100644
index 0000000..aaab512
--- /dev/null
+++ b/RagePawn/player_natives.cpp
@@ -0,0 +1,27 @@
+#include "main.hpp"
+#include "api.hpp"
+
+#define MAX_PLAYER_NAME 33
+
+// native GetPlayerName(playerid, const name[])
+// todo: different than on samp: native GetPlayerName(playerid, const name[], len)
+static cell AMX_NATIVE_CALL n_GetPlayerName(AMX *amx, const cell *params)
+{
+	HAS_PLAYER(player, (rage::entityId_t)params[1])
+	{
+		cell* addr = amx_Address(amx, params[2]);
+		amx_SetString(addr, player->GetName().c_str(), 0, 0, MAX_PLAYER_NAME);
+	}
+	return 0;
+}
+
+AMX_NATIVE_INFO player_Natives[] =
+{
+	{ "GetPlayerName", n_GetPlayerName },
+	{ NULL, NULL }
+};
+
+int amx_playerInit(AMX *amx)
+{
+	return amx_Register(amx, player_Natives, -1);
+}
\ No newline at end of file
diff --git a/RagePawn/util_natives.cpp b/RagePawn/util_natives.cpp
new file mode 100644
index 0000000..6010499
--- /dev/null
+++ b/RagePawn/util_natives.cpp
@@ -0,0 +1,13 @@
+#include "main.hpp"
+#include "format.hpp"
+
+AMX_NATIVE_INFO util_Natives[] =
+{
+	{ "format", n_format },
+	{ NULL, NULL }
+};
+
+int amx_utilInit(AMX *amx)
+{
+	return amx_Register(amx, util_Natives, -1);
+}
\ No newline at end of file