git add is strange

formtapez · formtapez · commit fdc5e99b04f8 · 2021-04-02T17:24:07.000+02:00
diff --git a/addons/characters/B_CTRG_soldier_AR_A_F.hpp b/addons/characters/B_CTRG_soldier_AR_A_F.hpp
@@ -1,4 +1,4 @@
 armor = 2;
 armorStructural = 0.5;
 explosionShielding = 0.05;
-uniformClass = "U_B_CTRG_3";
+uniformClass = "U_B_CTRG_3";
diff --git a/addons/characters/B_CTRG_soldier_GL_LAT_F.hpp b/addons/characters/B_CTRG_soldier_GL_LAT_F.hpp
@@ -1,4 +1,4 @@
 armor = 2;
 armorStructural = 0.38;
 explosionShielding = 0.038;
-uniformClass = "U_B_CTRG_1";
+uniformClass = "U_B_CTRG_1";
diff --git a/addons/characters/B_Soldier_base_F.hpp b/addons/characters/B_Soldier_base_F.hpp
@@ -1,3 +1,3 @@
 armor = 2;
 armorStructural = 0.38;
-explosionShielding = 0.038;
+explosionShielding = 0.038;
diff --git a/addons/characters/O_Soldier_02_F.hpp b/addons/characters/O_Soldier_02_F.hpp
@@ -1,3 +1,3 @@
 armor = 2;
 armorStructural = 0.1;
-explosionShielding = 0.01;
+explosionShielding = 0.01;
diff --git a/addons/characters/O_Soldier_base_F.hpp b/addons/characters/O_Soldier_base_F.hpp
@@ -1,3 +1,3 @@
 armor = 2;
 armorStructural = 0.5;
-explosionShielding = 0.05;
+explosionShielding = 0.05;
diff --git a/addons/characters/README.md b/addons/characters/README.md
@@ -1,3 +1,3 @@
 # Characters
 
-Contains all changes to player units, such as custom camouflage and armor/hitpoint changes.
+Contains all changes to player units, such as custom camouflage and armor/hitpoint changes.
diff --git a/addons/characters/config.cpp b/addons/characters/config.cpp
@@ -2913,4 +2913,4 @@ class CfgVehicles
 		respawnLinkedItems[] = {"H_Watchcap_camo", "V_HarnessO_ghex_F", "ItemMap", "ItemCompass", "ItemWatch", "tf_fadak", "ItemGps", "NVGoggles_OPFOR"};
 		backpack = "B_FieldPack_ghex_F";
 	};
-};
+};
diff --git a/addons/characters/slot_hitpoint.hpp b/addons/characters/slot_hitpoint.hpp
@@ -98,4 +98,4 @@ class HitPoints : HitPoints
 				explosionShielding = 0.800000;				
 				minimalHit = 0.010000;			
 			};			
-		};				
+		};
diff --git a/addons/core/README.md b/addons/core/README.md
@@ -1,3 +1,3 @@
-# Core
+# Main
 
-Contains global stuff such as mission images
+Contains global stuff such as mission images
diff --git a/addons/core/config.cpp b/addons/core/config.cpp
@@ -55,4 +55,3 @@ class CfgFactionClasses
 		priority = 4;
 	};
 };
-
diff --git a/addons/core/dialogs/OPTDef.hpp b/addons/core/dialogs/OPTDef.hpp
@@ -60,5 +60,3 @@
 #define DIALOG_GPS_MINIMAP          	opt_gps_minimap
 #define IDD_GPS_MINIMAP           		915
 #define IDC_GPS_MINIMAP_BOX             916
-
-
diff --git a/addons/core/macros.hpp b/addons/core/macros.hpp
@@ -1,19 +1 @@
-#define PATH opt
-#define PREFIX opt
-#define MOD opt_client
-
-// Define version information of this mod
-#define MAJOR 2
-#define MINOR 9
-#define PATCHLVL 5
-#define BUILD 0
-
-#ifdef VERSION
-    #undef VERSION
-#endif
-#ifdef VERSION_AR
-    #undef VERSION_AR
-#endif
-
-#define VERSION_AR MAJOR,MINOR,PATCHLVL,BUILD
-#define VERSION MAJOR.MINOR.PATCHLVL.BUILD
+#include "\opt\opt_client\addons\main\script_version.hpp"
diff --git a/addons/flashsuppressors/$PBOPREFIX$ b/addons/flashsuppressors/$PBOPREFIX$
@@ -1 +1 @@
-opt\opt_client\addons\ace_flashsuppressors
+opt\opt_client\addons\flashsuppressors
diff --git a/addons/flashsuppressors/README.md b/addons/flashsuppressors/README.md
@@ -1,3 +1,3 @@
 # OPT Flash Suppressors
 
