Skip to content

Commit

Permalink
Fix #9424 (setElementVisibleTo OOPdef is missing)
Browse files Browse the repository at this point in the history
  • Loading branch information
@qaisjp
qaisjp committed Oct 18, 2016
1 parent d798cfe commit e9367f6
Showing 1 changed file with 107 additions and 106 deletions.
213 changes: 107 additions & 106 deletions Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp
View file
Expand Up @@ -92,112 +92,113 @@ void CLuaElementDefs::LoadFunctions ( void )
CLuaCFunctions::AddFunction ( "setElementCollisionsEnabled", setElementCollisionsEnabled );
CLuaCFunctions::AddFunction ( "setElementFrozen", setElementFrozen );
CLuaCFunctions::AddFunction ( "setLowLODElement", setLowLODElement );
}

// TODO: specials
void CLuaElementDefs::AddClass ( lua_State* luaVM )
{
lua_newclass ( luaVM );

lua_classfunction ( luaVM, "getByID", "getElementByID" );
lua_classfunction ( luaVM, "getAllByType", "getElementsByType" );
lua_classfunction ( luaVM, "getByIndex", "getElementByIndex" );

lua_classfunction ( luaVM, "create", "createElement" );
lua_classfunction ( luaVM, "clone", "cloneElement" );
lua_classfunction ( luaVM, "destroy", "destroyElement" );
lua_classfunction ( luaVM, "clearVisibility", "clearElementVisibleTo" );
lua_classfunction ( luaVM, "attach", "attachElements" );
lua_classfunction ( luaVM, "detach", "detachElements" );
lua_classfunction ( luaVM, "removeData", "removeElementData" );

lua_classfunction ( luaVM, "setParent", "setElementParent" );
lua_classfunction ( luaVM, "setVelocity", "setElementVelocity" );
lua_classfunction ( luaVM, "setFrozen", "setElementFrozen" );
lua_classfunction ( luaVM, "setHealth", "setElementHealth" );
lua_classfunction ( luaVM, "setModel", "setElementModel" );
lua_classfunction ( luaVM, "setSyncer", "setElementSyncer" );
lua_classfunction ( luaVM, "setAlpha", "setElementAlpha" );
lua_classfunction ( luaVM, "setDoubleSided", "setElementDoubleSided" );
lua_classfunction ( luaVM, "setCollisionsEnabled", "setElementCollisionsEnabled" );
lua_classfunction ( luaVM, "setData", "setElementData" );
lua_classfunction ( luaVM, "setPosition", "setElementPosition" );
lua_classfunction ( luaVM, "setRotation", "setElementRotation" );
lua_classfunction ( luaVM, "setVelocity", "setElementVelocity" );
lua_classfunction ( luaVM, "setMatrix", "setElementMatrix" );
lua_classfunction ( luaVM, "setID", "setElementID" );
lua_classfunction ( luaVM, "setInterior", "setElementInterior" );
lua_classfunction ( luaVM, "setDimension", "setElementDimension" );
lua_classfunction ( luaVM, "setLowLOD", "setLowLODElement" );
lua_classfunction ( luaVM, "setAttachedOffsets", "setElementAttachedOffsets" );
lua_classfunction ( luaVM, "setCallPropagationEnabled", "setElementCallPropagationEnabled" );

lua_classfunction ( luaVM, "getAttachedOffsets", "getElementAttachedOffsets" );
lua_classfunction ( luaVM, "getChild", "getElementChild" );
lua_classfunction ( luaVM, "getChildren", "getElementChildren" );
lua_classfunction ( luaVM, "getParent", "getElementParent" );
lua_classfunction ( luaVM, "getAttachedElements", "getAttachedElements" );
lua_classfunction ( luaVM, "getAttachedTo", "getElementAttachedTo" );
lua_classfunction ( luaVM, "getVelocity", "getElementVelocity", OOP_getElementVelocity );
lua_classfunction ( luaVM, "getID", "getElementID" );
lua_classfunction ( luaVM, "getZoneName", "getElementZoneName" );
lua_classfunction ( luaVM, "getAlpha", "getElementAlpha" );
lua_classfunction ( luaVM, "getHealth", "getElementHealth" );
lua_classfunction ( luaVM, "getModel", "getElementModel" );
lua_classfunction ( luaVM, "getChildrenCount", "getElementChildrenCount" );
lua_classfunction ( luaVM, "getSyncer", "getElementSyncer" );
lua_classfunction ( luaVM, "getAllData", "getAllElementData" );
lua_classfunction ( luaVM, "getColShape", "getElementColShape" );
lua_classfunction ( luaVM, "getData", "getElementData" );
lua_classfunction ( luaVM, "getPosition", "getElementPosition", OOP_getElementPosition );
lua_classfunction ( luaVM, "getRotation", "getElementRotation", OOP_getElementRotation );
lua_classfunction ( luaVM, "getMatrix", "getElementMatrix", OOP_getElementMatrix );
lua_classfunction ( luaVM, "getType", "getElementType" );
lua_classfunction ( luaVM, "getInterior", "getElementInterior" );
lua_classfunction ( luaVM, "getDimension", "getElementDimension" );
lua_classfunction ( luaVM, "getLowLOD", "getLowLODElement" );

lua_classfunction ( luaVM, "getCollisionsEnabled", "getElementCollisionsEnabled" );
lua_classfunction ( luaVM, "isCallPropagationEnabled", "isElementCallPropagationEnabled" );
lua_classfunction ( luaVM, "isWithinMarker", "isElementWithinMarker" );
lua_classfunction ( luaVM, "isWithinColShape", "isElementWithinColShape" );
lua_classfunction ( luaVM, "isFrozen", "isElementFrozen" );
lua_classfunction ( luaVM, "isInWater", "isElementInWater" );
lua_classfunction ( luaVM, "isDoubleSided", "isElementDoubleSided" );
lua_classfunction ( luaVM, "isVisibleTo", "isElementVisibleTo" );
lua_classfunction ( luaVM, "isLowLOD", "isElementLowLOD" );
lua_classfunction ( luaVM, "isAttached", "isElementAttached" );

lua_classvariable ( luaVM, "id", "setElementID", "getElementID" );
lua_classvariable ( luaVM, "callPropagationEnabled", "setElementCallPropagationEnabled", "isElementCallPropagationEnabled" );
lua_classvariable ( luaVM, "parent", "setElementParent", "getElementParent" );
lua_classvariable ( luaVM, "zoneName", NULL, "getElementZoneName" );
lua_classvariable ( luaVM, "attachedTo", "attachElements", "getElementAttachedTo" );
lua_classvariable ( luaVM, "children", NULL, "getElementChildren" );
lua_classvariable ( luaVM, "frozen", "setElementFrozen", "isElementFrozen" );
lua_classvariable ( luaVM, "attachedElements", NULL, "getAttachedElements" );
lua_classvariable ( luaVM, "inWater", NULL, "isElementInWater" );
lua_classvariable ( luaVM, "health", "setElementHealth", "getElementHealth" );
lua_classvariable ( luaVM, "alpha", "setElementAlpha", "getElementAlpha" );
lua_classvariable ( luaVM, "type", NULL, "getElementType" );
lua_classvariable ( luaVM, "dimension", "setElementDimension", "getElementDimension" );
lua_classvariable ( luaVM, "doubleSided", "setElementDoubleSided", "isElementDoubleSided" );
lua_classvariable ( luaVM, "model", "setElementModel", "getElementModel" );
lua_classvariable ( luaVM, "lowLOD", "setLowLODElement", "getLowLODElement" );
lua_classvariable ( luaVM, "syncer", NULL, "getElementSyncer" );
lua_classvariable ( luaVM, "childrenCount", NULL, "getElementChildrenCount" );
lua_classvariable ( luaVM, "interior", "setElementInterior", "getElementInterior" );
lua_classvariable ( luaVM, "colShape", NULL, "getElementColShape" );
lua_classvariable ( luaVM, "collisions", "setElementCollisionsEnabled", "getElementCollisionsEnabled" );
lua_classvariable ( luaVM, "position", "setElementPosition", "getElementPosition", setElementPosition, OOP_getElementPosition );
lua_classvariable ( luaVM, "rotation", "setElementRotation", "getElementRotation", OOP_setElementRotation, OOP_getElementRotation );
lua_classvariable ( luaVM, "matrix", "setElementMatrix", "getElementMatrix", setElementMatrix, OOP_getElementMatrix );
lua_classvariable ( luaVM, "velocity", "setElementVelocity", "getElementVelocity", setElementVelocity, OOP_getElementVelocity );
lua_classvariable ( luaVM, "isElement", NULL, "isElement" );
//lua_classvariable ( luaVM, "data", "setElementData", "getElementData", OOP_setElementData, OOP_getElementData );
//lua_classvariable ( luaVM, "visibility", "setElementVisibleTo", "isElementVisibleTo", OOP_setElementVisibleTo, CLuaOOPDefs::IsElementVisibleTo ); // .visibility[john]=false

lua_registerclass ( luaVM, "Element" );
}

