comparison AnimationMaster.c @ 234:0ee1a3c8972d

Merged Nina's fix of assembly with Sean's comments and cleanup
author Some Random Person <seanhalle@yahoo.com>
date Fri, 16 Mar 2012 10:43:15 -0700
parents 421bde2a07d7
children ecbf6992dab4
comparison
equal deleted inserted replaced
2:816ba50f18a8 3:fde66a0f1846
181 (*slaveAssigner)( semanticEnv, currSlot ); 181 (*slaveAssigner)( semanticEnv, currSlot );
182 182
183 //put the chosen slave into slot, and adjust flags and state 183 //put the chosen slave into slot, and adjust flags and state
184 if( assignedSlaveVP != NULL ) 184 if( assignedSlaveVP != NULL )
185 { currSlot->slaveAssignedToSlot = assignedSlaveVP; 185 { currSlot->slaveAssignedToSlot = assignedSlaveVP;
186 assignedSlaveVP->schedSlot = currSlot; 186 assignedSlaveVP->schedSlotAssignedTo = currSlot;
187 currSlot->needsSlaveAssigned = FALSE; 187 currSlot->needsSlaveAssigned = FALSE;
188 numSlotsFilled += 1; 188 numSlotsFilled += 1;
189 } 189 }
190 } 190 }
191 } 191 }