Fix versioning and gear module (locality issue)

unitedoperations · May 10, 2014 · 6f4f827 · 6f4f827
1 parent 2dc2519
commit 6f4f827
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/core/version b/core/version
@@ -1 +1 @@
-4
+5
diff --git a/mission.sqm b/mission.sqm
@@ -25,7 +25,7 @@ class Mission
 	randomSeed=4656359;
 	class Intel
 	{
-		briefingName="CO14 Apple Core v5";
+		briefingName="CO14 Apple Core v6";
 		briefingDescription="Core Framework Showcase Mission";
 		startWeather=0.39999998;
 		forecastWeather=0.25;

diff --git a/modules/gear/module.cpp b/modules/gear/module.cpp
@@ -3,7 +3,7 @@ class gear
 {
 	name = "Gear Module";
 	authors[] = {"Naught"};
-	version = 2;
+	version = 4;
 	required_version = 1;
 	url = "https://github.com/unitedoperations/Core-framework";
 	preinit = "preinit.sqf";

diff --git a/modules/gear/preinit.sqf b/modules/gear/preinit.sqf
@@ -32,9 +32,8 @@ gear_fnc_setLoadout = {
 		private ["_obj"];
 		_obj = _this select 0;
 
-		if (!isDedicated) then {
-			waitUntil {!isNull player};
-		};
+		if (isMultiplayer && isDedicated && {isPlayer _obj}) exitWith {}; // Servers don't load player gear!
+		if (!isDedicated) then {waitUntil {!isNull player}}; // Clients must wait for server unit hand-over.
 
 		if (local _obj) then {
 			if (_obj isKindOf "Man") then {