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

Removed Defcore:Edible and OCF_Edible 

Had no use in the engine, should therefore be defined in C4Script if deemed necessary.
Maikel de Vries 2011-07-05 13:10:56 +02:00
parent cb1490297a
commit 248f85c2eb
12 changed files with 9 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docs/de.po
View File

@ -97,7 +97,6 @@ msgstr "Kategorie"
#: sdk/script/fn/OCF_Fullcon.xml:9(subcat)
#: sdk/script/fn/OCF_Exclusive.xml:9(subcat)
#: sdk/script/fn/OCF_Entrance.xml:9(subcat)
#: sdk/script/fn/OCF_Edible.xml:9(subcat)
#: sdk/script/fn/OCF_CrewMember.xml:9(subcat)
#: sdk/script/fn/OCF_Container.xml:9(subcat)
#: sdk/script/fn/OCF_Construct.xml:9(subcat)
@ -1458,7 +1457,6 @@ msgstr "Entfernt alle Objekte."
#: sdk/script/fn/OCF_Fullcon.xml:8(category)
#: sdk/script/fn/OCF_Exclusive.xml:8(category)
#: sdk/script/fn/OCF_Entrance.xml:8(category)
#: sdk/script/fn/OCF_Edible.xml:8(category)
#: sdk/script/fn/OCF_CrewMember.xml:8(category)
#: sdk/script/fn/OCF_Container.xml:8(category)
#: sdk/script/fn/OCF_Construct.xml:8(category)
@ -5870,7 +5868,6 @@ msgstr "Object character flag: Objekt ist drehbar."
#: sdk/script/fn/OCF_Fullcon.xml:13(remark)
#: sdk/script/fn/OCF_Exclusive.xml:13(remark)
#: sdk/script/fn/OCF_Entrance.xml:13(remark)
#: sdk/script/fn/OCF_Edible.xml:13(remark)
#: sdk/script/fn/OCF_Container.xml:13(remark)
#: sdk/script/fn/OCF_Construct.xml:13(remark)
#: sdk/script/fn/OCF_Collection.xml:13(remark)
@ -5899,7 +5896,6 @@ msgstr "Für weitere Informationen und Beispiele zur Benutzung dieser Konstanten
#: sdk/script/fn/OCF_Fullcon.xml:17(emlink)
#: sdk/script/fn/OCF_Exclusive.xml:17(emlink)
#: sdk/script/fn/OCF_Entrance.xml:17(emlink)
#: sdk/script/fn/OCF_Edible.xml:17(emlink)
#: sdk/script/fn/OCF_CrewMember.xml:31(emlink)
#: sdk/script/fn/OCF_Container.xml:17(emlink)
#: sdk/script/fn/OCF_Construct.xml:17(emlink)
@ -5978,10 +5974,6 @@ msgstr "Object character flag: Das Objekt blockiert (versteckt) dahinter befindl
msgid "Object character flag: The object has an active entrance area. For this there must be a defined entrance area (see <emlink href=\"definition/defcore.html\">DefCore.txt</emlink>), the object must be complete and not rotated too far."
msgstr "Object character flag: Das Objekt bestizt einen aktiven Eingangsbereich. Dies ist der Fall, wenn ein Eingangsbereich definiert ist (siehe <emlink href=\"definition/defcore.html\">DefCore.txt</emlink>), das Objekt fertig gebaut und nicht verdreht ist."
#: sdk/script/fn/OCF_Edible.xml:12(desc)
msgid "Object character flag: Edible object. This flag is set by <emlink href=\"definition/defcore.html\">DefCore</emlink> entry \"Edible\"."
msgstr "Object character flag: Essbares Objekt. Dieses Flag wird durch den <emlink href=\"definition/defcore.html\">DefCore</emlink>-Eintrag \"Edible\" gesetzt."
#: sdk/script/fn/OCF_CrewMember.xml:12(desc)
msgid "Object character flag: the object can be made a crew member or already is a crew member, meaning the corresponding DefCore flag is set and the object is alive."
msgstr "Object character flag: Das Objekt kann theoretisch zu einer Crew hinzugefügt werden oder gehört schon zu einer Crew. Das heißt, es hat den ensprechenden DefCore-Eintrag gesetzt, und lebt."
@ -16501,10 +16493,6 @@ msgstr "0 oder 1. Bei 1 kann das Objekt nicht verkauft werden."
msgid "0 or 1. Determines whether the object is prey for certain animals."
msgstr "0 oder 1. Legt fest, ob das Objekt ein Beutelebewesen ist."
#: sdk/definition/defcore.xml:186(col)
msgid "0 or 1. Determines whether the object is edible."
msgstr "0 oder 1. Legt fest, ob das Objekt essbar ist (noch nicht unterstützt)."
#: sdk/definition/defcore.xml:191(col)
msgid "0 or 1. If 1, the object is added to the player's crew upon purchase. Objects created using CreateObject have to be added to a player's crew manually using <emlink href=\"script/fn/MakeCrewMember\">MakeCrewMember</emlink>."
msgstr "0 oder 1. Wenn 1, wird das Objekt beim Kauf der Mannschaft hinzugefügt. Mit CreateObject erzeugte CrewMember-Objekte müssen mit <emlink href=\"script/fn/MakeCrewMember\">MakeCrewMember</emlink> der Mannschaft eines Spielers hinzugefügt werden."
@ -17569,9 +17557,6 @@ msgstr "Dieses Kommandozeilen-Programm dient zum Bearbeiten von Gruppendateien.
#~ msgid "OCF_Entrance"
#~ msgstr "OCF_Entrance"
#~ msgid "OCF_Edible"
#~ msgstr "OCF_Edible"
#~ msgid "OCF_CrewMember"
#~ msgstr "OCF_CrewMember"

5
docs/sdk/definition/defcore.xml
View File

@ -180,11 +180,6 @@
<col>Integer</col>
<col>0 or 1. Determines whether the object is prey for certain animals.</col>
</row>
<row>
<literal_col>Edible</literal_col>
<col>Integer</col>
<col>0 or 1. Determines whether the object is edible.</col>
</row>
<row>
<literal_col>CrewMember</literal_col>
<col>Integer</col>

2
docs/sdk/definition/ocf.xml
View File

@ -14,6 +14,6 @@ while (obj = <funclink>FindObject</funclink>(0, -100,-100,200,200, <funclink>OCF
<funclink>SetR</funclink>(180, obj);</code> <text>This script turns all rotatable objects upside down.</text>
<h id="ocf_fns">OCF Constants</h>
<text>The following OCFs are defined in C4Script:</text>
<text><funclink>OCF_Alive</funclink>, <funclink>OCF_AttractLightning</funclink>, <funclink>OCF_Available</funclink>, <funclink>OCF_Chop</funclink>, <funclink>OCF_Collectible</funclink>, <funclink>OCF_Collection</funclink>, <funclink>OCF_Construct</funclink>, <funclink>OCF_Container</funclink>, <funclink>OCF_CrewMember</funclink>, <funclink>OCF_Edible</funclink>, <funclink>OCF_Entrance</funclink>, <funclink>OCF_Exclusive</funclink>, <funclink>OCF_Fullcon</funclink>, <funclink>OCF_Grab</funclink>, <funclink>OCF_HitSpeed1</funclink>, <funclink>OCF_HitSpeed2</funclink>, <funclink>OCF_HitSpeed3</funclink>, <funclink>OCF_HitSpeed4</funclink>, <funclink>OCF_Inflammable</funclink>, <funclink>OCF_InFree</funclink>, <funclink>OCF_InLiquid</funclink>, <funclink>OCF_InSolid</funclink>, <funclink>OCF_Living</funclink>, <funclink>OCF_NotContained</funclink>, <funclink>OCF_OnFire</funclink>, <funclink>OCF_Prey</funclink>, <funclink>OCF_Rotate</funclink></text>
<text><funclink>OCF_Alive</funclink>, <funclink>OCF_AttractLightning</funclink>, <funclink>OCF_Available</funclink>, <funclink>OCF_Chop</funclink>, <funclink>OCF_Collectible</funclink>, <funclink>OCF_Collection</funclink>, <funclink>OCF_Construct</funclink>, <funclink>OCF_Container</funclink>, <funclink>OCF_CrewMember</funclink>, <funclink>OCF_Entrance</funclink>, <funclink>OCF_Exclusive</funclink>, <funclink>OCF_Fullcon</funclink>, <funclink>OCF_Grab</funclink>, <funclink>OCF_HitSpeed1</funclink>, <funclink>OCF_HitSpeed2</funclink>, <funclink>OCF_HitSpeed3</funclink>, <funclink>OCF_HitSpeed4</funclink>, <funclink>OCF_Inflammable</funclink>, <funclink>OCF_InFree</funclink>, <funclink>OCF_InLiquid</funclink>, <funclink>OCF_InSolid</funclink>, <funclink>OCF_Living</funclink>, <funclink>OCF_NotContained</funclink>, <funclink>OCF_OnFire</funclink>, <funclink>OCF_Prey</funclink>, <funclink>OCF_Rotate</funclink></text>
<author>Sven2</author><date>2002-05</date>
</doc>

21
docs/sdk/script/fn/OCF_Edible.xml
View File

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!DOCTYPE funcs
SYSTEM '../../../clonk.dtd'>
<?xml-stylesheet type="text/xsl" href="../../../clonk.xsl"?>
<funcs>
<const>
<title>OCF_Edible</title>
<category>Objects</category>
<subcat>OCF</subcat>
<version>5.1 OC</version>
<syntax><rtype>int</rtype></syntax>
<desc>Object character flag: Edible object. This flag is set by <emlink href="definition/defcore.html">DefCore</emlink> entry "Edible".</desc>
<remark>For more information and examples regarding these constants see <emlink href="definition/ocf.html">object character flags</emlink>.</remark>
<related>
<funclink>GetOCF</funclink>
<funclink>FindObject</funclink>
<emlink href="definition/ocf.html">Object character flags</emlink>
</related>
</const>
<author>Sven2</author><date>2002-05</date>
</funcs>

1
planet/Objects.ocd/Environment.ocd/Vegetation.ocd/Mushroom.ocd/DefCore.txt
View File

@ -13,6 +13,5 @@ VertexY=0,3
VertexCNAT=4,3
VertexFriction=10,100
Mass=6
Edible=1
StretchGrowth=4
Oversize=1

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

@ -27,7 +27,6 @@ global func GetDefBurnTo() { return GetDefCoreVal("BurnTo", "DefCore"); }
global func GetDefBase() { return GetDefCoreVal("Base", "DefCore"); }
global func GetDefLine() { return GetDefCoreVal("Line", "DefCore"); }
global func GetDefPrey() { return GetDefCoreVal("Prey", "DefCore"); }
global func GetDefEdible() { return GetDefCoreVal("Edible", "DefCore"); }
global func GetDefCrewMember() { return GetDefCoreVal("Prey", "DefCore"); }
global func GetDefConstruction(){ return GetDefCoreVal("Construction", "DefCore"); }
global func GetDefConstructTo() { return GetDefCoreVal("ConstructTo", "DefCore"); }

13
src/config/C4Constants.h
View File

@ -116,13 +116,12 @@ const uint32_t
OCF_AttractLightning = 1<<18,
OCF_NotContained = 1<<19,
OCF_CrewMember = 1<<20,
OCF_Edible = 1<<21,
OCF_InLiquid = 1<<22,
OCF_InSolid = 1<<23,
OCF_InFree = 1<<24,
OCF_Available = 1<<25,
OCF_Container = 1<<26,
OCF_Alive = 1<<27;
OCF_InLiquid = 1<<21,
OCF_InSolid = 1<<22,
OCF_InFree = 1<<23,
OCF_Available = 1<<24,
OCF_Container = 1<<25,
OCF_Alive = 1<<26;
//================================== Contact / Attachment ==============================================

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

@ -78,7 +78,6 @@ void C4Def::DefaultDefCore()
IncompleteActivity=0;
Placement=0;
Prey=0;
Edible=0;
AttractLightning=0;
Oversize=0;
Fragile=0;
@ -251,7 +250,6 @@ void C4Def::CompileFunc(StdCompiler *pComp)
pComp->Value(mkNamingAdapt(Line, "Line", 0 ));
pComp->Value(mkNamingAdapt(LineIntersect, "LineIntersect", 0 ));
pComp->Value(mkNamingAdapt(Prey, "Prey", 0 ));
pComp->Value(mkNamingAdapt(Edible, "Edible", 0 ));
pComp->Value(mkNamingAdapt(CrewMember, "CrewMember", 0 ));
pComp->Value(mkNamingAdapt(NativeCrew, "NoStandardCrew", 0 ));
pComp->Value(mkNamingAdapt(Constructable, "Construction", 0 ));

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

@ -142,7 +142,6 @@ public:
int32_t IncompleteActivity;
int32_t Placement;
int32_t Prey;
int32_t Edible;
int32_t AttractLightning;
int32_t Oversize;
int32_t Fragile;

5
src/game/object/C4Object.cpp
View File

@ -817,9 +817,6 @@ void C4Object::SetOCF()
// OCF_NotContained
if (!Contained)
OCF|=OCF_NotContained;
// OCF_Edible
if (Def->Edible)
OCF|=OCF_Edible;
// OCF_InLiquid
if (InLiquid)
if (!Contained)
@ -862,7 +859,7 @@ void C4Object::UpdateOCF()
{ LogF("Warning: contained in deleted object %p (%s)!", static_cast<void*>(Contained), Contained->GetName()); }
#endif
// Keep the bits that only have to be updated with SetOCF (def, category, con, alive, onfire)
OCF=OCF & (OCF_Normal | OCF_Exclusive | OCF_Edible | OCF_Grab | OCF_FullCon
OCF=OCF & (OCF_Normal | OCF_Exclusive | OCF_Grab | OCF_FullCon
| OCF_Rotate | OCF_OnFire | OCF_Inflammable | OCF_Alive
| OCF_Prey | OCF_CrewMember | OCF_AttractLightning);
// OCF_Carryable: Can be picked up

1
src/game/object/C4ObjectScript.cpp
View File

@ -2282,7 +2282,6 @@ C4ScriptConstDef C4ScriptObjectConstMap[]=
{ "OCF_AttractLightning" ,C4V_Int, OCF_AttractLightning},
{ "OCF_NotContained" ,C4V_Int, OCF_NotContained},
{ "OCF_CrewMember" ,C4V_Int, OCF_CrewMember},
{ "OCF_Edible" ,C4V_Int, OCF_Edible},
{ "OCF_InLiquid" ,C4V_Int, OCF_InLiquid},
{ "OCF_InSolid" ,C4V_Int, OCF_InSolid},
{ "OCF_InFree" ,C4V_Int, OCF_InFree},

2
src/script/C4AulParse.cpp
View File

@ -2973,7 +2973,7 @@ void C4AulParseState::Parse_Const()
if (TokenType != ATT_SET)
UnexpectedToken("'='");
// expect value. Theoretically, something like C4AulScript::ExecOperator could be used here
// this would allow for definitions like "static const OCF_Edible = 1<<23"
// this would allow for definitions like "static const OCF_CrewMember = 1<<20"
// However, such stuff should better be generalized, so the preparser (and parser)
// can evaluate any constant expression, including functions with constant retval (e.g. Sqrt)
// So allow only simple constants for now.