Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes for master branch #688

Closed
wants to merge 19 commits into from
Closed

fixes for master branch #688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
7c3f7f5
Update fn_catchFish.sqf
May 28, 2020
286a4a1
Update CfgRemoteExec.hpp
May 28, 2020
3d2fca5
Update Functions.hpp
May 28, 2020
9b0df7c
Update Config_SpyGlass.hpp
May 28, 2020
1cf3200
Update fn_setupEVH.sqf
May 28, 2020
af5749b
Create fn_handleHeal.sqf
May 28, 2020
2bd0967
Update impound.hpp
May 28, 2020
3f84079
added missing precedure call to AL.ini
May 29, 2020
26974c9
revert back container bugfix to keep in sync with not yet merged bugfix
May 29, 2020
95304fd
fix AL.ini
May 29, 2020
b6871d8
fix AL.ini again
May 29, 2020
db5869a
added call to deleteOldContainers and deleteOldWanted on server startup
May 29, 2020
79f822d
added database cleanup run every hour
May 29, 2020
d344a1a
fix fn_cleanup.sqf
May 29, 2020
3f60f0c
removing remote hud-update > not possible
May 29, 2020
3085b19
removing remote hud-update > not possible
May 29, 2020
35190a5
removing remote hud-update > not possible
May 29, 2020
e407401
removing remote hud-update > not possible
May 29, 2020
f4eb133
removing remote hud-update > not possible
May 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions AL.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ SQL1_1 = CALL deleteOldGangs
[deleteOldContainers]
SQL1_1 = CALL deleteOldContainers


[deleteOldWanted]
SQL1_1 = CALL deleteOldWanted

[checkPlayerExists]
SQL1_1 = SELECT pid, name FROM players WHERE pid = ?
Expand Down Expand Up @@ -120,8 +121,6 @@ SQL1_INPUTS = 1, 2
SQL1_1 = UPDATE players SET cash = ?, bankacc = ? WHERE pid = ?
SQL1_INPUTS = 1, 2, 3



[selectPlayerGang]
SQL1_1 = SELECT id, owner, name, maxmembers, bank, members FROM gangs WHERE active = '1' AND members LIKE ?
SQL1_INPUTS = 1
Expand Down Expand Up @@ -175,8 +174,6 @@ SQL1_INPUTS = 1, 2, 3
SQL1_1 = UPDATE gangs SET active = '0' WHERE id = ?
SQL1_INPUTS = 1



[insertHouse]
SQL1_1 = INSERT INTO houses (pid, pos, owned) VALUES (?, ?, '1')
SQL1_INPUTS = 1, 2
Expand Down Expand Up @@ -244,9 +241,6 @@ SQL1_INPUTS = 1, 2
SQL1_1 = UPDATE containers SET owned = '0', pos = '[]' WHERE id = ?
SQL1_INPUTS = 1




[selectVehicles]
SQL1_1 = SELECT id, side, classname, type, pid, alive, active, plate, color FROM vehicles WHERE pid = ? AND alive = '1' AND active = '0' AND side = ? AND type = ?
SQL1_INPUTS = 1, 2, 3
Expand Down Expand Up @@ -301,7 +295,6 @@ SQL1_INPUTS = 1, 2
SQL1_1 = UPDATE vehicles SET active = '0', fuel = ? WHERE pid = ? AND plate = ?
SQL1_INPUTS = 1, 2, 3


[selectWanted]
SQL1_1 = SELECT wantedID, wantedName, wantedCrimes, wantedBounty FROM wanted WHERE active = '1' AND wantedID = ?
SQL1_INPUTS = 1
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/actions/fn_catchFish.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ if (_fishType isEqualTo "") exitWith {}; //Couldn't get a type
private _fishName = localize _fishName;

//--- Add fish into inventory
if ([true,_type,1] call life_fnc_handleInv) then {
if ([true,_fishType,1] call life_fnc_handleInv) then {
//--- Delete fish in water
deleteVehicle _fish;

Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/dialog/impound.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class Life_impound_menu {
class SellCar: Life_RscButtonMenu {
idc = -1;
text = "$STR_Global_Sell";
onButtonClick = "closeDialog 0; [] spawn life_fnc_sellGarage;";
onButtonClick = "[] spawn life_fnc_sellGarage;";
x = 0.26 + (6.25 / 40) + (1 / 250 / (safezoneW / safezoneH));
y = 0.9 - (1 / 25);
w = (6.25 / 40);
Expand Down
12 changes: 11 additions & 1 deletion life_server/Functions/Systems/fn_cleanup.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,20 @@ private _fnc_cleanVehicles = {
} count (allMissionObjects "Thing");
};

private _fnc_cleanDatabase = {
["resetLifeVehicles", 1] call DB_fnc_asyncCall;
["deleteDeadVehicles", 1] call DB_fnc_asyncCall;
["deleteOldHouses", 1] call DB_fnc_asyncCall;
["deleteOldGangs", 1] call DB_fnc_asyncCall;
["deleteOldContainers", 1] call DB_fnc_asyncCall;
["deleteOldWanted", 1] call DB_fnc_asyncCall;
};

//Array format: [parameters,function,delayTime]
private _routines = [
[[], _fnc_fedDealerUpdate, 1800],
[[], _fnc_cleanVehicles, 3600]
[[], _fnc_cleanVehicles, 3600],
[[], _fnc_cleanDatabase, 3600]
];

{
Expand Down
2 changes: 2 additions & 0 deletions life_server/init.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ publicVariable "life_server_extDB_notLoaded";
["deleteDeadVehicles", 1] call DB_fnc_asyncCall;
["deleteOldHouses", 1] call DB_fnc_asyncCall;
["deleteOldGangs", 1] call DB_fnc_asyncCall;
["deleteOldContainers", 1] call DB_fnc_asyncCall;
["deleteOldWanted", 1] call DB_fnc_asyncCall;

_timeStamp = diag_tickTime;
diag_log "----------------------------------------------------------------------------------------------------";
Expand Down