mm7: mm7_2.cpp comparison

comparison mm7_2.cpp @ 1590:5792fdafe2f5

Слияние

author	Ritor1
date	Wed, 11 Sep 2013 09:39:09 +0600
parents	f408fbf3d9cc 75fafd8ced59
children	1efbaf1d01c3

comparison

equal deleted inserted replaced

-:f408fbf3d9cc
+:5792fdafe2f5
 #include "IndoorCamera.h"
 #include "Overlays.h"
 #include "Arcomage.h"
 #include "LOD.h"
 #include "Actor.h"
-#include "Allocator.h"
 #include "Events.h"
 #include "Viewport.h"
 #include "FrameTableInc.h"
 #include "Math.h"
 #include "SpriteObject.h"
 if ( v5 )
 {
 do
 {
 v6 = v5->pNext;
-pAllocator->FreeChunk(v5);
+free(v5);
 v5 = v6;
 }
 while ( v6 );
 }
 pDialogueWindow->pControlsHead = 0;
 pRenderer->EndScene();
 pRenderer->Present();
 if ( pRenderer->pRenderD3D )
 pRenderer->pBeforePresentFunction();
 pRenderer->_49F1BC("MM7_Win.Pcx");
-pAllocator->FreeChunk(pFont);
+free(pFont);
 window_SpeakInHouse->Release();
 window_SpeakInHouse = 0;
 if ( v15 == (void *)2 )
 {
 result = pMessageQueue_50CBD0->uNumMessages;
 v2 <<= field_40;
 return v2 | ((a2 & field_0.field_10) << field_48) | ((a2 & field_0.field_14) << field_50) | ((a2 & field_0.field_18) << field_58);
 }
 //----- (00452442) --------------------------------------------------------
-unsigned int __fastcall sub_452442(unsigned __int16 a1, unsigned __int16 a2, int a3, int a4)
+unsigned int __fastcall _452442_color_cvt(unsigned __int16 a1, unsigned __int16 a2, int a3, int a4)
 {
 int v4; // ebx@0
 __int16 v5; // ST14_2@1
 __int16 v6; // dx@1
 int v7; // ecx@1
 char* tmp_pos;
 int decode_step;
 int item_counter;
 if ( pMapStatsTXT_Raw )
-pAllocator->FreeChunk(pMapStatsTXT_Raw);
+free(pMapStatsTXT_Raw);
 pMapStatsTXT_Raw = NULL;
 pMapStatsTXT_Raw = (char *)pEvents_LOD->LoadRaw("MapStats.txt", 0);
 strtok(pMapStatsTXT_Raw, "\r");
 strtok(NULL, "\r");
 strtok(NULL, "\r");
 char* tmp_pos;
 int decode_step;
 int item_counter;
 if ( pHostileTXT_Raw )
-pAllocator->FreeChunk(pHostileTXT_Raw);
+free(pHostileTXT_Raw);
 pHostileTXT_Raw = NULL;
 pHostileTXT_Raw = (char *)pEvents_LOD->LoadRaw("hostile.txt", 0);
 strtok(pHostileTXT_Raw, "\r");
 for (i=0; i<89; ++i)
 	  {
 		  test_string=tmp_pos+1;
 		  } while ((decode_step<92)&&!break_loop);
 	  }
 if ( pHostileTXT_Raw)
 {
-pAllocator->FreeChunk(pHostileTXT_Raw);
+free(pHostileTXT_Raw);
 pHostileTXT_Raw = NULL;
 }
 }
 //----- (00458244) --------------------------------------------------------
 return DefWindowProcA(hWnd, uMsg, wParam, lParam);
 }
 }
 //----- (00464479) --------------------------------------------------------
-void  ResetCursor_Palettes_LODs_Level_Audio_SFT_Windows()
+void ResetCursor_Palettes_LODs_Level_Audio_SFT_Windows()
 {
 int v0; // esi@9
 if (pMouse)
 pMouse->SetCursorBitmap("MICON1");
 }
 sub_46080D();
 if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
 pIndoor->Release();
 else if (uCurrentlyLoadedLevelType == LEVEL_Outdoor)