// TODO: specials
void CLuaElementDefs::AddClass ( lua_State* luaVM )
{
lua_newclass ( luaVM );

lua_classfunction ( luaVM, "getByID", "getElementByID" );
lua_classfunction ( luaVM, "getAllByType", "getElementsByType" );
lua_classfunction ( luaVM, "getByIndex", "getElementByIndex" );

lua_classfunction ( luaVM, "create", "createElement" );
lua_classfunction ( luaVM, "clone", "cloneElement" );
lua_classfunction ( luaVM, "destroy", "destroyElement" );
lua_classfunction ( luaVM, "clearVisibility", "clearElementVisibleTo" );
lua_classfunction ( luaVM, "attach", "attachElements" );
lua_classfunction ( luaVM, "detach", "detachElements" );
lua_classfunction ( luaVM, "removeData", "removeElementData" );

lua_classfunction ( luaVM, "setParent", "setElementParent" );
lua_classfunction ( luaVM, "setVelocity", "setElementVelocity" );
lua_classfunction ( luaVM, "setFrozen", "setElementFrozen" );
lua_classfunction ( luaVM, "setHealth", "setElementHealth" );
lua_classfunction ( luaVM, "setModel", "setElementModel" );
lua_classfunction ( luaVM, "setSyncer", "setElementSyncer" );
lua_classfunction ( luaVM, "setAlpha", "setElementAlpha" );
lua_classfunction ( luaVM, "setDoubleSided", "setElementDoubleSided" );
lua_classfunction ( luaVM, "setCollisionsEnabled", "setElementCollisionsEnabled" );
lua_classfunction ( luaVM, "setData", "setElementData" );
lua_classfunction ( luaVM, "setPosition", "setElementPosition" );
lua_classfunction ( luaVM, "setRotation", "setElementRotation" );
lua_classfunction ( luaVM, "setVelocity", "setElementVelocity" );
lua_classfunction ( luaVM, "setVisibleTo", "setElementVisibleTo" );
lua_classfunction ( luaVM, "setMatrix", "setElementMatrix" );
lua_classfunction ( luaVM, "setID", "setElementID" );
lua_classfunction ( luaVM, "setInterior", "setElementInterior" );
lua_classfunction ( luaVM, "setDimension", "setElementDimension" );
lua_classfunction ( luaVM, "setLowLOD", "setLowLODElement" );
lua_classfunction ( luaVM, "setAttachedOffsets", "setElementAttachedOffsets" );
lua_classfunction ( luaVM, "setCallPropagationEnabled", "setElementCallPropagationEnabled" );

lua_classfunction ( luaVM, "getAttachedOffsets", "getElementAttachedOffsets" );
lua_classfunction ( luaVM, "getChild", "getElementChild" );
lua_classfunction ( luaVM, "getChildren", "getElementChildren" );
lua_classfunction ( luaVM, "getParent", "getElementParent" );
lua_classfunction ( luaVM, "getAttachedElements", "getAttachedElements" );
lua_classfunction ( luaVM, "getAttachedTo", "getElementAttachedTo" );
lua_classfunction ( luaVM, "getVelocity", "getElementVelocity", OOP_getElementVelocity );
lua_classfunction ( luaVM, "getID", "getElementID" );
lua_classfunction ( luaVM, "getZoneName", "getElementZoneName" );
lua_classfunction ( luaVM, "getAlpha", "getElementAlpha" );
lua_classfunction ( luaVM, "getHealth", "getElementHealth" );
lua_classfunction ( luaVM, "getModel", "getElementModel" );
lua_classfunction ( luaVM, "getChildrenCount", "getElementChildrenCount" );
lua_classfunction ( luaVM, "getSyncer", "getElementSyncer" );
lua_classfunction ( luaVM, "getAllData", "getAllElementData" );
lua_classfunction ( luaVM, "getColShape", "getElementColShape" );
lua_classfunction ( luaVM, "getData", "getElementData" );
lua_classfunction ( luaVM, "getPosition", "getElementPosition", OOP_getElementPosition );
lua_classfunction ( luaVM, "getRotation", "getElementRotation", OOP_getElementRotation );
lua_classfunction ( luaVM, "getMatrix", "getElementMatrix", OOP_getElementMatrix );
lua_classfunction ( luaVM, "getType", "getElementType" );
lua_classfunction ( luaVM, "getInterior", "getElementInterior" );
lua_classfunction ( luaVM, "getDimension", "getElementDimension" );
lua_classfunction ( luaVM, "getLowLOD", "getLowLODElement" );

lua_classfunction ( luaVM, "getCollisionsEnabled", "getElementCollisionsEnabled" );
lua_classfunction ( luaVM, "isCallPropagationEnabled", "isElementCallPropagationEnabled" );
lua_classfunction ( luaVM, "isWithinMarker", "isElementWithinMarker" );
lua_classfunction ( luaVM, "isWithinColShape", "isElementWithinColShape" );
lua_classfunction ( luaVM, "isFrozen", "isElementFrozen" );
lua_classfunction ( luaVM, "isInWater", "isElementInWater" );
lua_classfunction ( luaVM, "isDoubleSided", "isElementDoubleSided" );
lua_classfunction ( luaVM, "isVisibleTo", "isElementVisibleTo" );
lua_classfunction ( luaVM, "isLowLOD", "isElementLowLOD" );
lua_classfunction ( luaVM, "isAttached", "isElementAttached" );

lua_classvariable ( luaVM, "id", "setElementID", "getElementID" );
lua_classvariable ( luaVM, "callPropagationEnabled", "setElementCallPropagationEnabled", "isElementCallPropagationEnabled" );
lua_classvariable ( luaVM, "parent", "setElementParent", "getElementParent" );
lua_classvariable ( luaVM, "zoneName", NULL, "getElementZoneName" );
lua_classvariable ( luaVM, "attachedTo", "attachElements", "getElementAttachedTo" );
lua_classvariable ( luaVM, "children", NULL, "getElementChildren" );
lua_classvariable ( luaVM, "frozen", "setElementFrozen", "isElementFrozen" );
lua_classvariable ( luaVM, "attachedElements", NULL, "getAttachedElements" );
lua_classvariable ( luaVM, "inWater", NULL, "isElementInWater" );
lua_classvariable ( luaVM, "health", "setElementHealth", "getElementHealth" );
lua_classvariable ( luaVM, "alpha", "setElementAlpha", "getElementAlpha" );
lua_classvariable ( luaVM, "type", NULL, "getElementType" );
lua_classvariable ( luaVM, "dimension", "setElementDimension", "getElementDimension" );
lua_classvariable ( luaVM, "doubleSided", "setElementDoubleSided", "isElementDoubleSided" );
lua_classvariable ( luaVM, "model", "setElementModel", "getElementModel" );
lua_classvariable ( luaVM, "lowLOD", "setLowLODElement", "getLowLODElement" );
lua_classvariable ( luaVM, "syncer", NULL, "getElementSyncer" );
lua_classvariable ( luaVM, "childrenCount", NULL, "getElementChildrenCount" );
lua_classvariable ( luaVM, "interior", "setElementInterior", "getElementInterior" );
lua_classvariable ( luaVM, "colShape", NULL, "getElementColShape" );
lua_classvariable ( luaVM, "collisions", "setElementCollisionsEnabled", "getElementCollisionsEnabled" );
lua_classvariable ( luaVM, "position", "setElementPosition", "getElementPosition", setElementPosition, OOP_getElementPosition );
lua_classvariable ( luaVM, "rotation", "setElementRotation", "getElementRotation", OOP_setElementRotation, OOP_getElementRotation );
lua_classvariable ( luaVM, "matrix", "setElementMatrix", "getElementMatrix", setElementMatrix, OOP_getElementMatrix );
lua_classvariable ( luaVM, "velocity", "setElementVelocity", "getElementVelocity", setElementVelocity, OOP_getElementVelocity );
lua_classvariable ( luaVM, "isElement", NULL, "isElement" );
//lua_classvariable ( luaVM, "data", "setElementData", "getElementData", OOP_setElementData, OOP_getElementData );
//lua_classvariable ( luaVM, "visibility", "setElementVisibleTo", "isElementVisibleTo", OOP_setElementVisibleTo, CLuaOOPDefs::IsElementVisibleTo ); // .visibility[john]=false

lua_registerclass ( luaVM, "Element" );
}

int CLuaElementDefs::createElement ( lua_State* luaVM )
Expand Down

0 comments on commit e9367f6

Please sign in to comment.