From 0cf65151b3a1a85a5d3ad74a367045e596aee1aa Mon Sep 17 00:00:00 2001 From: lepelog Date: Thu, 7 Jan 2021 02:04:53 +0100 Subject: Split SComponent (#45) * split c_math * split c_angle * split c_API_controller_pad * split c_API_graphic * split c_bg_s_chk * c_bg_s_gnd_chk split * more c_bg split * split c_cc_d * delete asm * split c_cc_s * split c_lib * split c_m2d and c_m3d_g_aab * split c_m3d_g_cir * split c_m3d_g_cps * split rest of c_m3d_g * split c_m3d * split c_malloc * split c_request * split c_sxyz * split and partly decompile c_xyz * format * c_angle.h * begin c_angle decomp * c_angle * progress adding stub classes for SComponent * more c_m3d * remove some asm and format * more m3d headers * more c_angle decomp * c_lib headers * add public to classes * fix csXyz member names * c_sxyz partly OK * move Zero csXyz to c_sxyz header * c_API_graphic * delete some unused asm * move math extern data, decompile some functions * delete unused asm * fix duplicated c_angle.h * fix an inlined function name, add more inlined functions for c_angle.h (currently unused) * format Co-authored-by: Pheenoh --- src/d/d_camera.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/d/d_camera.cpp') diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 45c0cb84bc..1f57b00e04 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -1,6 +1,5 @@ /* d_camera.cpp autogenerated by split.py v0.3 at 2021-01-02 08:13:10.853821 */ -#include "SComponent/c_angle/c_angle.h" #include "SComponent/c_bg_w.h" #include "SComponent/c_xyz.h" #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" @@ -600,7 +599,7 @@ asm void _unnamed_d_camera_cpp__NS_rangef(void) { // __ct__7cSGlobeFv // cSGlobe::cSGlobe(void) -asm void cSGlobe(void) { +asm void __ct__7cSGlobeFv(void) { nofralloc #include "d/d_camera/asm/func_8016E420.s" } @@ -1333,12 +1332,16 @@ asm void std_NS_fabsf(void) { #include "d/d_camera/asm/func_80182A3C.s" } +extern "C" { + +// compiler generated from inline constructor // __ct__7cSAngleFv // cSAngle::cSAngle(void) -asm cSAngle::cSAngle() { +asm void __ct__7cSAngleFv(void) { nofralloc #include "d/d_camera/asm/func_80182A48.s" } +} // R__7cSGlobeFf // cSGlobe::R(float) -- cgit v1.2.3