-pOutdoor->Release2();
+pOutdoor->Release();
 pAudioPlayer->StopChannels(-1, -1);
 pSoundList->_4A9D79(0);
 uCurrentlyLoadedLevelType = LEVEL_null;
 pSpriteFrameTable->ResetSomeSpriteFlags();
 pMiscTimer->Resume();
 pEventTimer->Resume();
 }
 //----- (00464761) --------------------------------------------------------
-void  Game_DeinitializeAndTerminate(int exitCode)
+void Game_DeinitializeAndTerminate(int exitCode)
 {
-int v1; // esi@1
+SetPriorityClass(GetCurrentProcess(), 0x20u);
-HANDLE v2; // eax@1
-v1 = exitCode;
-v2 = GetCurrentProcess();
-SetPriorityClass(v2, 0x20u);
 ResetCursor_Palettes_LODs_Level_Audio_SFT_Windows();
 pGame->Deinitialize();
 pRenderer->Release2();
 if ( !DestroyWindow(hWnd) )
 GetLastError();
 hWnd = 0;
-exit(v1);
+exit(exitCode);
 }
 //----- (004647AB) --------------------------------------------------------
 void FinalInitialization()
 {
 pIcons_LOD->_inlined_sub1();
 }
 // 6BE3A0: using guessed type float flt_6BE3A0;
 //----- (00464839) --------------------------------------------------------
-char  Is_out15odm_underwater()
+char Is_out15odm_underwater()
 {
 return _stricmp(pCurrentMapName, "out15.odm") == 0;
 }
 //----- (00464851) --------------------------------------------------------
-void  SetUnderwaterFog()
+void SetUnderwaterFog()
 {
 day_fogrange_1 = 50;
 day_fogrange_2 = 5000;
 }
 uLevelMapStatsID = v5;
 pGame->uFlags2 &= 0xFFFFFFF7u;
 if ( !_stricmp(pCurrentMapName, "out15.odm") )
 {
 bUnderwater = true;
-pGame->uFlags2 |= 8u;
+pGame->uFlags2 |= GAME_FLAGS_2_ALTER_GRAVITY;
 }
 pParty->floor_face_pid = 0;
 if ( _stricmp(Str1, "blv") )
 PrepareToLoadODM(v9, 0);
 else
 PrepareToLoadBLV(v9);
 pAudioPlayer->SetMapEAX();
 _461103_load_level_sub();
 if ( !_stricmp(pCurrentMapName, "d11.blv") || !_stricmp(pCurrentMapName, "d10.blv") )
 {
-//spawning grounds & good analogue - no loot & exp from monsters
+//spawning grounds & walls of mist - no loot & exp from monsters
 for (uint i = 0; i < uNumActors; ++i)
 {
 pActors[i].pMonsterInfo.uTreasureType = 0;
 pActors[i].pMonsterInfo.uTreasureDiceRolls = 0;
 {
 Log::Warning(L"Render failed to initialize");
 return false;
 }
 }
-pAllocator = Allocator::Create();
-if (!pAllocator->Initialize(48 * 1024))
-{
-MessageBoxW(nullptr,
-L"Unable to Allocate 48Mb of RAM",
-L"More RAM Memory Required", MB_ICONEXCLAMATION);
-return false;
-}
 game_starting_year = 1168;
 pParty = new Party;
 memset(&pParty->pHirelings, 0, sizeof(pParty->pHirelings));
 dword_576E28 = 9;
 }
 void IntegrityTest()
 {
+assert(sizeof(MovieHeader) == 44);
 assert(sizeof(SoundDesc_mm6) == 112);
 assert(sizeof(SoundDesc) == 120);
 assert(sizeof(OverlayDesc) == 8);
 assert(sizeof(ChestDesc) == 36);
 assert(sizeof(ObjectDesc_mm6) == 52);

Mercurial > mm7

comparison mm7_2.cpp @ 1590:5792fdafe2f5