Merge pull request #37 from hx-w/dev-1.4.3

botmimic_fix fix
csgowiki · Sep 5, 2021 · 81b4362 · 81b4362
2 parents 02d9d55 + 23fe664
commit 81b4362
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 74 deletions.
diff --git a/plugins/csgowiki-pack.smx b/plugins/csgowiki-pack.smx
diff --git a/scripting/csgowiki/menus/menu_wikipro.sp b/scripting/csgowiki/menus/menu_wikipro.sp
@@ -3,7 +3,7 @@ public Action:Command_WikiPro(client, args) {
         return;
     }
 
-    if (BotMimic_IsPlayerMimicing(client)) {
+    if (BotMimicFix_IsPlayerMimicing(client)) {
         PrintToChat(client, "%s \x02正在播放录像", PREFIX);
         return;
     }
@@ -60,7 +60,7 @@ void ShowProListInRound(client, char round_str[4]) {
     if (g_aProMatchIndex[client] == -1) {
         return;
     }
-    if (BotMimic_IsPlayerMimicing(client)) {
+    if (BotMimicFix_IsPlayerMimicing(client)) {
         PrintToChat(client, "%s \x02正在播放录像", PREFIX);
         return;
     }

diff --git a/scripting/csgowiki/replay.sp b/scripting/csgowiki/replay.sp
@@ -9,35 +9,35 @@ public Action Command_Record(client, args) {
         PrintToChat(client, "%s \x02没有缓存的道具可以修改", PREFIX);
         return;
     }
-    if (BotMimic_IsPlayerMimicing(client)) {
+    if (BotMimicFix_IsPlayerMimicing(client)) {
         PrintToChat(client, "%s \x02正在播放录像", PREFIX);
         return;
     }
-    if (BotMimic_IsPlayerRecording(client)) {
+    if (BotMimicFix_IsPlayerRecording(client)) {
         PrintToChat(client, "%s \x02正在录像", PREFIX);
         return;
     }
     PrintToChat(client, "%s \x04开始录像", PREFIX);
-    BotMimic_StartRecording(client, g_aLastUtilityId[client], "csgowiki");
+    BotMimicFix_StartRecording(client, g_aLastUtilityId[client], "csgowiki");
 }
 
 public Action Command_StopRecord(client, args) {
     if (!IsPlayer(client)) {
         return;
     }
-    if (!BotMimic_IsPlayerRecording(client)) {
+    if (!BotMimicFix_IsPlayerRecording(client)) {
         PrintToChat(client, "%s \x02还未开始录像", PREFIX);
         return;
     }
     PrintToChat(client, "%s \x02停止录像", PREFIX);
     if (strlen(g_aLastUtilityId[client]) != 0) {
         PrintToChat(client, "[DEBUG] %s", g_aLastUtilityId[client]);
-        BotMimic_StopRecording(client, true, g_aLastUtilityId[client]);
+        BotMimicFix_StopRecording(client, true, g_aLastUtilityId[client]);
 
         UploadPlayBack(client, g_aLastUtilityId[client]);
     }
     else {
-        BotMimic_StopRecording(client, false);
+        BotMimicFix_StopRecording(client, false);
     }
 }
 
@@ -141,7 +141,7 @@ void BotMimicDownloadCallback(HTTPStatus status, DataPack pack) {
         return;
     }
     PrintToChat(client, "%s \x04录像文件获取成功", PREFIX);
-    if (BotMimic_IsPlayerMimicing(client)) {
+    if (BotMimicFix_IsPlayerMimicing(client)) {
         PrintToChat(client, "%s \x02请等待当前回放结束", client);
     }
     else {
@@ -181,16 +181,16 @@ public void BotMimicStartReplay(DataPack pack) {
     char filepath[84];
     pack.ReadString(filepath, sizeof(filepath));
 
-    BMError err = BotMimic_PlayRecordFromFile(client, filepath);
+    BMError err = BotMimicFix_PlayRecordFromFile(client, filepath);
     if (err != BM_NoError) {
         char errString[128];
-        BotMimic_GetErrorString(err, errString, sizeof(errString));
+        BotMimicFix_GetErrorString(err, errString, sizeof(errString));
         LogError("Error playing record %s on client %d: %s", filepath, client, errString);
     }
     delete pack;
 }
 
-public void BotMimic_OnPlayerStopsMimicing(int client, char[] name, char[] category, char[] path) {
+public void BotMimicFix_OnPlayerStopsMimicing(int client, char[] name, char[] category, char[] path) {
     if (IsPlayer(client)) {
         TeleportEntity(client, g_aStartPositions[client], g_aStartAngles[client], NULL_VECTOR);
     }

diff --git a/scripting/csgowiki/utility_submit.sp b/scripting/csgowiki/utility_submit.sp
@@ -6,7 +6,7 @@ public Action:Command_Submit(client, args) {
     if (e_cDefault != g_aPlayerStatus[client]) {
         return;
     }
-    if (BotMimic_IsPlayerMimicing(client)) {
+    if (BotMimicFix_IsPlayerMimicing(client)) {
         PrintToChat(client, "%s \x02正在播放录像", PREFIX);
         return;
     }
@@ -29,8 +29,8 @@ public Action:Command_SubmitAbort(client, args) {
         ResetSingleClientSubmitState(client);
         PrintToChat(client, "%s 已终止上传流程", PREFIX);
     }
-    if (BotMimic_IsPlayerMimicing(client)) {
-        BotMimic_StopPlayerMimic(client);
+    if (BotMimicFix_IsPlayerMimicing(client)) {
+        BotMimicFix_StopPlayerMimic(client);
     }
 }
 
@@ -63,7 +63,7 @@ void OnPlayerRunCmdForUtilitySubmit(client, &buttons) {
 
 public void CSU_OnThrowGrenade(int client, int entity, GrenadeType grenadeType,
         const float origin[3], const float velocity[3]) {
-        if (BotMimic_IsPlayerMimicing(client)) {
+        if (BotMimicFix_IsPlayerMimicing(client)) {
             AcceptEntityInput(entity, "Kill");
 
             if (g_aUtilityVelocity[client][0] + g_aUtilityVelocity[client][1] + g_aUtilityVelocity[client][2] == 0.0) {

diff --git a/scripting/csgowiki/utility_wiki.sp b/scripting/csgowiki/utility_wiki.sp
@@ -6,7 +6,7 @@ public Action:Command_Wiki(client, args) {
     if (!check_function_on(g_hOnUtilityWiki, "\x02道具学习插件关闭，请联系服务器管理员", client)) {
         return;
     }
-    if (BotMimic_IsPlayerMimicing(client)) {
+    if (BotMimicFix_IsPlayerMimicing(client)) {
         PrintToChat(client, "%s \x02正在播放录像", PREFIX);
         return;
     }
@@ -86,7 +86,7 @@ void GetFilterCollection(client, char[] method) {
 void GetUtilityDetail(client, char[] utId) {
     // lock
     float fWikiLimit = GetConVarFloat(g_hWikiReqLimit);
-    if (BotMimic_IsPlayerMimicing(client)) {
+    if (BotMimicFix_IsPlayerMimicing(client)) {
         PrintToChat(client, "%s \x02正在播放录像", PREFIX);
         return;
     }