Wrong vehicle selling on chopshop FIX #568
Conversation
There was a problem hiding this comment.
@Casperento happy with the changes, although while we're here, is it worth optimising the rest of the files you've changed?
|
Yes, I think so |
There was a problem hiding this comment.
All working in testing I assume?
https://travis-ci.org/AsYetUntitled/Framework/builds/562188210#L233
| @@ -2,25 +2,33 @@ | |||
| /* | |||
| File: fn_chopShopMenu.sqf | |||
| Author: Bryan "Tonic" Boardwine | |||
| Modified: Casperento | |||
There was a problem hiding this comment.
See the comment on the conversation here: https://github.com/AsYetUntitled/Framework/pull/564/files/a33681c53b384b2aaa97286df87bbae6fc5f2491#diff-480bd50ccc3ed591fc3ed0bd4b402585
I've made the same point a few times in recent PRs
There was a problem hiding this comment.
No problem, i'll remove these 'Modified' comments
|
|
||
| private _control = CONTROL(39400,39402); | ||
| private _price = _control lbValue (lbCurSel _control); | ||
| private _vehicle = _control lbData (lbCurSel _control); | ||
| _vehicle = call compile format ["%1", _vehicle]; |
There was a problem hiding this comment.
Would probably be best to remove this
There was a problem hiding this comment.
i would personally use setVariable, instead of lbDate when using anything but a string.
_control setVariable [format ["lbData_%1", _index], anything];
There was a problem hiding this comment.
Thx for suggesting
| if (isNull _vehicle) exitWith {}; | ||
|
|
||
| hint localize "STR_Shop_ChopShopSelling"; | ||
| life_action_inUse = true; | ||
| _price2 = CASH + _price; | ||
| [0] call SOCK_fnc_updatePartial; |
There was a problem hiding this comment.
(talking about the updatePartial so we're on the same page - can remove that)
There was a problem hiding this comment.
Yes, sorry my bad
|
|
||
| if (_price > 0) then { | ||
| CASH = CASH + _price; | ||
| [1,"STR_NOTF_ChopSoldCar",true,[_displayName,[_price] call life_fnc_numberText]] call life_fnc_broadcast; |
There was a problem hiding this comment.
Maybe more elegant to just do this manually?
|
Yeah, that's true @Leigham...already fixed for the next commit |
|
it just removes the need for |
|
Ya, i came up with this in the end: |
|
just pass through the object |
|
Yes, well reminded..but i think it's better keep lbData anyway |
|
just looked through, |
netID returns a string so that should be fine |
| */ | ||
| params [ | ||
| ["_price",-1,[-1]], | ||
| "_displayName" |
There was a problem hiding this comment.
displayName can be given a default of "" and allowed data types of "" also
| @@ -6,14 +6,16 @@ | |||
| Displays the pricing for the currently selected vehicle. | |||
| */ | |||
| disableSerialization; | |||
There was a problem hiding this comment.
Serialization doesn't need to be disabled here
| _control = CONTROL(39400,39402); | ||
| private _control = CONTROL(39400,39402); | ||
| private "_className"; | ||
| private "_classNameLife"; |
There was a problem hiding this comment.
If we invert usage of _classname,
if (!isClass (missionConfigFile >> "LifeCfgVehicles" >> _classNameLife)) then {
diag_log format ["%1: LifeCfgVehicles class doesn't exist",_className];
_className = "Default"; //Use Default class if it doesn't exist
};
There was a problem hiding this comment.
Thanks for the updates @Casperento. Just the last 2 things from me!
|
|
||
| private _chopable = LIFE_SETTINGS(getArray,"chopShop_vehicles"); | ||
| private _nearVehicles = nearestObjects [getMarkerPos (_this select 3),_chopable,25]; | ||
| private _nearUnits = (nearestObjects[player,["CAManBase"],5]) arrayIntersect playableUnits; | ||
| if (count _nearUnits > 1) exitWith {hint localize "STR_NOTF_PlayerNear"}; | ||
|
|
||
| life_chopShop = _this select 3; | ||
| //Error check | ||
| if (count _nearVehicles isEqualTo 0) exitWith {titleText[localize "STR_Shop_NoVehNear","PLAIN"];}; |
There was a problem hiding this comment.
Slight improvement for this;
if (_nearVehicles isEqualTo []) exitWith {blah};
Resolves #567
Changes proposed in this pull request:
Get vehicle object by it's netId
fn_chopShopMenu.sqf updated
fn_chopShopSell.sqf updated
I have tested my changes and corrected any errors found