Merge pull request #186 from DeliciousJaffa/dev

Bug fixes

Author: armazac

addons/overthrow_main/functions/actions/fn_recruitSpawnCiv.sqf

@@ -7,7 +7,7 @@ if(({side _x isEqualTo west || side _x isEqualTo east} count ((getpos player) ne
 private _price = [OT_nation,"CIV",100] call OT_fnc_getPrice;
 private _money = player getVariable ["money",0];
 
-if(_money < _price) exitWith {format ["You need $%1",_cost] call OT_fnc_notifyMinor};
+if(_money < _price) exitWith {format ["You need $%1",_price] call OT_fnc_notifyMinor};
 playSound "3DEN_notificationDefault";
 [-_price] call OT_fnc_money;
 

addons/overthrow_main/functions/player/fn_statsSystemLoop.sqf

@@ -29,8 +29,9 @@ if(!isNil "_qrfstart" && (time - _qrfstart) < 600) then {
 		_mins = floor(_secs / 60);
 		_secs = round(_secs % 60);
 	};
+	if(_mins < 10) then {_mins = format["0%1",_mins]};
 	if(_secs < 10) then {_secs = format["0%1",_secs]};
-	_qrf = format["<t size='0.7'>Battle of %1</t><br/>Starting (0%2:%3)",_attacking,_mins,_secs];
+	_qrf = format["<t size='0.7'>Battle of %1</t><br/>Starting (%2:%3)",_attacking,_mins,_secs];
 };
 
 if(!isNil "_qrfstart" && (time - _qrfstart) > 600) then {

addons/overthrow_main/functions/save/fn_savePlayerData.sqf

@@ -4,29 +4,32 @@ private _uid = getPlayerUid _player;
 private _data = [];
 
 {
-	private _v = _player getVariable [_x,""];
-	if(_x isEqualTo "home" && !(_v isEqualType [])) then {
-		_owned = (_player getVariable "owned");
-		if(count _owned isEqualTo 0) then {
-			diag_log format["Warning: Player %1 owns no buildings to be set as home",name _player];
-			//fallback to current pos
-			_v = getpos _player;
-		}else{
-			_buildid = _owned select 0;
-			_pos = buildingpositions getVariable [_buildid,[]];
-			if(count _pos isEqualTo 0) then {
+	private _v = _player getVariable _x;
+	if (!isNil "_v") then {
+		if(_x isEqualTo "home" && !(_v isEqualType [])) then {
+			_owned = (_player getVariable "owned");
+			if(count _owned isEqualTo 0) then {
+				diag_log format["Warning: Player %1 owns no buildings to be set as home",name _player];
 				//fallback to current pos
-				_v = getpos player;
+				_v = getpos _player;
 			}else{
-				_v = _pos;
+				_buildid = _owned select 0;
+				_pos = buildingpositions getVariable [_buildid,[]];
+				if(count _pos isEqualTo 0) then {
+					//fallback to current pos
+					_v = getpos player;
+				}else{
+					_v = _pos;
+				};
 			};
 		};
+		_data pushback [_x,_v];
 	};
-	_data pushback [_x,_v];
 }foreach(allVariables _player select {
 	_x = toLower _x;
-	!(_x in ["ot_loaded", "morale", "player_uid", "sa_tow_actions_loaded", "hiding", "randomValue", "saved3deninventory", "babe_em_vars"])
-	&& { !((_x select [0,4]) in ["ace_", "cba_", "bis_"]) }
+	!(_x in ["ot_loaded", "morale", "player_uid", "hiding", "randomValue", "saved3deninventory", "babe_em_vars"])
+	&& { !((_x select [0,4]) in ["ace_", "cba_", "bis_", "aur_"]) }
+	&& { !((_x select [0,3]) in ["sa_", "ar_"]) }
 	&& { (_x select [0,11]) != "missiondata" }
 	&& { (_x select [0,9]) != "seencache"}
 });