mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2025-08-22 22:33:43 -07:00
clean up includes + casting
This commit is contained in:
parent
3953861fe8
commit
624b447354
1 changed files with 3 additions and 4 deletions
|
@ -4,7 +4,6 @@
|
||||||
#include "global.h"
|
#include "global.h"
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#include "macros.h"
|
|
||||||
#include "functions.h"
|
#include "functions.h"
|
||||||
#include "objects/gameplay_keep/gameplay_keep.h"
|
#include "objects/gameplay_keep/gameplay_keep.h"
|
||||||
extern PlayState* gPlayState;
|
extern PlayState* gPlayState;
|
||||||
|
@ -81,9 +80,9 @@ void CrawlSpeed_Register() {
|
||||||
COND_VB_SHOULD(VB_CRAWL_SPEED_EXIT_CS, shouldRegister, {
|
COND_VB_SHOULD(VB_CRAWL_SPEED_EXIT_CS, shouldRegister, {
|
||||||
Player* player = GET_PLAYER(gPlayState);
|
Player* player = GET_PLAYER(gPlayState);
|
||||||
Camera* csCam = va_arg(args, Camera*);
|
Camera* csCam = va_arg(args, Camera*);
|
||||||
int16_t csId = (int16_t)va_arg(args, int);
|
s16 csId = va_arg(args, s16);
|
||||||
int16_t actionParameters = (int16_t)va_arg(args, int);
|
s16 actionParameters = va_arg(args, s16);
|
||||||
int16_t initTimer = (int16_t)va_arg(args, int);
|
s16 initTimer = va_arg(args, s16);
|
||||||
CutsceneCameraPoint* atPoints = va_arg(args, CutsceneCameraPoint*);
|
CutsceneCameraPoint* atPoints = va_arg(args, CutsceneCameraPoint*);
|
||||||
CutsceneCameraPoint* eyePoints = va_arg(args, CutsceneCameraPoint*);
|
CutsceneCameraPoint* eyePoints = va_arg(args, CutsceneCameraPoint*);
|
||||||
bool worldPosition = (player->actor.world.pos.x > 950.0f) && (player->actor.world.pos.x < 1025.0f) &&
|
bool worldPosition = (player->actor.world.pos.x > 950.0f) && (player->actor.world.pos.x < 1025.0f) &&
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue