marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed MaxUserSelect and C4D_Select* 

Since we don´t have the CR editor anymore, these categories are useless.
Maikel de Vries 2010-10-08 14:00:41 +02:00
parent b016b72d12
commit 860ef8b190
71 changed files with 41 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
planet/BackToTheRocks.c4f/BTTR.c4d/ObjectFade.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Rule_ObjectFade
Version=4,10,0,0
Category=C4D_StaticBack|C4D_Rule
MaxUserSelect=100
Width=1
Height=1
Picture=0,0,64,64

1
planet/BackToTheRocks.c4f/Windmill.c4s/Boomattack.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Boomattack
Version=4,9,10,10
Category=C4D_Object
MaxUserSelect=15
ContactCalls=1
Width=15
Height=27

1
planet/BackToTheRocks.c4f/Windmill.c4s/SaveTheWindmills.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Goal_SaveTheWindmills
Version=4,10,0,0
Category=C4D_StaticBack|C4D_Goal
MaxUserSelect=1
Width=1
Height=1
Picture=0,0,64,64

3
planet/Objects.c4d/Animals.c4d/Wolf.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=Wolf
Version=4,9,8
Category=C4D_Living|C4D_SelectAnimal
MaxUserSelect=10
Category=C4D_Living
TimerCall=Activity
ContactCalls=1
Width=26

3
planet/Objects.c4d/Clonk.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=Clonk
Version=4,10,0,0
Category=C4D_Living|C4D_SelectHomebase
MaxUserSelect=10
Category=C4D_Living
Width=8
Height=20
Offset=-4,-10

1
planet/Objects.c4d/Environment.c4d/Clouds.c4d/AcidRain.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Environment_AcidRain
Version=4,9,8
Category=C4D_StaticBack|C4D_Environment
MaxUserSelect=1
Width=1
Height=1
Value=1

1
planet/Objects.c4d/Environment.c4d/Clouds.c4d/Cloud.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Cloud
Version=4,10,0,0
Category=C4D_Vehicle|C4D_Background
MaxUserSelect=25
Timer=25
TimerCall=TimedEvents
Width=512

1
planet/Objects.c4d/Environment.c4d/Clouds.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Environment_Clouds
Version=4,9,8
Category=C4D_StaticBack|C4D_Environment
MaxUserSelect=2
Width=1
Height=1
Value=1

1
planet/Objects.c4d/Goals.c4d/KingOfTheHill.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Goal_KingOfTheHill
Version=4,10,0,0
Category=C4D_StaticBack|C4D_Goal
MaxUserSelect=1
Width=1
Height=1
Picture=0,0,64,64

1
planet/Objects.c4d/Goals.c4d/Melee.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Goal_Melee
Version=4,10,0,0
Category=C4D_StaticBack|C4D_Goal
MaxUserSelect=1
Width=1
Height=1
Picture=0,0,128,128

1
planet/Objects.c4d/Goals.c4d/Parkour.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Goal_Parkour
Version=4,10,0,0
Category=C4D_StaticBack|C4D_Goal
MaxUserSelect=1
Width=1
Height=1
Picture=0,0,256,256

1
planet/Objects.c4d/HUD.c4d/MenuDeco.c4d/DefCore.txt
View File

@ -2,6 +2,5 @@
id=GUI_MenuDeco
Version=4,10,0,0
Category=C4D_StaticBack
MaxUserSelect=0
Width=1
Height=1

1
planet/Objects.c4d/Items.c4d/Resources.c4d/BlackPowder.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Blackpowder
Version=4,9,10,0
Category=C4D_Object
MaxUserSelect=50
Width=8
Height=8
Offset=-4,-4

1
planet/Objects.c4d/Items.c4d/Resources.c4d/Coal.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Coal
Version=4,9,10,10
Category=C4D_Object
MaxUserSelect=50
Width=8
Height=8
Offset=-4,-4

1
planet/Objects.c4d/Items.c4d/Resources.c4d/Firestone.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Firestone
Version=4,10,0,0
Category=C4D_Object
MaxUserSelect=10
Width=8
Height=8
Offset=-4,-4

