Mercurial > mm7
changeset 2:89240115d392
MainMenuBtn(work)
| author | Ritor1 |
|---|---|
| date | Sun, 13 Jan 2013 01:47:51 +0600 |
| parents | 98b091cbabf7 |
| children | bf31c505f4d3 |
| files | Debug/AIL.obj Debug/Actor.obj Debug/Allocator.obj Debug/Arcomage.obj Debug/AudioPlayer.obj Debug/BSPModel.obj Debug/Bink_Smacker.obj Debug/CL.read.1.tlog Debug/CL.write.1.tlog Debug/Chest.obj Debug/DecalBuilder.obj Debug/Events.obj Debug/FrameTableInc.obj Debug/GUIButton.obj Debug/GUIFont.obj Debug/GUIProgressBar.obj Debug/GUIWindow.obj Debug/Game.obj Debug/GameUIs.obj Debug/GammaControl.obj Debug/Indoor.obj Debug/IndoorCamera.obj Debug/IndoorCameraD3D.obj Debug/Items.obj Debug/Keyboard.obj Debug/LOD.obj Debug/LayingItem.obj Debug/LightmapBuilder.obj Debug/LightsStack.obj Debug/Log.obj Debug/MM7.exe Debug/MM7.exe.embed.manifest Debug/MM7.exe.embed.manifest.res Debug/MM7.exe.intermediate.manifest Debug/MM7.ilk Debug/MM7.lastbuildstate Debug/MM7.log Debug/MM7.pdb Debug/MM7_manifest.rc Debug/Might and Magic Trilogy.res Debug/Monsters.obj Debug/Mouse.obj Debug/OSAPI.obj Debug/Outdoor.obj Debug/Overlays.obj Debug/PaletteManager.obj Debug/ParticleEngine.obj Debug/Party.obj Debug/Player.obj Debug/RCa04864 Debug/Random.obj Debug/Render.obj Debug/SaveLoad.obj Debug/Spells.obj Debug/Sprites.obj Debug/Texture.obj Debug/TileFrameTable.obj Debug/Time.obj Debug/VideoPlayer.obj Debug/Vis.obj Debug/Weather.obj Debug/cl.command.1.tlog Debug/lib/zlib/adler32.obj Debug/lib/zlib/compress.obj Debug/lib/zlib/crc32.obj Debug/lib/zlib/deflate.obj Debug/lib/zlib/infblock.obj Debug/lib/zlib/infcodes.obj Debug/lib/zlib/inffast.obj Debug/lib/zlib/inflate.obj Debug/lib/zlib/inftrees.obj Debug/lib/zlib/infutil.obj Debug/lib/zlib/trees.obj Debug/lib/zlib/uncompr.obj Debug/lib/zlib/zutil.obj Debug/link-cvtres.read.1.tlog Debug/link-cvtres.write.1.tlog Debug/link.command.1.tlog Debug/link.read.1.tlog Debug/link.write.1.tlog Debug/mm6text.cas Debug/mm6text.non Debug/mm7_1.obj Debug/mm7_2.obj Debug/mm7_3.obj Debug/mm7_4.obj Debug/mm7_5.obj Debug/mm7_6.obj Debug/mm7_data.obj Debug/mt.command.1.tlog Debug/mt.read.1.tlog Debug/mt.write.1.tlog Debug/rc.command.1.tlog Debug/rc.read.1.tlog Debug/rc.write.1.tlog Debug/stru10.obj Debug/stru6.obj Debug/stru9.obj Debug/vc100.idb Debug/vc100.pdb GUIButton.cpp GUIButton.h GUIWindow.h GameUIs.cpp MM7.sdf MM7.suo MM7.vcxproj MM7.vcxproj.user ipch/mm7-91968f84/mm7-c5fbce5d.ipch mm7_2.cpp mm7_5.cpp mm7_data.cpp mm7_data.h |
| diffstat | 113 files changed, 128 insertions(+), 1457 deletions(-) [+] |
line wrap: on
line diff
--- a/Debug/MM7.exe.embed.manifest Sat Jan 12 11:30:46 2013 +0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> - <security> - <requestedPrivileges> - <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel> - </requestedPrivileges> - </security> - </trustInfo> -</assembly> \ No newline at end of file
--- a/Debug/MM7.exe.intermediate.manifest Sat Jan 12 11:30:46 2013 +0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' standalone='yes'?> -<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'> - <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> - <security> - <requestedPrivileges> - <requestedExecutionLevel level='asInvoker' uiAccess='false' /> - </requestedPrivileges> - </security> - </trustInfo> -</assembly>
--- a/Debug/MM7.lastbuildstate Sat Jan 12 11:30:46 2013 +0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -#v4.0:v100 -Debug|Win32|D:\Моя папка\MM7 original\|
--- a/Debug/MM7.log Sat Jan 12 11:30:46 2013 +0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -Построение начато 12.01.2013 9:43:01. - 1>Проект "D:\Моя папка\MM7 original\MM7.vcxproj" в узле 2 (целевые объекты build). - 1>InitializeBuildStatus: - Создание "Debug\MM7.unsuccessfulbuild", так как было задано "AlwaysCreate". - ClCompile: - Для всех выходных данных обновления не требуется. - Для всех выходных данных обновления не требуется. - ResourceCompile: - Для всех выходных данных обновления не требуется. - ManifestResourceCompile: - Для всех выходных данных обновления не требуется. - Link: - Для всех выходных данных обновления не требуется. - Manifest: - Для всех выходных данных обновления не требуется. - FinalizeBuildStatus: - Файл "Debug\MM7.unsuccessfulbuild" удаляется. - Обращение к "Debug\MM7.lastbuildstate". - 1>Построение проекта "D:\Моя папка\MM7 original\MM7.vcxproj" завершено (целевые объекты build). - -Построение успешно завершено. - -Затраченное время: 00:00:00.12
--- a/Debug/link-cvtres.read.1.tlog Sat Jan 12 11:30:46 2013 +0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ - \ No newline at end of file
--- a/Debug/link-cvtres.write.1.tlog Sat Jan 12 11:30:46 2013 +0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ - \ No newline at end of file
--- a/Debug/mm6text.cas Sat Jan 12 11:30:46 2013 +0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,203 +0,0 @@ -//Gender I R D V T P X -//Dubles names -F -M -M -F -M -F -M -F -M -M -F -F -F -M -F -F -F -F -M -F -F -F -F -F -M -F -M -M -M -M -M -F -F -F -M c c c c -F -F -F -F -F -F -F -F -M -M -M -M -M -M -F -M -M -M -M -M -M -M -M -M -M -M -M -M -M -M -F -M -M -F -M -F -M -F -F -M -M -F -F -M -F @ -U -F -F -M -F -M -F -M -M -M -M -M -M -//Male -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -M * * * * * * -//Female -F * * * * * * -F * * * * * * -F * * * * * * -F * * * * * * -F * * * * * * -F * * * * * * -F * * * * * * -F * * * * * * -F * * * * * * -F * * * * * * -F * * * * * * -F * * * * * * -F * * * * * * -F * * * * * * -F * * * * * * -F * * * * * * -F * * * * * * -F * * * * * * -F * * * * * * -F * * * * * * -F * * * * * * -F * * * * * * -F * * * * * * -//Middle -U * * * * * * -U * * * * * * -U * * * * * * -U * * * * * * -U * * * * * * -U * * * * * * -U * * * * * * -U * * * * * * -U * * * * * * -U * * * * * * -U * * * * * * -U * * * * * * -U * * * * * * -U * * * * * * -U * * * * * * -U * * * * * * -U * * * * * * -U * * * * * * -U * * * * * * -
--- a/Debug/mm6text.non Sat Jan 12 11:30:46 2013 +0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,747 +0,0 @@ -//Male Female Middle - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file
--- a/GUIButton.cpp Sat Jan 12 11:30:46 2013 +0600 +++ b/GUIButton.cpp Sun Jan 13 01:47:51 2013 +0600 @@ -96,10 +96,10 @@ struct GUIButton *pBtn_SliderLeft; -struct GUIButton *ptr_69BD58; -struct GUIButton *ptr_69BD5C; -struct GUIButton *ptr_69BD60; -struct GUIButton *ptr_69BD64; +struct GUIButton *pBtnDownArrow; +struct GUIButton *pBtnArrowUp; +struct GUIButton *pBtnCancel; +struct GUIButton *pBtnLoadSlot; GUIButton *pCreationUI_BtnPressRight2[4];
--- a/GUIButton.h Sat Jan 12 11:30:46 2013 +0600 +++ b/GUIButton.h Sun Jan 13 01:47:51 2013 +0600 @@ -122,10 +122,10 @@ extern struct GUIButton *pBtn_SliderLeft; -extern struct GUIButton *ptr_69BD58; -extern struct GUIButton *ptr_69BD5C; -extern struct GUIButton *ptr_69BD60; -extern struct GUIButton *ptr_69BD64; +extern struct GUIButton *pBtnDownArrow; +extern struct GUIButton *pBtnArrowUp; +extern struct GUIButton *pBtnCancel; +extern struct GUIButton *pBtnLoadSlot; extern GUIButton *pCreationUI_BtnPressRight2[4];
--- a/GUIWindow.h Sat Jan 12 11:30:46 2013 +0600 +++ b/GUIWindow.h Sun Jan 13 01:47:51 2013 +0600 @@ -148,11 +148,11 @@ UIMSG_PlayerCreationVoiceBack = 0x90, UIMSG_PlayerCreationVoiceForward = 0x91, UIMSG_StartNPCDialogue = 0xA1, - UIMSG_A2 = 0xA2, - UIMSG_A3 = 0xA3, - UIMSG_A4 = 0xA4, + UIMSG_ArrowUp = 0xA2, + UIMSG_DownArrow = 0xA3, + UIMSG_LoadSlot = 0xA4, UIMSG_A5 = 0xA5, - UIMSG_A6 = 0xA6, + UIMSG_Cancel = 0xA6, UIMSG_A7 = 0xA7, UIMSG_A8 = 0xA8, UIMSG_A9 = 0xA9,
--- a/GameUIs.cpp Sat Jan 12 11:30:46 2013 +0600 +++ b/GameUIs.cpp Sun Jan 13 01:47:51 2013 +0600 @@ -71,9 +71,9 @@ pGUIWindow_CurrentMenu->DrawText(pFontSmallnum, 25, 199, 0, pGlobalTXT_LocalizationStrings[505], 0, 0, 0);// "Reading..." pRenderer->Present(); pSavegameList->Initialize(0); - if ( dword_6A0C9C > (signed int)uNumSavegameFiles ) + if ( pSaveListPosition > (signed int)uNumSavegameFiles ) { - dword_6A0C9C = 0; + pSaveListPosition = 0; uLoadGameUI_SelectedSlot = 0; } pLODFile.AllocSubIndicesAndIO(0x12C, 0); @@ -147,13 +147,13 @@ pGUIWindow_CurrentMenu->CreateButton(21, 282, 191, 18, 1, 0, 0xA5, 4, 0, "", 0); pGUIWindow_CurrentMenu->CreateButton(21, 303, 191, 18, 1, 0, 0xA5, 5, 0, "", 0); pGUIWindow_CurrentMenu->CreateButton(21, 324, 191, 18, 1, 0, 0xA5, 6, 0, "", 0); - ptr_69BD64 = pGUIWindow_CurrentMenu->CreateButton(241, 302, 105, 40, 1, 0, 0xA4, 0, 0, "", + pBtnLoadSlot = pGUIWindow_CurrentMenu->CreateButton(241, 302, 105, 40, 1, 0, 0xA4, 0, 0, "", (Texture *)(uTextureID_LS_ != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_LS_] : 0), 0); - ptr_69BD60 = pGUIWindow_CurrentMenu->CreateButton(350, 302, 105, 40, 1, 0, 0xA6, 0, 0, "", + pBtnCancel = pGUIWindow_CurrentMenu->CreateButton(350, 302, 105, 40, 1, 0, 0xA6, 0, 0, "", (Texture *)(uTextureID_x_d != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_x_d] : 0), 0); - ptr_69BD5C = pGUIWindow_CurrentMenu->CreateButton(215, 199, 17, 17, 1, 0, 0xA2, 0, 0, "", + pBtnArrowUp = pGUIWindow_CurrentMenu->CreateButton(215, 199, 17, 17, 1, 0, 0xA2, 0, 0, "", (Texture *)(uTextureID_AR_UP_DN != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_AR_UP_DN] : 0), 0); - ptr_69BD58 = pGUIWindow_CurrentMenu->CreateButton(215, 0x143, 0x11, 0x11, 1, 0, 0xA3, uNumSavegameFiles, 0, "", + pBtnDownArrow = pGUIWindow_CurrentMenu->CreateButton(215, 0x143, 0x11, 0x11, 1, 0, 0xA3, uNumSavegameFiles, 0, "", (Texture *)(uTextureID_AR_DN_DN != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_AR_DN_DN] : 0), 0); v16 = -1; //ptr_69BD58 = v7; @@ -264,58 +264,14 @@ pGUIWindow_CurrentMenu->CreateButton(21u, 278u, 0xBFu, 0x12u, 1, 0, 0xA5u, 4u, 0, "", 0); pGUIWindow_CurrentMenu->CreateButton(21u, 298u, 0xBFu, 0x12u, 1, 0, 0xA5u, 5u, 0, "", 0); pGUIWindow_CurrentMenu->CreateButton(21u, 318u, 0xBFu, 0x12u, 1, 0, 0xA5u, 6u, 0, "", 0); - ptr_69BD64 = pGUIWindow_CurrentMenu->CreateButton( - 0xF1u, - 0x12Eu, - 0x69u, - 0x28u, - 1, - 0, - 0xA4u, - 0, - 0, - "", - (Texture *)(uTextureID_LS_ != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_LS_] : 0), - 0); - ptr_69BD60 = pGUIWindow_CurrentMenu->CreateButton( - 0x15Eu, - 0x12Eu, - 0x69u, - 0x28u, - 1, - 0, - 0xA6u, - 0, - 0, - "", - (Texture *)(uTextureID_x_d != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_x_d] : 0), - 0); - ptr_69BD5C = pGUIWindow_CurrentMenu->CreateButton( - 0xD7u, - 0xC7u, - 0x11u, - 0x11u, - 1, - 0, - 0xA2u, - 0, - 0, - "", - (Texture *)(uTextureID_AR_UP_DN != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_AR_UP_DN] : 0), - 0); - v7 = pGUIWindow_CurrentMenu->CreateButton( - 0xD7u, - 0x143u, - 0x11u, - 0x11u, - 1, - 0, - 0xA3u, - 0x22u, - 0, - "", - (Texture *)(uTextureID_AR_DN_DN != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_AR_DN_DN] : 0), - 0); + pBtnLoadSlot = pGUIWindow_CurrentMenu->CreateButton(0xF1u, 0x12Eu, 0x69u, 0x28u, 1, 0, 0xA4u, 0, 0, "", + (Texture *)(uTextureID_LS_ != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_LS_] : 0), 0); + pBtnCancel = pGUIWindow_CurrentMenu->CreateButton(0x15Eu, 0x12Eu, 0x69u, 0x28u, 1, 0, 0xA6u, 0, 0, "", + (Texture *)(uTextureID_x_d != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_x_d] : 0), 0); + pBtnArrowUp = pGUIWindow_CurrentMenu->CreateButton( 0xD7u, 0xC7u, 0x11u, 0x11u, 1, 0, 0xA2u, 0, 0, "", + (Texture *)(uTextureID_AR_UP_DN != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_AR_UP_DN] : 0), 0); + pBtnDownArrow = pGUIWindow_CurrentMenu->CreateButton( 0xD7u, 0x143u, 0x11u, 0x11u, 1, 0, 0xA3u, 0x22u, 0, "", + (Texture *)(uTextureID_AR_DN_DN != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_AR_DN_DN] : 0), 0); v12 = -1; - ptr_69BD58 = v7; + //pBtnDownArrow = v7; } \ No newline at end of file
--- a/MM7.vcxproj Sat Jan 12 11:30:46 2013 +0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,293 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{4CB238C2-3039-4BF6-966A-1ED1285BE23B}</ProjectGuid> - <Keyword>Win32Proj</Keyword> - <RootNamespace>MightandMagicTrilogy</RootNamespace> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <LinkIncremental>true</LinkIncremental> - <TargetName>$(ProjectName)</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <LinkIncremental>false</LinkIncremental> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <ObjectFileName>$(IntDir)/%(RelativeDir)</ObjectFileName> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="Actor.cpp" /> - <ClCompile Include="AIL.cpp" /> - <ClCompile Include="Allocator.cpp" /> - <ClCompile Include="Arcomage.cpp" /> - <ClCompile Include="AudioPlayer.cpp" /> - <ClCompile Include="Bink_Smacker.cpp" /> - <ClCompile Include="BSPModel.cpp" /> - <ClCompile Include="Chest.cpp" /> - <ClCompile Include="DecalBuilder.cpp" /> - <ClCompile Include="Events.cpp" /> - <ClCompile Include="FrameTableInc.cpp" /> - <ClCompile Include="Game.cpp" /> - <ClCompile Include="GameUIs.cpp" /> - <ClCompile Include="GammaControl.cpp" /> - <ClCompile Include="GUIButton.cpp" /> - <ClCompile Include="GUIFont.cpp" /> - <ClCompile Include="GUIProgressBar.cpp" /> - <ClCompile Include="GUIWindow.cpp" /> - <ClCompile Include="Indoor.cpp" /> - <ClCompile Include="IndoorCamera.cpp" /> - <ClCompile Include="IndoorCameraD3D.cpp" /> - <ClCompile Include="Items.cpp" /> - <ClCompile Include="Keyboard.cpp" /> - <ClCompile Include="LayingItem.cpp" /> - <ClCompile Include="lib\zlib\adler32.c" /> - <ClCompile Include="lib\zlib\compress.c" /> - <ClCompile Include="lib\zlib\crc32.c" /> - <ClCompile Include="lib\zlib\deflate.c" /> - <ClCompile Include="lib\zlib\infblock.c" /> - <ClCompile Include="lib\zlib\infcodes.c" /> - <ClCompile Include="lib\zlib\inffast.c" /> - <ClCompile Include="lib\zlib\inflate.c" /> - <ClCompile Include="lib\zlib\inftrees.c" /> - <ClCompile Include="lib\zlib\infutil.c" /> - <ClCompile Include="lib\zlib\trees.c" /> - <ClCompile Include="lib\zlib\uncompr.c" /> - <ClCompile Include="lib\zlib\zutil.c" /> - <ClCompile Include="LightmapBuilder.cpp" /> - <ClCompile Include="LightsStack.cpp" /> - <ClCompile Include="LOD.cpp" /> - <ClCompile Include="Log.cpp" /> - <ClCompile Include="mm7_1.cpp"> - <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MultiThreadedDebug</RuntimeLibrary> - </ClCompile> - <ClCompile Include="mm7_2.cpp" /> - <ClCompile Include="mm7_3.cpp" /> - <ClCompile Include="mm7_4.cpp" /> - <ClCompile Include="mm7_5.cpp" /> - <ClCompile Include="mm7_6.cpp" /> - <ClCompile Include="mm7_data.cpp" /> - <ClCompile Include="Monsters.cpp" /> - <ClCompile Include="Mouse.cpp" /> - <ClCompile Include="OSAPI.cpp" /> - <ClCompile Include="Outdoor.cpp" /> - <ClCompile Include="Overlays.cpp" /> - <ClCompile Include="PaletteManager.cpp" /> - <ClCompile Include="ParticleEngine.cpp" /> - <ClCompile Include="Party.cpp" /> - <ClCompile Include="Player.cpp" /> - <ClCompile Include="Random.cpp" /> - <ClCompile Include="Render.cpp" /> - <ClCompile Include="SaveLoad.cpp" /> - <ClCompile Include="Spells.cpp" /> - <ClCompile Include="Sprites.cpp" /> - <ClCompile Include="stru10.cpp" /> - <ClCompile Include="stru6.cpp" /> - <ClCompile Include="stru9.cpp" /> - <ClCompile Include="Texture.cpp" /> - <ClCompile Include="TileFrameTable.h" /> - <ClCompile Include="Time.cpp" /> - <ClCompile Include="VideoPlayer.cpp" /> - <ClCompile Include="Vis.cpp" /> - <ClCompile Include="Weather.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="Actor.h" /> - <ClInclude Include="AIL.h" /> - <ClInclude Include="Allocator.h" /> - <ClInclude Include="Arcomage.h" /> - <ClInclude Include="AudioPlayer.h" /> - <ClInclude Include="Autonotes.h" /> - <ClInclude Include="Awards.h" /> - <ClInclude Include="Bink_Smacker.h" /> - <ClInclude Include="BSPModel.h" /> - <ClInclude Include="Chest.h" /> - <ClInclude Include="CShow.h" /> - <ClInclude Include="DecalBuilder.h" /> - <ClInclude Include="DecorationList.h" /> - <ClInclude Include="Events.h" /> - <ClInclude Include="Events2D.h" /> - <ClInclude Include="FactionTable.h" /> - <ClInclude Include="FrameTableInc.h" /> - <ClInclude Include="Game.h" /> - <ClInclude Include="GammaControl.h" /> - <ClInclude Include="GUIButton.h" /> - <ClInclude Include="GUIFont.h" /> - <ClInclude Include="GUIProgressBar.h" /> - <ClInclude Include="GUIWindow.h" /> - <ClInclude Include="IconFrameTable.h" /> - <ClInclude Include="Indoor.h" /> - <ClInclude Include="IndoorCamera.h" /> - <ClInclude Include="IndoorCameraD3D.h" /> - <ClInclude Include="Indoor_stuff.h" /> - <ClInclude Include="lib\zlib\deflate.h" /> - <ClInclude Include="lib\zlib\infblock.h" /> - <ClInclude Include="lib\zlib\infcodes.h" /> - <ClInclude Include="lib\zlib\inffast.h" /> - <ClInclude Include="lib\zlib\inffixed.h" /> - <ClInclude Include="lib\zlib\inftrees.h" /> - <ClInclude Include="lib\zlib\infutil.h" /> - <ClInclude Include="lib\zlib\trees.h" /> - <ClInclude Include="lib\zlib\zconf.h" /> - <ClInclude Include="lib\zlib\zlib.h" /> - <ClInclude Include="lib\zlib\zutil.h" /> - <ClInclude Include="Log.h" /> - <ClInclude Include="OSAPI.h" /> - <ClInclude Include="Outdoor_stuff.h" /> - <ClInclude Include="Items.h" /> - <ClInclude Include="Keyboard.h" /> - <ClInclude Include="LayingItem.h" /> - <ClInclude Include="lib\legacy_dx\d3d.h" /> - <ClInclude Include="lib\legacy_dx\d3dcaps.h" /> - <ClInclude Include="lib\legacy_dx\d3drm.h" /> - <ClInclude Include="lib\legacy_dx\d3drmdef.h" /> - <ClInclude Include="lib\legacy_dx\d3drmobj.h" /> - <ClInclude Include="lib\legacy_dx\d3drmwin.h" /> - <ClInclude Include="lib\legacy_dx\d3dtypes.h" /> - <ClInclude Include="lib\legacy_dx\ddraw.h" /> - <ClInclude Include="lib\legacy_dx\dinput.h" /> - <ClInclude Include="lib\legacy_dx\dinputd.h" /> - <ClInclude Include="lib\legacy_dx\dmdls.h" /> - <ClInclude Include="lib\legacy_dx\dmerror.h" /> - <ClInclude Include="lib\legacy_dx\dmksctrl.h" /> - <ClInclude Include="lib\legacy_dx\dmplugin.h" /> - <ClInclude Include="lib\legacy_dx\dmusbuff.h" /> - <ClInclude Include="lib\legacy_dx\dmusicc.h" /> - <ClInclude Include="lib\legacy_dx\dmusicf.h" /> - <ClInclude Include="lib\legacy_dx\dmusici.h" /> - <ClInclude Include="lib\legacy_dx\dmusics.h" /> - <ClInclude Include="lib\legacy_dx\dsconf.h" /> - <ClInclude Include="lib\legacy_dx\dsound.h" /> - <ClInclude Include="lib\legacy_dx\dvoice.h" /> - <ClInclude Include="lib\legacy_dx\multimon.h" /> - <ClInclude Include="lib\legacy_dx\rmxfguid.h" /> - <ClInclude Include="lib\legacy_dx\rmxftmpl.h" /> - <ClInclude Include="lib\legacy_dx\strsafe.h" /> - <ClInclude Include="LightmapBuilder.h" /> - <ClInclude Include="Lights.h" /> - <ClInclude Include="LOD.h" /> - <ClInclude Include="MapInfo.h" /> - <ClInclude Include="Math.h" /> - <ClInclude Include="MM7.h" /> - <ClInclude Include="mm7_data.h" /> - <ClInclude Include="Monsters.h" /> - <ClInclude Include="Mouse.h" /> - <ClInclude Include="NPC.h" /> - <ClInclude Include="ObjectList.h" /> - <ClInclude Include="OSInfo.h" /> - <ClInclude Include="Outdoor.h" /> - <ClInclude Include="OutdoorCamera.h" /> - <ClInclude Include="Overlays.h" /> - <ClInclude Include="PaletteManager.h" /> - <ClInclude Include="ParticleEngine.h" /> - <ClInclude Include="Party.h" /> - <ClInclude Include="Player.h" /> - <ClInclude Include="PlayerFrameTable.h" /> - <ClInclude Include="Random.h" /> - <ClInclude Include="Render.h" /> - <ClInclude Include="resource.h" /> - <ClInclude Include="SaveLoad.h" /> - <ClInclude Include="Spells.h" /> - <ClInclude Include="Sprites.h" /> - <ClInclude Include="StorylineTextTable.h" /> - <ClInclude Include="stru10.h" /> - <ClInclude Include="stru11.h" /> - <ClInclude Include="stru12.h" /> - <ClInclude Include="stru123.h" /> - <ClInclude Include="stru157.h" /> - <ClInclude Include="stru159.h" /> - <ClInclude Include="stru160.h" /> - <ClInclude Include="stru176.h" /> - <ClInclude Include="stru179.h" /> - <ClInclude Include="stru220.h" /> - <ClInclude Include="stru272.h" /> - <ClInclude Include="stru277.h" /> - <ClInclude Include="stru279.h" /> - <ClInclude Include="stru287.h" /> - <ClInclude Include="stru298.h" /> - <ClInclude Include="stru314.h" /> - <ClInclude Include="stru346.h" /> - <ClInclude Include="stru351.h" /> - <ClInclude Include="stru6.h" /> - <ClInclude Include="stru9.h" /> - <ClInclude Include="Texture.h" /> - <ClInclude Include="Time.h" /> - <ClInclude Include="TurnEngine.h" /> - <ClInclude Include="VectorTypes.h" /> - <ClInclude Include="VideoPlayer.h" /> - <ClInclude Include="Viewport.h" /> - <ClInclude Include="Vis.h" /> - <ClInclude Include="Weather.h" /> - </ItemGroup> - <ItemGroup> - <None Include="lib\legacy_dx\d3dvec.inl" /> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="Might and Magic Trilogy.rc" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project> \ No newline at end of file
--- a/MM7.vcxproj.user Sat Jan 12 11:30:46 2013 +0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <LocalDebuggerCommandArguments> - </LocalDebuggerCommandArguments> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <LocalDebuggerWorkingDirectory>..\..\Buka\MMCollection\MM_VII</LocalDebuggerWorkingDirectory> - <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> - </PropertyGroup> -</Project> \ No newline at end of file
--- a/mm7_2.cpp Sat Jan 12 11:30:46 2013 +0600 +++ b/mm7_2.cpp Sun Jan 13 01:47:51 2013 +0600 @@ -11572,8 +11572,8 @@ else pSaveFiles = uNumSavegameFiles; a4 = 199; - pFilesID = dword_6A0C9C; - pSlotName = (const char *)(&pSavegameHeader[dword_6A0C9C]);//draw name for save slot + pFilesID = pSaveListPosition; + pSlotName = (const char *)(&pSavegameHeader[pSaveListPosition]);//draw name for save slot do { if ( pFilesID >= (signed int)pSaveFiles ) @@ -14031,13 +14031,12 @@ CreditsMenu__Loop(); // break; } - if (GetCurrentMenuID() == MENU_5 || GetCurrentMenuID() == MENU_LOAD) //??? - __debugbreak(); - /*{ + if (GetCurrentMenuID() == MENU_5 || GetCurrentMenuID() == MENU_LOAD) // + { uGameState = 0; - }*/ - else - __debugbreak();// + } + else //??? + __debugbreak(); /*{ if (GetCurrentMenuID() != MENU_10) goto LABEL_49; @@ -14066,10 +14065,10 @@ pAsyncMouse->Resume(); if ( LOBYTE(pGame->pKeyboardInstance->bUsingAsynKeyboard) && pAsyncKeyboard ) pAsyncKeyboard->Resume(); - } + }*/ //LABEL_48: -// pGame->Loop(); //game -LABEL_49:*/ + pGame->Loop(); //game +LABEL_49: if ( uGameState == 3 ) __debugbreak(); /*{
--- a/mm7_5.cpp Sat Jan 12 11:30:46 2013 +0600 +++ b/mm7_5.cpp Sun Jan 13 01:47:51 2013 +0600 @@ -456,45 +456,45 @@ v148 = 0; pWindowType = (WindowType)8; goto LABEL_439; - case UIMSG_A2: - --dword_6A0C9C; - if ( dword_6A0C9C < 0 ) - dword_6A0C9C = 0; + case UIMSG_ArrowUp: + --pSaveListPosition; + if ( pSaveListPosition < 0 ) + pSaveListPosition = 0; v163 = 0; v8 = 199; - pButton2 = ptr_69BD5C; + pButton2 = pBtnArrowUp; //goto LABEL_60; - pWindowType1 = (WindowType)90; + pWindowType1 = (WindowType)90; v137 = 17; v133 = 17; v9 = 215; goto LABEL_733; - case UIMSG_A3: - ++dword_6A0C9C; - if ( dword_6A0C9C >= uMessageParam ) - dword_6A0C9C = uMessageParam - 1; + case UIMSG_DownArrow: + ++pSaveListPosition; + if ( pSaveListPosition >= uMessageParam ) + pSaveListPosition = uMessageParam - 1; v163 = 0; v8 = 323; - pButton2 = ptr_69BD58; + pButton2 = pBtnDownArrow; //LABEL_60: pWindowType1 = (WindowType)90; v137 = 17; v133 = 17; v9 = 215; goto LABEL_733; - case UIMSG_A6: + case UIMSG_Cancel: v163 = 0; v8 = 302; - pButton2 = ptr_69BD60; + pButton2 = pBtnCancel; v9 = 350; pWindowType1 = (WindowType)96; v137 = 42; v133 = 106; goto LABEL_733; - case UIMSG_A4: + case UIMSG_LoadSlot: v163 = 0; v8 = 302; - pButton2 = ptr_69BD64; + pButton2 = pBtnLoadSlot; v9 = 241; pWindowType1 = (WindowType)94; v137 = 42; @@ -503,10 +503,10 @@ case UIMSG_A5: if ( pGUIWindow_CurrentMenu->field_40 == v0 ) pKeyActionMap->_459ED1(0); - if ( pCurrentScreen != 11 || uLoadGameUI_SelectedSlot != dword_6A0C9C + uMessageParam ) - { - v10 = dword_6A0C9C + uMessageParam; - if ( dword_6BE138 == dword_6A0C9C + uMessageParam ) + if ( pCurrentScreen != 11 || uLoadGameUI_SelectedSlot != pSaveListPosition + uMessageParam ) + { + v10 = pSaveListPosition + uMessageParam; + if ( dword_6BE138 == pSaveListPosition + uMessageParam ) { if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) { @@ -3081,7 +3081,7 @@ void __cdecl GUI_MainMenuMessageProc() { //AudioPlayer *v0; // ebp@2 - char *v1; // ebx@2 + //Player *pPlayer1; // ebx@2 unsigned int v2; // ecx@18 void *v3; // edi@21 signed int v4; // eax@29 @@ -3128,38 +3128,38 @@ if ( pMessageQueue_50CBD0->uNumMessages ) { //v0 = pAudioPlayer; - v1 = (char *)pParty->pPlayers; - pPlayer = pParty->pPlayers; + //pPlayer1 = pParty->pPlayers; + pPlayer = pParty->pPlayers; do { pMessageQueue_50CBD0->PopMessage(&pUIMessageType, &uNum, &pSex); - switch (pUIMessageType) - { - case UIMSG_MainMenu_ShowPartyCreationWnd: + switch (pUIMessageType) // + { + case UIMSG_MainMenu_ShowPartyCreationWnd:// { GUIWindow::Create(495, 172, 0, 0, WINDOW_5A, (int)pMainMenu_BtnNew, 0); SetCurrentMenuID(MENU_NEWGAME); } continue; - case UIMSG_MainMenu_ShowLoadWindow: + case UIMSG_MainMenu_ShowLoadWindow:// { GUIWindow::Create(495, 227, 0, 0, WINDOW_5A, (int)pMainMenu_BtnLoad, 0); SetCurrentMenuID(MENU_SAVELOAD); } continue; - case UIMSG_ShowCredits: + case UIMSG_ShowCredits:// { GUIWindow::Create(495, 282, 0, 0, WINDOW_5A, (int)pMainMenu_BtnCredits, 0); SetCurrentMenuID(MENU_CREDITS); } continue; - case UIMSG_ExitToWindows: + case UIMSG_ExitToWindows:// { GUIWindow::Create(495, 337, 0, 0, WINDOW_5A, (int)pMainMenu_BtnExit, 0); SetCurrentMenuID(MENU_FINISHED); } continue; - case UIMSG_LoadGame: + case UIMSG_LoadGame:// { if (!pSavegameUsedSlots[uLoadGameUI_SelectedSlot]) continue; @@ -3174,13 +3174,13 @@ //main menu save/load wnd clicking on savegame lines if (pGUIWindow_CurrentMenu->field_40 == 1) pKeyActionMap->_459ED1(0); - if ( pCurrentScreen != 11 || uLoadGameUI_SelectedSlot != uNum + dword_6A0C9C ) + if ( pCurrentScreen != 11 || uLoadGameUI_SelectedSlot != uNum + pSaveListPosition ) { //load clicked line - v26 = uNum + dword_6A0C9C; - if ( dword_6BE138 == uNum + dword_6A0C9C ) + v26 = uNum + pSaveListPosition; + if ( dword_6BE138 == uNum + pSaveListPosition ) { - pMessageQueue_50CBD0->SendMessage(UIMSG_A4, 0, 0); + pMessageQueue_50CBD0->SendMessage(UIMSG_LoadSlot, 0, 0); pMessageQueue_50CBD0->SendMessage(UIMSG_LoadGame, 0, 0); } uLoadGameUI_SelectedSlot = v26; @@ -3195,19 +3195,19 @@ } } continue; - case UIMSG_A4: - { - GUIWindow::Create(pGUIWindow_CurrentMenu->uFrameX + 241, pGUIWindow_CurrentMenu->uFrameY + 302, 61, 28, WINDOW_5E, (int)ptr_69BD64, 0); + case UIMSG_LoadSlot: // + { + GUIWindow::Create(pGUIWindow_CurrentMenu->uFrameX + 241, pGUIWindow_CurrentMenu->uFrameY + 302, 61, 28, WINDOW_5E, (int)pBtnLoadSlot, 0); } continue; } if ( (signed int)pUIMessageType > UIMSG_PlayerCreationRemoveDownSkill ) { - if ( pUIMessageType > UIMSG_A3 ) - { - if ( pUIMessageType == UIMSG_A6 ) - { - GUIWindow::Create(pGUIWindow_CurrentMenu->uFrameX + 350, pGUIWindow_CurrentMenu->uFrameY + 302, 61, 28, (WindowType)95, (int)ptr_69BD60, 0); + if ( pUIMessageType > UIMSG_DownArrow ) + { + if ( pUIMessageType == UIMSG_Cancel )// + { + GUIWindow::Create(pGUIWindow_CurrentMenu->uFrameX + 350, pGUIWindow_CurrentMenu->uFrameY + 302, 61, 28, (WindowType)95, (int)pBtnCancel, 0); continue; } if ( pUIMessageType == UIMSG_SelectFacePlayerBack ) @@ -3231,13 +3231,13 @@ pAudioPlayer->PlaySound((SoundID)66, 0, 0, -1, 0, 0, 0.0, 0); v22 = pPlayer; v22->PlaySound(102, 0); - v1 = (char *)pParty->pPlayers; + //v1 = (char *)pParty->pPlayers; continue; } if ( pUIMessageType == UIMSG_SelectFacePlayerForward ) { pPlayer = &pParty->pPlayers[uNum]; - v20 = (char)((int)pPlayer->uFace + 1) % 20; + v20 = (char)((int)pPlayer->uFace + 1) % 20; pPlayer->uFace = v20; pPlayer->uVoiceID = v20; pPlayer->SetInitialStats(); @@ -3248,12 +3248,12 @@ % 7 + pGUIWindow_CurrentMenu->pStartingPosActiveItem + 7 * uNum; uPlayerCreationUI_SelectedCharacter = v21; GUIWindow::Create(pCreationUI_BtnPressRight[v21]->uX, pCreationUI_BtnPressRight[v21]->uY, 0, 0, (enum WindowType)92, - (int)pCreationUI_BtnPressRight[v21], 1); + (int)pCreationUI_BtnPressRight[v21], 1); //v0 = pAudioPlayer; pAudioPlayer->PlaySound((SoundID)66, 0, 0, -1, 0, 0, 0, 0); v22 = pPlayer; v22->PlaySound(102, 0); - v1 = (char *)pParty->pPlayers; + //v1 = (char *)pParty->pPlayers; continue; } if ( pUIMessageType == UIMSG_AD ) @@ -3265,25 +3265,24 @@ if ( pUIMessageType != UIMSG_AE ) continue; GUIWindow::Create(pMainMenu_BtnExit->uX, pMainMenu_BtnExit->uY, 0, 0, (enum WindowType)90, (int)pMainMenu_BtnExit, 0); -LABEL_114: +//LABEL_114: v40 = 10; -LABEL_89: +//LABEL_89: v2 = v40; SetCurrentMenuID((MENU_STATE)v2); continue; } - if ( pUIMessageType == UIMSG_A3 ) - { - ++dword_6A0C9C; - if ( dword_6A0C9C >= uNum ) - dword_6A0C9C = uNum - 1; - if ( dword_6A0C9C < 1 ) - dword_6A0C9C = 0; + if ( pUIMessageType == UIMSG_DownArrow )// + { + ++pSaveListPosition; + if ( pSaveListPosition >= uNum ) + pSaveListPosition = uNum - 1; + if ( pSaveListPosition < 1 ) + pSaveListPosition = 0; pWindow = pGUIWindow_CurrentMenu; - v43 = 0; - v39 = (int)ptr_69BD58; v8 = pGUIWindow_CurrentMenu->uFrameY + 323; - goto LABEL_105; + GUIWindow::Create(pWindow->uFrameX + 215, v8, 0, 0, (WindowType)90, (int)pBtnDownArrow, 0); + continue; } if ( pUIMessageType == UIMSG_6B ) { @@ -3326,12 +3325,18 @@ if (GetCurrentMenuID() == MENU_7) { v40 = 6; - goto LABEL_89; + //goto LABEL_89; + v2 = v40; + SetCurrentMenuID((MENU_STATE)v2); + continue; } if (GetCurrentMenuID() == MENU_Credits) { v40 = 11; - goto LABEL_89; + //goto LABEL_89; + v2 = v40; + SetCurrentMenuID((MENU_STATE)v2); + continue; } if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) { @@ -3356,7 +3361,7 @@ pTexture_PCX.Load("title.pcx", 0); SetCurrentMenuID(MENU_MAIN); v15 = 1; -LABEL_81: +//LABEL_81: pGUIWindow_CurrentMenu->Release(); pGUIWindow2->Release(); pGUIWindow2 = 0; @@ -3372,7 +3377,16 @@ else { if ( pCurrentScreen != 27 ) - goto LABEL_81; + //goto LABEL_81; + { + pGUIWindow_CurrentMenu->Release(); + pGUIWindow2->Release(); + pGUIWindow2 = 0; + pEventTimer->Resume(); + pCurrentScreen = 0; + viewparams->bRedrawGameUI = v15; + continue; + } //VideoPlayer::dtor(); } } @@ -3420,17 +3434,14 @@ pCurrentPlayer->PlaySound(102, 0); continue; } - if ( pUIMessageType == UIMSG_A2 ) - { - --dword_6A0C9C; - if ( dword_6A0C9C < 0 ) - dword_6A0C9C = 0; + if ( pUIMessageType == UIMSG_ArrowUp )// + { + --pSaveListPosition; + if ( pSaveListPosition < 0 ) + pSaveListPosition = 0; pWindow = pGUIWindow_CurrentMenu; - v43 = 0; - v39 = (int)ptr_69BD5C; v8 = pGUIWindow_CurrentMenu->uFrameY + 197; -LABEL_105: - GUIWindow::Create(pWindow->uFrameX + 215, v8, 0, 0, (WindowType)90, v39, v43); + GUIWindow::Create(pWindow->uFrameX + 215, v8, 0, 0, (WindowType)90, (int)pBtnArrowUp, 0); continue; } } @@ -3441,7 +3452,7 @@ { uPlayerCreationUI_SelectedCharacter = uNum; v41 = 3; - v1 = (char *)pParty->pPlayers; + //v1 = (char *)pParty->pPlayers; v5 = (pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem) % 7 + pGUIWindow_CurrentMenu->pStartingPosActiveItem + 7 * uNum; pGUIWindow_CurrentMenu->pCurrentPosActiveItem = v5; @@ -3531,7 +3542,13 @@ break; default: if ( pUIMessageType == 58 ) - goto LABEL_114; + //goto LABEL_114; + { + v40 = 10; + v2 = v40; + SetCurrentMenuID((MENU_STATE)v2); + continue; + } break; } }
--- a/mm7_data.cpp Sat Jan 12 11:30:46 2013 +0600 +++ b/mm7_data.cpp Sun Jan 13 01:47:51 2013 +0600 @@ -1555,7 +1555,7 @@ unsigned int uTextureID_loadsave; _UNKNOWN _69FBB4_ptr_iterator_end; // weak _UNKNOWN unk_6A0758; // weak -int dword_6A0C9C; // weak +int pSaveListPosition; // weak unsigned int uLoadGameUI_SelectedSlot; HWND hInsertCDWindow; // idb int uCPUSpeed; // weak
--- a/mm7_data.h Sat Jan 12 11:30:46 2013 +0600 +++ b/mm7_data.h Sun Jan 13 01:47:51 2013 +0600 @@ -1447,7 +1447,7 @@ extern unsigned int uTextureID_loadsave; extern _UNKNOWN _69FBB4_ptr_iterator_end; // weak extern _UNKNOWN unk_6A0758; // weak -extern int dword_6A0C9C; // weak +extern int pSaveListPosition; // weak extern unsigned int uLoadGameUI_SelectedSlot; extern HWND hInsertCDWindow; // idb extern int uCPUSpeed; // weak