Skip to content

Commit

Permalink
Updated variable name prefixes for vectors and methodmaps
Browse files Browse the repository at this point in the history
  • Loading branch information
@geominorai
geominorai committed Jan 25, 2024
1 parent 80bb743 commit 683a2e0
Show file tree
Hide file tree
Showing 7 changed files with 338 additions and 338 deletions.
36 changes: 18 additions & 18 deletions scripting/include/jse_tracker.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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");
Expand Down Expand Up @@ -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 {
Expand All @@ -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 {
Expand All @@ -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);
}

/*
Expand Down Expand Up @@ -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);
54 changes: 27 additions & 27 deletions scripting/jse_autosave.sp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#define DEBUG

#define PLUGIN_AUTHOR "AI"
#define PLUGIN_VERSION "0.1.5"
#define PLUGIN_VERSION "0.1.6"

#include <sourcemod>
#include <clientprefs>
Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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);
Expand All @@ -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");
}
Expand Down Expand Up @@ -444,18 +444,18 @@ void SendCourseListPanel(int iClient) {
for (int i=0; i<hCheckpoint.Length; i++) {
hCheckpoint.GetArray(i, eCheckpoint);

Course iCourse = ResolveCourseNumber(eCheckpoint.GetCourseNumber());
Jump iJump = ResolveJumpNumber(iCourse, eCheckpoint.GetJumpNumber());
Course mCourse = ResolveCourseNumber(eCheckpoint.GetCourseNumber());
Jump mJump = ResolveJumpNumber(mCourse, eCheckpoint.GetJumpNumber());

GetCourseDisplayName(iCourse, sBuffer, sizeof(sBuffer));
GetCourseDisplayName(mCourse, sBuffer, sizeof(sBuffer));

char sMark[3];
if (i == iLatestIdx) {
sMark = " *";
}

if (iJump) {
Format(sBuffer, sizeof(sBuffer), "(%2d/%2d) %s%s", iJump.iNumber, iCourse.hJumps.Length, sBuffer, sMark);
if (mJump) {
Format(sBuffer, sizeof(sBuffer), "(%2d/%2d) %s%s", mJump.iNumber, mCourse.hJumps.Length, sBuffer, sMark);
} else {
Format(sBuffer, sizeof(sBuffer), "(END) %s%s", sBuffer, sMark);
}
Expand Down
20 changes: 10 additions & 10 deletions scripting/jse_autosave_database.sp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,10 @@ int DB_BackupAutosaves_Client(Database hDatabase, 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;

hDatabase.Format(sQuery, sizeof(sQuery), \
"INSERT INTO `jse_autosaves`(`auth`, `map_id`, `team`, `class`, `course_id`, `controlpoint_id`)"
Expand All @@ -211,9 +211,9 @@ int DB_BackupAutosaves_Client(Database hDatabase, Transaction hTxn, int iClient)
... "`course_id`=VALUES(`course_id`),"
... "`jump_id`=NULL,"
... "`controlpoint_id`=VALUES(`controlpoint_id`)",
sAuthID, GetTrackerMapID(), view_as<int>(TFTeam_Red)+i, j+1, iCourse.iID, iControlPoint.iID);
sAuthID, GetTrackerMapID(), view_as<int>(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`)"
Expand All @@ -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<int>(TFTeam_Red)+i, j+1, iCourse.iID, iJump.iID);
sAuthID, GetTrackerMapID(), view_as<int>(TFTeam_Red)+i, j+1, mCourse.iID, mJump.iID);
}

hTxn.AddQuery(sQuery, GetClientSerial(iClient));
Expand Down Expand Up @@ -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));
Expand Down
Loading

0 comments on commit 683a2e0

Please sign in to comment.