| 9a76eea2f5a4966f140916a40d0f5bf4b00fb01b | ecea45defab258134a175bcf8a178f1ac7e4243e | ||
|---|---|---|---|
414 | 414 | ||
415 | static void QueenSoundHiss(STRATEGYBLOCK* sbPtr) | 415 | static void QueenSoundHiss(STRATEGYBLOCK* sbPtr) |
416 | { | 416 | { |
417 | assert(sbPtr); | ||
418 | QUEEN_STATUS_BLOCK *queenStatusPointer = (QUEEN_STATUS_BLOCK *)(sbPtr->dataptr); | 417 | QUEEN_STATUS_BLOCK *queenStatusPointer = (QUEEN_STATUS_BLOCK *)(sbPtr->dataptr); |
419 | 418 | ||
420 | if(queenStatusPointer->soundHandle == SOUND_NOACTIVEINDEX) | 419 | if(queenStatusPointer->soundHandle == SOUND_NOACTIVEINDEX) |
421 | { | 420 | { |
422 | PlayQueenSound(0,QSC_Hiss,0,&queenStatusPointer->soundHandle,&sbPtr->DynPtr->Position); | 421 | SpeciesSound(0, QSC_Hiss, 0, &queenStatusPointer->soundHandle, &sbPtr->DynPtr->Position, QUEEN_SOUND); |
423 | queenStatusPointer->lastSoundCategory = QSC_Hiss; | 422 | queenStatusPointer->lastSoundCategory = QSC_Hiss; |
424 | } | 423 | } |
425 | } | 424 | } |
... | ... | ||
439 | 438 | ||
440 | if(queenStatusPointer->soundHandle == SOUND_NOACTIVEINDEX) | 439 | if(queenStatusPointer->soundHandle == SOUND_NOACTIVEINDEX) |
441 | { | 440 | { |
442 | PlayQueenSound(0,QSC_Scream_Hurt,0,&queenStatusPointer->soundHandle,&sbPtr->DynPtr->Position); | 441 | SpeciesSound(0, QSC_Scream_Hurt, 0, &queenStatusPointer->soundHandle, &sbPtr->DynPtr->Position, QUEEN_SOUND); |
443 | queenStatusPointer->lastSoundCategory = QSC_Scream_Hurt; | 442 | queenStatusPointer->lastSoundCategory = QSC_Scream_Hurt; |
444 | } | 443 | } |
445 | } | 444 | } |
... | ... | ||
450 | {SOUND_NOACTIVEINDEX,SOUND_NOACTIVEINDEX,SOUND_NOACTIVEINDEX,SOUND_NOACTIVEINDEX,SOUND_NOACTIVEINDEX,SOUND_NOACTIVEINDEX,SOUND_NOACTIVEINDEX,SOUND_NOACTIVEINDEX
,SOUND_NOACTIVEINDEX,SOUND_NOACTIVEINDEX}; | 449 | {SOUND_NOACTIVEINDEX,SOUND_NOACTIVEINDEX,SOUND_NOACTIVEINDEX,SOUND_NOACTIVEINDEX,SOUND_NOACTIVEINDEX,SOUND_NOACTIVEINDEX,SOUND_NOACTIVEINDEX,SOUND_NOACTIVEINDEX
,SOUND_NOACTIVEINDEX,SOUND_NOACTIVEINDEX}; |
451 | assert(location); | 450 | assert(location); |
452 | 451 | ||
453 | PlayQueenSound(0,QSC_Object_Bounce,0,&QueenObjectSoundHandles[object_index],location); | 452 | SpeciesSound(0, QSC_Object_Bounce, 0, &QueenObjectSoundHandles[object_index], location, QUEEN_SOUND); |
454 | } | 453 | } |
455 | 454 | ||
456 | void InitQueenBehaviour(void* bhdata, STRATEGYBLOCK *sbPtr) | 455 | void InitQueenBehaviour(void* bhdata, STRATEGYBLOCK *sbPtr) |
457 | { | 456 | { |
458 | assert(bhdata); | ||
459 | TOOLS_DATA_QUEEN *toolsData = (TOOLS_DATA_QUEEN *)bhdata; | 457 | TOOLS_DATA_QUEEN *toolsData = (TOOLS_DATA_QUEEN *)bhdata; |
460 | 458 | ||
461 | /* Reset command interface. */ | 459 | /* Reset command interface. */ |