1
planet/Objects.c4d/Items.c4d/Resources.c4d/Gold.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Gold
Version=4,10,0,0
Category=C4D_Object
MaxUserSelect=100
Width=8
Height=8
Offset=-4,-4

1
planet/Objects.c4d/Items.c4d/Resources.c4d/Ice.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Ice
Version=4,9,10,10
Category=C4D_Object
MaxUserSelect=50
Timer=30
TimerCall=Check
Width=8

1
planet/Objects.c4d/Items.c4d/Resources.c4d/Loam.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Loam
Version=4,9,10,10
Category=C4D_Object
MaxUserSelect=50
Width=8
Height=8
Offset=-4,-4

3
planet/Objects.c4d/Items.c4d/Resources.c4d/Metal.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=Metal
Version=4,10,0,0
Category=C4D_Object|C4D_SelectMaterial|C4D_SelectHomebase
MaxUserSelect=25
Category=C4D_Object
Width=12
Height=4
Offset=-6,-2

1
planet/Objects.c4d/Items.c4d/Resources.c4d/Ore.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Ore
Version=4,9,10,0
Category=C4D_Object
MaxUserSelect=50
Width=8
Height=8
Offset=-4,-4

3
planet/Objects.c4d/Items.c4d/Resources.c4d/Rock.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=Rock
Version=4,10,0,0
Category=C4D_Object|C4D_SelectMaterial|C4D_SelectHomebase|C4D_SelectInEarth
MaxUserSelect=10
Category=C4D_Object
Width=8
Height=8
Offset=-4,-4

1
planet/Objects.c4d/Items.c4d/Resources.c4d/Snow.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Snow
Version=4,9,10,0
Category=C4D_Object
MaxUserSelect=100
Timer=30
TimerCall=Check
Width=8

1
planet/Objects.c4d/Items.c4d/Resources.c4d/Sulphur.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Sulphur
Version=4,9,10,0
Category=C4D_Object
MaxUserSelect=50
Width=8
Height=8
Offset=-4,-4

3
planet/Objects.c4d/Items.c4d/Resources.c4d/Wood.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=Wood
Version=4,10,0,0
Category=C4D_Object|C4D_SelectMaterial|C4D_SelectHomebase
MaxUserSelect=25
Category=C4D_Object
Width=12
Height=12
Offset=-7,-6

3
planet/Objects.c4d/Items.c4d/Tools.c4d/Axe.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=Axe
Version=4,10,0,0
Category=C4D_Object|C4D_SelectMaterial|C4D_SelectKnowledge|C4D_SelectHomebase
MaxUserSelect=5
Category=C4D_Object
Value=15
Mass=20
Width=10

1
planet/Objects.c4d/Items.c4d/Tools.c4d/Balloon.c4d/BalloonDeployed.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=BalloonDeployed
Version=4,9,8
Category=C4D_Vehicle
MaxUserSelect=10
Width=32
Height=40
Offset=-16,-16

1
planet/Objects.c4d/Items.c4d/Tools.c4d/Balloon.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Balloon
Version=4,9,8
Category=C4D_Vehicle
MaxUserSelect=10
Width=8
Height=8
Offset=-4,-4

3
planet/Objects.c4d/Items.c4d/Tools.c4d/Barrel.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=Barrel
Version=4,10,0,0
Category=C4D_Object|C4D_SelectMaterial|C4D_SelectKnowledge|C4D_SelectHomebase
MaxUserSelect=5
Category=C4D_Object
Value=8
Mass=20
TimerCall=Check

1
planet/Objects.c4d/Items.c4d/Tools.c4d/Boompack.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Boompack
Version=4,9,10,10
Category=C4D_Object
MaxUserSelect=15
Width=10
Height=18
Offset=-5,-7

3
planet/Objects.c4d/Items.c4d/Tools.c4d/CableReel.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=CableReel
Version=4,10,0,0
Category=C4D_Object|C4D_SelectMaterial|C4D_SelectKnowledge|C4D_SelectHomebase
MaxUserSelect=10
Category=C4D_Object
Width=8
Height=6
Offset=-4,-3

