Changeset 7284 for code/trunk/src/orxonox/weaponsystem

Timestamp:

Aug 31, 2010, 3:37:40 AM (14 years ago)

Author:

landauf

Message:

merged consolecommands3 branch back to trunk.

note: the console command interface has changed completely, but the documentation is not yet up to date. just copy an existing command and change it to your needs, it's pretty self-explanatory. also the include files related to console commands are now located in core/command/. in the game it should work exactly like before, except for some changes in the auto-completion.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/weaponsystem/Munition.cc (modified) (1 diff)

code/trunk/src/orxonox/weaponsystem/Munition.cc

@@ -461 +461 @@
         if (bUseReloadTime && (munition->reloadTime_ > 0 || munition->bStackMunition_))
         {
-            Executor* executor = createExecutor(createFunctor(&Magazine::loaded, this));
+            const ExecutorPtr& executor = createExecutor(createFunctor(&Magazine::loaded, this));
             executor->setDefaultValues(munition);