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

Jump to bottom

Post-release bugfixes #167

Merged
merged 2 commits into from
Aug 3, 2022
Merged

Post-release bugfixes #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c247af3
Fix the housework_enter state
ColinM9991 Aug 3, 2022
ea7c9c4
Set CBA settings on a server level
ColinM9991 Aug 3, 2022
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
2 changes: 1 addition & 1 deletion addons/cars/functions/fnc_setVehicles.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ params [

assert(_value isEqualTypeAll "");

[QGVAR(vehicles), str _value, 1, "mission"] call CBA_settings_fnc_set;
[QGVAR(vehicles), str _value, 1, "server", true] call CBA_settings_fnc_set;
2 changes: 1 addition & 1 deletion addons/lifecycle/functions/fnc_setCivilians.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ params [

assert(_value isEqualTypeAll "");

[QGVAR(civClasses), str _value, 1, "mission"] call CBA_settings_fnc_set;
[QGVAR(civClasses), str _value, 1, "server", true] call CBA_settings_fnc_set;
2 changes: 1 addition & 1 deletion addons/residents/functions/fnc_sm_business_state_housework_enter.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
private _isSleepingTime = _this call EFUNC(activities,isSleepingTime);

private _house = _this getVariable ["grad_civs_home", objNull];
_this setVariable [QGVAR(housework_time), random if (_isSleepingTime) then {GVAR(houseworkTimesNight)} else {GVAR(houseworkTimesDay)}];
Copy link
Member

@Fusselwurm Fusselwurm Aug 3, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you really like that syntax, do you.

Seriously though, I was sure I had residents in my test scenario, it should've failed right away.

_this setVariable [QGVAR(housework_time), random (if (_isSleepingTime) then [{GVAR(houseworkTimesNight)},{GVAR(houseworkTimesDay)}])];
_this call EFUNC(activities,forceEmotionSpeed);

if (isNull _house) exitWith {
Expand Down