3
planet/Objects.c4d/Items.c4d/Tools.c4d/DynamiteBox.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=DynamiteBox
Version=4,9,5
Category=C4D_Object|C4D_SelectMaterial|C4D_SelectKnowledge|C4D_SelectHomebase
MaxUserSelect=5
Category=C4D_Object
Value=16
Mass=30
Width=8

3
planet/Objects.c4d/Items.c4d/Tools.c4d/Hammer.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=Hammer
Version=4,9,5
Category=C4D_Object|C4D_SelectMaterial|C4D_SelectKnowledge|C4D_SelectHomebase
MaxUserSelect=10
Category=C4D_Object
Value=5
Mass=15
Width=8

1
planet/Objects.c4d/Items.c4d/Tools.c4d/JarOfWinds.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=JarOfWinds
Version=4,9,10,10
Category=C4D_Object
MaxUserSelect=30
Width=9
Height=9
Offset=-5,-5

1
planet/Objects.c4d/Items.c4d/Tools.c4d/OrbOfTelekinesis.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=OrbOfTelekinesis
Version=4,9,10,10
Category=C4D_Object
MaxUserSelect=15
Width=8
Height=8
Offset=-4,-4

3
planet/Objects.c4d/Items.c4d/Tools.c4d/Pickaxe.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=Pickaxe
Version=4,10,0,0
Category=C4D_Object|C4D_SelectMaterial|C4D_SelectKnowledge|C4D_SelectHomebase
MaxUserSelect=5
Category=C4D_Object
Value=15
Mass=20
Width=10

3
planet/Objects.c4d/Items.c4d/Tools.c4d/PowderKeg.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=PowderKeg
Version=4,10,0,0
Category=C4D_Object|C4D_SelectMaterial|C4D_SelectKnowledge|C4D_SelectHomebase
MaxUserSelect=5
Category=C4D_Object
Value=8
Mass=20
Width=16

1
planet/Objects.c4d/Items.c4d/Tools.c4d/Ropeladder.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Ropeladder
Version=4,9,8
Category=C4D_Object
MaxUserSelect=30
Width=8
Height=8
Offset=-4,-4

3
planet/Objects.c4d/Items.c4d/Tools.c4d/Shovel.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=Shovel
Version=4,9,5
Category=C4D_Object|C4D_SelectMaterial|C4D_SelectKnowledge|C4D_SelectHomebase
MaxUserSelect=5
Category=C4D_Object
Value=16
Mass=20
Width=8

1
planet/Objects.c4d/Items.c4d/Weapons.c4d/Bow.c4d/DefCore.txt
View File

@ -1,7 +1,6 @@
[DefCore]
id=Bow
Category=C4D_Object
MaxUserSelect=30
Width=4
Height=20
Offset=-2,-10

3
planet/Objects.c4d/Items.c4d/Weapons.c4d/Club.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=Club
Version=4,9,5
Category=C4D_Object|C4D_SelectMaterial|C4D_SelectKnowledge|C4D_SelectHomebase
MaxUserSelect=5
Category=C4D_Object
Value=16
Mass=20
Width=3

3
planet/Objects.c4d/Items.c4d/Weapons.c4d/Javelin.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=Javelin
Version=4,9,5
Category=C4D_Object|C4D_SelectMaterial|C4D_SelectKnowledge|C4D_SelectHomebase
MaxUserSelect=15
Category=C4D_Object
Value=7
Width=4
Height=26

1
planet/Objects.c4d/Items.c4d/Weapons.c4d/Musket.c4d/Ammo.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=LeadShot
Version=4,9,10,10
Category=C4D_Object
MaxUserSelect=50
Width=8
Height=8
Offset=-4,-4

1
planet/Objects.c4d/Items.c4d/Weapons.c4d/Musket.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Musket
Version=4,9,10,10
Category=C4D_Object
MaxUserSelect=30
Width=26
Height=5
Offset=-13,-2

3
planet/Objects.c4d/Items.c4d/Weapons.c4d/Shield.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=Shield
Version=4,9,5
Category=C4D_Object|C4D_SelectMaterial|C4D_SelectKnowledge|C4D_SelectHomebase
MaxUserSelect=5
Category=C4D_Object
Value=16
Mass=20
Width=8

