comparison SaveLoad.cpp @ 2081:70c45d12d9ca

Merge
author Ritor1
date Wed, 04 Dec 2013 00:45:18 +0600
parents 259df09dfb50
children 2318216e5206
comparison
equal deleted inserted replaced
2080:61960bd85c6d 2081:70c45d12d9ca
667 SaveGame(1, 1); 667 SaveGame(1, 1);
668 } 668 }
669 free(pSave); 669 free(pSave);
670 } 670 }
671 //----- (0045E03A) -------------------------------------------------------- 671 //----- (0045E03A) --------------------------------------------------------
672 unsigned short * MakeScreenshot( signed int width, signed int height ) 672 unsigned short *MakeScreenshot( signed int width, signed int height )
673 { 673 {
674 //signed int v2; // edi@1 674 //signed int v2; // edi@1
675 unsigned __int16 *v3; // ebx@1 675 unsigned __int16 *v3; // ebx@1
676 int v4; // edx@7 676 int v4; // edx@7
677 unsigned __int8 v5; // cf@9 677 unsigned __int8 v5; // cf@9
708 708
709 pPixels = (unsigned __int16 *)malloc(2 * height * width); 709 pPixels = (unsigned __int16 *)malloc(2 * height * width);
710 memset(pPixels, 0 , 2 * height * width); 710 memset(pPixels, 0 , 2 * height * width);
711 711
712 v3 = pPixels; 712 v3 = pPixels;
713 if ( pRenderer->pRenderD3D ) 713 if (!pRenderer->pRenderD3D)
714 { 714 __debugbreak();
715
715 pRenderer->BeginSceneD3D(); 716 pRenderer->BeginSceneD3D();
716 717
717 if (uCurrentlyLoadedLevelType == LEVEL_Indoor) 718 if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
718 pIndoor->Draw(); 719 pIndoor->Draw();
719 else if (uCurrentlyLoadedLevelType == LEVEL_Outdoor) 720 else if (uCurrentlyLoadedLevelType == LEVEL_Outdoor)
772 --v4; 773 --v4;
773 } 774 }
774 while ( v4 ); 775 while ( v4 );
775 } 776 }
776 } 777 }
777 } 778
778 else 779
780 /*if (!pRenderer->pRenderD3D)
779 { 781 {
780 pRenderer->BeginScene(); 782 pRenderer->BeginScene();
781 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor ) 783 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor )
782 { 784 {
783 pIndoor->Draw(); 785 pIndoor->Draw();
826 } 828 }
827 } 829 }
828 } 830 }
829 } 831 }
830 pRenderer->EndScene(); 832 pRenderer->EndScene();
831 } 833 }*/
832 return pPixels; 834 return pPixels;
833 } 835 }
834 //----- (0045E26C) -------------------------------------------------------- 836 //----- (0045E26C) --------------------------------------------------------
835 void SaveScreenshot(const char *pFilename) 837 void SaveScreenshot(const char *pFilename)
836 { 838 {