mm7: mm7_4.cpp comparison

comparison mm7_4.cpp @ 782:c47efaf23642

more tidy

author	zipi
date	Sun, 24 Mar 2013 01:45:09 +0000
parents	7994986603d5
children	b3e08a496778 da80bd2922df

comparison

equal deleted inserted replaced

-:d170f23f70d1
+:c47efaf23642
 #include <io.h>
 #include <direct.h>
 #include <assert.h>
 #include "MM7.h"
 #include "MapInfo.h"
 #include "Game.h"
 #include "GUIWindow.h"
 #include "GUIButton.h"
 #include "GUIFont.h"
 #include "Events2D.h"
 #include "stru159.h"
 #include "texts.h"
 #include "Log.h"
 #include "UIHouses.h"
 #include "mm7_data.h"
 //----- (0046CC4B) --------------------------------------------------------
 void __cdecl _46CC4B_check_event_triggers()
 {
 int v0; // eax@1
 LABEL_54:
 *(int *)a4 = 0;
 return dword_720F20[v22];
 }
 //not sure if right- or left-handed coordinate space assumed, so this could be normal of inverse normal
 // for a right-handed system, that would be an inverse normal
 //----- (0046DCC8) --------------------------------------------------------
 void ODM_GetTerrainNormalAt(int pos_x, int pos_z, Vec3_int_ *out)
 {
 out->x = invmag * nx * 65536.0;
 out->y = invmag * ny * 65536.0;
 out->z = invmag * nz * 65536.0;
 }
 }
 //----- (0046DEF2) --------------------------------------------------------
 unsigned int __fastcall sub_46DEF2(signed int a2, unsigned int uLayingItemID)
 {
 unsigned int result; // eax@1
 }
 }
 }
 // 4EC3EC: using guessed type Edge defaultEdge;
 //----- (00487355) --------------------------------------------------------
 bool OutdoorCamera::_487355()
 {
 int v0; // esi@1
 stru148 *v1; // edi@2
 while ( v0 < pOutdoorCamera->numStru148s );
 }
 return result;
 }
 //----- (00487DA9) --------------------------------------------------------
 void __cdecl sub_487DA9()
 {
 char *v0; // eax@1
 --v2;
 }
 while ( v2 );
 }
 // 4EC3EC: using guessed type Edge defaultEdge;
 //----- (0048958E) --------------------------------------------------------
 stru12_MemoryBlock::stru12_MemoryBlock(int a2)
 {
 stru12_MemoryBlock *v2; // esi@1
 while ( v22 < this->field_8C );
 }
 this->field_8C = 0;
 }
 //----- (0048A959) --------------------------------------------------------
 unsigned int ReplaceHSV(unsigned int uColor, float h_replace, float s_replace, float v_replace)
 {
 float r = ((uColor & 0x00FF0000) >> 16) / 255.0f,
 g = ((uColor & 0x0000FF00) >> 8) / 255.0f,
 return (((uint)floorf(r * 255.0f + 0.5f) & 0xFF) << 16) |
 (((uint)floorf(g * 255.0f + 0.5f) & 0xFF) << 8) |
 ((uint)floorf(b * 255.0f + 0.5f) & 0xFF);
 }
 //----- (0048B561) --------------------------------------------------------
 int _48B561_mess_with_scaling_along_z(/*int a1, */float a2)
 {
 //v2 = a2 - 0.5;
 //v5 = v7 + 6.7553994e15;
 //return LODWORD(v5) | (v4 << 16);
 int v5 = floorf((a2 - v4) * 65536.0f + 0.5f);
 return v5 | (v4 << 16);
 }
 //----- (00491E3A) --------------------------------------------------------
 void __cdecl sub_491E3A()
 {
 Player *v0; // ebx@1
 v12 = pIcons_LOD->pFacesLock;
 pIcons_LOD->pFacesLock = 0;
 pIcons_LOD->uNumLoadedFiles = v12;
 }
 // 4ED498: using guessed type char byte_4ED498;
 //----- (0049387A) --------------------------------------------------------
 int CycleCharacter(unsigned int _this)
 {
 signed int result; // eax@1
 }
 }
 return result;
 }
 //----- (00493F79) --------------------------------------------------------
 void sub_493F79(stru351_summoned_item *_this, __int64 a2)
 {
 signed __int64 v2; // ST2C_8@1
 signed __int64 v3; // qax@1
 _this->field_10_expire_week = v5 / 7 & 3;
 _this->field_C_expire_day = (unsigned int)v5 % 0x1C;
 _this->field_14_exprie_month = v6 % 0xC;
 _this->field_18_expire_year = v6 / 0xC + game_starting_year;
 }
 //----- (00494035) --------------------------------------------------------
 void __cdecl _494035_timed_effects__water_walking_damage__etc()
 {
 signed __int64 v0; // qax@1
 }
 return result;
 }
 // 4EE088: using guessed type __int16 word_4EE088_sound_ids[];
 //----- (00494AED) --------------------------------------------------------
 unsigned int PlayerFrameTable::GetFrameIdByExpression(CHARACTER_EXPRESSION_ID expression)
 {
 unsigned int _uNumFrames; // edx@1
 unsigned int result; // eax@1
 fclose(File);
 result = 0;
 }
 return result;
 }
 //----- (00495366) --------------------------------------------------------
 char *__fastcall sub_495366(unsigned __int8 a1, unsigned __int8 a2)
 {
 int v2; // edi@1
 }
 }
 return pTmpBuf2;
 }
 //----- (0049B04D) --------------------------------------------------------
 void stru154::GetFacePlaneAndClassify(ODMFace *a2, BSPVertexBuffer *a3)
 {
 //stru154 *v3; // edi@1
 //signed int v4; // eax@1
 pOutNormal->y = (double)(v5->pFacePlane.vNormal.y & 0xFFFF) / 65535.0f + (double)(v5->pFacePlane.vNormal.y >> 16);
 pOutNormal->z = (double)(v5->pFacePlane.vNormal.z & 0xFFFF) / 65535.0f + (double)(v5->pFacePlane.vNormal.z >> 16);
 *pOutDist = (double)(v5->pFacePlane.dist & 0xFFFF) / 65535.0f + (double)(v5->pFacePlane.dist >> 16);
 }
 //----- (0049D700) --------------------------------------------------------
 unsigned int __fastcall GetMaxMipLevels(unsigned int uDim)
 {
 unsigned int v1; // eax@1
 int v2; // ecx@1
 v3 >>= 1;
 ++v2;
 }
 return v3 == 0 ? v2 : 0;
 }
 //----- (004A19D8) --------------------------------------------------------
 unsigned int BlendColors(unsigned int a1, unsigned int a2)
 {
 /*signed __int64 v2; // ST10_8@1
 v12 = (double)(a1 & 0xFFi64) / 255.0f * (double)(unsigned __int8)a2 / 255.0f * 255.0;
 v13 = v12 + 6.7553994e15;
 return LOBYTE(v13) | ((LOBYTE(v11) | (((v6 << 8) | v9) << 8)) << 8);*/
 }
 //----- (004A46E6) --------------------------------------------------------
 int __fastcall sr_4A46E6_draw_particle_segment(unsigned int x, signed int y, signed int _z, int a4, unsigned int lightColor)
 {
 int v5; // eax@1
 int z; // eax@1
 }
 }
 }
 return z;
 }
 //----- (004A57E9) --------------------------------------------------------
 void __cdecl Present_ColorKey()
 {
 HRESULT v0; // eax@3
 }
 }
 }
 }
 //----- (004A7063) --------------------------------------------------------
 int __thiscall sub_4A7063(unsigned int uDiffuse, float a2)
 {
 float v2; // ST1C_4@1
 double v3; // ST14_8@1
 v10 = 255;
 if ( v10 < 0 )
 v10 = 0;
 return v10 | ((v9 | ((v7 | (v4 << 8)) << 8)) << 8);
 }
 //----- (004AD504) --------------------------------------------------------
 int __fastcall sub_4AD504(signed int sFaceID)
 {
 int result; // eax@1
 ++pBLVRenderParams->field_8C;
 return v17;
 }
 // 4AE491: using guessed type int __fastcall sub_4AE491(int, int);
 //----- (004AE5F1) --------------------------------------------------------
 void __fastcall sub_4AE5F1(unsigned int uFaceID)
 {
 BLVFace *v1; // esi@1
 BLVFaceExtra *v2; // ebx@1
 stru_F8AD28.uNumLightsApplied = 0;
 stru_F8AD28.field_34 = 0;
 return result;
 }
 //----- (004B1447) --------------------------------------------------------
 Player *__fastcall sub_4B1447_party_fine(int a1, int a2, int a3)
 {
 signed int v3; // esi@1
 char v4; // sf@8
 a1.DrawTitleText(pFontComic, 0xCu, 0x4Bu, 0, pSkillNames[v11 / 4 + 12], 3u);
 sprintf(pTmpBuf, "%s\n%d", pGlobalTXT_LocalizationStrings[522], *(&pSpellDatas[0].uNormalLevelMana + 10 * v1));
 a1.DrawTitleText(pFontComic, 0xCu, a1.uFrameHeight - LOBYTE(pFontComic->uFontHeight) - 16, 0, pTmpBuf, 3);
 }
 //----- (004B1784) --------------------------------------------------------
 bool __cdecl sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win()
 {
 Player *pPlayer; // ebx@1
 bool result; // eax@2
 result = 0;
 }
 return result;
 }
 // F8B1E0: using guessed type int dword_F8B1E0;
 //view  item details  in shop?
 //----- (004B1A2D) --------------------------------------------------------
 void __cdecl sub_4B1A2D()
 {
 }
 }
 }
 }
 }
 //----- (004B1ECE) --------------------------------------------------------
 void __cdecl sub_4B1ECE()
 {
 __int16 *v0; // edi@1
 }
 if ( v9 )
 	  v9->uHolderPlayer = v5;
 }
 }
 // 4F08EC: using guessed type int dword_4F08EC[];
 // 722B3C: using guessed type int dword_722B3C;
 // 722B44: using guessed type int dword_722B44;
 // F8B1A8: using guessed type int dword_F8B1A8;
 pPlayers[uActiveCharacter]->PlaySound((PlayerSpeech)61, 0);
 _return:
 pVideoPlayer->_4BF5B2();//HouseVideo
 }
 //----- (004B254D) --------------------------------------------------------
 char *__thiscall _4B254D_SkillMasteryTeacher(int _this)
 {
 Player *v1; // esi@1
 int v2; // edx@1
 sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[534], v21, v24, v27);
 }
 return pTmpBuf2;
 }
 //----- (004B29F2) --------------------------------------------------------
 const char * ContractSelectText( int pEventCode )
 	{
 static const int dialogue_base=110;
 contract_approved = 0;
 else
 {
 return pNPCTopics[dialogue_base+12].pText;
 }
 }
 //----- (004B2A74) --------------------------------------------------------
 void SimpleHouseAndBoatsDialog()
 {
 char *v0; // esi@3
 v49 = FitTextInAWindow(ptr_F8B1E8, v47, &w, 0xDu, 0);
 a1.DrawText(v47, 13, 354 - v48, 0, v49, 0, 0, 0);
 }
 }
 //----- (004B36CC) --------------------------------------------------------
 void CreateButtonInColumn( int column_pos, unsigned int control_id )
