DESKTOP-AB9OQPJ\RED-10 3 lat temu
rodzic
commit
9fd82f205a

+ 2 - 1
jni/Android.mk

@@ -459,7 +459,8 @@ LOCAL_SRC_FILES :=  ANIMHashName.cpp                        \
                     gl3stub.c                               \
                     GetAttribute.cpp                        \
                     sub.cpp                                     \
-                    TGfxCrowdState.cpp
+                    TGfxCrowdState.cpp                      \
+                    CFESShopHelper.cpp
 
 LOCAL_ARM_NEON := true
 LOCAL_CFLAGS   += -fshort-wchar -fvisibility=default  -fomit-frame-pointer -fno-stack-protector

+ 1 - 1
jni/CBallProj.cpp

@@ -1,5 +1,5 @@
 #include "CBallProj.h"
-
+CBallProj cBallProj;
 //-------------------------------------------------------------------------------------------------
 //00158AF8
 int CBallProj::GetTimeHeight(int) {

+ 2 - 0
jni/CFESShopHelper.cpp

@@ -0,0 +1,2 @@
+#include "CFESShopHelper.h"
+int CFESShopHelper::ms_eTrigger;

+ 2 - 0
jni/CFESShopHelper.h

@@ -33,6 +33,8 @@ public:
   static void Init();                                   // 00130998
   static void Process();                                // 00130f44
   static void RestorePurchase();                        // 001310c0
+
+  static int ms_eTrigger;  // 00336558
 };
 
 #endif  //_CFESGAME_H_

+ 4 - 4
jni/CGFXSpec.cpp

