From d34cfdb00367c893312a08c10cf6c75685621811 Mon Sep 17 00:00:00 2001
From: commy2 <commy-2@gmx.de>
Date: Tue, 7 Apr 2015 19:38:19 +0200
Subject: [PATCH 1/2] fix: day laser when being captured
---
addons/laserpointer/XEH_postInit.sqf | 3 +++
1 file changed, 3 insertions(+)
diff --git a/addons/laserpointer/XEH_postInit.sqf b/addons/laserpointer/XEH_postInit.sqf
index 58c47e3de2..14e4c384d8 100644
--- a/addons/laserpointer/XEH_postInit.sqf
+++ b/addons/laserpointer/XEH_postInit.sqf
@@ -1,6 +1,9 @@
// by commy2
#include "script_component.hpp"
+// fixes laser when being captured. Needed, because the selectionpsoition of the right hand is used
+["SetHandcuffed", {if (_this select 1) then {(_this select 0) action ["GunLightOff", _this select 0]};}] call EFUNC(common,addEventHandler);
+
if !(hasInterface) exitWith {};
GVAR(nearUnits) = [];
From 18b51aa2b5feffc59a4ddf0c8ab862fa2f4b43f7 Mon Sep 17 00:00:00 2001
From: PabstMirror <elephantisaterriblemascot@gmail.com>
Date: Tue, 7 Apr 2015 12:49:00 -0500
Subject: [PATCH 2/2] Build script: possibly fixed cfgConvert problems
---
.../pabstFrankensteinBuilder.py | 31 +++++++++++++++----
1 file changed, 25 insertions(+), 6 deletions(-)
diff --git a/tools/ace_build_tool/pabstFrankensteinBuilder.py b/tools/ace_build_tool/pabstFrankensteinBuilder.py
index 43d67e187d..a0c57f2b3e 100644
--- a/tools/ace_build_tool/pabstFrankensteinBuilder.py
+++ b/tools/ace_build_tool/pabstFrankensteinBuilder.py
@@ -48,6 +48,7 @@ import hashlib
import configparser
import json
import traceback
+import time
if sys.platform == "win32":
import winreg
@@ -538,8 +539,8 @@ See the make.cfg file for additional build options.
input("Press Enter to continue...")
print("Resuming build...")
continue
- else:
- print("WARNING: Module is stored on work drive (" + work_drive + ").")
+ #else:
+ #print("WARNING: Module is stored on work drive (" + work_drive + ").")
try:
# Remove the old pbo, key, and log
@@ -577,10 +578,28 @@ See the make.cfg file for additional build options.
#PABST: Convert config (run the macro'd config.cpp through CfgConvert twice to produce a de-macro'd cpp that pboProject can read without fucking up:
os.chdir(os.path.join(arma3tools_path, "CfgConvert"))
shutil.copyfile(os.path.join(work_drive, prefix, module, "config.cpp"), os.path.join(work_drive, prefix, module, "config.backup"))
- print_green("\Pabst (double converting):" + "cfgConvertGUI.exe " + os.path.join(work_drive, prefix, module, "config.cpp"))
+
ret = subprocess.call(["cfgConvertGUI.exe", os.path.join(work_drive, prefix, module, "config.cpp")])
+ if ret != 0:
+ print_error("cfgConvertGUI (bin) return code == " + str(ret))
+ input("Press Enter to continue...")
+
+ #PABST: Need micro sleeps because cfgConvertGUI can return before it's finished procressing
+ time.sleep(0.05)
+
ret = subprocess.call(["cfgConvertGUI.exe", os.path.join(work_drive, prefix, module, "config.bin")])
-
+ if ret != 0:
+ print_error("cfgConvertGUI (txt) return code == " + str(ret))
+ input("Press Enter to continue...")
+
+ time.sleep(0.05)
+
+ #cmd = [rapifyTool, "-L", "-P", os.path.join(work_drive, prefix, module, "config.cpp")];
+ #ret = subprocess.call(cmd)
+ #if ret != 0:
+ # print_error("rapifyTool return code == " + str(ret) + str(cmd))
+ # input("Press Enter to continue...")
+
# Call pboProject
os.chdir("P:\\")
@@ -625,12 +644,12 @@ See the make.cfg file for additional build options.
if not build_successful:
print_error("pboProject return code == " + str(ret))
print_error("Module not successfully built/signed.")
- #input("Press Enter to continue...")
+ input("Press Enter to continue...")
print ("Resuming build...")
continue
#PABST: cleanup config BS (you could comment this out to see the "de-macroed" cpp
- print_green("\Pabst (restoring): " + os.path.join(work_drive, prefix, module, "config.cpp"))
+ #print_green("\Pabst (restoring): " + os.path.join(work_drive, prefix, module, "config.cpp"))
os.remove(os.path.join(work_drive, prefix, module, "config.cpp"))
os.remove(os.path.join(work_drive, prefix, module, "config.bin"))
os.rename(os.path.join(work_drive, prefix, module, "config.backup"), os.path.join(work_drive, prefix, module, "config.cpp"))