-Makes more weapons compatible with ACE flash suppressors
+Makes more weapons compatible with ACE flash suppressors
diff --git a/addons/flashsuppressors/config.cpp b/addons/flashsuppressors/config.cpp
@@ -2,7 +2,7 @@
 
 class CfgPatches
 {
-	class opt_ace_flashsuppressors
+	class opt_flashsuppressors
 	{
 		units[] = {};
 		weapons[] = {};
@@ -125,4 +125,4 @@ class CfgWeapons
 			};
 		};
 	};
-};
+};
diff --git a/addons/hud/$PBOPREFIX$ b/addons/hud/$PBOPREFIX$
@@ -0,0 +1 @@
+opt\opt_client\addons\hud
diff --git a/addons/hud/config.cpp b/addons/hud/config.cpp
@@ -12,4 +12,4 @@ class CfgPatches
         versionAr[] = {VERSION_AR};
 		requiredAddons[] = {"A3_Ui_F", "A3_Ui_F_Data", "A3_Functions_F", "A3_UIFonts_F", "A3_Data_F", "opt_core"};
 	};
-};
+};
diff --git a/addons/hud/dialogs/config.cpp b/addons/hud/dialogs/config.cpp
@@ -192,4 +192,4 @@ class opt_DefaultMenu
             BackgroundBar, ScoreDisplay, PlayersDisplay, TimerDisplay, BudgetDisplay
         };			
     };
-};	
+};
diff --git a/addons/revive/$PBOPREFIX$ b/addons/revive/$PBOPREFIX$
@@ -0,0 +1 @@
+opt\opt_client\addons\revive
diff --git a/addons/revive/config.cpp b/addons/revive/config.cpp
@@ -12,4 +12,4 @@ class CfgPatches
         versionAr[] = {VERSION_AR};
 		requiredAddons[] = {"A3_Ui_F", "A3_Ui_F_Data", "A3_Functions_F", "A3_UIFonts_F", "A3_Data_F", "opt_core"};
 	};
-};
+};
diff --git a/addons/revive/dialogs/config.cpp b/addons/revive/dialogs/config.cpp
@@ -218,4 +218,4 @@ class opt_revive_blackscreen
 		};
 				
 	};
-};	
+};
diff --git a/addons/shop/$PBOPREFIX$ b/addons/shop/$PBOPREFIX$
@@ -0,0 +1 @@
+opt\opt_client\addons\shop
diff --git a/addons/shop/README.md b/addons/shop/README.md
@@ -1,2 +1 @@
-# shop
-
+# Shop
diff --git a/addons/shop/config.cpp b/addons/shop/config.cpp
@@ -8,4 +8,3 @@ class CfgPatches
         requiredAddons[] = {"a3_ui_f"};
     };
 };
-
diff --git a/addons/shop/dialogs/config.cpp b/addons/shop/dialogs/config.cpp
@@ -1765,5 +1765,3 @@ class DialogVerkaufs
         };
     };
 };
-
-
diff --git a/addons/vehicles/Fahrzeug-Transport.hpp b/addons/vehicles/Fahrzeug-Transport.hpp
@@ -7,4 +7,4 @@ class VehicleTransport
 		parachuteClass = "B_Parachute_02_F";
 		parachuteHeightLimit = 5;
 	};
-};
+};
diff --git a/addons/vehicles/Hellcat_MFD.hpp b/addons/vehicles/Hellcat_MFD.hpp
@@ -442,4 +442,4 @@
      };
     };
    };
-  };
+  };
diff --git a/addons/vehicles/README.md b/addons/vehicles/README.md
@@ -2,4 +2,4 @@
 
 Contains all OPT vehicles (vanilla clones) with altered settings such as weapons, fuel reserves and capabilities (scripts), as well as textures.
 
-Vehicles are sorted into subfolders for easier browsing.
+Vehicles are sorted into subfolders for easier browsing.
diff --git a/addons/vehicles/aktivradar.hpp b/addons/vehicles/aktivradar.hpp
@@ -7,4 +7,4 @@ class SensorsManagerComponent : SensorsManagerComponent
 			componentType = "ActiveRadarSensorComponent";						
 		};
 	};
-};
+};
diff --git a/addons/vehicles/apc/config.cpp b/addons/vehicles/apc/config.cpp
@@ -1,4 +1,4 @@
-﻿class CfgPatches
+class CfgPatches
 {
 	class opt_vehicles_apc
 	{
@@ -2916,4 +2916,4 @@ class CfgVehicles
 		};
 	};
 
-};
+};
diff --git a/addons/vehicles/berggang.hpp b/addons/vehicles/berggang.hpp
@@ -9,4 +9,4 @@ class UserActions
 		statement = "this execVM ""\opt_a3_vehicles\scripts\berggang.sqf"";";
 		onlyforplayer = "false";
 	};
-};
+};
diff --git a/addons/vehicles/boat/config.cpp b/addons/vehicles/boat/config.cpp
@@ -1,4 +1,4 @@
-﻿class CfgPatches
+class CfgPatches
 {
 	class opt_vehicles_boat
 	{
@@ -477,4 +477,4 @@ class CfgVehicles
 			};
 		};
 	};
-};
+};
diff --git a/addons/vehicles/bremsfallschirm.hpp b/addons/vehicles/bremsfallschirm.hpp
@@ -9,4 +9,4 @@ class UserActions
 		statement = "this execVM ""\opt_a3_vehicles\scripts\bremsfallschirm.sqf"";";	
 		onlyforplayer = 1;
 	};
-};
+};
diff --git a/addons/vehicles/cars/config.cpp b/addons/vehicles/cars/config.cpp
@@ -1,4 +1,4 @@
-﻿class CfgPatches
+class CfgPatches
 {
 	class opt_vehicles_cars
 	{
@@ -2175,4 +2175,4 @@ class CfgVehicles
 		{
 		};
 	};
-};
+};
diff --git a/addons/vehicles/config.cpp b/addons/vehicles/config.cpp
@@ -35,4 +35,4 @@ class CfgVehicles
 		displayName = "Benötigt OPT A3 Vehicles";
 		vehicleClass = "Modules";
 	};
-};
+};
diff --git a/addons/vehicles/heli/config.cpp b/addons/vehicles/heli/config.cpp
@@ -1,4 +1,4 @@
-﻿class CfgPatches
+class CfgPatches
 {
 	class opt_vehicles_heli
 	{
@@ -2778,4 +2778,4 @@ class CfgVehicles
 		{
 		};
 	};
-};
+};
diff --git a/addons/vehicles/kein_aktivradar.hpp b/addons/vehicles/kein_aktivradar.hpp
@@ -7,4 +7,4 @@ class SensorsManagerComponent : SensorsManagerComponent
 			componentType = "PassiveRadarSensorComponent";
 		};							
 	};	
-};
+};
diff --git a/addons/vehicles/mbt/config.cpp b/addons/vehicles/mbt/config.cpp
@@ -1,4 +1,4 @@
-﻿class CfgPatches
+class CfgPatches
 {
 	class opt_vehicles_mbt
 	{
@@ -1706,4 +1706,4 @@ class CfgVehicles
 		{
 		};
 	};
-};
+};
diff --git a/addons/vehicles/plane/config.cpp b/addons/vehicles/plane/config.cpp
@@ -1257,4 +1257,4 @@ class CfgVehicles
 			};
 		};
 	};
-};
+};
diff --git a/addons/vehicles/reparieren.hpp b/addons/vehicles/reparieren.hpp
@@ -9,4 +9,4 @@ class UserActions
 		statement = "this execVM ""\opt_a3_vehicles\scripts\reparieren.sqf"";";	
 		onlyforplayer = 1;
 	};
