Skip to content

Commit

Permalink
File name & comment cleanup, and remove unused file (#814)
Browse files Browse the repository at this point in the history
* Fixed: File name in comment: fn_whereAmI

* Fixed: Most file name in comments

Changes:
- Fixed: File name in the comments.
- Other stuff. Like not being the author of fn_vehicleColor3DRefresh.

* Removed: fn_logIt

Changes:
Removed: fn_logIt.sqf, ton_fnc_logit from Config_SpyGlass and logIt from
config as it is unused.

* Added: File name in comment

Changes:
- Added: The file name in the comment.
- Other stuff.

* Removes: Files with incorrect casing

Changes:
- Removes: Files with incorrect casing
-- To be re-added with correct casing.

* Re-added: Files with correct casing

Changes:
- Re-added: Files with correct casing.

* Changes: Fixed casing in other files

Changes:
- Fixed: The casing in other files for the files whose names were
changed.
  • Loading branch information
Jawshy authored and danielstuart14 committed Jun 9, 2016
1 parent f5f648e commit 87eea05
Show file tree
Hide file tree
Showing 37 changed files with 48 additions and 55 deletions.
6 changes: 3 additions & 3 deletions Altis_Life.Altis/CfgRemoteExec.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ class CfgRemoteExec {
/* Client only functions */
F(life_fnc_AAN,CLIENT)
F(life_fnc_addVehicle2Chain,CLIENT)
F(life_fnc_adminid,CLIENT)
F(life_fnc_admininfo,CLIENT)
F(life_fnc_adminID,CLIENT)
F(life_fnc_adminInfo,CLIENT)
F(life_fnc_bountyReceive,CLIENT)
F(life_fnc_copLights,CLIENT)
F(life_fnc_copSearch,CLIENT)
Expand Down Expand Up @@ -93,7 +93,7 @@ class CfgRemoteExec {
F(TON_fnc_getVehicles,SERVER)
F(TON_fnc_insertGang,SERVER)
F(TON_fnc_keyManagement,SERVER)
F(TON_fnc_managesc,SERVER)
F(TON_fnc_manageSC,SERVER)
F(TON_fnc_pickupAction,SERVER)
F(TON_fnc_removeGang,SERVER)
F(TON_fnc_sellHouse,SERVER)
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/config/Config_SpyGlass.hpp

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
File: fn_admingetID.sqf
File: fn_adminGetID.sqf
Author: Bryan "Tonic" Boardwine
Description:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
File: fn_adminid.sqf
File: fn_adminID.sqf
Author: Bryan "Tonic" Boardwine
Description:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "..\..\script_macros.hpp"
/*
File: fn_admininfo.sqf
File: fn_adminInfo.sqf
Author: Bryan "Tonic" Boardwine
Description:
Expand Down
3 changes: 2 additions & 1 deletion Altis_Life.Altis/core/functions/fn_searchPosEmpty.sqf
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/*
File: fn_searchPosEmpty.sqf
Author: R3F_Team
Description:
Return a clear position in the sky
Return a clear position in the sky.
Parameter(s):
0: (Optional) offset 3D cube in which to look for a location (default [0,0,0])
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/functions/fn_whereAmI.sqf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
File: fn_mine.sqf
File: fn_whereAmI.sqf
Author: Dardo
Description:
Expand Down
4 changes: 2 additions & 2 deletions Altis_Life.Altis/core/housing/fn_containerMenu.sqf
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include "..\..\script_macros.hpp"
/*
File : containerMenu.sqf
File: fn_containerMenu.sqf
Author: NiiRoZz
Description:
Container interaction menu
Container interaction menu.
*/
#define Btn1 37450
#define Btn2 37451
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/housing/fn_placeContainer.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ _message = 0;
_isPlaced = false;
if (!isNull _house) then {
_message = 1;
if (([player] call life_fnc_PlayerInBuilding) && {([_container] call life_fnc_PlayerInBuilding)}) then {
if (([player] call life_fnc_playerInBuilding) && {([_container] call life_fnc_playerInBuilding)}) then {
_message = 2;
if ((_house in life_vehicles) && !(isNil {_house getVariable "house_owner"})) then {
_message = 3;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/*
File : fn_PlayerInBuilding.sqf
File: fn_playerInBuilding.sqf
Author: Mad_Cheese
Description:
Indicates whether a player is in a building
Indicates whether a player is in a building.
Edit: BoGuu - lineIntersectsWith returns an array ordered by distance from farthest to closest.
Script needed to check the last index for each wallCheck array.
Expand All @@ -14,8 +15,7 @@
Example
//--- Find if a unit is in building
[player] call life_fnc_PlayerInBuilding
[player] call life_fnc_playerInBuilding
*/

private ["_unit","_position","_roofCheck","_return"];
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/init.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ diag_log "Display 46 Found";
(findDisplay 46) displayAddEventHandler ["KeyDown", "_this call life_fnc_keyHandler"];
player addRating 99999999;

[player,life_settings_enableSidechannel,playerSide] remoteExecCall ["TON_fnc_managesc",RSERV];
[player,life_settings_enableSidechannel,playerSide] remoteExecCall ["TON_fnc_manageSC",RSERV];
0 cutText ["","BLACK IN"];
[] call life_fnc_hudSetup;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "..\..\script_macros.hpp"
/*
File: fn_jerrycanRefuel.sqf
File: fn_jerryCanRefuel.sqf
Author: Bryan "Tonic" Boardwine
Modified: Jesse "tkcjesse" Schultz
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/medical/fn_onPlayerKilled.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ CASH = 0;
life_is_alive = false;

[] call life_fnc_hudUpdate; //Get our HUD updated.
[player,life_settings_enableSidechannel,playerSide] remoteExecCall ["TON_fnc_managesc",RSERV];
[player,life_settings_enableSidechannel,playerSide] remoteExecCall ["TON_fnc_manageSC",RSERV];

[0] call SOCK_fnc_updatePartial;
[3] call SOCK_fnc_updatePartial;
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/medical/fn_onPlayerRespawn.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ _unit addRating 1e12; //Set our rating to a high value, this is for a ARMA engin
player playMoveNow "AmovPpneMstpSrasWrflDnon";

[] call life_fnc_setupActions;
[_unit,life_settings_enableSidechannel,playerSide] remoteExecCall ["TON_fnc_managesc",RSERV];
[_unit,life_settings_enableSidechannel,playerSide] remoteExecCall ["TON_fnc_manageSC",RSERV];
if (LIFE_SETTINGS(getNumber,"enable_fatigue") isEqualTo 0) then {player enableFatigue false;};
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/pmenu/fn_s_onCheckedChange.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ switch (_option) do {
profileNamespace setVariable ["life_enableSidechannel",false];
life_settings_enableSidechannel = profileNamespace getVariable ["life_enableSidechannel",false];
};
[player,life_settings_enableSidechannel,playerSide] remoteExecCall ["TON_fnc_managesc",RSERV];
[player,life_settings_enableSidechannel,playerSide] remoteExecCall ["TON_fnc_manageSC",RSERV];
};
};
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/pmenu/fn_useItem.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ switch (true) do {
};

case (_item isEqualTo "fuelEmpty"): {
[] spawn life_fnc_jerrycanRefuel;
[] spawn life_fnc_jerryCanRefuel;
closeDialog 0;
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "..\..\script_macros.hpp"
/*
File: fn_RefuelCar.sqf
File: fn_fuelRefuelCar.sqf
Author: NiiRoZz
Description:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*
File: fn_vehiclecolor3DRefresh.sqf
Author: Jawshy
Modified : NiiRoZz
File: fn_vehicleColor3DRefresh.sqf
Author:
Modified: NiiRoZz
Description:
Called when a new selection is made in the rsc box and paint the vehicle with the color selected
Called when a new selection is made in the rsc box and paint the vehicle with the color selected.
*/
disableSerialization;
_display = findDisplay 2300;
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/vehicle/fn_vehicleWeight.sqf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
File: fn_calVehWeight.sqf
File: fn_vehicleWeight.sqf
Author: Bryan "Tonic" Boardwine
Description:
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/dialog/FuelStat.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class Life_FuelStat {
class refuelCar: Life_RscButtonMenu {
idc = 20309;
text = "Refuel";
onButtonClick = "[] spawn life_fnc_FuelRefuelcar;";
onButtonClick = "[] spawn life_fnc_fuelRefuelCar;";
x = 0.26 + (6.25 / 40) + (1 / 250 / (safezoneW / safezoneH));
y = 0.9 - (1 / 25);
w = (6.25 / 40);
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/dialog/admin_menu.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class life_admin_menu {
class RscButtonMenu_2402: Life_RscButtonMenu {
idc = -1;
text = "$STR_Admin_GetID";
onButtonClick = "[] call life_fnc_admingetID;";
onButtonClick = "[] call life_fnc_adminGetID;";
x = 0.396875 * safezoneW + safezoneX;
y = 0.643 * safezoneH + safezoneY;
w = 0.061875 * safezoneW;
Expand Down
1 change: 1 addition & 0 deletions Altis_Life.Altis/dialog/function/fn_gangDeposit.sqf
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "..\..\script_macros.hpp"
/*
File: fn_gangDeposit.sqf
Author: Bryan "Tonic" Boardwine
Description:
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/dialog/vehicleShop3D.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class Life_Vehicle_Shop_v2_3D {

class ColorList: Life_RscCombo {
idc = 2304;
onLBSelChanged = "[] call life_fnc_vehiclecolor3DRefresh;";
onLBSelChanged = "[] call life_fnc_vehicleColor3DRefresh;";
x = 0.0204687 * safezoneW + safezoneX;
y = 0.6034 * safezoneH + safezoneY;
w = 0.149531 * safezoneW;
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/initPlayerServer.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
*/
if (LIFE_SETTINGS(getNumber,"player_deathLog") isEqualTo 0) exitWith {};

_this select 0 addMPEventHandler ["MPKilled", {_this call fn_whoDoneit}];
_this select 0 addMPEventHandler ["MPKilled", {_this call fn_whoDoneIt}];
2 changes: 1 addition & 1 deletion BEFilters/mpEventHandler.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
//new
1 ""
7 "" !="_this call fn_whoDoneit"
7 "" !="_this call fn_whoDoneIt"
4 changes: 2 additions & 2 deletions BEFilters/remoteExec.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
//regex
1 "" !="_this call fn_whoDoneit"
5 "" !BIS_fnc_(effectKilled(AirDestruction|Secondaries)|execVM) !DB_fnc_(insertRequest|queryRequest|updatePartial|updateRequest) !HC_fnc_(addContainer|addHouse|chopShopSell|deleteDBContainer|getVehicles|insertGang|insertRequest|jailSys|queryRequest|receivekeyofServer) !HC_fnc_(removeGang|sellHouse(Container)?|spawnVehicle|spikeStrip) !HC_fnc_update(Gang|HouseContainers|HouseTrunk|Partial|Request) !HC_fnc_vehicle(Create|Delete|Store|Update) !HC_fnc_wanted(Add|Bounty|Crimes|Fetch|ProfUpdate|Remove) !life_fnc_(AAN|addVehicle2Chain|adminid|admininfo|animSync|bountyReceive|broadcast|colorVehicle|copLights) !life_fnc_(copSearch|CopSiren|corpse|demoChargeTimer|flashbang|freezePlayer|gangCreated|gangDisbanded|gangInvite) !life_fnc_(garageRefund|giveDiff|hideObj|impoundMenu|jail(Me|Sys)?) !life_fnc_(jumpFnc|knockedOut|licenseCheck|licensesRead|lightHouse|lockVehicle|medic(Lights|Request|Siren)) !life_fnc_(moveIn|pickupItem|pickupMoney|pulloutVeh|receiveItem|receiveMoney|removeLicenses|restrain|revived) !life_fnc_(robPerson|robReceive|say3D|searchClient|seizeClient|setFuel|simDisable|soundDevice|spikeStripEffect) !life_fnc_(tazeSound|ticketPaid|ticketPrompt|vehicleAnimate) !life_fnc_wanted(Add|Bounty|Crimes|Fetch|Info|List|ProfUpdate|Remove) !life_fnc_wireTransfer !SOCK_fnc_(dataQuery|insertPlayerInfo|updateRequest) !SPY_fnc_(cookieJar|notifyAdmins|observe) !TON_fnc_(addContainer|addHouse|chopShopSell|cleanupRequest|handleBlastingCharge) !TON_fnc_clientGang(Kick|Leader|Left) !TON_fnc_(clientGetKey|clientMessage) !TON_fnc_(deleteDBContainer|getID|getVehicles|insertGang|keyManagement|managesc|pickupAction|player_query|recupkeyforHC) !TON_fnc_(removeGang|sellHouse(Container)?|setObjVar|spawnVehicle|spikeStrip) !TON_fnc_update(Gang|HouseContainers|HouseTrunk) !TON_fnc_vehicle(Create|Delete|Store|Update) !="_this call fn_whoDoneit"
1 "" !="_this call fn_whoDoneIt"
5 "" !BIS_fnc_(effectKilled(AirDestruction|Secondaries)|execVM) !DB_fnc_(insertRequest|queryRequest|updatePartial|updateRequest) !HC_fnc_(addContainer|addHouse|chopShopSell|deleteDBContainer|getVehicles|insertGang|insertRequest|jailSys|queryRequest|receivekeyofServer) !HC_fnc_(removeGang|sellHouse(Container)?|spawnVehicle|spikeStrip) !HC_fnc_update(Gang|HouseContainers|HouseTrunk|Partial|Request) !HC_fnc_vehicle(Create|Delete|Store|Update) !HC_fnc_wanted(Add|Bounty|Crimes|Fetch|ProfUpdate|Remove) !life_fnc_(AAN|addVehicle2Chain|adminid|admininfo|animSync|bountyReceive|broadcast|colorVehicle|copLights) !life_fnc_(copSearch|CopSiren|corpse|demoChargeTimer|flashbang|freezePlayer|gangCreated|gangDisbanded|gangInvite) !life_fnc_(garageRefund|giveDiff|hideObj|impoundMenu|jail(Me|Sys)?) !life_fnc_(jumpFnc|knockedOut|licenseCheck|licensesRead|lightHouse|lockVehicle|medic(Lights|Request|Siren)) !life_fnc_(moveIn|pickupItem|pickupMoney|pulloutVeh|receiveItem|receiveMoney|removeLicenses|restrain|revived) !life_fnc_(robPerson|robReceive|say3D|searchClient|seizeClient|setFuel|simDisable|soundDevice|spikeStripEffect) !life_fnc_(tazeSound|ticketPaid|ticketPrompt|vehicleAnimate) !life_fnc_wanted(Add|Bounty|Crimes|Fetch|Info|List|ProfUpdate|Remove) !life_fnc_wireTransfer !SOCK_fnc_(dataQuery|insertPlayerInfo|updateRequest) !SPY_fnc_(cookieJar|notifyAdmins|observe) !TON_fnc_(addContainer|addHouse|chopShopSell|cleanupRequest|handleBlastingCharge) !TON_fnc_clientGang(Kick|Leader|Left) !TON_fnc_(clientGetKey|clientMessage) !TON_fnc_(deleteDBContainer|getID|getVehicles|insertGang|keyManagement|managesc|pickupAction|player_query|recupkeyforHC) !TON_fnc_(removeGang|sellHouse(Container)?|setObjVar|spawnVehicle|spikeStrip) !TON_fnc_update(Gang|HouseContainers|HouseTrunk) !TON_fnc_vehicle(Create|Delete|Store|Update) !="_this call fn_whoDoneIt"
2 changes: 1 addition & 1 deletion life_hc/MySQL/General/fn_queryRequest.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ publicVariable "TON_fnc_playtime_values_request";

life_keyreceived = false;
life_keyreceivedvar = [];
[_uid,_side] remoteExecCall ["TON_fnc_recupkeyforHC",RSERV];
[_uid,_side] remoteExecCall ["TON_fnc_recupKeyForHC",RSERV];
waitUntil {life_keyreceived};
_keyArr = life_keyreceivedvar;
_queryResult set[15,_keyArr];
Expand Down
4 changes: 2 additions & 2 deletions life_hc/MySQL/Housing/fn_addContainer.sqf
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#include "\life_hc\hc_macros.hpp"
/*
File : fn_addContainer
File: fn_addContainer.sqf
Author: NiiRoZz
This file is for Nanou's HeadlessClient.
Description:
Add container in Database
Add container in Database.
*/
private["_containerPos","_query","_className","_dir"];
params [
Expand Down
4 changes: 2 additions & 2 deletions life_server/Functions/Housing/fn_addContainer.sqf
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include "\life_server\script_macros.hpp"
/*
File : fn_addContainer
File: fn_addContainer.sqf
Author: NiiRoZz
Description:
Add container in Database
Add container in Database.
*/
private["_containerPos","_query","_className","_dir"];
params [
Expand Down
2 changes: 1 addition & 1 deletion life_server/Functions/Systems/fn_getID.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ private["_id","_ret"];
_id = owner (_this select 0);
_ret = owner (_this select 1);

[_id] remoteExecCall ["life_fnc_adminid",_ret];
[_id] remoteExecCall ["life_fnc_adminID",_ret];
8 changes: 0 additions & 8 deletions life_server/Functions/Systems/fn_logIt.sqf

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
File: fn_managesc.sqf
File: fn_manageSC.sqf
Author: Bryan "Tonic" Boardwine
Description:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "\life_server\script_macros.hpp"
/*
File: fn_recupkeyforHC.sqf
File: fn_recupKeyForHC.sqf
Author : NiiRoZz
Description:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
File: fn_whoDoneit.sqf
File: fn_whoDoneIt.sqf
Description: Save log file of units killed.
Author: Å ColinM - Help of BI Wiki & Forums.
Expand Down
1 change: 0 additions & 1 deletion life_server/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ class CfgFunctions {
class vehicleDelete {};
class spikeStrip {};
class transferOwnership {};
class logIt {};
class federalUpdate {};
class chopShopSell {};
class clientDisconnect {};
Expand Down
2 changes: 1 addition & 1 deletion life_server/functions.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ compileFinal "
if (isNull _ret) exitWith {};
if (isNil ""_ret"") exitWith {};
[life_atmbank,life_cash,owner player,player,profileNameSteam,getPlayerUID player,playerSide] remoteExecCall [""life_fnc_admininfo"",_ret];
[life_atmbank,life_cash,owner player,player,profileNameSteam,getPlayerUID player,playerSide] remoteExecCall [""life_fnc_adminInfo"",_ret];
";
publicVariable "TON_fnc_player_query";
publicVariable "TON_fnc_index";
Expand Down
2 changes: 1 addition & 1 deletion life_server/init.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ life_server_extDB_notLoaded = "";
serv_sv_use = [];
publicVariable "life_server_isReady";
life_save_civilian_position = if (LIFE_SETTINGS(getNumber,"save_civilian_position") isEqualTo 0) then {false} else {true};
fn_whoDoneit = compile preprocessFileLineNumbers "\life_server\Functions\Systems\fn_whoDoneit.sqf";
fn_whoDoneIt = compile preprocessFileLineNumbers "\life_server\Functions\Systems\fn_whoDoneIt.sqf";

/*
Prepare the headless client.
Expand Down

0 comments on commit 87eea05

Please sign in to comment.