Menu
▾
▴
[Gemrb-commits] Utilities/chitem BamEdit.cpp, 1.11, 1.12 BamEdit.h, 1.8, 1.9 CreatureEdit.cpp, 1.9, 1.10 PaletteEdit.cpp, 1.4, 1.5 SRCEdit.cpp, 1.5, 1.6 bam.cpp, 1.15, 1.16 bam.h, 1.9, 1.10 chitem.rc, 1.22, 1.23 chitemDlg.cpp, 1.22, 1.23 resource.h, 1.21, 1.22 seekers.cpp, 1.17, 1.18
|
From: Laszlo T. <ave...@us...> - 2006-11-27 17:39:18
|
Update of /cvsroot/gemrb/Utilities/chitem In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26355 Modified Files: BamEdit.cpp BamEdit.h CreatureEdit.cpp PaletteEdit.cpp SRCEdit.cpp bam.cpp bam.h chitem.rc chitemDlg.cpp resource.h seekers.cpp Log Message: dltcep update Index: SRCEdit.cpp =================================================================== RCS file: /cvsroot/gemrb/Utilities/chitem/SRCEdit.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SRCEdit.cpp 8 Sep 2006 14:15:51 -0000 1.5 --- SRCEdit.cpp 27 Nov 2006 17:39:08 -0000 1.6 *************** *** 33,38 **** --- 33,46 ---- } + static int srcboxids[]={IDC_REF, IDC_TAGGED, IDC_TEXT, + IDC_SOUNDREF, IDC_PLAY, IDC_REMOVE, IDC_SLOTPICKER, + 0}; + void CSRCEdit::DoDataExchange(CDataExchange* pDX) { + CWnd *cb; + int flg; + int i; + CDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CSRCEdit) *************** *** 47,50 **** --- 55,65 ---- DDX_Check(pDX, IDC_TAGGED, m_tagged); //}}AFX_DATA_MAP + flg=the_src.m_cnt>0; + i=0; + while(srcboxids[i]) + { + cb=GetDlgItem(srcboxids[i++]); + cb->EnableWindow(flg); + } } *************** *** 422,425 **** --- 437,441 ---- void CSRCEdit::OnKillfocusRef() { + if (m_stringnum<0) return; UpdateData(UD_RETRIEVE); the_src.m_slots[m_stringnum]=m_ref; Index: PaletteEdit.cpp =================================================================== RCS file: /cvsroot/gemrb/Utilities/chitem/PaletteEdit.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PaletteEdit.cpp 28 Dec 2005 18:17:15 -0000 1.4 --- PaletteEdit.cpp 27 Nov 2006 17:39:08 -0000 1.5 *************** *** 315,318 **** --- 315,319 ---- *((BYTE *) (palette+from)+2)=val; } + InitPaletteBitmap(); } Index: seekers.cpp =================================================================== RCS file: /cvsroot/gemrb/Utilities/chitem/seekers.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** seekers.cpp 8 Sep 2006 14:15:51 -0000 1.17 --- seekers.cpp 27 Nov 2006 17:39:09 -0000 1.18 *************** *** 2528,2532 **** search_data tmpdata; ! #if 1 int i; --- 2528,2532 ---- search_data tmpdata; ! #if 0 int i; *************** *** 2658,2661 **** --- 2658,2666 ---- { found=false; + if(!strnicmp(the_area.header.scriptref,searchdata.resource,8) ) + { + log("Using script: %.8s",the_area.header.scriptref); + } + for(actp=0;actp<the_area.actorcount;actp++) { Index: chitem.rc =================================================================== RCS file: /cvsroot/gemrb/Utilities/chitem/chitem.rc,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** chitem.rc 29 Aug 2006 21:26:58 -0000 1.22 --- chitem.rc 27 Nov 2006 17:39:08 -0000 1.23 *************** *** 1324,1327 **** --- 1324,1329 ---- LTEXT "Frame #",IDC_STATIC,320,110,27,8 LTEXT "Transparent index",IDC_STATIC,258,196,58,8 + CONTROL "Zoom",IDC_ZOOM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 306,214,34,10 END *************** *** 5918,5923 **** VS_VERSION_INFO VERSIONINFO ! FILEVERSION 7,0,0,0 ! PRODUCTVERSION 7,0,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG --- 5920,5925 ---- VS_VERSION_INFO VERSIONINFO ! FILEVERSION 7,0,0,4 ! PRODUCTVERSION 7,0,0,4 FILEFLAGSMASK 0x3fL #ifdef _DEBUG *************** *** 5937,5946 **** VALUE "CompanyName", "GemRB Project (gemrb.sourceforge.net)\0" VALUE "FileDescription", "DragonLance Total Conversion Editor Pro\0" ! VALUE "FileVersion", "7, 0, 0, 0\0" VALUE "InternalName", "dltcep\0" VALUE "LegalCopyright", "Copyright (C) 2002-2006 Avenger\0" VALUE "OriginalFilename", "chitem.EXE\0" ! VALUE "ProductName", "DLTC Editor Pro 7.0\0" ! VALUE "ProductVersion", "7, 0, 0, 0\0" END END --- 5939,5951 ---- VALUE "CompanyName", "GemRB Project (gemrb.sourceforge.net)\0" VALUE "FileDescription", "DragonLance Total Conversion Editor Pro\0" ! VALUE "FileVersion", "7, 0, 0, 4\0" VALUE "InternalName", "dltcep\0" VALUE "LegalCopyright", "Copyright (C) 2002-2006 Avenger\0" + VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "chitem.EXE\0" ! VALUE "PrivateBuild", "\0" ! VALUE "ProductName", "DLTC Editor Pro 7.0d\0" ! VALUE "ProductVersion", "7, 0, 0, 4\0" ! VALUE "SpecialBuild", "\0" END END Index: BamEdit.cpp =================================================================== RCS file: /cvsroot/gemrb/Utilities/chitem/BamEdit.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** BamEdit.cpp 27 Aug 2006 19:32:14 -0000 1.11 --- BamEdit.cpp 27 Nov 2006 17:39:08 -0000 1.12 *************** *** 132,136 **** framesize=the_bam.GetFrameSize(framenum); m_bamframe1_control.MoveWindow(CRect(newtopleft,framesize)); ! the_bam.MakeBitmap(framenum,bgcolor,hbf[0],BM_RESIZE,1,1); m_bamframe1_control.SetBitmap(hbf[0]); DDX_Text(pDX, IDC_XPOS, framepos.x); --- 132,136 ---- framesize=the_bam.GetFrameSize(framenum); m_bamframe1_control.MoveWindow(CRect(newtopleft,framesize)); ! the_bam.MakeBitmap(framenum,bgcolor,hbf[0],m_zoom,1,1); m_bamframe1_control.SetBitmap(hbf[0]); DDX_Text(pDX, IDC_XPOS, framepos.x); *************** *** 157,163 **** { newtopleft=topleft-the_bam.GetFramePos(invframe)+origin; framesize=the_bam.GetFrameSize(invframe); bf_control->MoveWindow(CRect(newtopleft,framesize)); ! the_bam.MakeBitmap(invframe,bgcolor,hbf[invframe],BM_RESIZE,1,1); bf_control->SetBitmap(hbf[invframe]); } --- 157,167 ---- { newtopleft=topleft-the_bam.GetFramePos(invframe)+origin; + if (m_zoom&BM_ZOOM) + { + newtopleft-=the_bam.GetFramePos(invframe)-origin; + } framesize=the_bam.GetFrameSize(invframe); bf_control->MoveWindow(CRect(newtopleft,framesize)); ! the_bam.MakeBitmap(invframe,bgcolor,hbf[invframe],m_zoom,1,1); bf_control->SetBitmap(hbf[invframe]); } *************** *** 167,173 **** bf_control=(CStatic *) GetDlgItem(controlids[1]); newtopleft=topleft+CPoint(origin.x,the_bam.GetFrameSize(framenum).y)-the_bam.GetFramePos(framenum^1); framesize=the_bam.GetFrameSize(framenum^1); bf_control->MoveWindow(CRect(newtopleft,framesize)); ! the_bam.MakeBitmap(framenum^1,bgcolor,hbf[1],BM_RESIZE,1,1); bf_control->SetBitmap(hbf[1]); for(invframe=2;invframe<4;invframe++) --- 171,181 ---- bf_control=(CStatic *) GetDlgItem(controlids[1]); newtopleft=topleft+CPoint(origin.x,the_bam.GetFrameSize(framenum).y)-the_bam.GetFramePos(framenum^1); + if (m_zoom&BM_ZOOM) + { + newtopleft+=CPoint(origin.x,the_bam.GetFrameSize(framenum).y)-the_bam.GetFramePos(framenum^1); + } framesize=the_bam.GetFrameSize(framenum^1); bf_control->MoveWindow(CRect(newtopleft,framesize)); ! the_bam.MakeBitmap(framenum^1,bgcolor,hbf[1],m_zoom,1,1); bf_control->SetBitmap(hbf[1]); for(invframe=2;invframe<4;invframe++) *************** *** 177,181 **** } } - } else //retrieve --- 185,188 ---- *************** *** 375,378 **** --- 382,386 ---- ON_COMMAND(ID_CYCLE_DROPFRAME10, OnCycleDropframe10) ON_COMMAND(ID_FRAME_MINIMIZEFRAME, OnFrameMinimizeframe) + ON_COMMAND(ID_TOOLS_MINIMALFRAME, OnToolsMinimalframe) ON_EN_KILLFOCUS(IDC_XSIZE, DefaultKillfocus) ON_EN_KILLFOCUS(IDC_YSIZE, DefaultKillfocus) *************** *** 399,404 **** ON_COMMAND(ID_TOOLS_CENTERFRAMES, OnCenter) ON_COMMAND(ID_TOOLS_IMPORTFRAMES, OnImport) - ON_COMMAND(ID_TOOLS_MINIMALFRAME, OnToolsMinimalframe) ON_COMMAND(ID_TOOLS_SPLITFRAMES, SplitBAM) //}}AFX_MSG_MAP END_MESSAGE_MAP() --- 407,412 ---- ON_COMMAND(ID_TOOLS_CENTERFRAMES, OnCenter) ON_COMMAND(ID_TOOLS_IMPORTFRAMES, OnImport) ON_COMMAND(ID_TOOLS_SPLITFRAMES, SplitBAM) + ON_BN_CLICKED(IDC_ZOOM, OnZoom) //}}AFX_MSG_MAP END_MESSAGE_MAP() *************** *** 412,415 **** --- 420,424 ---- CWnd *bc; + m_zoom=BM_RESIZE; CDialog::OnInitDialog(); RefreshDialog(); *************** *** 790,793 **** --- 799,808 ---- } + void CBamEdit::OnZoom() + { + m_zoom^=BM_ZOOM; + UpdateData(UD_DISPLAY); + } + void CBamEdit::DefaultKillfocus() { *************** *** 940,944 **** origin=the_bam.GetFramePos(0); newtopleft=topleft-the_bam.GetFramePos(nFrameIndex)+origin; ! the_bam.MakeBitmap(nFrameIndex,bgcolor,hbanim,BM_RESIZE,1,1); m_bamframe1_control.MoveWindow(CRect(newtopleft,the_bam.GetFrameSize(nFrameIndex))); m_bamframe1_control.SetBitmap(hbanim); --- 955,959 ---- origin=the_bam.GetFramePos(0); newtopleft=topleft-the_bam.GetFramePos(nFrameIndex)+origin; ! the_bam.MakeBitmap(nFrameIndex,bgcolor,hbanim,m_zoom,1,1); m_bamframe1_control.MoveWindow(CRect(newtopleft,the_bam.GetFrameSize(nFrameIndex))); m_bamframe1_control.SetBitmap(hbanim); Index: BamEdit.h =================================================================== RCS file: /cvsroot/gemrb/Utilities/chitem/BamEdit.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** BamEdit.h 5 Jul 2006 18:29:08 -0000 1.8 --- BamEdit.h 27 Nov 2006 17:39:08 -0000 1.9 *************** *** 33,36 **** --- 33,37 ---- int m_framenum2; //}}AFX_DATA + int m_zoom; // Overrides *************** *** 136,139 **** --- 137,141 ---- afx_msg void OnFrameMinimizeframe(); afx_msg void OnToolsMinimalframe(); + afx_msg void OnZoom(); //}}AFX_MSG DECLARE_MESSAGE_MAP() Index: CreatureEdit.cpp =================================================================== RCS file: /cvsroot/gemrb/Utilities/chitem/CreatureEdit.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CreatureEdit.cpp 8 Sep 2006 14:15:51 -0000 1.9 --- CreatureEdit.cpp 27 Nov 2006 17:39:08 -0000 1.10 *************** *** 256,259 **** --- 256,260 ---- newname=itemname; filepath=makeitemname(".cre",0); + chrorcre=0; goto gotname; } Index: chitemDlg.cpp =================================================================== RCS file: /cvsroot/gemrb/Utilities/chitem/chitemDlg.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** chitemDlg.cpp 29 Aug 2006 21:26:58 -0000 1.22 --- chitemDlg.cpp 27 Nov 2006 17:39:09 -0000 1.23 *************** *** 4,8 **** #include "stdafx.h" ! #define PRG_VERSION "7.0a" #include <fcntl.h> --- 4,8 ---- #include "stdafx.h" ! #define PRG_VERSION "7.0d" #include <fcntl.h> Index: resource.h =================================================================== RCS file: /cvsroot/gemrb/Utilities/chitem/resource.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** resource.h 29 Aug 2006 21:26:58 -0000 1.21 --- resource.h 27 Nov 2006 17:39:09 -0000 1.22 *************** *** 1603,1606 **** --- 1603,1607 ---- #define IDC_UNKNOWN56 2299 #define IDC_FORCENEW 2302 + #define IDC_ZOOM 2304 #define ID_RESCAN 32771 #define ID_RESCAN2 32772 *************** *** 1823,1827 **** #define _APS_NEXT_RESOURCE_VALUE 217 #define _APS_NEXT_COMMAND_VALUE 33044 ! #define _APS_NEXT_CONTROL_VALUE 2303 #define _APS_NEXT_SYMED_VALUE 120 #endif --- 1824,1828 ---- #define _APS_NEXT_RESOURCE_VALUE 217 #define _APS_NEXT_COMMAND_VALUE 33044 ! #define _APS_NEXT_CONTROL_VALUE 2305 #define _APS_NEXT_SYMED_VALUE 120 #endif Index: bam.cpp =================================================================== RCS file: /cvsroot/gemrb/Utilities/chitem/bam.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** bam.cpp 27 Aug 2006 19:32:15 -0000 1.15 --- bam.cpp 27 Nov 2006 17:39:08 -0000 1.16 *************** *** 2066,2070 **** // nMode ==BM_RESIZE - new dimensions // nMode ==BM_OVERLAY - overlay position ! int Cbam::MakeBitmap(int nFrameWanted, COLORREF clrTrans, HBITMAP &hBitmap, int nMode, int nWidth, int nHeight) { --- 2066,2072 ---- // nMode ==BM_RESIZE - new dimensions // nMode ==BM_OVERLAY - overlay position ! // nMode ==BM_MATCH - transparency special ! // nMode ==BM_INVERT - transparency special ! // nMode ==BM_ZOOM - zoom int Cbam::MakeBitmap(int nFrameWanted, COLORREF clrTrans, HBITMAP &hBitmap, int nMode, int nWidth, int nHeight) { *************** *** 2142,2148 **** return -1; ! if (nMode&BM_RESIZE) ! if (!FitAndCenterBitmap(hBitmap,clrTrans,nWidth,nHeight)) return -1; return nReplaced; --- 2144,2152 ---- return -1; ! if (nMode&(BM_RESIZE|BM_ZOOM) ) ! { ! if (!FitAndCenterBitmap(hBitmap,clrTrans,nWidth,nHeight, nMode&BM_ZOOM)) return -1; + } return nReplaced; *************** *** 2356,2360 **** } ! bool Cbam::FitAndCenterBitmap(HBITMAP &hOriginal, COLORREF clrBackground, int nWidth, int nHeight) { CBitmap *pBmp = CBitmap::FromHandle(hOriginal); --- 2360,2364 ---- } ! bool Cbam::FitAndCenterBitmap(HBITMAP &hOriginal, COLORREF clrBackground, int nWidth, int nHeight, int zoom) { CBitmap *pBmp = CBitmap::FromHandle(hOriginal); *************** *** 2365,2370 **** pBmp->GetBitmap(&bm); ! if (bm.bmWidth >= nWidth && bm.bmHeight >= nHeight) ! return true; if(bm.bmWidth>=nWidth) --- 2369,2377 ---- pBmp->GetBitmap(&bm); ! if (nWidth!=1 || nHeight!=1) ! { ! if (bm.bmWidth >= nWidth && bm.bmHeight >= nHeight) ! return true; ! } if(bm.bmWidth>=nWidth) *************** *** 2373,2376 **** --- 2380,2388 ---- nHeight=bm.bmHeight; + if (zoom) + { + nWidth*=2; + nHeight*=2; + } CDC *pDC = AfxGetMainWnd()->GetDC(); if (!pDC) *************** *** 2399,2403 **** // Copy the smaller original bitmap onto the 32x32 in the centered position. ! dcMem.BitBlt(nLeft,nTop,bm.bmWidth,bm.bmHeight,&dcBmp,0,0,SRCCOPY); // Select out the bitmaps. --- 2411,2424 ---- // Copy the smaller original bitmap onto the 32x32 in the centered position. ! if (zoom) ! { ! nLeft -= bm.bmWidth/2; ! nTop -= bm.bmHeight/2; ! dcMem.StretchBlt(nLeft,nTop,bm.bmWidth*2,bm.bmHeight*2,&dcBmp,0,0,bm.bmWidth,bm.bmHeight,SRCCOPY); ! } ! else ! { ! dcMem.BitBlt(nLeft,nTop,bm.bmWidth,bm.bmHeight,&dcBmp,0,0,SRCCOPY); ! } // Select out the bitmaps. Index: bam.h =================================================================== RCS file: /cvsroot/gemrb/Utilities/chitem/bam.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** bam.h 27 Aug 2006 19:32:15 -0000 1.9 --- bam.h 27 Nov 2006 17:39:08 -0000 1.10 *************** *** 59,62 **** --- 59,63 ---- #define BM_MATCH 0x40 #define BM_INVERT 0x80 + #define BM_ZOOM 0x100 struct INF_BAMC_HEADER *************** *** 326,330 **** COLORREF *pDIBits, bool bIsCompressed, int nMaxLength, int nColumn); bool FitAndCenterBitmap(HBITMAP &hOriginal, COLORREF clrBackground, ! int nWidth, int nHeight); int ReducePalette(int fhandle, bmp_header sHeader, int scanline); }; --- 327,331 ---- COLORREF *pDIBits, bool bIsCompressed, int nMaxLength, int nColumn); bool FitAndCenterBitmap(HBITMAP &hOriginal, COLORREF clrBackground, ! int nWidth, int nHeight, int zoom); int ReducePalette(int fhandle, bmp_header sHeader, int scanline); }; |