1
planet/Objects.c4d/Items.c4d/Weapons.c4d/Shield.c4d/ShieldSolidMask.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Shield_SolidMask
Version=4,9,5
Category=C4D_Vehicle
MaxUserSelect=0
Width=8
Height=11
Offset=-4,-5

3
planet/Objects.c4d/Items.c4d/Weapons.c4d/Sword.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=Sword
Version=4,9,5
Category=C4D_Object|C4D_SelectMaterial|C4D_SelectKnowledge|C4D_SelectHomebase
MaxUserSelect=5
Category=C4D_Object
Value=16
Mass=20
Width=5

1
planet/Objects.c4d/Rules.c4d/Energy.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Rule_NeedEnergy
Version=4,9,8
Category=C4D_StaticBack|C4D_Rule
MaxUserSelect=1
Width=1
Height=1
Value=1

1
planet/Objects.c4d/Rules.c4d/Restart.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Rule_Restart
Version=4,10,0,0
Category=C4D_StaticBack|C4D_Rule
MaxUserSelect=1
Width=1
Height=1
Picture=0,0,64,64

1
planet/Objects.c4d/Structures.c4d/CastleDoor.c4d/SpinWheel.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=SpinWheel
Version=4,10,0,0
Category=C4D_Structure
MaxUserSelect=1
Width=16
Height=16
Offset=-8,-8

3
planet/Objects.c4d/Structures.c4d/SteamEngine.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=SteamEngine
Version=4,9,8
Category=C4D_Structure|C4D_SelectBuilding|C4D_SelectKnowledge
MaxUserSelect=1
Category=C4D_Structure
TimerCall=ContentsCheck
Width=110
Height=80

3
planet/Objects.c4d/Structures.c4d/ToolsWorkshop.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=ToolsWorkshop
Version=4,9,8
Category=C4D_Structure|C4D_SelectBuilding|C4D_SelectKnowledge
MaxUserSelect=2
Category=C4D_Structure
Timer=20
TimerCall=CheckBuild
Width=52

3
planet/Objects.c4d/Structures.c4d/WindGenerator.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=WindGenerator
Version=4,9,8
Category=C4D_Structure|C4D_SelectBuilding|C4D_SelectKnowledge
MaxUserSelect=3
Category=C4D_Structure
TimerCall=Wind2Turn
Timer=35
Width=70

3
planet/Objects.c4d/Structures.c4d/WoodenCabin.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=WoodenCabin
Version=4,9,8
Category=C4D_Structure|C4D_SelectBuilding|C4D_SelectKnowledge
MaxUserSelect=2
Category=C4D_Structure
Width=94
Height=40
Offset=-47,-20

1
planet/Objects.c4d/Vehicles.c4d/Airplane.c4d/Bullet.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Bullet
Version=4,10,0,0
Category=C4D_Object
MaxUserSelect=50
Width=8
Height=8
Offset=-4,-4

3
planet/Objects.c4d/Vehicles.c4d/Cannon.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=Cannon
Version=4,9,8
Category=C4D_Vehicle|C4D_SelectVehicle|C4D_SelectKnowledge|C4D_SelectHomebase
MaxUserSelect=5
Category=C4D_Vehicle
ContactCalls=1
Width=22
Height=16

3
planet/Objects.c4d/Vehicles.c4d/Lorry.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=Lorry
Version=4,9,8
Category=C4D_Vehicle|C4D_SelectVehicle|C4D_SelectKnowledge|C4D_SelectHomebase
MaxUserSelect=5
Category=C4D_Vehicle
ContactCalls=1
Width=22
Height=16

1
planet/Parkour.c4f/AirRace.c4s/Extra.c4d/GuidedRocket.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=GuidedRocket
Version=4,10,0,0
Category=C4D_Object
MaxUserSelect=15
Width=8
Height=14
Offset=-4,-7

1
planet/Parkour.c4f/AirRace.c4s/Extra.c4d/Rocket.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Rocket
Version=4,10,0,0
Category=C4D_Object
MaxUserSelect=15
Width=8
Height=14
Offset=-4,-7

1
planet/Parkour.c4f/Boomshire.c4s/ArrowWheel.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=ArrowWheel
Version=4,10,0,0
Category=C4D_Structure
MaxUserSelect=1
Width=16
Height=16
Offset=-8,-8

