Add more rumble pak clips
This commit is contained in:
parent
0da90ce622
commit
e717d6f7e2
|
@ -1,6 +1,7 @@
|
|||
|
||||
#include <stdlib.h>
|
||||
#include "player.h"
|
||||
#include "player_rumble_clips.h"
|
||||
#include "../audio/clips.h"
|
||||
#include "../audio/soundplayer.h"
|
||||
#include "../controls/controller_actions.h"
|
||||
|
@ -452,6 +453,7 @@ void playerKill(struct Player* player, int isUnderwater) {
|
|||
// drop the portal gun
|
||||
player->flags &= ~(PlayerHasFirstPortalGun | PlayerHasSecondPortalGun);
|
||||
playerSetGrabbing(player, NULL);
|
||||
rumblePakClipPlay(&gPlayerDieRumbleWave);
|
||||
}
|
||||
|
||||
int playerIsDead(struct Player* player) {
|
||||
|
@ -831,6 +833,7 @@ void playerUpdate(struct Player* player) {
|
|||
soundPlayerPlay(soundsPortalExit[2 - didPassThroughPortal], 0.75f, 1.0f, NULL, NULL, SoundTypeAll);
|
||||
hudShowSubtitle(&gScene.hud, PORTALPLAYER_EXITPORTAL, SubtitleTypeCaption);
|
||||
gPlayerCollider.extendDownward = 0.0f;
|
||||
rumblePakClipPlay(&gPlayerPassPortalWave);
|
||||
} else {
|
||||
gPlayerCollider.extendDownward = mathfMoveTowards(gPlayerCollider.extendDownward, TARGET_CAPSULE_EXTEND_HEIGHT, STAND_SPEED * FIXED_DELTA_TIME);
|
||||
}
|
||||
|
|
21
src/player/player_rumble_clips.c
Normal file
21
src/player/player_rumble_clips.c
Normal file
|
@ -0,0 +1,21 @@
|
|||
#include "./player_rumble_clips.h"
|
||||
|
||||
unsigned char gPlayerPassPortalData[] = {
|
||||
0xFE, 0x09,
|
||||
};
|
||||
|
||||
struct RumblePakWave gPlayerPassPortalWave = {
|
||||
.samples = gPlayerPassPortalData,
|
||||
.sampleCount = 6,
|
||||
.samplesPerTick = 1 << 6,
|
||||
};
|
||||
|
||||
unsigned char gPlayerDieRumbleData[] = {
|
||||
0xFF, 0xE9, 0x9E, 0xFF, 0xFF, 0xE9
|
||||
};
|
||||
|
||||
struct RumblePakWave gPlayerDieRumbleWave = {
|
||||
.samples = gPlayerDieRumbleData,
|
||||
.sampleCount = 24,
|
||||
.samplesPerTick = 1 << 5,
|
||||
};
|
9
src/player/player_rumble_clips.h
Normal file
9
src/player/player_rumble_clips.h
Normal file
|
@ -0,0 +1,9 @@
|
|||
#ifndef __PLAYER_PLAYER_RUMBLE_CLIPS_H__
|
||||
#define __PLAYER_PLAYER_RUMBLE_CLIPS_H__
|
||||
|
||||
#include "../controls/rumble_pak.h"
|
||||
|
||||
extern struct RumblePakWave gPlayerPassPortalWave;
|
||||
extern struct RumblePakWave gPlayerDieRumbleWave;
|
||||
|
||||
#endif
|
Loading…
Reference in a new issue