diff --git a/scripting/include/jse_tracker.inc b/scripting/include/jse_tracker.inc index cecb051..bf79838 100644 --- a/scripting/include/jse_tracker.inc +++ b/scripting/include/jse_tracker.inc @@ -35,10 +35,10 @@ public void __pl_jse_tracker_SetNTVOptional() MarkNativeAsOptional("ControlPoint.iID.get"); MarkNativeAsOptional("ControlPoint.iID.set"); - MarkNativeAsOptional("ControlPoint.GetOrigin"); - MarkNativeAsOptional("ControlPoint.SetOrigin"); MarkNativeAsOptional("ControlPoint.fAngle.get"); MarkNativeAsOptional("ControlPoint.fAngle.set"); + MarkNativeAsOptional("ControlPoint.GetOrigin"); + MarkNativeAsOptional("ControlPoint.SetOrigin"); MarkNativeAsOptional("ControlPoint.GetIdentifier"); MarkNativeAsOptional("ControlPoint.SetIdentifier"); MarkNativeAsOptional("ControlPoint.Instance"); @@ -48,9 +48,9 @@ public void __pl_jse_tracker_SetNTVOptional() MarkNativeAsOptional("Course.iID.set"); MarkNativeAsOptional("Course.iNumber.get"); MarkNativeAsOptional("Course.iNumber.set"); - MarkNativeAsOptional("Course.Jumps.get"); - MarkNativeAsOptional("Course.ControlPoint.get"); - MarkNativeAsOptional("Course.ControlPoint.set"); + MarkNativeAsOptional("Course.hJumps.get"); + MarkNativeAsOptional("Course.mControlPoint.get"); + MarkNativeAsOptional("Course.mControlPoint.set"); MarkNativeAsOptional("Course.GetName"); MarkNativeAsOptional("Course.SetName"); MarkNativeAsOptional("Course.Instance"); @@ -93,13 +93,13 @@ methodmap Jump { public native set(float fAngle); } - public native void GetOrigin(float fOrigin[3]); - public native void SetOrigin(float fOrigin[3]); + public native void GetOrigin(float vecOrigin[3]); + public native void SetOrigin(float vecOrigin[3]); public native void GetIdentifier(char[] sIdentifier, int iLength); public native void SetIdentifier(char[] sIdentifier); public static native Jump Instance(); - public static native void Destroy(Jump iJump); + public static native void Destroy(Jump mJump); } methodmap ControlPoint { @@ -113,13 +113,13 @@ methodmap ControlPoint { public native set(float fAngle); } - public native void GetOrigin(float fOrigin[3]); - public native void SetOrigin(float fOrigin[3]); + public native void GetOrigin(float vecOrigin[3]); + public native void SetOrigin(float vecOrigin[3]); public native void GetIdentifier(char[] sIdentifier, int iLength); public native void SetIdentifier(char[] sIdentifier); public static native ControlPoint Instance(); - public static native void Destroy(ControlPoint iControlPoint); + public static native void Destroy(ControlPoint mControlPoint); } methodmap Course { @@ -137,16 +137,16 @@ methodmap Course { public native get(); } - property ControlPoint iControlPoint { + property ControlPoint mControlPoint { public native get(); - public native set(ControlPoint iControlPoint); + public native set(ControlPoint mControlPoint); } public native void GetName(char[] sName, int iLength); public native void SetName(char[] sName); public static native Course Instance(); - public static native void Destroy(Course iCourse); + public static native void Destroy(Course mCourse); } /* @@ -298,8 +298,8 @@ native void ResetPlayerProgress(int iClient, TFTeam iTeam=TFTeam_Unassigned, TFC typedef ProgressLookup = function void (int iClient, ArrayList hResult, int iResults, char[] sMapName, StringMap hCourseNames, StringMap hCourseLengths, any aData); native Course ResolveCourseNumber(int iCourseNumber); -native Jump ResolveJumpNumber(Course iCourse, int iJumpNumber); +native Jump ResolveJumpNumber(Course mCourse, int iJumpNumber); -native bool GetCourseDisplayName(Course iCourse, char[] sBuffer, int iMaxLen); -native bool GetCheckpointDisplayName(Course iCourse, int iJumpNumber, bool bControlPoint, char[] sBuffer, int iMaxLen); -native void GetCourseCheckpointDisplayName(Course iCourse, int iJumpNumber, bool bControlPoint, char[] sBuffer, int iMaxLen); +native bool GetCourseDisplayName(Course mCourse, char[] sBuffer, int iMaxLen); +native bool GetCheckpointDisplayName(Course mCourse, int iJumpNumber, bool bControlPoint, char[] sBuffer, int iMaxLen); +native void GetCourseCheckpointDisplayName(Course mCourse, int iJumpNumber, bool bControlPoint, char[] sBuffer, int iMaxLen); diff --git a/scripting/jse_autosave.sp b/scripting/jse_autosave.sp index 338c360..ed97f7b 100644 --- a/scripting/jse_autosave.sp +++ b/scripting/jse_autosave.sp @@ -3,7 +3,7 @@ #define DEBUG #define PLUGIN_AUTHOR "AI" -#define PLUGIN_VERSION "0.1.5" +#define PLUGIN_VERSION "0.1.6" #include #include @@ -203,18 +203,18 @@ bool CheckRespawnPopup(int iClient) { } void DrawCheckpointInfo(Panel hPanel, int iCourseNumber, int iJumpNumber, bool bControlPoint, int iTimestamp) { - Course iCourse = ResolveCourseNumber(iCourseNumber); - Jump iJump = ResolveJumpNumber(iCourse, iJumpNumber); + Course mCourse = ResolveCourseNumber(iCourseNumber); + Jump mJump = ResolveJumpNumber(mCourse, iJumpNumber); char sBuffer[1024]; - if (!GetCourseDisplayName(iCourse, sBuffer, sizeof(sBuffer))) { + if (!GetCourseDisplayName(mCourse, sBuffer, sizeof(sBuffer))) { Format(sBuffer, sizeof(sBuffer), "Course: %s%s", sBuffer, bControlPoint ? " (END)" : NULL_STRING); hPanel.DrawText(sBuffer); } - if (iJump) { - Format(sBuffer, sizeof(sBuffer), "Jump: %2d/%2d", iJump.iNumber, iCourse.hJumps.Length); + if (mJump) { + Format(sBuffer, sizeof(sBuffer), "Jump: %2d/%2d", mJump.iNumber, mCourse.hJumps.Length); hPanel.DrawText(sBuffer); } @@ -255,9 +255,9 @@ void SendToCheckpoint(int iClient) { int iJumpNumber = eCheckpoint.GetJumpNumber(); bool bControlPoint = eCheckpoint.IsControlPoint(); - Course iCourse = ResolveCourseNumber(iCourseNumber); - Jump iJump = ResolveJumpNumber(iCourse, iJumpNumber); - ControlPoint iControlPoint = iCourse.iControlPoint; + Course mCourse = ResolveCourseNumber(iCourseNumber); + Jump mJump = ResolveJumpNumber(mCourse, iJumpNumber); + ControlPoint mControlPoint = mCourse.mControlPoint; Call_StartForward(g_hAutosaveLoadForward); Call_PushCell(iClient); @@ -272,37 +272,37 @@ void SendToCheckpoint(int iClient) { return; } - float fPos[3], fAng[3], fVel[3]; + float vecPos[3], vecAng[3]; char sIdentifier[128]; - if (iJump) { - iJump.GetIdentifier(sIdentifier, sizeof(sIdentifier)); + if (mJump) { + mJump.GetIdentifier(sIdentifier, sizeof(sIdentifier)); if (sIdentifier[0]) { int iEntity = Entity_FindByName(sIdentifier, "info_*"); if (iEntity != INVALID_ENT_REFERENCE) { - Entity_GetAbsOrigin(iEntity, fPos); - fPos[2] += 10.0; // In case buried in ground + Entity_GetAbsOrigin(iEntity, vecPos); + vecPos[2] += 10.0; // In case buried in ground - Entity_GetAbsAngles(iEntity, fAng); + Entity_GetAbsAngles(iEntity, vecAng); } } else { - iJump.GetOrigin(fPos); + mJump.GetOrigin(vecPos); } } else { - iControlPoint.GetIdentifier(sIdentifier, sizeof(sIdentifier)); + mControlPoint.GetIdentifier(sIdentifier, sizeof(sIdentifier)); if (sIdentifier[0]) { int iEntity = Entity_FindByName(sIdentifier, "team_control_point"); if (iEntity != INVALID_ENT_REFERENCE) { - Entity_GetAbsOrigin(iEntity, fPos); - fPos[2] += 10.0; // In case buried in ground + Entity_GetAbsOrigin(iEntity, vecPos); + vecPos[2] += 10.0; // In case buried in ground - Entity_GetAbsAngles(iEntity, fAng); + Entity_GetAbsAngles(iEntity, vecAng); } } else { - iControlPoint.GetOrigin(fPos); + mControlPoint.GetOrigin(vecPos); } } - TeleportEntity(iClient, fPos, fAng, fVel); + TeleportEntity(iClient, vecPos, vecAng, {0.0, 0.0, 0.0}); CPrintToChat(iClient, "{dodgerblue}[jse] {white}Autosave loaded"); } @@ -444,18 +444,18 @@ void SendCourseListPanel(int iClient) { for (int i=0; i(TFTeam_Red)+i, j+1, iCourse.iID, iControlPoint.iID); + sAuthID, GetTrackerMapID(), view_as(TFTeam_Red)+i, j+1, mCourse.iID, mControlPoint.iID); } else { - Jump iJump = ResolveJumpNumber(iCourse, eCheckpoint.GetJumpNumber()); + Jump mJump = ResolveJumpNumber(mCourse, eCheckpoint.GetJumpNumber()); hDatabase.Format(sQuery, sizeof(sQuery), \ "INSERT INTO `jse_autosaves`(`auth`, `map_id`, `team`, `class`, `course_id`, `jump_id`)" @@ -222,7 +222,7 @@ int DB_BackupAutosaves_Client(Database hDatabase, Transaction hTxn, int iClient) ... "`course_id`=VALUES(`course_id`)," ... "`jump_id`=VALUES(`jump_id`)," ... "`controlpoint_id`=NULL", - sAuthID, GetTrackerMapID(), view_as(TFTeam_Red)+i, j+1, iCourse.iID, iJump.iID); + sAuthID, GetTrackerMapID(), view_as(TFTeam_Red)+i, j+1, mCourse.iID, mJump.iID); } hTxn.AddQuery(sQuery, GetClientSerial(iClient)); @@ -250,24 +250,24 @@ void DB_DeleteAutosave(int iClient, int iCourseNumber, int iJumpNumber, bool bCo return; } - Course iCourse = ResolveCourseNumber(iCourseNumber); + Course mCourse = ResolveCourseNumber(iCourseNumber); char sQuery[1024]; if (bControlPoint) { - ControlPoint iControlPoint = iCourse.iControlPoint; + ControlPoint mControlPoint = mCourse.mControlPoint; hDatabase.Format(sQuery, sizeof(sQuery), \ "DELETE FROM `jse_autosaves`" ... "WHERE `auth`=%s AND `map_id`=%d AND `team`=%d AND `class`=%d AND `course_id`=%d AND `controlpoint_id`=%d", - sAuthID, GetTrackerMapID(), iTeam, iClass, iCourse.iID, iControlPoint.iID); + sAuthID, GetTrackerMapID(), iTeam, iClass, mCourse.iID, mControlPoint.iID); } else { - Jump iJump = ResolveJumpNumber(iCourse, iJumpNumber); + Jump mJump = ResolveJumpNumber(mCourse, iJumpNumber); hDatabase.Format(sQuery, sizeof(sQuery), \ "DELETE FROM `jse_autosaves`" ... "WHERE `auth`=%s AND `map_id`=%d AND `team`=%d AND `class`=%d AND `course_id`=%d AND `jump_id`=%d", - sAuthID, GetTrackerMapID(), iTeam, iClass, iCourse.iID, iJump.iID); + sAuthID, GetTrackerMapID(), iTeam, iClass, mCourse.iID, mJump.iID); } hDatabase.Query(DB_Callback_DeleteAutosave, sQuery, GetClientSerial(iClient)); diff --git a/scripting/jse_teleport.sp b/scripting/jse_teleport.sp index 7a82c2a..5536e7c 100644 --- a/scripting/jse_teleport.sp +++ b/scripting/jse_teleport.sp @@ -3,7 +3,7 @@ #define DEBUG #define PLUGIN_AUTHOR "AI" -#define PLUGIN_VERSION "0.3.8" +#define PLUGIN_VERSION "0.3.9" #include #include @@ -53,35 +53,35 @@ public bool TraceFilter_Environment(int iEntity, int iMask) { // Helpers -void GetAimPos(int iClient, float fAimPos[3]) { - float fPos[3], fAng[3]; - GetClientEyePosition(iClient, fPos); - GetClientEyeAngles(iClient, fAng); +void GetAimPos(int iClient, float vecAimPos[3]) { + float vecPos[3], vecAng[3]; + GetClientEyePosition(iClient, vecPos); + GetClientEyeAngles(iClient, vecAng); - Handle hTr = TR_TraceRayFilterEx(fPos, fAng, MASK_SHOT_HULL, RayType_Infinite, TraceFilter_Environment); + Handle hTr = TR_TraceRayFilterEx(vecPos, vecAng, MASK_SHOT_HULL, RayType_Infinite, TraceFilter_Environment); if (TR_DidHit(hTr)) { - TR_GetEndPosition(fAimPos, hTr); + TR_GetEndPosition(vecAimPos, hTr); } delete hTr; } -void AdjustHullPos(int iTarget, float fSrcPos[3], float fAimPos[3]) { - float fMin[3], fMax[3]; - Entity_GetMinSize(iTarget, fMin); - Entity_GetMaxSize(iTarget, fMax); - Handle hTr = TR_TraceHullFilterEx(fSrcPos, fAimPos, fMin, fMax, MASK_SHOT_HULL, TraceFilter_Environment); +void AdjustHullPos(int iTarget, float vecSrcPos[3], float vecAimPos[3]) { + float vecMin[3], vecMax[3]; + Entity_GetMinSize(iTarget, vecMin); + Entity_GetMaxSize(iTarget, vecMax); + Handle hTr = TR_TraceHullFilterEx(vecSrcPos, vecAimPos, vecMin, vecMax, MASK_SHOT_HULL, TraceFilter_Environment); if (TR_DidHit(hTr)) { - TR_GetEndPosition(fAimPos, hTr); + TR_GetEndPosition(vecAimPos, hTr); } delete hTr; } -void BringPlayer(int iClient, int iTarget, float fPos[3], bool bNotify=true) { +void BringPlayer(int iClient, int iTarget, float vecPos[3], bool bNotify=true) { if (!IsClientInGame(iTarget)) { return; } - TeleportEntity(iTarget, fPos, NULL_VECTOR, view_as({0.0, 0.0, 0.0})); + TeleportEntity(iTarget, vecPos, NULL_VECTOR, {0.0, 0.0, 0.0}); if (bNotify) { CPrintToChat(iTarget, "{dodgerblue}[jse] {white}You have been teleported to {limegreen}%N{white}.", iClient); @@ -93,13 +93,13 @@ void GotoPlayer(int iClient, int iTarget, bool bNotify=true) { return; } - float fOrigin[3], fAngles[3]; - GetClientAbsOrigin(iTarget, fOrigin); - GetClientEyeAngles(iClient, fAngles); - fAngles[1] = 0.0; - fAngles[2] = 0.0; + float vecOrigin[3], vecAngles[3]; + GetClientAbsOrigin(iTarget, vecOrigin); + GetClientEyeAngles(iClient, vecAngles); + vecAngles[1] = 0.0; + vecAngles[2] = 0.0; - TeleportEntity(iClient, fOrigin, fAngles, view_as({0.0, 0.0, 0.0})); + TeleportEntity(iClient, vecOrigin, vecAngles, {0.0, 0.0, 0.0}); if (bNotify) { int iCourseNumber; @@ -107,10 +107,10 @@ void GotoPlayer(int iClient, int iTarget, bool bNotify=true) { bool bControlPoint; if (GetPlayerLastCheckpoint(iTarget, iCourseNumber, iJumpNumber, bControlPoint)) { - Course iCourse = ResolveCourseNumber(iCourseNumber); + Course mCourse = ResolveCourseNumber(iCourseNumber); char sBuffer[256]; - GetCourseCheckpointDisplayName(iCourse, iJumpNumber, bControlPoint, sBuffer, sizeof(sBuffer)); + GetCourseCheckpointDisplayName(mCourse, iJumpNumber, bControlPoint, sBuffer, sizeof(sBuffer)); CPrintToChat(iClient, "{dodgerblue}[jse] {white}You have been teleported to {limegreen}%N {white}on {yellow}%s{white}.", iTarget, sBuffer); } else { CPrintToChat(iClient, "{dodgerblue}[jse] {white}You have been teleported to {limegreen}%N{white}.", iTarget); @@ -120,40 +120,40 @@ void GotoPlayer(int iClient, int iTarget, bool bNotify=true) { } } -void GotoJump(int iClient, Course iCourse, int iJumpNumber, bool bNotify=true) { - Jump iJump = ResolveJumpNumber(iCourse, iJumpNumber); +void GotoJump(int iClient, Course mCourse, int iJumpNumber, bool bNotify=true) { + Jump mJump = ResolveJumpNumber(mCourse, iJumpNumber); - float fOrigin[3]; - iJump.GetOrigin(fOrigin); - fOrigin[2] += 10.0; + float vecOrigin[3]; + mJump.GetOrigin(vecOrigin); + vecOrigin[2] += 10.0; - float fAngles[3]; - GetClientAbsAngles(iClient, fAngles); - fAngles[1] = iJump.fAngle; + float vecAngles[3]; + GetClientAbsAngles(iClient, vecAngles); + vecAngles[1] = mJump.fAngle; - TeleportEntity(iClient, fOrigin, fAngles, view_as({0.0, 0.0, 0.0})); + TeleportEntity(iClient, vecOrigin, vecAngles, {0.0, 0.0, 0.0}); char sBuffer[256]; - GetCourseCheckpointDisplayName(iCourse, iJumpNumber, false, sBuffer, sizeof(sBuffer)); + GetCourseCheckpointDisplayName(mCourse, iJumpNumber, false, sBuffer, sizeof(sBuffer)); if (bNotify) { CPrintToChat(iClient, "{dodgerblue}[jse] {white}You have been teleported to {yellow}%s{white}.", sBuffer); } } -void GotoControlPoint(int iClient, Course iCourse, bool bNotify=true) { - float fOrigin[3]; - iCourse.iControlPoint.GetOrigin(fOrigin); - fOrigin[2] += 10.0; +void GotoControlPoint(int iClient, Course mCourse, bool bNotify=true) { + float vecOrigin[3]; + mCourse.mControlPoint.GetOrigin(vecOrigin); + vecOrigin[2] += 10.0; - float fAngles[3]; - GetClientAbsAngles(iClient, fAngles); - fAngles[1] = iCourse.iControlPoint.fAngle; + float vecAngles[3]; + GetClientAbsAngles(iClient, vecAngles); + vecAngles[1] = mCourse.mControlPoint.fAngle; - TeleportEntity(iClient, fOrigin, fAngles, view_as({0.0, 0.0, 0.0})); + TeleportEntity(iClient, vecOrigin, vecAngles, {0.0, 0.0, 0.0}); char sBuffer[256]; - GetCourseCheckpointDisplayName(iCourse, 0, true, sBuffer, sizeof(sBuffer)); + GetCourseCheckpointDisplayName(mCourse, 0, true, sBuffer, sizeof(sBuffer)); if (bNotify) { CPrintToChat(iClient, "{dodgerblue}[jse] {white}You have been teleported to {yellow}%s{white}.", sBuffer); @@ -260,15 +260,15 @@ public Action cmdBring(int iClient, int iArgC) { return Plugin_Handled; } - float fPos[3]; - GetClientEyePosition(iClient, fPos); + float vecPos[3]; + GetClientEyePosition(iClient, vecPos); - float fAimPos[3]; - GetAimPos(iClient, fAimPos); + float vecAimPos[3]; + GetAimPos(iClient, vecAimPos); for (int i = 0; i < iTargetCount; i++) { - AdjustHullPos(iTargetList[i], fPos, fAimPos); - BringPlayer(iClient, iTargetList[i], fAimPos, iTargetList[i] != iClient); + AdjustHullPos(iTargetList[i], vecPos, vecAimPos); + BringPlayer(iClient, iTargetList[i], vecAimPos, iTargetList[i] != iClient); } if (bTnIsML) { @@ -314,17 +314,17 @@ public Action cmdGoto(int iClient, int iArgC) { int iLastUpdateTime; if (GetPlayerLastCheckpoint(iTarget, iCourseNumber, iJumpNumber, bControlPoint, _, _, iLastUpdateTime) && GetTime()-iLastUpdateTime <= CHECKPOINT_TIME_CUTOFF) { - Course iCourse = ResolveCourseNumber(iCourseNumber); + Course mCourse = ResolveCourseNumber(iCourseNumber); if (bCanTeleToAllJumps || CheckProgress(iClient, iCourseNumber, iJumpNumber, bControlPoint)) { if (bControlPoint) { - GotoControlPoint(iClient, iCourse); + GotoControlPoint(iClient, mCourse); } else { - GotoJump(iClient, iCourse, iJumpNumber); + GotoJump(iClient, mCourse, iJumpNumber); } } else { char sBuffer[256]; - GetCourseCheckpointDisplayName(iCourse, iJumpNumber, bControlPoint, sBuffer, sizeof(sBuffer)); + GetCourseCheckpointDisplayName(mCourse, iJumpNumber, bControlPoint, sBuffer, sizeof(sBuffer)); CPrintToChat(iClient, "{dodgerblue}[jse] {white}You have not been to {limegreen}%N{white}'s location before: {yellow}%s{white}.", iTarget, sBuffer); } @@ -347,30 +347,30 @@ public Action cmdGoto(int iClient, int iArgC) { int iCourseNumber = StringToInt(sArg1); int iJumpNumber = StringToInt(sArg2); - Course iCourse = ResolveCourseNumber(iCourseNumber); - if (iCourse) { + Course mCourse = ResolveCourseNumber(iCourseNumber); + if (mCourse) { if (iJumpNumber == 0) { if (!bCanTeleToAllJumps && !CheckProgress(iClient, iCourseNumber, 0, true)) { char sBuffer[256]; - GetCourseCheckpointDisplayName(iCourse, iJumpNumber, true, sBuffer, sizeof(sBuffer)); + GetCourseCheckpointDisplayName(mCourse, iJumpNumber, true, sBuffer, sizeof(sBuffer)); CReplyToCommand(iClient, "{dodgerblue}[jse] {white}You have not yet finished {yellow}%s{white}.", sBuffer); return Plugin_Handled; } - GotoControlPoint(iClient, iCourse); + GotoControlPoint(iClient, mCourse); } else { - Jump iJump = ResolveJumpNumber(iCourse, iJumpNumber); - if (iJump) { + Jump mJump = ResolveJumpNumber(mCourse, iJumpNumber); + if (mJump) { if (!bCanTeleToAllJumps && !CheckProgress(iClient, iCourseNumber, iJumpNumber)) { char sBuffer[256]; - GetCourseCheckpointDisplayName(iCourse, iJumpNumber, false, sBuffer, sizeof(sBuffer)); + GetCourseCheckpointDisplayName(mCourse, iJumpNumber, false, sBuffer, sizeof(sBuffer)); CReplyToCommand(iClient, "{dodgerblue}[jse] {white}You have not yet reached {yellow}%s{white}.", sBuffer); return Plugin_Handled; } - GotoJump(iClient, iCourse, iJumpNumber); + GotoJump(iClient, mCourse, iJumpNumber); } else { CReplyToCommand(iClient, "{dodgerblue}[jse] {white}Cannot find specified jump number."); } @@ -433,8 +433,8 @@ public Action cmdSend(int iClient, int iArgC) { int iTarget = FindTarget(iClient, sArg2, false, true); if (iTarget != -1) { - float fPos[3]; - GetClientAbsOrigin(iTarget, fPos); + float vecPos[3]; + GetClientAbsOrigin(iTarget, vecPos); for (int i = 0; i < iTargetCount; i++) { if (iTargetList[i] == iTarget) { @@ -482,16 +482,16 @@ public Action cmdSend(int iClient, int iArgC) { int iCourseNumber = StringToInt(sArg2); int iJumpNumber = StringToInt(sArg3); - Course iCourse = ResolveCourseNumber(iCourseNumber); - if (iCourse) { + Course mCourse = ResolveCourseNumber(iCourseNumber); + if (mCourse) { char sBuffer[256]; if (iJumpNumber == 0) { for (int i = 0; i < iTargetCount; i++) { - GotoControlPoint(iTargetList[i], iCourse, iTargetList[i] != iClient); + GotoControlPoint(iTargetList[i], mCourse, iTargetList[i] != iClient); } - GetCourseCheckpointDisplayName(iCourse, 0, true, sBuffer, sizeof(sBuffer)); + GetCourseCheckpointDisplayName(mCourse, 0, true, sBuffer, sizeof(sBuffer)); if (bTnIsML) { CReplyToCommand(iClient, "{dodgerblue}[jse] {white}Teleported {limegreen}%t {white}to {yellow}%s{white}.", sTargetName, sBuffer); @@ -499,13 +499,13 @@ public Action cmdSend(int iClient, int iArgC) { CReplyToCommand(iClient, "{dodgerblue}[jse] {white}Teleported {limegreen}%s {white}to {yellow}%s{white}.", sTargetName, sBuffer); } } else { - Jump iJump = ResolveJumpNumber(iCourse, iJumpNumber); - if (iJump) { + Jump mJump = ResolveJumpNumber(mCourse, iJumpNumber); + if (mJump) { for (int i = 0; i < iTargetCount; i++) { - GotoJump(iTargetList[i], iCourse, iJumpNumber, iTargetList[i] != iClient); + GotoJump(iTargetList[i], mCourse, iJumpNumber, iTargetList[i] != iClient); } - GetCourseCheckpointDisplayName(iCourse, iJumpNumber, false, sBuffer, sizeof(sBuffer)); + GetCourseCheckpointDisplayName(mCourse, iJumpNumber, false, sBuffer, sizeof(sBuffer)); if (bTnIsML) { CReplyToCommand(iClient, "{dodgerblue}[jse] {white}Teleported {limegreen}%t {white}to {yellow}%s{white}.", sTargetName, sBuffer); @@ -609,8 +609,8 @@ void SendCourseMenu(int iClient, MenuHandler fnCourseHandler, MenuHandler fnJump if (bOverride) { for (int i=0; i=0; i--) { - Course iCourse = hBonusCourses.Get(i); - int iCourseNumber = iCourse.iNumber; + Course mCourse = hBonusCourses.Get(i); + int iCourseNumber = mCourse.iNumber; - GetCourseDisplayName(iCourse, sBuffer, sizeof(sBuffer)); + GetCourseDisplayName(mCourse, sBuffer, sizeof(sBuffer)); IntToString(iCourseNumber, sKey, sizeof(sKey)); hMenu.AddItem(sKey, sBuffer, hCourseNumbers.FindValue(iCourseNumber) == -1 ? ITEMDRAW_DISABLED : ITEMDRAW_DEFAULT); @@ -678,10 +678,10 @@ void SendCourseMenu(int iClient, MenuHandler fnCourseHandler, MenuHandler fnJump hMenu.Display(iClient, 0); } -void SendJumpMenu(int iClient, MenuHandler fnHandler, Course iCourse) { - int iCourseNumber = iCourse.iNumber; +void SendJumpMenu(int iClient, MenuHandler fnHandler, Course mCourse) { + int iCourseNumber = mCourse.iNumber; - ArrayList hJumps = iCourse.hJumps; + ArrayList hJumps = mCourse.hJumps; Menu hMenu = new Menu(fnHandler); hMenu.SetTitle("Select Jump"); @@ -694,7 +694,7 @@ void SendJumpMenu(int iClient, MenuHandler fnHandler, Course iCourse) { if (CheckCommandAccess(iClient, JUMPS_OVERRIDE, ADMFLAG_GENERIC)) { for (int i=1; i<=hJumps.Length; i++) { - GetCheckpointDisplayName(iCourse, i, false, sBuffer, sizeof(sBuffer)); + GetCheckpointDisplayName(mCourse, i, false, sBuffer, sizeof(sBuffer)); int iKey = (i & 0xFFFF) << 16 | iCourseNumber & 0xFFFF; IntToString(iKey, sKey, sizeof(sKey)); @@ -727,7 +727,7 @@ void SendJumpMenu(int iClient, MenuHandler fnHandler, Course iCourse) { delete hProgress; for (int i=1; i<=iFurthestJumpNumber; i++) { - GetCheckpointDisplayName(iCourse, i, false, sBuffer, sizeof(sBuffer)); + GetCheckpointDisplayName(mCourse, i, false, sBuffer, sizeof(sBuffer)); int iKey = (i & 0xFFFF) << 16 | iCourseNumber & 0xFFFF; @@ -737,7 +737,7 @@ void SendJumpMenu(int iClient, MenuHandler fnHandler, Course iCourse) { } if (bCompleted) { - GetCheckpointDisplayName(iCourse, 0, true, sBuffer, sizeof(sBuffer)); + GetCheckpointDisplayName(mCourse, 0, true, sBuffer, sizeof(sBuffer)); int iKey = iCourseNumber & 0xFFFF; IntToString(iKey, sKey, sizeof(sKey)); @@ -760,15 +760,15 @@ public int MenuHandler_BringPlayer(Menu hMenu, MenuAction iAction, int iClient, return 0; } - float fPos[3]; - GetClientEyePosition(iClient, fPos); + float vecPos[3]; + GetClientEyePosition(iClient, vecPos); - float fAimPos[3]; - GetAimPos(iClient, fAimPos); + float vecAimPos[3]; + GetAimPos(iClient, vecAimPos); - AdjustHullPos(iTarget, fPos, fAimPos); + AdjustHullPos(iTarget, vecPos, vecAimPos); - BringPlayer(iClient, iTarget, fAimPos); + BringPlayer(iClient, iTarget, vecAimPos); } case MenuAction_End: { @@ -817,17 +817,17 @@ public int MenuHandler_GotoPlayer(Menu hMenu, MenuAction iAction, int iClient, i int iLastUpdateTime; if (GetPlayerLastCheckpoint(iTarget, iCourseNumber, iJumpNumber, bControlPoint, _, _, iLastUpdateTime) && GetTime()-iLastUpdateTime <= CHECKPOINT_TIME_CUTOFF) { - Course iCourse = ResolveCourseNumber(iCourseNumber); + Course mCourse = ResolveCourseNumber(iCourseNumber); if (bCanTeleToAllJumps || CheckProgress(iClient, iCourseNumber, iJumpNumber, bControlPoint)) { if (bControlPoint) { - GotoControlPoint(iClient, iCourse); + GotoControlPoint(iClient, mCourse); } else { - GotoJump(iClient, iCourse, iJumpNumber); + GotoJump(iClient, mCourse, iJumpNumber); } } else { char sBuffer[256]; - GetCourseCheckpointDisplayName(iCourse, iJumpNumber, bControlPoint, sBuffer, sizeof(sBuffer)); + GetCourseCheckpointDisplayName(mCourse, iJumpNumber, bControlPoint, sBuffer, sizeof(sBuffer)); CPrintToChat(iClient, "{dodgerblue}[jse] {white}You have not been to {limegreen}%N{white}'s location before: {yellow}%s{white}.", iTarget, sBuffer); @@ -862,8 +862,8 @@ public int MenuHandler_GotoCourse(Menu hMenu, MenuAction iAction, int iClient, i char sKey[8]; hMenu.GetItem(iOption, sKey, sizeof(sKey)); - Course iCourse = ResolveCourseNumber(StringToInt(sKey)); - SendJumpMenu(iClient, MenuHandler_GotoJump, iCourse); + Course mCourse = ResolveCourseNumber(StringToInt(sKey)); + SendJumpMenu(iClient, MenuHandler_GotoJump, mCourse); } case MenuAction_Cancel: { @@ -892,13 +892,13 @@ public int MenuHandler_GotoJump(Menu hMenu, MenuAction iAction, int iClient, int iCourseNumber -= 65536; } - Course iCourse = ResolveCourseNumber(iCourseNumber); + Course mCourse = ResolveCourseNumber(iCourseNumber); int iJumpNumber = (iKey >> 16) & 0xFFFF; if (iJumpNumber) { - GotoJump(iClient, iCourse, iJumpNumber); + GotoJump(iClient, mCourse, iJumpNumber); } else { - GotoControlPoint(iClient, iCourse); + GotoControlPoint(iClient, mCourse); } } diff --git a/scripting/jse_tracker.sp b/scripting/jse_tracker.sp index d697117..63e3760 100644 --- a/scripting/jse_tracker.sp +++ b/scripting/jse_tracker.sp @@ -4,7 +4,7 @@ #define DEBUG #define PLUGIN_AUTHOR "AI" -#define PLUGIN_VERSION "0.5.0" +#define PLUGIN_VERSION "0.5.1" #define API_URL "https://api.jumpacademy.tf/mapinfo_json" @@ -31,12 +31,12 @@ #define NEGATIVE_INFINITY view_as(0xFF800000) enum struct CheckpointCache { - float fOrigin[3]; - Course iCourse; + float vecOrigin[3]; + Course mCourse; int iCourseNumber; - Jump iJump; + Jump mJump; int iJumpNumber; - ControlPoint iControlPoint; + ControlPoint mControlPoint; } GlobalForward g_hTrackerLoadedForward; @@ -71,7 +71,7 @@ float g_fTeleSettleTime; bool g_bPersist; bool g_bOctreeAvailable; -Octree g_iSpatialIdx; +Octree g_mSpatialIdx; #include "jse_tracker_database.sp" @@ -143,7 +143,7 @@ public void OnPluginEnd() { DB_BackupProgress(); if (g_bOctreeAvailable) { - Octree.Destroy(g_iSpatialIdx); + Octree.Destroy(g_mSpatialIdx); } } @@ -157,7 +157,7 @@ public void OnLibraryAdded(const char[] sName) { public void OnLibraryRemoved(const char[] sName) { if (StrEqual(sName, "octree")) { g_bOctreeAvailable = false; - g_iSpatialIdx = NULL_OCTREE; + g_mSpatialIdx = NULL_OCTREE; SetupCheckpointCache(); } } @@ -208,8 +208,8 @@ public void OnMapEnd() { } for (int i=0; i(g_hCourses.Get(i)); - Course.Destroy(iCourse); + Course mCourse = view_as(g_hCourses.Get(i)); + Course.Destroy(mCourse); } g_hCheckpointCache.Clear(); @@ -221,7 +221,7 @@ public void OnMapEnd() { delete g_hTimer; if (g_bOctreeAvailable) { - Octree.Destroy(g_iSpatialIdx); + Octree.Destroy(g_mSpatialIdx); } } @@ -363,11 +363,11 @@ public void HTTPRequestCallback_FetchedLayout(HTTPResponse hResponse, any aValue } int Sort_Courses(int iIdx1, int iIdx2, Handle hArr, Handle hHandle) { - Course iCourse1 = g_hCourses.Get(iIdx1); - Course iCourse2 = g_hCourses.Get(iIdx2); + Course mCourse1 = g_hCourses.Get(iIdx1); + Course mCourse2 = g_hCourses.Get(iIdx2); - int iCourseNumber1 = iCourse1.iNumber; - int iCourseNumber2 = iCourse2.iNumber; + int iCourseNumber1 = mCourse1.iNumber; + int iCourseNumber2 = mCourse2.iNumber; if (iCourseNumber1 > 0) { if (iCourseNumber2 > 0) { return iCourseNumber1-iCourseNumber2; @@ -664,26 +664,26 @@ public int Native_ResetPlayerProgress(Handle hPlugin, int iArgC) { public any Native_ResolveCourseNumber(Handle hPlugin, int iArgC) { int iCourseNumber = GetNativeCell(1); - Course iCourse = NULL_COURSE; + Course mCourse = NULL_COURSE; for (int i=0; i hJumps.Length) { + if (!mCourse || iJumpNumber <= 0 || iJumpNumber > hJumps.Length) { return view_as(NULL_JUMP); } @@ -691,13 +691,13 @@ public any Native_ResolveJumpNumber(Handle hPlugin, int iArgC) { } public int Native_GetCourseDisplayName(Handle hPlugin, int iArgC) { - Course iCourse = GetNativeCell(1); + Course mCourse = GetNativeCell(1); int iMaxLength = GetNativeCell(3); - int iCourseNumber = iCourse.iNumber; + int iCourseNumber = mCourse.iNumber; char sBuffer[128]; - iCourse.GetName(sBuffer, sizeof(sBuffer)); + mCourse.GetName(sBuffer, sizeof(sBuffer)); bool bCanHide = false; if (sBuffer[0]) { @@ -707,14 +707,14 @@ public int Native_GetCourseDisplayName(Handle hPlugin, int iArgC) { } else { if (iCourseNumber > 0) { if (g_iNormalCourses > 1) { - FormatEx(sBuffer, sizeof(sBuffer), "Course %d", iCourse.iNumber); + FormatEx(sBuffer, sizeof(sBuffer), "Course %d", mCourse.iNumber); } else { FormatEx(sBuffer, sizeof(sBuffer), "Course"); bCanHide = true; } } else { if (g_iBonusCourses > 1) { - FormatEx(sBuffer, sizeof(sBuffer), "Bonus %d", -iCourse.iNumber); + FormatEx(sBuffer, sizeof(sBuffer), "Bonus %d", -mCourse.iNumber); } else { FormatEx(sBuffer, sizeof(sBuffer), "Bonus"); } @@ -727,7 +727,7 @@ public int Native_GetCourseDisplayName(Handle hPlugin, int iArgC) { } public int Native_GetCheckpointDisplayName(Handle hPlugin, int iArgC) { - Course iCourse = GetNativeCell(1); + Course mCourse = GetNativeCell(1); int iJumpNumber = GetNativeCell(2); bool bControlPoint = GetNativeCell(3); int iMaxLength = GetNativeCell(5); @@ -738,7 +738,7 @@ public int Native_GetCheckpointDisplayName(Handle hPlugin, int iArgC) { if (bControlPoint) { FormatEx(sBuffer, sizeof(sBuffer), "End"); } else { - if (iCourse.hJumps.Length > 1) { + if (mCourse.hJumps.Length > 1) { FormatEx(sBuffer, sizeof(sBuffer), "Jump %d", iJumpNumber); } else { FormatEx(sBuffer, sizeof(sBuffer), "Jump"); @@ -752,7 +752,7 @@ public int Native_GetCheckpointDisplayName(Handle hPlugin, int iArgC) { } public int Native_GetCourseCheckpointDisplayName(Handle hPlugin, int iArgC) { - Course iCourse = GetNativeCell(1); + Course mCourse = GetNativeCell(1); int iJumpNumber = GetNativeCell(2); bool bControlPoint = GetNativeCell(3); int iMaxLength = GetNativeCell(5); @@ -760,10 +760,10 @@ public int Native_GetCourseCheckpointDisplayName(Handle hPlugin, int iArgC) { char sBuffer[256]; char sCourseName[128]; - bool bCanHideCourseName = GetCourseDisplayName(iCourse, sCourseName, sizeof(sCourseName)); + bool bCanHideCourseName = GetCourseDisplayName(mCourse, sCourseName, sizeof(sCourseName)); char sCheckpointName[128]; - bool bCanHideCheckpointName = GetCheckpointDisplayName(iCourse, iJumpNumber, bControlPoint, sCheckpointName, sizeof(sCheckpointName)); + bool bCanHideCheckpointName = GetCheckpointDisplayName(mCourse, iJumpNumber, bControlPoint, sCheckpointName, sizeof(sCheckpointName)); if (bControlPoint) { FormatEx(sBuffer, sizeof(sBuffer), "%s %s", sCourseName, sCheckpointName); @@ -800,12 +800,12 @@ public Action Timer_TrackPlayers(Handle hTimer, any aData) { int iTime = GetTime(); float fGameTime = GetGameTime(); - Course iActiveCourse[MAXPLAYERS + 1]; + Course mActiveCourse[MAXPLAYERS + 1]; static int iActiveClients[MAXPLAYERS+1]; int iActiveClientCount; - if (g_iSpatialIdx) { + if (g_mSpatialIdx) { ArrayList hCheckpoints = new ArrayList(sizeof(OctItem)); for (int i=1; i<=MaxClients; i++) { @@ -819,22 +819,22 @@ public Action Timer_TrackPlayers(Handle hTimer, any aData) { TFTeam iTeam = TF2_GetClientTeam(i); TFClassType iClass = TF2_GetPlayerClass(i); - float fPos[3]; - GetClientAbsOrigin(i, fPos); + float vecPos[3]; + GetClientAbsOrigin(i, vecPos); - int iCheckpoints = g_iSpatialIdx.Find(fPos, MAX_NEARBY_SEARCH_DISTANCE, hCheckpoints, true, true); + int iCheckpoints = g_mSpatialIdx.Find(vecPos, MAX_NEARBY_SEARCH_DISTANCE, hCheckpoints, true, true); for (int j=0; j fMax[0] ? fOrigin[0] : fMax[0]; - fMax[1] = fOrigin[1] > fMax[1] ? fOrigin[1] : fMax[1]; - fMax[2] = fOrigin[2] > fMax[2] ? fOrigin[2] : fMax[2]; + vecMax[0] = vecOrigin[0] > vecMax[0] ? vecOrigin[0] : vecMax[0]; + vecMax[1] = vecOrigin[1] > vecMax[1] ? vecOrigin[1] : vecMax[1]; + vecMax[2] = vecOrigin[2] > vecMax[2] ? vecOrigin[2] : vecMax[2]; } } - ControlPoint iControlPointItr = iCourseIter.iControlPoint; - if (iControlPointItr) { - iControlPointItr.GetOrigin(fOrigin); + ControlPoint mControlPointItr = mCourseIter.mControlPoint; + if (mControlPointItr) { + mControlPointItr.GetOrigin(vecOrigin); eCheckpoint.Init( iCourseNumber, @@ -1260,45 +1260,45 @@ void SetupCheckpointCache() { ); CheckpointCache eCheckpointCache; - eCheckpointCache.fOrigin = fOrigin; - eCheckpointCache.iCourse = iCourseIter; + eCheckpointCache.vecOrigin = vecOrigin; + eCheckpointCache.mCourse = mCourseIter; eCheckpointCache.iCourseNumber = iCourseNumber; - eCheckpointCache.iControlPoint = iControlPointItr; + eCheckpointCache.mControlPoint = mControlPointItr; g_hCheckpointCache.PushArray(eCheckpointCache); if (g_bOctreeAvailable) { - fMin[0] = fOrigin[0] < fMin[0] ? fOrigin[0] : fMin[0]; - fMin[1] = fOrigin[1] < fMin[1] ? fOrigin[1] : fMin[1]; - fMin[2] = fOrigin[2] < fMin[2] ? fOrigin[2] : fMin[2]; + vecMin[0] = vecOrigin[0] < vecMin[0] ? vecOrigin[0] : vecMin[0]; + vecMin[1] = vecOrigin[1] < vecMin[1] ? vecOrigin[1] : vecMin[1]; + vecMin[2] = vecOrigin[2] < vecMin[2] ? vecOrigin[2] : vecMin[2]; - fMax[0] = fOrigin[0] > fMax[0] ? fOrigin[0] : fMax[0]; - fMax[1] = fOrigin[1] > fMax[1] ? fOrigin[1] : fMax[1]; - fMax[2] = fOrigin[2] > fMax[2] ? fOrigin[2] : fMax[2]; + vecMax[0] = vecOrigin[0] > vecMax[0] ? vecOrigin[0] : vecMax[0]; + vecMax[1] = vecOrigin[1] > vecMax[1] ? vecOrigin[1] : vecMax[1]; + vecMax[2] = vecOrigin[2] > vecMax[2] ? vecOrigin[2] : vecMax[2]; } } } if (g_bOctreeAvailable) { - if (g_iSpatialIdx) { - Octree.Destroy(g_iSpatialIdx); + if (g_mSpatialIdx) { + Octree.Destroy(g_mSpatialIdx); } - float fCenter[3]; - AddVectors(fMin, fMax, fCenter); - ScaleVector(fCenter, 0.5); + float vecCenter[3]; + AddVectors(vecMin, vecMax, vecCenter); + ScaleVector(vecCenter, 0.5); - float fHalfWidth[3]; - SubtractVectors(fMax, fMin, fHalfWidth); - ScaleVector(fHalfWidth, 0.5); + float vecHalfWidth[3]; + SubtractVectors(vecMax, vecMin, vecHalfWidth); + ScaleVector(vecHalfWidth, 0.5); - float fMaxHalfWidth = fHalfWidth[0]; - fMaxHalfWidth = fHalfWidth[1] > fMaxHalfWidth ? fHalfWidth[1] : fMaxHalfWidth; - fMaxHalfWidth = fHalfWidth[2] > fMaxHalfWidth ? fHalfWidth[2] : fMaxHalfWidth; + float fMaxHalfWidth = vecHalfWidth[0]; + fMaxHalfWidth = vecHalfWidth[1] > fMaxHalfWidth ? vecHalfWidth[1] : fMaxHalfWidth; + fMaxHalfWidth = vecHalfWidth[2] > fMaxHalfWidth ? vecHalfWidth[2] : fMaxHalfWidth; fMaxHalfWidth += 50.0; // Prevents Octree out of bounds - g_iSpatialIdx = Octree.Instance(fCenter, fMaxHalfWidth, 3); + g_mSpatialIdx = Octree.Instance(vecCenter, fMaxHalfWidth, 3); // Insert all checkpoint positions into octree @@ -1314,7 +1314,7 @@ void SetupCheckpointCache() { TFClass_Unknown ); - g_iSpatialIdx.Insert(eCheckpointCache.fOrigin, eCheckpoint.iHash); + g_mSpatialIdx.Insert(eCheckpointCache.vecOrigin, eCheckpoint.iHash); } g_hCheckpointCache.Clear(); @@ -1356,10 +1356,10 @@ public Action cmdWhereAmI(int iClient, int iArgC) { Checkpoint eCheckpoint; eCheckpoint.iHash = g_eNearestCheckpointLanded[iClient].iHash; - Course iCourse = ResolveCourseNumber(eCheckpoint.GetCourseNumber()); + Course mCourse = ResolveCourseNumber(eCheckpoint.GetCourseNumber()); char sLocationName[256]; - GetCourseCheckpointDisplayName(iCourse, eCheckpoint.GetJumpNumber(), eCheckpoint.IsControlPoint(), sLocationName, sizeof(sLocationName)); + GetCourseCheckpointDisplayName(mCourse, eCheckpoint.GetJumpNumber(), eCheckpoint.IsControlPoint(), sLocationName, sizeof(sLocationName)); CReplyToCommand(iClient, "{dodgerblue}[jse] {white}You are on {yellow}%s{white}.", sLocationName); } else { @@ -1402,10 +1402,10 @@ public Action cmdWhereIs(int iClient, int iArgC) { Checkpoint eCheckpoint; eCheckpoint.iHash = g_eNearestCheckpointLanded[iTarget].iHash; - Course iCourse = ResolveCourseNumber(eCheckpoint.GetCourseNumber()); + Course mCourse = ResolveCourseNumber(eCheckpoint.GetCourseNumber()); char sLocationName[128]; - GetCourseCheckpointDisplayName(iCourse, eCheckpoint.GetJumpNumber(), eCheckpoint.IsControlPoint(), sLocationName, sizeof(sLocationName)); + GetCourseCheckpointDisplayName(mCourse, eCheckpoint.GetJumpNumber(), eCheckpoint.IsControlPoint(), sLocationName, sizeof(sLocationName)); CReplyToCommand(iClient, "{dodgerblue}[jse] {limegreen}%N {white}is on {yellow}%s{white}.", iTarget, sLocationName); } else { @@ -1431,10 +1431,10 @@ public Action cmdWhereIs(int iClient, int iArgC) { Checkpoint eCheckpoint; eCheckpoint.iHash = g_eNearestCheckpointLanded[iTarget].iHash; - Course iCourse = ResolveCourseNumber(eCheckpoint.GetCourseNumber()); + Course mCourse = ResolveCourseNumber(eCheckpoint.GetCourseNumber()); char sLocationName[128]; - GetCourseCheckpointDisplayName(iCourse, eCheckpoint.GetJumpNumber(), eCheckpoint.IsControlPoint(), sLocationName, sizeof(sLocationName)); + GetCourseCheckpointDisplayName(mCourse, eCheckpoint.GetJumpNumber(), eCheckpoint.IsControlPoint(), sLocationName, sizeof(sLocationName)); CReplyToCommand(iClient, "\t{limegreen}%N {white}is on {yellow}%s{white}.", iTarget, sLocationName); } else { @@ -1538,20 +1538,20 @@ public Action cmdProgress(int iClient, int iArgC) { StringMap hCourseLengths = new StringMap(); for (int i=0; i(iCourse)-1, eCourse, sizeof(_Course)); + hCourses.GetArray(iCourse, eCourse, sizeof(_Course)); ArrayList hJumpList = view_as(eCourse.hJumps); for (int i=0; i(iCourse)-1, 1, _Course::bGCFlag); + hCourses.Set(iCourse, 1, _Course::bGCFlag); } return 0; diff --git a/scripting/jse_tracker_database.sp b/scripting/jse_tracker_database.sp index 403fe42..a04f2a3 100644 --- a/scripting/jse_tracker_database.sp +++ b/scripting/jse_tracker_database.sp @@ -61,26 +61,26 @@ public void DB_Callback_LoadMapData(Database hDatabase, DBResultSet hResultSet, char sQuery[1024]; while (hResultSet.FetchRow()) { - Course iCourse = Course.Instance(); + Course mCourse = Course.Instance(); int iCourseID = hResultSet.FetchInt(0); - iCourse.iID = iCourseID; + mCourse.iID = iCourseID; int iCourseNumber = hResultSet.FetchInt(1); - iCourse.iNumber = iCourseNumber; + mCourse.iNumber = iCourseNumber; char sCourseName[128]; hResultSet.FetchString(2, sCourseName, sizeof(sCourseName)); - iCourse.SetName(sCourseName); + mCourse.SetName(sCourseName); hDatabase.Format(sQuery, sizeof(sQuery), "SELECT `id`, `identifier`, `x`, `y`, `z`, `a` FROM `jse_map_controlpoints` WHERE `course_id`=%d", iCourseID); - hTxn.AddQuery(sQuery, iCourse); + hTxn.AddQuery(sQuery, mCourse); hDatabase.Format(sQuery, sizeof(sQuery), "SELECT `id`, `jump`, `identifier`, `x`, `y`, `z`, `a` FROM `jse_map_jumps` WHERE `course_id`=%d", iCourseID); - hTxn.AddQuery(sQuery, iCourse); + hTxn.AddQuery(sQuery, mCourse); - g_hCourses.Push(iCourse); + g_hCourses.Push(mCourse); if (iCourseNumber <= 0) { g_iBonusCourses++; @@ -127,8 +127,8 @@ public void DB_Callback_AddMapInfo_Txn_Failure(Database hDatabase, any aData, in public void DB_Callback_LoadMapInfo_Txn_Success(Database hDatabase, any aData, int iNumQueries, DBResultSet[] hResults, any[] aQueryData) { char sIdentifier[128]; - float fOrigin[3]; - float fAngles[3]; + float vecOrigin[3]; + float vecAngles[3]; for (int i=0; i(aQueryData[i]); + Course mCourse = view_as(aQueryData[i]); char sCourseName[128]; - iCourse.GetName(sCourseName, sizeof(sCourseName)); + mCourse.GetName(sCourseName, sizeof(sCourseName)); - ControlPoint iControlPoint = ControlPoint.Instance(); - iControlPoint.iID = hResultSet.FetchInt(0); + ControlPoint mControlPoint = ControlPoint.Instance(); + mControlPoint.iID = hResultSet.FetchInt(0); - iCourse.iControlPoint = iControlPoint; + mCourse.mControlPoint = mControlPoint; if (hResults[i].IsFieldNull(1)) { - fOrigin[0] = float(hResultSet.FetchInt(2)); - fOrigin[1] = float(hResultSet.FetchInt(3)); - fOrigin[2] = float(hResultSet.FetchInt(4)); + vecOrigin[0] = float(hResultSet.FetchInt(2)); + vecOrigin[1] = float(hResultSet.FetchInt(3)); + vecOrigin[2] = float(hResultSet.FetchInt(4)); - iControlPoint.SetOrigin(fOrigin); - iControlPoint.fAngle = float(hResultSet.FetchInt(5)); + mControlPoint.SetOrigin(vecOrigin); + mControlPoint.fAngle = float(hResultSet.FetchInt(5)); } else { hResultSet.FetchString(1, sIdentifier, sizeof(sIdentifier)); - iControlPoint.SetIdentifier(sIdentifier); + mControlPoint.SetIdentifier(sIdentifier); int iEntity = Entity_FindByName(sIdentifier, "team_control_point"); if (iEntity != INVALID_ENT_REFERENCE) { - Entity_GetAbsOrigin(iEntity, fOrigin); - Entity_GetAbsAngles(iEntity, fAngles); - fOrigin[2] += 10.0; // In case buried in ground - iControlPoint.SetOrigin(fOrigin); - iControlPoint.fAngle = fAngles[1]; + Entity_GetAbsOrigin(iEntity, vecOrigin); + Entity_GetAbsAngles(iEntity, vecAngles); + vecOrigin[2] += 10.0; // In case buried in ground + mControlPoint.SetOrigin(vecOrigin); + mControlPoint.fAngle = vecAngles[1]; } } } for (int i=1; i(aQueryData[i]); + Course mCourse = view_as(aQueryData[i]); char sCourseName[128]; - iCourse.GetName(sCourseName, sizeof(sCourseName)); + mCourse.GetName(sCourseName, sizeof(sCourseName)); - ArrayList hJumps = iCourse.hJumps; + ArrayList hJumps = mCourse.hJumps; DBResultSet hResultSet = hResults[i]; while (hResultSet.FetchRow()) { - Jump iJump = Jump.Instance(); - hJumps.Push(iJump); + Jump mJump = Jump.Instance(); + hJumps.Push(mJump); - iJump.iID = hResultSet.FetchInt(0); - iJump.iNumber = hResultSet.FetchInt(1); + mJump.iID = hResultSet.FetchInt(0); + mJump.iNumber = hResultSet.FetchInt(1); if (hResults[i].IsFieldNull(2)) { - fOrigin[0] = hResultSet.FetchFloat(3); - fOrigin[1] = hResultSet.FetchFloat(4); - fOrigin[2] = hResultSet.FetchFloat(5); + vecOrigin[0] = hResultSet.FetchFloat(3); + vecOrigin[1] = hResultSet.FetchFloat(4); + vecOrigin[2] = hResultSet.FetchFloat(5); - iJump.SetOrigin(fOrigin); - iJump.fAngle = hResultSet.FetchFloat(6); + mJump.SetOrigin(vecOrigin); + mJump.fAngle = hResultSet.FetchFloat(6); } else { hResultSet.FetchString(2, sIdentifier, sizeof(sIdentifier)); - iJump.SetIdentifier(sIdentifier); + mJump.SetIdentifier(sIdentifier); int iEntity = Entity_FindByName(sIdentifier, "info_*"); if (iEntity != INVALID_ENT_REFERENCE) { - Entity_GetAbsOrigin(iEntity, fOrigin); - Entity_GetAbsAngles(iEntity, fAngles); - fOrigin[2] += 10.0; // In case buried in ground - iJump.SetOrigin(fOrigin); - iJump.fAngle = fAngles[1]; + Entity_GetAbsOrigin(iEntity, vecOrigin); + Entity_GetAbsAngles(iEntity, vecAngles); + vecOrigin[2] += 10.0; // In case buried in ground + mJump.SetOrigin(vecOrigin); + mJump.fAngle = vecAngles[1]; } } } @@ -225,8 +225,8 @@ public void DB_Callback_LoadMapInfo_Txn_Success(Database hDatabase, any aData, i } public void DB_Callback_LoadMapInfo_Txn_Failure(Database hDatabase, any aData, int iNumQueries, const char[] sError, int iFailIndex, any[] aQueryData) { - Course iCourse = view_as(aQueryData[iFailIndex]); - LogError("Database error while loading info for course %d: %s", iCourse.iNumber, sError); + Course mCourse = view_as(aQueryData[iFailIndex]); + LogError("Database error while loading info for course %d: %s", mCourse.iNumber, sError); } public void DB_Callback_BackupProgress_Txn_Success(Database hDatabase, any aData, int iNumQueries, DBResultSet[] hResults, any[] aQueryData) { @@ -712,22 +712,22 @@ int DB_BackupProgress_Client(Transaction hTxn, int iClient) { continue; } - Course iCourse = ResolveCourseNumber(eCheckpoint.GetCourseNumber()); + Course mCourse = ResolveCourseNumber(eCheckpoint.GetCourseNumber()); if (eCheckpoint.IsControlPoint()) { - ControlPoint iControlPoint = iCourse.iControlPoint; + ControlPoint mControlPoint = mCourse.mControlPoint; g_hDatabase.Format(sQuery, sizeof(sQuery), \ "INSERT IGNORE INTO `jse_progress_controlpoints`(`auth`, `map_id`, `team`, `class`, `course_id`, `controlpoint_id`)" ... "VALUES (%s, %d, %d, %d, %d, %d)", - sAuthID, GetTrackerMapID(), eCheckpoint.GetTeam(), eCheckpoint.GetClass(), iCourse.iID, iControlPoint.iID); + sAuthID, GetTrackerMapID(), eCheckpoint.GetTeam(), eCheckpoint.GetClass(), mCourse.iID, mControlPoint.iID); } else { - Jump iJump = ResolveJumpNumber(iCourse, eCheckpoint.GetJumpNumber()); + Jump mJump = ResolveJumpNumber(mCourse, eCheckpoint.GetJumpNumber()); g_hDatabase.Format(sQuery, sizeof(sQuery), \ "INSERT IGNORE INTO `jse_progress_jumps`(`auth`, `map_id`, `team`, `class`, `course_id`, `jump_id`)" ... "VALUES (%s, %d, %d, %d, %d, %d)", - sAuthID, GetTrackerMapID(), eCheckpoint.GetTeam(), eCheckpoint.GetClass(), iCourse.iID, iJump.iID); + sAuthID, GetTrackerMapID(), eCheckpoint.GetTeam(), eCheckpoint.GetClass(), mCourse.iID, mJump.iID); } hTxn.AddQuery(sQuery, GetClientSerial(iClient));