Changeset 549

Timestamp:

05/20/08 12:44:25 (8 months ago)

Author:

LeoD

Message:

this also removes the need for object type infos to be copyable

Files:

• trunk/src/defend/objects/Core.d (modified) (5 diffs)
• trunk/src/defend/objects/types/Building.d (modified) (6 diffs)
• trunk/src/defend/objects/types/Citizen.d (modified) (3 diffs)
• trunk/src/defend/objects/types/Resource.d (modified) (1 diff)
• trunk/src/defend/objects/types/Unit.d (modified) (1 diff)

trunk/src/defend/objects/Core.d

@@ -196 +196 @@
-abstract class ObjectButton
-{
-protected:
-    void assign(ObjectButton o)
-    {
-        o.id = id;
-        o.widget = widget;
-        o.pos = pos;
-        o.showCache = false;
-        o.doPlaceObject = doPlaceObject;
-        o.placeObject = placeObject;
-    }
-
-public:
-    abstract ObjectButton dup();
-
-    button_id_t id;
-    Widget widget;
@@ -215 +201 @@
-    bool showCache;
-
+    // Let the user place an object, then send OrderPlaceObject
-    bool doPlaceObject = false;
-
-    // Let the user place an object, then send OrderPlaceObject
-    object_type_t placeObject;
-
+    // Returns whether the button shall be made visible
-    abstract bool show(GameObject object);
+    
-    abstract void onLeftClick(GameObject[] objects);
-    abstract char[] miniPic();
@@ -302 +289 @@
-            assert(object.typeInfo.objectClass == whatClass);
-        });
-    }
-
-    // Duplication
-    void assign(ObjectTypeInfo o)
-    {
-        o.logger = logger;
-        o.buttonCounter = 0;
-        o.propertyFactors[] = propertyFactors[];
-        o.available = available;
-        o.abstractType = abstractType;
-        o.model = model;
-        o.posOffset = posOffset;
-        o.scale = scale;
-        o.miniPic = miniPic;
-        o.properties[] = properties[];
-        o.dimension = dimension;
-        o.gameObjects = gameObjects;
-        o.objectType = objectType;
-        o.parentType = parentType;
-        o.objectClass = objectClass;
-    }
-
@@ -359 +326 @@
-    typedef uint local_id_t;
-    local_id_t localTypeID;
-
-    abstract ObjectTypeInfo dup();
-
-    // Check if an order is valid
@@ -607 +572 @@
-
-public:
-    override ObjectTypeInfo dup()
-    {
-        auto result = new BaseTypeInfo;
-        assign(result);
-        
-        return result;
-    }
-
-    override void construct()
-    {

trunk/src/defend/objects/types/Building.d

@@ -143 +143 @@
-class BuildingTypeInfo : BaseTypeInfo
-{
-protected:
-    override void assign(ObjectTypeInfo t)
-    {
-        super.assign(t);
-        
-        auto o = cast(BuildingTypeInfo)t;
-        assert(o !is null);
-        
-        o.canBuild = canBuild.dup;
-        o.canDevelop = canDevelop.dup;
-        o.buildSteps = buildSteps;
-    }
-
-public:
-    object_type_t[] canBuild;
-    tech_t[] canDevelop;
@@ -162 +148 @@
-    // Time needed for building (in simulation steps)
-    uint buildSteps = 30;
-
-
-
-
-
-
-
-
-
+
-    // Orders
-    override OrderError checkOrder(GameObject[] objects, OrderMapRightClick* order)
@@ -191 +169 @@
-    class ButtonBuildUnit : ObjectButton
-    {
-    protected:
-        override void assign(ObjectButton t)
-        {
-            super.assign(t);
-            
-            auto o = cast(ButtonBuildUnit)t;
-            assert(o !is null);
-            
-            o.unitType = unitType;
-            o._unitTypePointer = null;
-        }
-    
-    public:
-        object_type_t unitType;
-        UnitTypeInfo _unitTypePointer;
@@ -210 +175 @@
-        {
-            unitType = t;
-        }
-        
-        override ObjectButton dup()
-        {
-            auto result = new ButtonBuildUnit(unitType);
-            assign(result);
-            
-            return result;
-        }
-        
@@ -288 +245 @@
-    class ButtonTech : ObjectButton
-    {
-    protected:
-        override void assign(ObjectButton t)
-        {
-            super.assign(t);
-            
-            auto o = cast(ButtonTech)t;
-            assert(o !is null);
-            
-            o.tech = tech;
-            o._techPointer = null;
-        }
-    
-    public:
-        tech_t tech;
-        Technology _techPointer;
@@ -307 +251 @@
-        {
-            tech = t;
-        }
-        
-        override ObjectButton dup()
-        {
-            auto result = new ButtonTech(tech);
-            assign(result);
-            
-            return result;
-        }
-        

trunk/src/defend/objects/types/Citizen.d

@@ -45 +45 @@
-class CitizenTypeInfo : UnitTypeInfo
-{
-protected:
-    override void assign(ObjectTypeInfo t)
-    {
-        super.assign(t);
-        
-        auto o = cast(CitizenTypeInfo)t;
-        assert(o !is null);
-        
-        o.canBuild = canBuild.dup;
-    }
-
-public:
-    object_type_t[] canBuild;
-    
-    override ObjectTypeInfo dup()
-    {
-        auto result = new CitizenTypeInfo;
-        assign(result);
-        
-        return result;
-    }
-    
-    override OrderError checkOrder(GameObject[] objects, OrderObjectRightClick* order)
@@ -148 +128 @@
-    class ButtonBuildBuilding : ObjectButton
-    {
-    protected:
-        override void assign(ObjectButton t)
-        {
-            super.assign(t);
-            
-            auto o = cast(ButtonBuildBuilding)t;
-            assert(o !is null);
-            
-            o.buildingType = buildingType;
-            o._buildingTypePointer = null;
-        }
-    
-    public:
-        object_type_t buildingType;
-        BuildingTypeInfo _buildingTypePointer;
@@ -169 +136 @@
-            doPlaceObject = true;
-            placeObject = t;
-        }
-        
-        override ObjectButton dup()
-        {
-            auto result = new ButtonBuildBuilding(buildingType);
-            assign(result);
-            
-            return result;
-        }
-        

trunk/src/defend/objects/types/Resource.d

@@ -48 +48 @@
-class ResourceTypeInfo : BaseTypeInfo
-{
-protected:
-    override void assign(ObjectTypeInfo t)
-    {
-        super.assign(t);
-        
-        auto o = cast(ResourceTypeInfo)t;
-        assert(o !is null);
-        
-        o.resourceType = resourceType;
-        o.initialAmount = initialAmount;
-    }
-
-public:
-    ResourceType resourceType;
-    uint initialAmount;
-    
-    override ResourceTypeInfo dup()
-    {
-        auto result = new ResourceTypeInfo;
-        assign(result);
-        
-        return result;
-    }
-    
-    override void construct()

trunk/src/defend/objects/types/Unit.d

@@ -137 +137 @@
-class UnitTypeInfo : BaseTypeInfo
-{
-protected:
-    override void assign(ObjectTypeInfo t)
-    {
-        super.assign(t);
-        
-        auto o = cast(UnitTypeInfo)t;
-        assert(o !is null);
-        
-        o.developmentSteps = developmentSteps;
-    }
-    
-public:
-    // Time needed for development (in simulation steps)
-    uint developmentSteps = 30;
-
-    override ObjectTypeInfo dup()
-    {
-        auto result = new UnitTypeInfo;
-        assign(result);
-        
-        return result;
-    }
-
-    // Orders