1
planet/Parkour.c4f/Boomshire.c4s/Target.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=DoorTarget
Version=4,9,8
Category=C4D_Vehicle
MaxUserSelect=10
Width=25
Height=25
Offset=-12,-12

1
planet/System.c4g/GetXVal.c
View File

@ -12,7 +12,6 @@
// GetDefCoreVal
global func GetDefCategory() { return GetDefCoreVal("Category", "DefCore"); }
global func GetDefMaxUserSelect() { return GetDefCoreVal("MaxUserSelect", "DefCore"); }
global func GetDefWidth() { return GetDefCoreVal("Width", "DefCore"); }
global func GetDefHeight() { return GetDefCoreVal("Height", "DefCore"); }
global func GetDefOffset(nr) { return GetDefCoreVal("Offset", "DefCore", nr); }

3
planet/Tests.c4f/Clonk50.c4s/Clonk.c4d/DefCore.txt
View File

@ -1,8 +1,7 @@
[DefCore]
id=_CLN
Version=4,9,8,8
Category=C4D_Living|C4D_SelectHomebase
MaxUserSelect=10
Category=C4D_Living
Width=4
Height=10
Offset=-2,-5

1
planet/Tests.c4f/Lines.c4s/FireGlobe.c4d/DefCore.txt
View File

@ -1,7 +1,6 @@
[DefCore]
id=Fireglobe
Category=C4D_Object
MaxUserSelect=30
Width=10
Height=10
Offset=-5,-5

1
planet/Tutorial.c4f/Tutorial.c4d/FlagGoal.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=Goal_ReachFlag
Version=4,10,0,0
Category=C4D_StaticBack|C4D_Goal
MaxUserSelect=1
Width=1
Height=1
Picture=0,0,128,128

1
planet/Tutorial.c4f/Tutorial03.c4s/Target.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=PracticeTarget
Version=4,9,8
Category=C4D_Vehicle
MaxUserSelect=10
Width=25
Height=25
Offset=-12,-12

1
planet/Tutorial.c4f/Tutorial03.c4s/Target.c4d/TargetBalloon.c4d/BurntBalloon.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=BurntBalloon
Version=4,9,8
Category=C4D_Vehicle
MaxUserSelect=10
Width=64
Height=64
Offset=-32,-32

1
planet/Tutorial.c4f/Tutorial03.c4s/Target.c4d/TargetBalloon.c4d/DefCore.txt
View File

@ -2,7 +2,6 @@
id=TargetBalloon
Version=4,9,8
Category=C4D_Vehicle
MaxUserSelect=10
Width=64
Height=64
Offset=-32,-32

2
src/game/object/C4Command.cpp
View File

