mirror of
https://github.com/mwpenny/portal64-still-alive.git
synced 2024-10-19 22:27:36 -04:00
Merge pull request #492 from Tiptup300/patch-1
code cleanup fixed typo decorObjectClenaup to decorObjectCleanup
This commit is contained in:
commit
3bd73383d5
|
@ -104,7 +104,7 @@ void decorObjectInit(struct DecorObject* object, struct DecorObjectDefinition* d
|
|||
object->playingSound = SOUND_ID_NONE;
|
||||
}
|
||||
|
||||
void decorObjectClenaup(struct DecorObject* decorObject) {
|
||||
void decorObjectCleanup(struct DecorObject* decorObject) {
|
||||
dynamicSceneRemove(decorObject->dynamicId);
|
||||
collisionSceneRemoveDynamicObject(&decorObject->collisionObject);
|
||||
if ((decorObject->playingSound != SOUND_ID_NONE) && (soundPlayerIsPlaying(decorObject->playingSound))) {
|
||||
|
@ -113,7 +113,7 @@ void decorObjectClenaup(struct DecorObject* decorObject) {
|
|||
}
|
||||
|
||||
void decorObjectDelete(struct DecorObject* decorObject) {
|
||||
decorObjectClenaup(decorObject);
|
||||
decorObjectCleanup(decorObject);
|
||||
free(decorObject);
|
||||
}
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@ struct DecorObject {
|
|||
|
||||
struct DecorObject* decorObjectNew(struct DecorObjectDefinition* definition, struct Transform* at, int room);
|
||||
void decorObjectInit(struct DecorObject* object, struct DecorObjectDefinition* definition, struct Transform* at, int room);
|
||||
void decorObjectClenaup(struct DecorObject* decorObject);
|
||||
void decorObjectCleanup(struct DecorObject* decorObject);
|
||||
void decorObjectDelete(struct DecorObject* decorObject);
|
||||
|
||||
int decorObjectUpdate(struct DecorObject* decorObject);
|
||||
|
|
|
@ -128,7 +128,7 @@ void boxDropperUpdate(struct BoxDropper* dropper) {
|
|||
|
||||
if (dropper->flags & BoxDropperFlagsCubeIsActive) {
|
||||
if (!decorObjectUpdate(&dropper->activeCube)) {
|
||||
decorObjectClenaup(&dropper->activeCube);
|
||||
decorObjectCleanup(&dropper->activeCube);
|
||||
dropper->flags &= ~BoxDropperFlagsCubeIsActive;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue