f_pc mostly linked for Wii/Shield (#3015)

1 files changed, 25 insertions, 26 deletions

diff --git a/src/f_pc/f_pc_node.cpp b/src/f_pc/f_pc_node.cpp
index d3c387d484..205d392ff1 100644
--- a/src/f_pc/f_pc_node.cpp
+++ b/src/f_pc/f_pc_node.cpp
@@ -7,12 +7,12 @@
 #include "f_pc/f_pc_layer_iter.h"
 #include "f_pc/f_pc_debug_sv.h"
 
-s32 fpcNd_DrawMethod(nodedraw_method_class* i_method_class, void* i_data) {
+int fpcNd_DrawMethod(nodedraw_method_class* i_method_class, void* i_data) {
     return fpcMtd_Method(i_method_class->draw_method, i_data);
 }
 
-s32 fpcNd_Draw(process_node_class* i_procNode) {
-    s32 ret = 0;
+int fpcNd_Draw(process_node_class* i_procNode) {
+    int ret = 0;
     process_node_class* var_r28 = i_procNode;
 
     if (i_procNode->unk_0x1A8 == 0) {
@@ -25,8 +25,8 @@ s32 fpcNd_Draw(process_node_class* i_procNode) {
     return ret;
 }
 
-s32 fpcNd_Execute(process_node_class* i_procNode) {
-    s32 ret = 0;
+int fpcNd_Execute(process_node_class* i_procNode) {
+    int ret = 0;
     layer_class* save_layer = fpcLy_CurrentLayer();
 
 #if DEBUG
@@ -47,25 +47,24 @@ s32 fpcNd_Execute(process_node_class* i_procNode) {
 int g_fpcNd_type;
 
 void* fpcNd_IsCreatingFromUnder(void* i_procNode) {
-    layer_class* layer;
-    process_node_class* procnode = (process_node_class*)i_procNode;
-    if (procnode != NULL && fpcBs_Is_JustOfType(g_fpcNd_type, procnode->base.subtype) != FALSE)
+    if (i_procNode != NULL && fpcBs_Is_JustOfType(g_fpcNd_type, ((process_node_class*)i_procNode)->base.subtype) != FALSE)
     {
-        layer = &procnode->layer;
+        layer_class* layer;
+        layer = &((process_node_class*)i_procNode)->layer;
         if (fpcLy_IsCreatingMesg(layer) == FALSE) {
             return (process_node_class*)fpcLyIt_Judge(
                 layer, (fpcLyIt_JudgeFunc)fpcNd_IsCreatingFromUnder, NULL);
         } else {
-            return procnode;
+            return i_procNode;
         }
     }
-    
+
     return NULL;
 }
 
 BOOL g_fpcNd_IsCheckOfDeleteTiming = TRUE;
 
-s32 fpcNd_IsDeleteTiming(process_node_class* i_procNode) {
+int fpcNd_IsDeleteTiming(process_node_class* i_procNode) {
     if (g_fpcNd_IsCheckOfDeleteTiming == TRUE && fpcNd_IsCreatingFromUnder(i_procNode) != NULL) {
         return 0;
     }
@@ -73,11 +72,11 @@ s32 fpcNd_IsDeleteTiming(process_node_class* i_procNode) {
     return 1;
 }
 
-s32 fpcNd_IsDelete(process_node_class* i_procNode) {
+int fpcNd_IsDelete(process_node_class* i_procNode) {
     return fpcMtd_IsDelete(&i_procNode->nodedraw_method->base, i_procNode);
 }
 
-s32 fpcNd_Delete(process_node_class* i_procNode) {
+int fpcNd_Delete(process_node_class* i_procNode) {
     if (!fpcLy_IsDeletingMesg(&i_procNode->layer) &&
         fpcMtd_Delete(&i_procNode->nodedraw_method->base, i_procNode) == 1)
     {
@@ -88,22 +87,22 @@ s32 fpcNd_Delete(process_node_class* i_procNode) {
     return 0;
 }
 
-s32 fpcNd_Create(process_node_class* i_procNode) {
-    process_node_class* procnode = (process_node_class*)i_procNode;
+int fpcNd_Create(process_node_class* i_procNode) {
+    int ret;
     layer_class* save_layer;
-    s32 ret;
-
-    if (procnode->base.state.init_state == 0) {
-        node_process_profile_definition* pprofile = (node_process_profile_definition*)procnode->base.profile;
-        procnode->base.subtype = fpcBs_MakeOfType(&g_fpcNd_type);
-        procnode->nodedraw_method = (nodedraw_method_class*)pprofile->sub_methods;
-        fpcLy_Create(&procnode->layer, procnode, procnode->layer_nodelist, 16);
-        procnode->unk_0x1A8 = 0;
+    if (i_procNode->base.state.init_state == 0) {
+        node_process_profile_definition* pprofile =
+            (node_process_profile_definition*)i_procNode->base.profile;
+        i_procNode->base.subtype = fpcBs_MakeOfType(&g_fpcNd_type);
+        i_procNode->nodedraw_method =
+            (nodedraw_method_class*)pprofile->sub_methods;
+        fpcLy_Create(&i_procNode->layer, i_procNode, i_procNode->layer_nodelist, 16);
+        i_procNode->unk_0x1A8 = 0;
     }
 
     save_layer = fpcLy_CurrentLayer();
-    fpcLy_SetCurrentLayer(&procnode->layer);
-    ret = fpcMtd_Create(&procnode->nodedraw_method->base, procnode);
+    fpcLy_SetCurrentLayer(&i_procNode->layer);
+    ret = fpcMtd_Create(&i_procNode->nodedraw_method->base, i_procNode);
     fpcLy_SetCurrentLayer(save_layer);
     return ret;
 }