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

Merge pull request #335 from westonCoder/standing-object-grab-fix

Browse source 
Standing Object Grab FIx and Slider Fix
This commit is contained in:
lambertjamesd 2023-10-18 16:48:53 -06:00 committed by GitHub
parent 48e2115ee3 dc9a5c0633
commit 38114d3ff1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/audio/soundplayer.c
View file

@ -269,7 +269,7 @@ float soundClipDuration(int soundClipId, float pitch) {
return soundPlayerEstimateLength(alSound, pitch); return soundPlayerEstimateLength(alSound, pitch);
} }
void soundPlayerGameVolumeUpdate(enum SoundType type) { void soundPlayerGameVolumeUpdate() {
int index = 0; int index = 0;
while (index < gActiveSoundCount) { while (index < gActiveSoundCount) {
struct ActiveSound* sound = &gActiveSounds[index]; struct ActiveSound* sound = &gActiveSounds[index];
@ -279,7 +279,7 @@ void soundPlayerGameVolumeUpdate(enum SoundType type) {
} }
float newVolume = sound->originalVolume * gSaveData.audio.soundVolume/0xFFFF; float newVolume = sound->originalVolume * gSaveData.audio.soundVolume/0xFFFF;
if (type == SoundTypeMusic){ if (sound->soundType == SoundTypeMusic){
newVolume = newVolume* gSaveData.audio.musicVolume/0xFFFF; newVolume = newVolume* gSaveData.audio.musicVolume/0xFFFF;
} }

4
src/decor/decor_object.c
View file

@ -149,6 +149,10 @@ enum FizzleCheckResult decorObjectUpdateFizzler(struct CollisionObject* collisio
} }
int decorObjectUpdate(struct DecorObject* decorObject) { int decorObjectUpdate(struct DecorObject* decorObject) {
if (decorObject->collisionObject.flags & COLLISION_OBJECT_PLAYER_STANDING) {
decorObject->collisionObject.flags &= ~COLLISION_OBJECT_PLAYER_STANDING;
}
if (decorObject->playingSound != SOUND_ID_NONE) { if (decorObject->playingSound != SOUND_ID_NONE) {
soundPlayerUpdatePosition( soundPlayerUpdatePosition(
decorObject->playingSound, decorObject->playingSound,

4
src/menu/audio_options.c
View file

@ -143,11 +143,11 @@ enum MenuDirection audioOptionsUpdate(struct AudioOptions* audioOptions) {
switch (audioOptions->selectedItem) { switch (audioOptions->selectedItem) {
case AudioOptionGameVolume: case AudioOptionGameVolume:
audioOptionsHandleSlider(audioOptions->selectedItem, &gSaveData.audio.soundVolume, &audioOptions->gameVolume.value); audioOptionsHandleSlider(audioOptions->selectedItem, &gSaveData.audio.soundVolume, &audioOptions->gameVolume.value);
soundPlayerGameVolumeUpdate(SoundTypeAll); soundPlayerGameVolumeUpdate();
break; break;
case AudioOptionMusicVolume: case AudioOptionMusicVolume:
audioOptionsHandleSlider(audioOptions->selectedItem, &gSaveData.audio.musicVolume, &audioOptions->musicVolume.value); audioOptionsHandleSlider(audioOptions->selectedItem, &gSaveData.audio.musicVolume, &audioOptions->musicVolume.value);
soundPlayerGameVolumeUpdate(SoundTypeMusic); soundPlayerGameVolumeUpdate();
break; break;
case AudioOptionSubtitlesEnabled: case AudioOptionSubtitlesEnabled:
if (controllerGetButtonDown(0, A_BUTTON)) { if (controllerGetButtonDown(0, A_BUTTON)) {

5
src/player/player.c
View file

@ -241,7 +241,10 @@ void playerApplyPortalGrab(struct Player* player, int portalIndex) {
} }
void playerSetGrabbing(struct Player* player, struct CollisionObject* grabbing) { void playerSetGrabbing(struct Player* player, struct CollisionObject* grabbing) {
if (grabbing && !player->grabConstraint.object) { if (grabbing && grabbing->flags & COLLISION_OBJECT_PLAYER_STANDING){
player->grabConstraint.object = NULL;
}
else if (grabbing && !player->grabConstraint.object) {
pointConstraintInit(&player->grabConstraint, grabbing, 8.0f, 5.0f, 1.0f); pointConstraintInit(&player->grabConstraint, grabbing, 8.0f, 5.0f, 1.0f);
contactSolverAddPointConstraint(&gContactSolver, &player->grabConstraint); contactSolverAddPointConstraint(&gContactSolver, &player->grabConstraint);
hudResolvePrompt(&gScene.hud, CutscenePromptTypePickup); hudResolvePrompt(&gScene.hud, CutscenePromptTypePickup);