github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 14:23:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed building

Browse source
This commit is contained in:
MelonSpeedruns 2022-05-16 13:41:55 -04:00
commit 1d39aaa3eb
6 changed files with 1238 additions and 3769 deletions
Download patch file Download diff file Expand all files Collapse all files

4
soh/include/z64player.h
View file

@ -5,10 +5,6 @@
struct Player; struct Player;
bool manualCamera;
f32 camX;
f32 camY;
typedef enum { typedef enum {
/* 0 */ PLAYER_SWORD_NONE, /* 0 */ PLAYER_SWORD_NONE,
/* 1 */ PLAYER_SWORD_KOKIRI, /* 1 */ PLAYER_SWORD_KOKIRI,

1
soh/soh.vcxproj
View file

@ -1400,6 +1400,7 @@
<ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Stick\z_eff_ss_stick.h" /> <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Stick\z_eff_ss_stick.h" />
<ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Stone1\z_eff_ss_stone1.h" /> <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Stone1\z_eff_ss_stone1.h" />
<ClInclude Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_scope.h" /> <ClInclude Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_scope.h" />
<ClInclude Include="z_camera.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="include\macro.inc" /> <None Include="include\macro.inc" />

4994
soh/soh.vcxproj.filters
View file

File diff suppressed because it is too large Load diff

1
soh/src/code/z_camera.c
View file

@ -29,6 +29,7 @@ s32 Camera_CheckWater(Camera* camera);
#define FLG_OFFGROUND (1 << 7) #define FLG_OFFGROUND (1 << 7)
#include "z_camera_data.inc" #include "z_camera_data.inc"
#include "z_camera.h"
/*===============================================================*/ /*===============================================================*/

2
soh/src/code/z_play.c
View file

@ -7,6 +7,8 @@
#include "soh/frame_interpolation.h" #include "soh/frame_interpolation.h"
#include "z_camera.h"
void* D_8012D1F0 = NULL; void* D_8012D1F0 = NULL;
//UNK_TYPE D_8012D1F4 = 0; // unused //UNK_TYPE D_8012D1F4 = 0; // unused
Input* D_8012D1F8 = NULL; Input* D_8012D1F8 = NULL;

5
soh/z_camera.h Normal file
View file

@ -0,0 +1,5 @@
#pragma once
bool manualCamera;
f32 camX;
f32 camY;