Changeset 5652 in orxonox.OLD for trunk/src/util
- Timestamp:
- Nov 20, 2005, 6:32:39 PM (19 years ago)
- Location:
- trunk/src/util/loading
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/util/loading/load_param.cc
r5651 r5652 110 110 { 111 111 this->loadString = grabParameter(root, paramName); 112 this->paramName = paramName; 112 113 this->object = object; 113 114 if (root != NULL) … … 127 128 if (likely(this->executor != NULL)) 128 129 { 129 if (likely(this->object != NULL)) 130 this->executor->execute(this->object, this->loadString); 131 130 printf("%s: %s", this->paramName, this->loadString); 131 if (likely(this->object != NULL && this->executor != NULL) && 132 ( this->loadString != NULL || 133 ((this->executor->getType() & Executor_NoLoadString) == Executor_NoLoadString))) 134 { 135 printf(" - exec"); 136 this->executor->execute(this->object, this->loadString); 137 } 138 printf ("\n"); 132 139 delete this->executor; 133 140 } 134 141 142 } 143 144 145 LoadParamBase* LoadParamBase::defaultValues(unsigned int count, ...) 146 { 147 if (this == NULL) 148 return NULL; 149 150 va_list values; 151 va_start(values, count); 152 153 assert(executor != NULL); 154 this->executor->defaultValues(count, values); 155 156 return this; 135 157 } 136 158 -
trunk/src/util/loading/load_param.h
r5651 r5652 22 22 #define _LOAD_PARAM_H 23 23 24 #include "functor_list.h" 25 26 #include "debug.h" 27 28 #include "factory.h" 29 #include "substring.h" 30 #include "tinyxml.h" 24 #include "base_object.h" 25 31 26 #include "executor/executor.h" 32 27 #include "executor/executor_specials.h" … … 74 69 75 70 protected: 71 bool withLoadString; //!< If we need the loadString to execute this. 76 72 Executor* executor; 77 73 BaseObject* object; 74 const char* paramName; 78 75 79 76 LoadClassDescription* classDesc; //!< The LoadClassDescription of this LoadParameter
Note: See TracChangeset
for help on using the changeset viewer.