mm7: mm7_3.cpp comparison

comparison mm7_3.cpp @ 226:c2f2d2644304

DrawDialogueUI NPCData

author	zipi
date	Sun, 17 Feb 2013 11:40:10 +0100
parents	125354fe1b9f
children	99ef31ffa74e 2799737f8a74

comparison

equal deleted inserted replaced

-:e3fd201a58f0
+:c2f2d2644304
 //----- (00476977) --------------------------------------------------------
 void NPCStats::Initialize2()
 {
 char *v4; // eax@4
 char v5; // dl@5
-char *v6; // ecx@5
+int v6; // ecx@5
-int v7; // edi@9
+char *v7; // edi@9
 char *v9; // eax@21
 char v10; // dl@22
-char *v11; // ecx@22
+int v11; // ecx@22
-int v12; // edi@26
+char *v12; // edi@26
 char *v14; // eax@39
 char v15; // dl@40
 int v16; // ecx@40
-int v17; // edi@44
+char *v17; // edi@44
 char v18; // zf@47
 NPCStats_stru0 *v19; // eax@57
 signed int v20; // edx@57
 signed int v21; // ecx@58
-char *v22; // [sp+10h] [bp-10h]@4
+int v22; // [sp+10h] [bp-10h]@4
-char *v23; // [sp+10h] [bp-10h]@21
+int v23; // [sp+10h] [bp-10h]@21
-char *v25; // [sp+14h] [bp-Ch]@4
+int v25; // [sp+14h] [bp-Ch]@4
-char *v26; // [sp+14h] [bp-Ch]@21
+int v26; // [sp+14h] [bp-Ch]@21
 signed int v27; // [sp+14h] [bp-Ch]@39
 //signed int v28; // [sp+18h] [bp-8h]@3
 //signed int v29; // [sp+18h] [bp-8h]@20
 signed int v30; // [sp+18h] [bp-8h]@37
 char *v31; // [sp+1Ch] [bp-4h]@37
 strtok(pNPCTextTXT_Raw, "\r");
 for (uint i = 0; i < 789; ++i)
 {
 v4 = strtok(nullptr, "\r") + 1;
-v22 = nullptr;
+v22 = 0;
-v25 = nullptr;
+v25 = 0;
 do
 {
 v5 = *v4;
 v6 = 0;
 if ( *v4 != 9 )
 do
 {
 if ( !v5 )
 break;
 ++v6;
-v5 = v4[(int)v6];
+v5 = v4[v6];
 }
 while ( v5 != 9 );
 //v2 = 0;
 }
-v7 = (int)&v4[(int)v6];
+v7 = &v4[v6];
-if ( !v4[(int)v6] )
+if ( !v4[v6] )
-v25 = (char *)1;
+v25 = 1;
-*(char *)v7 = 0;
+*v7 = 0;
-if ( v6 == nullptr )
+if ( v6 == 0 )
 {
-v25 = (char *)1;
+v25 = 1;
 }
 else
 {
-if ( v22 == (char *)1 )
+if ( v22 == 1 )
 pNPCTopics[i].pText = RemoveQuotes(v4);
 }
 ++v22;
-v4 = (char *)(v7 + 1);
+v4 = v7 + 1;
 }
-while ( (signed int)(v22 - 1) <= 1 && v25 == nullptr );
+while ( (signed int)(v22 - 1) <= 1 && !v25);// == nullptr );
 }
 if (pNPCTopicTXT_Raw)
 pAllocator->FreeChunk(pNPCTopicTXT_Raw);
 strtok(pNPCTopicTXT_Raw, "\r");
 for (uint i = 0; i < 579; ++i)
 {
 v9 = strtok(nullptr, "\r") + 1;
-v23 = nullptr;
+v23 = 0;
-v26 = nullptr;
+v26 = 0;
 do
 {
 v10 = *v9;
 v11 = 0;
 if ( *v9 != 9 )
 do
 {
 if ( !v10 )
 break;
 ++v11;
-v10 = v9[(int)v11];
+v10 = v9[v11];
 }
 while ( v10 != 9 );
 //v2 = 0;
 }
-v12 = (int)&v9[(int)v11];
+v12 = &v9[v11];
-if ( !v9[(int)v11] )
+if ( !v9[v11] )
-v26 = (char *)1;
+v26 = 1;
-*(char *)v12 = 0;
+*v12 = 0;
-if ( v11 == nullptr )
+if ( v11 == 0 )
 {
-v26 = (char *)1;
+v26 = 1;
 }
 else
 {
-if ( v23 == (char *)1 )
+if ( v23 == 1 )
 pNPCTopics[i].pTopic = RemoveQuotes(v9);
 }
 ++v23;
-v9 = (char *)(v12 + 1);
+v9 = v12 + 1;
 }