@ -1210,7 +1210,7 @@ void C4Command::Get()
bool C4Command::CheckMinimumCon (C4Object *pObj)
{
if ((pObj->Category & C4D_Vehicle) || (pObj->Category & C4D_Object))
if (pObj->Category & C4D_SelectKnowledge)
if (pObj->Category & C4D_Knowledge)
if (pObj->GetCon() < FullCon)
{
//SoundEffect("Error",0,100,cObj);

17
src/game/object/C4Def.cpp
View File

@ -109,7 +109,6 @@ void C4Def::DefaultDefCore()
ContainBlast=0;
UprightAttach=0;
ContactFunctionCalls=0;
MaxUserSelect=0;
Line=0;
LineConnect=0;
LineIntersect=0;
@ -233,23 +232,14 @@ void C4Def::CompileFunc(StdCompiler *pComp)
{ "C4D_Object", C4D_Object },
{ "C4D_Goal", C4D_Goal },
{ "C4D_Rule", C4D_Rule },
{ "C4D_Environment", C4D_Environment },
{ "C4D_SelectBuilding", C4D_SelectBuilding },
{ "C4D_SelectVehicle", C4D_SelectVehicle },
{ "C4D_SelectMaterial", C4D_SelectMaterial },
{ "C4D_SelectKnowledge", C4D_SelectKnowledge },
{ "C4D_SelectHomebase", C4D_SelectHomebase },
{ "C4D_SelectAnimal", C4D_SelectAnimal },
{ "C4D_SelectNest", C4D_SelectNest },
{ "C4D_SelectInEarth", C4D_SelectInEarth },
{ "C4D_SelectVegetation", C4D_SelectVegetation },
{ "C4D_Knowledge", C4D_Knowledge },
{ "C4D_TradeLiving", C4D_TradeLiving },
{ "C4D_Magic", C4D_Magic },
{ "C4D_CrewMember", C4D_CrewMember },
{ "C4D_Rule", C4D_Rule },
{ "C4D_Background", C4D_Background },
{ "C4D_Parallax", C4D_Parallax },
{ "C4D_MouseSelect", C4D_MouseSelect },
@ -263,7 +253,6 @@ void C4Def::CompileFunc(StdCompiler *pComp)
pComp->Value(mkNamingAdapt(mkBitfieldAdapt<int32_t>(Category, Categories),
"Category", 0 ));
pComp->Value(mkNamingAdapt(MaxUserSelect, "MaxUserSelect", 0 ));
pComp->Value(mkNamingAdapt(Timer, "Timer", 35 ));
pComp->Value(mkNamingAdapt(toC4CStr(STimerCall), "TimerCall", "" ));
pComp->Value(mkNamingAdapt(ContactFunctionCalls, "ContactCalls", 0 ));

35
src/game/object/C4Def.h
View File

@ -53,30 +53,20 @@ C4D_Object = 1<<4,
C4D_SortLimit = C4D_StaticBack | C4D_Structure | C4D_Vehicle | C4D_Living | C4D_Object,
C4D_Goal = 1<<5,
C4D_Environment = 1<<6,
C4D_Rule = 1<<6,
C4D_Environment = 1<<7,
C4D_SelectBuilding = 1<<7,
C4D_SelectVehicle = 1<<8,
C4D_SelectMaterial = 1<<9,
C4D_SelectKnowledge = 1<<10,
C4D_SelectHomebase = 1<<11,
C4D_SelectAnimal = 1<<12,
C4D_SelectNest = 1<<13,
C4D_SelectInEarth = 1<<14,
C4D_SelectVegetation = 1<<15,
C4D_Knowledge = 1<<8,
C4D_TradeLiving = 1<<9,
C4D_Magic = 1<<10,
C4D_CrewMember = 1<<11,
C4D_TradeLiving = 1<<16,
C4D_Magic = 1<<17,
C4D_CrewMember = 1<<18,
C4D_Rule = 1<<19,
C4D_Background = 1<<20,
C4D_Parallax = 1<<21,
C4D_MouseSelect = 1<<22,
C4D_Foreground = 1<<23,
C4D_MouseIgnore = 1<<24,
C4D_IgnoreFoW = 1<<25,
C4D_Background = 1<<12,
C4D_Parallax = 1<<13,
C4D_MouseSelect = 1<<14,
C4D_Foreground = 1<<15,
C4D_MouseIgnore = 1<<16,
C4D_IgnoreFoW = 1<<17,
C4D_BackgroundOrForeground = (C4D_Background | C4D_Foreground);
@ -179,7 +169,6 @@ public:
int32_t ContainBlast;
int32_t UprightAttach;
int32_t ContactFunctionCalls;
int32_t MaxUserSelect;
int32_t Line;
int32_t LineConnect;
int32_t LineIntersect;

2
src/game/script/C4Script.cpp
View File

@ -6413,7 +6413,7 @@ C4ScriptConstDef C4ScriptConstMap[]=
{ "C4D_Object" ,C4V_Int, C4D_Object},
{ "C4D_Goal" ,C4V_Int, C4D_Goal},
{ "C4D_Environment" ,C4V_Int, C4D_Environment},
{ "C4D_Knowledge" ,C4V_Int, C4D_SelectKnowledge},
{ "C4D_Knowledge" ,C4V_Int, C4D_Knowledge},
{ "C4D_Magic" ,C4V_Int, C4D_Magic},
{ "C4D_Rule" ,C4V_Int, C4D_Rule},
{ "C4D_Background" ,C4V_Int, C4D_Background},