sm-plugins/bhoptimer
1
0
Fork 0
mirror of https://github.com/shavitush/bhoptimer.git synced 2025-12-08 02:48:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Disallowed teleportation to empty CPs. (#399)

Browse Source
This commit is contained in:
shavitush 2017-07-16 21:14:16 +03:00
parent 590018f12b
commit 8d07a23574
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scripting/shavit-misc.sp
View File

@ -867,10 +867,7 @@ void ResetCheckpoints(int client)
{ {
for(int j = 0; j < sizeof(gF_Checkpoints[][]); j++) for(int j = 0; j < sizeof(gF_Checkpoints[][]); j++)
{ {
for(int k = 0; k < sizeof(gF_Checkpoints[][][]); k++) gF_Checkpoints[client][i][j] = NULL_VECTOR;
{
gF_Checkpoints[client][i][j][k] = 0.0;
}
} }
} }
@ -1090,7 +1087,6 @@ public Action Command_Teleport(int client, int args)
} }
menu.ExitButton = true; menu.ExitButton = true;
menu.Display(client, 60); menu.Display(client, 60);
} }
@ -1307,6 +1303,13 @@ public Action Command_Tele(int client, int args)
} }
} }
if(IsNullVector(gF_Checkpoints[client][index][0]))
{
Shavit_PrintToChat(client, "%T", "MiscCheckpointsEmpty", client, (index + 1), gS_ChatStrings[sMessageWarning], gS_ChatStrings[sMessageText]);
return Plugin_Handled;
}
TeleportToCheckpoint(client, index); TeleportToCheckpoint(client, index);
Shavit_PrintToChat(client, "%T", "MiscCheckpointsTeleported", client, (index + 1), gS_ChatStrings[sMessageVariable], gS_ChatStrings[sMessageText]); Shavit_PrintToChat(client, "%T", "MiscCheckpointsTeleported", client, (index + 1), gS_ChatStrings[sMessageVariable], gS_ChatStrings[sMessageText]);
@ -1378,6 +1381,8 @@ public int MenuHandler_Checkpoints(Menu menu, MenuAction action, int param1, int
{ {
if(action == MenuAction_Select) if(action == MenuAction_Select)
{ {
int current = gA_CheckpointsCache[param1][iCurrentCheckpoint];
switch(param2) switch(param2)
{ {
case 0: case 0:
@ -1388,12 +1393,12 @@ public int MenuHandler_Checkpoints(Menu menu, MenuAction action, int param1, int
case 1: case 1:
{ {
TeleportToCheckpoint(param1, gA_CheckpointsCache[param1][iCurrentCheckpoint] - 1); TeleportToCheckpoint(param1, current - 1);
} }
case 2: case 2:
{ {
if(gA_CheckpointsCache[param1][iCurrentCheckpoint] > 1) if(current > 1)
{ {
gA_CheckpointsCache[param1][iCurrentCheckpoint]--; gA_CheckpointsCache[param1][iCurrentCheckpoint]--;
} }
@ -1401,7 +1406,7 @@ public int MenuHandler_Checkpoints(Menu menu, MenuAction action, int param1, int
case 3: case 3:
{ {
if(gA_CheckpointsCache[param1][iCurrentCheckpoint] < CP_MAX) if(current < CP_MAX && !IsNullVector(gF_Checkpoints[param1][current][0]))
{ {
gA_CheckpointsCache[param1][iCurrentCheckpoint]++; gA_CheckpointsCache[param1][iCurrentCheckpoint]++;
} }
@ -1833,3 +1838,8 @@ public Action Command_Drop(int client, const char[] command, int argc)
return Plugin_Handled; return Plugin_Handled;
} }
bool IsNullVector(float vec[3])
{
return (vec[0] == NULL_VECTOR[0] && vec[1] == NULL_VECTOR[1] && vec[2] == NULL_VECTOR[2]);
}

5
translations/shavit-misc.phrases.txt
View File

@ -73,6 +73,11 @@
"#format" "{1:d},{2:s},{3:s}" "#format" "{1:d},{2:s},{3:s}"
"en" "{2}Teleported{3} to checkpoint ({1})." "en" "{2}Teleported{3} to checkpoint ({1})."
} }
"MiscCheckpointsEmpty"
{
"#format" "{1:d},{2:s},{3:s}"
"en" "Checkpoint {1} is {2}empty{3}."
}
// ---------- Menus ---------- // // ---------- Menus ---------- //
"TeleportMenuTitle" "TeleportMenuTitle"
{ {