-	{
+{
 pDialogueWindow->CreateButton( 480, 30 * column_pos + 146, 140, 30,  1,  0, 0x195u,  control_id,  0,   "",   0);
 }
 //----- (004B3A72) --------------------------------------------------------
 void sub_4B3A72( int a1 )
 	{
 int num_buttons; // esi@1
 pGlobalTXT_LocalizationStrings[406],  0); //"Hire"
 pDialogueWindow->_41D08F(v0 + 1, 1, 0, 2);
 dialog_menu_id = HOUSE_DIALOGUE_OTHER;
 }
 //----- (004B4224) --------------------------------------------------------
 void _4B4224_UpdateNPCTopics( int _this )
 	{
 int num_menu_buttons; // ebx@1
 int i; // ebp@5
 dialog_menu_id = HOUSE_DIALOGUE_MAIN;
 }
 }
 //----- (004B46A5) --------------------------------------------------------
 char __fastcall DrawTextAtStatusBar(const char *sText, int font_color)
 {
 int v4; // eax@1
 pRenderer->DrawTextureRGB(0, 352, pTexture_StatusBar);
 v1 = 0;
 for ( i = 0; i < a1; ++i )
 v1 += i + 1;
 return 1000 * v1;
 }
 //----- (004BC49B) --------------------------------------------------------
 void OnSelectNPCDialogueOption(DIALOGUE_TYPE newDialogueType)
 {
 	//unsigned int v1; // esi@1
 	if ( !dword_7241C8 )
 		pGame->Draw();
 	dword_7241C8 = 0;
 }
 //----- (004BDAAF) --------------------------------------------------------
 bool __fastcall sub_4BDAAF(ItemGen *a1, int _2da_idx)
 {
 int v2; // edx@1
 unsigned int v3; // esi@1
 	  }
 }
 return 0;
 */
 }
 //----- (004B6478) --------------------------------------------------------
 void sub_4B6478()
 {
 GUIWindow *v0; // ebx@1
 }
 while ( v35 <v29->pNumPresenceButton + v29->pStartingPosActiveItem );
 }
 return;
 }
 //----- (00405CFF) --------------------------------------------------------
 void stru262_TurnBased::End(bool bPlaySound)
 {
 stru262_TurnBased *v2; // edi@1
 {
 v1->_406FA8();
 }
 }
 }
 //----- (0043FDED) --------------------------------------------------------
 void PrepareActorRenderList_BLV()
 {
 RenderBillboard *v0; // esi@0
 _continue:
 ;
 }
 }
 //----- (00444732) --------------------------------------------------------
 char *GetEventHintString(unsigned int uEventID)
 {
 signed int event_index; // edx@1
 int event_pos; // esi@4
 result = &pLevelStr[pLevelStrOffsets[EVT_BYTE(last_evt->v5)]];
 }
 return result;
 }
 //----- (00444839) --------------------------------------------------------
 unsigned int __fastcall sub_444839_move_map(unsigned int a1, int a2, int x, int y, int z, int directiony, int directionx, int a8, const char *pLocationName)
 {
 unsigned int v9; // ebx@1
 result = v23;
 if ( v23 )
 uCurrentHouse_Animation = v23;
 return result;
 }

Mercurial > mm7

comparison mm7_4.cpp @ 782:c47efaf23642