-while ( (signed int)(v23 - 1) <= 1 && v26 == nullptr );
+while ( (signed int)(v23 - 1) <= 1 && !v26 );
 }
 if (pNPCDistTXT_Raw)
 pAllocator->FreeChunk(pNPCDistTXT_Raw);
 v15 = v14[v16];
 }
 while ( v15 != 9 );
 v2 = v24;
 }
-v17 = (int)&v14[v16];
+v17 = &v14[v16];
 if ( !v14[v16] )
 v27 = 1;
-*(char *)v17 = 0;
+*v17 = 0;
 if ( !v16 )
 {
 v27 = 1;
 goto LABEL_54;
 }
 }
 if ( v18 )
 *v31 = 10;
 LABEL_54:
 ++v2;
-v14 = (char *)(v17 + 1);
+v14 = v17 + 1;
 v24 = v2;
 }
 while ( (signed int)(v2 - 1) <= 77 && !v27 );
 ++v30;
 ++v31;
 pOutdoorCamera->uPickDepth = band3 * 512;
 //v4 = stru_76E5C8;                             // v4:  0 -> 65536
 for (uint i = 0; i < 16384; ++i)
 //do
 {
-auto v4 = stru_76E5C8 + i;
+auto v4 = stru_76E5C8[i];
 //band3a = 256;
 //v8 = (double)(signed int)((char *)v4 + 256 - (int)stru_76E5C8);
 for (uint j = 0; j < 128; ++j)                  // band3a: 0 -> 128
 {
 v5 = pow(j * 512 + 256, 2.0);
 //*((float *)&v5 + 1) = sqrt(v6 + v5);
 int v7 = floorf(sqrtf(v5 + v6) + 0.5f);//*((float *)&v5 + 1) + 6.7553994e15;
 if (v7 >= v10)
 {
 if (v7 >= v9)
-v4->field_0 = ((v7 >= v3) - 1) & 2;
+v4.field_0 = ((v7 >= v3) - 1) & 2;
 else
-v4->field_0 = 2;
+v4.field_0 = 2;
 }
 else
 {
-v4->field_0 = 1;
+v4.field_0 = 1;
 }
 //band3a += 512;
-v4->distance = v7;
+v4.distance = v7;
-++v4;
+//++v4;
 }
 //while ( band3a < 65792 );
 }
 //while ( (signed int)v4 < (signed int)arary_77E5C8 );
 }
 GUIWindow v52; // [sp+ACh] [bp-68h]@42
 char *Str; // [sp+100h] [bp-14h]@104
 __int16 v54[2]; // [sp+104h] [bp-10h]@2
 unsigned __int16 *v55; // [sp+108h] [bp-Ch]@82
 GUIFont *pOutString; // [sp+10Ch] [bp-8h]@39
-char *pInString; // [sp+110h] [bp-4h]@32
+char *pInString=NULL; // [sp+110h] [bp-4h]@32
 if ( !pDialogueWindow )
 return;
 memcpy(&v51, pDialogueWindow, sizeof(v51));
 pNPC = GetNPCData(uDialogue_SpeakingActorNPC_ID);
 {
 if ( npcid >= 501 )
 {
 MessageBoxW(nullptr, L"NPC id exceeds MAX_DATA!", L"E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Events.cpp:1984", 0);
 }
-return &pNPCStats->pNewNPCData[v1 - 1];
+return &pNPCStats->pNewNPCData[v1];// - 1];
 }
 return &pNPCStats->array_13EF4[npcid - 5000];
 }

Mercurial > mm7

comparison mm7_3.cpp @ 226:c2f2d2644304