Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/acemod/master'

Browse Source
This commit is contained in:
Jonathan Pereira 2016-03-01 07:50:57 -03:00
commit 59d0e6e788
15 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf
View File

@ -12,11 +12,7 @@
*/ */
#include "script_component.hpp" #include "script_component.hpp"
private "_deleted"; private _aceTimeSecond = floor ACE_time;
_deleted = 0;
_aceTimeSecond = floor ACE_time;
{ {
private ["_bulletVelocity", "_bulletPosition", "_bulletSpeed"]; private ["_bulletVelocity", "_bulletPosition", "_bulletSpeed"];

4
addons/rearm/CfgVehicles.hpp
View File

@ -170,8 +170,8 @@ class CfgVehicles {
class GVAR(defaultCarriedObject) : ThingX { class GVAR(defaultCarriedObject) : ThingX {
XEH_ENABLED; XEH_ENABLED;
displayName = QGVAR(dummy_obj); displayName = QGVAR(dummy_obj);
scope = 2; scope = 1;
scopeCurator = 2; scopeCurator = 1;
model = "\A3\Weapons_F\AmmoBoxes\AmmoBox_F.p3d"; model = "\A3\Weapons_F\AmmoBoxes\AmmoBox_F.p3d";
EGVAR(cargo,size) = 1; EGVAR(cargo,size) = 1;
class ACE_Actions { class ACE_Actions {

3
tools/sqf_validator.py
View File

@ -109,6 +109,9 @@ def check_sqf_syntax(filepath):
print("ERROR: Possible missing curly brace '}}' detected at {0} Line number: {1}".format(filepath,lineNumber)) print("ERROR: Possible missing curly brace '}}' detected at {0} Line number: {1}".format(filepath,lineNumber))
bad_count_file += 1 bad_count_file += 1
brackets_list.append('}') brackets_list.append('}')
elif (c== '\t'):
print("ERROR: Tab detected at {0} Line number: {1}".format(filepath,lineNumber))
bad_count_file += 1
if (checkForSemiColumn): if (checkForSemiColumn):
if (c not in [' ', '\t', '\n', '/']): # keep reading until no white space or comments if (c not in [' ', '\t', '\n', '/']): # keep reading until no white space or comments