From 46fe10658e04998e53d53d436066288540a20c17 Mon Sep 17 00:00:00 2001 From: bux578 Date: Tue, 13 Jan 2015 15:56:02 +0100 Subject: [PATCH 1/9] notepad++ sh sqf cba It's not really a tool ... i know --- ...ad++_SyntaxHighlighting_With_SQFandCBA.xml | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 tools/notepad++_SyntaxHighlighting_With_SQFandCBA.xml diff --git a/tools/notepad++_SyntaxHighlighting_With_SQFandCBA.xml b/tools/notepad++_SyntaxHighlighting_With_SQFandCBA.xml new file mode 100644 index 0000000000..a37a6304df --- /dev/null +++ b/tools/notepad++_SyntaxHighlighting_With_SQFandCBA.xml @@ -0,0 +1,64 @@ + + + + + + + + 00// 01 02 03/* 04*/ + + + + + + + + ! % & ( ) * / , : ; ? [ ] ^ + - < = > + greater greater= less less= or plus + { + + } + #ifdef + #else + #endif + + + + if then else goto switch case while do for foreach from to in step + abs accTime acos action actionKeys actionKeysImages actionKeysNames actionKeysNamesArray actionName activateAddons activatedAddons activateKey addAction addBackpack addBackpackCargo addBackpackCargoGlobal addBackpackGlobal addCamShake addCuratorAddons addCuratorCameraArea addCuratorEditableObjects addCuratorEditingArea addCuratorPoints addEditorObject addEventHandler addGoggles addGroupIcon addHandgunItem addHeadgear addItem addItemCargo addItemCargoGlobal addItemPool addItemToBackpack addItemToUniform addItemToVest addLiveStats addMagazine addMagazine array addMagazineAmmoCargo addMagazineCargo addMagazineCargoGlobal addMagazineGlobal addMagazinePool addMagazines addMagazineTurret addMenu addMenuItem addMissionEventHandler addMPEventHandler addMusicEventHandler addPrimaryWeaponItem addPublicVariableEventHandler addRating addResources addScore addScoreSide addSecondaryWeaponItem addSwitchableUnit addTeamMember addToRemainsCollector addUniform addVehicle addVest addWaypoint addWeapon addWeaponCargo addWeaponCargoGlobal addWeaponGlobal addWeaponPool addWeaponTurret agent agents aimedAtTarget aimPos airDensityRTD airportSide AISFinishHeal alive allControls allCurators allDead allDeadMen allDisplays allGroups allMapMarkers allMines allMissionObjects allow3DMode allowCrewInImmobile allowCuratorLogicIgnoreAreas allowDamage allowDammage allowFileOperations allowFleeing allowGetIn allSites allTurrets allUnits allUnitsUAV allVariables ammo and animate animateDoor animationPhase animationState armoryPoints asin ASLToATL assert assignAsCargo assignAsCargoIndex assignAsCommander assignAsDriver assignAsGunner assignAsTurret assignCurator assignedCargo assignedCommander assignedDriver assignedGunner assignedItems assignedTarget assignedTeam assignedVehicle assignedVehicleRole assignItem assignTeam assignToAirport atan atan2 atg ATLToASL attachedObject attachedObjects attachedTo attachObject attachTo attackEnabled backpack backpackCargo backpackContainer backpackItems backpackMagazines backpackSpaceFor behaviour benchmark binocular blufor boundingBox boundingBoxReal boundingCenter breakOut breakTo briefingName buildingExit buildingPos buttonAction buttonSetAction cadetMode call callExtension camCommand camCommit camCommitPrepared camCommitted camConstuctionSetParams camCreate camDestroy cameraEffect cameraEffectEnableHUD cameraInterest cameraOn cameraView campaignConfigFile camPreload camPreloaded camPrepareBank camPrepareDir camPrepareDive camPrepareFocus camPrepareFov camPrepareFovRange camPreparePos camPrepareRelPos camPrepareTarget camSetBank camSetDir camSetDive camSetFocus camSetFov camSetFovRange camSetPos camSetRelPos camSetTarget camTarget camUseNVG canAdd canAddItemToBackpack canAddItemToUniform canAddItemToVest cancelSimpleTaskDestination canFire canMove canSlingLoad canStand canUnloadInCombat captive captiveNum case catch cbChecked cbSetChecked ceil cheatsEnabled checkAIFeature civilian className clearAllItemsFromBackpack clearBackpackCargo clearBackpackCargoGlobal clearGroupIcons clearItemCargo clearItemCargoGlobal clearItemPool clearMagazineCargo clearMagazineCargoGlobal clearMagazinePool clearOverlay clearRadio clearWeaponCargo clearWeaponCargoGlobal clearWeaponPool closeDialog closeDisplay closeOverlay collapseObjectTree combatMode commandArtilleryFire commandChat commander commandFire commandFollow commandFSM commandGetOut commandingMenu commandMove commandRadio commandStop commandTarget commandWatch comment commitOverlay compile compileFinal completedFSM composeText configClasses configFile configName configProperties connectTerminalToUAV controlNull copyFromClipboard copyToClipboard copyWaypoints cos count countEnemy countFriendly countSide countType countUnknown createAgent createCenter createDialog createDiaryLink createDiaryRecord createDiarySubject createDisplay createGearDialog createGroup createGuardedPoint createLocation createMarker createMarkerLocal createMenu createMine createMissionDisplay createSimpleTask createSite createSoundSource createTask createTeam createTrigger createUnit createUnit array createVehicle createVehicle array createVehicleCrew createVehicleLocal crew ctrlActivate ctrlAddEventHandler ctrlAutoScrollDelay ctrlAutoScrollRewind ctrlAutoScrollSpeed ctrlChecked ctrlClassName ctrlCommit ctrlCommitted ctrlCreate ctrlDelete ctrlEnable ctrlEnabled ctrlFade ctrlHTMLLoaded ctrlIDC ctrlIDD ctrlMapAnimAdd ctrlMapAnimClear ctrlMapAnimCommit ctrlMapAnimDone ctrlMapCursor ctrlMapMouseOver ctrlMapScale ctrlMapScreenToWorld ctrlMapWorldToScreen ctrlModel ctrlModelDirAndUp ctrlModelScale ctrlParent ctrlPosition ctrlRemoveAllEventHandlers ctrlRemoveEventHandler ctrlScale ctrlSetActiveColor ctrlSetAutoScrollDelay ctrlSetAutoScrollRewind ctrlSetAutoScrollSpeed ctrlSetBackgroundColor ctrlSetChecked ctrlSetEventHandler ctrlSetFade ctrlSetFocus ctrlSetFont ctrlSetFontH1 ctrlSetFontH1B ctrlSetFontH2 ctrlSetFontH2B ctrlSetFontH3 ctrlSetFontH3B ctrlSetFontH4 ctrlSetFontH4B ctrlSetFontH5 ctrlSetFontH5B ctrlSetFontH6 ctrlSetFontH6B ctrlSetFontHeight ctrlSetFontHeightH1 ctrlSetFontHeightH2 ctrlSetFontHeightH3 ctrlSetFontHeightH4 ctrlSetFontHeightH5 ctrlSetFontHeightH6 ctrlSetFontP ctrlSetFontPB ctrlSetForegroundColor ctrlSetModel ctrlSetModelDirAndUp ctrlSetModelScale ctrlSetPosition ctrlSetScale ctrlSetStructuredText ctrlSetText ctrlSetTextColor ctrlSetTooltip ctrlSetTooltipColorBox ctrlSetTooltipColorShade ctrlSetTooltipColorText ctrlShow ctrlShown ctrlText ctrlTextHeight ctrlType ctrlVisible curatorAddons curatorCamera curatorCameraArea curatorCameraAreaCeiling curatorCoef curatorEditableObjects curatorEditingArea curatorEditingAreaType curatorMouseOver curatorPoints curatorRegisteredObjects curatorSelected curatorWaypointCost currentCommand currentMagazine currentMagazineDetail currentMagazineDetailTurret currentMagazineTurret currentMuzzle currentTask currentTasks currentVisionMode currentWaypoint currentWeapon currentWeaponMode currentWeaponTurret currentZeroing cursorTarget customChat customRadio cutFadeOut cutObj cutRsc cutText damage date dateToNumber daytime deActivateKey debriefingText debugFSM debugLog default deg deleteAt deleteCenter deleteCollection deleteEditorObject deleteGroup deleteIdentity deleteLocation deleteMarker deleteMarkerLocal deleteRange deleteResources deleteSite deleteStatus deleteTeam deleteVehicle deleteVehicleCrew deleteWaypoint detach detectedMines diag captureFrame diag captureSlowFrame diag fps diag fpsmin diag frameno diag log diag logSlowFrame diag tickTime dialog diarySubjectExists difficulty difficultyEnabled difficultyEnabledRTD direction directSay disableAI disableCollisionWith disableConversation disableDebriefingStats disableSerialization disableTIEquipment disableUAVConnectability disableUserInput displayAddEventHandler displayCtrl displayNull displayRemoveAllEventHandlers displayRemoveEventHandler displaySetEventHandler dissolveTeam distance distanceSqr distributionRegion do doArtilleryFire doFire doFollow doFSM doGetOut doMove doorPhase doStop doTarget doWatch drawArrow drawEllipse drawIcon drawIcon3D drawLine drawLine3D drawLink drawLocation drawRectangle driver drop east echo editObject editorSetEventHandler effectiveCommander else emptyPositions enableAI enableAIFeature enableAttack enableCamShake enableCaustics enableCollisionWith enableCopilot enableDebriefingStats enableDiagLegend enableEndDialog enableEngineArtillery enableEnvironment enableFatigue enableGunLights enableIRLasers enableMimics enablePersonTurret enableRadio enableReload enableRopeAttach enableSatNormalOnDetail enableSaving enableSentences enableSimulation enableSimulationGlobal enableTeamSwitch enableUAVConnectability endLoadingScreen endMission engineOn enginesIsOnRTD enginesRpmRTD enginesTorqueRTD entities estimatedEndServerTime estimatedTimeLeft evalObjectArgument everyBackpack everyContainer exec execEditorScript execFSM execVM exit exitWith exp expectedDestination eyeDirection eyePos face faction F cont. fadeMusic fadeRadio fadeSound fadeSpeech failMission false fillWeaponsFromPool find findCover findDisplay findEditorObject findEmptyPosition findEmptyPositionReady findNearestEnemy finishMissionInit finite fire fireAtTarget firstBackpack flag flagOwner fleeing floor flyInHeight fog fogForecast fogParams for forceAddUniform forceEnd forceMap forceRespawn forceSpeed forceWalk forceWeaponFire forceWeatherChange forEach forEachMember forEachMemberAgent forEachMemberTeam format formation formationDirection formationLeader formationMembers formationPosition formationTask formatText formLeader freeLook from fromEditor fuel fullCrew gearSlotAmmoCount gearSlotData getAmmoCargo getArray getArtilleryAmmo getArtilleryComputerSettings getArtilleryETA getAssignedCuratorLogic getAssignedCuratorUnit getBackpackCargo getBleedingRemaining getBurningValue getCargoIndex getCenterOfMass getChosenCont getClientState getConnectedUAV getDammage getDescription getDir getDirVisual getDLCs getEditorCamera getEditorMode getEditorObjectScope getElevationOffset getFatigue getFriend getFSMVariable getFuelCargo getGroupIcon getGroupIconParams getGroupIcons getHideFrom getHit getHitPointDamage getItemCargo getMagazineCargo getMarkerColor getMarkerPos getMarkerSize getMarkerType getMass getNumber getObjectArgument getObjectChildren getObjectDLC getObjectMaterials getObjectProxy getObjectTextures getOxygenRemaining getPersonUsedDLCs getPlayerUID getPos getPosASL getPosASLVisual getPosASLW getPosATL getPosATLVisual getPosVisual getPosWorld getRepairCargo getResolution getShadowDistance getSlingLoad getSpeed getTerrainHeightASL getText getVariable getWeaponCargo getWPPos glanceAt globalChat globalRadio goggles goto group groupChat groupFromNetId groupIconSelectable groupIconsVisible groupID groupRadio groupSelectedUnits groupSelectUnit grpNull gunner gusts halt handgunItems handgunMagazine handgunWeapon handsHit hasInterface hasWeapon hcAllGroups hcGroupParams hcLeader hcRemoveAllGroups hcRemoveGroup hcSelected hcSelectGroup hcSetGroup hcShowBar hcShownBar headgear hideBody hideObject hideObjectGlobal hint hintC hintC array hintC structuredText hintCadet hintSilent hmd hostMission htmlLoad HUDMovementLevels humidity if image importAllGroups importance in incapacitatedState independent inflame inflamed inGameUISetEventHandler inheritsFrom initAmbientLife inputAction inRangeOfArtillery insertEditorObject intersect isAbleToBreathe isAgent isArray isAutoHoverOn isAutonomous isAutotest isBleeding isBurning isClass isCollisionLightOn isCopilotEnabled isDedicated isDLCAvailable isEngineOn isEqualTo isFlashlightOn isFlatEmpty isForcedWalk isFormationLeader isHidden isInRemainsCollector isInstructorFigureEnabled isIRLaserOn isKeyActive isKindOf isLightOn isLocalized isManualFire isMarkedForCollection isMultiplayer isNil isNull isNumber isObjectRTD isOnRoad isPipEnabled isPlayer isRealTime isShowing3DIcons isSteamMission isStreamFriendlyUIEnabled isText isTouchingGround isTutHintsEnabled isUAVConnectable isUAVConnected isUniformAllowed isWalking itemCargo items itemsWithMagazines join joinAs joinAsSilent joinSilent kbAddDatabase kbAddDatabaseTargets kbAddTopic kbHasTopic kbReact kbRemoveTopic kbTell kbWasSaid keyImage keyName knowsAbout land landAt landResult language laserTarget lbAdd lbClear lbColor lbCurSel lbData lbDelete lbIsSelected lbPicture lbSelection lbSetColor lbSetCurSel lbSetData lbSetPicture lbSetSelected lbSetTooltip lbSetValue lbSize lbSort lbSortByValue lbText lbValue leader leaveVehicle libraryCredits libraryDisclaimers lifeState lightAttachObject lightDetachObject lightIsOn lightnings limitSpeed linearConversion lineBreak lineIntersects lineIntersectsObjs lineIntersectsWith linkItem list listObjects ln lnbAddArray lnbAddColumn lnbAddRow lnbClear lnbColor lnbCurSelRow lnbData lnbDeleteColumn lnbDeleteRow lnbGetColumnsPosition lnbPicture lnbSetColor lnbSetColumnsPos lnbSetCurSelRow lnbSetData lnbSetPicture lnbSetText lnbSetValue lnbSize lnbText lnbValue load loadAbs loadBackpack loadFile loadGame loadIdentity loadMagazine loadOverlay loadStatus loadUniform loadVest local localize locationNull locationPosition lock lockCameraTo lockCargo lockDriver locked lockedCargo lockedDriver lockedTurret lockTurret lockWP log logEntities lookAt lookAtPos magazineCargo magazines magazinesAmmo magazinesAmmoCargo magazinesAmmoFull magazinesDetail magazinesDetailBackpack magazinesDetailUniform magazinesDetailVest magazinesTurret magazineTurretAmmo mapAnimAdd mapAnimClear mapAnimCommit mapAnimDone mapCenterOnCamera mapGridPosition markAsFinishedOnSteam markerAlpha markerBrush markerColor markerDir markerPos markerShape markerSize markerText markerType max members min mineActive mineDetectedBy missionConfigFile missionName missionNamespace missionStart mod modelToWorld modelToWorldVisual moonIntensity morale move moveInAny moveInCargo moveInCommander moveInDriver moveInGunner moveInTurret moveObjectToEnd moveOut moveTime moveTo moveToCompleted moveToFailed musicVolume name name location nameSound nearEntities nearestBuilding nearestLocation nearestLocations nearestLocationWithDubbing nearestObject nearestObjects nearObjects nearObjectsReady nearRoads nearSupplies nearTargets needReload netId netObjNull newOverlay nextMenuItemIndex nextWeatherChange nil nMenuItems not numberToDate objectCurators objectFromNetId objNull objStatus onBriefingGroup onBriefingNotes onBriefingPlan onBriefingTeamSwitch onCommandModeChanged onDoubleClick onEachFrame onGroupIconClick onGroupIconOverEnter onGroupIconOverLeave onHCGroupSelectionChanged onMapSingleClick onPlayerConnected onPlayerDisconnected onPreloadFinished onPreloadStarted onShowNewObject onTeamSwitch openCuratorInterface openMap openYoutubeVideo opfor or orderGetIn overcast overcastForecast owner parseNumber parseText parsingNamespace particlesQuality pi pickWeaponPool pitch playableSlotsNumber playableUnits playAction playActionNow player playerRespawnTime playerSide playersNumber playGesture playMission playMove playMoveNow playMusic playScriptedMission playSound playSound3D position positionCameraToWorld posScreenToWorld posWorldToScreen ppEffectAdjust ppEffectCommit ppEffectCommitted ppEffectCreate ppEffectDestroy ppEffectEnable ppEffectForceInNVG precision preloadCamera preloadObject preloadSound preloadTitleObj preloadTitleRsc preprocessFile preprocessFileLineNumbers primaryWeapon primaryWeaponItems primaryWeaponMagazine priority private processDiaryLink productVersion profileName profileNamespace progressLoadingScreen progressPosition progressSetPosition publicVariable publicVariableClient publicVariableServer pushBack putWeaponPool queryItemsPool queryMagazinePool queryWeaponPool rad radioChannelAdd radioChannelCreate radioChannelRemove radioChannelSetCallSign radioChannelSetLabel radioVolume rain rainbow random rank rankId rating rectangular registeredTasks registerTask reload reloadEnabled remoteControl removeAction removeAllActions removeAllAssignedItems removeAllContainers removeAllCuratorAddons removeAllCuratorCameraAreas removeAllCuratorEditingAreas removeAllEventHandlers removeAllHandgunItems removeAllItems removeAllItemsWithMagazines removeAllMissionEventHandlers removeAllMPEventHandlers removeAllMusicEventHandlers removeAllPrimaryWeaponItems removeAllWeapons removeBackpack removeBackpackGlobal removeCuratorAddons removeCuratorCameraArea removeCuratorEditableObjects removeCuratorEditingArea removeDrawIcon removeDrawLinks removeEventHandler removeFromRemainsCollector removeGoggles removeGroupIcon removeHandgunItem removeHeadgear removeItem removeItemFromBackpack removeItemFromUniform removeItemFromVest removeItems removeMagazine removeMagazineGlobal removeMagazines removeMagazinesTurret removeMagazineTurret removeMenuItem removeMissionEventHandler R cont. removeMPEventHandler removeMusicEventHandler removePrimaryWeaponItem removeSecondaryWeaponItem removeSimpleTask removeSwitchableUnit removeTeamMember removeUniform removeVest removeWeapon removeWeaponGlobal removeWeaponTurret requiredVersion resetCamShake resetSubgroupDirection resistance resize resources respawnVehicle restartEditorCamera reveal revealMine reverse reversedMouseY roadsConnectedTo ropeAttachedObjects ropeAttachedTo ropeAttachEnabled ropeAttachTo ropeCreate ropeCut ropeEndPosition ropeLength ropes ropeUnwind ropeUnwound rotorsForcesRTD rotorsRpmRTD round runInitScript safeZoneH safeZoneW safeZoneWAbs safeZoneX safeZoneXAbs safeZoneY saveGame saveIdentity saveJoysticks saveOverlay saveProfileNamespace saveStatus saveVar savingEnabled say say2D say3D scopeName score scoreSide screenToWorld scriptDone scriptName scriptNull scudState secondaryWeapon secondaryWeaponItems secondaryWeaponMagazine select selectBestPlaces selectDiarySubject selectedEditorObjects selectEditorObject selectionPosition selectLeader selectNoPlayer selectPlayer selectWeapon selectWeaponTurret sendAUMessage sendSimpleCommand sendTask sendTaskResult sendUDPMessage serverCommand serverCommandAvailable serverCommandExecutable serverTime set setAccTime setAirportSide setAmmo setAmmoCargo setAperture setApertureNew setArmoryPoints setAttributes setAutonomous setBehaviour setBleedingRemaining setCameraInterest setCamShakeDefParams setCamShakeParams setCamUseTi setCaptive setCenterOfMass setCollisionLight setCombatMode setCompassOscillation setCuratorCameraAreaCeiling setCuratorCoef setCuratorEditingAreaType setCuratorWaypointCost setCurrentTask setCurrentWaypoint setDamage setDammage setDate setDebriefingText setDefaultCamera setDestination setDir setDirection setDrawIcon setDropInterval setEditorMode setEditorObjectScope setEffectCondition setFace setFaceAnimation setFatigue setFlagOwner setFlagSide setFlagTexture setFog setFog array setFormation setFormationTask setFormDir setFriend setFromEditor setFSMVariable setFuel setFuelCargo setGroupIcon setGroupIconParams setGroupIconsSelectable setGroupIconsVisible setGroupId setGusts setHideBehind setHit setHitPointDamage setHorizonParallaxCoef setHUDMovementLevels setIdentity setImportance setLeader setLightAmbient setLightAttenuation setLightBrightness setLightColor setLightDayLight setLightFlareMaxDistance setLightFlareSize setLightIntensity setLightnings setLightUseFlare setLocalWindParams setMagazineTurretAmmo setMarkerAlpha setMarkerAlphaLocal setMarkerBrush setMarkerBrushLocal setMarkerColor setMarkerColorLocal setMarkerDir setMarkerDirLocal setMarkerPos setMarkerPosLocal setMarkerShape setMarkerShapeLocal setMarkerSize setMarkerSizeLocal setMarkerText setMarkerTextLocal setMarkerType setMarkerTypeLocal setMass setMimic setMousePosition setMusicEffect setMusicEventHandler setName setNameSound setObjectArguments setObjectMaterial setObjectProxy setObjectTexture setObjectTextureGlobal setObjectViewDistance setOvercast setOwner setOxygenRemaining setParticleCircle setParticleClass setParticleFire setParticleParams setParticleRandom setPilotLight setPiPEffect setPitch setPlayable setPlayerRespawnTime setPos setPosASL setPosASL2 setPosASLW setPosATL setPosition setPosWorld setRadioMsg setRain setRainbow setRandomLip setRank setRectangular setRepairCargo setShadowDistance setSide setSimpleTaskDescription setSimpleTaskDestination setSimpleTaskTarget setSimulWeatherLayers setSize setSkill setSkill array setSlingLoad setSoundEffect setSpeaker setSpeech setSpeedMode setStatValue setSystemOfUnits setTargetAge setTaskResult setTaskState setTerrainGrid setText setTimeMultiplier setTitleEffect setTriggerActivation setTriggerArea setTriggerStatements setTriggerText setTriggerTimeout setTriggerType setType setUnconscious setUnitAbility setUnitPos setUnitPosWeak setUnitRank setUnitRecoilCoefficient setUnloadInCombat setUserActionText setVariable setVectorDir setVectorDirAndUp setVectorUp setVehicleAmmo setVehicleAmmoDef setVehicleArmor setVehicleId setVehicleLock setVehiclePosition setVehicleTiPars setVehicleVarName setVelocity setVelocityTransformation setViewDistance setVisibleIfTreeCollapsed setWaves setWaypointBehaviour setWaypointCombatMode setWaypointCompletionRadius setWaypointDescription setWaypointFormation setWaypointHousePosition setWaypointLoiterRadius setWaypointLoiterType setWaypointName setWaypointPosition setWaypointScript setWaypointSpeed setWaypointStatements setWaypointTimeout setWaypointType setWaypointVisible setWeaponReloadingTime setWind setWindDir setWindForce setWindStr setWPPos show3DIcons showChat showCinemaBorder showCommandingMenu showCompass showCuratorCompass showGPS showHUD showLegend showMap shownArtilleryComputer shownChat shownCompass shownCuratorCompass showNewEditorObject shownGPS shownMap shownPad shownRadio shownUAVFeed shownWarrant shownWatch showPad showRadio showSubtitles showUAVFeed showWarrant showWatch showWaypoint side sideChat sideEnemy sideFriendly sideLogic sideRadio sideUnknown simpleTasks simulationEnabled simulCloudDensity simulCloudOcclusion simulInClouds simulWeatherSync sin size sizeOf skill skillFinal skipTime sleep sliderPosition sliderRange sliderSetPosition sliderSetRange sliderSetSpeed sliderSpeed slingLoadAssistantShown soldierMagazines someAmmo soundVolume spawn speaker speed speedMode sqrt squadParams stance startLoadingScreen step stop stopped str sunOrMoon supportInfo suppressFor surfaceIsWater surfaceNormal surfaceType swimInDepth switch switchableUnits switchAction switchCamera switchGesture switchLight switchMove synchronizedObjects synchronizedTriggers synchronizedWaypoints synchronizeObjectsAdd synchronizeObjectsRemove synchronizeTrigger synchronizeWaypoint synchronizeWaypoint trigger systemChat systemOfUnits tan targetsAggregate targetsQuery taskChildren taskCompleted taskDescription taskDestination taskHint taskNull taskParent taskResult taskState teamMember teamMemberNull teamName teams teamSwitch teamSwitchEnabled teamType terminate terrainIntersect terrainIntersectASL text text location textLog textLogFormat tg then throw time timeMultiplier titleCut titleFadeOut titleObj titleRsc titleText to toArray toLower toString toUpper triggerActivated triggerActivation triggerArea triggerAttachedVehicle triggerAttachObject triggerAttachVehicle triggerStatements triggerText triggerTimeout triggerTimeoutCurrent triggerType true try turretLocal turretOwner turretUnit tvAdd tvClear tvCollapse tvCount tvCurSel tvData tvDelete tvExpand tvPicture tvSetCurSel tvSetData tvSetPicture tvSetValue tvSort tvSortByValue tvText tvValue type typeName typeOf UAVControl uiNamespace uiSleep unassignCurator unassignItem unassignTeam unassignVehicle underwater uniform uniformContainer uniformItems uniformMagazines unitAddons unitBackpack unitPos unitReady unitRecoilCoefficient units unitsBelowHeight unlinkItem unlockAchievement unregisterTask updateDrawIcon updateMenuItem updateObjectTree useAudioTimeForMoves vectorAdd vectorCos vectorCrossProduct vectorDiff vectorDir vectorDirVisual vectorDistance vectorDistanceSqr vectorDotProduct vectorFromTo vectorMagnitude vectorMagnitudeSqr vectorMultiply vectorNormalized vectorUp vectorUpVisual vehicle vehicleChat vehicleRadio vehicles vehicleVarName velocity velocityModelSpace verifySignature vest vestContainer vestItems vestMagazines viewDistance visibleCompass visibleGPS visibleMap visiblePosition visiblePositionASL visibleWatch waitUntil waves waypointAttachedObject waypointAttachedVehicle waypointAttachObject waypointAttachVehicle waypointBehaviour waypointCombatMode waypointCompletionRadius waypointDescription waypointFormation waypointHousePosition waypointLoiterRadius waypointLoiterType waypointName waypointPosition waypoints waypointScript waypointShow waypointSpeed waypointStatements waypointTimeout waypointTimeoutCurrent waypointType waypointVisible weaponAccessories weaponCargo weaponDirection weaponLowered weapons weaponsItems weaponsItemsCargo weaponState weaponsTurret weightRTD west WFSideText while wind windDir windStr with worldName worldToModel worldToModelVisual worldToScreen + BIS_fnc_3Dcredits BIS_fnc_AAN BIS_fnc_absSpeed BIS_fnc_activateAddons BIS_fnc_addClassOO BIS_fnc_addCommMenuItem BIS_fnc_addCuratorAreaFromTrigger BIS_fnc_addCuratorChallenge BIS_fnc_addCuratorIcon BIS_fnc_addEvidence BIS_fnc_addRespawnInventory BIS_fnc_addRespawnPosition BIS_fnc_addScore BIS_fnc_addScriptedEventHandler BIS_fnc_addStackedEventHandler BIS_fnc_addSupportLink BIS_fnc_addToPairs BIS_fnc_addVirtualBackpackCargo BIS_fnc_addVirtualItemCargo BIS_fnc_addVirtualMagazineCargo BIS_fnc_addVirtualWeaponCargo BIS_fnc_addWeapon BIS_fnc_advHint BIS_fnc_advHintArg BIS_fnc_advHintCall BIS_fnc_advHintCredits BIS_fnc_alignTabs BIS_fnc_allSynchronizedObjects BIS_fnc_ambientAnim BIS_fnc_ambientAnimCombat BIS_fnc_ambientAnimGetParams BIS_fnc_ambientBlacklist BIS_fnc_ambientBlacklistAdd BIS_fnc_ambientBoats BIS_fnc_ambientFlyby BIS_fnc_ambientHelicopters BIS_fnc_ambientPlanes BIS_fnc_ambientPostprocess BIS_fnc_animalBehaviour BIS_fnc_animalSiteSpawn BIS_fnc_animateTaskWaypoint BIS_fnc_animType BIS_fnc_animViewer BIS_fnc_areEqual BIS_fnc_areFriendly BIS_fnc_arithmeticMean BIS_fnc_arrayCompare BIS_fnc_arrayFindDeep BIS_fnc_arrayInsert BIS_fnc_arrayPop BIS_fnc_arrayPush BIS_fnc_arrayPushStack BIS_fnc_arrayShift BIS_fnc_arrayShuffle BIS_fnc_arrayUnShift BIS_fnc_arsenal BIS_fnc_assignPlayerRole BIS_fnc_baseWeapon BIS_fnc_basicBackpack BIS_fnc_basicTask BIS_fnc_blackIn BIS_fnc_blackOut BIS_fnc_bleedTickets BIS_fnc_bloodEffect BIS_fnc_boundingBoxCorner BIS_fnc_boundingBoxDimensions BIS_fnc_boundingBoxMarker BIS_fnc_boundingCircle BIS_fnc_briefingAnimate BIS_fnc_briefingInit BIS_fnc_buildingPositions BIS_fnc_call BIS_fnc_callScriptedEventHandler BIS_fnc_camera BIS_fnc_cameraOld BIS_fnc_camFollow BIS_fnc_changeSupportRadioChannel BIS_fnc_cinemaBorder BIS_fnc_classMagazine BIS_fnc_classWeapon BIS_fnc_codePerformance BIS_fnc_colorConfigToRGBA BIS_fnc_colorRGBAtoHTML BIS_fnc_colorRGBAtoTexture BIS_fnc_colorRGBtoHTML BIS_fnc_commsMenuCreate BIS_fnc_commsMenuToggleAvailability BIS_fnc_commsMenuToggleVisibility BIS_fnc_completedCuratorChallengesCount BIS_fnc_conditionalSelect BIS_fnc_configPath BIS_fnc_configviewer BIS_fnc_consolidateArray BIS_fnc_convertUnits BIS_fnc_countdown BIS_fnc_counter BIS_fnc_createLogRecord BIS_fnc_createmenu BIS_fnc_createObjectOO BIS_fnc_credits BIS_fnc_credits_movie BIS_fnc_credits_movieConfig BIS_fnc_credits_movieSupport BIS_fnc_crewCount BIS_fnc_crossProduct BIS_fnc_crows BIS_fnc_ctrlFitToTextHeight BIS_fnc_ctrlSetScale BIS_fnc_ctrlTextHeight BIS_fnc_curatorAttachObject BIS_fnc_curatorAttributes BIS_fnc_curatorAutomatic BIS_fnc_curatorAutomaticPositions BIS_fnc_curatorChallengeDestroyVehicle BIS_fnc_curatorChallengeFindIntel BIS_fnc_curatorChallengeFireWeapon BIS_fnc_curatorChallengeGetInVehicle BIS_fnc_curatorChallengeIlluminate BIS_fnc_curatorChallengeSpawnLightning BIS_fnc_curatorHint BIS_fnc_curatorObjectEdited BIS_fnc_curatorObjectPlaced BIS_fnc_curatorObjectRegistered BIS_fnc_curatorObjectRegisteredTable BIS_fnc_curatorPinged BIS_fnc_curatorRespawn BIS_fnc_curatorSayMessage BIS_fnc_curatorVisionModes BIS_fnc_curatorWaypointPlaced BIS_fnc_customGPS BIS_fnc_customGPSvideo BIS_fnc_customGPSVideo BIS_fnc_cutDecimals BIS_fnc_damageChanged BIS_fnc_damagePulsing BIS_fnc_dbClassCheck BIS_fnc_dbClassId BIS_fnc_dbClassIndex BIS_fnc_dbClassList BIS_fnc_dbClassRemove BIS_fnc_dbClassReturn BIS_fnc_dbClassSet BIS_fnc_dbConfigPath BIS_fnc_dbImportConfig BIS_fnc_dbImportXML BIS_fnc_dbisClass BIS_fnc_dbisValue BIS_fnc_dbPrint BIS_fnc_dbSymbolClass BIS_fnc_dbSymbolValue BIS_fnc_dbValueCheck BIS_fnc_dbValueId BIS_fnc_dbValueIndex BIS_fnc_dbValueList BIS_fnc_dbValueRemove BIS_fnc_dbValueReturn BIS_fnc_dbValueSet BIS_fnc_deleteInventory BIS_fnc_deleteTask BIS_fnc_destroyCity BIS_fnc_diagAAR BIS_fnc_diagAARrecord BIS_fnc_diagAnim BIS_fnc_diagBulletCam BIS_fnc_diagConfig BIS_fnc_diagFindMissingAuthors BIS_fnc_diagHit BIS_fnc_diagKey BIS_fnc_diagKeyLayout BIS_fnc_diagKeyTest BIS_fnc_diagKnownAsTarget BIS_fnc_diagKnownTargets BIS_fnc_diagLoop BIS_fnc_diagMacros BIS_fnc_diagMacrosAuthor BIS_fnc_diagMacrosMapSize BIS_fnc_diagMacrosNameSound BIS_fnc_diagMacrosVerify BIS_fnc_diagMissionPositions BIS_fnc_diagMissionWeapons BIS_fnc_diagPreview BIS_fnc_diagPreviewCycle BIS_fnc_diagPreviewVehicleCrew BIS_fnc_diagRadio BIS_fnc_diagVehicleIcons BIS_fnc_diagWiki BIS_fnc_diaryHints BIS_fnc_diaryMaps BIS_fnc_dirIndicator BIS_fnc_dirtEffect BIS_fnc_dirTo BIS_fnc_disableSaving BIS_fnc_displayClouds BIS_fnc_displayColorGet BIS_fnc_displayColorSet BIS_fnc_displayControls BIS_fnc_displayLoading BIS_fnc_displayMission BIS_fnc_displayName BIS_fnc_displayResize BIS_fnc_distance2D BIS_fnc_distance2Dsqr BIS_fnc_dotProduct BIS_fnc_drawAO BIS_fnc_drawCuratorDeaths BIS_fnc_drawCuratorLocations BIS_fnc_drawCuratorRespawnMarkers BIS_fnc_drawMinefields BIS_fnc_drawRespawnPositions BIS_fnc_dynamicText BIS_fnc_earthquake BIS_fnc_effectFired BIS_fnc_effectFiredArtillery BIS_fnc_effectFiredFlares BIS_fnc_effectFiredHeliRocket BIS_fnc_effectFiredLongSmoke BIS_fnc_effectFiredRifle BIS_fnc_effectFiredRocket BIS_fnc_effectFiredSmokeLauncher BIS_fnc_effectFiredSmokeLauncher_boat BIS_fnc_effectKilled BIS_fnc_effectKilledAirDestruction BIS_fnc_effectKilledAirDestructionStage2 BIS_fnc_effectKilledSecondaries BIS_fnc_effectPlankton BIS_fnc_enableSaving BIS_fnc_endLoadingScreen BIS_fnc_endMission BIS_fnc_endMissionServer BIS_fnc_enemyDetected BIS_fnc_enemySides BIS_fnc_enemyTargets BIS_fnc_error BIS_fnc_errorMsg BIS_fnc_establishingShot BIS_fnc_estimatedTimeLeft BIS_fnc_execFSM BIS_fnc_execRemote BIS_fnc_executeStackedEventHandler BIS_fnc_execVM BIS_fnc_exportCfgGroups BIS_fnc_exportCfgHints BIS_fnc_exportCfgMagazines BIS_fnc_exportCfgPatches BIS_fnc_exportCfgVehicles BIS_fnc_exportCfgWeapons BIS_fnc_exportCuratorCostTable BIS_fnc_exportFunctionsToWiki BIS_fnc_exportGroupFormations BIS_fnc_exportInventory BIS_fnc_exportMapToBiTXT BIS_fnc_fadeEffect BIS_fnc_fatigueEffect BIS_fnc_feedbackInit BIS_fnc_feedbackMain BIS_fnc_filterString BIS_fnc_findExtreme BIS_fnc_findInPairs BIS_fnc_findNestedElement BIS_fnc_findOverwatch BIS_fnc_findSafePos BIS_fnc_finishCuratorChallenge BIS_fnc_fixDate BIS_fnc_flamesEffect BIS_fnc_flies BIS_fnc_forceCuratorInterface BIS_fnc_forceEnd BIS_fnc_formatCuratorChallengeObjects BIS_fnc_fps BIS_fnc_friendlySides BIS_fnc_FTLmanager BIS_fnc_functionMeta BIS_fnc_functionPath BIS_fnc_functionsDebug BIS_fnc_GC BIS_fnc_GCinit BIS_fnc_genericSentence BIS_fnc_genericSentenceInit BIS_fnc_geometricMean BIS_fnc_getCfgData BIS_fnc_getCfgDataArray BIS_fnc_getCfgDataBool BIS_fnc_getCfgDataObject BIS_fnc_getCfgDataPool BIS_fnc_getCfgIsClass BIS_fnc_getCfgSubClasses BIS_fnc_getFactions BIS_fnc_getFromPairs BIS_fnc_getIDC BIS_fnc_getIDD BIS_fnc_getLineDist BIS_fnc_getParamValue BIS_fnc_getPitchBank G_cont. BIS_fnc_getRespawnInventories BIS_fnc_getRespawnMarkers BIS_fnc_getRespawnPositions BIS_fnc_getServerVariable BIS_fnc_getTurrets BIS_fnc_getUnitByUid BIS_fnc_getUnitInsignia BIS_fnc_getVirtualBackpackCargo BIS_fnc_getVirtualItemCargo BIS_fnc_getVirtualMagazineCargo BIS_fnc_getVirtualWeaponCargo BIS_fnc_greatestNum BIS_fnc_groupIndicator BIS_fnc_groupVehicles BIS_fnc_GUIbackground BIS_fnc_GUIeditor BIS_fnc_guiEffectTiles BIS_fnc_GUIgrid BIS_fnc_GUIgridToProfile BIS_fnc_GUIhint BIS_fnc_guiMessage BIS_fnc_GUImessage BIS_fnc_GUInewsfeed BIS_fnc_halo BIS_fnc_halt BIS_fnc_healing BIS_fnc_healthEffects BIS_fnc_helicopterCanFly BIS_fnc_helicopterDamage BIS_fnc_helicopterGetHitpoints BIS_fnc_helicopterSeat BIS_fnc_helicopterSeatMove BIS_fnc_helicopterType BIS_fnc_help BIS_fnc_HUDLimits BIS_fnc_importImageLinks BIS_fnc_inAngleSector BIS_fnc_incapacitatedEffect BIS_fnc_indicateBleeding BIS_fnc_infoText BIS_fnc_initCuratorAttribute BIS_fnc_initExpo BIS_fnc_initIntelObject BIS_fnc_initModules BIS_fnc_initMultiplayer BIS_fnc_initParams BIS_fnc_initPlayable BIS_fnc_initRespawn BIS_fnc_initRespawnBackpack BIS_fnc_initVirtualUnit BIS_fnc_inString BIS_fnc_InstructorFigure BIS_fnc_interpolateWeather BIS_fnc_inTrigger BIS_fnc_inv BIS_fnc_invAdd BIS_fnc_invCodeToArray BIS_fnc_invRemove BIS_fnc_invSlots BIS_fnc_invSlotsEmpty BIS_fnc_invSlotType BIS_fnc_invString BIS_fnc_isBuildingEnterable BIS_fnc_isCampaign BIS_fnc_isCurator BIS_fnc_isCuratorEditable BIS_fnc_isDemo BIS_fnc_isForcedCuratorInterface BIS_fnc_isInFrontOf BIS_fnc_isInsideArea BIS_fnc_isInZoom BIS_fnc_isLeapYear BIS_fnc_isLoading BIS_fnc_isLocalized BIS_fnc_isPosBlacklisted BIS_fnc_isUnitVirtual BIS_fnc_itemType BIS_fnc_jukebox BIS_fnc_kbCanSpeak BIS_fnc_kbCreateDummy BIS_fnc_kbIsSpeaking BIS_fnc_kbMenu BIS_fnc_kbPriority BIS_fnc_kbSentence BIS_fnc_kbSkip BIS_fnc_kbTell BIS_fnc_kbTellLocal BIS_fnc_kbTopicConfig BIS_fnc_keyCode BIS_fnc_keypointsExport BIS_fnc_keypointsExportFromKML BIS_fnc_KMLimport BIS_fnc_limitSupport BIS_fnc_linearConversion BIS_fnc_listCuratorPlayers BIS_fnc_listPlayers BIS_fnc_liveFeed BIS_fnc_liveFeedEffects BIS_fnc_liveFeedModuleEffects BIS_fnc_liveFeedModuleInit BIS_fnc_liveFeedModuleSetSource BIS_fnc_liveFeedModuleSetTarget BIS_fnc_liveFeedSetSource BIS_fnc_liveFeedSetTarget BIS_fnc_liveFeedTerminate BIS_fnc_loadClass BIS_fnc_loadEntry BIS_fnc_loadFunctions BIS_fnc_loadInventory BIS_fnc_localize BIS_fnc_locationDescription BIS_fnc_locations BIS_fnc_locWeaponInfo BIS_fnc_log BIS_fnc_logFormat BIS_fnc_loop BIS_fnc_lowestNum BIS_fnc_magnitude BIS_fnc_magnitudeSqr BIS_fnc_manageCuratorAddons BIS_fnc_manageCuratorChallenges BIS_fnc_mapSize BIS_fnc_markerCreate BIS_fnc_markerParams BIS_fnc_markerPath BIS_fnc_markerToTrigger BIS_fnc_markWaypoints BIS_fnc_maxDiffArray BIS_fnc_mirrorCuratorSettings BIS_fnc_miscanim BIS_fnc_missileLaunchPositionFix BIS_fnc_missionConversations BIS_fnc_missionConversationsLocal BIS_fnc_missionFlow BIS_fnc_missionHandlers BIS_fnc_missionRespawnType BIS_fnc_missionTasks BIS_fnc_missionTasksLocal BIS_fnc_missionTimeLeft BIS_fnc_moduleAI BIS_fnc_moduleAmmo BIS_fnc_moduleAnimals BIS_fnc_moduleArsenal BIS_fnc_moduleBleedTickets BIS_fnc_moduleBootcampStage BIS_fnc_moduleCAS BIS_fnc_moduleChat BIS_fnc_moduleCombatGetIn BIS_fnc_moduleCountdown BIS_fnc_moduleCoverMap BIS_fnc_moduleCreateDiaryRecord BIS_fnc_moduleCreateProjectile BIS_fnc_moduleCurator BIS_fnc_moduleCuratorAddAddons BIS_fnc_moduleCuratorAddCameraArea BIS_fnc_moduleCuratorAddEditableObjects BIS_fnc_moduleCuratorAddEditingArea BIS_fnc_moduleCuratorAddEditingAreaPlayers BIS_fnc_moduleCuratorAddIcon BIS_fnc_moduleCuratorAddPoints BIS_fnc_moduleCuratorSetAttributes BIS_fnc_moduleCuratorSetCamera BIS_fnc_moduleCuratorSetCoefs BIS_fnc_moduleCuratorSetCostsDefault BIS_fnc_moduleCuratorSetCostsSide BIS_fnc_moduleCuratorSetCostsVehicleClass BIS_fnc_moduleCuratorSetEditingAreaType BIS_fnc_moduleCuratorSetObjectCost BIS_fnc_moduleDamage BIS_fnc_moduleDate BIS_fnc_moduleDiary BIS_fnc_moduleDoorOpen BIS_fnc_moduleEffectsBubbles BIS_fnc_moduleEffectsEmitterCreator BIS_fnc_moduleEffectsFire BIS_fnc_moduleEffectsPlankton BIS_fnc_moduleEffectsShells BIS_fnc_moduleEffectsSmoke BIS_fnc_moduleEndMission BIS_fnc_moduleExecute BIS_fnc_moduleFDCPClear BIS_fnc_moduleFDCPIn BIS_fnc_moduleFDCPOut BIS_fnc_moduleFDFadeMarker BIS_fnc_moduleFDSkeetDestruction BIS_fnc_moduleFDStatsClear BIS_fnc_moduleFiringDrill BIS_fnc_moduleFriendlyFire BIS_fnc_moduleFuel BIS_fnc_moduleGenericRadio BIS_fnc_moduleGroupID BIS_fnc_moduleHandle BIS_fnc_moduleHealth BIS_fnc_moduleHint BIS_fnc_moduleHQ BIS_fnc_moduleInit BIS_fnc_moduleLightning BIS_fnc_moduleMine BIS_fnc_moduleMissionName BIS_fnc_moduleMode BIS_fnc_moduleModules BIS_fnc_moduleMPTypeDefense BIS_fnc_moduleMPTypeGameMaster BIS_fnc_moduleMPTypeSectorControl BIS_fnc_moduleMPTypeSeize BIS_fnc_moduleObjective BIS_fnc_moduleObjectiveFind BIS_fnc_moduleObjectiveGetIn BIS_fnc_moduleObjectiveMove BIS_fnc_moduleObjectiveRaceCP BIS_fnc_moduleObjectiveRaceFinish BIS_fnc_moduleObjectiveRaceStart BIS_fnc_moduleObjectiveSector BIS_fnc_moduleObjectiveTarget BIS_fnc_modulePositioning BIS_fnc_modulePoster BIS_fnc_modulePostprocess BIS_fnc_moduleProjectile BIS_fnc_modulePunishment BIS_fnc_moduleRadioChannelCreate BIS_fnc_moduleRank BIS_fnc_moduleRating BIS_fnc_moduleRemoteControl BIS_fnc_moduleRespawnInventory BIS_fnc_moduleRespawnPosition BIS_fnc_moduleRespawnTickets BIS_fnc_moduleRespawnVehicle BIS_fnc_moduleSaveGame BIS_fnc_moduleSector BIS_fnc_moduleSFX BIS_fnc_moduleShowHide BIS_fnc_moduleSimulationManager BIS_fnc_moduleSkill BIS_fnc_moduleSkiptime BIS_fnc_moduleSound BIS_fnc_moduleStrategicMapImage BIS_fnc_moduleStrategicMapInit BIS_fnc_moduleStrategicMapMission BIS_fnc_moduleStrategicMapOpen BIS_fnc_moduleStrategicMapORBAT BIS_fnc_moduleTaskCreate BIS_fnc_moduleTaskSetDescription BIS_fnc_moduleTaskSetDestination BIS_fnc_moduleTaskSetState BIS_fnc_moduleTimeTrial BIS_fnc_moduleTracers BIS_fnc_moduleTrident BIS_fnc_moduleTriggers BIS_fnc_moduleTTCPClear BIS_fnc_moduleTTCPIn BIS_fnc_moduleTTCPOut BIS_fnc_moduleTTCPTrigger BIS_fnc_moduleTTCPTriggerBehind BIS_fnc_moduleTTStatsClear BIS_fnc_moduleUnits BIS_fnc_moduleUnlockArea BIS_fnc_moduleUnlockObject BIS_fnc_moduleVolume BIS_fnc_moduleWeather BIS_fnc_moduleZoneProtection BIS_fnc_moduleZoneRestriction BIS_fnc_monthDays BIS_fnc_moveAction BIS_fnc_moveIn BIS_fnc_moveToRespawnPosition BIS_fnc_MP BIS_fnc_MPexec BIS_fnc_music BIS_fnc_nearestHelipad BIS_fnc_nearestNum BIS_fnc_nearestPosition BIS_fnc_nearestRoad BIS_fnc_neutralizeUnit BIS_fnc_noFlyZone BIS_fnc_noFlyZonesCreate BIS_fnc_noFlyZonesExport BIS_fnc_numberDigits BIS_fnc_numberText BIS_fnc_objectHeight BIS_fnc_ObjectsGrabber BIS_fnc_objectSide BIS_fnc_ObjectsMapper BIS_fnc_objectType BIS_fnc_objectVar BIS_fnc_onDiaryChanged BIS_fnc_onEnd BIS_fnc_onLoad BIS_fnc_onPlayerConnected BIS_fnc_ORBATAddGroupOverlay BIS_fnc_ORBATAnimate BIS_fnc_ORBATConfigPreview BIS_fnc_ORBATGetGroupParams BIS_fnc_ORBATOpen O_cont. BIS_fnc_ORBATRemoveGroupOverlay BIS_fnc_ORBATSetGroupFade BIS_fnc_ORBATSetGroupParams BIS_fnc_ORBATTooltip BIS_fnc_ordinalNumber BIS_fnc_overviewAuthor BIS_fnc_overviewDifficulty BIS_fnc_overviewMission BIS_fnc_overviewTerrain BIS_fnc_overviewTimeTrial BIS_fnc_packStaticWeapon BIS_fnc_param BIS_fnc_paramCountdown BIS_fnc_paramDaytime BIS_fnc_paramGuerFriendly BIS_fnc_paramIn BIS_fnc_paramRespawnTickets BIS_fnc_paramWeather BIS_fnc_parseNumber BIS_fnc_phoneticalWord BIS_fnc_PIP BIS_fnc_playEndMusic BIS_fnc_playerName BIS_fnc_playerSideFaction BIS_fnc_playMusic BIS_fnc_playSound BIS_fnc_playVideo BIS_fnc_posDegtoUTM BIS_fnc_posDegToWorld BIS_fnc_position BIS_fnc_PosToGrid BIS_fnc_posUTMToDeg BIS_fnc_preload BIS_fnc_prepareAO BIS_fnc_progressLoadingScreen BIS_fnc_quotations BIS_fnc_radialRed BIS_fnc_radialRedOut BIS_fnc_radioSetChannel BIS_fnc_radioSetPlaylist BIS_fnc_radioSetTrack BIS_fnc_randomIndex BIS_fnc_randomInt BIS_fnc_randomNum BIS_fnc_randomPos BIS_fnc_randomPosTrigger BIS_fnc_rankParams BIS_fnc_recompile BIS_fnc_refreshCommMenu BIS_fnc_registerCuratorObject BIS_fnc_relativeDirTo BIS_fnc_relPos BIS_fnc_relPosObject BIS_fnc_relScaledDist BIS_fnc_removeAllScriptedEventHandlers BIS_fnc_removeCommMenuItem BIS_fnc_removeCuratorIcon BIS_fnc_removeDestroyedCuratorEditableObjects BIS_fnc_removeFromPairs BIS_fnc_removeIndex BIS_fnc_removeNestedElement BIS_fnc_removeRespawnInventory BIS_fnc_removeRespawnPosition BIS_fnc_removeScriptedEventHandler BIS_fnc_removeStackedEventHandler BIS_fnc_removeSupportLink BIS_fnc_removeVirtualBackpackCargo BIS_fnc_removeVirtualItemCargo BIS_fnc_removeVirtualMagazineCargo BIS_fnc_removeVirtualWeaponCargo BIS_fnc_respawnBase BIS_fnc_respawnConfirm BIS_fnc_respawnCounter BIS_fnc_respawnEndMission BIS_fnc_respawnGroup BIS_fnc_respawnInstant BIS_fnc_RespawnManager BIS_fnc_respawnMenuInventory BIS_fnc_respawnMenuPosition BIS_fnc_respawnMenuSpectator BIS_fnc_respawnNone BIS_fnc_respawnRounds BIS_fnc_respawnSeagull BIS_fnc_respawnSide BIS_fnc_respawnSpectator BIS_fnc_respawnTickets BIS_fnc_respawnTimePenalty BIS_fnc_respawnWave BIS_fnc_respect BIS_fnc_returnChildren BIS_fnc_returnConfigEntry BIS_fnc_returnGroupComposition BIS_fnc_returnNestedElement BIS_fnc_returnParents BIS_fnc_returnVehicleTurrets BIS_fnc_romanNumeral BIS_fnc_rotateVector2D BIS_fnc_roundDir BIS_fnc_roundNum BIS_fnc_rscLayer BIS_fnc_runLater BIS_fnc_sandstorm BIS_fnc_saveGame BIS_fnc_saveInventory BIS_fnc_sayMessage BIS_fnc_sceneAreaClearance BIS_fnc_sceneCheckWeapons BIS_fnc_sceneCreateSceneTrigger BIS_fnc_sceneCreateSoundEntities BIS_fnc_sceneGetObjects BIS_fnc_sceneGetParticipants BIS_fnc_sceneGetPositionByAngle BIS_fnc_sceneIntruderDetector BIS_fnc_sceneMiscStuff BIS_fnc_sceneRotate BIS_fnc_sceneSetAnimationsForGroup BIS_fnc_sceneSetBehaviour BIS_fnc_sceneSetObjects BIS_fnc_sceneSetPosFormation BIS_fnc_scriptedMove BIS_fnc_scriptedWaypointType BIS_fnc_secondsToString BIS_fnc_selectCrew BIS_fnc_selectDiarySubject BIS_fnc_selectRandom BIS_fnc_selectRandomWeighted BIS_fnc_selectRespawnTemplate BIS_fnc_setCuratorAttributes BIS_fnc_setCuratorCamera BIS_fnc_setCuratorVisionModes BIS_fnc_setDate BIS_fnc_setFog BIS_fnc_setHeight BIS_fnc_setIDCStreamFriendly BIS_fnc_setNestedElement BIS_fnc_setObjectTexture BIS_fnc_setOvercast BIS_fnc_setPitchBank BIS_fnc_setPPeffectTemplate BIS_fnc_setRank BIS_fnc_setRespawnDelay BIS_fnc_setRespawnInventory BIS_fnc_setServerVariable BIS_fnc_setTask BIS_fnc_setTaskLocal BIS_fnc_setToPairs BIS_fnc_setUnitInsignia BIS_fnc_shakeCuratorCamera BIS_fnc_shakeGauges BIS_fnc_showCuratorAttributes BIS_fnc_showCuratorFeedbackMessage BIS_fnc_showMarkers BIS_fnc_showNotification BIS_fnc_showRespawnMenu BIS_fnc_showTime BIS_fnc_showUnitInfo BIS_fnc_shutdown BIS_fnc_sideColor BIS_fnc_sideID BIS_fnc_sideName BIS_fnc_sideType BIS_fnc_singleMissionConfig BIS_fnc_singleMissionKeys BIS_fnc_singleMissionName BIS_fnc_skirmishTrigger BIS_fnc_sortAlphabetically BIS_fnc_objectsGrabber BIS_fnc_sortBy BIS_fnc_sortNum BIS_fnc_spawn BIS_fnc_spawnCrew BIS_fnc_spawnEnemy BIS_fnc_spawnGroup BIS_fnc_spawnObjects BIS_fnc_spawnVehicle BIS_fnc_splitString BIS_fnc_spotter BIS_fnc_startLoadingScreen BIS_fnc_StrategicMapAnimate BIS_fnc_StrategicMapMouseButtonClick BIS_fnc_StrategicMapOpen BIS_fnc_subClasses BIS_fnc_subSelect BIS_fnc_supplydrop BIS_fnc_supplydropService BIS_fnc_swapVars BIS_fnc_target BIS_fnc_taskAttack BIS_fnc_taskChildren BIS_fnc_taskCompleted BIS_fnc_taskCreate BIS_fnc_taskCurrent BIS_fnc_taskDefend BIS_fnc_taskDescription BIS_fnc_taskDestination BIS_fnc_taskExists BIS_fnc_taskHandler BIS_fnc_taskHint BIS_fnc_taskParent BIS_fnc_taskPatrol BIS_fnc_taskReal BIS_fnc_taskSetCurrent BIS_fnc_taskSetDescription BIS_fnc_taskSetDestination BIS_fnc_taskSetState BIS_fnc_taskState BIS_fnc_tasksUnit BIS_fnc_taskVar BIS_fnc_teamColor BIS_fnc_terrainGradAngle BIS_fnc_textTiles BIS_fnc_textureMarker BIS_fnc_textureVehicleIcon BIS_fnc_threat BIS_fnc_timeToString BIS_fnc_titlecard BIS_fnc_titleText BIS_fnc_toggleCuratorVisionMode BIS_fnc_toUpperDisplayTexts BIS_fnc_traceBullets BIS_fnc_trackMissionTime BIS_fnc_transportService BIS_fnc_tridentClient BIS_fnc_tridentExecute BIS_fnc_tridentGetRelationship BIS_fnc_tridentHandleDamage BIS_fnc_tridentSetRelationship BIS_fnc_triggerToMarker BIS_fnc_trimString BIS_fnc_typeText BIS_fnc_typeText2 BIS_fnc_uniqueClasses BIS_fnc_unitAddon BIS_fnc_UnitCapture BIS_fnc_UnitCaptureFiring BIS_fnc_UnitCaptureSimple BIS_fnc_UnitPlay BIS_fnc_UnitPlayFiring BIS_fnc_UnitPlaySimple BIS_fnc_unitVector BIS_fnc_unpackStaticWeapon BIS_fnc_updatePlayerArray BIS_fnc_validateParametersOO BIS_fnc_variableSpaceAdd BIS_fnc_variableSpaceRemove BIS_fnc_vectorAdd BIS_fnc_vectorDiff BIS_fnc_vectorFromXToY BIS_fnc_vectorMultiply BIS_fnc_vehicleRoles BIS_fnc_version BIS_fnc_VRCourseBallistics1 BIS_fnc_VRCourseBallistics2 BIS_fnc_VRCourseBallistics3 BIS_fnc_VRCourseBallistics4 BIS_fnc_VRCourseCommandingActions1 BIS_fnc_VRCourseCommandingActions2 BIS_fnc_VRCourseCommandingActions3 BIS_fnc_VRCourseCommandingBehaviour1 BIS_fnc_VRCourseCommandingBehaviour2 BIS_fnc_VRCourseCommandingBehaviour3 BIS_fnc_VRCourseCommandingMovement1 BIS_fnc_VRCourseCommandingMovement2 BIS_fnc_VRCourseCommandingVehicles1 BIS_fnc_VRCourseCommandingVehicles2 BIS_fnc_VRCourseCommandingVehicles3 BIS_fnc_VRCourseLaunchers1 BIS_fnc_VRCourseLaunchers2 BIS_fnc_VRCourseLaunchers3 BIS_fnc_VRCoursePlaceables1 BIS_fnc_VRCoursePlaceables2 BIS_fnc_VRCoursePlaceables3 BIS_fnc_VRCourseTargetDesignation1 BIS_fnc_VRCourseTargetDesignation2 BIS_fnc_VRCourseTargetDesignation3 BIS_fnc_VRDrawBorder BIS_fnc_VRDrawGrid BIS_fnc_VREffectKilled BIS_fnc_VRFadeIn BIS_fnc_VRFadeOut BIS_fnc_VRSpawnEffect BIS_fnc_VRSpawnSelector BIS_fnc_VRTimer BIS_fnc_weaponAddon BIS_fnc_weaponComponents BIS_fnc_worldArea BIS_fnc_wpArtillery BIS_fnc_wpLand BIS_fnc_wpPatrol BIS_fnc_wpRelax BIS_fnc_wpSuppress BIS_fnc_zzRotate + true false player _x _forEachIndex + blufor west opfor east indfor independent resistance civilian + _ + #define #undef #ifdef #else #endif #include + GVAR QGVAR EGVAR QEGVAR FUNC EFUNC DFUNC DEFUNC QFUNC QEFUNC CALLSTACK CALLSTACK_NAMED QUOTE + 00" 00' 01 02" 02' 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a4a7318eae8938c9150d83a536094707c260ab97 Mon Sep 17 00:00:00 2001 From: bux578 Date: Tue, 13 Jan 2015 16:16:10 +0100 Subject: [PATCH 2/9] change np++ sh colors --- tools/notepad++_SyntaxHighlighting_With_SQFandCBA.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/notepad++_SyntaxHighlighting_With_SQFandCBA.xml b/tools/notepad++_SyntaxHighlighting_With_SQFandCBA.xml index a37a6304df..2b89ed8af8 100644 --- a/tools/notepad++_SyntaxHighlighting_With_SQFandCBA.xml +++ b/tools/notepad++_SyntaxHighlighting_With_SQFandCBA.xml @@ -40,18 +40,18 @@ - + - + - + From eea6780e59bd843b44bb3a64d977e0bf509a03ae Mon Sep 17 00:00:00 2001 From: bux578 Date: Tue, 13 Jan 2015 16:23:48 +0100 Subject: [PATCH 3/9] add more macros to np++ sh --- tools/notepad++_SyntaxHighlighting_With_SQFandCBA.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/notepad++_SyntaxHighlighting_With_SQFandCBA.xml b/tools/notepad++_SyntaxHighlighting_With_SQFandCBA.xml index 2b89ed8af8..2ffc52f15e 100644 --- a/tools/notepad++_SyntaxHighlighting_With_SQFandCBA.xml +++ b/tools/notepad++_SyntaxHighlighting_With_SQFandCBA.xml @@ -31,7 +31,7 @@ blufor west opfor east indfor independent resistance civilian _ #define #undef #ifdef #else #endif #include - GVAR QGVAR EGVAR QEGVAR FUNC EFUNC DFUNC DEFUNC QFUNC QEFUNC CALLSTACK CALLSTACK_NAMED QUOTE + GVAR QGVAR EGVAR QEGVAR FUNC EFUNC DFUNC DEFUNC QFUNC QEFUNC CALLSTACK CALLSTACK_NAMED QUOTE PATHTOF PREP PREPMAIN FUNC_INNER DISPLAY CONTROL 00" 00' 01 02" 02' 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 From 9efc1f9547c0b448d71720c2c2bc37d66881abd8 Mon Sep 17 00:00:00 2001 From: commy2 Date: Tue, 13 Jan 2015 16:38:21 +0100 Subject: [PATCH 4/9] fix script errors --- addons/attach/functions/fnc_openAttachUI.sqf | 2 +- addons/interaction/XEH_preInit.sqf | 6 +++--- addons/interaction/config.cpp | 4 ++-- addons/interaction/functions/fnc_GetActions.sqf | 2 +- addons/interaction/functions/fnc_getActions2.sqf | 2 +- addons/interaction/functions/fnc_getCaptivityStatus.sqf | 4 ---- addons/interaction/functions/fnc_setCaptivityStatus.sqf | 4 ---- addons/interaction/functions/fnc_tapShoulder.sqf | 2 +- addons/switchunits/functions/fnc_switchUnit.sqf | 2 +- 9 files changed, 10 insertions(+), 18 deletions(-) delete mode 100644 addons/interaction/functions/fnc_getCaptivityStatus.sqf delete mode 100644 addons/interaction/functions/fnc_setCaptivityStatus.sqf diff --git a/addons/attach/functions/fnc_openAttachUI.sqf b/addons/attach/functions/fnc_openAttachUI.sqf index 5af80d2c9e..c36b3445ae 100644 --- a/addons/attach/functions/fnc_openAttachUI.sqf +++ b/addons/attach/functions/fnc_openAttachUI.sqf @@ -60,6 +60,6 @@ _attachables = items _unit; }, { call EFUNC(interaction,hideMenu); - if !(profileNamespace getVariable [EQGVAR(interaction,AutoCloseMenu), false]) then {"Default" call EFUNC(interaction,openMenuSelf)}; + if !(profileNamespace getVariable [QEGVAR(interaction,AutoCloseMenu), false]) then {"Default" call EFUNC(interaction,openMenuSelf)}; } ] call EFUNC(interaction,openSelectMenu); diff --git a/addons/interaction/XEH_preInit.sqf b/addons/interaction/XEH_preInit.sqf index e5093f77f2..e455223783 100644 --- a/addons/interaction/XEH_preInit.sqf +++ b/addons/interaction/XEH_preInit.sqf @@ -2,13 +2,13 @@ PREP(addInteraction); PREP(addInteractionSelf); -PREP(AddSelectableItem); +PREP(addSelectableItem); PREP(addToTooltip); PREP(applyButtons); PREP(canInteractWith); PREP(canTapShoulder); +PREP(getActions); PREP(getActions2); -PREP(GetActions); PREP(getDoor); PREP(getDoorAnimations); PREP(getDown); @@ -43,4 +43,4 @@ PREP(showMenu); PREP(showMouseHint); PREP(sortOptionsByPriority); PREP(tapShoulder); -PREP(updateTooltipPosition); \ No newline at end of file +PREP(updateTooltipPosition); diff --git a/addons/interaction/config.cpp b/addons/interaction/config.cpp index e59f861f79..62425636e7 100644 --- a/addons/interaction/config.cpp +++ b/addons/interaction/config.cpp @@ -522,8 +522,8 @@ class CfgVehicles { class ACE_Push { displayName = "$STR_ACE_Interaction_Push"; distance = 4; - condition = QUOTE( getMass _target < 1000 and alive _target ); - //statement = QUOTE( [_target, [2 * (vectorDir _player select 0), 2 * (vectorDir _player select 1), 0.5]] call FUNC(push); ); + condition = QUOTE(getMass _target < 1000 && {alive _target}); + statement = QUOTE([ARR_2(_target, [ARR_3(2 * (vectorDir _player select 0), 2 * (vectorDir _player select 1), 0.5)])] call FUNC(push);); showDisabled = 0; priority = -1; }; diff --git a/addons/interaction/functions/fnc_GetActions.sqf b/addons/interaction/functions/fnc_GetActions.sqf index 096050a6b3..30afaa095a 100644 --- a/addons/interaction/functions/fnc_GetActions.sqf +++ b/addons/interaction/functions/fnc_GetActions.sqf @@ -77,7 +77,7 @@ for "_i" from 0 to (_count - 1) do { _condition = getText (_action >> "condition"); if (_condition == "") then {_condition = "true"}; - _condition = _condition + format [QUOTE( && {%1 call EGVAR(core,canInteract)} && {[ACE_player, GVAR(Target)] call EFUNC(common,canInteractWith)} ), getArray (_action >> "exceptions")]; + _condition = _condition + format [QUOTE( && {%1 call EGVAR(core,canInteract)} && {[ARR_2(ACE_player, GVAR(Target))] call EFUNC(common,canInteractWith)} ), getArray (_action >> "exceptions")]; if (_enableInside != 1) then {_condition = _condition + " && {_player == _vehicle}"}; _condition = compile _condition; diff --git a/addons/interaction/functions/fnc_getActions2.sqf b/addons/interaction/functions/fnc_getActions2.sqf index 01c86d6db0..2f7ad4b07e 100644 --- a/addons/interaction/functions/fnc_getActions2.sqf +++ b/addons/interaction/functions/fnc_getActions2.sqf @@ -45,7 +45,7 @@ _cacheIndices = _cache select 2; _condition = getText (_action >> "condition"); if (_condition == "") then {_condition = "true"}; - _condition = _condition + format [QUOTE(&& {%1 call EFUNC(common,canInteract)} && {[ACE_player, GVAR(Target)] call FUNC(canInteractWith)}), getArray (_action >> "exceptions")]; + _condition = _condition + format [QUOTE(&& {%1 call EFUNC(common,canInteract)} && {[ARR_2(ACE_player, GVAR(Target))] call FUNC(canInteractWith)}), getArray (_action >> "exceptions")]; if (_enableInside != 1) then {_condition = _condition + " && {_player == _vehicle}"}; _condition = compile _condition; diff --git a/addons/interaction/functions/fnc_getCaptivityStatus.sqf b/addons/interaction/functions/fnc_getCaptivityStatus.sqf deleted file mode 100644 index e97b580ce5..0000000000 --- a/addons/interaction/functions/fnc_getCaptivityStatus.sqf +++ /dev/null @@ -1,4 +0,0 @@ -// by commy2 -#include "script_component.hpp" - -_this call EFUNC(common,getCaptivityStatus); diff --git a/addons/interaction/functions/fnc_setCaptivityStatus.sqf b/addons/interaction/functions/fnc_setCaptivityStatus.sqf deleted file mode 100644 index fc6c618590..0000000000 --- a/addons/interaction/functions/fnc_setCaptivityStatus.sqf +++ /dev/null @@ -1,4 +0,0 @@ -// by commy2 -#include "script_component.hpp" - -_this call EFUNC(common,setCaptivityStatus); diff --git a/addons/interaction/functions/fnc_tapShoulder.sqf b/addons/interaction/functions/fnc_tapShoulder.sqf index aedf6ce37f..9405be8ce8 100644 --- a/addons/interaction/functions/fnc_tapShoulder.sqf +++ b/addons/interaction/functions/fnc_tapShoulder.sqf @@ -9,7 +9,7 @@ _target = _this select 1; if (_target != ACE_player) exitWith { addCamShake [4, 0.5, 5]; if !(local _target) then { - [[_tapper, _target], QUOTE(FUNC(tapShoulder)), _target] call EFUNC(execRemoteFnc); + [[_tapper, _target], QUOTE(FUNC(tapShoulder)), _target] call EFUNC(common,execRemoteFnc); }; }; diff --git a/addons/switchunits/functions/fnc_switchUnit.sqf b/addons/switchunits/functions/fnc_switchUnit.sqf index 606fdccf22..7cbce96f90 100644 --- a/addons/switchunits/functions/fnc_switchUnit.sqf +++ b/addons/switchunits/functions/fnc_switchUnit.sqf @@ -48,7 +48,7 @@ _newUnit spawn { // should switch locality // This doesn't work anymore, because one's now able to switch to units from a different side //[_unit] joinSilent group player; - [[_unit, player], QUOTE({(_this select 0) setVariable [QGVAR(OriginalOwner), owner (_this select 0), true]; (_this select 0) setOwner owner (_this select 1)}), 1] call EFUNC(common,execRemoteFnc); + [[_unit, player], QUOTE({(_this select 0) setVariable [ARR_3(QUOTE(QGVAR(OriginalOwner)), owner (_this select 0), true)]; (_this select 0) setOwner owner (_this select 1)}), 1] call EFUNC(common,execRemoteFnc); _oldUnit = player; waitUntil {sleep 0.2; local _unit}; From 039ae01594eea0d8ca9e63e43bc5799b3e92358f Mon Sep 17 00:00:00 2001 From: commy2 Date: Tue, 13 Jan 2015 17:08:49 +0100 Subject: [PATCH 5/9] fix some sqf errors --- addons/common/scripts/KeyInput/initKeys.sqf | 4 ++-- addons/interaction/config.cpp | 6 +++--- addons/interaction/functions/fnc_GetActions.sqf | 2 +- addons/interaction/functions/fnc_tapShoulder.sqf | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/common/scripts/KeyInput/initKeys.sqf b/addons/common/scripts/KeyInput/initKeys.sqf index c4a88ede68..15d3960675 100644 --- a/addons/common/scripts/KeyInput/initKeys.sqf +++ b/addons/common/scripts/KeyInput/initKeys.sqf @@ -1,7 +1,7 @@ // by commy2 #include "\z\ace\addons\common\script_component.hpp" -_config = configFile >> QGVAR(Default_Keys); +_config = configFile >> ACE_Default_Keys; _count = count _config; _header = format ["_keyCode = [_this select 1, _this select 2, _this select 3, _this select 4] call %1; _keyIndex = floor _keyCode; if (_keyIndex == 0) exitWith {false}; if (!(profileNamespace getVariable ['ACE_enableNumberHotkeys', true]) && {_keyIndex < 12} && {_keyIndex > 1} && {_keyCode mod 1 == 0}) exitWith {false}; _time = time; _player = ACE_player; _vehicle = vehicle _player; _isInput = false;", QUOTE(FUNC(convertKeyCode))]; @@ -26,7 +26,7 @@ for "_index" from 0 to (_count - 1) do { _statement = getText (_configFile >> "statement"); _exceptions = getArray (_configFile >> "exceptions"); - _canInteract = format ["%1 call GVAR(canInteract)", _exceptions]; + _canInteract = format [QUOTE(%1 call GVAR(canInteract)), _exceptions]; _conditionName = format ["ACE_Key_%1_Condition", _keyName]; _statementName = format ["ACE_Key_%1_Statement", _keyName]; diff --git a/addons/interaction/config.cpp b/addons/interaction/config.cpp index 62425636e7..ab3645eba3 100644 --- a/addons/interaction/config.cpp +++ b/addons/interaction/config.cpp @@ -16,7 +16,7 @@ class CfgPatches { #include "CfgEventHandlers.hpp" -class ACE_Core_Default_Keys { +class ACE_Default_Keys { class openInteractionMenuNew { displayName = "$STR_ACE_Interaction_InteractionMenu"; condition = "true"; @@ -75,7 +75,7 @@ class ACE_Core_Default_Keys { }; }; -class ACE_Core_Options { +class ACE_Options { class Interaction_FlowMenu { displayName = "$STR_ACE_Interaction_FlowMenu"; default = 0; @@ -97,7 +97,7 @@ class ACE_Parameters_Boolean { ACE_Interaction_EnableTeamManagement = 1; }; -class ACE_Core_canInteractConditions { +class ACE_canInteractConditions { class ACE_Interaction_isNotEscorting { condition = QUOTE( !(_player getVariable ['ACE_isEscorting', false]) ); }; diff --git a/addons/interaction/functions/fnc_GetActions.sqf b/addons/interaction/functions/fnc_GetActions.sqf index 30afaa095a..ede8adf3a8 100644 --- a/addons/interaction/functions/fnc_GetActions.sqf +++ b/addons/interaction/functions/fnc_GetActions.sqf @@ -77,7 +77,7 @@ for "_i" from 0 to (_count - 1) do { _condition = getText (_action >> "condition"); if (_condition == "") then {_condition = "true"}; - _condition = _condition + format [QUOTE( && {%1 call EGVAR(core,canInteract)} && {[ARR_2(ACE_player, GVAR(Target))] call EFUNC(common,canInteractWith)} ), getArray (_action >> "exceptions")]; + _condition = _condition + format [QUOTE( && {%1 call EGVAR(common,canInteract)} && {[ARR_2(ACE_player, GVAR(Target))] call EFUNC(common,canInteractWith)} ), getArray (_action >> "exceptions")]; if (_enableInside != 1) then {_condition = _condition + " && {_player == _vehicle}"}; _condition = compile _condition; diff --git a/addons/interaction/functions/fnc_tapShoulder.sqf b/addons/interaction/functions/fnc_tapShoulder.sqf index 9405be8ce8..02eed88542 100644 --- a/addons/interaction/functions/fnc_tapShoulder.sqf +++ b/addons/interaction/functions/fnc_tapShoulder.sqf @@ -9,7 +9,7 @@ _target = _this select 1; if (_target != ACE_player) exitWith { addCamShake [4, 0.5, 5]; if !(local _target) then { - [[_tapper, _target], QUOTE(FUNC(tapShoulder)), _target] call EFUNC(common,execRemoteFnc); + [[_tapper, _target], QUOTE(DFUNC(tapShoulder)), _target] call EFUNC(common,execRemoteFnc); }; }; From 21acccc228a1ab61ca918134e7cbd06955de2690 Mon Sep 17 00:00:00 2001 From: Thomas Kooi Date: Tue, 13 Jan 2015 17:35:39 +0100 Subject: [PATCH 6/9] Removed to_merge nametags folder (now called sys_nametags) --- TO_MERGE/cse/nametags/CfgEventHandlers.hpp | 11 --- TO_MERGE/cse/nametags/CfgVehicles.hpp | 64 ---------------- TO_MERGE/cse/nametags/XEH_postInit.sqf | 66 ---------------- TO_MERGE/cse/nametags/XEH_preInit.sqf | 17 ----- TO_MERGE/cse/nametags/config.cpp | 24 ------ TO_MERGE/cse/nametags/data/empty.paa | Bin 12010 -> 0 bytes TO_MERGE/cse/nametags/data/module_icon.paa | Bin 5625 -> 0 bytes .../nametags/data/soundwaves/soundwave1.paa | Bin 26293 -> 0 bytes .../nametags/data/soundwaves/soundwave2.paa | Bin 26529 -> 0 bytes .../nametags/data/soundwaves/soundwave3.paa | Bin 26253 -> 0 bytes .../nametags/data/soundwaves/soundwave4.paa | Bin 26802 -> 0 bytes .../nametags/data/soundwaves/soundwave5.paa | Bin 26662 -> 0 bytes .../nametags/data/soundwaves/soundwave6.paa | Bin 26473 -> 0 bytes .../nametags/data/soundwaves/soundwave7.paa | Bin 26996 -> 0 bytes .../nametags/data/soundwaves/soundwave8.paa | Bin 27615 -> 0 bytes .../nametags/data/soundwaves/soundwave9.paa | Bin 27049 -> 0 bytes .../data/soundwaves/soundwave_silent.paa | Bin 25425 -> 0 bytes .../cse/nametags/functions/fnc_allowSide.sqf | 15 ---- .../nametags/functions/fnc_drawNameTags.sqf | 71 ------------------ .../functions/fnc_findNearbyUnits.sqf | 65 ---------------- .../nametags/functions/fnc_handleSpeaking.sqf | 40 ---------- .../functions/fnc_initalizeModule.sqf | 24 ------ TO_MERGE/cse/nametags/script_component.hpp | 12 --- TO_MERGE/cse/nametags/stringtable.xml | 43 ----------- 24 files changed, 452 deletions(-) delete mode 100644 TO_MERGE/cse/nametags/CfgEventHandlers.hpp delete mode 100644 TO_MERGE/cse/nametags/CfgVehicles.hpp delete mode 100644 TO_MERGE/cse/nametags/XEH_postInit.sqf delete mode 100644 TO_MERGE/cse/nametags/XEH_preInit.sqf delete mode 100644 TO_MERGE/cse/nametags/config.cpp delete mode 100644 TO_MERGE/cse/nametags/data/empty.paa delete mode 100644 TO_MERGE/cse/nametags/data/module_icon.paa delete mode 100644 TO_MERGE/cse/nametags/data/soundwaves/soundwave1.paa delete mode 100644 TO_MERGE/cse/nametags/data/soundwaves/soundwave2.paa delete mode 100644 TO_MERGE/cse/nametags/data/soundwaves/soundwave3.paa delete mode 100644 TO_MERGE/cse/nametags/data/soundwaves/soundwave4.paa delete mode 100644 TO_MERGE/cse/nametags/data/soundwaves/soundwave5.paa delete mode 100644 TO_MERGE/cse/nametags/data/soundwaves/soundwave6.paa delete mode 100644 TO_MERGE/cse/nametags/data/soundwaves/soundwave7.paa delete mode 100644 TO_MERGE/cse/nametags/data/soundwaves/soundwave8.paa delete mode 100644 TO_MERGE/cse/nametags/data/soundwaves/soundwave9.paa delete mode 100644 TO_MERGE/cse/nametags/data/soundwaves/soundwave_silent.paa delete mode 100644 TO_MERGE/cse/nametags/functions/fnc_allowSide.sqf delete mode 100644 TO_MERGE/cse/nametags/functions/fnc_drawNameTags.sqf delete mode 100644 TO_MERGE/cse/nametags/functions/fnc_findNearbyUnits.sqf delete mode 100644 TO_MERGE/cse/nametags/functions/fnc_handleSpeaking.sqf delete mode 100644 TO_MERGE/cse/nametags/functions/fnc_initalizeModule.sqf delete mode 100644 TO_MERGE/cse/nametags/script_component.hpp delete mode 100644 TO_MERGE/cse/nametags/stringtable.xml diff --git a/TO_MERGE/cse/nametags/CfgEventHandlers.hpp b/TO_MERGE/cse/nametags/CfgEventHandlers.hpp deleted file mode 100644 index ab75a246bb..0000000000 --- a/TO_MERGE/cse/nametags/CfgEventHandlers.hpp +++ /dev/null @@ -1,11 +0,0 @@ -class Extended_PreInit_EventHandlers { - class ADDON { - init = QUOTE( call compile preprocessFileLineNumbers PATHTOF(XEH_preInit.sqf) ); - }; -}; - -class Extended_PostInit_EventHandlers { - class ADDON { - init = QUOTE( call compile preprocessFileLineNumbers PATHTOF(XEH_postInit.sqf) ); - }; -}; \ No newline at end of file diff --git a/TO_MERGE/cse/nametags/CfgVehicles.hpp b/TO_MERGE/cse/nametags/CfgVehicles.hpp deleted file mode 100644 index a0d8133e8a..0000000000 --- a/TO_MERGE/cse/nametags/CfgVehicles.hpp +++ /dev/null @@ -1,64 +0,0 @@ -// TODO Check what faction classes are available within ACE and move this to a core pbo -class CfgFactionClasses -{ - class NO_CATEGORY; - class ACEMisc: NO_CATEGORY { - displayName = "ACE Misc Modules"; - }; -}; - - -class CfgVehicles -{ - class Logic; - class Module_F: Logic { - class ArgumentsBaseUnits { - }; - }; - class GVAR(Module): Module_F { - scope = 2; - displayName = $STR_ACE_NameTags_Title; - icon = QUOTE(PATHOF(data\module_icon.paa)); - category = "ACEMisc"; - function = QUOTE(FUNC(initalizeModule)); - functionPriority = 1; - isGlobal = 1; - isTriggerActivated = 0; - class Arguments { - class enableModule { - displayName = $STR_ACE_NameTags_Arg_enable; - description = $STR_ACE_NameTags_Arg_enable_Desc; - typeName = "BOOL"; - defaultValue = 0; - }; - class indirectDistance { - displayName = $STR_ACE_NameTags_Arg_indirectDistance; - description = $STR_ACE_NameTags_Arg_indirectDistance_Desc; - typeName = "NUMBER"; - defaultValue = 7.5; - }; - class cursorTargetDistance { - displayName = $STR_ACE_NameTags_Arg_directDistance; - description = $STR_ACE_NameTags_Arg_directDistance_Desc; - typeName = "NUMBER"; - defaultValue = 20; - }; - class allowDifferentSides { - displayName = $STR_ACE_NameTags_Arg_differentSides; - description = $STR_ACE_NameTags_Arg_differentSides_Desc; - typeName = "BOOL"; - defaultValue = 0; - }; - class enableSoundWaves { - displayName = $STR_ACE_NameTags_Arg_soundWaves; - description = $STR_ACE_NameTags_Arg_soundWaves_Desc; - typeName = "BOOL"; - defaultValue = 0; - }; - }; - class ModuleDescription { - description = $STR_ACE_NameTags_ModuleDesc; - sync[] = {}; - }; - }; -}; \ No newline at end of file diff --git a/TO_MERGE/cse/nametags/XEH_postInit.sqf b/TO_MERGE/cse/nametags/XEH_postInit.sqf deleted file mode 100644 index 97b6926c5b..0000000000 --- a/TO_MERGE/cse/nametags/XEH_postInit.sqf +++ /dev/null @@ -1,66 +0,0 @@ -/** - * XEH_postInit.sqf - * @Descr: N/A - * @Author: Glowbal - * - * @Arguments: [] - * @Return: - * @PublicAPI: false - */ - -if (!hasInterface) exitwith {}; // No need for this module on HC or dedicated server. - -#include "script_component.hpp" - -// Settings -if (isNil QUOTE(ACE_NameTagsModule)) then { - GVAR(INDIRECT_TAGS_DISTANCE) = 7.5; - GVAR(DIRECT_TAG_DISTANCE) = 20; - GVAR(ENABLE_SOUNDWAVES) = false; - GVAR(ALLOW_OWN_SIDE_ONLY) = true; - GVAR(ENABLE_MODULE) = true; -}; - -// In case the module has been placed and the enable setting has been put to false -if (!GVAR(ENABLE_MODULE)) exitwith {}; - -// Client side options -// TODO Implement a framework for adjusting client side settings. -GVAR(DRAW_TAG_ICONS) = true; -GVAR(ENABLE_INDIRECT) = false; -GVAR(TAG_DISPLAY_COLOR) = [1,1,1,1]; -GVAR(SHOW_SOUNDWAVES) = false; -GVAR(DISPLAY_RANK) = false; - -// If the distance values are set incorrectly, ensure we handle this -if (GVAR(DIRECT_TAG_DISTANCE) < GVAR(INDIRECT_TAGS_DISTANCE)) then { - GVAR(DIRECT_TAG_DISTANCE) = GVAR(INDIRECT_TAGS_DISTANCE); -}; - -// If both are below 1m, exit because they will not show up. -if (GVAR(DIRECT_TAG_DISTANCE) < 1) exitwith {}; - -// Draw the icons for each nametag -// TODO Look into replacement with cutRsc instead of icon3d -addMissionEventHandler ["Draw3D", FUNC(drawNameTags)]; - -if (GVAR(ENABLE_SOUNDWAVES)) then { - - GVAR(SOUNDWAVE_ICONS) = [QUOTE(PATHTOF(data\soundwaves\soundwave1.paa)),QUOTE(PATHTOF(data\soundwaves\soundwave2.paa)), QUOTE(PATHTOF(data\soundwaves\soundwave3.paa)), QUOTE(PATHTOF(data\soundwaves\soundwave4.paa)), QUOTE(PATHTOF(data\soundwaves\soundwave5.paa)), QUOTE(PATHTOF(data\soundwaves\soundwave6.paa)), QUOTE(PATHTOF(data\soundwaves\soundwave7.paa)), QUOTE(PATHTOF(data\soundwaves\soundwave8.paa)), QUOTE(PATHTOF(data\soundwaves\soundwave9.paa)), QUOTE(PATHTOF(data\soundwaves\soundwave_silent.paa))]; - - // TODO Implement function for checking if an addon is loaded - //if (["task_force_radio"] call ace_fnc_isModLoaded_F) then { - if (isnil "TFAR_fnc_isSpeaking") then { - TFAR_fnc_isSpeaking = { if (!isnil "TF_tangent_lr_pressed") then {(TF_tangent_lr_pressed || TF_tangent_sw_pressed || TF_tangent_dd_pressed)} else { false }; }; - }; - //}; - - // TODO Move to unscheduled environment with PFH - [] spawn { - waituntil{ - waituntil {alive player}; - /*ACE_player*/ player call FUNC(handleSpeaking); - !GVAR(ENABLE_SOUNDWAVES); // exit when the soundwaves have been disabled - }; - }; -}; \ No newline at end of file diff --git a/TO_MERGE/cse/nametags/XEH_preInit.sqf b/TO_MERGE/cse/nametags/XEH_preInit.sqf deleted file mode 100644 index 702a785859..0000000000 --- a/TO_MERGE/cse/nametags/XEH_preInit.sqf +++ /dev/null @@ -1,17 +0,0 @@ -/** - * XEH_preInit.sqf - * @Descr: N/A - * @Author: Glowbal - * - * @Arguments: [] - * @Return: - * @PublicAPI: false - */ - -#include "script_component.hpp" - -PREP(drawNameTags); -PREP(findNearbyUnits); -PREP(handleSpeaking); -PREP(allowSide); -PREP(initalizeModule); diff --git a/TO_MERGE/cse/nametags/config.cpp b/TO_MERGE/cse/nametags/config.cpp deleted file mode 100644 index 8a90482389..0000000000 --- a/TO_MERGE/cse/nametags/config.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include "script_component.hpp" - -class CfgPatches { - class ADDON { - units[] = {}; - weapons[] = {}; - requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"ACE_gui","ACE_main"}; - version = VERSION; - author[] = {$STR_ACE_Core_ACETeam}; - authorUrl = "http://ACEmod.com"; // TODO website link? - }; -}; - -class CfgAddons { - class PreloadAddons { - class ADDON { - list[] = {QUOTE(ADDON)}; - }; - }; -}; - -#include "CfgVehicles.hpp" -#include "CfgEventHandlers.hpp" \ No newline at end of file diff --git a/TO_MERGE/cse/nametags/data/empty.paa b/TO_MERGE/cse/nametags/data/empty.paa deleted file mode 100644 index a354c7eb3879581ef6c3de727b6566041a4825c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12010 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 diff --git a/TO_MERGE/cse/nametags/data/soundwaves/soundwave1.paa b/TO_MERGE/cse/nametags/data/soundwaves/soundwave1.paa deleted file mode 100644 index ce4f85eb6941214cc6a169b42fc9afa0f15b76ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26293 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 diff --git a/TO_MERGE/cse/nametags/data/soundwaves/soundwave2.paa b/TO_MERGE/cse/nametags/data/soundwaves/soundwave2.paa deleted file mode 100644 index 0bc59cde24940b831d94bd6d4f9fb9f0af3fea27..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26529 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 diff --git a/TO_MERGE/cse/nametags/data/soundwaves/soundwave3.paa b/TO_MERGE/cse/nametags/data/soundwaves/soundwave3.paa deleted file mode 100644 index 39f3e8e95bd9e86515becd853e69cfe57ee29b2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26253 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 diff --git a/TO_MERGE/cse/nametags/data/soundwaves/soundwave4.paa b/TO_MERGE/cse/nametags/data/soundwaves/soundwave4.paa deleted file mode 100644 index 7ab8b6d9442a2456f681099149d59fd112790773..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26802 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 diff --git a/TO_MERGE/cse/nametags/data/soundwaves/soundwave5.paa b/TO_MERGE/cse/nametags/data/soundwaves/soundwave5.paa deleted file mode 100644 index f3e98d47aae32588a8e588d0a3d9be43374f5318..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26662 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 diff --git a/TO_MERGE/cse/nametags/data/soundwaves/soundwave7.paa b/TO_MERGE/cse/nametags/data/soundwaves/soundwave7.paa deleted file mode 100644 index e705c70b422e2d41e0475a62810c5c2281c1cc92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26996 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 LFm-eGg|7bxu#VuD diff --git a/TO_MERGE/cse/nametags/data/soundwaves/soundwave_silent.paa b/TO_MERGE/cse/nametags/data/soundwaves/soundwave_silent.paa deleted file mode 100644 index 27f34b38abc77d69ae2b9f0ed0793e00ec7f78fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25425 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 diff --git a/TO_MERGE/cse/nametags/functions/fnc_allowSide.sqf b/TO_MERGE/cse/nametags/functions/fnc_allowSide.sqf deleted file mode 100644 index d28c9a336d..0000000000 --- a/TO_MERGE/cse/nametags/functions/fnc_allowSide.sqf +++ /dev/null @@ -1,15 +0,0 @@ -/** - * fn_allowSide_TAGS.sqf - * @Descr: N/A - * @Author: Glowbal - * - * @Arguments: side - * @Return: - * @PublicAPI: false - */ -#include "script_component.hpp" - -if (GVAR(ALLOW_OWN_SIDE_ONLY)) exitwith { - _this == playerSide; /* side ACE_player */ -}; -((_this getFriend playerSide /* side ACE_player */ ) >= 0.6); \ No newline at end of file diff --git a/TO_MERGE/cse/nametags/functions/fnc_drawNameTags.sqf b/TO_MERGE/cse/nametags/functions/fnc_drawNameTags.sqf deleted file mode 100644 index da05c477e4..0000000000 --- a/TO_MERGE/cse/nametags/functions/fnc_drawNameTags.sqf +++ /dev/null @@ -1,71 +0,0 @@ -/** - * fn_drawNameTags_TAGS.sqf - * @Descr: N/A - * @Author: Glowbal - * - * @Arguments: [] - * @Return: - * @PublicAPI: false - */ -#include "script_component.hpp" -#define FONT "EtelkaMonospacePro" - -private ["_cursor","_soundWaves", "_nameOfUnit","_pos","_color", "_nearbyUnits", "_iconOptions", "_iconSets", "_unit", "_colorOfIcon", "_nearObj"]; -if (visibleMap || !GVAR(DRAW_TAG_ICONS)) exitwith {}; - -_nearObj = if (isNull curatorCamera) then {/* ACE_player */ if (isNull (missionnamespace getvariable ["bis_fnc_moduleRemoteControl_unit",objnull])) then { player} else {(missionnamespace getvariable ["bis_fnc_moduleRemoteControl_unit",objnull]) }; } else { curatorCamera }; - -if (GVAR(ENABLE_INDIRECT)) then { - { - _nameOfUnit = _x select 0; - _pos = _x select 1; - _color = _x select 2; - _unit = _x select 3; - _iconDrawn = QUOTE(PATHTOF(data\empty.paa)); - if (_unit getvariable [QGVAR(isSpeaking),false] && GVAR(SHOW_SOUNDWAVES)) then { - _iconDrawn = (GVAR(SOUNDWAVE_ICONS) select ((round(random (count GVAR(SOUNDWAVE_ICONS) - 1))))); - }; - drawIcon3D [_iconDrawn,_color, _pos, 2, 2, 1 ,toUpper _nameOfUnit, 1, 0.03, FONT]; - false; - }count (_nearObj call FUNC(findNearbyUnits)); -}; - -_cursor = cursortarget; -if (_cursor == _cursor && isTouchingGround _cursor) then { - if (_cursor isKindOf "CAManBase" && ((_cursor distance _nearObj) < GVAR(DIRECT_TAG_DISTANCE)) && ((side _cursor) call FUNC(allowSide))) then { - - // TODO Improve this switch statement - _pos = visiblePositionASL _cursor; - switch (stance _cursor) do { - case "STAND": { - _pos set [2, ((_cursor modelToWorld [0,0,0]) select 2)+2]; - }; - case "CROUCH": { - _pos set [2, ((_cursor modelToWorld [0,0,0]) select 2)+1.5]; - }; - case "PRONE": { - _pos set [2, ((_cursor modelToWorld [0,0,0]) select 2)+0.5]; - }; - default { - _pos set [2, ((_cursor modelToWorld [0,0,0]) select 2) + 1.5]; - }; - }; - _color = +GVAR(TAG_DISPLAY_COLOR); - - _nameOfUnit = name _cursor; //[_cursor] call FUNC(getName); // TODO Implement a getName function - // TODO implement module checking - /*if (ACE_NameTags_SYS_MEDICAL_SYSTEM_ENABLED_TAGS) then { - _status = [_cursor] call FUNC(getTriageStatus_CMS); - if ((_status select 1) >0) then { - _nameOfUnit = _nameOfUnit + " ["+ (_status select 0) + "]"; - _color = _status select 2; - }; - };*/ - _iconDrawn = QUOTE(PATHTOF(data\empty.paa)); - if (_unit getvariable [QGVAR(isSpeaking),false] && GVAR(SHOW_SOUNDWAVES)) then { - _iconDrawn = (GVAR(SOUNDWAVE_ICONS) select ((round(random (count GVAR(SOUNDWAVE_ICONS) - 1))))); - }; - drawIcon3D [_iconDrawn,_color, _pos, 2, 2, 1 ,toUpper _nameOfUnit, 1, 0.03, FONT]; - - }; -}; diff --git a/TO_MERGE/cse/nametags/functions/fnc_findNearbyUnits.sqf b/TO_MERGE/cse/nametags/functions/fnc_findNearbyUnits.sqf deleted file mode 100644 index 122823c46c..0000000000 --- a/TO_MERGE/cse/nametags/functions/fnc_findNearbyUnits.sqf +++ /dev/null @@ -1,65 +0,0 @@ -/** - * fn_findNearbyUnits_TAGS.sqf - * @Descr: N/A - * @Author: Glowbal - * - * @Arguments: [] - * @Return: - * @PublicAPI: false - */ - -#include "script_component.hpp" - -private ["_info", "_nameOfUnit", "_color", "_isTalking", "_pos", "_nearest"]; -_info = []; -if (alive player) then { - _nearest = (_this nearEntities [["CAManBase"], GVAR(INDIRECT_TAGS_DISTANCE)]); - { - if (_x != _this && (vehicle _x == _x) && isTouchingGround _X) then { - if (lineIntersects [eyePos _this, eyePos _x, _x, _this]) exitwith{}; - if ((side _x) call FUNC(allowSide) && !(_x == cursortarget)) then { - _nameOfUnit = name _x; - if (_x getvariable ["ACE_isDead",false]) then { // TODO, how do we check for dead units? - _nameOfUnit = _unit getvariable ["ACE_name","Unknown"]; // TODO is there are function to get the name of a unit? - }; - _pos = visiblePositionASL _x; - - // TODO This can be done better - switch (stance _x) do { - case "STAND": { - _pos set [2, ((_x modelToWorld [0,0,0]) select 2)+2]; - }; - case "CROUCH": { - _pos set [2, ((_x modelToWorld [0,0,0]) select 2)+1.5]; - }; - case "PRONE": { - _pos set [2, ((_x modelToWorld [0,0,0]) select 2) + 0.5]; - }; - default { - _pos set [2, ((_x modelToWorld [0,0,0]) select 2) + 1.5]; - }; - }; - - _color = +GVAR(TAG_DISPLAY_COLOR); - _color set [3, 0]; - _isTalking = (_x getvariable [QGVAR(isSpeaking),false]); - - // TODO implement module checking - /*if (ACE_NameTags_SYS_MEDICAL_SYSTEM_ENABLED_TAGS) then { - _status = [_x] call FUNC(getTriageStatus_CMS; - if ((_status select 1) >0) then { - _nameOfUnit = _nameOfUnit + " ["+ (_status select 0) + "]"; - _color = _status select 2; - }; - };*/ - if (GVAR(DISPLAY_RANK)) then { - _nameOfUnit = (rank _x) + " " + _nameOfUnit; - }; - _color set [3,(1-((_x distance _this) / GVAR(INDIRECT_TAGS_DISTANCE))) + 0.05]; - _info pushback [_nameOfUnit, _pos, _color, _x]; - }; - }; - }foreach _nearest; -}; - -_info; \ No newline at end of file diff --git a/TO_MERGE/cse/nametags/functions/fnc_handleSpeaking.sqf b/TO_MERGE/cse/nametags/functions/fnc_handleSpeaking.sqf deleted file mode 100644 index a61f810969..0000000000 --- a/TO_MERGE/cse/nametags/functions/fnc_handleSpeaking.sqf +++ /dev/null @@ -1,40 +0,0 @@ -/** - * fn_handleSpeaking_TAGS.sqf - * @Descr: N/A - * @Author: Glowbal - * - * @Arguments: [] - * @Return: - * @PublicAPI: false - */ -#include "script_component.hpp" - -// TODO Implement a check mod loaded function -#define ACTION_PUSH_TO_TALK_PRESSED (inputAction "PushToTalk" > 0) -#define ACTION_TFAR_RADIO_ACTIVE false // [] call {if (["task_force_radio"] call FUNC(isModLoaded_F)) then {player call TFAR_fnc_isSpeaking} else { false };} -#define ACTION_ACRE_RADIO_ACTIVE false // [] call {if (["acre_api"] call FUNC(isModLoaded_F)) then {[player] call ACRE_api_fnc_isBroadcasting} else { false };} - -private ["_unit"]; -_unit = _this select 0; - -if (_unit != player /* _unit != ACE_Player */) exitwith {}; - -// TODO check mod loaded function -/*if (["task_force_radio"] call FUNC(isModLoaded_F)) then { - waituntil {!isnil "TF_tangent_lr_pressed"}; -};*/ - -waituntil { - if (ACTION_TFAR_RADIO_ACTIVE || ACTION_PUSH_TO_TALK_PRESSED || ACTION_ACRE_RADIO_ACTIVE) then { - if !(_unit getvariable [QGVAR(isSpeaking), false]) then { - _unit setvariable [QGVAR(isSpeaking), true, true]; - }; - } else { - if (_unit getvariable [QGVAR(isSpeaking), false]) then { - _unit setvariable [QGVAR(isSpeaking), false, true]; - }; - }; - !(alive _unit) /* _unit != ACE_Player */ -}; - -_unit setvariable [QGVAR(isSpeaking),nil,true]; \ No newline at end of file diff --git a/TO_MERGE/cse/nametags/functions/fnc_initalizeModule.sqf b/TO_MERGE/cse/nametags/functions/fnc_initalizeModule.sqf deleted file mode 100644 index 7db37789db..0000000000 --- a/TO_MERGE/cse/nametags/functions/fnc_initalizeModule.sqf +++ /dev/null @@ -1,24 +0,0 @@ -/** - * fnc_initalizeModule.sqf - * @Descr: N/A - * @Author: Glowbal - * - * @Arguments: [] - * @Return: - * @PublicAPI: false - */ - -#include "script_component.hpp" - -if (!hasInterface) exitwith {}; // No need for this module on HC or dedicated server. - -private ["_logic"]; -_logic = [_this,0,objNull,[objNull]] call BIS_fnc_param; -if (!isNull _logic) then { - // TODO default values should be defined somewhere through an include, so they are the same in CfgVehicles and here. - GVAR(ENABLE_MODULE) = _logic getvariable ["enableModule", false]; - GVAR(INDIRECT_TAGS_DISTANCE) = _logic getvariable ["indirectDistance", 7.5]; - GVAR(DIRECT_TAG_DISTANCE) = _logic getvariable ["cursorTargetDistance", 20]; - GVAR(ALLOW_OWN_SIDE_ONLY) = !(_logic getvariable ["allowDifferentSides", false]); - GVAR(ENABLE_SOUNDWAVES) = _logic getvariable ["enableSoundWaves", false]; -}; \ No newline at end of file diff --git a/TO_MERGE/cse/nametags/script_component.hpp b/TO_MERGE/cse/nametags/script_component.hpp deleted file mode 100644 index 4637f8de75..0000000000 --- a/TO_MERGE/cse/nametags/script_component.hpp +++ /dev/null @@ -1,12 +0,0 @@ -#define COMPONENT nametags -#include "\z\ace\addons\main\script_mod.hpp" - -#ifdef DEBUG_ENABLED_NAMETAGS - #define DEBUG_MODE_FULL -#endif - -#ifdef DEBUG_SETTINGS_NAMETAGS - #define DEBUG_SETTINGS DEBUG_SETTINGS_NAMETAGS -#endif - -#include "\z\ace\addons\main\script_macros.hpp" \ No newline at end of file diff --git a/TO_MERGE/cse/nametags/stringtable.xml b/TO_MERGE/cse/nametags/stringtable.xml deleted file mode 100644 index 53100d4ceb..0000000000 --- a/TO_MERGE/cse/nametags/stringtable.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - Name Tags [ACE] - - - Enable Name Tags - - - Enable the name tags - - - Indirect Distance - - - Distance for indirect Tags - - - Target Distance - - - Distance for the direct Tag (Cursortarget) - - - Enable Soundwaves - - - Enable Soundwaves when a player is speaking - - - Allow Different sides - - - Allow name tags for all friendly sides, instead of only player side - - - Adjust the name tags settings. - - - - \ No newline at end of file From 2336b51e5b21cabae03ca4952285854d4014b1a9 Mon Sep 17 00:00:00 2001 From: commy2 Date: Tue, 13 Jan 2015 17:42:56 +0100 Subject: [PATCH 7/9] fix key input not working --- addons/common/config.cpp | 4 ++-- addons/common/functions/fnc_setKeyDefault.sqf | 4 ++-- addons/common/scripts/KeyInput/initKeys.sqf | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/common/config.cpp b/addons/common/config.cpp index 771511ac04..31ab380344 100644 --- a/addons/common/config.cpp +++ b/addons/common/config.cpp @@ -51,13 +51,13 @@ class ACE_Rsc_Control_Base { h = 0; }; -class GVAR(canInteractConditions) { +class ACE_canInteractConditions { class GVAR(notOnMap) { condition = "!visibleMap"; }; }; -class GVAR(Options) { +class ACE_Options { class enableNumberHotkeys { displayName = "$STR_ACE_Common_EnableNumberHotkeys"; default = 1; diff --git a/addons/common/functions/fnc_setKeyDefault.sqf b/addons/common/functions/fnc_setKeyDefault.sqf index 210e18e1c7..ffb3edc709 100644 --- a/addons/common/functions/fnc_setKeyDefault.sqf +++ b/addons/common/functions/fnc_setKeyDefault.sqf @@ -17,7 +17,7 @@ _overwrite = _this select 0; _saveProfile = false; -_config = configFile >> QGVAR(Default_Keys); +_config = configFile >> "ACE_Default_Keys"; _count = count _config; for "_index" from 0 to (_count - 1) do { @@ -38,7 +38,7 @@ for "_index" from 0 to (_count - 1) do { }; }; -_config = configFile >> QGVAR(Options); +_config = configFile >> "ACE_Options"; _count = count _config; for "_index" from 0 to (_count - 1) do { diff --git a/addons/common/scripts/KeyInput/initKeys.sqf b/addons/common/scripts/KeyInput/initKeys.sqf index 15d3960675..7d4283d802 100644 --- a/addons/common/scripts/KeyInput/initKeys.sqf +++ b/addons/common/scripts/KeyInput/initKeys.sqf @@ -1,7 +1,7 @@ // by commy2 #include "\z\ace\addons\common\script_component.hpp" -_config = configFile >> ACE_Default_Keys; +_config = configFile >> "ACE_Default_Keys"; _count = count _config; _header = format ["_keyCode = [_this select 1, _this select 2, _this select 3, _this select 4] call %1; _keyIndex = floor _keyCode; if (_keyIndex == 0) exitWith {false}; if (!(profileNamespace getVariable ['ACE_enableNumberHotkeys', true]) && {_keyIndex < 12} && {_keyIndex > 1} && {_keyCode mod 1 == 0}) exitWith {false}; _time = time; _player = ACE_player; _vehicle = vehicle _player; _isInput = false;", QUOTE(FUNC(convertKeyCode))]; From 270ff5535ab9af1456ecbcaa30b5369f72a1bf58 Mon Sep 17 00:00:00 2001 From: commy2 Date: Tue, 13 Jan 2015 19:14:34 +0100 Subject: [PATCH 8/9] fix interaction menu --- addons/attach/config.cpp | 4 +- addons/interaction/config.cpp | 158 +++++++++--------- .../interaction/functions/fnc_GetActions.sqf | 4 +- .../interaction/functions/fnc_getActions2.sqf | 4 +- .../functions/fnc_initialiseInteraction.sqf | 6 +- addons/interaction/functions/fnc_onClick.sqf | 2 +- addons/main/script_macros.hpp | 2 + 7 files changed, 91 insertions(+), 89 deletions(-) diff --git a/addons/attach/config.cpp b/addons/attach/config.cpp index c7948fc323..5449155017 100644 --- a/addons/attach/config.cpp +++ b/addons/attach/config.cpp @@ -39,8 +39,8 @@ class CfgFunctions { class CfgVehicles { class Man; class CAManBase: Man { - class AGM_SelfActions { - class AGM_Equipment { + class ACE_SelfActions { + class ACE_Equipment { class GVAR(Attach) { displayName = "$STR_AGM_Attach_AttachDetach"; condition = QUOTE( [_player, ''] call FUNC(canAttach) ); diff --git a/addons/interaction/config.cpp b/addons/interaction/config.cpp index ab3645eba3..860acf3997 100644 --- a/addons/interaction/config.cpp +++ b/addons/interaction/config.cpp @@ -147,11 +147,11 @@ class CfgVehicles { class ACE_TeamManagement { displayName = "$STR_ACE_Interaction_TeamManagement"; distance = 4; - condition = QUOTE( alive _target && {!isPlayer _target} && {_target in units group _player} && {GVAR(EnableTeamManagement)} ); + condition = QUOTE(alive _target && {!isPlayer _target} && {_target in units group _player} && {GVAR(EnableTeamManagement)}); statement = ""; showDisabled = 0; priority = 3.2; - icon = PATHOF(UI\team\team_management_ca.paa); + icon = PATHTOF(UI\team\team_management_ca.paa); subMenu[] = {"ACE_TeamManagement", 0}; hotkey = "M"; enableInside = 1; @@ -159,10 +159,10 @@ class CfgVehicles { class ACE_JoinTeamRed { displayName = "$STR_ACE_Interaction_JoinTeamRed"; distance = 4; - condition = QUOTE( alive _target && {!isPlayer _target} && {_target in units group _player} ); - statement = QUOTE( [_target, 'RED'] call FUNC(joinTeam) ); + condition = QUOTE(alive _target && {!isPlayer _target} && {_target in units group _player}); + statement = QUOTE([ARR2(_target,'RED')] call DFUNC(joinTeam)); showDisabled = 1; - icon = PATHOF(UI\team\team_red_ca.paa); + icon = PATHTOF(UI\team\team_red_ca.paa); priority = 2.4; hotkey = "R"; enableInside = 1; @@ -170,10 +170,10 @@ class CfgVehicles { class ACE_JoinTeamGreen { displayName = "$STR_ACE_Interaction_JoinTeamGreen"; distance = 4; - condition = QUOTE( alive _target && {!isPlayer _target} && {_target in units group _player} ); - statement = QUOTE( [_target, 'GREEN'] call FUNC(joinTeam) ); + condition = QUOTE(alive _target && {!isPlayer _target} && {_target in units group _player}); + statement = QUOTE([ARR_2(_target,'GREEN')] call DFUNC(joinTeam)); showDisabled = 1; - icon = PATHOF(UI\team\team_green_ca.paa); + icon = PATHTOF(UI\team\team_green_ca.paa); priority = 2.3; hotkey = "G"; enableInside = 1; @@ -181,10 +181,10 @@ class CfgVehicles { class ACE_JoinTeamBlue { displayName = "$STR_ACE_Interaction_JoinTeamBlue"; distance = 4; - condition = QUOTE( alive _target && {!isPlayer _target} && {_target in units group _player} ); - statement = QUOTE( [_target, 'BLUE'] call FUNC(joinTeam) ); + condition = QUOTE(alive _target && {!isPlayer _target} && {_target in units group _player}); + statement = QUOTE([ARR_2(_target,'BLUE')] call DFUNC(joinTeam)); showDisabled = 1; - icon = PATHOF(UI\team\team_blue_ca.paa); + icon = PATHTOF(UI\team\team_blue_ca.paa); priority = 2.2; hotkey = "B"; enableInside = 1; @@ -192,10 +192,10 @@ class CfgVehicles { class ACE_JoinTeamYellow { displayName = "$STR_ACE_Interaction_JoinTeamYellow"; distance = 4; - condition = QUOTE( alive _target && {!isPlayer _target} && {_target in units group _player} ); - statement = QUOTE( [_target, 'YELLOW'] call FUNC(joinTeam) ); + condition = QUOTE(alive _target && {!isPlayer _target} && {_target in units group _player}); + statement = QUOTE([ARR_2(_target,'YELLOW')] call DFUNC(joinTeam)); showDisabled = 1; - icon = PATHOF(UI\team\team_yellow_ca.paa); + icon = PATHTOF(UI\team\team_yellow_ca.paa); priority = 2.1; hotkey = "Y"; enableInside = 1; @@ -204,10 +204,10 @@ class CfgVehicles { class ACE_LeaveTeam { displayName = "$STR_ACE_Interaction_LeaveTeam"; distance = 4; - condition = QUOTE( alive _target && {!isPlayer _target} && {_target in units group _player} && {assignedTeam _player != 'MAIN'} ); - statement = QUOTE( [_target, 'MAIN'] call FUNC(joinTeam) ); + condition = QUOTE(alive _target && {!isPlayer _target} && {_target in units group _player} && {assignedTeam _player != 'MAIN'}); + statement = QUOTE([ARR_2(_target,'MAIN')] call DFUNC(joinTeam)); showDisabled = 1; - icon = PATHOF(UI\team\team_white_ca.paa); + icon = PATHTOF(UI\team\team_white_ca.paa); priority = 2.5; hotkey = "N"; enableInside = 1; @@ -217,8 +217,8 @@ class CfgVehicles { class ACE_TapShoulder { displayName = "$STR_ACE_Interaction_TapShoulder"; distance = 4; - condition = QUOTE( [_player, _target] call FUNC(canTapShoulder) ); - statement = QUOTE( [_player, _target] call FUNC(tapShoulder) ); + condition = QUOTE([ARR_2(_player, _target)] call DFUNC(canTapShoulder)); + statement = QUOTE([ARR_2(_player, _target)] call DFUNC(tapShoulder)); showDisabled = 1; priority = 2.8; hotkey = "Q"; @@ -227,11 +227,11 @@ class CfgVehicles { class ACE_JoinGroup { displayName = "$STR_ACE_Interaction_JoinGroup"; distance = 4; - condition = QUOTE( side group _player == side group _target && {group _player != group _target} ); - statement = QUOTE( [_player] joinSilent group _target; ); + condition = QUOTE(side group _player == side group _target && {group _player != group _target}); + statement = QUOTE([_player] joinSilent group _target;); showDisabled = 0; priority = 2.6; - icon = PATHOF(UI\team\team_management_ca.paa); + icon = PATHTOF(UI\team\team_management_ca.paa); hotkey = "J"; enableInside = 1; }; @@ -239,24 +239,24 @@ class CfgVehicles { class ACE_GetDown { displayName = "$STR_ACE_Interaction_GetDown"; distance = 4; - condition = QUOTE( [_target] call FUNC(canInteractWith) ); - statement = QUOTE( [_target] call FUNC(getDown) ); + condition = QUOTE([_target] call DFUNC(canInteractWith)); + statement = QUOTE([_target] call DFUNC(getDown)); showDisabled = 0; priority = 2.2; }; class ACE_SendAway { displayName = "$STR_ACE_Interaction_SendAway"; distance = 4; - condition = QUOTE( [_target] call FUNC(canInteractWith) ); - statement = QUOTE( [_target] call FUNC(sendAway) ); + condition = QUOTE([_target] call DFUNC(canInteractWith)); + statement = QUOTE([_target] call DFUNC(sendAway)); showDisabled = 0; priority = 2.0; }; class ACE_Pardon { displayName = "$STR_ACE_Interaction_Pardon"; distance = 4; - condition = QUOTE( rating _target < -2000 && {alive _target} && {side group _player == side group _target} ); - statement = QUOTE( [_target, '{_this addRating -rating _this}', _target] call EFUNC(core,execRemoteFnc) ); + condition = QUOTE(rating _target < -2000 && {alive _target} && {side group _player == side group _target}); + statement = QUOTE([ARR_3(_target,'{_this addRating -rating _this}',_target)] call DEFUNC(common,execRemoteFnc)); showDisabled = 0; priority = 2.5; enableInside = 1; @@ -266,84 +266,84 @@ class CfgVehicles { class ACE_SelfActions { class ACE_TeamManagement { displayName = "$STR_ACE_Interaction_TeamManagement"; - condition = QUOTE( GVAR(EnableTeamManagement) ); + condition = QUOTE(GVAR(EnableTeamManagement)); statement = ""; showDisabled = 1; priority = 3.2; - icon = PATHOF(UI\team\team_management_ca.paa); + icon = PATHTOF(UI\team\team_management_ca.paa); subMenu[] = {"ACE_TeamManagement", 1}; enableInside = 1; hotkey = "M"; class ACE_JoinTeamRed { displayName = "$STR_ACE_Interaction_JoinTeamRed"; - condition = QUOTE( true ); - statement = QUOTE( [_player, 'RED'] call FUNC(joinTeam) ); + condition = QUOTE(true); + statement = QUOTE([ARR_2(_player,'RED')] call DFUNC(joinTeam)); showDisabled = 1; priority = 2.4; - icon = PATHOF(UI\team\team_red_ca.paa); + icon = PATHTOF(UI\team\team_red_ca.paa); enableInside = 1; hotkey = "R"; }; class ACE_JoinTeamGreen { displayName = "$STR_ACE_Interaction_JoinTeamGreen"; - condition = QUOTE( true ); - statement = QUOTE( [_player, 'GREEN'] call FUNC(joinTeam) ); + condition = QUOTE(true); + statement = QUOTE([ARR_2(_player,'GREEN')] call DFUNC(joinTeam)); showDisabled = 1; priority = 2.3; - icon = PATHOF(UI\team\team_green_ca.paa); + icon = PATHTOF(UI\team\team_green_ca.paa); enableInside = 1; hotkey = "G"; }; class ACE_JoinTeamBlue { displayName = "$STR_ACE_Interaction_JoinTeamBlue"; - condition = QUOTE( true ); - statement = QUOTE( [_player, 'BLUE'] call FUNC(joinTeam) ); + condition = QUOTE(true); + statement = QUOTE([ARR_2(_player,'BLUE')] call FUNC(joinTeam)); showDisabled = 1; priority = 2.2; - icon = PATHOF(UI\team\team_blue_ca.paa); + icon = PATHTOF(UI\team\team_blue_ca.paa); enableInside = 1; hotkey = "B"; }; class ACE_JoinTeamYellow { displayName = "$STR_ACE_Interaction_JoinTeamYellow"; - condition = QUOTE( true ); - statement = QUOTE( [_player, 'YELLOW'] call FUNC(joinTeam) ); + condition = QUOTE(true); + statement = QUOTE([ARR_2(_player,'YELLOW')] call FUNC(joinTeam)); showDisabled = 1; priority = 2.1; - icon = PATHOF(UI\team\team_yellow_ca.paa); + icon = PATHTOF(UI\team\team_yellow_ca.paa); enableInside = 1; hotkey = "Y"; }; class ACE_LeaveTeam { displayName = "$STR_ACE_Interaction_LeaveTeam"; - condition = QUOTE( assignedTeam _player != 'MAIN' ); - statement = QUOTE( [_player, 'MAIN'] call FUNC(joinTeam) ); + condition = QUOTE(assignedTeam _player != 'MAIN'); + statement = QUOTE([ARR_2(_player,'MAIN')] call FUNC(joinTeam)); showDisabled = 1; priority = 2.5; - icon = PATHOF(UI\team\team_white_ca.paa); + icon = PATHTOF(UI\team\team_white_ca.paa); enableInside = 1; hotkey = "N"; }; class ACE_BecomeLeader { displayName = "$STR_ACE_Interaction_BecomeLeader"; - condition = QUOTE( count (units group _player) > 1 && {leader group _player != _player} ); - statement = QUOTE( _newGroup = createGroup side group _player; (units group _player) joinSilent _newGroup; _newGroup selectLeader _player; ); + condition = QUOTE(count (units group _player) > 1 && {leader group _player != _player}); + statement = QUOTE(_newGroup = createGroup side group _player; (units group _player) joinSilent _newGroup; _newGroup selectLeader _player;); showDisabled = 1; priority = 1.0; - icon = PATHOF(UI\team\team_white_ca.paa); + icon = PATHTOF(UI\team\team_white_ca.paa); enableInside = 1; hotkey = "L"; }; class ACE_LeaveGroup { displayName = "$STR_ACE_Interaction_LeaveGroup"; - condition = QUOTE( count (units group _player) > 1 ); - statement = QUOTE( _oldGroup = units group _player; _newGroup = createGroup side _player; [_player] joinSilent _newGroup; {_player reveal _x} forEach _oldGroup; ); + condition = QUOTE(count (units group _player) > 1); + statement = QUOTE(_oldGroup = units group _player; _newGroup = createGroup side _player; [_player] joinSilent _newGroup; {_player reveal _x} forEach _oldGroup;); showDisabled = 1; priority = 1.2; - icon = PATHOF(UI\team\team_management_ca.paa); + icon = PATHTOF(UI\team\team_management_ca.paa); enableInside = 1; hotkey = "M"; }; @@ -373,7 +373,7 @@ class CfgVehicles { showDisabled = 1; priority = 3.5; subMenu[] = {"ACE_Gestures", 1}; - icon = "ACE_Interaction\UI\gestures_ca.paa"; + icon = PATHTOF(UI\gestures_ca.paa); hotkey = "G"; /*class ACE_Gesture_Advance { @@ -385,87 +385,87 @@ class CfgVehicles { };*/ class ACE_Gesture_Advance { displayName = "$STR_ACE_Interaction_Gestures_Advance"; - condition = "canStand _target"; - statement = "_target playActionNow 'gestureAdvance';"; + condition = QUOTE(canStand _target); + statement = QUOTE(_target playActionNow 'gestureAdvance';); showDisabled = 1; priority = 1.9; hotkey = "1"; }; class ACE_Gesture_Go { displayName = "$STR_ACE_Interaction_Gestures_Go"; - condition = "canStand _target"; - statement = "_target playActionNow (['gestureGo', 'gestureGoB'] select (floor random 2));"; + condition = QUOTE(canStand _target); + statement = QUOTE(_target playActionNow ([ARR_2('gestureGo','gestureGoB')] select floor random 2);); showDisabled = 1; priority = 1.8; hotkey = "2"; }; class ACE_Gesture_Follow { displayName = "$STR_ACE_Interaction_Gestures_Follow"; - condition = "canStand _target"; - statement = "_target playActionNow 'gestureFollow';"; + condition = QUOTE(canStand _target); + statement = QUOTE(_target playActionNow 'gestureFollow';); showDisabled = 1; priority = 1.7; hotkey = "3"; }; /*class ACE_Gesture_Point { displayName = "$STR_ACE_Interaction_Gestures_Point"; - condition = "canStand _target"; - statement = "_target playActionNow 'gesturePoint';"; + condition = QUOTE(canStand _target); + statement = QUOTE(_target playActionNow 'gesturePoint';); showDisabled = 1; priority = 1.6; };*/ class ACE_Gesture_Up { displayName = "$STR_ACE_Interaction_Gestures_Up"; - condition = "canStand _target"; - statement = "_target playActionNow 'gestureUp';"; + condition = QUOTE(canStand _target); + statement = QUOTE(_target playActionNow 'gestureUp';); showDisabled = 1; priority = 1.5; hotkey = "4"; }; class ACE_Gesture_Cover { displayName = "$STR_ACE_Interaction_Gestures_Cover"; - condition = "canStand _target"; - statement = "_target playActionNow 'gestureCover';"; + condition = QUOTE(canStand _target); + statement = QUOTE(_target playActionNow 'gestureCover';); showDisabled = 1; priority = 1.4; hotkey = "5"; }; class ACE_Gesture_CeaseFire { displayName = "$STR_ACE_Interaction_Gestures_Cease_Fire"; - condition = "canStand _target"; - statement = "_target playActionNow 'gestureCeaseFire';"; + condition = QUOTE(canStand _target); + statement = QUOTE(_target playActionNow 'gestureCeaseFire';); showDisabled = 1; priority = 1.3; hotkey = "6"; }; class ACE_Gesture_Freeze { displayName = "$STR_ACE_Interaction_Gestures_Freeze"; - condition = "canStand _target"; - statement = "_target playActionNow 'gestureFreeze';"; + condition = QUOTE(canStand _target); + statement = QUOTE(_target playActionNow 'gestureFreeze';); showDisabled = 1; priority = 1.2; hotkey = "7"; }; class ACE_Gesture_Yes { displayName = "$STR_ACE_Interaction_Gestures_Yes"; - condition = "canStand _target"; - statement = "_target playActionNow (['gestureYes', 'gestureNod'] select (floor random 2));"; + condition = QUOTE(canStand _target); + statement = QUOTE(_target playActionNow ([ARR_2('gestureYes','gestureNod')] select floor random 2);); showDisabled = 1; priority = 1.1; hotkey = "8"; }; class ACE_Gesture_No { displayName = "$STR_ACE_Interaction_Gestures_No"; - condition = "canStand _target"; - statement = "_target playActionNow 'gestureNo';"; + condition = QUOTE(canStand _target); + statement = QUOTE(_target playActionNow 'gestureNo';); showDisabled = 1; priority = 1.0; hotkey = "9"; }; class ACE_Gesture_Hi { displayName = "$STR_ACE_Interaction_Gestures_Hi"; - condition = "canStand _target"; - statement = "_target playActionNow (['gestureHi', 'gestureHiB', 'gestureHiC'] select (floor random 3));"; + condition = QUOTE(canStand _target); + statement = QUOTE(_target playActionNow ([ARR_3('gestureHi','gestureHiB','gestureHiC')] select floor random 3);); showDisabled = 1; priority = 0.9; hotkey = "0"; @@ -474,7 +474,7 @@ class CfgVehicles { class ACE_Equipment { displayName = "$STR_ACE_Interaction_Equipment"; - condition = "true"; + condition = QUOTE(true); statement = ""; showDisabled = 1; priority = 4.5; @@ -485,11 +485,11 @@ class CfgVehicles { class ACE_Dummy { displayName = ""; - condition = "false"; + condition = QUOTE(false); statement = ""; showDisabled = 1; priority = -99; - icon = PATHOF(UI\blank_CO.paa); + icon = PATHTOEF(common,UI\blank_CO.paa); enableInside = 1; }; }; @@ -557,8 +557,8 @@ class CfgWeapons { class ACE_CableTie: ACE_ItemCore { displayName = "$STR_ACE_Interaction_CableTie_Name"; descriptionShort = "$STR_ACE_Interaction_CableTie_Description"; - model = PATHOF(ACE_cabletie.p3d); - picture = PATHOF(UI\ACE_cabletie_x_ca.paa); + model = PATHTOF(ACE_cabletie.p3d); + picture = PATHTOF(UI\ACE_cabletie_x_ca.paa); scope = 2; class ItemInfo: InventoryItem_Base_F { mass = 1; diff --git a/addons/interaction/functions/fnc_GetActions.sqf b/addons/interaction/functions/fnc_GetActions.sqf index ede8adf3a8..67386331c1 100644 --- a/addons/interaction/functions/fnc_GetActions.sqf +++ b/addons/interaction/functions/fnc_GetActions.sqf @@ -129,9 +129,9 @@ for "_i" from 0 to (_count - 1) do { _cacheIndices pushBack _indexCache; _cache = [_cacheConfigs, _cacheActions, _cacheIndices]; - ["InteractionMenu", _action, {format ["%1 loaded into cache", _this]}] call EFUNC(debug,log); + ["InteractionMenu", _action, {format ["%1 loaded into cache", _this]}] call EFUNC(common,log); } else { - ["InteractionMenu", _action, {format ["%1 loaded from cache", _this]}] call EFUNC(debug,log); + ["InteractionMenu", _action, {format ["%1 loaded from cache", _this]}] call EFUNC(common,log); _cachedAction = _cacheActions select (_cacheIndices select _indexCache); diff --git a/addons/interaction/functions/fnc_getActions2.sqf b/addons/interaction/functions/fnc_getActions2.sqf index 2f7ad4b07e..ab64d8d390 100644 --- a/addons/interaction/functions/fnc_getActions2.sqf +++ b/addons/interaction/functions/fnc_getActions2.sqf @@ -97,9 +97,9 @@ _cacheIndices = _cache select 2; _cacheIndices pushBack _indexCache; _cache = [_cacheConfigs, _cacheActions, _cacheIndices]; - ["InteractionMenu", _action, {format ["%1 loaded into cache", _this]}] call EFUNC(debug,log); + ["InteractionMenu", _action, {format ["%1 loaded into cache", _this]}] call EFUNC(common,log); } else { - ["InteractionMenu", _action, {format ["%1 loaded from cache", _this]}] call EFUNC(debug,log); + ["InteractionMenu", _action, {format ["%1 loaded from cache", _this]}] call EFUNC(common,log); private ["_cachedAction", "_showDisabled"]; _cachedAction = _cacheActions select (_cacheIndices select _indexCache); diff --git a/addons/interaction/functions/fnc_initialiseInteraction.sqf b/addons/interaction/functions/fnc_initialiseInteraction.sqf index 180a7024bb..43e45edaa4 100644 --- a/addons/interaction/functions/fnc_initialiseInteraction.sqf +++ b/addons/interaction/functions/fnc_initialiseInteraction.sqf @@ -31,7 +31,7 @@ _player = ACE_player; _vehicle = vehicle _player; //_object = [GVAR(Target), _player] select (GVAR(MenuType) % 2 == 1); -if !([_target, 5] call GVAR(isInRange)) exitWith {}; +if !([_target, 5] call FUNC(isInRange)) exitWith {}; GVAR(Shortcuts) = [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1]; @@ -119,7 +119,7 @@ if (_this select 2) then { _target = [GVAR(Target), _player] select (GVAR(MenuType) % 2 == 1); waitUntil { - if !([_target, 5] call GVAR(isInRange)) exitWith { + if !([_target, 5] call FUNC(isInRange)) exitWith { (findDisplay 1713999) closeDisplay 1 }; @@ -134,7 +134,7 @@ if (_this select 2) then { GVAR(CurrentTooltip) = []; - _enable = (_distance == 0 || {[_target, _distance] call GVAR(isInRange)}) && {[_target, _player] call _condition} && {[_target, _player] call _conditionShow}; + _enable = (_distance == 0 || {[_target, _distance] call FUNC(isInRange)}) && {[_target, _player] call _condition} && {[_target, _player] call _conditionShow}; if (isNil "_enable") then {_enable = false}; GVAR(Tooltips) set [_forEachIndex, GVAR(CurrentTooltip)]; diff --git a/addons/interaction/functions/fnc_onClick.sqf b/addons/interaction/functions/fnc_onClick.sqf index 68047a5fba..39581db3a3 100644 --- a/addons/interaction/functions/fnc_onClick.sqf +++ b/addons/interaction/functions/fnc_onClick.sqf @@ -19,7 +19,7 @@ _subMenu = _action select 4; // back if (_index == -1) exitWith { - call FUNC(MainButton); + call GVAR(MainButton); }; if (count _subMenu < 2) then { diff --git a/addons/main/script_macros.hpp b/addons/main/script_macros.hpp index be16f947ac..8812c11507 100644 --- a/addons/main/script_macros.hpp +++ b/addons/main/script_macros.hpp @@ -182,6 +182,8 @@ #define QFUNC(var1) QUOTE(DFUNC(var1)) #define QEFUNC(var1,var2) QUOTE(DEFUNC(var1,var2)) +#define PATHTOEF(var1,var2) PATHTOF_SYS(PREFIX,var1,var2) + #ifdef DISABLE_COMPILE_CACHE #define PREP(fncName) DFUNC(fncName) = compile preprocessFileLineNumbers QUOTE(PATHTOF(functions\DOUBLES(fnc,fncName).sqf)) #else From b7050a4a92b25aa49829c80d11d7d6c112b903ad Mon Sep 17 00:00:00 2001 From: commy2 Date: Tue, 13 Jan 2015 19:31:26 +0100 Subject: [PATCH 9/9] fixing macros --- addons/common/CfgVehicles.hpp | 2 +- addons/common/XEH_preInit.sqf | 2 +- addons/common/config.cpp | 2 +- ...oadEventhandler.sqf => fnc_addCuratorUnloadEventhandler.sqf} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename addons/common/functions/{fnc_addUnloadEventhandler.sqf => fnc_addCuratorUnloadEventhandler.sqf} (100%) diff --git a/addons/common/CfgVehicles.hpp b/addons/common/CfgVehicles.hpp index 8ed770d786..94bc6f057f 100644 --- a/addons/common/CfgVehicles.hpp +++ b/addons/common/CfgVehicles.hpp @@ -30,7 +30,7 @@ class CfgVehicles { author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "Check PBOs"; - function = "ACE_Common_fnc_moduleCheckPBOs"; + function = QFUNC(moduleCheckPBOs); scope = 2; isGlobal = 1; icon = QUOTE(PATHTOF(UI\IconCheckPBO_ca.paa)); diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf index e59894c370..52ccdff4d4 100644 --- a/addons/common/XEH_preInit.sqf +++ b/addons/common/XEH_preInit.sqf @@ -134,7 +134,7 @@ PREP(monitor); PREP(showUser); // ACE_CuratorFix -PREP(addUnloadEventhandler); +PREP(addCuratorUnloadEventhandler); PREP(fixCrateContent); // Loop to update the ACE_player variable diff --git a/addons/common/config.cpp b/addons/common/config.cpp index 31ab380344..db8b8f532b 100644 --- a/addons/common/config.cpp +++ b/addons/common/config.cpp @@ -72,7 +72,7 @@ class ACE_Options { /* class RscControlsGroupNoScrollbars; class RscAttributeInventory: RscControlsGroupNoScrollbars { - onSetFocus = "[_this,""RscAttributeInventory"",'CuratorCommon'] call (uinamespace getvariable ""BIS_fnc_initCuratorAttribute""); _this select 0 call ACE_CuratorFix_fnc_addUnloadEventhandler;"; + onSetFocus = "[_this,""RscAttributeInventory"",'CuratorCommon'] call (uinamespace getvariable ""BIS_fnc_initCuratorAttribute""); _this select 0 call ACE_Common_fnc_addCuratorUnloadEventhandler;"; }; */ diff --git a/addons/common/functions/fnc_addUnloadEventhandler.sqf b/addons/common/functions/fnc_addCuratorUnloadEventhandler.sqf similarity index 100% rename from addons/common/functions/fnc_addUnloadEventhandler.sqf rename to addons/common/functions/fnc_addCuratorUnloadEventhandler.sqf