@@ -49,7 +49,7 @@ GFXSPEC_Specification GFXSPEC_tSpecification_AndroidLow{
     false,                   //bFloatEnvMap_3E
     false,                   //bDynNormMap_3F
     0,                       //eAntiAliasing_40
-    0,                       //ePlayerLightingQuality_44
+    EPlayerShader_Quality_0,                       //ePlayerLightingQuality_44
     EPitchShader_Quality_0,  //eHighQualityGrass_48
     0,                       //eCrowdQuality_4C
     -1,                      //iMinMaxResolution_50
@@ -89,7 +89,7 @@ GFXSPEC_Specification GFXSPEC_tSpecification_AndroidMed{
     false,                   //bFloatEnvMap_3E
     false,                   //bDynNormMap_3F
     0,                       //eAntiAliasing_40
-    1,                       //ePlayerLightingQuality_44
+    EPlayerShader_Quality_1,                       //ePlayerLightingQuality_44
     EPitchShader_Quality_1,  //eHighQualityGrass_48
     0,                       //eCrowdQuality_4C
     -1,                      //iMinMaxResolution_50
@@ -129,7 +129,7 @@ GFXSPEC_Specification GFXSPEC_tSpecification_AndroidHigh{
     true,                    //bFloatEnvMap_3E
     true,                    //bDynNormMap_3F
     0,                       //eAntiAliasing_40
-    1,                       //ePlayerLightingQuality_44
+    EPlayerShader_Quality_1,                       //ePlayerLightingQuality_44
     EPitchShader_Quality_2,  //eHighQualityGrass_48
     2,                       //eCrowdQuality_4C
     -1,                      //iMinMaxResolution_50
@@ -169,7 +169,7 @@ GFXSPEC_Specification GFXSPEC_tSpecification_AndroidHighest{
     true,                    //bFloatEnvMap_3E
     true,                    //bDynNormMap_3F
     3,                       //eAntiAliasing_40
-    2,                       //ePlayerLightingQuality_44
+    EPlayerShader_Quality_2,                       //ePlayerLightingQuality_44
     EPitchShader_Quality_3,  //eHighQualityGrass_48
     3,                       //eCrowdQuality_4C
     -1,                      //iMinMaxResolution_50

+ 2 - 2
jni/CGFXSpec.h

@@ -5,7 +5,7 @@
 #include "CFTTXmlReaderNode.h"
 #include "CFTTAndroidGraphicsSettings.h"
 #include "CPitchShader.h"
-
+#include "CPlayerShader.h"
 /*
 0018E728 CGFXSpec::Initialise()
 0018E878 CGFXSpec::Platform_InspectDevice()
@@ -46,7 +46,7 @@ struct GFXSPEC_Specification {
   bool bFloatEnvMap_3E;
   bool bDynNormMap_3F;
   int eAntiAliasing_40;
-  int ePlayerLightingQuality_44;
+  EPlayerShader_Quality  ePlayerLightingQuality_44;
   EPitchShader_Quality eHighQualityGrass_48;
   int eCrowdQuality_4C;
   int iMinMaxResolution_50;

+ 1 - 1
jni/CGfxCharacter.h

@@ -295,5 +295,5 @@ public:
   static int CHAR_MEGA_NUM_X;                // 0033ECC0
   static int CHAR_MEGA_NUM_Y;                // 0033ECC4
 };
-
+extern unsigned int s_uHairColours[8];
 #endif  //_CGFXCHARACTER_H_

+ 3 - 1
jni/CPlayer.cpp

@@ -241,7 +241,9 @@ __attribute__((noinline)) ushort CPlayer::GetRotPoint(TPoint point1) {
 }
 //-------------------------------------------------------------------------------------------------
 // 0016EC34
-__attribute__((noinline)) void CPlayer::SetFace(int i1) {}
+__attribute__((noinline)) void CPlayer::SetFace(int i1) {
+  LOGE("CPlayer::SetFace%p%x",this,i1);
+}
 //-------------------------------------------------------------------------------------------------
 // 0016EC3A
 __attribute__((noinline)) void CPlayer::SetFace(int i1, int i2) {

+ 1 - 1
jni/CStageManager.h

@@ -165,7 +165,7 @@ struct TStruct_84 {
   int filed_28;
   int OpponentTeam_2c;
   wchar_t Location_30[0x20];
-  int TournamentType_70;
+  ETournamentType TournamentType_70;
   int MatchType_74;
   int Weather_78;
   int SleeveLength_7c;

+ 62 - 80
jni/CStoryHUD.cpp

@@ -1,114 +1,96 @@
 #include "CStoryHUD.h"
 
 //-------------------------------------------------------------------------------------------------
-//001E42F4
-void CStoryHUD::Init() {
-}
+// 001E42F4
+void CStoryHUD::Init() {}
 //-------------------------------------------------------------------------------------------------
-//001E4468
-void CStoryHUD::Shutdown() {
-}
+// 001E4468
+void CStoryHUD::Shutdown() {}
 //-------------------------------------------------------------------------------------------------
-//001E448C
-void CStoryHUD::UpdateInfoText(int, EHudTextType) {
-}
+// 001E448C
+void CStoryHUD::UpdateInfoText(int, EHudTextType) {}
 //-------------------------------------------------------------------------------------------------
-//001E4498
-void CStoryHUD::UpdateInfoText(wchar_t const *, EHudTextType) {
-}
+// 001E4498
+void CStoryHUD::UpdateInfoText(wchar_t const *, EHudTextType) {}
 //-------------------------------------------------------------------------------------------------
-//001E44A4
-void CStoryHUD::ResetInfoText() {
-}
+// 001E44A4
+void CStoryHUD::ResetInfoText() {}
 //-------------------------------------------------------------------------------------------------
-//001E44BA
+// 001E44BA
 void CStoryHUD::FadeInfoText() {
-//  filed_14->FadeLastText();
+  //  filed_14->FadeLastText();
 }
 //-------------------------------------------------------------------------------------------------
-//001E44C0
-void CStoryHUD::PositionNewspaper(int, float &, float &, float &, float &, float &, float &, float &, float &) const{
-}
+// 001E44C0
+void CStoryHUD::PositionNewspaper(int, float &, float &, float &, float &,
+                                  float &, float &, float &, float &) const {}
 //-------------------------------------------------------------------------------------------------
-//001E461C
-void CStoryHUD::AddNewspaperParticles() {
-}
+// 001E461C
+void CStoryHUD::AddNewspaperParticles() {}
 //-------------------------------------------------------------------------------------------------
-//001E467C
-void CStoryHUD::RenderNewspaper() {
-}
+// 001E467C
+void CStoryHUD::RenderNewspaper() {}
 //-------------------------------------------------------------------------------------------------
-//001E4AE8
-void CStoryHUD::SocialNetworkingCB(int, void *) {
-}
+// 001E4AE8
+void CStoryHUD::SocialNetworkingCB(int, void *) {}
 //-------------------------------------------------------------------------------------------------
-//001E4AF4
-void CStoryHUD::Continue(int) {
-}
+// 001E4AF4
+void CStoryHUD::Continue(int) {}
 //-------------------------------------------------------------------------------------------------
-//001E4B6C
-int CStoryHUD::Process() {
-	return 0;
-}
+// 001E4B6C
+int CStoryHUD::Process() { return 0; }
 //-------------------------------------------------------------------------------------------------
-//001E4F30
-void CStoryHUD::ProcessSuccess() {
-}
+// 001E4F30
+void CStoryHUD::ProcessSuccess() {}
 //-------------------------------------------------------------------------------------------------
-//001E50C8
-void CStoryHUD::SetAwardedMedal() {
-}
+// 001E50C8
+void CStoryHUD::SetAwardedMedal() {}
 //-------------------------------------------------------------------------------------------------
-//001E5178
-void CStoryHUD::UpdateVisualFeedback() {
-}
+// 001E5178
+void CStoryHUD::UpdateVisualFeedback() {}
 //-------------------------------------------------------------------------------------------------
-//001E51A8
+// 001E51A8
 void CStoryHUD::ClearVisualFeedback() {
+  LOGE("CStoryHUD::ClearVisualFeedback%p", this);
 }
 //-------------------------------------------------------------------------------------------------
-//001E51C0
-void CStoryHUD::RenderSuccess() {
-}
+// 001E51C0
+void CStoryHUD::RenderSuccess() {}
 //-------------------------------------------------------------------------------------------------
-//001E5290
-void CStoryHUD::RenderInfo() {
-}
+// 001E5290
+void CStoryHUD::RenderInfo() {}
 //-------------------------------------------------------------------------------------------------
-//001E5294
-void CStoryHUD::RenderReplayHUD() {
-}
+// 001E5294
+void CStoryHUD::RenderReplayHUD() {}
 //-------------------------------------------------------------------------------------------------
-//001E5298
-void CStoryHUD::Render() {
-}
+// 001E5298
+void CStoryHUD::Render() {}
 //-------------------------------------------------------------------------------------------------
-//001E5498
-void CStoryHUD::RenderVisualFeedback() {
-}
+// 001E5498
+void CStoryHUD::RenderVisualFeedback() {}
 //-------------------------------------------------------------------------------------------------
-//001E5A70
-void CStoryHUD::RenderHUD() {
-}
+// 001E5A70
+void CStoryHUD::RenderHUD() {}
 //-------------------------------------------------------------------------------------------------
-//001E5A7C
-void CStoryHUD::SetVideoPlayingMessageBox() {
-}
+// 001E5A7C
+void CStoryHUD::SetVideoPlayingMessageBox() {}
 //-------------------------------------------------------------------------------------------------
-//001E5A9C
-void CStoryHUD::CreateNPPhoto() {
-}
+// 001E5A9C
+void CStoryHUD::CreateNPPhoto() {}
 //-------------------------------------------------------------------------------------------------
-//001E5CB8
-void CStoryHUD::AddVisualFeedback(wchar_t const *, char const *, TPoint3D, TPoint3D, int, float, uint, int, EVFEffect, int) {
-}
+// 001E5CB8
+void CStoryHUD::AddVisualFeedback(wchar_t const *a1, char const *a2,
+                                  TPoint3D a3, TPoint3D a4, int a5, float a6,
+                                  uint a7, int a8, EVFEffect a9, int a10) {
+	LOGE("%x%x%x%x%x%x%x%x",a1,a2,a5,a6,a7,a8,a9,a10);
+	LOGE("%x%x%x",a3.dz_8,a3.point_0.dx_0,a3.point_0.dy_4);
+	LOGE("%x%x%x",a4.dz_8,a4.point_0.dx_0,a4.point_0.dy_4);
+	LOGE("CStoryHUD::AddVisualFeedback%p",this);
+								  }
 //-------------------------------------------------------------------------------------------------
-//001E5D6C
-int CStoryHUD::PassedVideoTime() {
-	return 0;
-}
+// 001E5D6C
+int CStoryHUD::PassedVideoTime() { return 0; }
 //-------------------------------------------------------------------------------------------------
-//001E5DA0
-void CStoryHUD::UpdateAdvertTimings() {
-}
+// 001E5DA0
+void CStoryHUD::UpdateAdvertTimings() {}
 //-------------------------------------------------------------------------------------------------

+ 2 - 2
jni/CUIMsgShopButton.cpp

@@ -18,8 +18,8 @@ void CUIMsgShopButton::RenderPost() {
 }
 //-------------------------------------------------------------------------------------------------
 //00142762
-int CUIMsgShopButton::Process() {
-  return rand() % 10;
+EUITileAction CUIMsgShopButton::Process() {
+  return EUITileAction_0;
 }
 //-------------------------------------------------------------------------------------------------
 //00142766

+ 3 - 3
jni/CUIMsgShopButton.h

@@ -2,7 +2,7 @@
 #ifndef _CUIMSGSHOPBUTTON_H_
 #define _CUIMSGSHOPBUTTON_H_
 
-#include "CMessageBox.h"
+#include "CUITile.h"
 
 /*
 0014260C CUIMsgShopButton::CUIMsgShopButton(int,int)
@@ -13,12 +13,12 @@
 00142766 CUIMsgShopButton::SetCost(int)
 */
 
-class CUIMsgShopButton : public CMessageBox {
+class CUIMsgShopButton : public CUITile {
 public:
   CUIMsgShopButton(int, int);  // 0014260C
   ~CUIMsgShopButton();         // 0014276C
   virtual void Render();       // 00142650
-  virtual int Process();       // 00142762
+  virtual EUITileAction Process();       // 00142762
 
   void RenderPost();  // 00142760
   void SetCost(int);  // 00142766

+ 7 - 0
jni/CUITileActions.h

@@ -67,7 +67,14 @@ enum EUITileAction {
   EUITileAction_53 = 53,
   EUITileAction_55 = 55,
   EUITileAction_56 = 56,
+  EUITileAction_58=58,
+  EUITileAction_59=59,
+  EUITileAction_60=60,
+  EUITileAction_61=61,
+  EUITileAction_62=62,
+  EUITileAction_63=63,
   EUITileAction_65 = 65,
+
   EUITileAction_66 = 66,
 };
 

+ 2 - 1
jni/SNDGAME.cpp

@@ -81,7 +81,8 @@ void SNDGAME_Crowd_StopReactions() {
 }
 //-------------------------------------------------------------------------------------------------
 //001D2058
-void SNDGAME_Crowd_PlayReaction(int) {
+void SNDGAME_Crowd_PlayReaction(int a1) {
+	LOGE("SNDGAME_Crowd_PlayReaction%x",a1);
 }
 //-------------------------------------------------------------------------------------------------
 //001D20A8

+ 3 - 11
jni/TStoryConfig.h

@@ -27,7 +27,7 @@ struct TPromo {
   int ID_b54;
   long DateStart_b58;
   long EDateEnd_b5c;
-  int Depend_b64;
+  int Depend_b60;
   int Users_b64;
   char IapID_b68[0x20];
   int ProductIndex_b88;
@@ -124,16 +124,8 @@ struct TStoryConfig {
   struct TPromo PromoNodeList_b50[20];
   char UnlimitedIapID_53D0[256];
   int Unlimited_54D0;
-  int PlayerCustomisationNumber_54D4[64];
-  int PlayerCustomisationHairStyle_55D4[64];
-  int PlayerCustomisationHairColour_56D4[64];
-  int PlayerCustomisationFacialHair_57D4[64];
-  int PlayerCustomisationBoots_58D4[64];
-  int PlayerCustomisationNumberCount_59D4;
-  int PlayerCustomisationHairStyleCount_59D8;
-  int PlayerCustomisationHairColourCount_59DC;
-  int PlayerCustomisationFacialHairCount_59E0;
-  int PlayerCustomisationBootsCount_59e4;
+  int PlayerCustomisationNumber_54D4[5][64];
+  int PlayerCustomisationNumberCount_59D4[5];
   int PlayerCustomisationShirtNumbers_59E8[64];
   int InitRangeStart_5AE8;
   int InitRangeEnd_5AEC;

+ 4 - 3
jni/XMATH.cpp

@@ -175,13 +175,13 @@ uint64_t XMATH_Mag(TPoint const *p_tpoint_r0) {
 //-------------------------------------------------------------------------------------------------
 //001f329e	XMATH_Mag	16 经过单元测试,功能正常
 float XMATH_Mag(TPointF const *a1) {
-  LOGE("XMATH_Mag%x",a1);
+  LOGE("XMATH_Mag%p",a1);
   return (float)rand();
 }
 //-------------------------------------------------------------------------------------------------
 //001F32D8
 uint64_t XMATH_Mag2D(TPoint3D const *pPoint3D0) {
-  LOGE("XMATH_Mag2D%x",pPoint3D0);
+  LOGE("XMATH_Mag2D%p",pPoint3D0);
   return rand();
 }
 //-------------------------------------------------------------------------------------------------
@@ -350,7 +350,8 @@ int XMATH_Distance3DSq(const TPoint3D *a1, const TPoint3D *a2) {
 //-------------------------------------------------------------------------------------------------
 //001f3d78 ^_^ 经过单元测试,功能正常
 uint64_t XMATH_Distance(const TPoint *a1, const TPoint *a2) {
-  return 1;
+  LOGE("%p%p%x%x%x%x",a1,a2,a1->dx_0,a1->dy_4,a2->dx_0,a2->dy_4);
+  return rand();
 }
 //-------------------------------------------------------------------------------------------------
 //001F3D94

+ 1 - 1
jni/XSYS.cpp

@@ -98,7 +98,7 @@ int XSYS_Random(int a1) {
   }
   // loc_1F4F5C
   //LOGE("rand=%x",rand);
-  rand=0;
+  
   return rand;
 }
 //-------------------------------------------------------------------------------------------------

+ 6 - 0
jni/str_conv.cpp

@@ -462,4 +462,10 @@ size_t strlcpy(unsigned char* a1, unsigned char* a2, int a3) {
 const wchar_t* xstrstr(wchar_t const*a1, wchar_t const*a2){
   LOGE("xstrstr=%s%s",a1,a2);
   return a1+rand()%10;
+}
+
+size_t xstrlcat(wchar_t*a1, const wchar_t*a2, unsigned int a3)
+{
+  LOGE("xstrstr=%s%s%x",a1,a2,a3);
+  return rand()%10;
 }

Plik diff jest za duży
+ 0 - 0
obj/local/armeabi-v7a/objs/Hero/linker.list


Plik diff jest za duży
+ 0 - 0
obj/local/armeabi-v7a/objs/Hero/linker.list.tmp


Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików