@@ -97,7 +97,6 @@ namespace gamelib::scene
97
97
}
98
98
99
99
// Read properties
100
- Value properties;
101
100
{
102
101
const auto & [vRes, _newInstructions] = objectType->verify (ip);
103
102
if (!vRes)
@@ -112,7 +111,7 @@ namespace gamelib::scene
112
111
throw SceneObjectVisitorException (objectIdx, " Invalid instructions set (verification failed) [2]" );
113
112
}
114
113
115
- properties = *value;
114
+ currentObject-> getProperties () = *value;
116
115
ip = newIP; // Assign new ip
117
116
}
118
117
@@ -134,8 +133,6 @@ namespace gamelib::scene
134
133
135
134
NEXT_IP
136
135
137
- std::map<std::string, Value> controllers;
138
-
139
136
if (controllersCount > 0 )
140
137
{
141
138
for (int32_t controllerIdx = 0 ; controllerIdx < controllersCount; ++controllerIdx)
@@ -192,7 +189,7 @@ namespace gamelib::scene
192
189
193
190
ip = nextIP;
194
191
195
- controllers [controllerName] = controllerMapResult.value ();
192
+ currentObject-> getControllers () [controllerName] = controllerMapResult.value ();
196
193
197
194
if (ip[0 ].getOpCode () != PRPOpCode::EndObject && reinterpret_cast <const TypeComplex*>(controllerType)->areUnexposedInstructionsAllowed ())
198
195
{
@@ -214,8 +211,9 @@ namespace gamelib::scene
214
211
215
212
auto unexposedInstructions = begin.slice (0 , ip.size () - endOffset).as <std::vector<PRPInstruction>>();
216
213
217
- auto & orgInstructionsRef = controllers[controllerName].getInstructions ();
218
- orgInstructionsRef.insert (orgInstructionsRef.end (), unexposedInstructions.begin (), unexposedInstructions.end ());
214
+ // FIXME: Do it better!!!
215
+ // auto& orgInstructionsRef = controllers[controllerName].getInstructions();
216
+ // orgInstructionsRef.insert(orgInstructionsRef.end(), unexposedInstructions.begin(), unexposedInstructions.end());
219
217
220
218
ip = ip.slice (endOffset, ip.size () - endOffset);
221
219
}
@@ -229,9 +227,6 @@ namespace gamelib::scene
229
227
}
230
228
}
231
229
232
- currentObject->getControllers () = controllers;
233
- currentObject->getProperties () = properties;
234
-
235
230
if (parent)
236
231
{
237
232
currentObject->setParent (parent);
0 commit comments