mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-21 17:05:04 -05:00
Code Issues Projects Releases Wiki Activity

khan -> dev

Browse Source
This commit is contained in:
briaguya 2023-04-02 21:37:00 -04:00 committed by GitHub
commit 0f40472c1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -5,8 +5,8 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
project(Ship VERSION 6.1.1 LANGUAGES C CXX)
set(PROJECT_BUILD_NAME "KHAN BRAVO" CACHE STRING "")
project(Ship VERSION 6.1.2 LANGUAGES C CXX)
set(PROJECT_BUILD_NAME "KHAN CHARLIE" CACHE STRING "")
set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "")
set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)

2
soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c
View File

@ -69,7 +69,7 @@ void func_8087B7E8(BgHaka* this, PlayState* play) {
Player* player = GET_PLAYER(play);
if (this->dyna.unk_150 != 0.0f) {
if (play->sceneNum == SCENE_SPOT02 && !LINK_IS_ADULT && IS_DAY && !gSaveContext.n64ddFlag && !CVarGetInteger("gDayGravePull", 0)) {
if (play->sceneNum == SCENE_SPOT02 && !LINK_IS_ADULT && IS_DAY && !CVarGetInteger("gDayGravePull", 0)) {
this->dyna.unk_150 = 0.0f;
player->stateFlags2 &= ~0x10;
if (!Play_InCsMode(play)) {