Update WazeGPS.inc - Fixers and remove YSI

Author: devbluen

WazeGPS.inc

@@ -10,7 +10,7 @@
 
 
 #if !defined _gps_included
-    #error You need to include the GPS plugin before this: https://github.com/kristoisberg/samp-gps-plugin/releases
+	#include <GPS>
 #endif
 
 #if defined include_waze_gps
@@ -23,49 +23,47 @@
 #define 	MAX_WAZE_DOTS 			(100)
 #define 	WAZE_UPDATE_TIME 		(3100)
 
-			// Includes
-#include <YSI_Coding\y_hooks>
-#include <YSI_Data\y_iterate>
-
 			// Forrwards
 forward UpdateWaze(playerid, Float:X, Float:Y, Float:Z);
 forward OnPlayerWazeRouters(Path:pathid, playerid);
 
 static enum WAZEGPS_ENUM {
 	wazeGPS_Timer,
 	wazeGPS_Color,
+	wazeGPS_Count,
+
+	// Rotas
+	bool:wazeGPS_Created[MAX_WAZE_DOTS],
     wazeGPS_Routes[MAX_WAZE_DOTS],
 
 	Float:wazeGPS_Position[3],
 	Float:wazeGPS_TickPosition[3]
 };
 
 static 
-    Iterator:wazePointers[MAX_PLAYERS]<MAX_WAZE_DOTS>,
-    wazeGPS[MAX_PLAYERS][WAZEGPS_ENUM];
+	wazeGPS[MAX_PLAYERS][WAZEGPS_ENUM];
 
-hook OnPlayerDisconnect(playerid, reason) {
-	
-    WazeGPS_Reset(playerid);
-	return Y_HOOKS_CONTINUE_RETURN_1;
-}
+public OnPlayerDisconnect(playerid, reason) {
 
-hook OnPlayerStateChange(playerid, newstate, oldstate) {
+	WazeGPS_Reset(playerid);
 
-	switch(newstate) 
-    {
-		case PLAYER_STATE_PASSENGER:
-		{
-			foreach(new i: VehicleOccupant[GetPlayerVehicleID(playerid)]) {
-				if(GetPlayerState(i) != PLAYER_STATE_DRIVER) continue;
-				SetPlayerWaze(playerid, wazeGPS[playerid][wazeGPS_Position][0], wazeGPS[playerid][wazeGPS_Position][1], wazeGPS[playerid][wazeGPS_Position][2], wazeGPS[playerid][wazeGPS_Color]);
-				break;
-			}
-		}
-	}
-	return true;
+    #if defined alsOnPlayerDisconnect
+        alsOnPlayerDisconnect(playerid, reason);
+    #else
+   	 	return true;
+	#endif
 }
 
+#if defined _ALS_OnPlayerDisconnect
+    #undef OnPlayerDisconnect
+#else
+    #define _ALS_OnPlayerDisconnect
+#endif
+#define OnPlayerDisconnect alsOnPlayerDisconnect
+#if defined alsOnPlayerDisconnect
+    forward alsOnPlayerDisconnect(playerid, reason);
+#endif
+
 
 
 /*
@@ -85,13 +83,17 @@ public UpdateWaze(playerid, Float:X, Float:Y, Float:Z) {
 	if(GetPlayerInterior(playerid) != 0) 
 		return StopWazeGPS(playerid);
 	
-	if(IsPlayerInRangeOfPoint(playerid, 30.0, wazeGPS[playerid][wazeGPS_TickPosition][0], wazeGPS[playerid][wazeGPS_TickPosition][1], wazeGPS[playerid][wazeGPS_TickPosition][2])) 
-        return true;		// Prevent Lags
+	if(IsPlayerInRangeOfPoint(playerid, 30.0, wazeGPS[playerid][wazeGPS_Position][0], wazeGPS[playerid][wazeGPS_Position][1], wazeGPS[playerid][wazeGPS_Position][2])) {
+		StopWazeGPS(playerid);
+	    return true;		// Prevent Lags
+	}
 
 	new
 		MapNode:start,
 		MapNode:target;
 
+	DestroyWazeRoutesGPS(playerid);
+
 	GetPlayerPos(playerid, wazeGPS[playerid][wazeGPS_TickPosition][0], wazeGPS[playerid][wazeGPS_TickPosition][1], wazeGPS[playerid][wazeGPS_TickPosition][2]);
     if(GetClosestMapNodeToPoint(wazeGPS[playerid][wazeGPS_TickPosition][0], wazeGPS[playerid][wazeGPS_TickPosition][1], wazeGPS[playerid][wazeGPS_TickPosition][2], start) != 0) return true;
     if(GetClosestMapNodeToPoint(X, Y, Z, target)) return true;
@@ -103,26 +105,21 @@ public OnPlayerWazeRouters(Path:pathid, playerid) {
     if(!IsValidPath(pathid)) return true;
 	if(!wazeGPS[playerid][wazeGPS_Timer]) return true;
 
-    DestroyWazeRoutesGPS(playerid);
-
-	new 
-		Float:length,
-		size;
-	
+	new size;
 	GetPathSize(pathid, size);
-	GetPathLength(pathid, length);
-
-	if(size == 1) 
-        return StopWazeGPS(playerid);
+	if(size == 1) return StopWazeGPS(playerid);
 	
 	new 
 		MapNode:nodeid,
 		Float:x,
 		Float:y,
 		Float:z,
+		Float:length,
 		index;
 
 	GetPlayerPos(playerid, x, y, z);
+
+	GetPathLength(pathid, length);
 	GetClosestMapNodeToPoint(x, y, z, nodeid);
 	GetMapNodePos(nodeid, x, y, z);
 
@@ -140,8 +137,9 @@ public OnPlayerWazeRouters(Path:pathid, playerid) {
 		GetMapNodePos(nodeid, X, Y, Z);
 
 		if(i == index) 
-			CreateWazePointer(playerid, x, y, X, Y, wazeGPS[playerid][wazeGPS_Color]);
-
+			if(!CreateWazePointer(playerid, x, y, X, Y, wazeGPS[playerid][wazeGPS_Color]))
+				break;
+	
 		x = X + 0.5;
 		y = Y + 0.5;
 	}
@@ -162,19 +160,18 @@ public OnPlayerWazeRouters(Path:pathid, playerid) {
 
 */
 
-static stock Float:GDBP(Float:X, Float:Y, Float:Z, Float:PointX, Float:PointY, Float:PointZ) 
-    return (floatsqroot(floatadd(floatadd(floatpower(floatsub(X, PointX), 2.0), floatpower(floatsub(Y, PointY), 2.0)), floatpower(floatsub(Z, PointZ), 2.0))));
+static stock Float:GDBP(Float:X, Float:Y, Float:Z, Float: PointX, Float: PointY, Float: PointZ) 
+	return floatsqroot(floatadd(floatadd(floatpower(floatsub(X, PointX), 2.0), floatpower(floatsub(Y, PointY), 2.0)), floatpower(floatsub(Z, PointZ), 2.0)));
 
 stock IsValidWazeGPS(playerid) 
 	return (wazeGPS[playerid][wazeGPS_Timer] <= 0 ? (false) : (true));
 
 static stock WazeGPS_Reset(playerid) {
 
     StopWazeGPS(playerid);
-    Iter_Clear(wazePointers[playerid]);
 
-	new dsada[WAZEGPS_ENUM];
-	wazeGPS[playerid] = dsada;
+	static const e_Clear[WAZEGPS_ENUM];
+	wazeGPS[playerid] = e_Clear;
 }
 
 stock SetPlayerWaze(playerid, Float:x, Float:y, Float:z, color = 0x8A44E4FF) {
@@ -204,38 +201,41 @@ stock StopWazeGPS(playerid) {
 
 static stock DestroyWazeRoutesGPS(playerid) {
 
-    foreach(new i: wazePointers[playerid]) {
-        GangZoneDestroy(wazeGPS[playerid][wazeGPS_Routes][i]);
-        Iter_Remove(wazePointers[playerid], i);
-    }
+	for(new i = 0; i < wazeGPS[playerid][wazeGPS_Count]; i++) {
+		if(!wazeGPS[playerid][wazeGPS_Created][i]) continue;
+
+		wazeGPS[playerid][wazeGPS_Created][i] = false;
+		GangZoneDestroy(wazeGPS[playerid][wazeGPS_Routes][i]);
+	}
+
+	wazeGPS[playerid][wazeGPS_Count] = 0;
 }
 
 static stock CreateWazePointer(playerid, Float:X1, Float:Y1, Float:X2, Float:Y2, color) {
 
 	new 
         Float:Dis = 12.5,
-        Float:x, Float:y,
-		Points = floatround(GDBP(X1, Y1, 0.0, X2, Y2, 0.0) / Dis);
+        Float:x, 
+		Float:y,
+		Float:GDPointers = GDBP(X1, Y1, 0.0, X2, Y2, 0.0),
+		Points = floatround(GDPointers / Dis),
+		index;
 
 	for(new i = 1; i <= Points; i++) {
 
-        switch(i) {
-            case 0: {
-                x = X1;
-			    y = Y1;
-            }
-            default: {
-                x = X1 + (((X2 - X1) / Points) * i);
-			    y = Y1 + (((Y2 - Y1) / Points) * i);
-            }
-        }
-
-        new index = Iter_Free(wazePointers[playerid]);
-        if(index == -1) break;
-
-        wazeGPS[playerid][wazeGPS_Routes][index] = GangZoneCreate(x - (Dis / 2)-  5, y - (Dis / 2) - 5, x + (Dis / 2) + 5, y + (Dis / 2) + 5); 
+		index = wazeGPS[playerid][wazeGPS_Count];
+
+		if(index >= MAX_WAZE_DOTS) 
+			return false;
+		
+        x = X1 + (((X2 - X1) / Points) * i);
+		y = Y1 + (((Y2 - Y1) / Points) * i);
+
+		wazeGPS[playerid][wazeGPS_Created][index] = true;
+        wazeGPS[playerid][wazeGPS_Routes][index] = GangZoneCreate(x-(Dis/2)-5, y-(Dis/2)-5, x+(Dis/2)+5, y+(Dis/2)+5); 
 		GangZoneShowForPlayer(playerid, wazeGPS[playerid][wazeGPS_Routes][index], color);
 
-        Iter_Add(wazePointers[playerid], index);
+		wazeGPS[playerid][wazeGPS_Count]++;
 	}
+	return true;
 }