Archive/portal64-still-alive
1
0
Fork 0
mirror of https://github.com/mwpenny/portal64-still-alive.git synced 2024-10-19 22:27:36 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #492 from Tiptup300/patch-1

Browse source 
code cleanup fixed typo decorObjectClenaup to decorObjectCleanup
This commit is contained in:
lambertjamesd 2023-11-24 12:44:57 -07:00 committed by GitHub
parent 7ea13d6c2b dae52907a5
commit 3bd73383d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/decor/decor_object.c
View file

@ -104,7 +104,7 @@ void decorObjectInit(struct DecorObject* object, struct DecorObjectDefinition* d
object->playingSound = SOUND_ID_NONE; object->playingSound = SOUND_ID_NONE;
} }
void decorObjectClenaup(struct DecorObject* decorObject) { void decorObjectCleanup(struct DecorObject* decorObject) {
dynamicSceneRemove(decorObject->dynamicId); dynamicSceneRemove(decorObject->dynamicId);
collisionSceneRemoveDynamicObject(&decorObject->collisionObject); collisionSceneRemoveDynamicObject(&decorObject->collisionObject);
if ((decorObject->playingSound != SOUND_ID_NONE) && (soundPlayerIsPlaying(decorObject->playingSound))) { if ((decorObject->playingSound != SOUND_ID_NONE) && (soundPlayerIsPlaying(decorObject->playingSound))) {
@ -113,7 +113,7 @@ void decorObjectClenaup(struct DecorObject* decorObject) {
} }
void decorObjectDelete(struct DecorObject* decorObject) { void decorObjectDelete(struct DecorObject* decorObject) {
decorObjectClenaup(decorObject); decorObjectCleanup(decorObject);
free(decorObject); free(decorObject);
} }

2
src/decor/decor_object.h
View file

@ -39,7 +39,7 @@ struct DecorObject {
struct DecorObject* decorObjectNew(struct DecorObjectDefinition* definition, struct Transform* at, int room); 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 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); void decorObjectDelete(struct DecorObject* decorObject);
int decorObjectUpdate(struct DecorObject* decorObject); int decorObjectUpdate(struct DecorObject* decorObject);

2
src/scene/box_dropper.c
View file

@ -128,7 +128,7 @@ void boxDropperUpdate(struct BoxDropper* dropper) {
if (dropper->flags & BoxDropperFlagsCubeIsActive) { if (dropper->flags & BoxDropperFlagsCubeIsActive) {
if (!decorObjectUpdate(&dropper->activeCube)) { if (!decorObjectUpdate(&dropper->activeCube)) {
decorObjectClenaup(&dropper->activeCube); decorObjectCleanup(&dropper->activeCube);
dropper->flags &= ~BoxDropperFlagsCubeIsActive; dropper->flags &= ~BoxDropperFlagsCubeIsActive;
} }
} }