mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-11 03:13:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tidy includes, drop PC STATIC_ASSERTs, and more macro usage

Browse Source
This commit is contained in:
Irastris
2026-09-04 20:48:36 -04:00
parent 2170967b6b
commit bb09df7948
179 changed files with 838 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_ne.cpp
+10 -19
View File
@@ -18,9 +18,12 @@
#include "f_op/f_op_kankyo_mng.h"
#include "c/c_damagereaction.h"
#include "Z2AudioLib/Z2Instances.h"
#include "dusk/frame_interpolation.h"
#include <cstring>
#if TARGET_PC
#include "dusk/frame_interpolation.h"
#endif
static home_path_pnt home_path[38] = {
{0, {561.0f, 87.0f, -1110.0f}},
{1, {306.0f, 87.0f, -849.0f}},
@@ -2656,9 +2659,7 @@ static void demo_camera(npc_ne_class* i_this) {
i_this->mCameraFovY = 55.0f;
camera->mCamera.SetTrimSize(3);
daPy_getPlayerActorClass()->changeOriginalDemo();
#ifdef TARGET_PC
dusk::frame_interp::request_presentation_sync();
#endif
IF_DUSK(dusk::frame_interp::request_presentation_sync());
// fallthrough
case 2:
@@ -2687,9 +2688,7 @@ static void demo_camera(npc_ne_class* i_this) {
if (i_this->mDemoCounter == 0) {
i_this->mCameraCenter1.set(387.0f, 133.0f, -866.0f);
i_this->mCameraEye1.set(284.0f, 208.0f, -585.0f);
#ifdef TARGET_PC
dusk::frame_interp::request_presentation_sync();
#endif
IF_DUSK(dusk::frame_interp::request_presentation_sync());
}
if (i_this->mDemoCounter == 12) {
@@ -2726,9 +2725,7 @@ static void demo_camera(npc_ne_class* i_this) {
i_this->mCameraFovY = 45.0f;
camera->mCamera.SetTrimSize(3);
daPy_getPlayerActorClass()->changeOriginalDemo();
#ifdef TARGET_PC
dusk::frame_interp::request_presentation_sync();
#endif
IF_DUSK(dusk::frame_interp::request_presentation_sync());
// fallthrough
case 11:
@@ -2809,14 +2806,10 @@ static void demo_camera(npc_ne_class* i_this) {
MtxPosition(&vec, &i_this->mCameraEye2);
i_this->mCameraEye2 += player->current.pos;
player->changeDemoParam2(2);
#ifdef TARGET_PC
dusk::frame_interp::request_presentation_sync();
#endif
IF_DUSK(dusk::frame_interp::request_presentation_sync());
} else if (i_this->mDemoCounter == 120) {
player->changeDemoParam2(0);
#ifdef TARGET_PC
dusk::frame_interp::request_presentation_sync();
#endif
IF_DUSK(dusk::frame_interp::request_presentation_sync());
}
}
}
@@ -2869,9 +2862,7 @@ static void demo_camera(npc_ne_class* i_this) {
i_this->mCameraCenter1 = _this->current.pos;
i_this->mCameraCenter1.y += 20.0f;
i_this->mCameraFovY = 55.0f;
#ifdef TARGET_PC
dusk::frame_interp::request_presentation_sync();
#endif
IF_DUSK(dusk::frame_interp::request_presentation_sync());
}
camera->mCamera.Set(i_this->mCameraCenter1, i_this->mCameraEye1,