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

Remove references to vanilla classes which have been removed from the base game #6206

Merged
merged 1 commit into from
Apr 8, 2018
Merged

Remove references to vanilla classes which have been removed from the base game #6206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 0 additions & 12 deletions addons/realisticnames/CfgVehicles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,18 +733,6 @@ class CfgVehicles {
class I_C_Offroad_02_unarmed_F: Offroad_02_unarmed_base_F {
displayName = CSTRING(C_Offroad_02_unarmed);
};
class C_Offroad_02_unarmed_F_black: C_Offroad_02_unarmed_F {
displayName = CSTRING(C_Offroad_02_unarmed_black);
};
class C_Offroad_02_unarmed_F_blue: C_Offroad_02_unarmed_F {
displayName = CSTRING(C_Offroad_02_unarmed_blue);
};
class C_Offroad_02_unarmed_F_green: C_Offroad_02_unarmed_F {
displayName = CSTRING(C_Offroad_02_unarmed_green);
};
class C_Offroad_02_unarmed_F_orange: C_Offroad_02_unarmed_F {
displayName = CSTRING(C_Offroad_02_unarmed_orange);
};

// Cessna
class Plane_Civil_01_base_F;
Expand Down
96 changes: 0 additions & 96 deletions addons/realisticnames/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2591,102 +2591,6 @@
<Chinese>"牧馬人"吉普車</Chinese>
<Chinesesimp>"牧马人"吉普车</Chinesesimp>
</Key>
<Key ID="STR_ACE_RealisticNames_C_Offroad_02_unarmed_black">
<English>Jeep Wrangler (Black)</English>
<Czech>Jeep Wrangler (Černý)</Czech>
<French>Jeep Wrangler (Noir)</French>
<Spanish>Jeep Wrangler (Negro)</Spanish>
<Russian>Jeep Wrangler (Чёрный)</Russian>
<Polish>Jeep Wrangler (czarny)</Polish>
<German>Jeep Wrangler (Schwarz)</German>
<Italian>Jeep Wrangler (Nero)</Italian>
<Hungarian>Jeep Wrangler (Fekete)</Hungarian>
<Portuguese>Jeep Wrangler (Preto)</Portuguese>
<Japanese>ジープ ラングラー (黒)</Japanese>
<Korean>Jeep Wrangler (검정)</Korean>
<Chinese>"牧馬人"吉普車 (黑色)</Chinese>
<Chinesesimp>"牧马人"吉普车 (黑色)</Chinesesimp>
</Key>
<Key ID="STR_ACE_RealisticNames_C_Offroad_02_unarmed_blue">
<English>Jeep Wrangler (Blue)</English>
<German>Jeep Wrangler (Blau)</German>
<Spanish>Jeep Wrangler (Azul)</Spanish>
<Polish>Jeep Wrangler (niebieski)</Polish>
<Czech>Jeep Wrangler (Modrý)</Czech>
<French>Jeep Wrangler (Bleue)</French>
<Russian>Jeep Wrangler (Синий)</Russian>
<Italian>Jeep Wrangler (Azul)</Italian>
<Hungarian>Jeep Wrangler (Kék)</Hungarian>
<Portuguese>Jeep Wrangler (Blu)</Portuguese>
<Japanese>ジープ ラングラー (青)</Japanese>
<Korean>Jeep Wrangler (파랑)</Korean>
<Chinese>"牧馬人"吉普車 (藍色)</Chinese>
<Chinesesimp>"牧马人"吉普车 (蓝色)</Chinesesimp>
</Key>
<Key ID="STR_ACE_RealisticNames_C_Offroad_02_unarmed_green">
<English>Jeep Wrangler (Green)</English>
<German>Jeep Wrangler (Grün)</German>
<Spanish>Jeep Wrangler (Verde)</Spanish>
<Polish>Jeep Wrangler (zielony)</Polish>
<Czech>Jeep Wrangler (Zelený)</Czech>
<French>Jeep Wrangler (Verte)</French>
<Russian>Jeep Wrangler (Зелёный)</Russian>
<Italian>Jeep Wrangler (Verde)</Italian>
<Hungarian>Jeep Wrangler (Zöld)</Hungarian>
<Portuguese>Jeep Wrangler (Verde)</Portuguese>
<Japanese>ジープ ラングラー (緑)</Japanese>
<Korean>Jeep Wrangler (초록)</Korean>
<Chinese>"牧馬人"吉普車 (綠色)</Chinese>
<Chinesesimp>"牧马人"吉普车 (绿色)</Chinesesimp>
</Key>
<Key ID="STR_ACE_RealisticNames_C_Offroad_02_unarmed_orange">
<English>Jeep Wrangler (Orange)</English>
<German>Jeep Wrangler (Orange)</German>
<Spanish>Jeep Wrangler (Naranja)</Spanish>
<Polish>Jeep Wrangler (pomarańczowy)</Polish>
<Czech>Jeep Wrangler (Oranžový)</Czech>
<French>Jeep Wrangler (Orange)</French>
<Russian>Jeep Wrangler (Оранжевый)</Russian>
<Italian>Jeep Wrangler (Laranja)</Italian>
<Hungarian>Jeep Wrangler (Narancssárga)</Hungarian>
<Portuguese>Jeep Wrangler (Arancione)</Portuguese>
<Japanese>ジープ ラングラー (橙)</Japanese>
<Korean>Jeep Wrangler (주황)</Korean>
<Chinese>"牧馬人"吉普車 (橘色)</Chinese>
<Chinesesimp>"牧马人"吉普车 (橘色)</Chinesesimp>
</Key>
<Key ID="STR_ACE_RealisticNames_C_Offroad_02_unarmed_red">
<English>Jeep Wrangler (Red)</English>
<German>Jeep Wrangler (Rot)</German>
<Spanish>Jeep Wrangler (Rojo)</Spanish>
<Polish>Jeep Wrangler (czerwony)</Polish>
<Czech>Jeep Wrangler (Červený)</Czech>
<French>Jeep Wrangler (Rouge)</French>
<Russian>Jeep Wrangler (Красный)</Russian>
<Italian>Jeep Wrangler (Vermelha)</Italian>
<Hungarian>Jeep Wrangler (Piros)</Hungarian>
<Portuguese>Jeep Wrangler (Rosso)</Portuguese>
<Japanese>ジープ ラングラー (赤)</Japanese>
<Korean>Jeep Wrangler (빨강)</Korean>
<Chinese>"牧馬人"吉普車 (紅色)</Chinese>
<Chinesesimp>"牧马人"吉普车 (红色)</Chinesesimp>
</Key>
<Key ID="STR_ACE_RealisticNames_C_Offroad_02_unarmed_white">
<English>Jeep Wrangler (White)</English>
<German>Jeep Wrangler (Weiß)</German>
<Spanish>Jeep Wrangler (Blanco)</Spanish>
<Polish>Jeep Wrangler (biały)</Polish>
<Czech>Jeep Wrangler (Bílý)</Czech>
<French>Jeep Wrangler (Blanche)</French>
<Russian>Jeep Wrangler (Белый)</Russian>
<Italian>Jeep Wrangler (Branca)</Italian>
<Hungarian>Jeep Wrangler (Fehér)</Hungarian>
<Portuguese>Jeep Wrangler (Bianco)</Portuguese>
<Japanese>ジープ ラングラー (白)</Japanese>
<Korean>Jeep Wrangler (하양)</Korean>
<Chinese>"牧馬人"吉普車 (白色)</Chinese>
<Chinesesimp>"牧马人"吉普车 (白色)</Chinesesimp>
</Key>
<Key ID="STR_ACE_RealisticNames_C_Plane_Civil_01">
<English>Cessna TTx</English>
<Czech>Cessna TTx</Czech>
Expand Down
6 changes: 0 additions & 6 deletions addons/rearm/CfgAmmo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
class CfgAmmo {

class BombCore;
class BombBase : BombCore {
GVAR(caliber) = 250; // Default caliber for bombs
};
class LaserBombCore : BombCore {
GVAR(caliber) = 250; // Default caliber for bombs
};
Expand Down Expand Up @@ -54,9 +51,6 @@ class CfgAmmo {
GVAR(caliber) = 60;
GVAR(dummy) = QGVAR(R_60mm_HE);
};
class R_Hydra_HE : RocketBase {
GVAR(dummy) = QGVAR(R_Hydra_HE);
};

class BulletBase;
class B_19mm_HE : BulletBase {
Expand Down
3 changes: 0 additions & 3 deletions addons/rearm/CfgVehicles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,4 @@ class CfgVehicles {
class GVAR(R_60mm_HE): GVAR(defaultCarriedObject) {
model = "\A3\Weapons_F_EPC\Ammo\Rocket_03_HE_F.p3d";
};
class GVAR(R_Hydra_HE): GVAR(defaultCarriedObject) {
model = "\A3\Weapons_F_EPC\Ammo\Rocket_03_HE_F.p3d";
};
};