-};
+};
diff --git a/addons/vehicles/scripts/berggang.sqf b/addons/vehicles/scripts/berggang.sqf
@@ -26,4 +26,4 @@ while {(alive _vehicle) && (isengineon _vehicle) && ((driver _vehicle) != objNul
 	_looptime = time - _looptime;
 };
 
-if(true) exitWith {0};
+if(true) exitWith {0};
diff --git a/addons/vehicles/scripts/bremsfallschirm.sqf b/addons/vehicles/scripts/bremsfallschirm.sqf
@@ -1,5 +1,5 @@
 if (isTouchingGround vehicle player) then {
-vehicle player vehiclechat "Bremsfallschirm ausgelöst",
+vehicle player vehiclechat "Bremsfallschirm ausgel�st",
 sleep 2,
 vehicle player setVelocity [0, 0, 0]
-};
+};
diff --git a/addons/vehicles/scripts/reparieren.sqf b/addons/vehicles/scripts/reparieren.sqf
@@ -1,4 +1,4 @@
 systemChat "Reparatur gestartet";
 sleep 20;
 systemChat "Reparatur beendet";
-vehicle player setDamage 0;
+vehicle player setDamage 0;
diff --git a/addons/vehicles/truck/config.cpp b/addons/vehicles/truck/config.cpp
@@ -1,4 +1,4 @@
-﻿class CfgPatches
+class CfgPatches
 {
 	class opt_vehicles_truck
 	{
@@ -754,4 +754,4 @@ class CfgVehicles
 		typicalCargo[] = {"OPT_CSAT_Soldat"};
 		hiddenSelectionsTextures[] = {"\opt\opt_client\addons\vehicles\textures\ZamakMRL\opt_zamak_02_kab_hex_pazifik.paa","\A3\soft_f_Enoch\Truck_02\Data\Truck_02_int_EAF_co.paa","\opt\opt_client\addons\vehicles\textures\ZamakMRL\opt_zamak_02_mrl_hex_pazifik.paa","\A3\soft_f_Enoch\Truck_02\Data\truck_02_chassis_EAF_CO.paa"};
 	};
-};
+};
diff --git a/addons/vehicles/uav/config.cpp b/addons/vehicles/uav/config.cpp
@@ -1,4 +1,4 @@
-﻿class CfgPatches
+class CfgPatches
 {
 	class opt_vehicles_uav
 	{
@@ -1124,4 +1124,4 @@ class CfgVehicles
 			};
 		};
 	};
-};
+};
diff --git a/addons/vehicles/unarmed/config.cpp b/addons/vehicles/unarmed/config.cpp
@@ -1,4 +1,4 @@
-﻿class CfgPatches
+class CfgPatches
 {
 	class opt_vehicles_unarmed
 	{
@@ -1995,4 +1995,4 @@ class CfgVehicles
 		};
 	};
 
-};
+};
diff --git a/addons/vehicles/vtol/config.cpp b/addons/vehicles/vtol/config.cpp
@@ -764,4 +764,4 @@ class CfgVehicles
 			};
 		};
 	};
-};
+};
diff --git a/addons/weapons/README.md b/addons/weapons/README.md
@@ -1,3 +1,3 @@
 # Weapons
 
-Contains all OPT unique weapons and alterations
+Contains all OPT unique weapons and alterations
diff --git a/addons/weapons/config.cpp b/addons/weapons/config.cpp
@@ -1,4 +1,4 @@
-﻿#include "\opt\opt_client\addons\core\macros.hpp"
+#include "\opt\opt_client\addons\core\macros.hpp"
 
 class CfgPatches
 {
@@ -9269,4 +9269,4 @@ class CfgVehicles
 			};
 		};
 	};
-};
+};
diff --git a/mod.cpp b/mod.cpp
@@ -1,7 +1,6 @@
-name = "OPT Client-Mod v3.0.0";
+name = "OPT Client-Mod";
 picture = "opt4_icon.paa";
 actionName = "Website";
-action = "http://www.operation-pandora.de";
+action = "https://opt4.net";
 tooltip = "Operation Pandora Trigger";
-tooltipOwned = "Operation Pandora Trigger Owned";
 author = "OPT Team";

-Original file line number
+Diff line change
 		priority = 4;
 	};
 };
+-