From: <ave...@us...> - 2008-10-24 20:13:45
|
Revision: 5469 http://gemrb.svn.sourceforge.net/gemrb/?rev=5469&view=rev Author: avenger_teambg Date: 2008-10-24 20:13:35 +0000 (Fri, 24 Oct 2008) Log Message: ----------- dltcep source update Modified Paths: -------------- chitem/trunk/2DAEdit.cpp chitem/trunk/2DAEdit.h chitem/trunk/AreaProperties.cpp chitem/trunk/Chitem.cpp chitem/trunk/CreatureProperties.cpp chitem/trunk/Script.cpp chitem/trunk/ScriptEdit.cpp chitem/trunk/chitem.clw chitem/trunk/chitem.rc chitem/trunk/chitemDlg.cpp chitem/trunk/resource.h Modified: chitem/trunk/2DAEdit.cpp =================================================================== --- chitem/trunk/2DAEdit.cpp 2008-10-24 20:12:02 UTC (rev 5468) +++ chitem/trunk/2DAEdit.cpp 2008-10-24 20:13:35 UTC (rev 5469) @@ -101,12 +101,13 @@ ON_COMMAND(ID_TOOLS_CAPITALIZEENTRIES, OnToolsCapitalize) ON_COMMAND(ID_TOOLS_LOOKUPSTRREF, OnToolsLookupstrref) ON_BN_CLICKED(IDC_ORDER, OnOrder) + ON_COMMAND(ID_TOOLS_ADDSPARKDATA, OnToolsAddsparkdata) ON_EN_KILLFOCUS(IDC_DEFAULT, DefaultKillfocus) ON_COMMAND(ID_FILE_NEW, OnNew) ON_COMMAND(ID_FILE_LOAD, OnLoad) ON_COMMAND(ID_FILE_LOADEXTERNALSCRIPT, OnLoadex) ON_COMMAND(ID_FILE_SAVEAS, OnSaveas) - ON_COMMAND(ID_TOOLS_ADDSPARKDATA, OnToolsAddsparkdata) + ON_COMMAND(ID_TOOLS_PLAYSOUND, OnToolsPlaysound) //}}AFX_MSG_MAP ON_EN_KILLFOCUS(IDC_EDITLINK,OnKillfocusEditlink) ON_NOTIFY(NM_CUSTOMDRAW, IDC_2DA, OnCustomdrawMyList) @@ -752,7 +753,7 @@ CString *tmppoi; CString tmpstr; int i; - + if (m_item<0) { return; @@ -770,7 +771,7 @@ if(colordlg.DoModal()==IDOK) { unsigned long colors[5]; - + MakeGradientArray(colors, (unsigned char) colordlg.m_picked); for (i=0;i<5;i++) { @@ -786,13 +787,13 @@ POSITION pos; int i,j; CString *tmppoi; - + pos=the_2da.data->GetHeadPosition(); for(j=0;j<the_2da.cols;j++) { the_2da.collabels[j].MakeUpper(); } - for(i=0;i<the_2da.rows;i++) + for(i=0;i<the_2da.rows;i++) { tmppoi=(CString *) the_2da.data->GetNext(pos); for(j=0;j<the_2da.cols;j++) @@ -805,13 +806,22 @@ void C2DAEdit::OnToolsLookupstrref() { - CStrRefDlg dlg; - + CStrRefDlg dlg; + if(IsWindow(m_edit)) m_edit.DestroyWindow(); dlg.DoModal(); RefreshDialog(); } +void C2DAEdit::OnToolsPlaysound() +{ + CString tmpstr; + + tmpstr=m_2da_control.GetItemText(m_item,m_subitem); + tmpstr.MakeUpper(); + play_acm(tmpstr,false,false); +} + BOOL C2DAEdit::PreTranslateMessage(MSG* pMsg) { m_tooltip.RelayEvent(pMsg); @@ -1957,3 +1967,4 @@ m_tooltip.RelayEvent(pMsg); return CDialog::PreTranslateMessage(pMsg); } + Modified: chitem/trunk/2DAEdit.h =================================================================== --- chitem/trunk/2DAEdit.h 2008-10-24 20:12:02 UTC (rev 5468) +++ chitem/trunk/2DAEdit.h 2008-10-24 20:13:35 UTC (rev 5469) @@ -73,6 +73,7 @@ afx_msg void OnToolsLookupstrref(); afx_msg void OnOrder(); afx_msg void OnToolsAddsparkdata(); + afx_msg void OnToolsPlaysound(); //}}AFX_MSG afx_msg void OnKillfocusEditlink(); afx_msg void OnCustomdrawMyList ( NMHDR* pNMHDR, LRESULT* pResult ); Modified: chitem/trunk/AreaProperties.cpp =================================================================== --- chitem/trunk/AreaProperties.cpp 2008-10-24 20:12:02 UTC (rev 5468) +++ chitem/trunk/AreaProperties.cpp 2008-10-24 20:13:35 UTC (rev 5469) @@ -5911,8 +5911,8 @@ } static int animboxids[]={IDC_ANIMPICKER, IDC_POSX, IDC_POSY, IDC_BAM, -IDC_FRAME, IDC_CYCLE, IDC_FLAGS, IDC_U36, IDC_U38, IDC_U3A, IDC_U3C, -IDC_U3E, IDC_SKIPEXT, IDC_BMP, IDC_FLAG1, IDC_FLAG2, IDC_FLAG3, +IDC_FRAME, IDC_CYCLE, IDC_FLAGS, IDC_U36, IDC_U38, IDC_TRANSPARENT, IDC_U3C, +IDC_CHANCE, IDC_SKIPEXT, IDC_BMP, IDC_FLAG1, IDC_FLAG2, IDC_FLAG3, IDC_FLAG4, IDC_FLAG5, IDC_FLAG6, IDC_FLAG7, IDC_FLAG8, IDC_FLAG9, IDC_FLAG10, IDC_FLAG11, IDC_FLAG12, IDC_FLAG13, IDC_FLAG14, IDC_FLAG15, IDC_FLAG16, IDC_BAMFRAME, IDC_PLAY, IDC_SCHEDULE, IDC_REMOVE, IDC_COPY, @@ -5976,9 +5976,9 @@ DDX_Text(pDX, IDC_FLAGS, the_area.animheaders[m_animnum].flags); DDX_Text(pDX, IDC_U36,the_area.animheaders[m_animnum].unknown36); DDX_Text(pDX, IDC_U38,the_area.animheaders[m_animnum].height); - DDX_Text(pDX, IDC_U3A,the_area.animheaders[m_animnum].transparency); + DDX_Text(pDX, IDC_TRANSPARENT,the_area.animheaders[m_animnum].transparency); DDX_Text(pDX, IDC_U3C,the_area.animheaders[m_animnum].current); - DDX_Text(pDX, IDC_U3E,the_area.animheaders[m_animnum].progress); + DDX_Text(pDX, IDC_CHANCE,the_area.animheaders[m_animnum].progress); DDX_Text(pDX, IDC_SKIPEXT,the_area.animheaders[m_animnum].skipcycle); RetrieveResref(tmpstr, the_area.animheaders[m_animnum].bmp); @@ -6048,6 +6048,22 @@ m_tooltip.SetTipBkColor(RGB(240,224,160)); m_tooltip.AddTool(GetDlgItem(IDC_ANIMPICKER), IDS_LABEL); + m_tooltip.AddTool(GetDlgItem(IDC_FLAG1), IDS_AVISIBLE); + m_tooltip.AddTool(GetDlgItem(IDC_FLAG2), IDS_ABLEND); + m_tooltip.AddTool(GetDlgItem(IDC_FLAG3), IDS_ANOLIGHT); + m_tooltip.AddTool(GetDlgItem(IDC_FLAG4), IDS_APARTIAL); + m_tooltip.AddTool(GetDlgItem(IDC_FLAG5), IDS_ASYNC); + m_tooltip.AddTool(GetDlgItem(IDC_FLAG7), IDS_ANOWALL); + m_tooltip.AddTool(GetDlgItem(IDC_FLAG8), IDS_AFOG); + m_tooltip.AddTool(GetDlgItem(IDC_FLAG9), IDS_GROUND); + m_tooltip.AddTool(GetDlgItem(IDC_FLAG10), IDS_AALL); + m_tooltip.AddTool(GetDlgItem(IDC_FLAG11), IDS_APALETTE); + m_tooltip.AddTool(GetDlgItem(IDC_BMP), IDS_APALETTE); + m_tooltip.AddTool(GetDlgItem(IDC_BROWSE2), IDS_APALETTE); + m_tooltip.AddTool(GetDlgItem(IDC_FLAG12), IDS_AMIRROR); + m_tooltip.AddTool(GetDlgItem(IDC_FLAG13), IDS_ACOMBAT); + m_tooltip.AddTool(GetDlgItem(IDC_FLAG14), IDS_CHANCE); + m_tooltip.AddTool(GetDlgItem(IDC_TRANSPARENT), IDS_ATRANSP); } RefreshAnim(); return TRUE; @@ -6093,9 +6109,9 @@ ON_EN_KILLFOCUS(IDC_U38, DefaultKillfocus) ON_EN_KILLFOCUS(IDC_U3C, DefaultKillfocus) ON_EN_KILLFOCUS(IDC_BMP, DefaultKillfocus) - ON_EN_KILLFOCUS(IDC_U3A, DefaultKillfocus) + ON_EN_KILLFOCUS(IDC_TRANSPARENT, DefaultKillfocus) ON_EN_KILLFOCUS(IDC_SKIPEXT, DefaultKillfocus) - ON_EN_KILLFOCUS(IDC_U3E, DefaultKillfocus) + ON_EN_KILLFOCUS(IDC_CHANCE, DefaultKillfocus) //}}AFX_MSG_MAP END_MESSAGE_MAP() Modified: chitem/trunk/Chitem.cpp =================================================================== --- chitem/trunk/Chitem.cpp 2008-10-24 20:12:02 UTC (rev 5468) +++ chitem/trunk/Chitem.cpp 2008-10-24 20:13:35 UTC (rev 5469) @@ -821,7 +821,7 @@ pos=1; do { - len=temp.Find('\\',pos); + len=filename.Find('\\',pos); if(len<0) temp = filename; else { @@ -2761,7 +2761,7 @@ "specific","gender","alignment" }; -char *idsname[NUM_IDS]={"EA","GENERAL","RACE","CLASS","SPECIFIC","GENDER","ALIGN"}; +char *idsname[NUM_IDS]={"EA","GENERAL","RACE","CLASS","SPECIFIC","GENDER","ALIGNMEN"}; char *base_idsname_iwd[NUM_IDS]={"EA","GENERAL","RACE","CLASS","SPECIFIC","GENDER","ALIGNMEN"}; char *base_idsname_iwd2[NUM_IDS]={"EA","GENERAL","RACE","CLASS","SPECIFIC","GENDER","ALIGNMNT"}; Modified: chitem/trunk/CreatureProperties.cpp =================================================================== --- chitem/trunk/CreatureProperties.cpp 2008-10-24 20:12:02 UTC (rev 5468) +++ chitem/trunk/CreatureProperties.cpp 2008-10-24 20:13:35 UTC (rev 5469) @@ -297,7 +297,7 @@ cb=(CComboBox *) GetDlgItem(IDC_IDSALIGNMENT); if(pst_compatible_var()) FillCombo("ALIGN",cb,2); - else FillCombo(IDSName(ALIGN,false),cb,2); + else FillCombo(IDSName2(ALIGN,false),cb,2); cb=(CComboBox *) GetDlgItem(IDC_HATED); FillCombo("RACE",cb,2); Modified: chitem/trunk/Script.cpp =================================================================== --- chitem/trunk/Script.cpp 2008-10-24 20:12:02 UTC (rev 5468) +++ chitem/trunk/Script.cpp 2008-10-24 20:13:35 UTC (rev 5469) @@ -15,9 +15,9 @@ #endif static CString oidPST[9]={"FACTION","TEAM","EA","GENERAL","RACE","CLASS","SPECIFIC","GENDER","ALIGN"}; -static CString oidIWD[8]={"EA","GENERAL","RACE","CLASS","SPECIFIC","GENDER","ALIGN"}; +static CString oidIWD[8]={"EA","GENERAL","RACE","CLASS","SPECIFIC","GENDER","ALIGNMEN"}; static CString oidIWD2[10]={"EA","GENERAL","RACE","SUBRAC","CLASS","SPECIFIC","GENDER","ALIGN","",""}; -static CString oidBG[7]={"EA","GENERAL","RACE","CLASS","SPECIFIC","GENDER","ALIGN"}; +static CString oidBG[7]={"EA","GENERAL","RACE","CLASS","SPECIFIC","GENDER","ALIGNMEN"}; ////////////////////////////////////////////////////////////////////// // Construction/Destruction ////////////////////////////////////////////////////////////////////// Modified: chitem/trunk/ScriptEdit.cpp =================================================================== --- chitem/trunk/ScriptEdit.cpp 2008-10-24 20:12:02 UTC (rev 5468) +++ chitem/trunk/ScriptEdit.cpp 2008-10-24 20:13:35 UTC (rev 5469) @@ -274,8 +274,7 @@ } chdir(bgfolder); outpath.Format("override"); - mkdir(outpath); - if(!dir_exists(outpath)) + if(!assure_dir_exists(bgfolder+outpath)) { tmpstr.Format("%s cannot be created as output path.",outpath); MessageBox(tmpstr,"Dialog editor",MB_OK|MB_ICONSTOP); @@ -352,8 +351,7 @@ } } chdir(bgfolder); - mkdir(weidudecompiled); - if(!dir_exists(weidudecompiled)) + if(!assure_dir_exists(bgfolder+weidudecompiled)) { tmpstr.Format("%s cannot be created as output path.",weidudecompiled); MessageBox(tmpstr,"Dialog editor",MB_OK|MB_ICONSTOP); @@ -1127,7 +1125,7 @@ if(tmpstart==-1) ch=0; else { - line.Delete(tmpstart,len); + line.Delete(tmpstart,search.GetLength()); line.Insert(tmpstart,replace); found=true; } Modified: chitem/trunk/chitem.clw =================================================================== --- chitem/trunk/chitem.clw 2008-10-24 20:12:02 UTC (rev 5468) +++ chitem/trunk/chitem.clw 2008-10-24 20:13:35 UTC (rev 5469) @@ -2,7 +2,7 @@ [General Info] Version=1 -LastClass=CChitemDlg +LastClass=C2DAEdit LastTemplate=CDialog NewFileInclude1=#include "stdafx.h" NewFileInclude2=#include "chitem.h" @@ -232,134 +232,134 @@ Resource123=IDD_GAMEGENERAL Class98=IcewindCre Resource124=IDR_SHORTCUT -Resource125=IDD_CREATUREEFF (English (U.S.)) -Resource126=IDD_SPELLTOOL (English (U.S.)) -Resource127=IDD_GAMEPCINFO (English (U.S.)) -Resource128=IDD_AREASONGS (English (U.S.)) -Resource129=IDR_TREEMENU (English (U.S.)) -Resource130=IDR_EFFECT (English (U.S.)) -Resource131=IDD_SRCEDIT (English (U.S.)) -Resource132=IDD_ADDLINK (English (U.S.)) -Resource133=IDR_SPELL (English (U.S.)) -Resource134=IDD_CREATUREGENERAL (English (U.S.)) -Resource135=IDD_TISDIALOG (English (U.S.)) -Resource136=IDD_CREATUREICONS (English (U.S.)) -Resource137=IDD_GAMEGENERAL (English (U.S.)) -Resource138=IDD_STRREFDLG (English (U.S.)) -Resource139=IDD_2DAEDIT (English (U.S.)) -Resource140=IDD_ITEMGENERAL (English (U.S.)) -Resource141=IDD_AREACONTAINER (English (U.S.)) -Resource142=IDD_AREAAMBIENT (English (U.S.)) -Resource143=IDR_PROJECT (English (U.S.)) -Resource144=IDD_AREAENTRANCE (English (U.S.)) -Resource145=IDD_VVCEDIT (English (U.S.)) -Resource146=IDD_PROJEDIT (English (U.S.)) -Resource147=IDR_MENUBAR (English (U.S.)) -Resource148=IDD_SPELLEFFECT (English (U.S.)) -Resource149=IDD_KEYEDIT (English (U.S.)) -Resource150=IDD_AREAACTOR (English (U.S.)) -Resource151=IDR_TLKMENU (English (U.S.)) -Resource152=IDR_CREATURE (English (U.S.)) -Resource153=IDD_ITEMUSE (English (U.S.)) -Resource154=IDD_ITEMEQUIP (English (U.S.)) -Resource155=IDD_ANIMDIALOG -Resource156=IDR_ITEM (English (U.S.)) -Resource157=IDD_PALETTE (English (U.S.)) -Resource158=IDD_CREATUREEDIT (English (U.S.)) -Resource159=IDD_AREAINT (English (U.S.)) -Resource160=IDD_SPELLDESC (English (U.S.)) -Resource161=IDR_SCRIPT (English (U.S.)) -Resource162=IDD_AREASPAWN (English (U.S.)) -Resource163=IDD_WEDPOLY (English (U.S.)) -Resource164=IDR_TILE (English (U.S.)) -Resource165=IDD_WEDTILE (English (U.S.)) -Resource166=IDD_CREATUREIWD2 (English (U.S.)) -Resource167=IDD_CHECK (English (U.S.)) -Resource168=IDD_AREAMAP (English (U.S.)) -Resource169=IDD_DIALOGEDIT (English (U.S.)) -Resource170=IDD_POLYGON (English (U.S.)) -Resource171=IDD_COMPAT (English (U.S.)) -Resource172=IDD_SCRIPTEDIT (English (U.S.)) -Resource173=IDR_WORLDMAP (English (U.S.)) -Resource174=IDR_STORE (English (U.S.)) -Resource175=IDD_ITEMDESC (English (U.S.)) -Resource176=IDD_GAMESTATS (English (U.S.)) -Resource177=IDD_AREADOOR (English (U.S.)) -Resource178=IDD_AREAGENERAL (English (U.S.)) -Resource179=IDD_PANICBUTTON (English (U.S.)) -Resource180=IDD_MAPLINK (English (U.S.)) -Resource181=IDR_AREA (English (U.S.)) -Resource182=IDD_SPELLEDIT (English (U.S.)) -Resource183=IDD_MOSEDIT (English (U.S.)) -Resource184=IDR_BAMMENU (English (U.S.)) -Resource185=IDR_CHUI (English (U.S.)) -Resource186=IDD_CREATUREPST (English (U.S.)) -Resource187=IDD_IMAGEVIEW (English (U.S.)) -Resource188=IDD_PROJEXT (English (U.S.)) -Resource189=IDD_MASSCLEAR (English (U.S.)) -Resource190=IDD_CREATURERES (English (U.S.)) -Resource191=IDD_CHUIEDIT (English (U.S.)) -Resource192=IDD_ITEMPICKER (English (U.S.)) -Resource193=IDD_STORERENTAL (English (U.S.)) -Resource194=IDD_IDSEDIT (English (U.S.)) -Resource195=IDR_IDS (English (U.S.)) -Resource196=IDD_IAPDIALOG (English (U.S.)) -Resource197=IDR_SRC (English (U.S.)) -Resource198=IDD_WEDEDIT (English (U.S.)) -Resource199=IDD_WEIDU (English (U.S.)) -Resource200=IDD_AREATRIGGER (English (U.S.)) -Resource201=IDD_MAPEDIT (English (U.S.)) -Resource202=IDR_2DA (English (U.S.)) -Resource203=IDD_EXTRACT2 (English (U.S.)) -Resource204=IDD_EDIT (English (U.S.)) -Resource205=IDD_AREAEDIT (English (U.S.)) -Resource206=IDD_CREATURESTRINGS (English (U.S.)) -Resource207=IDD_CREATUREITEMS (English (U.S.)) -Resource208=IDD_CREATURESKILLS (English (U.S.)) -Resource209=IDD_PROGRESS (English (U.S.)) -Resource210=IDD_BAMEDIT (English (U.S.)) -Resource211=IDD_AREATRIGGERSTRINGS (English (U.S.)) -Resource212=IDD_STOREEXTRA (English (U.S.)) -Resource213=IDD_STOREDRINKS (English (U.S.)) -Resource214=IDD_FINDITEM (English (U.S.)) -Resource215=IDD_SPELLGENERAL (English (U.S.)) -Resource216=IDD_ITEMEXTRA (English (U.S.)) -Resource217=IDD_MUSEDIT (English (U.S.)) -Resource218=IDD_ABOUTBOX (English (U.S.)) -Resource219=IDD_STOREEDIT (English (U.S.)) -Resource220=IDD_SEARCHNODE (English (U.S.)) -Resource221=IDD_EFFEDIT (English (U.S.)) -Resource222=IDD_VARIABLES (English (U.S.)) -Resource223=IDD_STOREITEMS (English (U.S.)) -Resource224=IDD_TEXTVIEW (English (U.S.)) -Resource225=IDD_GAMEEDIT (English (U.S.)) -Resource226=IDD_CHITEM_DIALOG (English (U.S.)) -Resource227=IDD_EXTRACT (English (U.S.)) -Resource228=IDR_VVC (English (U.S.)) -Resource229=IDD_CREATUREIWD (English (U.S.)) -Resource230=IDD_CREATUREUNKNOWN (English (U.S.)) -Resource231=IDD_CFB (English (U.S.)) -Resource232=IDD_SAVHANDLE (English (U.S.)) -Resource233=IDD_SCHEDULE (English (U.S.)) -Resource234=IDR_GAME (English (U.S.)) -Resource235=IDD_AREAANIM (English (U.S.)) -Resource236=IDD_ITEMEFFECT (English (U.S.)) -Resource237=IDD_COLORPICKER (English (U.S.)) -Resource238=IDD_STOREGENERAL (English (U.S.)) -Resource239=IDD_CREATUREOVR (English (U.S.)) -Resource240=IDD_AREAVARIABLE (English (U.S.)) -Resource241=IDD_SPELLEQUIP (English (U.S.)) -Resource242=IDD_SHOWLOG (English (U.S.)) -Resource243=IDR_CHITIN (English (U.S.)) -Resource244=IDD_ITEMEDIT (English (U.S.)) -Resource245=IDD_SPELLEXTRA (English (U.S.)) +Resource125=IDD_BAMEDIT (English (U.S.)) +Resource126=IDD_SPELLDESC (English (U.S.)) +Resource127=IDD_AREATRIGGER (English (U.S.)) +Resource128=IDR_CHITIN (English (U.S.)) +Resource129=IDD_CREATURESTRINGS (English (U.S.)) +Resource130=IDD_IMAGEVIEW (English (U.S.)) +Resource131=IDD_CREATUREIWD (English (U.S.)) +Resource132=IDD_FINDITEM (English (U.S.)) +Resource133=IDD_AREASONGS (English (U.S.)) +Resource134=IDR_GAME (English (U.S.)) +Resource135=IDD_ITEMUSE (English (U.S.)) +Resource136=IDR_MUSIC (English (U.S.)) +Resource137=IDD_AREAENTRANCE (English (U.S.)) +Resource138=IDD_STORERENTAL (English (U.S.)) +Resource139=IDD_EXTRACT (English (U.S.)) +Resource140=IDD_WEDEDIT (English (U.S.)) +Resource141=IDD_AREAINT (English (U.S.)) +Resource142=IDD_ANIMDIALOG +Resource143=IDD_GAMEEDIT (English (U.S.)) +Resource144=IDR_SCRIPT (English (U.S.)) +Resource145=IDD_SPELLTOOL (English (U.S.)) +Resource146=IDR_TLKMENU (English (U.S.)) +Resource147=IDD_CREATURESKILLS (English (U.S.)) +Resource148=IDR_SPELL (English (U.S.)) +Resource149=IDD_SPELLEQUIP (English (U.S.)) +Resource150=IDD_AREAEDIT (English (U.S.)) +Resource151=IDD_SEARCHNODE (English (U.S.)) +Resource152=IDD_AREADOOR (English (U.S.)) +Resource153=IDD_CREATURERES (English (U.S.)) +Resource154=IDD_MASSCLEAR (English (U.S.)) +Resource155=IDD_ITEMGENERAL (English (U.S.)) +Resource156=IDD_CREATUREUNKNOWN (English (U.S.)) +Resource157=IDD_AREATRIGGERSTRINGS (English (U.S.)) +Resource158=IDR_2DA (English (U.S.)) +Resource159=IDD_WEIDU (English (U.S.)) +Resource160=IDR_ITEM (English (U.S.)) +Resource161=IDD_ADDLINK (English (U.S.)) +Resource162=IDR_PROJECT (English (U.S.)) +Resource163=IDD_SPELLGENERAL (English (U.S.)) +Resource164=IDD_MOSEDIT (English (U.S.)) +Resource165=IDD_GAMESTATS (English (U.S.)) +Resource166=IDD_CREATUREGENERAL (English (U.S.)) +Resource167=IDD_SAVHANDLE (English (U.S.)) +Resource168=IDR_VVC (English (U.S.)) +Resource169=IDD_CHECK (English (U.S.)) +Resource170=IDD_CREATUREOVR (English (U.S.)) +Resource171=IDD_SPELLEXTRA (English (U.S.)) +Resource172=IDD_EFFEDIT (English (U.S.)) +Resource173=IDD_AREAVARIABLE (English (U.S.)) +Resource174=IDD_AREAAMBIENT (English (U.S.)) +Resource175=IDR_WORLDMAP (English (U.S.)) +Resource176=IDR_TREEMENU (English (U.S.)) +Resource177=IDD_ABOUTBOX (English (U.S.)) +Resource178=IDR_AREA (English (U.S.)) +Resource179=IDD_ITEMEXTRA (English (U.S.)) +Resource180=IDD_ITEMEQUIP (English (U.S.)) +Resource181=IDD_AREACONTAINER (English (U.S.)) +Resource182=IDR_STORE (English (U.S.)) +Resource183=IDD_ITEMPICKER (English (U.S.)) +Resource184=IDR_MENUBAR (English (U.S.)) +Resource185=IDD_2DAEDIT (English (U.S.)) +Resource186=IDD_SCHEDULE (English (U.S.)) +Resource187=IDD_SCRIPTEDIT (English (U.S.)) +Resource188=IDD_ITEMEDIT (English (U.S.)) +Resource189=IDD_ITEMDESC (English (U.S.)) +Resource190=IDR_CHUI (English (U.S.)) +Resource191=IDD_SPELLEFFECT (English (U.S.)) +Resource192=IDD_KEYEDIT (English (U.S.)) +Resource193=IDD_CREATUREPST (English (U.S.)) +Resource194=IDD_VVCEDIT (English (U.S.)) +Resource195=IDD_MAPLINK (English (U.S.)) +Resource196=IDD_EDIT (English (U.S.)) +Resource197=IDD_IDSEDIT (English (U.S.)) +Resource198=IDD_PALETTE (English (U.S.)) +Resource199=IDD_AREAANIM (English (U.S.)) +Resource200=IDD_EXTRACT2 (English (U.S.)) +Resource201=IDD_ITEMICONS (English (U.S.)) +Resource202=IDD_COLORPICKER (English (U.S.)) +Resource203=IDR_EFFECT (English (U.S.)) +Resource204=IDD_CFB (English (U.S.)) +Resource205=IDR_CREATURE (English (U.S.)) +Resource206=IDR_SRC (English (U.S.)) +Resource207=IDD_ITEMEFFECT (English (U.S.)) +Resource208=IDR_TILE (English (U.S.)) +Resource209=IDD_PANICBUTTON (English (U.S.)) +Resource210=IDD_SPELLEDIT (English (U.S.)) +Resource211=IDD_CREATUREEDIT (English (U.S.)) +Resource212=IDD_GAMEPCINFO (English (U.S.)) +Resource213=IDD_AREAGENERAL (English (U.S.)) +Resource214=IDD_MUSEDIT (English (U.S.)) +Resource215=IDD_CREATUREIWD2 (English (U.S.)) +Resource216=IDD_GAMEGENERAL (English (U.S.)) +Resource217=IDD_STOREEXTRA (English (U.S.)) +Resource218=IDD_SHOWLOG (English (U.S.)) +Resource219=IDD_SRCEDIT (English (U.S.)) +Resource220=IDD_PROGRESS (English (U.S.)) +Resource221=IDD_POLYGON (English (U.S.)) +Resource222=IDD_TEXTVIEW (English (U.S.)) +Resource223=IDD_STOREDRINKS (English (U.S.)) +Resource224=IDR_IDS (English (U.S.)) +Resource225=IDD_MAPEDIT (English (U.S.)) +Resource226=IDD_STRREFDLG (English (U.S.)) +Resource227=IDD_WEDTILE (English (U.S.)) +Resource228=IDD_PROJEXT (English (U.S.)) +Resource229=IDD_AREASPAWN (English (U.S.)) +Resource230=IDR_WEDMENU (English (U.S.)) +Resource231=IDD_CHUIEDIT (English (U.S.)) +Resource232=IDD_COMPAT (English (U.S.)) +Resource233=IDD_AREAACTOR (English (U.S.)) +Resource234=IDD_DIALOGEDIT (English (U.S.)) +Resource235=IDD_STOREITEMS (English (U.S.)) +Resource236=IDD_TISDIALOG (English (U.S.)) +Resource237=IDD_STOREGENERAL (English (U.S.)) +Resource238=IDD_AREAMAP (English (U.S.)) +Resource239=IDD_CREATUREICONS (English (U.S.)) +Resource240=IDD_CHITEM_DIALOG (English (U.S.)) +Resource241=IDR_BAMMENU (English (U.S.)) +Resource242=IDD_VARIABLES (English (U.S.)) +Resource243=IDD_IAPDIALOG (English (U.S.)) +Resource244=IDD_CREATUREEFF (English (U.S.)) +Resource245=IDD_PROJEDIT (English (U.S.)) Class99=CAreaTriggerString Class100=CPCInfo -Resource246=IDR_MUSIC (English (U.S.)) +Resource246=IDD_CREATUREITEMS (English (U.S.)) Class101=CCreatureOverlay -Resource247=IDD_ITEMICONS (English (U.S.)) +Resource247=IDD_WEDPOLY (English (U.S.)) Class102=IWD2Creature -Resource248=IDR_WEDMENU (English (U.S.)) +Resource248=IDD_STOREEDIT (English (U.S.)) Class103=CAnimDialog Resource249=IDR_SHORTCUT (English (U.S.)) @@ -4165,7 +4165,7 @@ ImplementationFile=2DAEdit.cpp BaseClass=CDialog Filter=D -LastObject=IDC_2DA +LastObject=ID_TOOLS_PLAYSOUND VirtualFilter=dWC [DLG:IDD_IDSEDIT] @@ -8711,8 +8711,8 @@ Control51=IDC_STATIC,static,1342308352 Control52=IDC_STATIC,static,1342308352 Control53=IDC_STATIC,static,1342308352 -Control54=IDC_U3A,edit,1350631552 -Control55=IDC_U3E,edit,1350631552 +Control54=IDC_TRANSPARENT,edit,1350631552 +Control55=IDC_CHANCE,edit,1350631552 Control56=IDC_STATIC,static,1342308352 [DLG:IDD_SCRIPTEDIT (English (U.S.))] @@ -9905,7 +9905,7 @@ [MNU:IDR_2DA (English (U.S.))] Type=1 -Class=? +Class=C2DAEdit Command1=ID_FILE_NEW Command2=ID_FILE_LOAD Command3=ID_FILE_LOADEXTERNALSCRIPT @@ -9917,7 +9917,8 @@ Command9=ID_TOOLS_ADDSPARKDATA Command10=ID_TOOLS_CAPITALIZEENTRIES Command11=ID_TOOLS_LOOKUPSTRREF -CommandCount=11 +Command12=ID_TOOLS_PLAYSOUND +CommandCount=12 [MNU:IDR_IDS (English (U.S.))] Type=1 Modified: chitem/trunk/chitem.rc =================================================================== --- chitem/trunk/chitem.rc 2008-10-24 20:12:02 UTC (rev 5468) +++ chitem/trunk/chitem.rc 2008-10-24 20:13:35 UTC (rev 5469) @@ -3496,7 +3496,7 @@ EXSTYLE WS_EX_CONTROLPARENT CAPTION "Edit game:" MENU IDR_GAME -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN COMBOBOX IDC_NPCPICKER,11,13,145,230,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP @@ -4038,8 +4038,8 @@ WS_TABSTOP,13,126,79,10 CONTROL "Invisible in fog",IDC_FLAG8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,137,61,10 - CONTROL "Transparent",IDC_FLAG9,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,93,60,54,10 + CONTROL "Ground",IDC_FLAG9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 93,60,39,10 CONTROL "Draw all cycles",IDC_FLAG10,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,71,63,10 CONTROL "Use palette BMP",IDC_FLAG11,"Button",BS_AUTOCHECKBOX | @@ -4088,8 +4088,8 @@ LTEXT "Skip cycles",IDC_STATIC,373,33,37,8 LTEXT "Palette BMP",IDC_STATIC,171,33,40,8 LTEXT "Transparency",IDC_STATIC,373,7,44,8 - EDITTEXT IDC_U3A,373,17,40,14,ES_AUTOHSCROLL - EDITTEXT IDC_U3E,307,43,20,14,ES_AUTOHSCROLL + EDITTEXT IDC_TRANSPARENT,373,17,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_CHANCE,307,43,20,14,ES_AUTOHSCROLL LTEXT "Chance of progress",IDC_STATIC,307,33,62,8 END @@ -6092,8 +6092,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 7,0,0,11 - PRODUCTVERSION 7,0,0,11 + FILEVERSION 7,1,0,1 + PRODUCTVERSION 7,1,0,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -6111,14 +6111,14 @@ VALUE "Comments", "www.dragonlancetc.com\0" VALUE "CompanyName", "GemRB Project (gemrb.sourceforge.net)\0" VALUE "FileDescription", "DragonLance Total Conversion Editor Pro\0" - VALUE "FileVersion", "7, 0, 0, 11\0" + VALUE "FileVersion", "7, 1, 0, 1\0" VALUE "InternalName", "dltcep\0" - VALUE "LegalCopyright", "Copyright (C) 2002-2007 Avenger\0" + VALUE "LegalCopyright", "Copyright (C) 2002-2008 Avenger\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "chitem.EXE\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "DLTC Editor Pro 7.0k\0" - VALUE "ProductVersion", "7, 0, 0, 11\0" + VALUE "ProductName", "DLTC Editor Pro 7.1b\0" + VALUE "ProductVersion", "7, 1, 0, 1\0" VALUE "SpecialBuild", "\0" END END @@ -6724,6 +6724,7 @@ MENUITEM "&Add spark data", ID_TOOLS_ADDSPARKDATA MENUITEM "&Capitalize entries", ID_TOOLS_CAPITALIZEENTRIES MENUITEM "&Edit strings", ID_TOOLS_LOOKUPSTRREF + MENUITEM "&Play sound", ID_TOOLS_PLAYSOUND END END @@ -7472,8 +7473,26 @@ IDS_FIELDS "1-creature isn't embedded\n8-creature's scripting name overridden" IDS_LABEL "To edit this field, remove the number from the beginning." IDS_EXPIRATION "This field exists in bg2, the item will expire after x hours." + IDS_AVISIBLE "Set it to make the animation visible." + IDS_ABLEND "Per pixel transparency. The darker the pixel, the more transparent it is." + IDS_ANOLIGHT "The animation will be affected by darkness effects (weather, time of day)" + IDS_APARTIAL "The animation will stop after the last frame, it won't restart." + IDS_ASYNC "The animation will start synchronised with other similarly flagged animations. Otherwise its beginning is random." + IDS_ANOWALL "The animation will be always drawn over wall covers." + IDS_AFOG "???" + IDS_ATRANSP "Per surface transparency, 255=invisible. Cannot use with blending." + IDS_AALL "Used for very large animations where a single BAM contains multiple cycles." + IDS_APALETTE "Uses a separate BMP palette, see the palette field." + IDS_AMIRROR "Mirror the animation on the X-axis." + IDS_ACOMBAT "Don't remove the animation in combat, on low settings." + IDS_CHANCE "The chance of drawing the animation. (default:100)" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_GROUND "The animation is covered by actors." +END + #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// Modified: chitem/trunk/chitemDlg.cpp =================================================================== --- chitem/trunk/chitemDlg.cpp 2008-10-24 20:12:02 UTC (rev 5468) +++ chitem/trunk/chitemDlg.cpp 2008-10-24 20:13:35 UTC (rev 5469) @@ -3,7 +3,7 @@ #include "stdafx.h" -#define PRG_VERSION "7.1" +#define PRG_VERSION "7.1b" #include <fcntl.h> #include <direct.h> @@ -798,6 +798,8 @@ MessageBox("trigger.ids is wrong, triggers won't be resolved.","Warning",MB_ICONEXCLAMATION|MB_OK); break; } + + get_idsfile("ALIGNMEN",1); /* idrefs.Lookup("RACE",tmploc); val=ReadIds(tmploc, race_names,1); Modified: chitem/trunk/resource.h =================================================================== --- chitem/trunk/resource.h 2008-10-24 20:12:02 UTC (rev 5468) +++ chitem/trunk/resource.h 2008-10-24 20:13:35 UTC (rev 5469) @@ -306,6 +306,20 @@ #define IDS_FIELDS 272 #define IDS_LABEL 273 #define IDS_EXPIRATION 274 +#define IDS_AVISIBLE 275 +#define IDS_ABLEND 276 +#define IDS_ANOLIGHT 277 +#define IDS_APARTIAL 278 +#define IDS_ASYNC 279 +#define IDS_ANOWALL 280 +#define IDS_AFOG 281 +#define IDS_ATRANSP 282 +#define IDS_AALL 283 +#define IDS_APALETTE 284 +#define IDS_AMIRROR 285 +#define IDS_ACOMBAT 286 +#define IDS_CHANCE 287 +#define IDS_GROUND 288 #define IDC_RESCAN 1000 #define IDC_RESCAN2 1001 #define IDC_ICONCHK 1002 @@ -1828,6 +1842,7 @@ #define ID_OPTIONS_LOGGING 33042 #define ID_FILE_TP2 33043 #define ID_EXTRACTION_RECOMPRESSSAV 33044 +#define ID_TOOLS_PLAYSOUND 33045 #define ID_CONTEXT 0xF180 // Next default values for new objects @@ -1835,7 +1850,7 @@ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 233 -#define _APS_NEXT_COMMAND_VALUE 33045 +#define _APS_NEXT_COMMAND_VALUE 33046 #define _APS_NEXT_CONTROL_VALUE 2334 #define _APS_NEXT_SYMED_VALUE 120 #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-10-26 20:59:50
|
Revision: 5471 http://gemrb.svn.sourceforge.net/gemrb/?rev=5471&view=rev Author: avenger_teambg Date: 2008-10-26 20:59:40 +0000 (Sun, 26 Oct 2008) Log Message: ----------- dltcep update (allow editing of iwd2 creature spells, levels) Modified Paths: -------------- chitem/trunk/2da.cpp chitem/trunk/2da.h chitem/trunk/Chitem.cpp chitem/trunk/Chitem.h chitem/trunk/CreatureProperties.cpp chitem/trunk/CreatureProperties.h chitem/trunk/chitem.clw chitem/trunk/chitem.dsp chitem/trunk/chitem.rc chitem/trunk/chitemDlg.cpp chitem/trunk/creature.cpp chitem/trunk/creature.h chitem/trunk/resource.h Added Paths: ----------- chitem/trunk/CreatureLevels.cpp chitem/trunk/CreatureLevels.h Modified: chitem/trunk/2da.cpp =================================================================== --- chitem/trunk/2da.cpp 2008-10-26 20:56:37 UTC (rev 5470) +++ chitem/trunk/2da.cpp 2008-10-26 20:59:40 UTC (rev 5471) @@ -563,6 +563,64 @@ return Read2daIntFromFile(fhandle, refs, entry.size); } +int Read2daResRefFromFile(int fhandle, CIntMapString &refs, int length, int column) +{ + char tmpref[MAXIDSIZE]; + CString ref; + FILE *fpoi; + int ret, val; + + if(length<0) maxlength=filelength(fhandle); + else maxlength=length; + fpoi=fdopen(fhandle,"rb"); + if(!fpoi) + { + close(fhandle); + return -1; + } + read_string(fpoi, "\n"); //skipping crap + read_string(fpoi, "\n"); //skipping crap + read_string(fpoi, "\n"); //skipping crap + do + { + if(read_string(fpoi, " ",tmpref,sizeof(tmpref)) ) + { + tmpref[MAXIDSIZE-1]=0; + val=atoi(tmpref); + int c = column; + while(c--) + { + if(!read_string(fpoi, " ",tmpref,sizeof(tmpref))) + { + fclose(fpoi); + return -1; + } + } + ret=read_string(fpoi,"\n", tmpref,sizeof(tmpref)); + if(!ret) break; + tmpref[MAXIDSIZE-1]=0; + ref=tmpref; + ref.MakeUpper(); + refs[val]=ref; + } + else break; + } + while(1); + fclose(fpoi); + return 0; +} + +int Read2daResRef(loc_entry entry, CIntMapString &refs, int removeall, int skipcolumn) +{ + int fhandle; + + if(removeall) refs.RemoveAll(); + xorflag=position=0; + fhandle=locate_file(entry, 0); + if(fhandle<1) return -1; + return Read2daResRefFromFile(fhandle, refs, entry.size, skipcolumn); +} + int Read2daField(CString daname, int line, int column) { char tmpref[MAXIDSIZE]; Modified: chitem/trunk/2da.h =================================================================== --- chitem/trunk/2da.h 2008-10-26 20:56:37 UTC (rev 5470) +++ chitem/trunk/2da.h 2008-10-26 20:59:40 UTC (rev 5471) @@ -185,6 +185,7 @@ int Read2daStrref(loc_entry entry, CIntMapInt &refs, int column); int Read2daArray(loc_entry entry, CStringMapArray &refs, int columns); //maximum 3 int Read2daInt(loc_entry entry, CStringMapInt &refs, int removeall); +int Read2daResRef(loc_entry entry, CIntMapString &refs, int removeall, int skipcolumn=0); int Read2daField(CString daname, int line, int column); int Read2daColumn(loc_entry entry, CStringList &refs, int column, bool caps); int ReadIds(loc_entry entry, CStringList &refs, int add); Modified: chitem/trunk/Chitem.cpp =================================================================== --- chitem/trunk/Chitem.cpp 2008-10-26 20:56:37 UTC (rev 5470) +++ chitem/trunk/Chitem.cpp 2008-10-26 20:59:40 UTC (rev 5471) @@ -188,6 +188,11 @@ CString action_defs[MAX_ACTION]; CString trigger_defs[MAX_TRIGGER]; CStringMapCStringMapInt idsmaps; //this is a cstring map to a cstringmapint +CIntMapString listspells; //iwd2 spell list (number to resref mapping) +CIntMapString listdomains; //iwd2 domain spell list (number to resref mapping) +CIntMapString listinnates; //iwd2 innate list (number to resref mapping) +CIntMapString listsongs; //iwd2 song list (number to resref mapping) +CIntMapString listshapes; //iwd2 wildshape list (number to resref mapping) CColorPicker colordlg; CItemPicker pickerdlg; Modified: chitem/trunk/Chitem.h =================================================================== --- chitem/trunk/Chitem.h 2008-10-26 20:56:37 UTC (rev 5470) +++ chitem/trunk/Chitem.h 2008-10-26 20:59:40 UTC (rev 5471) @@ -743,6 +743,11 @@ extern int has_duration[]; extern CStringMapGameProps allgameprops; extern CStringMapCStringMapInt idsmaps; +extern CIntMapString listspells; +extern CIntMapString listdomains; +extern CIntMapString listinnates; +extern CIntMapString listsongs; +extern CIntMapString listshapes; //area animation flags #define AA_MIRROR 2048 Added: chitem/trunk/CreatureLevels.cpp =================================================================== --- chitem/trunk/CreatureLevels.cpp (rev 0) +++ chitem/trunk/CreatureLevels.cpp 2008-10-26 20:59:40 UTC (rev 5471) @@ -0,0 +1,87 @@ +// CreatureLevels.cpp : implementation file +// + +#include "stdafx.h" +#include "chitem.h" +#include "CreatureLevels.h" + +#ifdef _DEBUG +#define new DEBUG_NEW +#undef THIS_FILE +static char THIS_FILE[] = __FILE__; +#endif + +///////////////////////////////////////////////////////////////////////////// +// CCreatureLevels dialog + + +CCreatureLevels::CCreatureLevels(CWnd* pParent /*=NULL*/) + : CDialog(CCreatureLevels::IDD, pParent) +{ + //{{AFX_DATA_INIT(CCreatureLevels) + // NOTE: the ClassWizard will add member initialization here + //}}AFX_DATA_INIT +} + + +void CCreatureLevels::DoDataExchange(CDataExchange* pDX) +{ + int i; + + CDialog::DoDataExchange(pDX); + //{{AFX_DATA_MAP(CCreatureLevels) + // NOTE: the ClassWizard will add DDX and DDV calls here + //}}AFX_DATA_MAP + + DDX_Text(pDX, IDC_U1, the_creature.iwd2header.totlevel); + + for(i=0;i<11;i++) + { + DDX_Text(pDX, IDC_U2+i, the_creature.iwd2header.levels[i]); + } +} + + +BEGIN_MESSAGE_MAP(CCreatureLevels, CDialog) + //{{AFX_MSG_MAP(CCreatureLevels) + ON_EN_KILLFOCUS(IDC_U1, OnDefaultKillfocus) + ON_EN_KILLFOCUS(IDC_U2, OnDefaultKillfocus) + ON_EN_KILLFOCUS(IDC_U3, OnDefaultKillfocus) + ON_EN_KILLFOCUS(IDC_U4, OnDefaultKillfocus) + ON_EN_KILLFOCUS(IDC_U5, OnDefaultKillfocus) + ON_EN_KILLFOCUS(IDC_U6, OnDefaultKillfocus) + ON_EN_KILLFOCUS(IDC_U7, OnDefaultKillfocus) + ON_EN_KILLFOCUS(IDC_U8, OnDefaultKillfocus) + ON_EN_KILLFOCUS(IDC_U9, OnDefaultKillfocus) + ON_EN_KILLFOCUS(IDC_U10, OnDefaultKillfocus) + ON_EN_KILLFOCUS(IDC_U11, OnDefaultKillfocus) + ON_EN_KILLFOCUS(IDC_U12, OnDefaultKillfocus) + //}}AFX_MSG_MAP +END_MESSAGE_MAP() + +///////////////////////////////////////////////////////////////////////////// +// CCreatureLevels message handlers + +BOOL CCreatureLevels::OnInitDialog() +{ + CDialog::OnInitDialog(); + + GetDlgItem(IDC_U1)->EnableWindow(0); + + UpdateData(UD_DISPLAY); + return TRUE; +} + +void CCreatureLevels::OnDefaultKillfocus() +{ + int i, sum; + + UpdateData(UD_RETRIEVE); + sum=0; + for(i=0;i<11;i++) + { + sum+=the_creature.iwd2header.levels[i]; + } + the_creature.iwd2header.totlevel=(unsigned char) sum; + UpdateData(UD_DISPLAY); +} Added: chitem/trunk/CreatureLevels.h =================================================================== --- chitem/trunk/CreatureLevels.h (rev 0) +++ chitem/trunk/CreatureLevels.h 2008-10-26 20:59:40 UTC (rev 5471) @@ -0,0 +1,47 @@ +#if !defined(AFX_CREATURELEVELS_H__A9D27295_914D_4D8D_B376_6176E32F6382__INCLUDED_) +#define AFX_CREATURELEVELS_H__A9D27295_914D_4D8D_B376_6176E32F6382__INCLUDED_ + +#if _MSC_VER > 1000 +#pragma once +#endif // _MSC_VER > 1000 +// CreatureLevels.h : header file +// + +///////////////////////////////////////////////////////////////////////////// +// CCreatureLevels dialog + +class CCreatureLevels : public CDialog +{ +// Construction +public: + CCreatureLevels(CWnd* pParent = NULL); // standard constructor + +// Dialog Data + //{{AFX_DATA(CCreatureLevels) + enum { IDD = IDD_CREATURELEVELS }; + // NOTE: the ClassWizard will add data members here + //}}AFX_DATA + + +// Overrides + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(CCreatureLevels) + protected: + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + //}}AFX_VIRTUAL + +// Implementation +protected: + + // Generated message map functions + //{{AFX_MSG(CCreatureLevels) + virtual BOOL OnInitDialog(); + afx_msg void OnDefaultKillfocus(); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() +}; + +//{{AFX_INSERT_LOCATION}} +// Microsoft Visual C++ will insert additional declarations immediately before the previous line. + +#endif // !defined(AFX_CREATURELEVELS_H__A9D27295_914D_4D8D_B376_6176E32F6382__INCLUDED_) Modified: chitem/trunk/CreatureProperties.cpp =================================================================== --- chitem/trunk/CreatureProperties.cpp 2008-10-26 20:56:37 UTC (rev 5470) +++ chitem/trunk/CreatureProperties.cpp 2008-10-26 20:59:40 UTC (rev 5471) @@ -10,6 +10,7 @@ #include "TormentCre.h" #include "IcewindCre.h" #include "IWD2Creature.h" +#include "CreatureLevels.h" #include "2da.h" #include "tbg.h" #include "options.h" @@ -69,6 +70,7 @@ CString tmpstr; creature_header tmpheader; int value; + int i, flg; memcpy(&tmpheader,&the_creature.header,sizeof(creature_header) ); CPropertyPage::DoDataExchange(pDX); @@ -218,6 +220,14 @@ tmpstr=FindKit(the_creature.header.kit); DDX_Text(pDX,IDC_KIT,tmpstr); the_creature.header.kit=strtonum(tmpstr); + + flg =(the_creature.revision==22); + for(i=0;i<3;i++) + { + GetDlgItem(IDC_LEVEL1+i)->ShowWindow(!flg); + } + GetDlgItem(IDC_LEVELSLOT)->ShowWindow(flg); + if(memcmp(&tmpheader,&the_creature.header,sizeof(creature_header) )) { the_creature.m_changed=true; @@ -351,6 +361,7 @@ ON_BN_CLICKED(IDC_NEW1, OnNew1) ON_BN_CLICKED(IDC_NEW2, OnNew2) ON_CBN_KILLFOCUS(IDC_KIT, OnKillfocusKit) + ON_BN_CLICKED(IDC_LEVELSLOT, OnLevelslot) //}}AFX_MSG_MAP END_MESSAGE_MAP() ///////////////////////////////////////////////////////////////////////////// @@ -607,23 +618,35 @@ void CCreatureGeneral::OnV10() { the_creature.revision=10; + UpdateData(UD_DISPLAY); } void CCreatureGeneral::OnV22() { the_creature.revision=22; + UpdateData(UD_DISPLAY); } void CCreatureGeneral::OnV90() { the_creature.revision=90; + UpdateData(UD_DISPLAY); } void CCreatureGeneral::OnV12() { the_creature.revision=12; + UpdateData(UD_DISPLAY); } +//iwd2 levels +void CCreatureGeneral::OnLevelslot() +{ + CCreatureLevels dlg; + + dlg.DoModal(); +} + BOOL CCreatureGeneral::PreTranslateMessage(MSG* pMsg) { m_tooltip.RelayEvent(pMsg); @@ -2382,7 +2405,7 @@ static int flagboxids[]={IDC_IDENTIFIED, IDC_NOSTEAL, IDC_STOLEN, IDC_UNDROPPABLE, 0}; -static int spellboxids[]={IDC_SPELLPICKER, IDC_MEMORISED, IDC_FORGET, +static int spellboxids[]={IDC_SPELLPICKER, IDC_MEMORISED, IDC_FORGET, IDC_MEMORISED2, IDC_TOTAL, 0}; static int levelboxids[]={ @@ -2390,6 +2413,16 @@ IDC_MEMORISE, IDC_SPELLRES, IDC_BROWSE2, 0}; +static int noiwd2levelboxids[]={ + IDC_BOOKPICKER, IDC_BROWSE3, IDC_ADD, IDC_REMOVE, IDC_SPELLRES2, IDC_SPELLTYPE2, IDC_LEVEL2, + IDC_STATIC4, IDC_STATIC5, IDC_STATIC6, IDC_BOOK, IDC_BOOK2, + IDC_LEVEL, IDC_SPELLTYPE, IDC_DELSLOT,IDC_ADDSLOT, IDC_MEMORISED, IDC_STATIC1, +0}; + +static int nobg2levelboxids[]={ + IDC_MEMORISED2, IDC_TOTAL, IDC_STATIC2, IDC_STATIC3, +0}; + static int bookboxids[]={IDC_LEVEL2, IDC_SPELLTYPE2, IDC_REMOVE, IDC_BOOK2, IDC_BOOKPICKER, 0}; @@ -2409,6 +2442,42 @@ return pos; } +CIntMapString *CCreatureItem::GetIWD2SpellList(int pos) +{ + if(pos<9*7) return &listspells; + if(pos<9*8) return &listdomains; + if(pos==9*8) return &listinnates; + if(pos==9*8+1) return &listshapes; + if(pos==9*8+2) return &listsongs; + abort(); +} + +CString CCreatureItem::ResolveIWD2SpellResRef(int spid, int type) +{ + CIntMapString *list = GetIWD2SpellList(type); + if (!list) return ""; + return (*list)[spid]; +} + +int CCreatureItem::ResolveIWD2SpellID(CString resref, int type) +{ + POSITION pos; + + CIntMapString *list = GetIWD2SpellList(type); + if (!list) return -1; + + pos=list->GetStartPosition(); + while(pos) + { + CString resource; + int key; + + list->GetNextAssoc(pos, key, resource); + if(!resource.CompareNoCase(resref)) return key; + } + return -1; +} + CString CCreatureItem::ResolveSpellName(CString key) { Cspell tmpspell; @@ -2511,68 +2580,92 @@ //spells section pos=m_levelpicker.GetCurSel(); - flg=(pos>=0) && (pos<the_creature.selectcount); + if(the_creature.revision==22) + { + flg=(pos>=0) && (pos<IWD2_SPELLCOUNT); + } + else + { + flg=(pos>=0) && (pos<the_creature.selectcount); + } if(flg) { - DDX_Text(pDX,IDC_MIN, the_creature.selects[pos].num1); - DDX_Text(pDX,IDC_MAX, the_creature.selects[pos].num2); - j=the_creature.selects[pos].spelltype; - DDX_CBIndex(pDX, IDC_SPELLTYPE, j); - the_creature.selects[pos].spelltype=(short) j; - j=the_creature.selects[pos].level+1; - DDX_Text(pDX, IDC_LEVEL,j); - //range checks - /* - if(iwd2_structures()) + if(the_creature.revision==22) { - DDV_MinMaxInt(pDX,j,1,9); + //DDX_Text(pDX,IDC_MIN, the_creature.iwd2_counts[pos]); + DDX_Text(pDX,IDC_MIN, the_creature.iwd2_free[pos].free); + DDX_Text(pDX,IDC_MAX, the_creature.iwd2_free[pos].maximum); + j=pos; + DDX_CBIndex(pDX, IDC_SPELLTYPE, j); + if(pos<8*9) j=pos%9+1; + else j=1; + DDX_Text(pDX, IDC_LEVEL,j); } else { - switch(the_creature.selects[pos].spelltype) - { - case 0: - DDV_MinMaxInt(pDX,j,1,7); - break; - case 1: - DDV_MinMaxInt(pDX,j,1,9); - break; - default: - DDV_MinMaxInt(pDX,j,1,1); - } + DDX_Text(pDX,IDC_MIN, the_creature.selects[pos].num1); + DDX_Text(pDX,IDC_MAX, the_creature.selects[pos].num2); + j=the_creature.selects[pos].spelltype; + DDX_CBIndex(pDX, IDC_SPELLTYPE, j); + the_creature.selects[pos].spelltype=(short) j; + j=the_creature.selects[pos].level+1; + DDX_Text(pDX, IDC_LEVEL,j); + DDV_MinMaxInt(pDX,j,1,9); //simplified range check + the_creature.selects[pos].level=(short) (j-1); } - */ - DDV_MinMaxInt(pDX,j,1,9); //simplified range check - the_creature.selects[pos].level=(short) (j-1); pos2=m_spellpicker.GetCurSel(); - flg2=(pos2>=0) && (pos2<the_creature.selects[pos].count); - if(flg2) + if(the_creature.revision==22) { -/* - m_spellslot=pos2+the_creature.selects[pos].index; - RetrieveResref(tmpstr,the_creature.memos[m_spellslot].resref); - DDX_Text(pDX, IDC_SPELLRES,tmpstr); - DDV_MaxChars(pDX, tmpstr, 8); - StoreResref(tmpstr,the_creature.memos[m_spellslot].resref); -*/ - - tmpstr=ResolveSpellName(m_spellres); - DDX_Text(pDX, IDC_SPELLNAME, tmpstr); - + flg2=(pos2>=0) && (pos2<the_creature.iwd2_counts[pos]); + if(flg2) + { + tmpstr=ResolveSpellName(m_spellres); + DDX_Text(pDX, IDC_SPELLNAME, tmpstr); + DDX_Text(pDX, IDC_TOTAL, the_creature.iwd2_spells[pos][pos2].total); + DDX_Text(pDX, IDC_MEMORISED2, the_creature.iwd2_spells[pos][pos2].remaining); + } + } + else + { cb=(CButton *) GetDlgItem(IDC_MEMORISED); - cb->SetCheck(!!the_creature.memos[m_spellslot].flags); - } + flg2=(pos2>=0) && (pos2<the_creature.selects[pos].count); + if(flg2) + { + tmpstr=ResolveSpellName(m_spellres); + DDX_Text(pDX, IDC_SPELLNAME, tmpstr); + + cb->SetCheck(!!the_creature.memos[m_spellslot].flags); + } + } } else flg2=0; for(i=0;levelboxids[i];i++) { GetDlgItem(levelboxids[i])->EnableWindow(flg); } + for(i=0;spellboxids[i];i++) { GetDlgItem(spellboxids[i])->EnableWindow(flg2); } + + if(the_creature.revision==22) + { + for(i=0;noiwd2levelboxids[i];i++) + { + GetDlgItem(noiwd2levelboxids[i])->ShowWindow(0); + } + GetDlgItem(IDC_MIN)->EnableWindow(0); + } + else + { + for(i=0;i<nobg2levelboxids[i];i++) + { + GetDlgItem(nobg2levelboxids[i])->ShowWindow(0); + } + } + //books pos=m_bookpicker.GetCurSel(); flg=(pos>=0) && (pos<the_creature.bookcount); @@ -2694,13 +2787,27 @@ pos=m_levelpicker.GetCurSel(); if(pos<0) pos=0; m_levelpicker.ResetContent(); - m_maxslot.Format("/ %d", the_creature.selectcount); - for(i=0;i<the_creature.selectcount;i++) + if(the_creature.revision==22) { - idx=the_creature.selects[i].level; - tmpstr.Format("%d %s level %d (%d)",i+1, format_spellslot(the_creature.selects[i].spelltype),idx+1, the_creature.selects[i].count ); - m_levelpicker.AddString(tmpstr); + m_maxslot.Format("/ %d", IWD2_SPELLCOUNT); + for(i=0;i<IWD2_SPELLCOUNT;i++) + { + if(i<8*9) idx=i%9; + else idx=0; + tmpstr.Format("%d %s level %d (%d)",i+1, format_spellslot(i),idx+1, the_creature.iwd2_counts[i] ); + m_levelpicker.AddString(tmpstr); + } } + else + { + m_maxslot.Format("/ %d", the_creature.selectcount); + for(i=0;i<the_creature.selectcount;i++) + { + idx=the_creature.selects[i].level; + tmpstr.Format("%d %s level %d (%d)",i+1, format_spellslot(the_creature.selects[i].spelltype),idx+1, the_creature.selects[i].count ); + m_levelpicker.AddString(tmpstr); + } + } if(pos>=i) pos=i-1; pos=m_levelpicker.SetCurSel(pos); if(pos>=0) //got a valid level @@ -2716,27 +2823,54 @@ int pos2; int idx; int i; + unsigned int spid; if(pos<0) return; pos2=m_spellpicker.GetCurSel(); if(pos2<0) pos2=0; m_spellpicker.ResetContent(); - idx=the_creature.selects[pos].index; - m_maxspell.Format("/ %d", the_creature.selects[pos].count); - for(i=0;i<the_creature.selects[pos].count;i++) + if(the_creature.revision==22) { - RetrieveResref(tmp,the_creature.memos[idx+i].resref); - tmptext=ResolveSpellName(tmp); - tmpstr.Format("%d %s %s",i+1, tmp, tmptext); - m_spellpicker.AddString(tmpstr); + for(i=0;i<the_creature.iwd2_counts[pos];i++) + { + spid = the_creature.iwd2_spells[pos][i].type; + tmp = ResolveIWD2SpellResRef(spid, pos); + tmptext=ResolveSpellName(tmp); + tmpstr.Format("%d %s %s",i+1, tmp, tmptext); + m_spellpicker.AddString(tmpstr); + } } + else + { + idx=the_creature.selects[pos].index; + for(i=0;i<the_creature.selects[pos].count;i++) + { + RetrieveResref(tmp,the_creature.memos[idx+i].resref); + tmptext=ResolveSpellName(tmp); + tmpstr.Format("%d %s %s",i+1, tmp, tmptext); + m_spellpicker.AddString(tmpstr); + } + } + m_maxspell.Format("/ %d", i); if(pos2>=i) pos2=i-1; pos2=m_spellpicker.SetCurSel(pos2); if(pos2<0) m_spellslot=-1; - else m_spellslot=pos2+the_creature.selects[pos].index; + else + { + if(the_creature.revision==22) m_spellslot=pos2; + else m_spellslot=pos2+the_creature.selects[pos].index; + } if(m_spellslot>=0) { - RetrieveResref(m_spellres,the_creature.memos[m_spellslot].resref); + if(the_creature.revision==22) + { + spid = the_creature.iwd2_spells[pos][m_spellslot].type; + m_spellres = ResolveIWD2SpellResRef(spid, pos); + } + else + { + RetrieveResref(m_spellres,the_creature.memos[m_spellslot].resref); + } } else m_spellres=""; } @@ -2810,7 +2944,6 @@ ON_EN_KILLFOCUS(IDC_LEVEL, OnKillfocusLevel) ON_EN_KILLFOCUS(IDC_MIN, OnKillfocusMin) ON_EN_KILLFOCUS(IDC_MAX, OnKillfocusMax) - ON_EN_KILLFOCUS(IDC_SPELLRES, OnKillfocusSpellres) ON_BN_CLICKED(IDC_ADD, OnAdd) ON_BN_CLICKED(IDC_BROWSE2, OnBrowse2) ON_CBN_KILLFOCUS(IDC_SPELLPICKER, OnKillfocusSpellpicker) @@ -2833,6 +2966,10 @@ ON_CBN_KILLFOCUS(IDC_SELECTED, OnKillfocusSelected) ON_BN_CLICKED(IDC_UNDROPPABLE, OnUndroppable) ON_BN_CLICKED(IDC_CLEARALL, OnClearall) + ON_BN_CLICKED(IDC_MEMORISED, OnMemorised) + ON_EN_KILLFOCUS(IDC_SPELLRES, OnDefaultKillfocus) + ON_EN_KILLFOCUS(IDC_TOTAL, OnDefaultKillfocus) + ON_EN_KILLFOCUS(IDC_MEMORISED2, OnDefaultKillfocus) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -3020,12 +3157,19 @@ { int i; + the_creature.KillIwd2Spells(); the_creature.KillBooks(); the_creature.KillMemos(); the_creature.KillSelects(); the_creature.header.bookcnt=0; the_creature.header.memcnt=0; the_creature.header.selectcnt=0; + for(i=0;i<IWD2_SPELLCOUNT;i++) + { + the_creature.iwd2_free[i].free=0; + the_creature.iwd2_free[i].maximum=0; + } + the_creature.selects=new creature_select[BG2_SELECTCOUNT]; if(!the_creature.selects) return; the_creature.selectcount=the_creature.header.selectcnt=BG2_SELECTCOUNT; @@ -3161,40 +3305,66 @@ return ret; } +int CCreatureItem::CalculateIWD2Slots() +{ + int i, pos; + long sum; + + for(pos = 0; pos<8*9+3; pos++) + { + sum = 0; + for(i=0;i<the_creature.iwd2_counts[pos];i++) + { + sum+=the_creature.iwd2_spells[pos][i].total; + } + //this line is not correct, we need the possible maximum number, not the actual + the_creature.iwd2_free[pos].maximum=sum; + the_creature.iwd2_free[pos].free=the_creature.iwd2_free[pos].maximum-sum; + } + return 0; +} + void CCreatureItem::OnClass() { int flg; - switch(the_creature.header.idsclass) + if(the_creature.revision==22) { - case MAGE_THIEF: - case CLASS_MAGE: flg=SetMemoryByClass("MXSPLWIZ",1,the_creature.header.levels[0]); break; - case CLERIC_THIEF: - case CLASS_CLERIC: flg=SetMemoryByClass("MXSPLPRS",0,the_creature.header.levels[0]); break; - case CLASS_BARD: flg=SetMemoryByClass("MXSPLBRD",1,the_creature.header.levels[0]); break; - case CLASS_PALADIN: flg=SetMemoryByClass("MXSPLPAL",0,the_creature.header.levels[0]); break; - case CLASS_DRUID: flg=SetMemoryByClass("MXSPLDRU",0,the_creature.header.levels[0]); break; - case CLASS_RANGER: flg=SetMemoryByClass("MXSPLRAN",0,the_creature.header.levels[0]); break; - case CLASS_SORCEROR: flg=SetMemoryByClass("SPLSRCKN",1,the_creature.header.levels[0]); break; - case FIGHTER_MAGE: flg=SetMemoryByClass("MXSPLWIZ",1,the_creature.header.levels[1]); break; - case FIGHTER_CLERIC: flg=SetMemoryByClass("MXSPLPRS",0,the_creature.header.levels[1]); break; - case CLERIC_MAGE: - flg=SetMemoryByClass("MXSPLPRS",0,the_creature.header.levels[0]); - flg|=SetMemoryByClass("MXSPLWIZ",1,the_creature.header.levels[1]); - break; - case CLERIC_RANGER: - flg=SetMemoryByClass("MXSPLPRS",0,the_creature.header.levels[0]); - flg|=SetMemoryByClass("MXSPLRAN",0,the_creature.header.levels[1]); - break; - case FIGHTER_DRUID: flg=SetMemoryByClass("MXSPLDRU",0,the_creature.header.levels[1]); break; - case FIGHTER_MAGE_CLERIC: - flg=SetMemoryByClass("MXSPLWIZ",1,the_creature.header.levels[1]); - flg|=SetMemoryByClass("MXSPLPRS",0,the_creature.header.levels[2]); - break; - default: - MessageBox("Not spellcaster player class.","Creature editor",MB_OK); - return; + flg = CalculateIWD2Slots(); } + else + { + switch(the_creature.header.idsclass) + { + case MAGE_THIEF: + case CLASS_MAGE: flg=SetMemoryByClass("MXSPLWIZ",1,the_creature.header.levels[0]); break; + case CLERIC_THIEF: + case CLASS_CLERIC: flg=SetMemoryByClass("MXSPLPRS",0,the_creature.header.levels[0]); break; + case CLASS_BARD: flg=SetMemoryByClass("MXSPLBRD",1,the_creature.header.levels[0]); break; + case CLASS_PALADIN: flg=SetMemoryByClass("MXSPLPAL",0,the_creature.header.levels[0]); break; + case CLASS_DRUID: flg=SetMemoryByClass("MXSPLDRU",0,the_creature.header.levels[0]); break; + case CLASS_RANGER: flg=SetMemoryByClass("MXSPLRAN",0,the_creature.header.levels[0]); break; + case CLASS_SORCEROR: flg=SetMemoryByClass("SPLSRCKN",1,the_creature.header.levels[0]); break; + case FIGHTER_MAGE: flg=SetMemoryByClass("MXSPLWIZ",1,the_creature.header.levels[1]); break; + case FIGHTER_CLERIC: flg=SetMemoryByClass("MXSPLPRS",0,the_creature.header.levels[1]); break; + case CLERIC_MAGE: + flg=SetMemoryByClass("MXSPLPRS",0,the_creature.header.levels[0]); + flg|=SetMemoryByClass("MXSPLWIZ",1,the_creature.header.levels[1]); + break; + case CLERIC_RANGER: + flg=SetMemoryByClass("MXSPLPRS",0,the_creature.header.levels[0]); + flg|=SetMemoryByClass("MXSPLRAN",0,the_creature.header.levels[1]); + break; + case FIGHTER_DRUID: flg=SetMemoryByClass("MXSPLDRU",0,the_creature.header.levels[1]); break; + case FIGHTER_MAGE_CLERIC: + flg=SetMemoryByClass("MXSPLWIZ",1,the_creature.header.levels[1]); + flg|=SetMemoryByClass("MXSPLPRS",0,the_creature.header.levels[2]); + break; + default: + MessageBox("Not spellcaster player class.","Creature editor",MB_OK); + return; + } + } if(flg) { MessageBox("Failed to set spell limits.","Creature editor",MB_OK); @@ -3202,7 +3372,7 @@ UpdateData(UD_DISPLAY); } -void CCreatureItem::OnKillfocusSpellres() +void CCreatureItem::OnDefaultKillfocus() { UpdateData(UD_RETRIEVE); UpdateData(UD_DISPLAY); @@ -3288,6 +3458,15 @@ int level, type; if(m_spellres.IsEmpty()) return; + + if (the_creature.revision==22) + { + AddIWD2Spell(m_spellres); + RefreshItem(); + UpdateData(UD_DISPLAY); + return; + } + xpos=ResolveTypeAndLevel(m_spellres); if(xpos<7) { level=xpos; type=0; } else if(xpos<16) { level=xpos-7; type=1; } @@ -3311,24 +3490,94 @@ MessageBox(tmpstr,"Creature editor",MB_OK); } +void CCreatureItem::OnMemorised() +{ + CButton *cb; + + if(m_spellslot>=0) + { + cb=(CButton *) GetDlgItem(IDC_MEMORISED); + the_creature.memos[m_spellslot].flags=cb->GetCheck(); + } +} + void CCreatureItem::OnForget() { - int pos; + int i, size, pos, pos2; m_spellres.Empty(); - for(pos=0;pos<the_creature.selectcount;pos++) + if(the_creature.revision==22) { - if( (the_creature.selects[pos].index<=m_spellslot) && - the_creature.selects[pos].index+the_creature.selects[pos].count>m_spellslot) + pos = m_levelpicker.GetCurSel(); + pos2 = m_spellpicker.GetCurSel(); + if(pos2>=0) { - RemoveSpell(pos); - break; + size = --the_creature.iwd2_counts[pos]; + creature_iwd2_spell *tmpspell=new creature_iwd2_spell[size]; + for(i=0;i<pos2;i++) + { + tmpspell[i]=the_creature.iwd2_spells[pos][i]; + } + for(i=pos2+1;i<=size;i++) + { + tmpspell[i-1]=the_creature.iwd2_spells[pos][i]; + } + delete [] the_creature.iwd2_spells[pos]; + the_creature.iwd2_spells[pos]=tmpspell; } } + else + { + for(pos=0;pos<the_creature.selectcount;pos++) + { + if( (the_creature.selects[pos].index<=m_spellslot) && + the_creature.selects[pos].index+the_creature.selects[pos].count>m_spellslot) + { + RemoveSpell(pos); + break; + } + } + } RefreshItem(); UpdateData(UD_DISPLAY); } +void CCreatureItem::AddIWD2Spell(CString res) +{ + unsigned int spid; + int i, size, pos, pos2; + + pos = m_levelpicker.GetCurSel(); + pos2 = m_spellpicker.GetCurSel(); + + spid = ResolveIWD2SpellID(m_spellres, pos); + if(spid<0) + { + MessageBox("Couldn't resolve this spell name, please make sure it is on the appropriate list.","Creature editor",MB_OK|MB_ICONWARNING); + } + else + { + if(pos2<0) + { + size = the_creature.iwd2_counts[pos]++; + pos2=size; + creature_iwd2_spell *tmpspell=new creature_iwd2_spell[size+1]; + for(i=0;i<size;i++) + { + tmpspell[i]=the_creature.iwd2_spells[pos][i]; + } + + delete [] the_creature.iwd2_spells[pos]; + tmpspell[i].remaining=1; + tmpspell[i].total=1; + tmpspell[i].unknown=0; + the_creature.iwd2_spells[pos]=tmpspell; + } + + the_creature.iwd2_spells[pos][pos2].type=spid; + } +} + void CCreatureItem::OnBrowse2() { pickerdlg.m_restype=REF_SPL; @@ -3337,6 +3586,7 @@ { m_spellres=pickerdlg.m_picked; } + UpdateData(UD_DISPLAY); } Modified: chitem/trunk/CreatureProperties.h =================================================================== --- chitem/trunk/CreatureProperties.h 2008-10-26 20:56:37 UTC (rev 5470) +++ chitem/trunk/CreatureProperties.h 2008-10-26 20:59:40 UTC (rev 5471) @@ -83,6 +83,7 @@ afx_msg void OnNew1(); afx_msg void OnNew2(); afx_msg void OnKillfocusKit(); + afx_msg void OnLevelslot(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; @@ -474,11 +475,16 @@ CToolTipCtrl m_tooltip; void RefreshSpellPicker(int pos); + CIntMapString *GetIWD2SpellList(int pos); + CString ResolveIWD2SpellResRef(int spid, int pos); + int ResolveIWD2SpellID(CString resref, int pos); int ResolveTypeAndLevel(CString key); CString ResolveSpellName(CString key); int AddBook(int level, int type); + void AddIWD2Spell(CString spellres); void AddSpell(int slot, CString spellres); void RemoveSpell(int slot); + int CalculateIWD2Slots(); int SetMemoryByClass(CString daname, int type, int level); // Generated message map functions //{{AFX_MSG(CCreatureItem) @@ -501,7 +507,6 @@ afx_msg void OnKillfocusLevel(); afx_msg void OnKillfocusMin(); afx_msg void OnKillfocusMax(); - afx_msg void OnKillfocusSpellres(); afx_msg void OnAdd(); afx_msg void OnBrowse2(); afx_msg void OnKillfocusSpellpicker(); @@ -524,6 +529,8 @@ afx_msg void OnKillfocusSelected(); afx_msg void OnUndroppable(); afx_msg void OnClearall(); + afx_msg void OnMemorised(); + afx_msg void OnDefaultKillfocus(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: chitem/trunk/chitem.clw =================================================================== --- chitem/trunk/chitem.clw 2008-10-26 20:56:37 UTC (rev 5470) +++ chitem/trunk/chitem.clw 2008-10-26 20:59:40 UTC (rev 5471) @@ -2,17 +2,17 @@ [General Info] Version=1 -LastClass=C2DAEdit +LastClass=CCreatureItem LastTemplate=CDialog NewFileInclude1=#include "stdafx.h" NewFileInclude2=#include "chitem.h" -ClassCount=103 +ClassCount=104 Class1=CChitemApp Class2=CChitemDlg Class3=CAboutDlg -ResourceCount=249 +ResourceCount=250 Resource1=IDD_AREASPAWN Resource2=IDR_MAINFRAME Resource3=IDD_STOREITEMS @@ -232,136 +232,138 @@ Resource123=IDD_GAMEGENERAL Class98=IcewindCre Resource124=IDR_SHORTCUT -Resource125=IDD_BAMEDIT (English (U.S.)) -Resource126=IDD_SPELLDESC (English (U.S.)) -Resource127=IDD_AREATRIGGER (English (U.S.)) -Resource128=IDR_CHITIN (English (U.S.)) -Resource129=IDD_CREATURESTRINGS (English (U.S.)) -Resource130=IDD_IMAGEVIEW (English (U.S.)) -Resource131=IDD_CREATUREIWD (English (U.S.)) -Resource132=IDD_FINDITEM (English (U.S.)) -Resource133=IDD_AREASONGS (English (U.S.)) -Resource134=IDR_GAME (English (U.S.)) -Resource135=IDD_ITEMUSE (English (U.S.)) -Resource136=IDR_MUSIC (English (U.S.)) -Resource137=IDD_AREAENTRANCE (English (U.S.)) -Resource138=IDD_STORERENTAL (English (U.S.)) -Resource139=IDD_EXTRACT (English (U.S.)) -Resource140=IDD_WEDEDIT (English (U.S.)) -Resource141=IDD_AREAINT (English (U.S.)) -Resource142=IDD_ANIMDIALOG -Resource143=IDD_GAMEEDIT (English (U.S.)) -Resource144=IDR_SCRIPT (English (U.S.)) -Resource145=IDD_SPELLTOOL (English (U.S.)) -Resource146=IDR_TLKMENU (English (U.S.)) -Resource147=IDD_CREATURESKILLS (English (U.S.)) -Resource148=IDR_SPELL (English (U.S.)) -Resource149=IDD_SPELLEQUIP (English (U.S.)) -Resource150=IDD_AREAEDIT (English (U.S.)) -Resource151=IDD_SEARCHNODE (English (U.S.)) -Resource152=IDD_AREADOOR (English (U.S.)) -Resource153=IDD_CREATURERES (English (U.S.)) -Resource154=IDD_MASSCLEAR (English (U.S.)) -Resource155=IDD_ITEMGENERAL (English (U.S.)) -Resource156=IDD_CREATUREUNKNOWN (English (U.S.)) -Resource157=IDD_AREATRIGGERSTRINGS (English (U.S.)) -Resource158=IDR_2DA (English (U.S.)) -Resource159=IDD_WEIDU (English (U.S.)) -Resource160=IDR_ITEM (English (U.S.)) -Resource161=IDD_ADDLINK (English (U.S.)) -Resource162=IDR_PROJECT (English (U.S.)) -Resource163=IDD_SPELLGENERAL (English (U.S.)) -Resource164=IDD_MOSEDIT (English (U.S.)) -Resource165=IDD_GAMESTATS (English (U.S.)) -Resource166=IDD_CREATUREGENERAL (English (U.S.)) -Resource167=IDD_SAVHANDLE (English (U.S.)) -Resource168=IDR_VVC (English (U.S.)) -Resource169=IDD_CHECK (English (U.S.)) -Resource170=IDD_CREATUREOVR (English (U.S.)) -Resource171=IDD_SPELLEXTRA (English (U.S.)) -Resource172=IDD_EFFEDIT (English (U.S.)) -Resource173=IDD_AREAVARIABLE (English (U.S.)) -Resource174=IDD_AREAAMBIENT (English (U.S.)) -Resource175=IDR_WORLDMAP (English (U.S.)) -Resource176=IDR_TREEMENU (English (U.S.)) -Resource177=IDD_ABOUTBOX (English (U.S.)) -Resource178=IDR_AREA (English (U.S.)) -Resource179=IDD_ITEMEXTRA (English (U.S.)) -Resource180=IDD_ITEMEQUIP (English (U.S.)) -Resource181=IDD_AREACONTAINER (English (U.S.)) -Resource182=IDR_STORE (English (U.S.)) -Resource183=IDD_ITEMPICKER (English (U.S.)) -Resource184=IDR_MENUBAR (English (U.S.)) -Resource185=IDD_2DAEDIT (English (U.S.)) -Resource186=IDD_SCHEDULE (English (U.S.)) -Resource187=IDD_SCRIPTEDIT (English (U.S.)) -Resource188=IDD_ITEMEDIT (English (U.S.)) -Resource189=IDD_ITEMDESC (English (U.S.)) -Resource190=IDR_CHUI (English (U.S.)) -Resource191=IDD_SPELLEFFECT (English (U.S.)) -Resource192=IDD_KEYEDIT (English (U.S.)) -Resource193=IDD_CREATUREPST (English (U.S.)) -Resource194=IDD_VVCEDIT (English (U.S.)) -Resource195=IDD_MAPLINK (English (U.S.)) -Resource196=IDD_EDIT (English (U.S.)) -Resource197=IDD_IDSEDIT (English (U.S.)) -Resource198=IDD_PALETTE (English (U.S.)) -Resource199=IDD_AREAANIM (English (U.S.)) -Resource200=IDD_EXTRACT2 (English (U.S.)) -Resource201=IDD_ITEMICONS (English (U.S.)) -Resource202=IDD_COLORPICKER (English (U.S.)) -Resource203=IDR_EFFECT (English (U.S.)) -Resource204=IDD_CFB (English (U.S.)) -Resource205=IDR_CREATURE (English (U.S.)) -Resource206=IDR_SRC (English (U.S.)) -Resource207=IDD_ITEMEFFECT (English (U.S.)) -Resource208=IDR_TILE (English (U.S.)) -Resource209=IDD_PANICBUTTON (English (U.S.)) -Resource210=IDD_SPELLEDIT (English (U.S.)) -Resource211=IDD_CREATUREEDIT (English (U.S.)) -Resource212=IDD_GAMEPCINFO (English (U.S.)) -Resource213=IDD_AREAGENERAL (English (U.S.)) -Resource214=IDD_MUSEDIT (English (U.S.)) -Resource215=IDD_CREATUREIWD2 (English (U.S.)) -Resource216=IDD_GAMEGENERAL (English (U.S.)) -Resource217=IDD_STOREEXTRA (English (U.S.)) -Resource218=IDD_SHOWLOG (English (U.S.)) -Resource219=IDD_SRCEDIT (English (U.S.)) -Resource220=IDD_PROGRESS (English (U.S.)) -Resource221=IDD_POLYGON (English (U.S.)) -Resource222=IDD_TEXTVIEW (English (U.S.)) -Resource223=IDD_STOREDRINKS (English (U.S.)) -Resource224=IDR_IDS (English (U.S.)) -Resource225=IDD_MAPEDIT (English (U.S.)) -Resource226=IDD_STRREFDLG (English (U.S.)) -Resource227=IDD_WEDTILE (English (U.S.)) -Resource228=IDD_PROJEXT (English (U.S.)) -Resource229=IDD_AREASPAWN (English (U.S.)) -Resource230=IDR_WEDMENU (English (U.S.)) -Resource231=IDD_CHUIEDIT (English (U.S.)) -Resource232=IDD_COMPAT (English (U.S.)) -Resource233=IDD_AREAACTOR (English (U.S.)) -Resource234=IDD_DIALOGEDIT (English (U.S.)) -Resource235=IDD_STOREITEMS (English (U.S.)) -Resource236=IDD_TISDIALOG (English (U.S.)) -Resource237=IDD_STOREGENERAL (English (U.S.)) -Resource238=IDD_AREAMAP (English (U.S.)) -Resource239=IDD_CREATUREICONS (English (U.S.)) -Resource240=IDD_CHITEM_DIALOG (English (U.S.)) -Resource241=IDR_BAMMENU (English (U.S.)) -Resource242=IDD_VARIABLES (English (U.S.)) -Resource243=IDD_IAPDIALOG (English (U.S.)) -Resource244=IDD_CREATUREEFF (English (U.S.)) -Resource245=IDD_PROJEDIT (English (U.S.)) +Resource125=IDD_STOREGENERAL (English (U.S.)) +Resource126=IDD_CREATURERES (English (U.S.)) +Resource127=IDD_TISDIALOG (English (U.S.)) +Resource128=IDD_CREATUREIWD2 (English (U.S.)) +Resource129=IDD_PROGRESS (English (U.S.)) +Resource130=IDD_AREAENTRANCE (English (U.S.)) +Resource131=IDR_TLKMENU (English (U.S.)) +Resource132=IDD_EDIT (English (U.S.)) +Resource133=IDD_IDSEDIT (English (U.S.)) +Resource134=IDD_IMAGEVIEW (English (U.S.)) +Resource135=IDD_ITEMDESC (English (U.S.)) +Resource136=IDD_ITEMGENERAL (English (U.S.)) +Resource137=IDD_DIALOGEDIT (English (U.S.)) +Resource138=IDD_SPELLTOOL (English (U.S.)) +Resource139=IDD_AREAINT (English (U.S.)) +Resource140=IDD_GAMEPCINFO (English (U.S.)) +Resource141=IDD_CREATUREGENERAL (English (U.S.)) +Resource142=IDD_WEDPOLY (English (U.S.)) +Resource143=IDD_MUSEDIT (English (U.S.)) +Resource144=IDD_CHITEM_DIALOG (English (U.S.)) +Resource145=IDR_MENUBAR (English (U.S.)) +Resource146=IDD_ABOUTBOX (English (U.S.)) +Resource147=IDD_POLYGON (English (U.S.)) +Resource148=IDR_CHUI (English (U.S.)) +Resource149=IDD_CREATUREICONS (English (U.S.)) +Resource150=IDD_ITEMUSE (English (U.S.)) +Resource151=IDD_WEDEDIT (English (U.S.)) +Resource152=IDD_ITEMEFFECT (English (U.S.)) +Resource153=IDD_CREATUREEFF (English (U.S.)) +Resource154=IDD_SHOWLOG (English (U.S.)) +Resource155=IDD_STOREDRINKS (English (U.S.)) +Resource156=IDD_MAPLINK (English (U.S.)) +Resource157=IDR_SCRIPT (English (U.S.)) +Resource158=IDD_FINDITEM (English (U.S.)) +Resource159=IDD_STOREEDIT (English (U.S.)) +Resource160=IDR_TILE (English (U.S.)) +Resource161=IDD_AREASONGS (English (U.S.)) +Resource162=IDD_MOSEDIT (English (U.S.)) +Resource163=IDD_AREASPAWN (English (U.S.)) +Resource164=IDD_STORERENTAL (English (U.S.)) +Resource165=IDR_CREATURE (English (U.S.)) +Resource166=IDD_CFB (English (U.S.)) +Resource167=IDD_TEXTVIEW (English (U.S.)) +Resource168=IDD_CHECK (English (U.S.)) +Resource169=IDD_CREATUREEDIT (English (U.S.)) +Resource170=IDR_PROJECT (English (U.S.)) +Resource171=IDD_KEYEDIT (English (U.S.)) +Resource172=IDD_EXTRACT2 (English (U.S.)) +Resource173=IDD_CREATUREIWD (English (U.S.)) +Resource174=IDD_COMPAT (English (U.S.)) +Resource175=IDD_WEIDU (English (U.S.)) +Resource176=IDR_MUSIC (English (U.S.)) +Resource177=IDD_PROJEDIT (English (U.S.)) +Resource178=IDR_CHITIN (English (U.S.)) +Resource179=IDD_CREATUREOVR (English (U.S.)) +Resource180=IDD_CREATUREUNKNOWN (English (U.S.)) +Resource181=IDD_COLORPICKER (English (U.S.)) +Resource182=IDR_SRC (English (U.S.)) +Resource183=IDD_IAPDIALOG (English (U.S.)) +Resource184=IDR_2DA (English (U.S.)) +Resource185=IDD_SEARCHNODE (English (U.S.)) +Resource186=IDD_VVCEDIT (English (U.S.)) +Resource187=IDD_AREAMAP (English (U.S.)) +Resource188=IDD_CREATURESKILLS (English (U.S.)) +Resource189=IDD_VARIABLES (English (U.S.)) +Resource190=IDD_STOREEXTRA (English (U.S.)) +Resource191=IDD_CREATURESTRINGS (English (U.S.)) +Resource192=IDD_SCHEDULE (English (U.S.)) +Resource193=IDR_AREA (English (U.S.)) +Resource194=IDD_SPELLEQUIP (English (U.S.)) +Resource195=IDD_AREADOOR (English (U.S.)) +Resource196=IDD_WEDTILE (English (U.S.)) +Resource197=IDD_ITEMEXTRA (English (U.S.)) +Resource198=IDD_AREATRIGGER (English (U.S.)) +Resource199=IDD_SRCEDIT (English (U.S.)) +Resource200=IDD_SAVHANDLE (English (U.S.)) +Resource201=IDD_BAMEDIT (English (U.S.)) +Resource202=IDD_CHUIEDIT (English (U.S.)) +Resource203=IDR_WEDMENU (English (U.S.)) +Resource204=IDD_SPELLEXTRA (English (U.S.)) +Resource205=IDD_ANIMDIALOG +Resource206=IDD_ITEMPICKER (English (U.S.)) +Resource207=IDD_SPELLGENERAL (English (U.S.)) +Resource208=IDD_ITEMEQUIP (English (U.S.)) +Resource209=IDD_SPELLDESC (English (U.S.)) +Resource210=IDD_PALETTE (English (U.S.)) +Resource211=IDD_PROJEXT (English (U.S.)) +Resource212=IDR_GAME (English (U.S.)) +Resource213=IDD_AREAAMBIENT (English (U.S.)) +Resource214=IDD_SPELLEFFECT (English (U.S.)) +Resource215=IDR_VVC (English (U.S.)) +Resource216=IDR_WORLDMAP (English (U.S.)) +Resource217=IDD_CREATUREITEMS (English (U.S.)) +Resource218=IDD_AREAANIM (English (U.S.)) +Resource219=IDR_TREEMENU (English (U.S.)) +Resource220=IDD_MASSCLEAR (English (U.S.)) +Resource221=IDR_STORE (English (U.S.)) +Resource222=IDR_EFFECT (English (U.S.)) +Resource223=IDR_SPELL (English (U.S.)) +Resource224=IDD_ITEMEDIT (English (U.S.)) +Resource225=IDD_STOREITEMS (English (U.S.)) +Resource226=IDD_2DAEDIT (English (U.S.)) +Resource227=IDD_CREATURELEVELS (English (U.S.)) +Resource228=IDD_PANICBUTTON (English (U.S.)) +Resource229=IDD_ADDLINK (English (U.S.)) +Resource230=IDD_EXTRACT (English (U.S.)) +Resource231=IDR_BAMMENU (English (U.S.)) +Resource232=IDD_STRREFDLG (English (U.S.)) +Resource233=IDD_AREACONTAINER (English (U.S.)) +Resource234=IDD_CREATUREPST (English (U.S.)) +Resource235=IDD_SPELLEDIT (English (U.S.)) +Resource236=IDD_AREAACTOR (English (U.S.)) +Resource237=IDD_GAMESTATS (English (U.S.)) +Resource238=IDR_ITEM (English (U.S.)) +Resource239=IDD_MAPEDIT (English (U.S.)) +Resource240=IDD_EFFEDIT (English (U.S.)) +Resource241=IDR_IDS (English (U.S.)) +Resource242=IDD_AREAGENERAL (English (U.S.)) +Resource243=IDD_GAMEEDIT (English (U.S.)) +Resource244=IDD_GAMEGENERAL (English (U.S.)) +Resource245=IDD_AREATRIGGERSTRINGS (English (U.S.)) Class99=CAreaTriggerString Class100=CPCInfo -Resource246=IDD_CREATUREITEMS (English (U.S.)) +Resource246=IDD_AREAEDIT (English (U.S.)) Class101=CCreatureOverlay -Resource247=IDD_WEDPOLY (English (U.S.)) +Resource247=IDD_SCRIPTEDIT (English (U.S.)) Class102=IWD2Creature -Resource248=IDD_STOREEDIT (English (U.S.)) +Resource248=IDD_AREAVARIABLE (English (U.S.)) Class103=CAnimDialog -Resource249=IDR_SHORTCUT (English (U.S.)) +Resource249=IDD_ITEMICONS (English (U.S.)) +Class104=CCreatureLevels +Resource250=IDR_SHORTCUT (English (U.S.)) [CLS:CChitemApp] Type=0 @@ -2760,7 +2762,7 @@ BaseClass=CPropertyPage Filter=D VirtualFilter=dWC -LastObject=IDC_KIT +LastObject=CCreatureGeneral [DLG:IDD_CREATUREICONS] Type=1 @@ -4000,7 +4002,7 @@ ImplementationFile=CreatureProperties.cpp BaseClass=CPropertyPage Filter=D -LastObject=IDC_SLOTPICKER +LastObject=IDC_MEMORISED2 VirtualFilter=idWC [DLG:IDD_MOSEDIT] @@ -4555,7 +4557,7 @@ BaseClass=CDialog Filter=D VirtualFilter=dWC -LastObject=ID_FILE_SAVE +LastObject=ID_CLEAR [MNU:IDR_GAME] Type=1 @@ -7458,7 +7460,7 @@ [DLG:IDD_CREATUREGENERAL (English (U.S.))] Type=1 Class=CCreatureGeneral -ControlCount=67 +ControlCount=68 Control1=IDC_LONGNAMEREF,edit,1350631552 Control2=IDC_LONGNAME,edit,1350631552 Control3=IDC_LONGNAMETAG,button,1342242851 @@ -7526,6 +7528,7 @@ Control65=IDC_NEW1,button,1342242816 Control66=IDC_NEW2,button,1342242816 Control67=IDC_KIT,combobox,1344340034 +Control68=IDC_LEVELSLOT,button,1342242816 [DLG:IDD_CREATUREICONS (English (U.S.))] Type=1 @@ -8442,7 +8445,7 @@ [DLG:IDD_CREATUREITEMS (English (U.S.))] Type=1 Class=CCreatureItem -ControlCount=60 +ControlCount=64 Control1=IDC_SLOTPICKER,combobox,1344339971 Control2=IDC_SELECTED,combobox,1344339970 Control3=IDC_ITEMRES,edit,1350631560 @@ -8489,20 +8492,24 @@ Control44=IDC_STATIC,static,1342308352 Control45=IDC_STATIC,static,1342308352 Control46=IDC_STATIC,static,1342308352 -Control47=IDC_STATIC,static,1342308352 +Control47=IDC_STATIC1,static,1342308352 Control48=IDC_STATIC,static,1342308352 Control49=IDC_STATIC,static,1342308352 Control50=IDC_STATIC,static,1342308352 Control51=IDC_STATIC,static,1342308352 -Control52=IDC_STATIC,button,1342210055 +Control52=IDC_STATIC4,button,1342210055 Control53=IDC_MAXSPELL,static,1342308352 Control54=IDC_MAXSLOT,static,1342308352 Control55=IDC_STATIC,button,1342210055 Control56=IDC_STATIC,static,1342308352 -Control57=IDC_STATIC,static,1342308352 -Control58=IDC_STATIC,static,1342308352 +Control57=IDC_STATIC5,static,1342308352 +Control58=IDC_STATIC6,static,1342308352 Control59=IDC_STATIC,static,1342308352 Control60=IDC_UNDROPPABLE,button,1342242819 +Control61=IDC_TOTAL,edit,1350631552 +Control62=IDC_STATIC2,static,1342308352 +Control63=IDC_MEMORISED2,edit,1350631552 +Control64=IDC_STATIC3,static,1342308352 [DLG:IDD_MOSEDIT (English (U.S.))] Type=1 @@ -9838,7 +9845,7 @@ [MNU:IDR_TLKMENU (English (U.S.))] Type=1 -Class=? +Class=CStrRefDlg Command1=IDC_RELOAD Command2=ID_FILE_SAVE Command3=IDCANCEL @@ -10173,3 +10180,42 @@ LastObject=IDC_FILTER VirtualFilter=dWC +[DLG:IDD_CREATURELEVELS (English (U.S.))] +Type=1 +Class=CCreatureLevels +ControlCount=25 +Control1=IDCANCEL,button,1342242816 +Control2=IDC_U1,edit,1350631552 +Control3=IDC_U2,edit,1350631552 +Control4=IDC_U3,edit,1350631552 +Control5=IDC_U4,edit,1350631552 +Control6=IDC_U5,edit,1350631552 +Control7=IDC_U6,edit,1350631552 +Control8=IDC_U7,edit,1350631552 +Control9=IDC_U8,edit,1350631552 +Control10=IDC_U9,edit,1350631552 +Control11=IDC_U10,edit,1350631552 +Control12=IDC_U11,edit,1350631552 +Control13=IDC_U12,edit,1350631552 +Control14=IDC_STATIC,static,1342308352 +Control15=IDC_STATIC,static,1342308352 +Control16=IDC_STATIC,static,1342308352 +Control17=IDC_STATIC,static,1342308352 +Control18=IDC_STATIC,static,1342308352 +Control19=IDC_STATIC,static,1342308352 +Control20=IDC_STATIC,static,1342308352 +Control21=IDC_STATIC,static,1342308352 +Control22=IDC_STATIC,static,1342308352 +Control23=IDC_STATIC,static,1342308352 +Control24=IDC_STATIC,static,1342308352 +Control25=IDC_STATIC,static,1342308352 + +[CLS:CCreatureLevels] +Type=0 +HeaderFile=CreatureLevels.h +ImplementationFile=CreatureLevels.cpp +BaseClass=CDialog +Filter=D +VirtualFilter=dWC +LastObject=IDC_U1 + Modified: chitem/trunk/chitem.dsp =================================================================== --- chitem/trunk/chitem.dsp 2008-10-26 20:56:37 UTC (rev 5470) +++ chitem/trunk/chitem.dsp 2008-10-26 20:59:40 UTC (rev 5471) @@ -193,6 +193,10 @@ # End Source File # Begin Source File +SOURCE=.\CreatureLevels.cpp +# End Source File +# Begin Source File + SOURCE=.\CreatureOverlay.cpp # End Source File # Begin Source File @@ -594,6 +598,10 @@ # End Source File # Begin Source File +SOURCE=.\CreatureLevels.h +# End Source File +# Begin Source File + SOURCE=.\CreatureOverlay.h # End Source File # Begin Source File Modified: chitem/trunk/chitem.rc =================================================================== --- chitem/trunk/chitem.rc 2008-10-26 20:56:37 UTC (rev 5470) +++ chitem/trunk/chitem.rc 2008-10-26 20:59:40 UTC (rev 5471) @@ -145,7 +145,7 @@ BEGIN ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20 LTEXT "",IDC_VERSION,40,10,119,8,SS_NOPREFIX - LTEXT "Copyright (C) 2002-2007 Avenger",IDC_STATIC,40,23,119,8 + LTEXT "Copyright (C) 2002-2008 Avenger",IDC_STATIC,40,23,119,8 DEFPUSHBUTTON "OK",IDOK,178,7,50,14,WS_GROUP LTEXT "Source: http://gemrb.sourceforge.net",IDC_STATIC,40,36, 119,8 @@ -2548,6 +2548,7 @@ PUSHBUTTON "New string",IDC_NEW2,254,6,51,11 COMBOBOX IDC_KIT,300,113,93,79,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "IWD2 levels",IDC_LEVELSLOT,7,69,88,27 END IDD_CREATUREICONS DIALOG DISCARDABLE 0, 0, 400, 199 @@ -3753,11 +3754,11 @@ CONTROL "Memorised ?",IDC_MEMORISED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,159,56,10 EDITTEXT IDC_SPELLNAME,50,176,138,14,ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "Add level slot",IDC_ADDSLOT,223,79,50,14 - PUSHBUTTON "Remove slot",IDC_DELSLOT,223,97,50,14 - PUSHBUTTON "Set limits",IDC_CLASS,223,115,50,14 - PUSHBUTTON "New spell",IDC_MEMORISE,223,139,50,14 - PUSHBUTTON "Forget spell",IDC_FORGET,223,157,50,14 + PUSHBUTTON "Add level slot",IDC_ADDSLOT,223,76,50,14 + PUSHBUTTON "Remove slot",IDC_DELSLOT,223,94,50,14 + PUSHBUTTON "Set limits",IDC_CLASS,223,112,50,14 + PUSHBUTTON "New spell",IDC_MEMORISE,223,130,50,14 + PUSHBUTTON "Forget spell",IDC_FORGET,223,148,50,14 COMBOBOX IDC_BOOKPICKER,283,82,102,59,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_SPELLRES2,283,112,54,14,ES_UPPERCASE | @@ -3778,23 +3779,27 @@ LTEXT "Item flags",IDC_STATIC,160,35,31,8 LTEXT "Expiration",IDC_STATIC,356,9,32,8 LTEXT "Itemname",IDC_STATIC,7,34,32,8 - LTEXT "Spell level && type",IDC_STATIC,121,107,54,8 + LTEXT "Spell level && type",IDC_STATIC1,121,107,54,8 LTEXT "Icon",IDC_STATIC,284,8,15,8 LTEXT "Number of memorisable spells",IDC_STATIC,121,79,94,8 LTEXT "Spellname",IDC_STATIC,9,177,34,8 LTEXT "Choose spell",IDC_STATIC,9,128,41,8 - GROUPBOX "Known spells && innates",IDC_STATIC,275,68,118,108, + GROUPBOX "Known spells && innates",IDC_STATIC4,275,68,118,108, BS_FLAT LTEXT "/ 0",IDC_MAXSPELL,196,141,21,8 LTEXT "/ 0",IDC_MAXSLOT,98,91,21,8 GROUPBOX "Memorised spells && innates",IDC_STATIC,7,68,269,124, BS_FLAT LTEXT "Resource",IDC_STATIC,9,159,32,8 - LTEXT "Resource",IDC_STATIC,283,100,32,8 - LTEXT "Spell level && type",IDC_STATIC,283,130,54,8 + LTEXT "Resource",IDC_STATIC5,283,100,32,8 + LTEXT "Spell level && type",IDC_STATIC6,283,130,54,8 LTEXT "Selected slot",IDC_STATIC,320,42,42,8 CONTROL "No drop",IDC_UNDROPPABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,248,48,41,10 + EDITTEXT IDC_TOTAL,194,176,26,14,ES_AUTOHSCROLL + LTEXT "Count",IDC_STATIC2,194,166,20,8 + EDITTEXT IDC_MEMORISED2,233,176,40,14,ES_AUTOHSCROLL + LTEXT "Memorised",IDC_STATIC3,233,166,35,8 END IDD_MOSEDIT DIALOG DISCARDABLE 0, 0, 349, 149 @@ -5235,7 +5240,39 @@ LTEXT "Duration",IDC_STATIC,96,80,28,8 END +IDD_CREATURELEVELS DIALOG DISCARDABLE 0, 0, 183, 190 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Icewind Dale II levels" +FONT 8, "MS Sans Serif" +BEGIN + PUSHBUTTON "Back",IDCANCEL,126,169,50,14 + EDITTEXT IDC_U1,18,16,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_U2,18,46,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_U3,18,76,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_U4,18,106,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_U5,18,136,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_U6,18,166,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_U7,78,16,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_U8,78,46,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_U9,78,76,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_U10,78,106,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_U11,78,136,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_U12,78,166,40,14,ES_AUTOHSCROLL + LTEXT "Bard",IDC_STATIC,18,64,16,8 + LTEXT "Barbarian",IDC_STATIC,18,34,31,8 + LTEXT "Cleric",IDC_STATIC,18,94,18,8 + LTEXT "Druid",IDC_STATIC,18,124,18,8 + LTEXT "Total",IDC_STATIC,18,4,17,8 + LTEXT "Fighter",IDC_STATIC,18,154,22,8 + LTEXT "Monk",IDC_STATIC,78,4,19,8 + LTEXT "Paladin",IDC_STATIC,78,34,24,8 + LTEXT "Ranger",IDC_STATIC,78,64,24,8 + LTEXT "Rogue",IDC_STATIC,78,94,22,8 + LTEXT "Sorcerer",IDC_STATIC,78,124,28,8 + LTEXT "Wizard",IDC_STATIC,78,154,23,8 +END + ///////////////////////////////////////////////////////////////////////////// // // DESIGNINFO @@ -6043,6 +6080,14 @@ TOPMARGIN, 7 BOTTOMMARGIN, 130 END + + IDD_CREATURELEVELS, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 176 + TOPMARGIN, 7 + BOTTOMMARGIN, 183 + END END #endif // APSTUDIO_INVOKED Modified: chitem/trunk/chitemDlg.cpp =================================================================== --- chitem/trunk/chitemDlg.cpp 2008-10-26 20:56:37 UTC (rev 5470) +++ chitem/trunk/chitemDlg.cpp 2008-10-26 20:59:40 UTC (rev 5471) @@ -736,6 +736,14 @@ val=Read2daInt(tmploc, rnditems, 1); //removeall=1 darefs.Lookup("RT_NORM", tmploc); val|=Read2daInt(tmploc, rnditems, 0); //adding more items + darefs.Lookup("LISTSPLL", tmploc); + val|=Read2daResRef(tmploc, listspells, 1, 7); + darefs.Lookup("LISTINNT", tmploc); + val|=Read2daResRef(tmploc, listinnates, 1); + darefs.Lookup("LISTSONG", tmploc); + val|=Read2daResRef(tmploc, listsongs, 1); + darefs.Lookup("LISTSHAP", tmploc); + val|=Read2daResRef(tmploc, listshapes, 1); //this is the slot setup for(i=0;i<IWD2_SLOT_COUNT;i++) slot_names[i]=iwd2_slot_names[i]; Modified: chitem/trunk/creature.cpp =================================================================== --- chitem/trunk/creature.cpp 2008-10-26 20:56:37 UTC (rev 5470) +++ chitem/trunk/creature.cpp 2008-10-26 20:59:40 UTC (rev 5471) @@ -36,6 +36,7 @@ pst_overlay_size=0; revision=10; memset(iwd2_spells,0,sizeof(iwd2_spells)); + memset(iwd2_free,0,sizeof(iwd2_free)); m_savechanges=true; } @@ -256,7 +257,7 @@ if(revision==22) { - write_iwd2_spells(); + write_iwd2_spells(fhandle); } else { @@ -499,7 +500,7 @@ return flg; } -int Ccreature::write_iwd2_spells() +int Ccreature::write_iwd2_spells(int fhandle) { int position, esize; Modified: chitem/trunk/creature.h =================================================================== --- chitem/trunk/creature.h 2008-10-26 20:56:37 UTC (rev 5470) +++ chitem/trunk/creature.h 2008-10-26 20:59:40 UTC (rev 5471) @@ -16,7 +16,7 @@ typedef struct { - long unknown; + long maximum; long free; } iwd2_trail; @@ -146,7 +146,7 @@ int adjust_actpoint(long offset); int handle_iwd2_spells(int position, long offset, long count); int handle_iwd2(); - int write_iwd2_spells(); + int write_iwd2_spells(int fhandle); int calculate_iwd2_spells(int position, long &offset, long &maxcount); int calculate_iwd2(); inline long myseek(long pos) Modified: chitem/trunk/resource.h =================================================================== --- chitem/trunk/resource.h 2008-10-26 20:56:37 UTC (rev 5470) +++ chitem/trunk/resource.h 2008-10-26 20:59:40 UTC (rev 5471) @@ -264,6 +264,7 @@ #define IDS_VVCFLAG 231 #define IDD_ANIMDIALOG 231 #define IDS_SEQFLAG 232 +#define IDD_CREATURELEVELS 232 #define IDS_MINIMAP 233 #define IDS_TISEXTRACT 234 #define IDS_OVERLAY 235 @@ -1629,6 +1630,9 @@ #define IDC_SHADOW 2322 #define IDC_BREAKABLE 2331 #define IDC_BUTTON1 2333 +#define IDC_TOTAL 2336 +#define IDC_MEMORISED2 2337 +#define IDC_STATIC1 2338 #define ID_RESCAN 32771 #define ID_RESCAN2 32772 #define ID_EDIT_ITEM 32773 @@ -1851,7 +1855,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 233 #define _APS_NEXT_COMMAND_VALUE 33046 -#define _APS_NEXT_CONTROL_VALUE 2334 +#define _APS_NEXT_CONTROL_VALUE 2339 #define _APS_NEXT_SYMED_VALUE 120 #endif #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-03-29 20:07:33
|
Revision: 5839 http://gemrb.svn.sourceforge.net/gemrb/?rev=5839&view=rev Author: avenger_teambg Date: 2009-03-29 20:07:27 +0000 (Sun, 29 Mar 2009) Log Message: ----------- DLTCEP update Modified Paths: -------------- chitem/trunk/2DAEdit.cpp chitem/trunk/Chitem.cpp chitem/trunk/Chitem.h chitem/trunk/ScriptEdit.cpp chitem/trunk/chitem.clw chitem/trunk/chitem.rc chitem/trunk/chitemDlg.cpp chitem/trunk/chitemDlg.h chitem/trunk/resource.h chitem/trunk/seekers.cpp Modified: chitem/trunk/2DAEdit.cpp =================================================================== --- chitem/trunk/2DAEdit.cpp 2009-03-29 17:36:00 UTC (rev 5838) +++ chitem/trunk/2DAEdit.cpp 2009-03-29 20:07:27 UTC (rev 5839) @@ -1198,7 +1198,7 @@ } if(match&2) // full word trick { - tmp2=" "+tlk_entries[choosedialog][idx].text+" "; //in this + tmp2=" "+tmp2+" "; //in this } if(tmp2.Find(srch) !=-1) return true; } @@ -1256,6 +1256,16 @@ //matchcase is cheaper, therefore it is marked 0 match=!m_searchdlg->MatchCase()+(!!m_searchdlg->MatchWholeWord())*2; search=m_searchdlg->GetFindString(); + + if(match&1) //we can do this here + { + search.MakeLower(); + } + if(match&2) //this too + { + search=" "+search+" "; + } + do_search(direction,match,search); return 0; } Modified: chitem/trunk/Chitem.cpp =================================================================== --- chitem/trunk/Chitem.cpp 2009-03-29 17:36:00 UTC (rev 5838) +++ chitem/trunk/Chitem.cpp 2009-03-29 20:07:27 UTC (rev 5839) @@ -2266,7 +2266,7 @@ return tmpstr; } -CString spellnames[]={"SPPR","SPWI","SPIN","SPCL"}; +static CString spellnames[]={"SPPR","SPWI","SPIN","SPCL"}; CString format_spell_id(int id) { Modified: chitem/trunk/Chitem.h =================================================================== --- chitem/trunk/Chitem.h 2009-03-29 17:36:00 UTC (rev 5838) +++ chitem/trunk/Chitem.h 2009-03-29 20:07:27 UTC (rev 5839) @@ -874,6 +874,7 @@ CString format_animtype(int animtype); int getanimationidx(int animtype); int find_animtype(unsigned short *percents); +CString format_spell_id(int id); CString convert_degree(int value); CString convert_radius(int value, int direction=0); CString get_face_value(int fvalue); Modified: chitem/trunk/ScriptEdit.cpp =================================================================== --- chitem/trunk/ScriptEdit.cpp 2009-03-29 17:36:00 UTC (rev 5838) +++ chitem/trunk/ScriptEdit.cpp 2009-03-29 20:07:27 UTC (rev 5839) @@ -31,13 +31,6 @@ #define MAX_SCRIPT_LEN 6553599 #define LINES 30 -#define TA_ACTION 0 -#define TA_TRIGGER 1 -#define TA_IF 2 -#define TA_RESPONSE 3 -#define TA_THEN 4 -#define TA_ENDIF 5 - //static function //displays compiler data in human readable format CString format_parameters(compiler_data &compiler_data) @@ -301,24 +294,19 @@ else { tmpname = filepath; - } + } y = tmpname.ReverseFind('.'); if (y>0) { - filepath=tmpname.Left(y); + tmpname=tmpname.Left(y); } - else - { - filepath=tmpname; - } //setting up compiler with options - res = scmp->Compile(filepath, bgfolder+"\\"+outpath+"\\"+filepath+".bcs"); + res = scmp->Compile(filepath, bgfolder+"\\"+outpath+"\\"+tmpname+".bcs"); //actually this is not needed, delete will close all anyway - scmp->CloseAll(); delete scmp; if (res) { - MessageBox("Decompiler error.","Script editor",MB_OK|MB_ICONSTOP); + MessageBox("Compiler error.","Script editor",MB_OK|MB_ICONSTOP); res = 0; } } @@ -610,7 +598,7 @@ else if(newname.Right(4)==".BAF") newname=newname.Left(newname.GetLength()-4); if(newname.GetLength()>8 || newname.GetLength()<1 || newname.Find(" ",0)!=-1) { - tmpstr.Format("The resource name '%s' is bad, it should be 8 characters long and without spaces.",newname); + tmpstr.Format("The resource name '%s' is wrong, it should be 8 characters long and without spaces.",newname); MessageBox(tmpstr,"Warning",MB_ICONEXCLAMATION|MB_OK); goto restart; } @@ -626,7 +614,7 @@ { chdir(bgfolder); tmpstr=bgfolder+weidudecompiled; - mkdir(tmpstr); + assure_dir_exists(tmpstr); if(!dir_exists(tmpstr) ) { res=-3; @@ -1376,8 +1364,18 @@ int tmp = IDSKey("OBJECT",tmpstr); if (tmp!=-1) { - MessageBox(tmpstr,"Script Object", MB_ICONINFORMATION|MB_OK); + helpstr.Format("%s=%d", tmpstr, tmp); + MessageBox(helpstr,"Script Object", MB_ICONINFORMATION|MB_OK); + return false; } + + tmp = IDSKey("SPELL", tmpstr); + if (tmp!=-1) + { + helpstr.Format("%s=%s", tmpstr, format_spell_id(tmp)); + MessageBox(helpstr,"Spell", MB_ICONINFORMATION|MB_OK); + return false; + } return false; } Modified: chitem/trunk/chitem.clw =================================================================== --- chitem/trunk/chitem.clw 2009-03-29 17:36:00 UTC (rev 5838) +++ chitem/trunk/chitem.clw 2009-03-29 20:07:27 UTC (rev 5839) @@ -2,7 +2,7 @@ [General Info] Version=1 -LastClass=CCreatureItem +LastClass=CChitemDlg LastTemplate=CDialog NewFileInclude1=#include "stdafx.h" NewFileInclude2=#include "chitem.h" @@ -232,136 +232,136 @@ Resource123=IDD_GAMEGENERAL Class98=IcewindCre Resource124=IDR_SHORTCUT -Resource125=IDD_STOREGENERAL (English (U.S.)) -Resource126=IDD_CREATURERES (English (U.S.)) -Resource127=IDD_TISDIALOG (English (U.S.)) -Resource128=IDD_CREATUREIWD2 (English (U.S.)) -Resource129=IDD_PROGRESS (English (U.S.)) -Resource130=IDD_AREAENTRANCE (English (U.S.)) -Resource131=IDR_TLKMENU (English (U.S.)) -Resource132=IDD_EDIT (English (U.S.)) -Resource133=IDD_IDSEDIT (English (U.S.)) -Resource134=IDD_IMAGEVIEW (English (U.S.)) -Resource135=IDD_ITEMDESC (English (U.S.)) -Resource136=IDD_ITEMGENERAL (English (U.S.)) -Resource137=IDD_DIALOGEDIT (English (U.S.)) -Resource138=IDD_SPELLTOOL (English (U.S.)) -Resource139=IDD_AREAINT (English (U.S.)) -Resource140=IDD_GAMEPCINFO (English (U.S.)) -Resource141=IDD_CREATUREGENERAL (English (U.S.)) -Resource142=IDD_WEDPOLY (English (U.S.)) -Resource143=IDD_MUSEDIT (English (U.S.)) -Resource144=IDD_CHITEM_DIALOG (English (U.S.)) -Resource145=IDR_MENUBAR (English (U.S.)) -Resource146=IDD_ABOUTBOX (English (U.S.)) -Resource147=IDD_POLYGON (English (U.S.)) -Resource148=IDR_CHUI (English (U.S.)) -Resource149=IDD_CREATUREICONS (English (U.S.)) -Resource150=IDD_ITEMUSE (English (U.S.)) -Resource151=IDD_WEDEDIT (English (U.S.)) -Resource152=IDD_ITEMEFFECT (English (U.S.)) -Resource153=IDD_CREATUREEFF (English (U.S.)) -Resource154=IDD_SHOWLOG (English (U.S.)) -Resource155=IDD_STOREDRINKS (English (U.S.)) -Resource156=IDD_MAPLINK (English (U.S.)) -Resource157=IDR_SCRIPT (English (U.S.)) -Resource158=IDD_FINDITEM (English (U.S.)) -Resource159=IDD_STOREEDIT (English (U.S.)) -Resource160=IDR_TILE (English (U.S.)) -Resource161=IDD_AREASONGS (English (U.S.)) -Resource162=IDD_MOSEDIT (English (U.S.)) -Resource163=IDD_AREASPAWN (English (U.S.)) -Resource164=IDD_STORERENTAL (English (U.S.)) -Resource165=IDR_CREATURE (English (U.S.)) -Resource166=IDD_CFB (English (U.S.)) -Resource167=IDD_TEXTVIEW (English (U.S.)) -Resource168=IDD_CHECK (English (U.S.)) -Resource169=IDD_CREATUREEDIT (English (U.S.)) -Resource170=IDR_PROJECT (English (U.S.)) -Resource171=IDD_KEYEDIT (English (U.S.)) -Resource172=IDD_EXTRACT2 (English (U.S.)) -Resource173=IDD_CREATUREIWD (English (U.S.)) -Resource174=IDD_COMPAT (English (U.S.)) -Resource175=IDD_WEIDU (English (U.S.)) -Resource176=IDR_MUSIC (English (U.S.)) -Resource177=IDD_PROJEDIT (English (U.S.)) -Resource178=IDR_CHITIN (English (U.S.)) -Resource179=IDD_CREATUREOVR (English (U.S.)) -Resource180=IDD_CREATUREUNKNOWN (English (U.S.)) -Resource181=IDD_COLORPICKER (English (U.S.)) -Resource182=IDR_SRC (English (U.S.)) -Resource183=IDD_IAPDIALOG (English (U.S.)) -Resource184=IDR_2DA (English (U.S.)) -Resource185=IDD_SEARCHNODE (English (U.S.)) -Resource186=IDD_VVCEDIT (English (U.S.)) -Resource187=IDD_AREAMAP (English (U.S.)) -Resource188=IDD_CREATURESKILLS (English (U.S.)) -Resource189=IDD_VARIABLES (English (U.S.)) -Resource190=IDD_STOREEXTRA (English (U.S.)) -Resource191=IDD_CREATURESTRINGS (English (U.S.)) -Resource192=IDD_SCHEDULE (English (U.S.)) -Resource193=IDR_AREA (English (U.S.)) -Resource194=IDD_SPELLEQUIP (English (U.S.)) -Resource195=IDD_AREADOOR (English (U.S.)) -Resource196=IDD_WEDTILE (English (U.S.)) -Resource197=IDD_ITEMEXTRA (English (U.S.)) -Resource198=IDD_AREATRIGGER (English (U.S.)) -Resource199=IDD_SRCEDIT (English (U.S.)) -Resource200=IDD_SAVHANDLE (English (U.S.)) -Resource201=IDD_BAMEDIT (English (U.S.)) -Resource202=IDD_CHUIEDIT (English (U.S.)) -Resource203=IDR_WEDMENU (English (U.S.)) -Resource204=IDD_SPELLEXTRA (English (U.S.)) -Resource205=IDD_ANIMDIALOG -Resource206=IDD_ITEMPICKER (English (U.S.)) -Resource207=IDD_SPELLGENERAL (English (U.S.)) -Resource208=IDD_ITEMEQUIP (English (U.S.)) -Resource209=IDD_SPELLDESC (English (U.S.)) -Resource210=IDD_PALETTE (English (U.S.)) -Resource211=IDD_PROJEXT (English (U.S.)) -Resource212=IDR_GAME (English (U.S.)) -Resource213=IDD_AREAAMBIENT (English (U.S.)) -Resource214=IDD_SPELLEFFECT (English (U.S.)) -Resource215=IDR_VVC (English (U.S.)) -Resource216=IDR_WORLDMAP (English (U.S.)) -Resource217=IDD_CREATUREITEMS (English (U.S.)) -Resource218=IDD_AREAANIM (English (U.S.)) -Resource219=IDR_TREEMENU (English (U.S.)) -Resource220=IDD_MASSCLEAR (English (U.S.)) -Resource221=IDR_STORE (English (U.S.)) -Resource222=IDR_EFFECT (English (U.S.)) -Resource223=IDR_SPELL (English (U.S.)) -Resource224=IDD_ITEMEDIT (English (U.S.)) -Resource225=IDD_STOREITEMS (English (U.S.)) -Resource226=IDD_2DAEDIT (English (U.S.)) -Resource227=IDD_CREATURELEVELS (English (U.S.)) -Resource228=IDD_PANICBUTTON (English (U.S.)) -Resource229=IDD_ADDLINK (English (U.S.)) -Resource230=IDD_EXTRACT (English (U.S.)) -Resource231=IDR_BAMMENU (English (U.S.)) -Resource232=IDD_STRREFDLG (English (U.S.)) -Resource233=IDD_AREACONTAINER (English (U.S.)) -Resource234=IDD_CREATUREPST (English (U.S.)) -Resource235=IDD_SPELLEDIT (English (U.S.)) -Resource236=IDD_AREAACTOR (English (U.S.)) -Resource237=IDD_GAMESTATS (English (U.S.)) -Resource238=IDR_ITEM (English (U.S.)) -Resource239=IDD_MAPEDIT (English (U.S.)) -Resource240=IDD_EFFEDIT (English (U.S.)) -Resource241=IDR_IDS (English (U.S.)) -Resource242=IDD_AREAGENERAL (English (U.S.)) -Resource243=IDD_GAMEEDIT (English (U.S.)) -Resource244=IDD_GAMEGENERAL (English (U.S.)) -Resource245=IDD_AREATRIGGERSTRINGS (English (U.S.)) +Resource125=IDD_AREATRIGGER (English (U.S.)) +Resource126=IDD_SHOWLOG (English (U.S.)) +Resource127=IDR_EFFECT (English (U.S.)) +Resource128=IDR_CHITIN (English (U.S.)) +Resource129=IDD_SPELLEQUIP (English (U.S.)) +Resource130=IDD_2DAEDIT (English (U.S.)) +Resource131=IDD_ITEMPICKER (English (U.S.)) +Resource132=IDD_GAMESTATS (English (U.S.)) +Resource133=IDD_CREATUREPST (English (U.S.)) +Resource134=IDD_PALETTE (English (U.S.)) +Resource135=IDD_AREAINT (English (U.S.)) +Resource136=IDD_SPELLEFFECT (English (U.S.)) +Resource137=IDD_TISDIALOG (English (U.S.)) +Resource138=IDR_WORLDMAP (English (U.S.)) +Resource139=IDD_CREATUREEFF (English (U.S.)) +Resource140=IDR_CHUI (English (U.S.)) +Resource141=IDD_COLORPICKER (English (U.S.)) +Resource142=IDR_SPELL (English (U.S.)) +Resource143=IDR_BAMMENU (English (U.S.)) +Resource144=IDD_ITEMDESC (English (U.S.)) +Resource145=IDD_EDIT (English (U.S.)) +Resource146=IDD_SPELLGENERAL (English (U.S.)) +Resource147=IDR_PROJECT (English (U.S.)) +Resource148=IDR_2DA (English (U.S.)) +Resource149=IDD_AREAANIM (English (U.S.)) +Resource150=IDD_AREACONTAINER (English (U.S.)) +Resource151=IDR_ITEM (English (U.S.)) +Resource152=IDD_AREAGENERAL (English (U.S.)) +Resource153=IDR_TREEMENU (English (U.S.)) +Resource154=IDD_CREATUREIWD2 (English (U.S.)) +Resource155=IDR_VVC (English (U.S.)) +Resource156=IDD_AREAMAP (English (U.S.)) +Resource157=IDD_EXTRACT (English (U.S.)) +Resource158=IDD_SPELLEXTRA (English (U.S.)) +Resource159=IDD_AREAENTRANCE (English (U.S.)) +Resource160=IDD_EFFEDIT (English (U.S.)) +Resource161=IDD_PANICBUTTON (English (U.S.)) +Resource162=IDD_POLYGON (English (U.S.)) +Resource163=IDD_IMAGEVIEW (English (U.S.)) +Resource164=IDD_CREATUREICONS (English (U.S.)) +Resource165=IDD_ITEMICONS (English (U.S.)) +Resource166=IDD_PROJEDIT (English (U.S.)) +Resource167=IDD_AREASPAWN (English (U.S.)) +Resource168=IDD_ITEMUSE (English (U.S.)) +Resource169=IDD_IAPDIALOG (English (U.S.)) +Resource170=IDD_CFB (English (U.S.)) +Resource171=IDR_AREA (English (U.S.)) +Resource172=IDD_PROJEXT (English (U.S.)) +Resource173=IDR_SRC (English (U.S.)) +Resource174=IDD_CREATURESKILLS (English (U.S.)) +Resource175=IDD_BAMEDIT (English (U.S.)) +Resource176=IDD_STOREITEMS (English (U.S.)) +Resource177=IDD_MOSEDIT (English (U.S.)) +Resource178=IDD_ITEMEXTRA (English (U.S.)) +Resource179=IDD_ANIMDIALOG +Resource180=IDD_SAVHANDLE (English (U.S.)) +Resource181=IDD_GAMEPCINFO (English (U.S.)) +Resource182=IDD_STORERENTAL (English (U.S.)) +Resource183=IDD_GAMEGENERAL (English (U.S.)) +Resource184=IDD_STOREEDIT (English (U.S.)) +Resource185=IDD_KEYEDIT (English (U.S.)) +Resource186=IDD_SCHEDULE (English (U.S.)) +Resource187=IDR_SCRIPT (English (U.S.)) +Resource188=IDD_SCRIPTEDIT (English (U.S.)) +Resource189=IDD_CREATUREGENERAL (English (U.S.)) +Resource190=IDD_CREATURESTRINGS (English (U.S.)) +Resource191=IDD_STRREFDLG (English (U.S.)) +Resource192=IDD_CREATUREITEMS (English (U.S.)) +Resource193=IDD_ITEMGENERAL (English (U.S.)) +Resource194=IDD_AREADOOR (English (U.S.)) +Resource195=IDD_WEDPOLY (English (U.S.)) +Resource196=IDR_CREATURE (English (U.S.)) +Resource197=IDD_CREATURERES (English (U.S.)) +Resource198=IDD_IDSEDIT (English (U.S.)) +Resource199=IDR_TLKMENU (English (U.S.)) +Resource200=IDD_CREATURELEVELS (English (U.S.)) +Resource201=IDD_CREATUREUNKNOWN (English (U.S.)) +Resource202=IDR_GAME (English (U.S.)) +Resource203=IDD_COMPAT (English (U.S.)) +Resource204=IDD_AREAVARIABLE (English (U.S.)) +Resource205=IDD_AREATRIGGERSTRINGS (English (U.S.)) +Resource206=IDD_AREAEDIT (English (U.S.)) +Resource207=IDD_AREAAMBIENT (English (U.S.)) +Resource208=IDD_EXTRACT2 (English (U.S.)) +Resource209=IDD_DIALOGEDIT (English (U.S.)) +Resource210=IDD_AREASONGS (English (U.S.)) +Resource211=IDD_SPELLTOOL (English (U.S.)) +Resource212=IDD_ITEMEFFECT (English (U.S.)) +Resource213=IDD_MUSEDIT (English (U.S.)) +Resource214=IDD_SEARCHNODE (English (U.S.)) +Resource215=IDD_VVCEDIT (English (U.S.)) +Resource216=IDD_ITEMEQUIP (English (U.S.)) +Resource217=IDD_STOREDRINKS (English (U.S.)) +Resource218=IDD_CREATUREIWD (English (U.S.)) +Resource219=IDD_CHITEM_DIALOG (English (U.S.)) +Resource220=IDR_STORE (English (U.S.)) +Resource221=IDD_FINDITEM (English (U.S.)) +Resource222=IDD_ITEMEDIT (English (U.S.)) +Resource223=IDD_PROGRESS (English (U.S.)) +Resource224=IDD_SPELLDESC (English (U.S.)) +Resource225=IDD_VARIABLES (English (U.S.)) +Resource226=IDD_TEXTVIEW (English (U.S.)) +Resource227=IDD_WEIDU (English (U.S.)) +Resource228=IDR_MENUBAR (English (U.S.)) +Resource229=IDD_WEDTILE (English (U.S.)) +Resource230=IDD_AREAACTOR (English (U.S.)) +Resource231=IDD_ABOUTBOX (English (U.S.)) +Resource232=IDD_CREATUREOVR (English (U.S.)) +Resource233=IDD_WEDEDIT (English (U.S.)) +Resource234=IDR_IDS (English (U.S.)) +Resource235=IDD_ADDLINK (English (U.S.)) +Resource236=IDD_MAPLINK (English (U.S.)) +Resource237=IDR_MUSIC (English (U.S.)) +Resource238=IDD_CHECK (English (U.S.)) +Resource239=IDD_SRCEDIT (English (U.S.)) +Resource240=IDD_CREATUREEDIT (English (U.S.)) +Resource241=IDD_STOREGENERAL (English (U.S.)) +Resource242=IDD_GAMEEDIT (English (U.S.)) +Resource243=IDD_CHUIEDIT (English (U.S.)) +Resource244=IDR_TILE (English (U.S.)) +Resource245=IDR_WEDMENU (English (U.S.)) Class99=CAreaTriggerString Class100=CPCInfo -Resource246=IDD_AREAEDIT (English (U.S.)) +Resource246=IDD_MAPEDIT (English (U.S.)) Class101=CCreatureOverlay -Resource247=IDD_SCRIPTEDIT (English (U.S.)) +Resource247=IDD_STOREEXTRA (English (U.S.)) Class102=IWD2Creature -Resource248=IDD_AREAVARIABLE (English (U.S.)) +Resource248=IDD_MASSCLEAR (English (U.S.)) Class103=CAnimDialog -Resource249=IDD_ITEMICONS (English (U.S.)) +Resource249=IDD_SPELLEDIT (English (U.S.)) Class104=CCreatureLevels Resource250=IDR_SHORTCUT (English (U.S.)) @@ -379,7 +379,7 @@ Filter=D BaseClass=CDialog VirtualFilter=dWC -LastObject=ID_EXTRACTION_RECOMPRESSSAV +LastObject=ID_CHECK_WORLDMAP [CLS:CAboutDlg] Type=0 @@ -9590,43 +9590,44 @@ Command57=ID_CHECK_UI Command58=ID_CHECK_VVC Command59=ID_CHECK_WORLDMAP -Command60=ID_FILE_EXTRACT -Command61=ID_FILE_SEARCH -Command62=ID_UNCOMPRESSBIF -Command63=ID_UNCOMPRESSSAV -Command64=ID_UNCOMPRESSCBF -Command65=ID_SKIMSAV -Command66=ID_EXTRACTION_RECOMPRESSSAV -Command67=ID_FILE_BUILDBIF -Command68=ID_REORDERBIF -Command69=ID_COMPRESSBIF -Command70=ID_COMPRESSCBF -Command71=ID_WAVCTOWAV -Command72=ID_WAVCTOWAV2 -Command73=ID_WAVTOWAVC -Command74=ID_ACMTOWAV -Command75=ID_ACMTOWAV2 -Command76=ID_WAVTOACM -Command77=ID_ADDCFBTOSPELLS -Command78=ID_CLEARCFBFROMSPELLS -Command79=ID_TOOLS_DECOMPILE -Command80=ID_TOOLS_LOOKUPSTRREF -Command81=ID_AVATARS -Command82=ID_SCANVARIABLES -Command83=ID_TOOLS_SCANJOURNALENTRIES -Command84=ID_TISPACK -Command85=ID_LOGGING_NONE -Command86=ID_LOGGING_SCREEN -Command87=ID_LOGGING_FILE -Command88=ID_PROGRESS -Command89=ID_READONLY -Command90=ID_USEDIALOGF -Command91=ID_COMPAT -Command92=ID_SAVESETTINGS -Command93=IDM_ABOUTBOX -Command94=ID_TOOLTIPS -Command95=ID_HELP_README -CommandCount=95 +Command60=ID_CHECK_AVATAR2DA +Command61=ID_FILE_EXTRACT +Command62=ID_FILE_SEARCH +Command63=ID_UNCOMPRESSBIF +Command64=ID_UNCOMPRESSSAV +Command65=ID_UNCOMPRESSCBF +Command66=ID_SKIMSAV +Command67=ID_EXTRACTION_RECOMPRESSSAV +Command68=ID_FILE_BUILDBIF +Command69=ID_REORDERBIF +Command70=ID_COMPRESSBIF +Command71=ID_COMPRESSCBF +Command72=ID_WAVCTOWAV +Command73=ID_WAVCTOWAV2 +Command74=ID_WAVTOWAVC +Command75=ID_ACMTOWAV +Command76=ID_ACMTOWAV2 +Command77=ID_WAVTOACM +Command78=ID_ADDCFBTOSPELLS +Command79=ID_CLEARCFBFROMSPELLS +Command80=ID_TOOLS_DECOMPILE +Command81=ID_TOOLS_LOOKUPSTRREF +Command82=ID_AVATARS +Command83=ID_SCANVARIABLES +Command84=ID_TOOLS_SCANJOURNALENTRIES +Command85=ID_TISPACK +Command86=ID_LOGGING_NONE +Command87=ID_LOGGING_SCREEN +Command88=ID_LOGGING_FILE +Command89=ID_PROGRESS +Command90=ID_READONLY +Command91=ID_USEDIALOGF +Command92=ID_COMPAT +Command93=ID_SAVESETTINGS +Command94=IDM_ABOUTBOX +Command95=ID_TOOLTIPS +Command96=ID_HELP_README +CommandCount=96 [MNU:IDR_BAMMENU (English (U.S.))] Type=1 Modified: chitem/trunk/chitem.rc =================================================================== --- chitem/trunk/chitem.rc 2009-03-29 17:36:00 UTC (rev 5838) +++ chitem/trunk/chitem.rc 2009-03-29 20:07:27 UTC (rev 5839) @@ -6271,6 +6271,8 @@ MENUITEM "&UI", ID_CHECK_UI MENUITEM "&VVC", ID_CHECK_VVC MENUITEM "&Worldmap", ID_CHECK_WORLDMAP + MENUITEM SEPARATOR + MENUITEM "Avatar.&2da", ID_CHECK_AVATAR2DA END POPUP "E&xtraction" BEGIN Modified: chitem/trunk/chitemDlg.cpp =================================================================== --- chitem/trunk/chitemDlg.cpp 2009-03-29 17:36:00 UTC (rev 5838) +++ chitem/trunk/chitemDlg.cpp 2009-03-29 20:07:27 UTC (rev 5839) @@ -241,6 +241,7 @@ ON_COMMAND(ID_RESCAN3, OnRescan3) ON_COMMAND(ID_RESCAN4, OnRescan4) ON_COMMAND(ID_RESCAN5, OnRescan5) + ON_COMMAND(ID_CHECK_AVATAR2DA, OnCheckAvatar2da) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -2238,6 +2239,7 @@ return gret; } + void CChitemDlg::OnCheckItem() { if(bgfolder.IsEmpty()) @@ -2599,9 +2601,36 @@ } return; } - MessageBox("No problem found!","Game check",MB_OK|MB_ICONINFORMATION); + MessageBox("No problem found!","Worldmap check",MB_OK|MB_ICONINFORMATION); } +void CChitemDlg::OnCheckAvatar2da() +{ + if(bgfolder.IsEmpty()) + { + MessageBox("Use the setup first!","Warning",MB_ICONEXCLAMATION|MB_OK); + return; + } + + m_event.Empty(); + UpdateData(UD_DISPLAY); + + if(check_avatar()) + { + switch(logtype) + { + case 0: + MessageBox("There were inconsistencies, change the logging type to see them!","Avatar check",MB_OK|MB_ICONINFORMATION); + break; + case 2: + MessageBox("See the chitem.log for details on the inconsistencies!","Avatar check",MB_OK|MB_ICONINFORMATION); + break; + } + return; + } + MessageBox("No problem found!","Avatar check",MB_OK|MB_ICONINFORMATION); +} + void CChitemDlg::OnRescan() { if(bgfolder.IsEmpty()) Modified: chitem/trunk/chitemDlg.h =================================================================== --- chitem/trunk/chitemDlg.h 2009-03-29 17:36:00 UTC (rev 5838) +++ chitem/trunk/chitemDlg.h 2009-03-29 20:07:27 UTC (rev 5839) @@ -215,6 +215,27 @@ int check_kits(); int check_statdesc(); int check_songlist(); + int check_avatar(); + int check_ani_code_mirror(CString prefix); + int check_ani_code_mirror_2(CString prefix); + int check_ani_one_file(CString prefix); + int check_ani_two_files(CString prefix); + int check_ani_two_files_2(CString prefix); + int check_ani_two_files_3(CString prefix); + int check_ani_four_files(CString prefix); + int check_ani_six_files(CString prefix); + int check_ani_six_files_2(CString prefix); + int check_ani_twentytwo(CString prefix); + int check_ani_bird(CString prefix); + int check_ani_four_frames(CString prefix); + int check_ani_nine_frames(CString prefix); + int check_ani_pst_animation_1(CString prefix); + int check_ani_pst_animation_2(CString prefix); + int check_ani_pst_animation_3(CString prefix); + int check_ani_pst_ghost(CString prefix); + int check_ani_pst_stand(CString prefix); + int check_all_types(CString prefix, int except); + int check_or_scan_trigger(const trigger *tpoi, int checkflags, int check_or_scan, int bcnt); int check_or_scan_action(const action *apoi, int checkflags, int check_or_scan, int bcnt); int check_integers(const int *bytes, int storeflags, int opcode, int trigger, int block); @@ -328,6 +349,7 @@ afx_msg void OnRecompresssav(); afx_msg void OnUsedialogf(); afx_msg void OnToolsDecompile(); + afx_msg void OnCheckAvatar2da(); //}}AFX_MSG afx_msg void OnOk5(); afx_msg void OnOk6(); Modified: chitem/trunk/resource.h =================================================================== --- chitem/trunk/resource.h 2009-03-29 17:36:00 UTC (rev 5838) +++ chitem/trunk/resource.h 2009-03-29 20:07:27 UTC (rev 5839) @@ -1847,6 +1847,7 @@ #define ID_FILE_TP2 33043 #define ID_EXTRACTION_RECOMPRESSSAV 33044 #define ID_TOOLS_PLAYSOUND 33045 +#define ID_CHECK_AVATAR2DA 33046 #define ID_CONTEXT 0xF180 // Next default values for new objects @@ -1854,7 +1855,7 @@ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 233 -#define _APS_NEXT_COMMAND_VALUE 33046 +#define _APS_NEXT_COMMAND_VALUE 33047 #define _APS_NEXT_CONTROL_VALUE 2339 #define _APS_NEXT_SYMED_VALUE 120 #endif Modified: chitem/trunk/seekers.cpp =================================================================== --- chitem/trunk/seekers.cpp 2009-03-29 17:36:00 UTC (rev 5838) +++ chitem/trunk/seekers.cpp 2009-03-29 20:07:27 UTC (rev 5839) @@ -6070,3 +6070,562 @@ return ret; } +#define CODE_MIRROR_COUNT 13 +CString code_mirror_suffixes[CODE_MIRROR_COUNT]={"a1","a2","a3","a4","a5","a6","a7","a8","a9","sa","sx","ss","ca"}; +int cycle_count[CODE_MIRROR_COUNT]={9}; +int mandatory_code_mirror_s[CODE_MIRROR_COUNT]={1,1,1,1,1,1,1,1,1,1,1,1,0}; + +int CChitemDlg::check_ani_code_mirror(CString prefix) +{ + CString resref; + int i; + int res; + int cnt; + + cnt=0; + for(i=0;i<CODE_MIRROR_COUNT;i++) + { + resref=prefix+code_mirror_suffixes[i]; + res=check_resource(resref, false); + if(mandatory_code_mirror_s[i] && res) + { + cnt++; + } + } + + //9 is the number of mandatory animations, update it when mandatory_iwd_ani_s changed + if(cnt==12) return 1; //completely missing animation + if(cnt) return -1; //missing one file + return 0; +} + +int CChitemDlg::check_ani_one_file(CString prefix) +{ + int res, res2; + + res=check_resource(prefix, false); + res2=check_resource(prefix+"e", false); + if(res) return 1; //if prefix doesn't exist this is not a single file animation + if(!res2) return 1; //nor if an east animation exists + return 0; +} + +#define CODE_SF_COUNT 3 +CString code_sf_suffixes[CODE_SF_COUNT]={"g1","g2","g3"}; +int need_suffix_two[CODE_SF_COUNT]={1,0,0}; +int need_suffix_four[CODE_SF_COUNT]={1,1,0}; + +int CChitemDlg::check_ani_four_files(CString prefix) +{ + int i; + int res, res2; + + for(i=0;i<CODE_SF_COUNT;i++) + { + res=check_resource(prefix+code_sf_suffixes[i], false); + res2=check_resource(prefix+code_sf_suffixes[i]+"e", false); + if(res!=res2) return -2; + + if(!res ^ need_suffix_four[i]) + { + return 1; + } + } + return 0; +} + + +int CChitemDlg::check_ani_two_files(CString prefix) +{ + int i; + int res, res2; + + for(i=0;i<CODE_SF_COUNT;i++) + { + res=check_resource(prefix+code_sf_suffixes[i], false); + res2=check_resource(prefix+code_sf_suffixes[i]+"e", false); + if(res!=res2) return -2; + if(!res ^ need_suffix_two[i]) + { + return 1; + } + } + return 0; +} + +#define CODE_MIRROR2_COUNT 13 +CString code_mirror2_suffixes[CODE_MIRROR_COUNT]={"g1","g2","g11","g12","g13","g14","g15","g21","g22","g23","g24","g25","g26"}; + +int CChitemDlg::check_ani_code_mirror_2(CString prefix) +{ + CString resref; + int i; + int res; + int cnt; + + cnt=0; + for(i=0;i<CODE_MIRROR2_COUNT;i++) + { + resref=prefix+code_mirror2_suffixes[i]; + res=check_resource(resref, false); + if(res) + { + cnt++; + } + } + + if(cnt) return 1; //missing at least one file + return 0; +} + +int six_files_2_cycles[CODE_SF_COUNT]={24,16,32}; + +int CChitemDlg::check_ani_six_files_2(CString prefix) +{ + int i; + int res, res2; + CString resref; + Cbam tmp; + + for(i=0;i<CODE_SF_COUNT;i++) + { + resref=prefix+code_sf_suffixes[i]; + res=check_resource(resref, false); + res2=check_resource(resref+"e", false); + if(res) return 1; //if prefix doesn't exist this is not a single file animation + if(res2) return 1; //nor if an east animation is missing + resref.MakeUpper(); + if(read_bam_preview(resref,&tmp)) return -2; + if(tmp.GetCycleCount()!=six_files_2_cycles[i]) return 1; + } + return 0; +} + +#define CODE_TWENTYTWO_COUNT 11 +CString code_twentytwo_suffixes[CODE_MIRROR_COUNT]={"a1","a2","a3","a4","a5","a6","ca","g1","w2","sx","sa"}; +int mandatory_twentytwo_s[CODE_MIRROR_COUNT]={2,3,2,3,2,3,1,1,1,0,0}; + +int CChitemDlg::check_ani_twentytwo(CString prefix) +{ + int i; + int res, res2; + int cnt; + bool east; + bool twohanded; //needs twohanded + + cnt=0; + east=false; + twohanded=false; + for(i=0;i<CODE_SF_COUNT;i++) + { + res=check_resource(prefix+code_twentytwo_suffixes[i], false); + res2=check_resource(prefix+code_twentytwo_suffixes[i]+"e", false); + if (res!=res2) east=true; + if (mandatory_twentytwo_s[i]==2) + { + if(res) twohanded=true; + else twohanded=false; + } + + if(res) + { + switch(mandatory_twentytwo_s[i]) + { + case 0: case 2: + break; + case 1: + cnt++; + break; + case 3: + if(twohanded) + { + cnt++; + } + break; + } + } + } + + if(cnt) return -1; //missing only a few files + if(east) return -2; //missing an east file + return 0; +} + +int CChitemDlg::check_ani_bird(CString prefix) +{ + int res, res2; + + res=check_resource(prefix, false); + res2=check_resource(prefix+"e", false); + if(res) return 1; //if prefix doesn't exist this is not a single file animation + if(!res2) return 1; //nor if an east animation exists + return 0; +} + +int six_files_cycles[CODE_SF_COUNT]={16,80,48}; + +int CChitemDlg::check_ani_six_files(CString prefix) +{ + int i; + int res, res2; + CString resref; + Cbam tmp; + + for(i=0;i<CODE_SF_COUNT;i++) + { + resref=prefix+code_sf_suffixes[i]; + res=check_resource(resref, false); + res2=check_resource(resref+"e", false); + if(res) return 1; //if prefix doesn't exist this is not a single file animation + if(res2) return 1; //nor if an east animation is missing + resref.MakeUpper(); + if(read_bam_preview(resref,&tmp)) return -2; + if(tmp.GetCycleCount()!=six_files_cycles[i]) return 1; + } + return 0; +} + +int CChitemDlg::check_ani_two_files_2(CString prefix) +{ + int i; + int res, res2; + + for(i=0;i<CODE_SF_COUNT;i++) + { + res=check_resource(prefix+code_sf_suffixes[i], false); + res2=check_resource(prefix+code_sf_suffixes[i]+"e", false); + if(res!=res2) return -2; + if(!res ^ need_suffix_two[i]) + { + return 1; + } + } + return 0; +} + +#define IWD_ANI_COUNT 13 + +CString iwd_ani_suffixes[IWD_ANI_COUNT]={"wk","tw","sl","gu","de","gh","sc","sp","ca","sd","a1","a2","a4"}; +int mandatory_iwd_ani_s[IWD_ANI_COUNT]={1,1,1,1,1,1,1,0,0,1,1,0,0}; + +int CChitemDlg::check_ani_two_files_3(CString prefix) +{ + CString resref; + int i; + int res, res2; + int cnt; + bool east; + + cnt=0; + east=false; + for(i=0;i<IWD_ANI_COUNT;i++) + { + resref=prefix+iwd_ani_suffixes[i]; + res=check_resource(resref, false); + res2=check_resource(resref+"e", false); + if(res!=res2) + { + east=true; + } + if(mandatory_iwd_ani_s[i] && res) + { + cnt++; + } + } + + //9 is the number of mandatory animations, update it when mandatory_iwd_ani_s changed + //but some animations may contain a1 animation even when they are not iwd animations + if(cnt>=8) return 1; //completely missing animation or not this type + if(cnt) return -1; //missing only a few files + if(east) return -2; //missing an east file + return 0; +} + +#define NF_COUNT 27 +CString nf_suffixes[NF_COUNT]={"g11","g12","g13","g14","g15","g16","g17","g18","g19", +"g21","g22","g23","g24","g25","g26","g27","g28","g29", +"g31","g32","g33","g34","g35","g36","g37","g38","g39"}; + +int need_four_frames[NF_COUNT]={1,1,1,1,0,0,0,0,0,1,1,1,1,0,0,0,0,0,1,1,1,1,0,0,0,0,0}; + +int CChitemDlg::check_ani_four_frames(CString prefix) +{ + CString resref; + int i; + int res; + + for(i=0;i<NF_COUNT;i++) + { + resref=prefix+nf_suffixes[i]; + res=check_resource(resref, false); + if(!res ^ need_four_frames[i]) + { + return 1; + } + } + + return 0; +} + +#define NF_STANCE_COUNT 7 +int NFStancePrefix[]={1,2,3,4,4,4,5}; +int NFCyclePrefix[]= {0,0,0,0,1,2,1}; + +int CChitemDlg::check_ani_nine_frames(CString prefix) +{ + CString resref; + int i; + int res; + int part, cycle; + + for(i=0;i<NF_STANCE_COUNT;i++) + { + for(part=1;part<10;part++) + { + for(cycle=0;cycle<9;cycle++) + { + resref.Format("%s%d%d%d%d",prefix, NFStancePrefix[i], part, NFCyclePrefix[i], cycle); + res=check_resource(resref, false); + if(res) + { + return 1; + } + } + } + } + + return 0; +} + +#define PINF_COUNT 21 +CString pst_infixes[PINF_COUNT]={"at1","at2","c2s","s2c","cf1","cf2","sf1","sf2","dfb","gup","hit", +"run","sp1","sp2","stc","std","wlk","tk1","tk2","tk3","ms1"}; +int pst_ani_1_mandatory_infixes[PINF_COUNT]={0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,1,1,0,0,0,0}; +int pst_ani_2_mandatory_infixes[PINF_COUNT]={0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,1,0,0,0,0}; +int pst_ani_3_mandatory_infixes[PINF_COUNT]={0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,1,0,0,0,0}; +int pst_ani_stand_mandatory_infixes[PINF_COUNT]={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0}; + +int CChitemDlg::check_ani_pst_animation_1(CString prefix) +{ + CString resref; + int i; + int res; + int cnt; + + cnt=0; + for(i=0;i<PINF_COUNT;i++) + { + resref=prefix.Left(1)+pst_infixes[i]+prefix.Right(4); + res=check_resource(resref, false); + if(pst_ani_1_mandatory_infixes[i] && res) + { + cnt++; + } + } + + if(cnt>2) return 1; + if(cnt) return -1; + return 0; +} + +int CChitemDlg::check_ani_pst_ghost(CString prefix) +{ + int res, res2; + + res=check_resource(prefix, false); + res2=check_resource(prefix+"e", false); + if(res) return 1; //if prefix doesn't exist this is not a single file animation + if(!res2) return 1; //nor if an east animation exists + return 0; +} + +int CChitemDlg::check_ani_pst_stand(CString prefix) +{ + CString resref; + int i; + int res; + int cnt; + + cnt=0; + for(i=0;i<PINF_COUNT;i++) + { + resref=prefix.Left(1)+pst_infixes[i]+prefix.Right(4); + res=check_resource(resref, false); + if(pst_ani_stand_mandatory_infixes[i] && res) + { + cnt++; + } + } + + if(cnt>9) return 1; + if(cnt) return -1; + return 0; +} + +int CChitemDlg::check_ani_pst_animation_2(CString prefix) +{ + CString resref; + int i; + int res; + int cnt; + + cnt=0; + for(i=0;i<PINF_COUNT;i++) + { + resref=prefix.Left(1)+pst_infixes[i]+prefix.Right(4); + res=check_resource(resref, false); + if(pst_ani_2_mandatory_infixes[i] && res) + { + cnt++; + } + } + + if(cnt>9) return 1; + if(cnt) return -1; + return 0; +} + +int CChitemDlg::check_ani_pst_animation_3(CString prefix) +{ + CString resref; + int i; + int res; + int cnt; + + cnt=0; + for(i=0;i<PINF_COUNT;i++) + { + resref=prefix.Left(1)+pst_infixes[i]+prefix.Right(4); + res=check_resource(resref, false); + if(pst_ani_3_mandatory_infixes[i] && res) + { + cnt++; + } + } + + if(cnt>9) return 1; + if(cnt) return -1; + return 0; +} + + +int CChitemDlg::check_all_types(CString prefix, int except) +{ + int type, res; + + for(type=0;type<21;type++) + { + if(type==except) continue; + switch(type) + { + case 0: res=check_ani_code_mirror(prefix); break; //simple bg1 animations + case 1: res=check_ani_one_file(prefix); break; + case 2: res=check_ani_four_files(prefix); break; + case 3: res=check_ani_two_files(prefix); break; + case 4: res=check_ani_code_mirror_2(prefix); break; + case 5: res=check_ani_six_files_2(prefix); break; + case 6: res=check_ani_twentytwo(prefix); break; + case 7: res=check_ani_bird(prefix); break; + case 8: res=check_ani_six_files(prefix); break; + case 9: res=check_ani_two_files_3(prefix); break; //iwd animations + case 10: res=check_ani_two_files_2(prefix); break; + case 11: res=check_ani_four_frames(prefix); break; //large animations + case 12: res=check_ani_nine_frames(prefix); break; //huge animations + case 16: res=check_ani_pst_animation_1(prefix); break; + case 17: res=check_ani_pst_ghost(prefix); break; + case 18: res=check_ani_pst_stand(prefix); break; + case 19: res=check_ani_pst_animation_2(prefix); break; //std->stc + case 20: res=check_ani_pst_animation_3(prefix); break; //stc->std + default: res=-3; break; + } + if(!res) return type; + } + return -1; +} + +int CChitemDlg::check_avatar() +{ + int ret; + POSITION pos, pos2, pos3; + CStringList ids; + CStringList prefixes; + CStringList types; + loc_entry tmploc; + CString prefix, id; + int type, res; + + changeitemname("AVATARS"); + if(!darefs.Lookup("AVATARS", tmploc)) + { + MessageBox("There is no avatars.2da (it is a GemRB specific file)!","Warning",MB_ICONEXCLAMATION|MB_OK); + return 2; + } + + Read2daColumn(tmploc, ids, 0, false); + Read2daColumn(tmploc, prefixes, 1, false); + Read2daColumn(tmploc, types, 5, false); + pos=prefixes.GetHeadPosition(); + pos2=types.GetHeadPosition(); + pos3=ids.GetHeadPosition(); + if(!pos || !pos2 || !pos3 || prefixes.GetCount()!=types.GetCount()) + { + log("File is crippled"); + return 2; + } + ret=0; + while(pos && pos2 && pos3) + { + prefix=prefixes.GetNext(pos); + type=atoi(types.GetNext(pos2)); + id=ids.GetNext(pos3); + switch(type) + { + case 0: res=check_ani_code_mirror(prefix); break; //simple bg1 animations + case 1: res=check_ani_one_file(prefix); break; + case 2: res=check_ani_four_files(prefix); break; + case 3: res=check_ani_two_files(prefix); break; + case 4: res=check_ani_code_mirror_2(prefix); break; + case 5: res=check_ani_six_files_2(prefix); break; + case 6: res=check_ani_twentytwo(prefix); break; + case 7: res=check_ani_bird(prefix); break; + case 8: res=check_ani_six_files(prefix); break; + case 9: res=check_ani_two_files_3(prefix); break; //iwd animations + case 10: res=check_ani_two_files_2(prefix); break; + case 11: res=check_ani_four_frames(prefix); break; //large animations + case 12: res=check_ani_nine_frames(prefix); break; //huge animations + case 16: res=check_ani_pst_animation_1(prefix); break; + case 17: res=check_ani_pst_ghost(prefix); break; + case 18: res=check_ani_pst_stand(prefix); break; + case 19: res=check_ani_pst_animation_2(prefix); break; //std->stc + case 20: res=check_ani_pst_animation_3(prefix); break; //stc->std + default: + res=-3; break; + } + + if(res<0) ret=-2; + switch(res) + { + case -3: + log("Invalid avatar type for %s (%s)",prefix, id); + break; + case -2: + log("Missing east animation file for %s (%s)", prefix, id); + break; + case -1: + log("Missing file for %s (%s)", prefix, id); + break; + case 1: + //this is not an exact error, completely missing animations are fine + //but if we have a better suggestion, it means avatars.2da is wrong + log("Invalid animation %s (%s) for type %d.", prefix, id, type); + type=check_all_types(prefix, type); + if(type>=0) + { + ret=-1; //this means a fixable problem + log("Suggested type is: %d", type); + } + } + } + + return ret; +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-03-29 20:08:20
|
Revision: 5840 http://gemrb.svn.sourceforge.net/gemrb/?rev=5840&view=rev Author: avenger_teambg Date: 2009-03-29 20:08:16 +0000 (Sun, 29 Mar 2009) Log Message: ----------- dltcep: missing files! Added Paths: ----------- chitem/trunk/Compiler.cpp chitem/trunk/Compiler.h Added: chitem/trunk/Compiler.cpp =================================================================== --- chitem/trunk/Compiler.cpp (rev 0) +++ chitem/trunk/Compiler.cpp 2009-03-29 20:08:16 UTC (rev 5840) @@ -0,0 +1,400 @@ +// Compiler.cpp: implementation of the Compiler class. +// +////////////////////////////////////////////////////////////////////// + +#include "stdafx.h" +#include "chitem.h" +#include "Compiler.h" +#include <fcntl.h> +#include <sys/stat.h> +#include <assert.h> + +#ifdef _DEBUG +#undef THIS_FILE +static char THIS_FILE[]=__FILE__; +#define new DEBUG_NEW +#endif + +////////////////////////////////////////////////////////////////////// +// Construction/Destruction +////////////////////////////////////////////////////////////////////// + +Compiler::Compiler(int arg_log) +{ + logging = arg_log; + flog = 0; + fhandle = 0; + fout = 0; + buffer = 0; + bpoi = 0; + valid = 0; + state = 0; + ObjectFieldsCount = 7; + MaxObjectNesting = 5; + ExtraParametersCount = 0; + HasAdditionalRect = false; + HasTriggerPoint = false; + if (pst_compatible_var()) + { + ObjectFieldsCount += 2; + HasTriggerPoint = true; + HasAdditionalRect = true; + } + if (has_xpvar()) + { + HasAdditionalRect = true; + } + if (iwd2_structures()) + { + ObjectFieldsCount++; + ExtraParametersCount += 2; + } +} + +Compiler::~Compiler() +{ + CloseAll(); + if (buffer) free(buffer); +} + +void Compiler::CloseAll() +{ + if (flog) close(flog); + flog = 0; + if (fhandle) close(fhandle); + fhandle = 0; + if (fout) close(fout); + fout = 0; + bpoi = 0; + valid = 0; +} + +bool Compiler::Compile(CString filepath, CString output) +{ + linecount=1; + bpoi = 0; + valid = 0; + if (logging && !flog) + { + unlink(WEIDU_LOG); //removing the logfile + flog = open(WEIDU_LOG, O_RDWR|O_CREAT|O_TRUNC, S_IWRITE|S_IREAD); + if (flog<0) flog = 0; + } + + if (fhandle) abort(); + + fhandle=open(filepath,O_RDONLY|O_BINARY,S_IREAD); + if (fhandle<=0) + { + return true; + } + + if (fout) abort(); + + fout = open(output, O_RDWR|O_CREAT|O_TRUNC, S_IWRITE|S_IREAD); + if (fout<=0) + { + return true; + } + + //output the script + state = TA_IF; + WriteString("SC\n"); + //ok we have all the files now + while (!ProcessLine()); + WriteString("SC\n"); + + CloseAll(); + return false; +} + +//different from the decompiler readline, this one ignores // characters +void Compiler::ReadLine(int maxlength) +{ + int i; + bool comment; + + if (!buffer) + { + buffer = (char *) malloc(READ_BUFFERLENGTH); + valid = 0; + bpoi = 0; + } + + assert(maxlength<=READ_BUFFERLENGTH); + line.Empty(); + if (!buffer) + { + return; + } +retry: + if(valid<bpoi) + { + return; + } + if (bpoi+maxlength>valid) + { + memmove(buffer,buffer+bpoi, valid-bpoi); + valid-=bpoi; + buffer[valid]=0; + bpoi=0; + } + valid += read(fhandle, buffer+valid, READ_BUFFERLENGTH-valid); + if (valid<1) + { + return; + } + if (valid<maxlength) + { + maxlength=valid; + } + comment=false; + for(i=bpoi;i<bpoi+valid;i++) + { + if (buffer[i]=='\r' || buffer[i]=='\n') + { + buffer[i]=0; + comment=false; + break; + } + if (buffer[i]=='/' && (i+1<bpoi+valid) && buffer[i+1]=='/') + { + buffer[i]=0; + buffer[i+1]=0; + comment=true; + continue; + } + if(comment) buffer[i]=0; + } + + //This conversion always sets the linelength to maxlength, which is wrong + line = CString(buffer+bpoi, maxlength); + line.ReleaseBuffer();//correcting the line value + bpoi=i+1; + line.TrimLeft(); + line.TrimRight(); + + if (line.IsEmpty()) + { + goto retry; + } +} + +void Compiler::WriteString(CString tmp) +{ + write(fout,tmp, tmp.GetLength()); +} + +void Compiler::WriteError(CString out) +{ + CString tmp; + + if(flog) + { + tmp.Format("%d: %s\r\n", linecount, out); + write(flog, tmp, tmp.GetLength()); + } +} + +void Compiler::WriteObject(object &ob) +{ + int i; + CString tmp; + + WriteString("OB\n"); + for(i=0;i<ObjectFieldsCount+MaxObjectNesting;i++) + { + tmp.Format("%d ", ob.bytes[i]); + WriteString(tmp); + } + + if(HasAdditionalRect) + { + tmp.Format("%d.%d.%d.%d ",ob.area[0],ob.area[1],ob.area[2],ob.area[3]); + WriteString(tmp); + } + + tmp.Format("\"%s\"",ob.var); + WriteString(tmp); + + for(i=0;i<ExtraParametersCount;i++) + { + tmp.Format("%d ", ob.bytes2[i]); + WriteString(tmp); + } + //TODO write object + WriteString("OB\n"); +} + +bool Compiler::HandleAction() +{ + int i; + int err; + CString tmp; + action action; + + ReadLine(1024); + if (line.CompareNoCase("END")) + { + err = compile_action(line, action, false); + + tmp.Format("AC\n%d", action.opcode); + WriteString(tmp); + + for(i=0;i<3;i++) + { + WriteObject(action.obj[i]); + } + for(i=0;i<5;i++) + { + //no space before var1 + if(i!=4) + { + tmp.Format("%d ", action.bytes[i]); + } + else + { + tmp.Format("%d", action.bytes[i]); + } + WriteString(tmp); + } + tmp.Format("\"%s\" \"%s\" ", action.var1, action.var2); + WriteString(tmp); + + //TODO output the action + // + WriteString("AC\n"); + return false; + } + WriteString("RE\nRS\nCR\n"); + state = TA_IF; + return false; +} + +bool Compiler::HandleResponse() +{ + CString num; + int value; + + ReadLine(1024); + if(num_or==-1) + { + num_or=0; + WriteString("RS\n"); + } + if(line.Left(10).CompareNoCase("RESPONSE #")) + { + return true; + } + num = line.Mid(10); + value=-1; + sscanf(num,"%d", &value); + if (value<1 || value>100) + { + WriteError("Invalid response #"); + } + WriteString("RE\n"+num); + state=TA_ACTION; + return false; +} + +bool Compiler::HandleTrigger() +{ + int err; + CString tmp; + trigger trigger; + + ReadLine(1024); + if(line.CompareNoCase("THEN")) + { + if(num_or==-1) + { + WriteString("CO\n"); + num_or=0; + } + err = compile_trigger(line, trigger); + if (err) + { + //TODO use WriteError to explain the error + // + } + + if((trigger.opcode&0x3fff)==TR_OR) + { + if (num_or) + { + WriteError("Nested OR in trigger block"); + } + num_or = trigger.bytes[0]; + } else if (num_or) num_or--; + + WriteString("TR\n"); + //TODO output the trigger + // + tmp.Format("%d %d %d %d %d ", + trigger.opcode, trigger.bytes[0], trigger.negate, + trigger.bytes[1], trigger.bytes[2]); + WriteString(tmp); + + if(HasTriggerPoint) + { + tmp.Format("[%d,%d] ", trigger.bytes[3],trigger.bytes[4]); + WriteString(tmp); + } + tmp.Format("\"%s\" \"%s\" ", trigger.var1, trigger.var2); + WriteString(tmp); + WriteObject(trigger.trobj); + WriteString("TR\n"); + return false; + } + + if (num_or<0) + { + //there was nothing in the trigger block (IF/THEN without any triggers) + WriteError("Missing trigger block"); + state = TA_RESPONSE; //this is just a guessed state we are already off track + return true; + } + //at the end of the trigger block, we got incomplete or + if (num_or) + { + WriteError("Incomplete OR in trigger block"); + } + //output the condition closer marker + WriteString("CO\n"); + state = TA_RESPONSE; + num_or=-1; + return false; +} + +bool Compiler::ProcessLine() +{ + switch(state) + { + case TA_IF: + ReadLine(10); + if(line.CompareNoCase("IF")) return true; + state=TA_TRIGGER; + WriteString("CR\n"); + num_or=-1; + break; + case TA_TRIGGER: + if (HandleTrigger()) return true; + break; + case TA_ACTION: + if (HandleAction()) return true; + break; + case TA_RESPONSE: + if (HandleResponse()) + { + if(line.CompareNoCase("END")) + { + WriteString("RE\nCR\n"); + state = TA_IF; + } else return true; + } + break; + } + + return false; +} Added: chitem/trunk/Compiler.h =================================================================== --- chitem/trunk/Compiler.h (rev 0) +++ chitem/trunk/Compiler.h 2009-03-29 20:08:16 UTC (rev 5840) @@ -0,0 +1,53 @@ +// Compiler.h: interface for the Compiler class. +// +////////////////////////////////////////////////////////////////////// + +#if !defined(AFX_COMPILER_H__7DCEF5CB_14D9_4D38_997E_DADA9256476E__INCLUDED_) +#define AFX_COMPILER_H__7DCEF5CB_14D9_4D38_997E_DADA9256476E__INCLUDED_ + +#if _MSC_VER > 1000 +#pragma once +#endif // _MSC_VER > 1000 + +#define READ_BUFFERLENGTH 4096 + +//compiler states +#define TA_ACTION 0 +#define TA_TRIGGER 1 +#define TA_IF 2 +#define TA_RESPONSE 3 + +class Compiler +{ +public: + Compiler(int arg_log); + virtual ~Compiler(); +public: + bool Compile(CString filepath, CString output); + void CloseAll(); + void ReadLine(int maxlength); + bool HandleTrigger(); + bool HandleResponse(); + bool HandleAction(); + bool ProcessLine(); + void WriteObject(object &ob); + void WriteString(CString tmp); + void WriteError(CString tmp); + +private: + int logging; + int flog, fhandle, fout; + char *buffer; + CString line; + int num_or; + int bpoi, valid; + int ObjectFieldsCount; + int MaxObjectNesting; + bool HasAdditionalRect; + bool HasTriggerPoint; + int ExtraParametersCount; + int state; + int linecount; +}; + +#endif // !defined(AFX_COMPILER_H__7DCEF5CB_14D9_4D38_997E_DADA9256476E__INCLUDED_) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-04-25 17:04:37
|
Revision: 5887 http://gemrb.svn.sourceforge.net/gemrb/?rev=5887&view=rev Author: avenger_teambg Date: 2009-04-25 17:04:32 +0000 (Sat, 25 Apr 2009) Log Message: ----------- dltcep update (area projectile editing started) Modified Paths: -------------- chitem/trunk/AreaProperties.cpp chitem/trunk/AreaProperties.h chitem/trunk/Structs.h chitem/trunk/chitem.rc chitem/trunk/resource.h Modified: chitem/trunk/AreaProperties.cpp =================================================================== --- chitem/trunk/AreaProperties.cpp 2009-04-25 17:02:49 UTC (rev 5886) +++ chitem/trunk/AreaProperties.cpp 2009-04-25 17:04:32 UTC (rev 5887) @@ -35,6 +35,7 @@ IMPLEMENT_DYNCREATE(CAreaVariable, CPropertyPage) IMPLEMENT_DYNCREATE(CAreaAnim, CPropertyPage) IMPLEMENT_DYNCREATE(CAreaMap, CPropertyPage) +IMPLEMENT_DYNCREATE(CAreaProj, CPropertyPage) static unsigned long defschedule; @@ -238,7 +239,6 @@ m_tooltip.Create(this,TTS_NOPREFIX); m_tooltip.SetMaxTipWidth(200); m_tooltip.SetTipBkColor(RGB(240,224,160)); - } UpdateData(UD_DISPLAY); return TRUE; @@ -1578,7 +1578,7 @@ int i; CPropertyPage::OnInitDialog(); - + RefreshTrigger(); for(i=0;i<NUM_RTTYPE;i++) { m_regiontype_control.AddString(get_region_type(i)); @@ -1591,7 +1591,6 @@ m_tooltip.AddTool(GetDlgItem(IDC_TRIGGERPICKER), IDS_LABEL); } - RefreshTrigger(); UpdateData(UD_DISPLAY); return TRUE; } @@ -3094,6 +3093,7 @@ BOOL CAreaAmbient::OnInitDialog() { CPropertyPage::OnInitDialog(); + RefreshAmbient(); //tooltips { m_tooltip.Create(this,TTS_NOPREFIX); @@ -3102,7 +3102,6 @@ m_tooltip.AddTool(GetDlgItem(IDC_AMBIENTPICKER), IDS_LABEL); } - RefreshAmbient(); UpdateData(UD_DISPLAY); return TRUE; } @@ -4514,6 +4513,7 @@ CComboBox *cb; CPropertyPage::OnInitDialog(); + RefreshVariable(); if(pst_compatible_var()) { cb = (CComboBox *) GetDlgItem(IDC_COLOR); @@ -4526,10 +4526,7 @@ m_tooltip.Create(this,TTS_NOPREFIX); m_tooltip.SetMaxTipWidth(200); m_tooltip.SetTipBkColor(RGB(240,224,160)); - - } - RefreshVariable(); UpdateData(UD_DISPLAY); return TRUE; } @@ -5115,6 +5112,7 @@ BOOL CAreaDoor::OnInitDialog() { CPropertyPage::OnInitDialog(); + RefreshDoor(); //tooltips { m_tooltip.Create(this,TTS_NOPREFIX); @@ -5123,7 +5121,6 @@ m_tooltip.AddTool(GetDlgItem(IDC_DOORPICKER), IDS_LABEL); } - RefreshDoor(); UpdateData(UD_DISPLAY); return TRUE; } @@ -6041,6 +6038,7 @@ BOOL CAreaAnim::OnInitDialog() { CPropertyPage::OnInitDialog(); + RefreshAnim(); //tooltips { m_tooltip.Create(this,TTS_NOPREFIX); @@ -6065,7 +6063,6 @@ m_tooltip.AddTool(GetDlgItem(IDC_FLAG14), IDS_CHANCE); m_tooltip.AddTool(GetDlgItem(IDC_TRANSPARENT), IDS_ATRANSP); } - RefreshAnim(); return TRUE; } @@ -6485,18 +6482,16 @@ CRect tmprect; CPropertyPage::OnInitDialog(); + RefreshMap(); + GetDlgItem(IDC_MAP)->GetWindowRect(tmprect); + m_oladjust=tmprect.TopLeft(); + ScreenToClient(&m_oladjust); //tooltips { m_tooltip.Create(this,TTS_NOPREFIX); m_tooltip.SetMaxTipWidth(200); m_tooltip.SetTipBkColor(RGB(240,224,160)); - - } - RefreshMap(); - GetDlgItem(IDC_MAP)->GetWindowRect(tmprect); - m_oladjust=tmprect.TopLeft(); - ScreenToClient(&m_oladjust); return TRUE; } @@ -6889,7 +6884,187 @@ return CPropertyPage::PreTranslateMessage(pMsg); } + ///////////////////////////////////////////////////////////////////////////// +// CAreaProj dialog + +void CAreaProj::RefreshProj() +{ + CString tmpstr; + int offset; + int i; + + if(m_trapnum<0 || m_trapnum>=the_area.header.trapcnt) + { + if(the_area.header.trapcnt) m_trapnum=0; + else m_trapnum=-1; + } + if(IsWindow(m_trappicker) ) + { + m_trappicker.ResetContent(); + for(i=0;i<the_area.trapcount;i++) + { + tmpstr.Format("%d. %-.8s",i+1,the_area.trapheaders[i].projectile); + m_trappicker.AddString(tmpstr); + } + m_trapnum=m_trappicker.SetCurSel(m_trapnum); + } + + offset=0; + for(i=0;i<the_area.trapcount;i++) + { + the_area.trapheaders[i].offset=offset; + offset+=the_area.trapheaders[i].size/0x108; + } + + if(m_effect_control && (m_trapnum>=0) ) + { + m_effect_control.ResetContent(); + offset=the_area.trapheaders[m_trapnum].offset; + for(i=0;i<the_area.trapheaders[m_trapnum].size/0x108;i++) + { + // + if(i+offset>=the_area.effectcount) + { + MessageBox("Something is inconsistent here!\n",MB_OK); + break; + } + + tmpstr.Format("%d %s (0x%x 0x%x) %.8s",i+1, + get_opcode_text(the_area.effects[i+offset].feature), + the_area.effects[i+offset].par1.parl, + the_area.effects[i+offset].par2.parl, + the_area.effects[i+offset].vvc); + m_effect_control.AddString(tmpstr); + } + if(effectnum<0 || effectnum>=i) effectnum=0; + effectnum=m_effect_control.SetCurSel(effectnum); + } +} + +BOOL CAreaProj::OnInitDialog() +{ + CPropertyPage::OnInitDialog(); + RefreshProj(); + //tooltips + { + m_tooltip.Create(this,TTS_NOPREFIX); + m_tooltip.SetMaxTipWidth(200); + m_tooltip.SetTipBkColor(RGB(240,224,160)); + } + UpdateData(UD_DISPLAY); + return TRUE; +} + +BEGIN_MESSAGE_MAP(CAreaProj, CPropertyPage) + //{{AFX_MSG_MAP(CAreaProj) + ON_CBN_KILLFOCUS(IDC_PROJPICKER, OnKillfocusProjpicker) + ON_CBN_SELCHANGE(IDC_PROJPICKER, OnSelchangeProjpicker) + ON_BN_CLICKED(IDC_BROWSE, OnBrowse) + //}}AFX_MSG_MAP +END_MESSAGE_MAP() + +CAreaProj::CAreaProj() : CPropertyPage(CAreaProj::IDD) +{ + //{{AFX_DATA_INIT(CAreaProj) + + //}}AFX_DATA_INIT +} + +CAreaProj::~CAreaProj() +{ +} + +static int trapboxids[]={ + //fields + IDC_BAM,IDC_PROJECTILE,IDC_POSX,IDC_POSY,IDC_UNKNOWN10, + IDC_UNKNOWN18,IDC_UNKNOWN1A, + IDC_EQUIPNUM, + //buttons + IDC_REMOVE, IDC_REMOVE2, IDC_ADD2, 0}; + +void CAreaProj::DoDataExchange(CDataExchange* pDX) +{ + CWnd *cb; + CString tmpstr; + int flg; + int i; + + CPropertyPage::DoDataExchange(pDX); + //{{AFX_DATA_MAP(CAreaProj) + DDX_Control(pDX, IDC_PROJPICKER, m_trappicker); + DDX_Control(pDX, IDC_EQUIPNUM, m_effect_control); + //}}AFX_DATA_MAP + cb=GetDlgItem(IDC_MAX); + flg=m_trapnum>=0; + tmpstr.Format("/ %d",the_area.trapcount); + cb->SetWindowText(tmpstr); + i=0; + while(trapboxids[i]) + { + cb=GetDlgItem(trapboxids[i++]); + cb->EnableWindow(flg); + } + if(flg) + { + DDX_Text(pDX, IDC_PROJECTILE, the_area.trapheaders[m_trapnum].proj); + DDX_Text(pDX, IDC_POSX, the_area.trapheaders[m_trapnum].posx); + DDX_Text(pDX, IDC_POSY, the_area.trapheaders[m_trapnum].posy); + RetrieveResref(tmpstr, the_area.trapheaders[m_trapnum].projectile); + DDX_Text(pDX, IDC_BAM, tmpstr); + DDV_MaxChars(pDX, tmpstr, 8); + StoreResref(tmpstr, the_area.trapheaders[m_trapnum].projectile); + DDX_Text(pDX, IDC_UNKNOWN10, the_area.trapheaders[m_trapnum].unknown10); + DDX_Text(pDX, IDC_UNKNOWN18, the_area.trapheaders[m_trapnum].unknown18); + DDX_Text(pDX, IDC_UNKNOWN1A, the_area.trapheaders[m_trapnum].unknown1a); + } +} + +void CAreaProj::OnSelchangeProjpicker() +{ + int x; + + x=m_trappicker.GetCurSel(); + if(x>=0 && x<=the_area.trapcount) m_trapnum=x; + RefreshProj(); + UpdateData(UD_DISPLAY); +} + +void CAreaProj::OnKillfocusProjpicker() +{ + CString tmpstr; + int x; + + m_trappicker.GetWindowText(tmpstr); + x=strtonum(tmpstr)-1; + if(x>=0 && x<=the_area.trapcount) + { + m_trapnum=m_trappicker.SetCurSel(x); + } + RefreshProj(); + UpdateData(UD_DISPLAY); +} + +void CAreaProj::OnBrowse() +{ + if(m_trapnum<0) return; + pickerdlg.m_restype=REF_PRO; + RetrieveResref(pickerdlg.m_picked,the_area.trapheaders[m_trapnum].projectile); + if(pickerdlg.DoModal()==IDOK) + { + StoreResref(pickerdlg.m_picked,the_area.trapheaders[m_trapnum].projectile); + } + RefreshProj(); + UpdateData(UD_DISPLAY); +} + +BOOL CAreaProj::PreTranslateMessage(MSG* pMsg) +{ + m_tooltip.RelayEvent(pMsg); + return CPropertyPage::PreTranslateMessage(pMsg); +} + +///////////////////////////////////////////////////////////////////////////// // CAreaPropertySheet IMPLEMENT_DYNAMIC(CAreaPropertySheet, CPropertySheet) @@ -6909,6 +7084,7 @@ AddPage(&m_PageAnim); AddPage(&m_PageVariable); AddPage(&m_PageMap); + AddPage(&m_PageProj); } CAreaPropertySheet::~CAreaPropertySheet() @@ -6930,6 +7106,7 @@ m_PageVariable.RefreshVariable(); m_PageAnim.RefreshAnim(); m_PageMap.RefreshMap(); + m_PageProj.RefreshProj(); page=GetActivePage(); page->UpdateData(UD_DISPLAY); } Modified: chitem/trunk/AreaProperties.h =================================================================== --- chitem/trunk/AreaProperties.h 2009-04-25 17:02:49 UTC (rev 5886) +++ chitem/trunk/AreaProperties.h 2009-04-25 17:04:32 UTC (rev 5887) @@ -746,6 +746,9 @@ DECLARE_MESSAGE_MAP() }; +///////////////////////////////////////////////////////////////////////////// +// CAreaMap dialog + class CAreaMap : public CPropertyPage { DECLARE_DYNCREATE(CAreaMap) @@ -812,7 +815,57 @@ DECLARE_MESSAGE_MAP() }; + ///////////////////////////////////////////////////////////////////////////// +// CAreaProj dialog + +class CAreaProj : public CPropertyPage +{ + DECLARE_DYNCREATE(CAreaProj) +// Construction +public: + CAreaProj(); // standard constructor + ~CAreaProj(); + void RefreshProj(); + +// Dialog Data + //{{AFX_DATA(CAreaProj) + enum { IDD = IDD_AREAPROJ }; + CComboBox m_trappicker; + CListBox m_effect_control; + //}}AFX_DATA + + int m_trapnum; + int effectnum; + +// Overrides + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(CAreaProj) + public: + virtual BOOL PreTranslateMessage(MSG* pMsg); + protected: + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + //}}AFX_VIRTUAL + +// Implementation +protected: + CToolTipCtrl m_tooltip; + + afx_msg void DefaultKillfocus(); + // Generated message map functions + //{{AFX_MSG(CAreaProj) + virtual BOOL OnInitDialog(); + afx_msg void OnKillfocusProjpicker(); + afx_msg void OnSelchangeProjpicker(); + afx_msg void OnAdd(); + afx_msg void OnRemove(); + afx_msg void OnBrowse(); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() +}; + + +///////////////////////////////////////////////////////////////////////////// // CAreaPropertySheet class CAreaPropertySheet : public CPropertySheet @@ -836,6 +889,7 @@ CAreaVariable m_PageVariable; CAreaAnim m_PageAnim; CAreaMap m_PageMap; + CAreaProj m_PageProj; // Operations public: Modified: chitem/trunk/Structs.h =================================================================== --- chitem/trunk/Structs.h 2009-04-25 17:02:49 UTC (rev 5886) +++ chitem/trunk/Structs.h 2009-04-25 17:04:32 UTC (rev 5887) @@ -1561,7 +1561,8 @@ typedef struct { char projectile[8]; long offset; - long size; + short size; + short proj; long unknown10; short posx,posy; short unknown18; Modified: chitem/trunk/chitem.rc =================================================================== --- chitem/trunk/chitem.rc 2009-04-25 17:02:49 UTC (rev 5886) +++ chitem/trunk/chitem.rc 2009-04-25 17:04:32 UTC (rev 5887) @@ -1862,21 +1862,21 @@ LTEXT "XXXXXXXX.2DA in \n\\data\\xxxx.bif",IDC_TEXT,7,7,172,35 END -IDD_AREAGENERAL DIALOG DISCARDABLE 0, 0, 420, 199 +IDD_AREAGENERAL DIALOG DISCARDABLE 0, 0, 480, 198 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Sans Serif" BEGIN - EDITTEXT IDC_WED,7,18,40,14,ES_UPPERCASE | ES_AUTOHSCROLL - PUSHBUTTON "Browse",IDC_BROWSE,54,18,28,14 - PUSHBUTTON "Edit wed",IDC_EDIT,89,18,32,14 - PUSHBUTTON "Night wed",IDC_NIGHT,128,18,44,14,WS_DISABLED - COMBOBOX IDC_AREATYPE,176,18,102,173,CBS_DROPDOWN | + EDITTEXT IDC_WED,7,18,53,14,ES_UPPERCASE | ES_AUTOHSCROLL + PUSHBUTTON "Browse",IDC_BROWSE,66,18,28,14 + PUSHBUTTON "Edit wed",IDC_EDIT,101,18,32,14 + PUSHBUTTON "Night wed",IDC_NIGHT,162,18,44,14,WS_DISABLED + COMBOBOX IDC_AREATYPE,213,18,118,173,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_LASTSAVED,287,18,40,14,ES_AUTOHSCROLL - EDITTEXT IDC_SCRIPT,335,18,40,14,ES_UPPERCASE | ES_AUTOHSCROLL - PUSHBUTTON "Browse",IDC_BROWSE2,383,18,28,14 - EDITTEXT IDC_UNKNOWN90,373,50,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_LASTSAVED,336,18,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_SCRIPT,384,18,40,14,ES_UPPERCASE | ES_AUTOHSCROLL + PUSHBUTTON "Browse",IDC_BROWSE2,432,18,28,14 + EDITTEXT IDC_UNKNOWN90,421,50,40,14,ES_AUTOHSCROLL EDITTEXT IDC_NORTHRES,11,57,40,14,ES_UPPERCASE | ES_AUTOHSCROLL EDITTEXT IDC_NORTHFLAG,62,57,29,14,ES_AUTOHSCROLL EDITTEXT IDC_WESTRES,11,87,40,14,ES_UPPERCASE | ES_AUTOHSCROLL @@ -1885,81 +1885,81 @@ EDITTEXT IDC_SOUTHFLAG,62,117,29,14,ES_AUTOHSCROLL EDITTEXT IDC_EASTRES,11,147,40,14,ES_UPPERCASE | ES_AUTOHSCROLL EDITTEXT IDC_EASTFLAG,62,147,29,14,ES_AUTOHSCROLL - EDITTEXT IDC_RAIN,116,54,40,14,ES_AUTOHSCROLL - EDITTEXT IDC_SNOW,116,84,40,14,ES_AUTOHSCROLL - EDITTEXT IDC_FOG,116,114,40,14,ES_AUTOHSCROLL - EDITTEXT IDC_LIGHTNING,116,144,40,14,ES_AUTOHSCROLL - EDITTEXT IDC_UNKNOWN52,116,174,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_RAIN,150,54,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_SNOW,150,84,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_FOG,150,114,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_LIGHTNING,150,144,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_UNKNOWN52,150,174,40,14,ES_AUTOHSCROLL CONTROL "Outdoors",IDC_OUTDOOR,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,185,47,45,10 + WS_TABSTOP,222,47,45,10 CONTROL "Day and night",IDC_DAYNIGHT,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,185,61,60,10 + WS_TABSTOP,222,61,60,10 CONTROL "Weather",IDC_WEATHER,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,185,75,43,10 + WS_TABSTOP,222,75,43,10 CONTROL "City",IDC_CITY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 185,89,27,10 + 222,89,27,10 CONTROL "Forest",IDC_FOREST,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,185,103,35,10 + WS_TABSTOP,222,103,35,10 CONTROL "Dungeon",IDC_DUNGEON,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,185,117,45,10 + WS_TABSTOP,222,117,45,10 CONTROL "Extended night",IDC_EXTENDEDNIGHT,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,185,131,63,10 + BS_AUTOCHECKBOX | WS_TABSTOP,222,131,63,10 CONTROL "Can rest indoor",IDC_CANREST,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,185,145,63,10 - EDITTEXT IDC_UNKFLAG,179,174,26,14,ES_AUTOHSCROLL + WS_TABSTOP,222,145,63,10 + EDITTEXT IDC_UNKFLAG,216,174,26,14,ES_AUTOHSCROLL CONTROL "Has songs",IDC_SONG,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,279,80,49,10 - PUSHBUTTON "Edit Songs",IDC_SONGS,353,80,60,14 + WS_TABSTOP,334,40,49,10 + PUSHBUTTON "Edit Songs",IDC_SONGS,413,80,60,14 CONTROL "Resting interrupts",IDC_REST,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,279,103,71,10 - PUSHBUTTON "Edit Interrupts",IDC_INT,353,103,60,14 - PUSHBUTTON "Remove explored",IDC_DELEXP,353,126,60,14 - PUSHBUTTON "Edit unknowns",IDC_UNKNOWN,353,149,60,14 + WS_TABSTOP,334,58,70,10 + PUSHBUTTON "Edit Interrupts",IDC_INT,413,103,60,14 + PUSHBUTTON "Remove explored",IDC_DELEXP,413,126,60,14 + PUSHBUTTON "Edit unknowns",IDC_UNKNOWN,413,149,60,14 CONTROL "V1.0",IDC_V10,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE, - 304,164,31,10 + 359,164,31,10 CONTROL "V9.1",IDC_V91,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE, - 304,176,31,10 - PUSHBUTTON "View map",IDC_VIEW,353,172,60,14 - GROUPBOX "Area type",IDC_STATIC,175,33,101,159,BS_FLAT + 359,176,31,10 + PUSHBUTTON "View map",IDC_VIEW,413,172,60,14 + GROUPBOX "Area type",IDC_STATIC,212,32,120,159,BS_FLAT LTEXT "Wedfile",IDC_STATIC,7,7,25,8 - GROUPBOX "BG1 Area fields",IDC_STATIC,7,33,101,159,BS_FLAT + GROUPBOX "BG1 Area fields",IDC_STATIC,8,32,136,159,BS_FLAT LTEXT "North",IDC_STATIC,11,45,18,8 LTEXT "West",IDC_STATIC,11,135,18,8 LTEXT "East",IDC_STATIC,11,75,15,8 LTEXT "South",IDC_STATIC,11,105,20,8 - GROUPBOX "Weather",IDC_STATIC,107,33,69,159,BS_FLAT - LTEXT "Rain",IDC_STATIC,116,42,16,8 - LTEXT "Fog",IDC_STATIC,116,102,13,8 - LTEXT "Lightning",IDC_STATIC,116,132,30,8 - LTEXT "Snow",IDC_STATIC,116,72,19,8 - LTEXT "Area flag",IDC_STATIC,192,7,29,8 - LTEXT "0x52",IDC_STATIC,116,162,16,8 - LTEXT "0x90",IDC_STATIC,373,39,16,8 - LTEXT "Lastsaved",IDC_STATIC,287,7,34,8 - LTEXT "Scriptname",IDC_STATIC,335,7,36,8 - LTEXT "Extra area type bits",IDC_STATIC,179,162,61,8 - GROUPBOX "Area version",IDC_STATIC,276,152,70,40,BS_FLAT - LTEXT "IWD2",IDC_STATIC,281,176,20,8 - LTEXT "Other",IDC_STATIC,283,164,18,8 - PUSHBUTTON "Edit explored",IDC_EXPLORED,281,126,60,14 + GROUPBOX "Weather",IDC_STATIC,143,32,69,159,BS_FLAT + LTEXT "Rain",IDC_STATIC,150,42,16,8 + LTEXT "Fog",IDC_STATIC,150,102,13,8 + LTEXT "Lightning",IDC_STATIC,150,132,30,8 + LTEXT "Snow",IDC_STATIC,150,72,19,8 + LTEXT "Area flag",IDC_STATIC,229,7,29,8 + LTEXT "0x52",IDC_STATIC,150,162,16,8 + LTEXT "0x90",IDC_STATIC,421,39,16,8 + LTEXT "Lastsaved",IDC_STATIC,336,7,34,8 + LTEXT "Scriptname",IDC_STATIC,384,7,36,8 + LTEXT "Extra area type bits",IDC_STATIC,216,162,61,8 + GROUPBOX "Area version",IDC_STATIC,331,151,70,40,BS_FLAT + LTEXT "IWD2",IDC_STATIC,336,176,20,8 + LTEXT "Other",IDC_STATIC,338,164,18,8 + PUSHBUTTON "Edit explored",IDC_EXPLORED,336,80,60,14 END -IDD_AREAEDIT DIALOGEX 0, 0, 445, 250 +IDD_AREAEDIT DIALOGEX 0, 0, 500, 250 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTROLPARENT CAPTION "Edit Area:" MENU IDR_AREA -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "Load Area",IDC_LOAD,7,229,50,14 - PUSHBUTTON "Load external area",IDC_LOADEX,79,229,64,14 - PUSHBUTTON "Save Area As...",IDC_SAVEAS,165,229,54,14 - PUSHBUTTON "New Area",IDC_NEW,241,229,50,14 - PUSHBUTTON "Check Area",IDC_CHECK,313,229,50,14 - PUSHBUTTON "E&xit",IDCANCEL,385,229,50,14 + PUSHBUTTON "Load external area",IDC_LOADEX,90,229,64,14 + PUSHBUTTON "Save Area As...",IDC_SAVEAS,187,229,54,14 + PUSHBUTTON "New Area",IDC_NEW,274,229,50,14 + PUSHBUTTON "Check Area",IDC_CHECK,357,229,50,14 + PUSHBUTTON "E&xit",IDCANCEL,440,229,50,14 END -IDD_AREAACTOR DIALOG DISCARDABLE 0, 0, 420, 199 +IDD_AREAACTOR DIALOG DISCARDABLE 0, 0, 480, 198 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Actors" FONT 8, "MS Sans Serif" @@ -2006,13 +2006,13 @@ PUSHBUTTON "Browse",IDC_BROWSE5,237,170,28,14 EDITTEXT IDC_AREA,272,170,48,14,ES_UPPERCASE | ES_AUTOHSCROLL PUSHBUTTON "Browse",IDC_BROWSE9,324,170,28,14 - PUSHBUTTON "Add actor",IDC_ADD,363,14,50,14 - PUSHBUTTON "Remove actor",IDC_REMOVE,363,41,50,14 - PUSHBUTTON "Remove all",IDC_BUTTON1,363,68,50,14 - PUSHBUTTON "Copy actor",IDC_COPY,363,95,50,14 - PUSHBUTTON "Paste actor",IDC_PASTE,363,122,50,14 - PUSHBUTTON "Set position",IDC_SETPOS,363,149,50,14 - PUSHBUTTON "Set destination",IDC_SETDEST,363,176,50,14 + PUSHBUTTON "Add actor",IDC_ADD,423,14,50,14 + PUSHBUTTON "Remove actor",IDC_REMOVE,423,41,50,14 + PUSHBUTTON "Remove all",IDC_BUTTON1,423,68,50,14 + PUSHBUTTON "Copy actor",IDC_COPY,423,95,50,14 + PUSHBUTTON "Paste actor",IDC_PASTE,423,122,50,14 + PUSHBUTTON "Set position",IDC_SETPOS,423,149,50,14 + PUSHBUTTON "Set destination",IDC_SETDEST,423,176,50,14 LTEXT "Actor",IDC_STATIC,7,2,18,8 LTEXT "Position",IDC_STATIC,7,34,26,8 LTEXT "Destination",IDC_STATIC,65,34,36,8 @@ -2026,7 +2026,7 @@ LTEXT "Schedule",IDC_STATIC,7,152,31,8 LTEXT "Dialog",IDC_STATIC,183,54,21,8 LTEXT "General",IDC_STATIC,272,54,26,8 - GROUPBOX "Override scripts && dialog",IDC_STATIC,175,34,183,158, + GROUPBOX "Override scripts && dialog",IDC_STATIC,175,33,183,158, BS_FLAT LTEXT "Override",IDC_STATIC,183,88,28,8 LTEXT "Class",IDC_STATIC,183,122,18,8 @@ -2251,7 +2251,7 @@ PUSHBUTTON "Browse",IDC_BROWSE13,335,176,28,14 END -IDD_AREAENTRANCE DIALOG DISCARDABLE 0, 0, 420, 199 +IDD_AREAENTRANCE DIALOG DISCARDABLE 0, 0, 480, 198 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Entrances" FONT 8, "MS Sans Serif" @@ -2265,12 +2265,12 @@ EDITTEXT IDC_UNKNOWN26,131,50,24,14,ES_AUTOHSCROLL EDITTEXT IDC_UNKNOWN28,160,50,24,14,ES_AUTOHSCROLL EDITTEXT IDC_UNKNOWN2A,189,50,24,14,ES_AUTOHSCROLL - PUSHBUTTON "Add entrance",IDC_ADD,351,20,62,14 - PUSHBUTTON "Remove entrance",IDC_REMOVE,351,50,62,14 - PUSHBUTTON "Copy entrance",IDC_COPY,351,80,62,14 - PUSHBUTTON "Paste entrance",IDC_PASTE,351,110,62,14 - PUSHBUTTON "Set entrance",IDC_SET,351,140,62,14 - PUSHBUTTON "Edit unknowns",IDC_UNKNOWN,351,170,62,14 + PUSHBUTTON "Add entrance",IDC_ADD,411,20,62,14 + PUSHBUTTON "Remove entrance",IDC_REMOVE,411,50,62,14 + PUSHBUTTON "Copy entrance",IDC_COPY,411,80,62,14 + PUSHBUTTON "Paste entrance",IDC_PASTE,411,110,62,14 + PUSHBUTTON "Set entrance",IDC_SET,411,140,62,14 + PUSHBUTTON "Edit unknowns",IDC_UNKNOWN,411,170,62,14 LTEXT "Entrance",IDC_STATIC,7,6,30,8 LTEXT "Position",IDC_STATIC,7,40,26,8 LTEXT "Face",IDC_STATIC,65,40,17,8 @@ -2280,7 +2280,7 @@ LTEXT "0x2a",IDC_STATIC,189,40,16,8 END -IDD_AREATRIGGER DIALOG DISCARDABLE 0, 0, 420, 199 +IDD_AREATRIGGER DIALOG DISCARDABLE 0, 0, 480, 198 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Regions" FONT 8, "MS Sans Serif" @@ -2350,13 +2350,13 @@ 159,24,10 CONTROL "16",IDC_TUNK7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,317, 172,24,10 - PUSHBUTTON "Add region",IDC_ADD,350,9,62,14 - PUSHBUTTON "Remove region",IDC_REMOVE,350,33,62,14 - PUSHBUTTON "Copy region",IDC_COPY,350,57,62,14 - PUSHBUTTON "Paste region",IDC_PASTE,350,81,62,14 - PUSHBUTTON "Set launch point",IDC_SET,350,105,62,14 - PUSHBUTTON "Select region",IDC_SELECTION,350,153,62,14 - PUSHBUTTON "Edit unknowns",IDC_UNKNOWN,350,177,62,14 + PUSHBUTTON "Add region",IDC_ADD,411,9,62,14 + PUSHBUTTON "Remove region",IDC_REMOVE,411,33,62,14 + PUSHBUTTON "Copy region",IDC_COPY,411,57,62,14 + PUSHBUTTON "Paste region",IDC_PASTE,411,81,62,14 + PUSHBUTTON "Set launch point",IDC_SET,411,105,62,14 + PUSHBUTTON "Select region",IDC_SELECTION,411,153,62,14 + PUSHBUTTON "Edit unknowns",IDC_UNKNOWN,411,177,62,14 LTEXT "Region name",IDC_STATIC,7,6,43,8 LTEXT "Bounding box",IDC_STATIC,7,33,44,8 LTEXT "Region type",IDC_STATIC,159,6,39,8 @@ -2364,7 +2364,7 @@ LTEXT "Cursor index",IDC_STATIC,14,149,40,8 GROUPBOX "Travel trigger",IDC_STATIC,7,80,129,66,BS_FLAT LTEXT "Destination",IDC_STATIC,10,90,36,8 - GROUPBOX "Trap",IDC_STATIC,135,34,212,158,BS_FLAT + GROUPBOX "Trap",IDC_STATIC,135,33,212,158,BS_FLAT LTEXT "Detection",IDC_STATIC,139,77,32,8 LTEXT "Removal",IDC_STATIC,176,77,29,8 LTEXT "Entrance",IDC_STATIC,10,103,30,8 @@ -2383,10 +2383,10 @@ PUSHBUTTON "Browse",IDC_BROWSE3,256,119,28,14 LTEXT "Operating point",IDC_STATIC,139,157,49,8 PUSHBUTTON "Edit strings",IDC_STRING,213,166,50,14 - PUSHBUTTON "Set walk point",IDC_SET2,350,129,62,14 + PUSHBUTTON "Set walk point",IDC_SET2,411,129,62,14 END -IDD_AREASPAWN DIALOG DISCARDABLE 0, 0, 420, 199 +IDD_AREASPAWN DIALOG DISCARDABLE 0, 0, 480, 198 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Spawns" FONT 8, "MS Sans Serif" @@ -2414,12 +2414,12 @@ EDITTEXT IDC_HIGH,150,122,33,14,ES_AUTOHSCROLL PUSHBUTTON "xxxxxxxxxxxxxxxxxxxxxxxx",IDC_SCHEDULE,7,170,83,14, BS_FLAT - PUSHBUTTON "Add spawnpoint",IDC_ADD,343,20,70,14 - PUSHBUTTON "Remove spawnpoint",IDC_REMOVE,343,50,70,14 - PUSHBUTTON "Copy spawnpoint",IDC_COPY,343,80,70,14 - PUSHBUTTON "Paste spawnpoint",IDC_PASTE,343,110,70,14 - PUSHBUTTON "Set spawnpoint",IDC_SET,343,140,70,14 - PUSHBUTTON "Edit unknowns",IDC_UNKNOWN,343,170,70,14 + PUSHBUTTON "Add spawnpoint",IDC_ADD,403,20,70,14 + PUSHBUTTON "Remove spawnpoint",IDC_REMOVE,403,50,70,14 + PUSHBUTTON "Copy spawnpoint",IDC_COPY,403,80,70,14 + PUSHBUTTON "Paste spawnpoint",IDC_PASTE,403,110,70,14 + PUSHBUTTON "Set spawnpoint",IDC_SET,403,140,70,14 + PUSHBUTTON "Edit unknowns",IDC_UNKNOWN,403,170,70,14 LTEXT "Spawn point",IDC_STATIC,7,6,40,8 LTEXT "Position",IDC_STATIC,7,33,26,8 LTEXT "/ 0",IDC_MAXSPAWN,128,20,16,8 @@ -2865,12 +2865,12 @@ PUSHBUTTON "Browse",IDC_BROWSE2,193,146,26,14 END -IDD_AREAAMBIENT DIALOG DISCARDABLE 0, 0, 420, 199 +IDD_AREAAMBIENT DIALOG DISCARDABLE 0, 0, 480, 198 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ambients" FONT 8, "MS Sans Serif" BEGIN - COMBOBOX IDC_AMBIENTPICKER,7,20,116,167,CBS_DROPDOWN | WS_VSCROLL | + COMBOBOX IDC_AMBIENTPICKER,7,20,130,167,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_POSX,7,50,24,14,ES_AUTOHSCROLL EDITTEXT IDC_POSY,42,50,24,14,ES_AUTOHSCROLL @@ -2887,43 +2887,43 @@ PUSHBUTTON "xxxxxxxxxxxxxxxxxxxxxxxx",IDC_SCHEDULE,7,170,83,14, BS_FLAT CONTROL "Enabled",IDC_FLAG1,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,207,74,42,10 + WS_TABSTOP,239,74,42,10 CONTROL "Point (volume decreases)",IDC_FLAG2,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,207,87,95,10 + BS_AUTOCHECKBOX | WS_TABSTOP,239,87,95,10 CONTROL "Main",IDC_FLAG3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 207,102,31,10 + 239,102,31,10 CONTROL "Area",IDC_FLAG4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 207,116,31,10 - COMBOBOX IDC_AMBINUMPICKER,153,18,85,104,CBS_DROPDOWN | + 239,116,31,10 + COMBOBOX IDC_AMBINUMPICKER,185,18,85,104,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Add",IDC_ADDWAV,271,15,31,14 - PUSHBUTTON "Remove",IDC_DELWAV,271,32,31,14 - EDITTEXT IDC_WAVRES,153,49,72,14,ES_UPPERCASE | ES_AUTOHSCROLL - PUSHBUTTON "Play",IDC_PLAY,233,49,31,14 - PUSHBUTTON "Browse",IDC_BROWSE,271,49,31,14 - PUSHBUTTON "Add ambient",IDC_ADD,351,20,62,14 - PUSHBUTTON "Remove ambient",IDC_REMOVE,351,50,62,14 - PUSHBUTTON "Copy ambient",IDC_COPY,351,80,62,14 - PUSHBUTTON "Paste ambient",IDC_PASTE,351,110,62,14 - PUSHBUTTON "Set center",IDC_SET,351,140,62,14 - PUSHBUTTON "Edit unknowns",IDC_UNKNOWN,351,170,62,14 - LTEXT "/ 0",IDC_MAXWAV,247,20,16,8 + PUSHBUTTON "Add",IDC_ADDWAV,303,15,31,14 + PUSHBUTTON "Remove",IDC_DELWAV,303,32,31,14 + EDITTEXT IDC_WAVRES,185,49,72,14,ES_UPPERCASE | ES_AUTOHSCROLL + PUSHBUTTON "Play",IDC_PLAY,265,49,31,14 + PUSHBUTTON "Browse",IDC_BROWSE,303,49,31,14 + PUSHBUTTON "Add ambient",IDC_ADD,411,20,62,14 + PUSHBUTTON "Remove ambient",IDC_REMOVE,411,50,62,14 + PUSHBUTTON "Copy ambient",IDC_COPY,411,80,62,14 + PUSHBUTTON "Paste ambient",IDC_PASTE,411,110,62,14 + PUSHBUTTON "Set center",IDC_SET,411,140,62,14 + PUSHBUTTON "Edit unknowns",IDC_UNKNOWN,411,170,62,14 + LTEXT "/ 0",IDC_MAXWAV,279,20,16,8 LTEXT "Ambient",IDC_STATIC,7,6,26,8 LTEXT "Position",IDC_STATIC,7,40,26,8 - LTEXT "/ 0",IDC_MAXAMBIENT,128,23,17,8 + LTEXT "/ 0",IDC_MAXAMBIENT,141,23,17,8 LTEXT "Radius",IDC_STATIC,77,40,23,8 LTEXT "Height",IDC_STATIC,112,40,22,8 LTEXT "Volume",IDC_STATIC,7,99,24,8 LTEXT "Schedule",IDC_STATIC,7,159,31,8 LTEXT "Static",IDC_TIMEOFDAY,94,173,38,8 - GROUPBOX "Sound resources",IDC_STATIC,148,7,167,60,BS_FLAT + GROUPBOX "Sound resources",IDC_STATIC,180,7,167,60,BS_FLAT LTEXT "0x80",IDC_STATIC,42,99,16,8 LTEXT "Interval",IDC_STATIC,77,98,24,8 LTEXT "Sounds to use",IDC_STATIC,109,98,46,8 LTEXT "0x2c",IDC_STATIC,45,71,16,8 LTEXT "0x28",IDC_STATIC,7,71,16,8 LTEXT "0x90",IDC_STATIC,42,128,16,8 - LTEXT "Ambient",IDC_STATIC,153,38,26,8 + LTEXT "Ambient",IDC_STATIC,185,38,26,8 LTEXT "Flags",IDC_STATIC,7,128,18,8 END @@ -2970,7 +2970,7 @@ GROUPBOX "Global data",IDC_STATIC,5,97,232,103,BS_FLAT END -IDD_AREACONTAINER DIALOG DISCARDABLE 0, 0, 420, 199 +IDD_AREACONTAINER DIALOG DISCARDABLE 0, 0, 480, 198 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Containers" FONT 8, "MS Sans Serif" @@ -3003,51 +3003,51 @@ EDITTEXT IDC_KEY,103,144,48,14,ES_UPPERCASE | ES_AUTOHSCROLL PUSHBUTTON "Browse",IDC_BROWSE2,158,144,28,14 EDITTEXT IDC_STRREF,7,175,40,14,ES_AUTOHSCROLL - EDITTEXT IDC_TEXT,54,175,286,14,ES_AUTOHSCROLL - COMBOBOX IDC_ITEMNUMPICKER,193,17,68,167,CBS_DROPDOWN | + EDITTEXT IDC_TEXT,54,175,320,14,ES_AUTOHSCROLL + COMBOBOX IDC_ITEMNUMPICKER,221,17,68,167,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Add item",IDC_ADDITEM,287,17,50,14 - EDITTEXT IDC_ITEMRES,193,41,55,14,ES_UPPERCASE | ES_AUTOHSCROLL - PUSHBUTTON "Browse",IDC_BROWSE,253,41,28,14 - PUSHBUTTON "Remove item",IDC_DELITEM,287,41,50,14 - EDITTEXT IDC_FLAGS,193,68,24,14,ES_AUTOHSCROLL - EDITTEXT IDC_USE1,222,68,24,14,ES_AUTOHSCROLL - EDITTEXT IDC_USE2,251,68,24,14,ES_AUTOHSCROLL - EDITTEXT IDC_USE3,280,68,24,14,ES_AUTOHSCROLL - EDITTEXT IDC_UNKNOWN8,309,68,24,14,ES_AUTOHSCROLL + PUSHBUTTON "Add item",IDC_ADDITEM,315,17,50,14 + EDITTEXT IDC_ITEMRES,221,41,55,14,ES_UPPERCASE | ES_AUTOHSCROLL + PUSHBUTTON "Browse",IDC_BROWSE,281,41,28,14 + PUSHBUTTON "Remove item",IDC_DELITEM,315,41,50,14 + EDITTEXT IDC_FLAGS,221,68,24,14,ES_AUTOHSCROLL + EDITTEXT IDC_USE1,250,68,24,14,ES_AUTOHSCROLL + EDITTEXT IDC_USE2,279,68,24,14,ES_AUTOHSCROLL + EDITTEXT IDC_USE3,308,68,24,14,ES_AUTOHSCROLL + EDITTEXT IDC_UNKNOWN8,337,68,24,14,ES_AUTOHSCROLL CONTROL "Identified",IDC_IDENTIFIED,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,193,85,45,10 + WS_TABSTOP,221,85,45,10 CONTROL "Unstealable",IDC_NOSTEAL,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,193,98,53,10 + WS_TABSTOP,221,98,53,10 CONTROL "Stolen",IDC_STOLEN,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,269,85,36,10 + WS_TABSTOP,297,85,36,10 CONTROL "No drop",IDC_NODROP,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,269,98,41,10 - EDITTEXT IDC_POS1X,197,133,24,14,ES_AUTOHSCROLL - EDITTEXT IDC_POS1Y,228,133,24,14,ES_AUTOHSCROLL - EDITTEXT IDC_POS2X,197,149,24,14,ES_AUTOHSCROLL - EDITTEXT IDC_POS2Y,228,149,24,14,ES_AUTOHSCROLL - PUSHBUTTON "Edit polygon",IDC_EDITPOLYGON,259,123,60,14 - PUSHBUTTON "Recalculate Box",IDC_RECALCBOX,259,149,60,14 - PUSHBUTTON "Add container",IDC_ADD,351,6,62,14 - PUSHBUTTON "Remove container",IDC_REMOVE,351,30,62,14 - PUSHBUTTON "Copy container",IDC_COPY,351,54,62,14 - PUSHBUTTON "Paste container",IDC_PASTE,351,78,62,14 - PUSHBUTTON "Set position",IDC_SET,351,102,62,14 - PUSHBUTTON "Select container",IDC_SELECTION,351,126,62,14 - PUSHBUTTON "Fix items",IDC_FIT,351,150,62,14 - PUSHBUTTON "Edit unknowns",IDC_UNKNOWN,351,174,62,14 + WS_TABSTOP,297,98,41,10 + EDITTEXT IDC_POS1X,225,133,24,14,ES_AUTOHSCROLL + EDITTEXT IDC_POS1Y,256,133,24,14,ES_AUTOHSCROLL + EDITTEXT IDC_POS2X,225,149,24,14,ES_AUTOHSCROLL + EDITTEXT IDC_POS2Y,256,149,24,14,ES_AUTOHSCROLL + PUSHBUTTON "Edit polygon",IDC_EDITPOLYGON,287,123,60,14 + PUSHBUTTON "Recalculate Box",IDC_RECALCBOX,287,149,60,14 + PUSHBUTTON "Add container",IDC_ADD,411,6,62,14 + PUSHBUTTON "Remove container",IDC_REMOVE,411,30,62,14 + PUSHBUTTON "Copy container",IDC_COPY,411,54,62,14 + PUSHBUTTON "Paste container",IDC_PASTE,411,78,62,14 + PUSHBUTTON "Set position",IDC_SET,411,102,62,14 + PUSHBUTTON "Select container",IDC_SELECTION,411,126,62,14 + PUSHBUTTON "Fix items",IDC_FIT,411,150,62,14 + PUSHBUTTON "Edit unknowns",IDC_UNKNOWN,411,174,62,14 LTEXT "/ 0",IDC_MAXCONTAINER,128,18,17,8 LTEXT "Position",IDC_STATIC,7,30,26,8 LTEXT "Type",IDC_STATIC,61,30,17,8 - GROUPBOX "Items",IDC_STATIC,190,7,155,109,BS_FLAT + GROUPBOX "Items",IDC_STATIC,218,7,155,109,BS_FLAT LTEXT "Container name",IDC_STATIC,7,6,50,8 LTEXT "Lock strength",IDC_STATIC,137,56,44,8 - LTEXT "Itemname",IDC_STATIC,193,31,32,8 - LTEXT "Amount/charges",IDC_STATIC,222,58,54,8 - LTEXT "Flags",IDC_STATIC,193,58,18,8 - LTEXT "Unknown",IDC_STATIC,309,58,32,8 - LTEXT "/ 0",IDC_MAXITEM,262,19,23,8 + LTEXT "Itemname",IDC_STATIC,221,31,32,8 + LTEXT "Amount/charges",IDC_STATIC,250,58,54,8 + LTEXT "Flags",IDC_STATIC,221,58,18,8 + LTEXT "Unknown",IDC_STATIC,337,58,32,8 + LTEXT "/ 0",IDC_MAXITEM,290,19,23,8 LTEXT "Trapped",IDC_STATIC,7,82,28,8 LTEXT "Removal",IDC_STATIC,115,82,29,8 LTEXT "Detection",IDC_STATIC,74,82,32,8 @@ -3057,17 +3057,17 @@ LTEXT "Detected",IDC_STATIC,39,82,30,8 LTEXT "Trap launch point",IDC_STATIC,7,108,56,8 LTEXT "Key",IDC_STATIC,103,134,13,8 - LTEXT "Bounding box",IDC_STATIC,197,123,44,8 + LTEXT "Bounding box",IDC_STATIC,225,123,44,8 LTEXT "Script",IDC_STATIC,65,108,19,8 LTEXT "Open fail text (reference && text)",IDC_STATIC,7,165,98, 8 LTEXT "0x80",IDC_STATIC,157,108,16,8 LTEXT "0x56",IDC_STATIC,157,82,16,8 LTEXT "Scripting name ?",IDC_STATIC,7,134,54,8 - GROUPBOX "Vertices",IDC_STATIC,190,111,155,57,BS_FLAT + GROUPBOX "Vertices",IDC_STATIC,218,111,155,57,BS_FLAT END -IDD_AREADOOR DIALOG DISCARDABLE 0, 0, 420, 199 +IDD_AREADOOR DIALOG DISCARDABLE 0, 0, 480, 198 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Doors" FONT 8, "MS Sans Serif" @@ -3105,19 +3105,19 @@ CONTROL "Slide",IDC_FLAG12,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 148,117,31,10 EDITTEXT IDC_INFOSTR,52,151,174,14,ES_AUTOHSCROLL - EDITTEXT IDC_CURSORIDX,10,178,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_CURSORIDX,10,177,40,14,ES_AUTOHSCROLL CONTROL "Spin1",IDC_SPINCURSOR,"msctls_updown32",UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | - UDS_ARROWKEYS | UDS_NOTHOUSANDS,44,178,11,14 + UDS_ARROWKEYS | UDS_NOTHOUSANDS,44,177,11,14 CONTROL "",IDC_CURSOR,"Static",SS_BITMAP | SS_SUNKEN,56,169,16, 14 - EDITTEXT IDC_SOUND1,96,178,40,14,ES_UPPERCASE | ES_AUTOHSCROLL - PUSHBUTTON "Browse",IDC_BROWSE,138,178,28,14 - PUSHBUTTON "Play Sound",IDC_PLAY,167,178,41,14 - EDITTEXT IDC_SOUND2,210,178,40,14,ES_UPPERCASE | ES_AUTOHSCROLL - PUSHBUTTON "Browse",IDC_BROWSE2,255,178,28,14 - PUSHBUTTON "Play Sound",IDC_PLAYSOUND,283,178,41,14 - EDITTEXT IDC_U54,329,178,28,14,ES_AUTOHSCROLL + EDITTEXT IDC_SOUND1,96,177,40,14,ES_UPPERCASE | ES_AUTOHSCROLL + PUSHBUTTON "Browse",IDC_BROWSE,141,177,28,14 + PUSHBUTTON "Play Sound",IDC_PLAY,175,177,41,14 + EDITTEXT IDC_SOUND2,224,177,40,14,ES_UPPERCASE | ES_AUTOHSCROLL + PUSHBUTTON "Browse",IDC_BROWSE2,269,177,28,14 + PUSHBUTTON "Play Sound",IDC_PLAYSOUND,302,177,41,14 + EDITTEXT IDC_U54,348,177,28,14,ES_AUTOHSCROLL EDITTEXT IDC_LOCKED,193,16,28,14,ES_AUTOHSCROLL EDITTEXT IDC_DIFF,237,16,28,14,ES_AUTOHSCROLL EDITTEXT IDC_KEY,284,16,40,14,ES_UPPERCASE | ES_AUTOHSCROLL @@ -3130,10 +3130,10 @@ PUSHBUTTON "Browse",IDC_BROWSE3,329,16,28,14 PUSHBUTTON "Browse",IDC_BROWSE5,329,44,28,14 PUSHBUTTON "Browse",IDC_BROWSE4,329,70,28,14 - PUSHBUTTON "Add door",IDC_ADD,361,8,52,14 - PUSHBUTTON "Remove door",IDC_REMOVE,361,30,52,14 - PUSHBUTTON "Copy door",IDC_COPY,361,52,52,14 - PUSHBUTTON "Paste door",IDC_PASTE,361,74,52,14 + PUSHBUTTON "Add door",IDC_ADD,421,8,52,14 + PUSHBUTTON "Remove door",IDC_REMOVE,421,30,52,14 + PUSHBUTTON "Copy door",IDC_COPY,421,52,52,14 + PUSHBUTTON "Paste door",IDC_PASTE,421,74,52,14 CONTROL "Open",IDC_OPEN,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,307,104,33,10 EDITTEXT IDC_POS1X,295,128,24,14,ES_AUTOHSCROLL @@ -3143,7 +3143,7 @@ PUSHBUTTON "Edit blocks",IDC_EDITBLOCK,352,104,56,14 PUSHBUTTON "Edit polygon",IDC_EDITPOLYGON,352,125,56,14 PUSHBUTTON "Recalculate Box",IDC_RECALCBOX,352,146,56,14 - PUSHBUTTON "Edit unknowns",IDC_UNKNOWN,361,176,52,14 + PUSHBUTTON "Edit unknowns",IDC_UNKNOWN,421,176,52,14 LTEXT "/ 0",IDC_MAXDOOR,159,19,26,8 LTEXT "Door name",IDC_STATIC,7,6,36,8 LTEXT "Identifier",IDC_STATIC,7,33,28,8 @@ -3152,7 +3152,7 @@ GROUPBOX "Vertices && impeded blocks",IDC_STATIC,291,92,122,70, BS_FLAT LTEXT "Opening sound",IDC_STATIC,96,166,49,8 - LTEXT "Closing sound",IDC_STATIC,210,166,45,8 + LTEXT "Closing sound",IDC_STATIC,224,166,45,8 LTEXT "Discovery",IDC_STATIC,193,6,32,8 LTEXT "Cursor index",IDC_STATIC,10,166,40,8 LTEXT "Trap detection && removal",IDC_STATIC,193,33,80,8 @@ -3164,7 +3164,7 @@ LTEXT "Script",IDC_STATIC,284,33,19,8 LTEXT "%",IDC_STATIC,226,46,8,8 LTEXT "%",IDC_STATIC,269,46,8,8 - LTEXT "0x54",IDC_STATIC,332,166,16,8 + LTEXT "0x54",IDC_STATIC,351,166,16,8 LTEXT "%",IDC_STATIC,269,19,8,8 LTEXT "Lock difficulty",IDC_STATIC,237,6,44,8 LTEXT "Open fail",IDC_STATIC,7,141,29,8 @@ -3183,51 +3183,51 @@ WS_VSCROLL | WS_TABSTOP END -IDD_AREAVARIABLE DIALOG DISCARDABLE 0, 0, 420, 199 +IDD_AREAVARIABLE DIALOG DISCARDABLE 0, 0, 480, 198 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Variables && notes" FONT 8, "MS Sans Serif" BEGIN - COMBOBOX IDC_VARIABLEPICKER,12,22,109,170,CBS_DROPDOWN | + COMBOBOX IDC_VARIABLEPICKER,12,22,144,170,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_VARIABLE,12,51,126,14,ES_AUTOHSCROLL + EDITTEXT IDC_VARIABLE,12,51,156,14,ES_AUTOHSCROLL EDITTEXT IDC_UNKNOWN20,12,81,36,14,ES_AUTOHSCROLL EDITTEXT IDC_UNKNOWN24,57,81,36,14,ES_AUTOHSCROLL EDITTEXT IDC_VALUE,102,81,36,14,ES_AUTOHSCROLL - PUSHBUTTON "Add variable",IDC_ADD,144,22,60,14 - PUSHBUTTON "Remove variable",IDC_REMOVE,144,51,60,14 - PUSHBUTTON "Copy variable",IDC_COPY,144,81,60,14 - PUSHBUTTON "Paste variable",IDC_PASTE,144,111,60,14 - PUSHBUTTON "Edit unknowns",IDC_UNKNOWN,144,142,60,14 - COMBOBOX IDC_NOTEPICKER,214,22,101,171,CBS_DROPDOWN | WS_VSCROLL | + PUSHBUTTON "Add variable",IDC_ADD,175,22,60,14 + PUSHBUTTON "Remove variable",IDC_REMOVE,175,51,60,14 + PUSHBUTTON "Copy variable",IDC_COPY,175,81,60,14 + PUSHBUTTON "Paste variable",IDC_PASTE,175,111,60,14 + PUSHBUTTON "Edit unknowns",IDC_UNKNOWN,175,142,60,14 + COMBOBOX IDC_NOTEPICKER,252,22,144,171,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_POS1X,214,51,40,14,ES_AUTOHSCROLL - EDITTEXT IDC_POS1Y,262,51,40,14,ES_AUTOHSCROLL - EDITTEXT IDC_STRREF,243,78,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_POS1X,252,51,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_POS1Y,300,51,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_STRREF,281,78,40,14,ES_AUTOHSCROLL CONTROL "Tagged",IDC_TAGGED,"Button",BS_AUTOCHECKBOX | - BS_LEFTTEXT | WS_TABSTOP,298,81,41,10 - EDITTEXT IDC_NOTE,214,99,125,14,ES_AUTOHSCROLL - EDITTEXT IDC_UNKNOWNC,214,130,40,14,ES_AUTOHSCROLL - COMBOBOX IDC_COLOR,262,130,78,111,CBS_DROPDOWNLIST | WS_VSCROLL | + BS_LEFTTEXT | WS_TABSTOP,336,81,41,10 + EDITTEXT IDC_NOTE,252,99,154,14,ES_AUTOHSCROLL + EDITTEXT IDC_UNKNOWNC,252,130,40,14,ES_AUTOHSCROLL + COMBOBOX IDC_COLOR,300,130,78,111,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Add note",IDC_ADD2,349,22,60,14 - PUSHBUTTON "Remove note",IDC_REMOVE2,349,51,60,14 - PUSHBUTTON "Copy note",IDC_COPY2,349,81,60,14 - PUSHBUTTON "Paste note",IDC_PASTE2,349,111,60,14 - PUSHBUTTON "Edit unknowns",IDC_UNKNOWN2,349,142,60,14 - PUSHBUTTON "Set position",IDC_SET,349,173,60,14 + PUSHBUTTON "Add note",IDC_ADD2,411,22,60,14 + PUSHBUTTON "Remove note",IDC_REMOVE2,411,51,60,14 + PUSHBUTTON "Copy note",IDC_COPY2,411,81,60,14 + PUSHBUTTON "Paste note",IDC_PASTE2,411,111,60,14 + PUSHBUTTON "Edit unknowns",IDC_UNKNOWN2,411,142,60,14 + PUSHBUTTON "Set position",IDC_SET,411,173,60,14 LTEXT "Variable",IDC_STATIC,12,41,26,8 LTEXT "Value",IDC_STATIC,102,71,19,8 LTEXT "0x20",IDC_STATIC,12,71,16,8 - LTEXT "Position",IDC_STATIC,214,41,26,8 - LTEXT "Note",IDC_STATIC,215,81,16,8 - LTEXT "Colour",IDC_STATIC,262,120,21,8 - LTEXT "0x0c",IDC_STATIC,214,120,16,8 - LTEXT "/ 0",IDC_MAXVARIABLE,122,24,20,8 - LTEXT "/ 0",IDC_MAXNOTE,317,24,20,8 + LTEXT "Position",IDC_STATIC,252,41,26,8 + LTEXT "Note",IDC_STATIC,253,81,16,8 + LTEXT "Colour",IDC_STATIC,300,120,21,8 + LTEXT "0x0c",IDC_STATIC,252,120,16,8 + LTEXT "/ 0",IDC_MAXVARIABLE,158,24,20,8 + LTEXT "/ 0",IDC_MAXNOTE,397,24,20,8 LTEXT "0x24",IDC_STATIC,57,71,16,8 - GROUPBOX "Choose variable",IDC_STATIC,7,6,201,185,BS_FLAT - GROUPBOX "Choose mapnote",IDC_STATIC,207,6,206,185,BS_FLAT + GROUPBOX "Choose variable",IDC_STATIC,7,6,237,185,BS_FLAT + GROUPBOX "Choose mapnote",IDC_STATIC,244,6,229,185,BS_FLAT END IDD_DIALOGEDIT DIALOGEX 0, 0, 464, 286 @@ -4016,7 +4016,7 @@ PUSHBUTTON "&Cancel",IDCANCEL,97,178,50,14 END -IDD_AREAANIM DIALOG DISCARDABLE 0, 0, 420, 199 +IDD_AREAANIM DIALOG DISCARDABLE 0, 0, 480, 198 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Animations" FONT 8, "MS Sans Serif" @@ -4070,14 +4070,14 @@ EDITTEXT IDC_U3C,260,43,40,14,ES_AUTOHSCROLL EDITTEXT IDC_BMP,171,43,48,14,ES_UPPERCASE | ES_AUTOHSCROLL PUSHBUTTON "Browse",IDC_BROWSE2,226,43,30,14 - EDITTEXT IDC_SKIPEXT,373,43,20,14,ES_AUTOHSCROLL + EDITTEXT IDC_SKIPEXT,371,43,20,14,ES_AUTOHSCROLL CONTROL "",IDC_BAMFRAME,"Static",SS_BITMAP | SS_SUNKEN,187,62,16, 14 - PUSHBUTTON "Add animation",IDC_ADD,351,68,62,14 - PUSHBUTTON "Remove animation",IDC_REMOVE,351,95,62,14 - PUSHBUTTON "Copy animation",IDC_COPY,351,122,62,14 - PUSHBUTTON "Paste animation",IDC_PASTE,351,149,62,14 - PUSHBUTTON "Find place",IDC_FIT,351,176,62,14 + PUSHBUTTON "Add animation",IDC_ADD,411,68,62,14 + PUSHBUTTON "Remove animation",IDC_REMOVE,411,95,62,14 + PUSHBUTTON "Copy animation",IDC_COPY,411,122,62,14 + PUSHBUTTON "Paste animation",IDC_PASTE,411,149,62,14 + PUSHBUTTON "Find place",IDC_FIT,411,176,62,14 LTEXT "Animation",IDC_STATIC,7,6,32,8 LTEXT "Position",IDC_STATIC,7,33,26,8 LTEXT "/ 0",IDC_MAXANIM,128,20,38,8 @@ -4090,10 +4090,10 @@ LTEXT "Flags",IDC_STATIC,239,6,18,8 LTEXT "Height",IDC_STATIC,307,7,22,8 LTEXT "Counter ?",IDC_STATIC,261,33,32,8 - LTEXT "Skip cycles",IDC_STATIC,373,33,37,8 + LTEXT "Skip cycles",IDC_STATIC,371,33,37,8 LTEXT "Palette BMP",IDC_STATIC,171,33,40,8 - LTEXT "Transparency",IDC_STATIC,373,7,44,8 - EDITTEXT IDC_TRANSPARENT,373,17,40,14,ES_AUTOHSCROLL + LTEXT "Transparency",IDC_STATIC,371,7,44,8 + EDITTEXT IDC_TRANSPARENT,371,17,40,14,ES_AUTOHSCROLL EDITTEXT IDC_CHANCE,307,43,20,14,ES_AUTOHSCROLL LTEXT "Chance of progress",IDC_STATIC,307,33,62,8 END @@ -4751,34 +4751,34 @@ LTEXT "/ 0",IDC_CNT,374,25,22,8 END -IDD_AREAMAP DIALOG DISCARDABLE 0, 0, 420, 199 +IDD_AREAMAP DIALOG DISCARDABLE 0, 0, 480, 198 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Maps" FONT 8, "MS Sans Serif" BEGIN CONTROL "Height map",IDC_HEIGHTMAP,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,342,15,54,10 - CONTROL "Light map",IDC_LIGHTMAP,"Button",BS_AUTORADIOBUTTON,342, + WS_GROUP | WS_TABSTOP,400,15,54,10 + CONTROL "Light map",IDC_LIGHTMAP,"Button",BS_AUTORADIOBUTTON,400, 26,54,10 CONTROL "Night light map",IDC_NIGHTMAP,"Button", - BS_AUTORADIOBUTTON,342,37,63,10 + BS_AUTORADIOBUTTON,400,37,63,10 CONTROL "Search map",IDC_SEARCHMAP,"Button",BS_AUTORADIOBUTTON, - 342,48,54,10 - PUSHBUTTON "Set to",IDC_SET,297,96,35,14,WS_GROUP - COMBOBOX IDC_VALUE,337,96,76,112,CBS_DROPDOWN | WS_VSCROLL | + 400,48,54,10 + PUSHBUTTON "Set to",IDC_SET,355,96,35,14,WS_GROUP + COMBOBOX IDC_VALUE,394,96,76,112,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Clear",IDC_CLEAR,297,120,35,14,WS_GROUP - PUSHBUTTON "Special",IDC_SPECIAL,337,120,76,14 - PUSHBUTTON "Create palette",IDC_INIT,297,146,52,14 - PUSHBUTTON "Edit palette",IDC_PALETTE,361,146,52,14 - PUSHBUTTON "Edit map",IDC_EDIT,297,172,52,14 - PUSHBUTTON "Undo floodfill",IDC_UNDO,361,172,52,14 - GROUPBOX "Choose map type",IDC_STATIC,333,1,80,61 + PUSHBUTTON "Clear",IDC_CLEAR,355,120,35,14,WS_GROUP + PUSHBUTTON "Special",IDC_SPECIAL,397,120,76,14 + PUSHBUTTON "Create palette",IDC_INIT,355,146,52,14 + PUSHBUTTON "Edit palette",IDC_PALETTE,421,146,52,14 + PUSHBUTTON "Edit map",IDC_EDIT,355,172,52,14 + PUSHBUTTON "Undo floodfill",IDC_UNDO,421,172,52,14 + GROUPBOX "Choose map type",IDC_STATIC,390,1,80,61 CONTROL "",IDC_MAP,"Static",SS_BITMAP | SS_NOTIFY,7,1,15,13 - EDITTEXT IDC_HEIGHT,376,77,20,14,ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_WIDTH,342,77,20,14,ES_AUTOHSCROLL | ES_READONLY - LTEXT "Map dimensions",IDC_STATIC,342,64,52,8 - LTEXT "x",IDC_STATIC,368,80,8,8 + EDITTEXT IDC_HEIGHT,434,77,20,14,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_WIDTH,400,77,20,14,ES_AUTOHSCROLL | ES_READONLY + LTEXT "Map dimensions",IDC_STATIC,400,64,52,8 + LTEXT "x",IDC_STATIC,426,80,8,8 END IDD_STOREDRINKS DIALOG DISCARDABLE 0, 0, 360, 199 @@ -5272,7 +5272,39 @@ LTEXT "Wizard",IDC_STATIC,78,154,23,8 END +IDD_AREAPROJ DIALOG DISCARDABLE 0, 0, 480, 198 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Projectiles" +FONT 8, "MS Sans Serif" +BEGIN + COMBOBOX IDC_PROJPICKER,7,17,116,167,CBS_DROPDOWN | WS_VSCROLL | + WS_TABSTOP + EDITTEXT IDC_POSX,7,43,24,14,ES_AUTOHSCROLL + EDITTEXT IDC_POSY,42,43,24,14,ES_AUTOHSCROLL + EDITTEXT IDC_BAM,77,43,48,14,ES_UPPERCASE | ES_AUTOHSCROLL + PUSHBUTTON "Browse",IDC_BROWSE,132,43,28,14 + PUSHBUTTON "Add projectile",IDC_ADD,411,17,62,14 + PUSHBUTTON "Remove projectile",IDC_REMOVE,411,43,62,14 + LTEXT "Projectile",IDC_STATIC,7,6,30,8 + LTEXT "Position",IDC_STATIC,7,33,26,8 + LTEXT "/ 0",IDC_MAX,128,20,38,8 + LTEXT "Projectile reference",IDC_STATIC,77,33,62,8 + EDITTEXT IDC_UNKNOWN10,171,43,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_PROJECTILE,171,17,40,14,ES_AUTOHSCROLL + LTEXT "Effects",IDC_STATIC,7,70,23,8 + LTEXT "Projectile ID",IDC_STATIC,171,6,39,8 + LTEXT "Unknown 10",IDC_STATIC,171,33,42,8 + EDITTEXT IDC_UNKNOWN18,226,43,40,14,ES_AUTOHSCROLL + LTEXT "Unknown 18",IDC_STATIC,226,33,42,8 + EDITTEXT IDC_UNKNOWN1A,280,43,40,14,ES_AUTOHSCROLL + LTEXT "Unknown 1a",IDC_STATIC,280,33,42,8 + LISTBOX IDC_EQUIPNUM,7,83,340,107,LBS_NOINTEGRALHEIGHT | + LBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Remove effect",IDC_REMOVE2,411,119,62,14 + PUSHBUTTON "Add effect",IDC_ADD2,411,90,62,14 +END + ///////////////////////////////////////////////////////////////////////////// // // DESIGNINFO @@ -5572,15 +5604,15 @@ IDD_AREAGENERAL, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 413 + RIGHTMARGIN, 473 TOPMARGIN, 7 - BOTTOMMARGIN, 192 + BOTTOMMARGIN, 191 END IDD_AREAEDIT, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 438 + RIGHTMARGIN, 493 TOPMARGIN, 7 BOTTOMMARGIN, 243 END @@ -5588,9 +5620,9 @@ IDD_AREAACTOR, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 413 + RIGHTMARGIN, 473 TOPMARGIN, 7 - BOTTOMMARGIN, 192 + BOTTOMMARGIN, 191 END IDD_SCHEDULE, DIALOG @@ -5612,25 +5644,25 @@ IDD_AREAENTRANCE, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 413 + RIGHTMARGIN, 473 TOPMARGIN, 7 - BOTTOMMARGIN, 192 + BOTTOMMARGIN, 191 END IDD_AREATRIGGER, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 413 + RIGHTMARGIN, 473 TOPMARGIN, 7 - BOTTOMMARGIN, 192 + BOTTOMMARGIN, 191 END IDD_AREASPAWN, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 413 + RIGHTMARGIN, 473 TOPMARGIN, 7 - BOTTOMMARGIN, 192 + BOTTOMMARGIN, 191 END IDD_CREATUREEDIT, DIALOG @@ -5700,9 +5732,9 @@ IDD_AREAAMBIENT, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 413 + RIGHTMARGIN, 473 TOPMARGIN, 7 - BOTTOMMARGIN, 192 + BOTTOMMARGIN, 191 END IDD_AREAINT, DIALOG @@ -5716,25 +5748,25 @@ IDD_AREACONTAINER, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 413 + RIGHTMARGIN, 473 TOPMARGIN, 7 - BOTTOMMARGIN, 192 + BOTTOMMARGIN, 191 END IDD_AREADOOR, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 413 + RIGHTMARGIN, 473 TOPMARGIN, 7 - BOTTOMMARGIN, 192 + BOTTOMMARGIN, 191 END IDD_AREAVARIABLE, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 413 + RIGHTMARGIN, 473 TOPMARGIN, 7 - BOTTOMMARGIN, 192 + BOTTOMMARGIN, 191 END IDD_DIALOGEDIT, DIALOG @@ -5852,9 +5884,9 @@ IDD_AREAANIM, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 413 + RIGHTMARGIN, 473 TOPMARGIN, 7 - BOTTOMMARGIN, 192 + BOTTOMMARGIN, 191 END IDD_SCRIPTEDIT, DIALOG @@ -5988,9 +6020,9 @@ IDD_AREAMAP, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 413 + RIGHTMARGIN, 473 TOPMARGIN, 1 - BOTTOMMARGIN, 192 + BOTTOMMARGIN, 191 END IDD_STOREDRINKS, DIALOG @@ -6088,6 +6120,14 @@ TOPMARGIN, 7 BOTTOMMARGIN, 183 END + + IDD_AREAPROJ, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 473 + TOPMARGIN, 7 + BOTTOMMARGIN, 191 + END END #endif // APSTUDIO_INVOKED Modified: chitem/trunk/resource.h =================================================================== --- chitem/trunk/resource.h 2009-04-25 17:02:49 UTC (rev 5886) +++ chitem/trunk/resource.h 2009-04-25 17:04:32 UTC (rev 5887) @@ -266,6 +266,7 @@ #define IDS_SEQFLAG 232 #define IDD_CREATURELEVELS 232 #define IDS_MINIMAP 233 +#define IDD_AREAPROJ 233 #define IDS_TISEXTRACT 234 #define IDS_OVERLAY 235 #define IDS_VEF 236 @@ -1633,6 +1634,7 @@ #define IDC_TOTAL 2336 #define IDC_MEMORISED2 2337 #define IDC_STATIC1 2338 +#define IDC_PROJPICKER 2340 #define ID_RESCAN 32771 #define ID_RESCAN2 32772 #define ID_EDIT_ITEM 32773 @@ -1856,7 +1858,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 233 #define _APS_NEXT_COMMAND_VALUE 33047 -#define _APS_NEXT_CONTROL_VALUE 2339 +#define _APS_NEXT_CONTROL_VALUE 2341 #define _APS_NEXT_SYMED_VALUE 120 #endif #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-05-10 21:06:28
|
Revision: 5949 http://gemrb.svn.sourceforge.net/gemrb/?rev=5949&view=rev Author: avenger_teambg Date: 2009-05-10 21:06:17 +0000 (Sun, 10 May 2009) Log Message: ----------- dltcep update Modified Paths: -------------- chitem/trunk/AreaInt.cpp chitem/trunk/AreaInt.h chitem/trunk/ProjEdit.cpp chitem/trunk/ProjEdit.h chitem/trunk/Structs.h chitem/trunk/chitem.rc chitem/trunk/resource.h Modified: chitem/trunk/AreaInt.cpp =================================================================== --- chitem/trunk/AreaInt.cpp 2009-05-10 21:01:58 UTC (rev 5948) +++ chitem/trunk/AreaInt.cpp 2009-05-10 21:06:17 UTC (rev 5949) @@ -66,6 +66,16 @@ DDX_Text(pDX, IDC_TEXT, m_text); //}}AFX_DATA_MAP + RetrieveResref(tmpstr,the_area.header.sleep1); + DDX_Text(pDX, IDC_DAYMOVIE, tmpstr); + DDV_MaxChars(pDX, tmpstr, 8); + StoreResref(tmpstr,the_area.header.sleep1); + + RetrieveResref(tmpstr,the_area.header.sleep2); + DDX_Text(pDX, IDC_NIGHTMOVIE, tmpstr); + DDV_MaxChars(pDX, tmpstr, 8); + StoreResref(tmpstr,the_area.header.sleep2); + RetrieveVariable(tmpstr,the_area.intheader.intname); DDX_Text(pDX, IDC_SECTION, tmpstr); DDV_MaxChars(pDX, tmpstr, 32); @@ -103,16 +113,20 @@ ON_EN_KILLFOCUS(IDC_UNKNOWN9C, OnKillfocusUnknown9c) ON_EN_KILLFOCUS(IDC_UNKNOWNA0, OnKillfocusUnknowna0) ON_EN_KILLFOCUS(IDC_UNKNOWNA2, OnKillfocusUnknowna2) - ON_BN_CLICKED(IDC_BROWSE, OnBrowse) - ON_BN_CLICKED(IDC_ADDCRE, OnAddcre) - ON_BN_CLICKED(IDC_DELCRE, OnDelcre) ON_EN_KILLFOCUS(IDC_DAY, OnKillfocusDay) ON_EN_KILLFOCUS(IDC_NIGHT, OnKillfocusNight) ON_CBN_KILLFOCUS(IDC_SPAWNNUMPICKER, OnKillfocusSpawnnumpicker) ON_CBN_SELCHANGE(IDC_SPAWNNUMPICKER, OnSelchangeSpawnnumpicker) - ON_BN_CLICKED(IDC_CLEAR, OnClear) ON_EN_KILLFOCUS(IDC_UNKNOWNAC, OnKillfocusUnknownac) ON_EN_KILLFOCUS(IDC_UNKNOWNAE, OnKillfocusUnknownae) + ON_EN_KILLFOCUS(IDC_DAYMOVIE, OnKillfocusDaymovie) + ON_EN_KILLFOCUS(IDC_NIGHTMOVIE, OnKillfocusNightmovie) + ON_BN_CLICKED(IDC_CLEAR, OnClear) + ON_BN_CLICKED(IDC_BROWSE, OnBrowse) + ON_BN_CLICKED(IDC_BROWSE2, OnBrowse2) + ON_BN_CLICKED(IDC_BROWSE3, OnBrowse3) + ON_BN_CLICKED(IDC_ADDCRE, OnAddcre) + ON_BN_CLICKED(IDC_DELCRE, OnDelcre) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -220,6 +234,19 @@ UpdateData(UD_DISPLAY); } +void CAreaInt::OnKillfocusDaymovie() +{ + UpdateData(UD_RETRIEVE); + UpdateData(UD_DISPLAY); +} + +void CAreaInt::OnKillfocusNightmovie() +{ + UpdateData(UD_RETRIEVE); + UpdateData(UD_DISPLAY); +} + + void CAreaInt::OnBrowse() { if(m_crenum<0) return; @@ -233,6 +260,28 @@ UpdateData(UD_DISPLAY); } +void CAreaInt::OnBrowse2() +{ + pickerdlg.m_restype=REF_MVE; + RetrieveResref(pickerdlg.m_picked,the_area.header.sleep1); + if(pickerdlg.DoModal()==IDOK) + { + StoreResref(pickerdlg.m_picked,the_area.header.sleep1); + } + UpdateData(UD_DISPLAY); +} + +void CAreaInt::OnBrowse3() +{ + pickerdlg.m_restype=REF_MVE; + RetrieveResref(pickerdlg.m_picked,the_area.header.sleep2); + if(pickerdlg.DoModal()==IDOK) + { + StoreResref(pickerdlg.m_picked,the_area.header.sleep2); + } + UpdateData(UD_DISPLAY); +} + void CAreaInt::OnAddcre() { if(the_area.intheader.creaturecnt<10) Modified: chitem/trunk/AreaInt.h =================================================================== --- chitem/trunk/AreaInt.h 2009-05-10 21:01:58 UTC (rev 5948) +++ chitem/trunk/AreaInt.h 2009-05-10 21:06:17 UTC (rev 5949) @@ -62,6 +62,10 @@ afx_msg void OnClear(); afx_msg void OnKillfocusUnknownac(); afx_msg void OnKillfocusUnknownae(); + afx_msg void OnKillfocusDaymovie(); + afx_msg void OnKillfocusNightmovie(); + afx_msg void OnBrowse2(); + afx_msg void OnBrowse3(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: chitem/trunk/ProjEdit.cpp =================================================================== --- chitem/trunk/ProjEdit.cpp 2009-05-10 21:01:58 UTC (rev 5948) +++ chitem/trunk/ProjEdit.cpp 2009-05-10 21:06:17 UTC (rev 5949) @@ -1173,11 +1173,6 @@ BEGIN_MESSAGE_MAP(CProjExt, CDialog) //{{AFX_MSG_MAP(CProjExt) - ON_EN_KILLFOCUS(IDC_ATTR, DefaultKillfocus) - ON_EN_KILLFOCUS(IDC_UNKNOWN2, DefaultKillfocus) - ON_CBN_KILLFOCUS(IDC_TRIGGER, DefaultKillfocus) - ON_CBN_KILLFOCUS(IDC_AREA, DefaultKillfocus) - ON_EN_KILLFOCUS(IDC_SOUND, DefaultKillfocus) ON_BN_CLICKED(IDC_ATTR1, OnAttr1) ON_BN_CLICKED(IDC_ATTR2, OnAttr2) ON_BN_CLICKED(IDC_ATTR3, OnAttr3) @@ -1194,18 +1189,24 @@ ON_BN_CLICKED(IDC_ATTR14, OnAttr14) ON_BN_CLICKED(IDC_ATTR15, OnAttr15) ON_BN_CLICKED(IDC_ATTR16, OnAttr16) + ON_BN_CLICKED(IDC_BROWSE1, OnBrowse1) + ON_BN_CLICKED(IDC_PLAY1, OnPlay1) + ON_BN_CLICKED(IDC_BROWSE, OnBrowse) + ON_BN_CLICKED(IDC_BROWSE2, OnBrowse2) + ON_EN_KILLFOCUS(IDC_ATTR, DefaultKillfocus) + ON_EN_KILLFOCUS(IDC_UNKNOWN2, DefaultKillfocus) + ON_CBN_KILLFOCUS(IDC_TRIGGER, DefaultKillfocus) + ON_CBN_KILLFOCUS(IDC_AREA, DefaultKillfocus) + ON_EN_KILLFOCUS(IDC_SOUND, DefaultKillfocus) ON_EN_KILLFOCUS(IDC_DURATION, DefaultKillfocus) ON_CBN_KILLFOCUS(IDC_EXPLOSION, DefaultKillfocus) ON_CBN_KILLFOCUS(IDC_CONESIZE, DefaultKillfocus) - ON_BN_CLICKED(IDC_BROWSE1, OnBrowse1) - ON_BN_CLICKED(IDC_PLAY1, OnPlay1) ON_CBN_KILLFOCUS(IDC_FRAGMENT, DefaultKillfocus) ON_CBN_KILLFOCUS(IDC_UNKNOWN14, DefaultKillfocus) ON_CBN_KILLFOCUS(IDC_PROJECTILE, DefaultKillfocus) ON_EN_KILLFOCUS(IDC_COLOR, DefaultKillfocus) ON_EN_KILLFOCUS(IDC_VVC, DefaultKillfocus) - ON_BN_CLICKED(IDC_BROWSE, OnBrowse) - ON_BN_CLICKED(IDC_BROWSE2, OnBrowse2) + ON_BN_CLICKED(IDC_UNKNOWN, OnUnknown) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -1354,8 +1355,15 @@ } } +void CProjExt::OnUnknown() +{ + // TODO: Add your control notification handler code here + +} + BOOL CProjExt::PreTranslateMessage(MSG* pMsg) { m_tooltip.RelayEvent(pMsg); return CDialog::PreTranslateMessage(pMsg); } + Modified: chitem/trunk/ProjEdit.h =================================================================== --- chitem/trunk/ProjEdit.h 2009-05-10 21:01:58 UTC (rev 5948) +++ chitem/trunk/ProjEdit.h 2009-05-10 21:06:17 UTC (rev 5949) @@ -169,6 +169,7 @@ afx_msg void OnPlay1(); afx_msg void OnBrowse(); afx_msg void OnBrowse2(); + afx_msg void OnUnknown(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: chitem/trunk/Structs.h =================================================================== --- chitem/trunk/Structs.h 2009-05-10 21:01:58 UTC (rev 5948) +++ chitem/trunk/Structs.h 2009-05-10 21:06:17 UTC (rev 5949) @@ -1279,7 +1279,9 @@ long mapnotecnt; long pstmapnotecnt; //also trapoffset long trapcnt; - char unused[72]; + char sleep1[8]; + char sleep2[8]; + char unused[56]; } area_header; typedef struct { Modified: chitem/trunk/chitem.rc =================================================================== --- chitem/trunk/chitem.rc 2009-05-10 21:01:58 UTC (rev 5948) +++ chitem/trunk/chitem.rc 2009-05-10 21:06:17 UTC (rev 5949) @@ -2927,7 +2927,7 @@ LTEXT "Flags",IDC_STATIC,7,128,18,8 END -IDD_AREAINT DIALOG DISCARDABLE 0, 0, 310, 207 +IDD_AREAINT DIALOG DISCARDABLE 0, 0, 340, 206 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Rest interruptions" FONT 8, "MS Sans Serif" @@ -2935,9 +2935,9 @@ EDITTEXT IDC_SECTION,5,16,132,14,ES_AUTOHSCROLL COMBOBOX IDC_SPAWNNUMPICKER,151,17,85,123,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_STRREF,5,44,40,14,ES_AUTOHSCROLL - EDITTEXT IDC_TEXT,49,44,201,14,ES_AUTOHSCROLL - EDITTEXT IDC_CRERES,5,74,72,14,ES_UPPERCASE | ES_AUTOHSCROLL + EDITTEXT IDC_STRREF,5,44,48,14,ES_AUTOHSCROLL + EDITTEXT IDC_TEXT,59,44,201,14,ES_AUTOHSCROLL + EDITTEXT IDC_CRERES,5,74,66,14,ES_UPPERCASE | ES_AUTOHSCROLL EDITTEXT IDC_UNKNOWN9A,9,133,33,14,ES_AUTOHSCROLL EDITTEXT IDC_UNKNOWN9C,56,133,33,14,ES_AUTOHSCROLL EDITTEXT IDC_UNKNOWNA0,103,133,33,14,ES_AUTOHSCROLL @@ -2948,11 +2948,11 @@ EDITTEXT IDC_NIGHT,103,170,33,14,ES_AUTOHSCROLL EDITTEXT IDC_UNKNOWNAC,150,170,33,14,ES_AUTOHSCROLL EDITTEXT IDC_UNKNOWNAE,197,170,33,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse",IDC_BROWSE,81,74,31,14 - PUSHBUTTON "Add",IDC_ADDCRE,270,37,31,14 - PUSHBUTTON "Remove",IDC_DELCRE,270,52,31,14 - PUSHBUTTON "Clear interruptions",IDC_CLEAR,240,129,61,14 - PUSHBUTTON "Back",IDOK,253,186,50,14 + PUSHBUTTON "Browse",IDC_BROWSE,78,74,31,14 + PUSHBUTTON "Add",IDC_ADDCRE,302,28,31,14 + PUSHBUTTON "Remove",IDC_DELCRE,302,43,31,14 + PUSHBUTTON "Clear interruptions",IDC_CLEAR,272,129,61,14 + PUSHBUTTON "Back",IDOK,283,185,50,14 LTEXT "Section name",IDC_STATIC,5,7,44,8 LTEXT "Tlk entry",IDC_STATIC,5,34,28,8 LTEXT "Creature",IDC_STATIC,5,64,28,8 @@ -2967,7 +2967,13 @@ LTEXT "Night chance",IDC_STATIC,103,151,33,17 LTEXT "0xac",IDC_STATIC,150,160,16,8 LTEXT "0xae",IDC_STATIC,197,160,16,8 - GROUPBOX "Global data",IDC_STATIC,5,97,232,103,BS_FLAT + GROUPBOX "Global data",IDC_STATIC,5,96,232,103,BS_FLAT + EDITTEXT IDC_DAYMOVIE,116,74,66,14,ES_AUTOHSCROLL + EDITTEXT IDC_NIGHTMOVIE,227,74,66,14,ES_AUTOHSCROLL + PUSHBUTTON "Browse",IDC_BROWSE2,189,73,31,14 + PUSHBUTTON "Browse",IDC_BROWSE3,300,73,31,14 + LTEXT "Resting movie at day",IDC_STATIC,116,62,67,8 + LTEXT "Resting movie at night",IDC_STATIC,227,63,71,8 END IDD_AREACONTAINER DIALOG DISCARDABLE 0, 0, 480, 198 @@ -5740,9 +5746,9 @@ IDD_AREAINT, DIALOG BEGIN LEFTMARGIN, 5 - RIGHTMARGIN, 303 + RIGHTMARGIN, 333 TOPMARGIN, 7 - BOTTOMMARGIN, 200 + BOTTOMMARGIN, 199 END IDD_AREACONTAINER, DIALOG Modified: chitem/trunk/resource.h =================================================================== --- chitem/trunk/resource.h 2009-05-10 21:01:58 UTC (rev 5948) +++ chitem/trunk/resource.h 2009-05-10 21:06:17 UTC (rev 5949) @@ -1635,6 +1635,8 @@ #define IDC_MEMORISED2 2337 #define IDC_STATIC1 2338 #define IDC_PROJPICKER 2340 +#define IDC_DAYMOVIE 2342 +#define IDC_NIGHTMOVIE 2343 #define ID_RESCAN 32771 #define ID_RESCAN2 32772 #define ID_EDIT_ITEM 32773 @@ -1858,7 +1860,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 233 #define _APS_NEXT_COMMAND_VALUE 33047 -#define _APS_NEXT_CONTROL_VALUE 2341 +#define _APS_NEXT_CONTROL_VALUE 2344 #define _APS_NEXT_SYMED_VALUE 120 #endif #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-06-01 07:53:42
|
Revision: 6226 http://gemrb.svn.sourceforge.net/gemrb/?rev=6226&view=rev Author: avenger_teambg Date: 2009-06-01 07:53:39 +0000 (Mon, 01 Jun 2009) Log Message: ----------- added bounce flag to projectiles (editing in dltcep) Modified Paths: -------------- chitem/trunk/Chitem.h chitem/trunk/ProjEdit.cpp chitem/trunk/Structs.h chitem/trunk/chitem.rc chitem/trunk/resource.h Added Paths: ----------- chitem/trunk/ProjGemRB.cpp chitem/trunk/ProjGemRB.h Modified: chitem/trunk/Chitem.h =================================================================== --- chitem/trunk/Chitem.h 2009-06-01 07:08:24 UTC (rev 6225) +++ chitem/trunk/Chitem.h 2009-06-01 07:53:39 UTC (rev 6226) @@ -502,6 +502,16 @@ #define ST_RENT 0x10000 //not in the original flags +//projectile flags +#define PROJ_BAMPALETTE 1 +#define PROJ_SMOKE 2 +// +#define PROJ_NOLIGHT 8 +// +#define PROJ_SHADOW 32 +#define PROJ_LIGHTSPOT 64 + +//projectile aoe flags #define PROJ_VISIBLE 1 #define PROJ_INANIMATE 2 #define PROJ_TRIGGER 4 @@ -514,6 +524,9 @@ #define PROJ_HAS_VVC 1024 #define PROJ_CONE 2048 +//extended flags for gemrb +#define PROJ_BOUNCE 1 + #define TRANSPARENT_GREEN 0x00ff00 #define COLORNUM 256 Modified: chitem/trunk/ProjEdit.cpp =================================================================== --- chitem/trunk/ProjEdit.cpp 2009-06-01 07:08:24 UTC (rev 6225) +++ chitem/trunk/ProjEdit.cpp 2009-06-01 07:53:39 UTC (rev 6226) @@ -8,6 +8,7 @@ #include "chitem.h" #include "chitemDlg.h" #include "ProjEdit.h" +#include "ProjgemRB.h" #include "ColorPicker.h" #include "MyFileDialog.h" @@ -90,7 +91,9 @@ DDX_Text(pDX, IDC_SPARKCOLOUR, tmpstr); the_projectile.header.spkcolour=strtonum(tmpstr); - DDX_Text(pDX, IDC_ATTR, the_projectile.header.attr); + tmpstr.Format("%d", the_projectile.header.attr); + DDX_Text(pDX, IDC_ATTR, tmpstr); + the_projectile.header.attr=strtonum(tmpstr); RetrieveResref(tmpstr,the_projectile.header.bam1); DDX_Text(pDX, IDC_BAM1, tmpstr); @@ -710,13 +713,13 @@ void CProjEdit::OnAttr1() { - the_projectile.header.attr^=1; + the_projectile.header.attr^=PROJ_BAMPALETTE; UpdateData(UD_DISPLAY); } void CProjEdit::OnAttr2() { - the_projectile.header.attr^=2; + the_projectile.header.attr^=PROJ_SMOKE; UpdateData(UD_DISPLAY); } @@ -728,7 +731,7 @@ void CProjEdit::OnAttr4() { - the_projectile.header.attr^=8; + the_projectile.header.attr^=PROJ_NOLIGHT; UpdateData(UD_DISPLAY); } @@ -740,13 +743,13 @@ void CProjEdit::OnAttr6() { - the_projectile.header.attr^=32; + the_projectile.header.attr^=PROJ_SHADOW; UpdateData(UD_DISPLAY); } void CProjEdit::OnAttr7() { - the_projectile.header.attr^=64; + the_projectile.header.attr^=PROJ_LIGHTSPOT; UpdateData(UD_DISPLAY); } @@ -924,8 +927,9 @@ void CProjEdit::OnUnknown2c() { - // TODO: Add your control notification handler code here + CProjGemRB dlg; + dlg.DoModal(); } void CProjEdit::OnUnknown154() Added: chitem/trunk/ProjGemRB.cpp =================================================================== --- chitem/trunk/ProjGemRB.cpp (rev 0) +++ chitem/trunk/ProjGemRB.cpp 2009-06-01 07:53:39 UTC (rev 6226) @@ -0,0 +1,69 @@ +// ProjGemRB.cpp : implementation file +// + +#include "stdafx.h" +#include "chitem.h" +#include "ProjGemRB.h" + +#ifdef _DEBUG +#define new DEBUG_NEW +#undef THIS_FILE +static char THIS_FILE[] = __FILE__; +#endif + +///////////////////////////////////////////////////////////////////////////// +// CProjGemRB dialog + + +CProjGemRB::CProjGemRB(CWnd* pParent /*=NULL*/) + : CDialog(CProjGemRB::IDD, pParent) +{ + //{{AFX_DATA_INIT(CProjGemRB) + // NOTE: the ClassWizard will add member initialization here + //}}AFX_DATA_INIT +} + + +void CProjGemRB::DoDataExchange(CDataExchange* pDX) +{ + CButton *cb; + CString tmpstr; + int i,j; + int flg; + + CDialog::DoDataExchange(pDX); + //{{AFX_DATA_MAP(CProjGemRB) + // NOTE: the ClassWizard will add DDX and DDV calls here + //}}AFX_DATA_MAP + tmpstr.Format("%d", the_projectile.header.extflags); + DDX_Text(pDX, IDC_FLAGS, tmpstr); + the_projectile.header.extflags=strtonum(tmpstr); + j=1; + for(i=0;i<16;i++) + { + cb=(CButton *) GetDlgItem(IDC_FLAG1+i); + if (cb) + { + flg=!!(the_projectile.header.extflags&j); + cb->SetCheck(flg); + j<<=1; + } + } +} + + +BEGIN_MESSAGE_MAP(CProjGemRB, CDialog) + //{{AFX_MSG_MAP(CProjGemRB) + ON_BN_CLICKED(IDC_FLAG1, OnFlag1) + //}}AFX_MSG_MAP +END_MESSAGE_MAP() + +///////////////////////////////////////////////////////////////////////////// +// CProjGemRB message handlers + + +void CProjGemRB::OnFlag1() +{ + the_projectile.header.extflags^=PROJ_BOUNCE; + UpdateData(UD_DISPLAY); +} Added: chitem/trunk/ProjGemRB.h =================================================================== --- chitem/trunk/ProjGemRB.h (rev 0) +++ chitem/trunk/ProjGemRB.h 2009-06-01 07:53:39 UTC (rev 6226) @@ -0,0 +1,46 @@ +#if !defined(AFX_PROJGEMRB_H__BD52A523_DB9E_4DDA_9A9A_8D22A2981094__INCLUDED_) +#define AFX_PROJGEMRB_H__BD52A523_DB9E_4DDA_9A9A_8D22A2981094__INCLUDED_ + +#if _MSC_VER > 1000 +#pragma once +#endif // _MSC_VER > 1000 +// ProjGemRB.h : header file +// + +///////////////////////////////////////////////////////////////////////////// +// CProjGemRB dialog + +class CProjGemRB : public CDialog +{ +// Construction +public: + CProjGemRB(CWnd* pParent = NULL); // standard constructor + +// Dialog Data + //{{AFX_DATA(CProjGemRB) + enum { IDD = IDD_PROJGEMRB }; + // NOTE: the ClassWizard will add data members here + //}}AFX_DATA + + +// Overrides + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(CProjGemRB) + protected: + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + //}}AFX_VIRTUAL + +// Implementation +protected: + + // Generated message map functions + //{{AFX_MSG(CProjGemRB) + afx_msg void OnFlag1(); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() +}; + +//{{AFX_INSERT_LOCATION}} +// Microsoft Visual C++ will insert additional declarations immediately before the previous line. + +#endif // !defined(AFX_PROJGEMRB_H__BD52A523_DB9E_4DDA_9A9A_8D22A2981094__INCLUDED_) Modified: chitem/trunk/Structs.h =================================================================== --- chitem/trunk/Structs.h 2009-06-01 07:08:24 UTC (rev 6225) +++ chitem/trunk/Structs.h 2009-06-01 07:53:39 UTC (rev 6226) @@ -535,8 +535,9 @@ char wavc1[8]; char wavc2[8]; char wavc3[8]; - long spkcolour; //cannot be 0 if there are sparks (must be 1-12) - char unknown2c[212]; //unknown till next 256 block + long spkcolour; //cannot be 0 if there are sparks (must be 1-12) + long extflags; //flags used by gemrb + char unknown30[208]; //unknown till next 256 block unsigned long attr; char bam1[8]; char bam2[8]; Modified: chitem/trunk/chitem.rc =================================================================== --- chitem/trunk/chitem.rc 2009-06-01 07:08:24 UTC (rev 6225) +++ chitem/trunk/chitem.rc 2009-06-01 07:53:39 UTC (rev 6226) @@ -2111,7 +2111,7 @@ EXSTYLE WS_EX_CONTROLPARENT CAPTION "Edit Projectile:" MENU IDR_PROJECT -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Sans Serif" BEGIN COMBOBOX IDC_TYPE,7,20,88,57,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP @@ -2189,7 +2189,7 @@ EDITTEXT IDC_BAM5,282,176,49,14,ES_UPPERCASE | ES_AUTOHSCROLL EDITTEXT IDC_FREQ3,366,176,28,14,ES_AUTOHSCROLL PUSHBUTTON "Edit area extension",IDC_EXTENSION,135,213,141,14 - PUSHBUTTON "Unknowns at 0x2c",IDC_UNKNOWN2C,335,202,68,14 + PUSHBUTTON "GemRB specific",IDC_UNKNOWN2C,335,202,68,14 PUSHBUTTON "Unknowns at 0x154",IDC_UNKNOWN154,335,223,68,14 DEFPUSHBUTTON "Load Projectile",IDC_LOAD,7,245,52,14 PUSHBUTTON "Load external projectile",IDC_LOADEX,69,245,78,14 @@ -4707,15 +4707,15 @@ WS_TABSTOP,90,161,46,10 CONTROL "2",IDC_FLAG2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,140, 161,20,10 - CONTROL "3",IDC_FLAG3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164, - 161,20,10 + CONTROL "Center",IDC_FLAG3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 164,161,37,10 CONTROL "Left",IDC_FLAG4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 296,178,28,10 CONTROL "Right",IDC_FLAG5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 328,178,33,10 CONTROL "Top",IDC_FLAG6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 296,192,29,10 - CONTROL "7",IDC_FLAG7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189, + CONTROL "7",IDC_FLAG7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,221, 161,20,10 CONTROL "Bottom",IDC_FLAG8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 328,192,38,10 @@ -5310,7 +5310,19 @@ PUSHBUTTON "Add effect",IDC_ADD2,411,90,62,14 END +IDD_PROJGEMRB DIALOG DISCARDABLE 0, 0, 227, 164 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "GemRB specific data" +FONT 8, "MS Sans Serif" +BEGIN + PUSHBUTTON "Back",IDOK,170,143,50,14 + EDITTEXT IDC_FLAGS,9,21,48,14,ES_AUTOHSCROLL + LTEXT "Additional flags",IDC_STATIC,9,7,48,8 + CONTROL "Bounce",IDC_FLAG1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 9,44,41,10 +END + ///////////////////////////////////////////////////////////////////////////// // // DESIGNINFO @@ -6134,6 +6146,14 @@ TOPMARGIN, 7 BOTTOMMARGIN, 191 END + + IDD_PROJGEMRB, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 220 + TOPMARGIN, 7 + BOTTOMMARGIN, 157 + END END #endif // APSTUDIO_INVOKED @@ -6183,8 +6203,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 7,1,0,1 - PRODUCTVERSION 7,1,0,1 + FILEVERSION 7,1,0,2 + PRODUCTVERSION 7,1,0,2 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -6202,14 +6222,14 @@ VALUE "Comments", "www.dragonlancetc.com\0" VALUE "CompanyName", "GemRB Project (gemrb.sourceforge.net)\0" VALUE "FileDescription", "DragonLance Total Conversion Editor Pro\0" - VALUE "FileVersion", "7, 1, 0, 1\0" + VALUE "FileVersion", "7, 1, 0, 2\0" VALUE "InternalName", "dltcep\0" - VALUE "LegalCopyright", "Copyright (C) 2002-2008 Avenger\0" + VALUE "LegalCopyright", "Copyright (C) 2002-2009 Avenger\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "chitem.EXE\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "DLTC Editor Pro 7.1b\0" - VALUE "ProductVersion", "7, 1, 0, 1\0" + VALUE "ProductVersion", "7, 1, 0, 2\0" VALUE "SpecialBuild", "\0" END END Modified: chitem/trunk/resource.h =================================================================== --- chitem/trunk/resource.h 2009-06-01 07:08:24 UTC (rev 6225) +++ chitem/trunk/resource.h 2009-06-01 07:53:39 UTC (rev 6226) @@ -268,6 +268,7 @@ #define IDS_MINIMAP 233 #define IDD_AREAPROJ 233 #define IDS_TISEXTRACT 234 +#define IDD_PROJGEMRB 234 #define IDS_OVERLAY 235 #define IDS_VEF 236 #define IDS_INI 237 @@ -1860,7 +1861,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 233 #define _APS_NEXT_COMMAND_VALUE 33047 -#define _APS_NEXT_CONTROL_VALUE 2344 +#define _APS_NEXT_CONTROL_VALUE 2346 #define _APS_NEXT_SYMED_VALUE 120 #endif #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-06-01 19:57:40
|
Revision: 6247 http://gemrb.svn.sourceforge.net/gemrb/?rev=6247&view=rev Author: avenger_teambg Date: 2009-06-01 19:57:32 +0000 (Mon, 01 Jun 2009) Log Message: ----------- one more gemrb specific flag for projectiles Modified Paths: -------------- chitem/trunk/Chitem.h chitem/trunk/ProjGemRB.cpp chitem/trunk/ProjGemRB.h chitem/trunk/chitem.clw chitem/trunk/chitem.rc chitem/trunk/resource.h Modified: chitem/trunk/Chitem.h =================================================================== --- chitem/trunk/Chitem.h 2009-06-01 19:17:51 UTC (rev 6246) +++ chitem/trunk/Chitem.h 2009-06-01 19:57:32 UTC (rev 6247) @@ -525,7 +525,8 @@ #define PROJ_CONE 2048 //extended flags for gemrb -#define PROJ_BOUNCE 1 +#define PROJ_BOUNCE 1 //bounce from walls +#define PROJ_CONTINUE 2 //continue as travel projectile after triggered #define TRANSPARENT_GREEN 0x00ff00 Modified: chitem/trunk/ProjGemRB.cpp =================================================================== --- chitem/trunk/ProjGemRB.cpp 2009-06-01 19:17:51 UTC (rev 6246) +++ chitem/trunk/ProjGemRB.cpp 2009-06-01 19:57:32 UTC (rev 6247) @@ -55,6 +55,7 @@ BEGIN_MESSAGE_MAP(CProjGemRB, CDialog) //{{AFX_MSG_MAP(CProjGemRB) ON_BN_CLICKED(IDC_FLAG1, OnFlag1) + ON_BN_CLICKED(IDC_FLAG2, OnFlag2) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -67,3 +68,9 @@ the_projectile.header.extflags^=PROJ_BOUNCE; UpdateData(UD_DISPLAY); } + +void CProjGemRB::OnFlag2() +{ + the_projectile.header.extflags^=PROJ_CONTINUE; + UpdateData(UD_DISPLAY); +} Modified: chitem/trunk/ProjGemRB.h =================================================================== --- chitem/trunk/ProjGemRB.h 2009-06-01 19:17:51 UTC (rev 6246) +++ chitem/trunk/ProjGemRB.h 2009-06-01 19:57:32 UTC (rev 6247) @@ -36,6 +36,7 @@ // Generated message map functions //{{AFX_MSG(CProjGemRB) afx_msg void OnFlag1(); + afx_msg void OnFlag2(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: chitem/trunk/chitem.clw =================================================================== --- chitem/trunk/chitem.clw 2009-06-01 19:17:51 UTC (rev 6246) +++ chitem/trunk/chitem.clw 2009-06-01 19:57:32 UTC (rev 6247) @@ -2,17 +2,17 @@ [General Info] Version=1 -LastClass=CChitemDlg +LastClass=CProjGemRB LastTemplate=CDialog NewFileInclude1=#include "stdafx.h" NewFileInclude2=#include "chitem.h" -ClassCount=104 +ClassCount=106 Class1=CChitemApp Class2=CChitemDlg Class3=CAboutDlg -ResourceCount=250 +ResourceCount=252 Resource1=IDD_AREASPAWN Resource2=IDR_MAINFRAME Resource3=IDD_STOREITEMS @@ -232,138 +232,142 @@ Resource123=IDD_GAMEGENERAL Class98=IcewindCre Resource124=IDR_SHORTCUT -Resource125=IDD_AREATRIGGER (English (U.S.)) -Resource126=IDD_SHOWLOG (English (U.S.)) -Resource127=IDR_EFFECT (English (U.S.)) -Resource128=IDR_CHITIN (English (U.S.)) -Resource129=IDD_SPELLEQUIP (English (U.S.)) -Resource130=IDD_2DAEDIT (English (U.S.)) -Resource131=IDD_ITEMPICKER (English (U.S.)) -Resource132=IDD_GAMESTATS (English (U.S.)) -Resource133=IDD_CREATUREPST (English (U.S.)) -Resource134=IDD_PALETTE (English (U.S.)) -Resource135=IDD_AREAINT (English (U.S.)) -Resource136=IDD_SPELLEFFECT (English (U.S.)) -Resource137=IDD_TISDIALOG (English (U.S.)) -Resource138=IDR_WORLDMAP (English (U.S.)) -Resource139=IDD_CREATUREEFF (English (U.S.)) -Resource140=IDR_CHUI (English (U.S.)) -Resource141=IDD_COLORPICKER (English (U.S.)) -Resource142=IDR_SPELL (English (U.S.)) -Resource143=IDR_BAMMENU (English (U.S.)) -Resource144=IDD_ITEMDESC (English (U.S.)) -Resource145=IDD_EDIT (English (U.S.)) -Resource146=IDD_SPELLGENERAL (English (U.S.)) -Resource147=IDR_PROJECT (English (U.S.)) -Resource148=IDR_2DA (English (U.S.)) -Resource149=IDD_AREAANIM (English (U.S.)) -Resource150=IDD_AREACONTAINER (English (U.S.)) -Resource151=IDR_ITEM (English (U.S.)) -Resource152=IDD_AREAGENERAL (English (U.S.)) -Resource153=IDR_TREEMENU (English (U.S.)) -Resource154=IDD_CREATUREIWD2 (English (U.S.)) -Resource155=IDR_VVC (English (U.S.)) -Resource156=IDD_AREAMAP (English (U.S.)) -Resource157=IDD_EXTRACT (English (U.S.)) -Resource158=IDD_SPELLEXTRA (English (U.S.)) -Resource159=IDD_AREAENTRANCE (English (U.S.)) -Resource160=IDD_EFFEDIT (English (U.S.)) -Resource161=IDD_PANICBUTTON (English (U.S.)) -Resource162=IDD_POLYGON (English (U.S.)) -Resource163=IDD_IMAGEVIEW (English (U.S.)) -Resource164=IDD_CREATUREICONS (English (U.S.)) -Resource165=IDD_ITEMICONS (English (U.S.)) -Resource166=IDD_PROJEDIT (English (U.S.)) -Resource167=IDD_AREASPAWN (English (U.S.)) -Resource168=IDD_ITEMUSE (English (U.S.)) -Resource169=IDD_IAPDIALOG (English (U.S.)) -Resource170=IDD_CFB (English (U.S.)) -Resource171=IDR_AREA (English (U.S.)) -Resource172=IDD_PROJEXT (English (U.S.)) -Resource173=IDR_SRC (English (U.S.)) -Resource174=IDD_CREATURESKILLS (English (U.S.)) -Resource175=IDD_BAMEDIT (English (U.S.)) -Resource176=IDD_STOREITEMS (English (U.S.)) -Resource177=IDD_MOSEDIT (English (U.S.)) -Resource178=IDD_ITEMEXTRA (English (U.S.)) -Resource179=IDD_ANIMDIALOG -Resource180=IDD_SAVHANDLE (English (U.S.)) -Resource181=IDD_GAMEPCINFO (English (U.S.)) -Resource182=IDD_STORERENTAL (English (U.S.)) -Resource183=IDD_GAMEGENERAL (English (U.S.)) -Resource184=IDD_STOREEDIT (English (U.S.)) -Resource185=IDD_KEYEDIT (English (U.S.)) -Resource186=IDD_SCHEDULE (English (U.S.)) -Resource187=IDR_SCRIPT (English (U.S.)) -Resource188=IDD_SCRIPTEDIT (English (U.S.)) -Resource189=IDD_CREATUREGENERAL (English (U.S.)) -Resource190=IDD_CREATURESTRINGS (English (U.S.)) -Resource191=IDD_STRREFDLG (English (U.S.)) -Resource192=IDD_CREATUREITEMS (English (U.S.)) +Resource125=IDD_ANIMDIALOG +Resource126=IDD_AREASONGS (English (U.S.)) +Resource127=IDD_GAMESTATS (English (U.S.)) +Resource128=IDD_COMPAT (English (U.S.)) +Resource129=IDD_AREAMAP (English (U.S.)) +Resource130=IDD_CREATUREEDIT (English (U.S.)) +Resource131=IDD_CREATURERES (English (U.S.)) +Resource132=IDD_SEARCHNODE (English (U.S.)) +Resource133=IDD_GAMEGENERAL (English (U.S.)) +Resource134=IDD_WEDEDIT (English (U.S.)) +Resource135=IDD_GAMEPCINFO (English (U.S.)) +Resource136=IDD_ITEMEQUIP (English (U.S.)) +Resource137=IDD_PROJEXT (English (U.S.)) +Resource138=IDR_SHORTCUT (English (U.S.)) +Resource139=IDD_SHOWLOG (English (U.S.)) +Resource140=IDD_EFFEDIT (English (U.S.)) +Resource141=IDD_SCRIPTEDIT (English (U.S.)) +Resource142=IDR_VVC (English (U.S.)) +Resource143=IDD_WEDPOLY (English (U.S.)) +Resource144=IDD_PROJEDIT (English (U.S.)) +Resource145=IDD_CREATUREIWD2 (English (U.S.)) +Resource146=IDD_ITEMDESC (English (U.S.)) +Resource147=IDD_AREAVARIABLE (English (U.S.)) +Resource148=IDD_AREAAMBIENT (English (U.S.)) +Resource149=IDD_STOREEXTRA (English (U.S.)) +Resource150=IDD_SPELLTOOL (English (U.S.)) +Resource151=IDD_STRREFDLG (English (U.S.)) +Resource152=IDD_KEYEDIT (English (U.S.)) +Resource153=IDD_STOREITEMS (English (U.S.)) +Resource154=IDD_STOREEDIT (English (U.S.)) +Resource155=IDD_EDIT (English (U.S.)) +Resource156=IDD_CREATUREOVR (English (U.S.)) +Resource157=IDD_COLORPICKER (English (U.S.)) +Resource158=IDD_EXTRACT (English (U.S.)) +Resource159=IDD_EXTRACT2 (English (U.S.)) +Resource160=IDD_MAPLINK (English (U.S.)) +Resource161=IDR_WEDMENU (English (U.S.)) +Resource162=IDD_WEDTILE (English (U.S.)) +Resource163=IDR_PROJECT (English (U.S.)) +Resource164=IDD_2DAEDIT (English (U.S.)) +Resource165=IDR_WORLDMAP (English (U.S.)) +Resource166=IDD_STOREGENERAL (English (U.S.)) +Resource167=IDD_AREACONTAINER (English (U.S.)) +Resource168=IDD_CREATUREIWD (English (U.S.)) +Resource169=IDD_ITEMICONS (English (U.S.)) +Resource170=IDR_2DA (English (U.S.)) +Resource171=IDD_CREATURESKILLS (English (U.S.)) +Resource172=IDD_SAVHANDLE (English (U.S.)) +Resource173=IDD_PALETTE (English (U.S.)) +Resource174=IDD_ABOUTBOX (English (U.S.)) +Resource175=IDD_IDSEDIT (English (U.S.)) +Resource176=IDD_MASSCLEAR (English (U.S.)) +Resource177=IDD_CREATUREUNKNOWN (English (U.S.)) +Resource178=IDD_WEIDU (English (U.S.)) +Resource179=IDD_VARIABLES (English (U.S.)) +Resource180=IDD_ITEMUSE (English (U.S.)) +Resource181=IDR_MENUBAR (English (U.S.)) +Resource182=IDD_CREATUREEFF (English (U.S.)) +Resource183=IDR_SCRIPT (English (U.S.)) +Resource184=IDR_MUSIC (English (U.S.)) +Resource185=IDD_AREAPROJ (English (U.S.)) +Resource186=IDD_MOSEDIT (English (U.S.)) +Resource187=IDR_IDS (English (U.S.)) +Resource188=IDD_SPELLGENERAL (English (U.S.)) +Resource189=IDR_CHITIN (English (U.S.)) +Resource190=IDD_AREATRIGGER (English (U.S.)) +Resource191=IDD_PANICBUTTON (English (U.S.)) +Resource192=IDD_AREADOOR (English (U.S.)) Resource193=IDD_ITEMGENERAL (English (U.S.)) -Resource194=IDD_AREADOOR (English (U.S.)) -Resource195=IDD_WEDPOLY (English (U.S.)) -Resource196=IDR_CREATURE (English (U.S.)) -Resource197=IDD_CREATURERES (English (U.S.)) -Resource198=IDD_IDSEDIT (English (U.S.)) -Resource199=IDR_TLKMENU (English (U.S.)) -Resource200=IDD_CREATURELEVELS (English (U.S.)) -Resource201=IDD_CREATUREUNKNOWN (English (U.S.)) -Resource202=IDR_GAME (English (U.S.)) -Resource203=IDD_COMPAT (English (U.S.)) -Resource204=IDD_AREAVARIABLE (English (U.S.)) -Resource205=IDD_AREATRIGGERSTRINGS (English (U.S.)) -Resource206=IDD_AREAEDIT (English (U.S.)) -Resource207=IDD_AREAAMBIENT (English (U.S.)) -Resource208=IDD_EXTRACT2 (English (U.S.)) -Resource209=IDD_DIALOGEDIT (English (U.S.)) -Resource210=IDD_AREASONGS (English (U.S.)) -Resource211=IDD_SPELLTOOL (English (U.S.)) -Resource212=IDD_ITEMEFFECT (English (U.S.)) -Resource213=IDD_MUSEDIT (English (U.S.)) -Resource214=IDD_SEARCHNODE (English (U.S.)) +Resource194=IDD_SCHEDULE (English (U.S.)) +Resource195=IDD_SPELLEXTRA (English (U.S.)) +Resource196=IDD_SRCEDIT (English (U.S.)) +Resource197=IDD_IMAGEVIEW (English (U.S.)) +Resource198=IDR_STORE (English (U.S.)) +Resource199=IDD_POLYGON (English (U.S.)) +Resource200=IDD_CFB (English (U.S.)) +Resource201=IDD_TISDIALOG (English (U.S.)) +Resource202=IDD_SPELLEDIT (English (U.S.)) +Resource203=IDD_CREATUREITEMS (English (U.S.)) +Resource204=IDD_AREAANIM (English (U.S.)) +Resource205=IDD_GAMEEDIT (English (U.S.)) +Resource206=IDR_BAMMENU (English (U.S.)) +Resource207=IDD_AREAINT (English (U.S.)) +Resource208=IDD_AREAEDIT (English (U.S.)) +Resource209=IDR_SPELL (English (U.S.)) +Resource210=IDD_CHECK (English (U.S.)) +Resource211=IDR_SRC (English (U.S.)) +Resource212=IDR_TLKMENU (English (U.S.)) +Resource213=IDD_AREAGENERAL (English (U.S.)) +Resource214=IDD_ITEMEFFECT (English (U.S.)) Resource215=IDD_VVCEDIT (English (U.S.)) -Resource216=IDD_ITEMEQUIP (English (U.S.)) -Resource217=IDD_STOREDRINKS (English (U.S.)) -Resource218=IDD_CREATUREIWD (English (U.S.)) -Resource219=IDD_CHITEM_DIALOG (English (U.S.)) -Resource220=IDR_STORE (English (U.S.)) -Resource221=IDD_FINDITEM (English (U.S.)) -Resource222=IDD_ITEMEDIT (English (U.S.)) +Resource216=IDR_ITEM (English (U.S.)) +Resource217=IDD_AREASPAWN (English (U.S.)) +Resource218=IDD_CHUIEDIT (English (U.S.)) +Resource219=IDD_CREATUREGENERAL (English (U.S.)) +Resource220=IDD_SPELLEQUIP (English (U.S.)) +Resource221=IDR_EFFECT (English (U.S.)) +Resource222=IDR_AREA (English (U.S.)) Resource223=IDD_PROGRESS (English (U.S.)) -Resource224=IDD_SPELLDESC (English (U.S.)) -Resource225=IDD_VARIABLES (English (U.S.)) -Resource226=IDD_TEXTVIEW (English (U.S.)) -Resource227=IDD_WEIDU (English (U.S.)) -Resource228=IDR_MENUBAR (English (U.S.)) -Resource229=IDD_WEDTILE (English (U.S.)) -Resource230=IDD_AREAACTOR (English (U.S.)) -Resource231=IDD_ABOUTBOX (English (U.S.)) -Resource232=IDD_CREATUREOVR (English (U.S.)) -Resource233=IDD_WEDEDIT (English (U.S.)) -Resource234=IDR_IDS (English (U.S.)) -Resource235=IDD_ADDLINK (English (U.S.)) -Resource236=IDD_MAPLINK (English (U.S.)) -Resource237=IDR_MUSIC (English (U.S.)) -Resource238=IDD_CHECK (English (U.S.)) -Resource239=IDD_SRCEDIT (English (U.S.)) -Resource240=IDD_CREATUREEDIT (English (U.S.)) -Resource241=IDD_STOREGENERAL (English (U.S.)) -Resource242=IDD_GAMEEDIT (English (U.S.)) -Resource243=IDD_CHUIEDIT (English (U.S.)) +Resource224=IDD_SPELLEFFECT (English (U.S.)) +Resource225=IDD_ITEMPICKER (English (U.S.)) +Resource226=IDR_GAME (English (U.S.)) +Resource227=IDD_CREATURESTRINGS (English (U.S.)) +Resource228=IDD_ADDLINK (English (U.S.)) +Resource229=IDR_CREATURE (English (U.S.)) +Resource230=IDD_CREATUREICONS (English (U.S.)) +Resource231=IDD_DIALOGEDIT (English (U.S.)) +Resource232=IDD_MUSEDIT (English (U.S.)) +Resource233=IDD_STORERENTAL (English (U.S.)) +Resource234=IDD_FINDITEM (English (U.S.)) +Resource235=IDD_CREATUREPST (English (U.S.)) +Resource236=IDR_TREEMENU (English (U.S.)) +Resource237=IDD_ITEMEXTRA (English (U.S.)) +Resource238=IDD_STOREDRINKS (English (U.S.)) +Resource239=IDD_AREAENTRANCE (English (U.S.)) +Resource240=IDD_CHITEM_DIALOG (English (U.S.)) +Resource241=IDD_AREATRIGGERSTRINGS (English (U.S.)) +Resource242=IDD_SPELLDESC (English (U.S.)) +Resource243=IDD_ITEMEDIT (English (U.S.)) Resource244=IDR_TILE (English (U.S.)) -Resource245=IDR_WEDMENU (English (U.S.)) +Resource245=IDD_CREATURELEVELS (English (U.S.)) Class99=CAreaTriggerString Class100=CPCInfo -Resource246=IDD_MAPEDIT (English (U.S.)) +Resource246=IDD_IAPDIALOG (English (U.S.)) Class101=CCreatureOverlay -Resource247=IDD_STOREEXTRA (English (U.S.)) +Resource247=IDD_BAMEDIT (English (U.S.)) Class102=IWD2Creature -Resource248=IDD_MASSCLEAR (English (U.S.)) +Resource248=IDD_AREAACTOR (English (U.S.)) Class103=CAnimDialog -Resource249=IDD_SPELLEDIT (English (U.S.)) +Resource249=IDD_TEXTVIEW (English (U.S.)) Class104=CCreatureLevels -Resource250=IDR_SHORTCUT (English (U.S.)) +Resource250=IDR_CHUI (English (U.S.)) +Class105=CAreaProj +Resource251=IDD_MAPEDIT (English (U.S.)) +Class106=CProjGemRB +Resource252=IDD_PROJGEMRB (English (U.S.)) [CLS:CChitemApp] Type=0 @@ -379,7 +383,7 @@ Filter=D BaseClass=CDialog VirtualFilter=dWC -LastObject=ID_CHECK_WORLDMAP +LastObject=CChitemDlg [CLS:CAboutDlg] Type=0 @@ -716,7 +720,7 @@ HeaderFile=ItemProperties.h ImplementationFile=ItemProperties.cpp BaseClass=CPropertyPage -LastObject=CItemGeneral +LastObject=IDC_ITEMTYPE Filter=D VirtualFilter=idWC @@ -1095,7 +1099,7 @@ BaseClass=CDialog Filter=D VirtualFilter=dWC -LastObject=CVVCEdit +LastObject=IDC_FLAG1 [DLG:IDD_CFB] Type=1 @@ -2475,7 +2479,7 @@ ImplementationFile=ProjEdit.cpp BaseClass=CDialog Filter=D -LastObject=CProjEdit +LastObject=IDC_ATTR7 VirtualFilter=dWC [DLG:IDD_AREAENTRANCE] @@ -2600,7 +2604,7 @@ HeaderFile=AreaProperties.h ImplementationFile=AreaProperties.cpp BaseClass=CPropertyPage -LastObject=IDC_FACE +LastObject=CAreaEntrance Filter=D VirtualFilter=dWC @@ -3213,7 +3217,7 @@ ImplementationFile=AreaInt.cpp BaseClass=CDialog Filter=D -LastObject=CAreaInt +LastObject=IDC_NIGHTMOVIE VirtualFilter=dWC [DLG:IDD_AREACONTAINER] @@ -3709,7 +3713,7 @@ ImplementationFile=ProjEdit.cpp BaseClass=CDialog Filter=D -LastObject=IDC_ATTR +LastObject=IDC_ATTR12 VirtualFilter=dWC [DLG:IDD_GAMEEDIT] @@ -5200,7 +5204,7 @@ BaseClass=CDialog Filter=D VirtualFilter=dWC -LastObject=ID_FILE_TBG +LastObject=CChuiEdit [MNU:IDR_CHUI] Type=1 @@ -7827,7 +7831,7 @@ [DLG:IDD_AREAINT (English (U.S.))] Type=1 Class=CAreaInt -ControlCount=35 +ControlCount=41 Control1=IDC_SECTION,edit,1350631552 Control2=IDC_SPAWNNUMPICKER,combobox,1344339970 Control3=IDC_STRREF,edit,1350631552 @@ -7863,6 +7867,12 @@ Control33=IDC_STATIC,static,1342308352 Control34=IDC_STATIC,static,1342308352 Control35=IDC_STATIC,button,1342210055 +Control36=IDC_DAYMOVIE,edit,1350631552 +Control37=IDC_NIGHTMOVIE,edit,1350631552 +Control38=IDC_BROWSE2,button,1342242816 +Control39=IDC_BROWSE3,button,1342242816 +Control40=IDC_STATIC,static,1342308352 +Control41=IDC_STATIC,static,1342308352 [DLG:IDD_AREACONTAINER (English (U.S.))] Type=1 @@ -10220,3 +10230,59 @@ VirtualFilter=dWC LastObject=IDC_U1 +[DLG:IDD_AREAPROJ (English (U.S.))] +Type=1 +Class=CAreaProj +ControlCount=23 +Control1=IDC_PROJPICKER,combobox,1344339970 +Control2=IDC_POSX,edit,1350631552 +Control3=IDC_POSY,edit,1350631552 +Control4=IDC_BAM,edit,1350631560 +Control5=IDC_BROWSE,button,1342242816 +Control6=IDC_ADD,button,1342242816 +Control7=IDC_REMOVE,button,1342242816 +Control8=IDC_STATIC,static,1342308352 +Control9=IDC_STATIC,static,1342308352 +Control10=IDC_MAX,static,1342308352 +Control11=IDC_STATIC,static,1342308352 +Control12=IDC_UNKNOWN10,edit,1350631552 +Control13=IDC_PROJECTILE,edit,1350631552 +Control14=IDC_STATIC,static,1342308352 +Control15=IDC_STATIC,static,1342308352 +Control16=IDC_STATIC,static,1342308352 +Control17=IDC_UNKNOWN18,edit,1350631552 +Control18=IDC_STATIC,static,1342308352 +Control19=IDC_UNKNOWN1A,edit,1350631552 +Control20=IDC_STATIC,static,1342308352 +Control21=IDC_EQUIPNUM,listbox,1352732929 +Control22=IDC_REMOVE2,button,1342242816 +Control23=IDC_ADD2,button,1342242816 + +[CLS:CAreaProj] +Type=0 +HeaderFile=AreaProperties.h +ImplementationFile=AreaProperties.cpp +BaseClass=CPropertyPage +Filter=D +VirtualFilter=idWC +LastObject=IDC_PROJPICKER + +[DLG:IDD_PROJGEMRB (English (U.S.))] +Type=1 +Class=CProjGemRB +ControlCount=5 +Control1=IDOK,button,1342242816 +Control2=IDC_FLAGS,edit,1350631552 +Control3=IDC_STATIC,static,1342308352 +Control4=IDC_FLAG1,button,1342242819 +Control5=IDC_FLAG2,button,1342242819 + +[CLS:CProjGemRB] +Type=0 +HeaderFile=ProjGemRB.h +ImplementationFile=ProjGemRB.cpp +BaseClass=CDialog +Filter=D +LastObject=IDC_FLAG1 +VirtualFilter=dWC + Modified: chitem/trunk/chitem.rc =================================================================== --- chitem/trunk/chitem.rc 2009-06-01 19:17:51 UTC (rev 6246) +++ chitem/trunk/chitem.rc 2009-06-01 19:57:32 UTC (rev 6247) @@ -5320,6 +5320,8 @@ LTEXT "Additional flags",IDC_STATIC,9,7,48,8 CONTROL "Bounce",IDC_FLAG1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 9,44,41,10 + CONTROL "Continue",IDC_FLAG2,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,9,58,44,10 END Modified: chitem/trunk/resource.h =================================================================== --- chitem/trunk/resource.h 2009-06-01 19:17:51 UTC (rev 6246) +++ chitem/trunk/resource.h 2009-06-01 19:57:32 UTC (rev 6247) @@ -1861,7 +1861,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 233 #define _APS_NEXT_COMMAND_VALUE 33047 -#define _APS_NEXT_CONTROL_VALUE 2346 +#define _APS_NEXT_CONTROL_VALUE 2347 #define _APS_NEXT_SYMED_VALUE 120 #endif #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-06-12 20:18:56
|
Revision: 6410 http://gemrb.svn.sourceforge.net/gemrb/?rev=6410&view=rev Author: avenger_teambg Date: 2009-06-12 20:18:54 +0000 (Fri, 12 Jun 2009) Log Message: ----------- dltcep update Modified Paths: -------------- chitem/trunk/Chitem.cpp chitem/trunk/Chitem.h chitem/trunk/CreatureProperties.cpp chitem/trunk/CreatureProperties.h chitem/trunk/ProjEdit.cpp chitem/trunk/ProjEdit.h chitem/trunk/ProjGemRB.cpp chitem/trunk/ProjGemRB.h chitem/trunk/chitem.clw chitem/trunk/chitem.dsp chitem/trunk/chitem.rc chitem/trunk/chitemDlg.cpp chitem/trunk/resource.h chitem/trunk/seekers.cpp Modified: chitem/trunk/Chitem.cpp =================================================================== --- chitem/trunk/Chitem.cpp 2009-06-12 20:12:40 UTC (rev 6409) +++ chitem/trunk/Chitem.cpp 2009-06-12 20:18:54 UTC (rev 6410) @@ -2296,10 +2296,10 @@ CString convert_degree(int value) { CString tmpstr; - int degree; + //int degree; - degree=value*360/256; - tmpstr.Format("%d (%d degree)",value,degree); + //degree=value*360/256; + tmpstr.Format("%d degree",value); return tmpstr; } Modified: chitem/trunk/Chitem.h =================================================================== --- chitem/trunk/Chitem.h 2009-06-12 20:12:40 UTC (rev 6409) +++ chitem/trunk/Chitem.h 2009-06-12 20:18:54 UTC (rev 6410) @@ -520,13 +520,19 @@ #define PROJ_FRAGMENT 32 #define PROJ_NO_SELF 64 #define PROJ_NO_ENEMY 128 +#define PROJ_LEVEL 256 #define PROJ_HAS_VVC 1024 #define PROJ_CONE 2048 +#define PROJ_DELAYED 0x4000 +#define PROJ_AFFECT_ONE 0x8000 //extended flags for gemrb #define PROJ_BOUNCE 1 //bounce from walls #define PROJ_CONTINUE 2 //continue as travel projectile after triggered +#define PROJ_FREEZE 4 //freeze after trigger and slowly fade out +#define PROJ_NO_TRAVEL 8 //appear immediately on target +#define PROJ_TRAIL_FACE 16 ///trail bams also use face #define TRANSPARENT_GREEN 0x00ff00 Modified: chitem/trunk/CreatureProperties.cpp =================================================================== --- chitem/trunk/CreatureProperties.cpp 2009-06-12 20:12:40 UTC (rev 6409) +++ chitem/trunk/CreatureProperties.cpp 2009-06-12 20:18:54 UTC (rev 6410) @@ -65,6 +65,34 @@ return tmpstr; } +int CCreatureGeneral::FillKitCombo(CString idsname, CComboBox *cb, int len) +{ + CStringMapInt *idsfile; + int value; + POSITION pos; + CString tmpstr, format; + + cb->ResetContent(); + if(!idsmaps.Lookup(idsname, idsfile)) + { + return -1; //internal error + } + pos=idsfile->GetStartPosition(); + while(pos) + { + idsfile->GetNextAssoc(pos, idsname, value); + if(the_creature.revision!=22) + { + value = (value>>16)|(value<<16); + } + if(len<0) format.Format("%%0%dd %%s",-len); + else format.Format("0x%%0%dx %%s",len); + tmpstr.Format(format,(unsigned long) value,idsname); + cb->AddString(tmpstr); + } + return 0; +} + void CCreatureGeneral::DoDataExchange(CDataExchange* pDX) { CString tmpstr; @@ -312,6 +340,9 @@ cb=(CComboBox *) GetDlgItem(IDC_HATED); FillCombo("RACE",cb,2); + cb=(CComboBox *) GetDlgItem(IDC_KIT); + FillKitCombo("KIT",cb,8); + //tooltips { m_tooltip.Create(this,TTS_NOPREFIX); Modified: chitem/trunk/CreatureProperties.h =================================================================== --- chitem/trunk/CreatureProperties.h 2009-06-12 20:12:40 UTC (rev 6409) +++ chitem/trunk/CreatureProperties.h 2009-06-12 20:18:54 UTC (rev 6410) @@ -42,6 +42,7 @@ CToolTipCtrl m_tooltip; CString FindKit(unsigned int kit); + int FillKitCombo(CString idsname, CComboBox *cb, int len); // Generated message map functions //{{AFX_MSG(CCreatureGeneral) Modified: chitem/trunk/ProjEdit.cpp =================================================================== --- chitem/trunk/ProjEdit.cpp 2009-06-12 20:12:40 UTC (rev 6409) +++ chitem/trunk/ProjEdit.cpp 2009-06-12 20:18:54 UTC (rev 6410) @@ -298,6 +298,7 @@ ON_COMMAND(ID_FILE_LOADEXTERNALSCRIPT, OnLoadex) ON_COMMAND(ID_FILE_SAVEAS, OnSaveas) ON_COMMAND(ID_CHECK, OnCheck) + ON_BN_CLICKED(IDC_FLAG4, OnFlag4) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -574,13 +575,13 @@ the_projectile.header.sparks^=4; UpdateData(UD_DISPLAY); } -/* + void CProjEdit::OnFlag4() { the_projectile.header.sparks^=8; UpdateData(UD_DISPLAY); } -*/ + void CProjEdit::OnFlag5() { the_projectile.header.sparks^=16; @@ -1109,7 +1110,7 @@ CDialog::OnInitDialog(); cb1=(CComboBox *) GetDlgItem(IDC_CONESIZE); - for(i=0;i<256;i+=16) + for(i=0;i<360;i+=30) { tmpstr=convert_degree(i); cb1->AddString(tmpstr); @@ -1273,7 +1274,7 @@ void CProjExt::OnAttr9() { - the_projectile.extension.aoe^=256; + the_projectile.extension.aoe^=PROJ_LEVEL; UpdateData(UD_DISPLAY); } @@ -1309,13 +1310,13 @@ void CProjExt::OnAttr15() { - the_projectile.extension.aoe^=0x4000; + the_projectile.extension.aoe^=PROJ_DELAYED; UpdateData(UD_DISPLAY); } void CProjExt::OnAttr16() { - the_projectile.extension.aoe^=0x8000; + the_projectile.extension.aoe^=PROJ_AFFECT_ONE; UpdateData(UD_DISPLAY); } Modified: chitem/trunk/ProjEdit.h =================================================================== --- chitem/trunk/ProjEdit.h 2009-06-12 20:12:40 UTC (rev 6409) +++ chitem/trunk/ProjEdit.h 2009-06-12 20:18:54 UTC (rev 6410) @@ -112,6 +112,7 @@ afx_msg void OnBrowse8(); afx_msg void OnBrowse9(); virtual void OnCancel(); + afx_msg void OnFlag4(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: chitem/trunk/ProjGemRB.cpp =================================================================== --- chitem/trunk/ProjGemRB.cpp 2009-06-12 20:12:40 UTC (rev 6409) +++ chitem/trunk/ProjGemRB.cpp 2009-06-12 20:18:54 UTC (rev 6410) @@ -56,6 +56,8 @@ //{{AFX_MSG_MAP(CProjGemRB) ON_BN_CLICKED(IDC_FLAG1, OnFlag1) ON_BN_CLICKED(IDC_FLAG2, OnFlag2) + ON_BN_CLICKED(IDC_FLAG3, OnFlag3) + ON_BN_CLICKED(IDC_FLAG4, OnFlag4) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -74,3 +76,15 @@ the_projectile.header.extflags^=PROJ_CONTINUE; UpdateData(UD_DISPLAY); } + +void CProjGemRB::OnFlag3() +{ + the_projectile.header.extflags^=PROJ_FREEZE; + UpdateData(UD_DISPLAY); +} + +void CProjGemRB::OnFlag4() +{ + the_projectile.header.extflags^=PROJ_NO_TRAVEL; + UpdateData(UD_DISPLAY); +} Modified: chitem/trunk/ProjGemRB.h =================================================================== --- chitem/trunk/ProjGemRB.h 2009-06-12 20:12:40 UTC (rev 6409) +++ chitem/trunk/ProjGemRB.h 2009-06-12 20:18:54 UTC (rev 6410) @@ -37,6 +37,8 @@ //{{AFX_MSG(CProjGemRB) afx_msg void OnFlag1(); afx_msg void OnFlag2(); + afx_msg void OnFlag3(); + afx_msg void OnFlag4(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: chitem/trunk/chitem.clw =================================================================== --- chitem/trunk/chitem.clw 2009-06-12 20:12:40 UTC (rev 6409) +++ chitem/trunk/chitem.clw 2009-06-12 20:18:54 UTC (rev 6410) @@ -232,142 +232,142 @@ Resource123=IDD_GAMEGENERAL Class98=IcewindCre Resource124=IDR_SHORTCUT -Resource125=IDD_ANIMDIALOG -Resource126=IDD_AREASONGS (English (U.S.)) -Resource127=IDD_GAMESTATS (English (U.S.)) -Resource128=IDD_COMPAT (English (U.S.)) -Resource129=IDD_AREAMAP (English (U.S.)) -Resource130=IDD_CREATUREEDIT (English (U.S.)) -Resource131=IDD_CREATURERES (English (U.S.)) -Resource132=IDD_SEARCHNODE (English (U.S.)) -Resource133=IDD_GAMEGENERAL (English (U.S.)) -Resource134=IDD_WEDEDIT (English (U.S.)) -Resource135=IDD_GAMEPCINFO (English (U.S.)) -Resource136=IDD_ITEMEQUIP (English (U.S.)) -Resource137=IDD_PROJEXT (English (U.S.)) -Resource138=IDR_SHORTCUT (English (U.S.)) -Resource139=IDD_SHOWLOG (English (U.S.)) -Resource140=IDD_EFFEDIT (English (U.S.)) -Resource141=IDD_SCRIPTEDIT (English (U.S.)) -Resource142=IDR_VVC (English (U.S.)) -Resource143=IDD_WEDPOLY (English (U.S.)) -Resource144=IDD_PROJEDIT (English (U.S.)) -Resource145=IDD_CREATUREIWD2 (English (U.S.)) -Resource146=IDD_ITEMDESC (English (U.S.)) -Resource147=IDD_AREAVARIABLE (English (U.S.)) -Resource148=IDD_AREAAMBIENT (English (U.S.)) -Resource149=IDD_STOREEXTRA (English (U.S.)) -Resource150=IDD_SPELLTOOL (English (U.S.)) -Resource151=IDD_STRREFDLG (English (U.S.)) -Resource152=IDD_KEYEDIT (English (U.S.)) -Resource153=IDD_STOREITEMS (English (U.S.)) -Resource154=IDD_STOREEDIT (English (U.S.)) -Resource155=IDD_EDIT (English (U.S.)) -Resource156=IDD_CREATUREOVR (English (U.S.)) -Resource157=IDD_COLORPICKER (English (U.S.)) -Resource158=IDD_EXTRACT (English (U.S.)) -Resource159=IDD_EXTRACT2 (English (U.S.)) -Resource160=IDD_MAPLINK (English (U.S.)) -Resource161=IDR_WEDMENU (English (U.S.)) -Resource162=IDD_WEDTILE (English (U.S.)) -Resource163=IDR_PROJECT (English (U.S.)) -Resource164=IDD_2DAEDIT (English (U.S.)) -Resource165=IDR_WORLDMAP (English (U.S.)) -Resource166=IDD_STOREGENERAL (English (U.S.)) -Resource167=IDD_AREACONTAINER (English (U.S.)) -Resource168=IDD_CREATUREIWD (English (U.S.)) -Resource169=IDD_ITEMICONS (English (U.S.)) -Resource170=IDR_2DA (English (U.S.)) -Resource171=IDD_CREATURESKILLS (English (U.S.)) -Resource172=IDD_SAVHANDLE (English (U.S.)) -Resource173=IDD_PALETTE (English (U.S.)) -Resource174=IDD_ABOUTBOX (English (U.S.)) -Resource175=IDD_IDSEDIT (English (U.S.)) -Resource176=IDD_MASSCLEAR (English (U.S.)) -Resource177=IDD_CREATUREUNKNOWN (English (U.S.)) -Resource178=IDD_WEIDU (English (U.S.)) -Resource179=IDD_VARIABLES (English (U.S.)) -Resource180=IDD_ITEMUSE (English (U.S.)) -Resource181=IDR_MENUBAR (English (U.S.)) -Resource182=IDD_CREATUREEFF (English (U.S.)) -Resource183=IDR_SCRIPT (English (U.S.)) -Resource184=IDR_MUSIC (English (U.S.)) -Resource185=IDD_AREAPROJ (English (U.S.)) -Resource186=IDD_MOSEDIT (English (U.S.)) -Resource187=IDR_IDS (English (U.S.)) -Resource188=IDD_SPELLGENERAL (English (U.S.)) -Resource189=IDR_CHITIN (English (U.S.)) -Resource190=IDD_AREATRIGGER (English (U.S.)) -Resource191=IDD_PANICBUTTON (English (U.S.)) -Resource192=IDD_AREADOOR (English (U.S.)) -Resource193=IDD_ITEMGENERAL (English (U.S.)) -Resource194=IDD_SCHEDULE (English (U.S.)) -Resource195=IDD_SPELLEXTRA (English (U.S.)) -Resource196=IDD_SRCEDIT (English (U.S.)) -Resource197=IDD_IMAGEVIEW (English (U.S.)) -Resource198=IDR_STORE (English (U.S.)) -Resource199=IDD_POLYGON (English (U.S.)) -Resource200=IDD_CFB (English (U.S.)) -Resource201=IDD_TISDIALOG (English (U.S.)) -Resource202=IDD_SPELLEDIT (English (U.S.)) -Resource203=IDD_CREATUREITEMS (English (U.S.)) -Resource204=IDD_AREAANIM (English (U.S.)) -Resource205=IDD_GAMEEDIT (English (U.S.)) -Resource206=IDR_BAMMENU (English (U.S.)) -Resource207=IDD_AREAINT (English (U.S.)) -Resource208=IDD_AREAEDIT (English (U.S.)) -Resource209=IDR_SPELL (English (U.S.)) -Resource210=IDD_CHECK (English (U.S.)) -Resource211=IDR_SRC (English (U.S.)) -Resource212=IDR_TLKMENU (English (U.S.)) -Resource213=IDD_AREAGENERAL (English (U.S.)) -Resource214=IDD_ITEMEFFECT (English (U.S.)) -Resource215=IDD_VVCEDIT (English (U.S.)) -Resource216=IDR_ITEM (English (U.S.)) -Resource217=IDD_AREASPAWN (English (U.S.)) -Resource218=IDD_CHUIEDIT (English (U.S.)) -Resource219=IDD_CREATUREGENERAL (English (U.S.)) -Resource220=IDD_SPELLEQUIP (English (U.S.)) -Resource221=IDR_EFFECT (English (U.S.)) -Resource222=IDR_AREA (English (U.S.)) -Resource223=IDD_PROGRESS (English (U.S.)) -Resource224=IDD_SPELLEFFECT (English (U.S.)) -Resource225=IDD_ITEMPICKER (English (U.S.)) -Resource226=IDR_GAME (English (U.S.)) -Resource227=IDD_CREATURESTRINGS (English (U.S.)) -Resource228=IDD_ADDLINK (English (U.S.)) -Resource229=IDR_CREATURE (English (U.S.)) -Resource230=IDD_CREATUREICONS (English (U.S.)) -Resource231=IDD_DIALOGEDIT (English (U.S.)) -Resource232=IDD_MUSEDIT (English (U.S.)) -Resource233=IDD_STORERENTAL (English (U.S.)) -Resource234=IDD_FINDITEM (English (U.S.)) -Resource235=IDD_CREATUREPST (English (U.S.)) -Resource236=IDR_TREEMENU (English (U.S.)) -Resource237=IDD_ITEMEXTRA (English (U.S.)) -Resource238=IDD_STOREDRINKS (English (U.S.)) -Resource239=IDD_AREAENTRANCE (English (U.S.)) -Resource240=IDD_CHITEM_DIALOG (English (U.S.)) -Resource241=IDD_AREATRIGGERSTRINGS (English (U.S.)) -Resource242=IDD_SPELLDESC (English (U.S.)) -Resource243=IDD_ITEMEDIT (English (U.S.)) -Resource244=IDR_TILE (English (U.S.)) -Resource245=IDD_CREATURELEVELS (English (U.S.)) +Resource125=IDD_MAPEDIT (English (U.S.)) +Resource126=IDD_ITEMEFFECT (English (U.S.)) +Resource127=IDD_AREAINT (English (U.S.)) +Resource128=IDR_EFFECT (English (U.S.)) +Resource129=IDD_CREATURERES (English (U.S.)) +Resource130=IDD_CHECK (English (U.S.)) +Resource131=IDD_ITEMGENERAL (English (U.S.)) +Resource132=IDR_TILE (English (U.S.)) +Resource133=IDD_AREACONTAINER (English (U.S.)) +Resource134=IDD_WEDPOLY (English (U.S.)) +Resource135=IDD_AREADOOR (English (U.S.)) +Resource136=IDD_AREATRIGGERSTRINGS (English (U.S.)) +Resource137=IDD_VARIABLES (English (U.S.)) +Resource138=IDD_CHUIEDIT (English (U.S.)) +Resource139=IDD_SPELLEFFECT (English (U.S.)) +Resource140=IDR_ITEM (English (U.S.)) +Resource141=IDD_SPELLDESC (English (U.S.)) +Resource142=IDD_CREATURELEVELS (English (U.S.)) +Resource143=IDD_PROJEDIT (English (U.S.)) +Resource144=IDD_STOREEXTRA (English (U.S.)) +Resource145=IDD_SEARCHNODE (English (U.S.)) +Resource146=IDR_SCRIPT (English (U.S.)) +Resource147=IDD_STOREEDIT (English (U.S.)) +Resource148=IDD_ITEMPICKER (English (U.S.)) +Resource149=IDR_CREATURE (English (U.S.)) +Resource150=IDD_CREATUREGENERAL (English (U.S.)) +Resource151=IDD_SPELLEDIT (English (U.S.)) +Resource152=IDD_AREASPAWN (English (U.S.)) +Resource153=IDR_TREEMENU (English (U.S.)) +Resource154=IDR_MENUBAR (English (U.S.)) +Resource155=IDD_ITEMDESC (English (U.S.)) +Resource156=IDD_ADDLINK (English (U.S.)) +Resource157=IDD_SPELLEQUIP (English (U.S.)) +Resource158=IDD_SCHEDULE (English (U.S.)) +Resource159=IDR_CHUI (English (U.S.)) +Resource160=IDD_ITEMEXTRA (English (U.S.)) +Resource161=IDD_WEDTILE (English (U.S.)) +Resource162=IDD_CREATUREEDIT (English (U.S.)) +Resource163=IDD_MUSEDIT (English (U.S.)) +Resource164=IDD_PALETTE (English (U.S.)) +Resource165=IDD_SCRIPTEDIT (English (U.S.)) +Resource166=IDR_BAMMENU (English (U.S.)) +Resource167=IDD_VVCEDIT (English (U.S.)) +Resource168=IDD_AREAVARIABLE (English (U.S.)) +Resource169=IDD_CREATUREIWD (English (U.S.)) +Resource170=IDD_CREATUREEFF (English (U.S.)) +Resource171=IDD_ITEMEDIT (English (U.S.)) +Resource172=IDD_EXTRACT2 (English (U.S.)) +Resource173=IDD_STOREDRINKS (English (U.S.)) +Resource174=IDR_GAME (English (U.S.)) +Resource175=IDD_SPELLGENERAL (English (U.S.)) +Resource176=IDD_AREAENTRANCE (English (U.S.)) +Resource177=IDD_ITEMEQUIP (English (U.S.)) +Resource178=IDD_SRCEDIT (English (U.S.)) +Resource179=IDR_SPELL (English (U.S.)) +Resource180=IDR_VVC (English (U.S.)) +Resource181=IDD_STOREGENERAL (English (U.S.)) +Resource182=IDD_AREAACTOR (English (U.S.)) +Resource183=IDD_SAVHANDLE (English (U.S.)) +Resource184=IDD_PANICBUTTON (English (U.S.)) +Resource185=IDD_GAMEEDIT (English (U.S.)) +Resource186=IDD_BAMEDIT (English (U.S.)) +Resource187=IDD_WEDEDIT (English (U.S.)) +Resource188=IDR_TLKMENU (English (U.S.)) +Resource189=IDD_SPELLTOOL (English (U.S.)) +Resource190=IDD_ABOUTBOX (English (U.S.)) +Resource191=IDD_AREAGENERAL (English (U.S.)) +Resource192=IDD_CFB (English (U.S.)) +Resource193=IDD_GAMEPCINFO (English (U.S.)) +Resource194=IDD_ANIMDIALOG +Resource195=IDR_2DA (English (U.S.)) +Resource196=IDD_CREATURESKILLS (English (U.S.)) +Resource197=IDD_AREAMAP (English (U.S.)) +Resource198=IDD_EDIT (English (U.S.)) +Resource199=IDD_CREATUREUNKNOWN (English (U.S.)) +Resource200=IDD_PROJGEMRB (English (U.S.)) +Resource201=IDD_AREATRIGGER (English (U.S.)) +Resource202=IDD_STOREITEMS (English (U.S.)) +Resource203=IDD_WEIDU (English (U.S.)) +Resource204=IDD_SPELLEXTRA (English (U.S.)) +Resource205=IDD_STORERENTAL (English (U.S.)) +Resource206=IDD_CREATUREITEMS (English (U.S.)) +Resource207=IDD_EXTRACT (English (U.S.)) +Resource208=IDR_WEDMENU (English (U.S.)) +Resource209=IDD_IDSEDIT (English (U.S.)) +Resource210=IDD_TEXTVIEW (English (U.S.)) +Resource211=IDD_KEYEDIT (English (U.S.)) +Resource212=IDD_STRREFDLG (English (U.S.)) +Resource213=IDR_SRC (English (U.S.)) +Resource214=IDD_CREATUREIWD2 (English (U.S.)) +Resource215=IDD_AREAPROJ (English (U.S.)) +Resource216=IDD_2DAEDIT (English (U.S.)) +Resource217=IDD_CHITEM_DIALOG (English (U.S.)) +Resource218=IDD_COMPAT (English (U.S.)) +Resource219=IDD_PROGRESS (English (U.S.)) +Resource220=IDD_GAMESTATS (English (U.S.)) +Resource221=IDD_IAPDIALOG (English (U.S.)) +Resource222=IDD_COLORPICKER (English (U.S.)) +Resource223=IDD_CREATUREPST (English (U.S.)) +Resource224=IDR_MUSIC (English (U.S.)) +Resource225=IDD_CREATUREOVR (English (U.S.)) +Resource226=IDD_SHOWLOG (English (U.S.)) +Resource227=IDD_ITEMICONS (English (U.S.)) +Resource228=IDD_EFFEDIT (English (U.S.)) +Resource229=IDR_WORLDMAP (English (U.S.)) +Resource230=IDD_FINDITEM (English (U.S.)) +Resource231=IDD_MAPLINK (English (U.S.)) +Resource232=IDD_AREAEDIT (English (U.S.)) +Resource233=IDR_STORE (English (U.S.)) +Resource234=IDR_PROJECT (English (U.S.)) +Resource235=IDD_AREAAMBIENT (English (U.S.)) +Resource236=IDD_MOSEDIT (English (U.S.)) +Resource237=IDR_AREA (English (U.S.)) +Resource238=IDD_CREATURESTRINGS (English (U.S.)) +Resource239=IDD_IMAGEVIEW (English (U.S.)) +Resource240=IDD_POLYGON (English (U.S.)) +Resource241=IDD_DIALOGEDIT (English (U.S.)) +Resource242=IDR_IDS (English (U.S.)) +Resource243=IDD_GAMEGENERAL (English (U.S.)) +Resource244=IDD_MASSCLEAR (English (U.S.)) +Resource245=IDD_PROJEXT (English (U.S.)) Class99=CAreaTriggerString Class100=CPCInfo -Resource246=IDD_IAPDIALOG (English (U.S.)) +Resource246=IDD_ITEMUSE (English (U.S.)) Class101=CCreatureOverlay -Resource247=IDD_BAMEDIT (English (U.S.)) +Resource247=IDD_AREAANIM (English (U.S.)) Class102=IWD2Creature -Resource248=IDD_AREAACTOR (English (U.S.)) +Resource248=IDR_CHITIN (English (U.S.)) Class103=CAnimDialog -Resource249=IDD_TEXTVIEW (English (U.S.)) +Resource249=IDD_AREASONGS (English (U.S.)) Class104=CCreatureLevels -Resource250=IDR_CHUI (English (U.S.)) +Resource250=IDD_TISDIALOG (English (U.S.)) Class105=CAreaProj -Resource251=IDD_MAPEDIT (English (U.S.)) +Resource251=IDD_CREATUREICONS (English (U.S.)) Class106=CProjGemRB -Resource252=IDD_PROJGEMRB (English (U.S.)) +Resource252=IDR_SHORTCUT (English (U.S.)) [CLS:CChitemApp] Type=0 @@ -383,7 +383,7 @@ Filter=D BaseClass=CDialog VirtualFilter=dWC -LastObject=CChitemDlg +LastObject=ID_SEARCH_PROJECTILE [CLS:CAboutDlg] Type=0 @@ -2479,7 +2479,7 @@ ImplementationFile=ProjEdit.cpp BaseClass=CDialog Filter=D -LastObject=IDC_ATTR7 +LastObject=IDC_FLAG4 VirtualFilter=dWC [DLG:IDD_AREAENTRANCE] @@ -7181,7 +7181,7 @@ [DLG:IDD_PROJEDIT (English (U.S.))] Type=1 Class=CProjEdit -ControlCount=110 +ControlCount=111 Control1=IDC_TYPE,combobox,1344339970 Control2=IDC_SPEED,edit,1350631552 Control3=IDC_SOUND1,edit,1350631560 @@ -7292,6 +7292,7 @@ Control108=IDC_BROWSE7,button,1342242816 Control109=IDC_BROWSE8,button,1342242816 Control110=IDC_BROWSE13,button,1342242816 +Control111=IDC_FLAG4,button,1342242819 [DLG:IDD_AREAENTRANCE (English (U.S.))] Type=1 @@ -7531,7 +7532,7 @@ Control64=IDC_STATIC,static,1342308352 Control65=IDC_NEW1,button,1342242816 Control66=IDC_NEW2,button,1342242816 -Control67=IDC_KIT,combobox,1344340034 +Control67=IDC_KIT,combobox,1344340290 Control68=IDC_LEVELSLOT,button,1342242816 [DLG:IDD_CREATUREICONS (English (U.S.))] @@ -10270,12 +10271,14 @@ [DLG:IDD_PROJGEMRB (English (U.S.))] Type=1 Class=CProjGemRB -ControlCount=5 +ControlCount=7 Control1=IDOK,button,1342242816 Control2=IDC_FLAGS,edit,1350631552 Control3=IDC_STATIC,static,1342308352 Control4=IDC_FLAG1,button,1342242819 Control5=IDC_FLAG2,button,1342242819 +Control6=IDC_FLAG3,button,1342242819 +Control7=IDC_FLAG4,button,1342242819 [CLS:CProjGemRB] Type=0 @@ -10283,6 +10286,6 @@ ImplementationFile=ProjGemRB.cpp BaseClass=CDialog Filter=D -LastObject=IDC_FLAG1 +LastObject=IDC_FLAG4 VirtualFilter=dWC Modified: chitem/trunk/chitem.dsp =================================================================== --- chitem/trunk/chitem.dsp 2009-06-12 20:12:40 UTC (rev 6409) +++ chitem/trunk/chitem.dsp 2009-06-12 20:18:54 UTC (rev 6410) @@ -361,6 +361,10 @@ # End Source File # Begin Source File +SOURCE=.\ProjGemRB.cpp +# End Source File +# Begin Source File + SOURCE=.\readers.cpp # End Source File # Begin Source File @@ -786,6 +790,10 @@ # End Source File # Begin Source File +SOURCE=.\ProjGemRB.h +# End Source File +# Begin Source File + SOURCE=.\readers.h # End Source File # Begin Source File Modified: chitem/trunk/chitem.rc =================================================================== --- chitem/trunk/chitem.rc 2009-06-12 20:12:40 UTC (rev 6409) +++ chitem/trunk/chitem.rc 2009-06-12 20:18:54 UTC (rev 6410) @@ -2249,6 +2249,8 @@ PUSHBUTTON "Browse",IDC_BROWSE7,335,138,28,14 PUSHBUTTON "Browse",IDC_BROWSE8,335,157,28,14 PUSHBUTTON "Browse",IDC_BROWSE13,335,176,28,14 + CONTROL "Looping",IDC_FLAG4,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,88,65,41,10 END IDD_AREAENTRANCE DIALOG DISCARDABLE 0, 0, 480, 198 @@ -2547,7 +2549,7 @@ PUSHBUTTON "New string",IDC_NEW1,53,6,51,11 PUSHBUTTON "New string",IDC_NEW2,254,6,51,11 COMBOBOX IDC_KIT,300,113,93,79,CBS_DROPDOWN | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP + CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "IWD2 levels",IDC_LEVELSLOT,7,69,88,27 END @@ -3421,7 +3423,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTROLPARENT CAPTION "Area extension header" -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Sans Serif" BEGIN EDITTEXT IDC_DURATION,142,72,55,14,ES_AUTOHSCROLL PUSHBUTTON "Back",IDOK,352,170,50,14 @@ -3441,8 +3443,8 @@ WS_TABSTOP,13,94,79,10 CONTROL "Party only (with only enemies)",IDC_ATTR8,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,104,108,10 - CONTROL "9",IDC_ATTR9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13, - 114,20,10 + CONTROL "Caster level * explosions",IDC_ATTR9,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,114,92,10 CONTROL "Multiple set off",IDC_ATTR10,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,124,61,10 CONTROL "Use VVC",IDC_ATTR11,"Button",BS_AUTOCHECKBOX | @@ -5316,12 +5318,16 @@ FONT 8, "MS Sans Serif" BEGIN PUSHBUTTON "Back",IDOK,170,143,50,14 - EDITTEXT IDC_FLAGS,9,21,48,14,ES_AUTOHSCROLL + EDITTEXT IDC_FLAGS,9,20,48,14,ES_AUTOHSCROLL LTEXT "Additional flags",IDC_STATIC,9,7,48,8 CONTROL "Bounce",IDC_FLAG1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 9,44,41,10 + 9,39,41,10 CONTROL "Continue",IDC_FLAG2,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,9,58,44,10 + WS_TABSTOP,9,54,44,10 + CONTROL "Freeze on hit",IDC_FLAG3,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,9,69,57,10 + CONTROL "No travel path",IDC_FLAG4,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,9,84,61,10 END Modified: chitem/trunk/chitemDlg.cpp =================================================================== --- chitem/trunk/chitemDlg.cpp 2009-06-12 20:12:40 UTC (rev 6409) +++ chitem/trunk/chitemDlg.cpp 2009-06-12 20:18:54 UTC (rev 6410) @@ -2960,11 +2960,11 @@ CFindItem dlg; int ret; - dlg.mask=0x40; + dlg.mask=0x4c; dlg.flags=searchflags; dlg.searchdata=searchdata; dlg.title="Find projectiles"; - dlg.mtype_title=""; + dlg.mtype_title="Find AOE flag"; ret=dlg.DoModal(); if(ret==IDOK) { Modified: chitem/trunk/resource.h =================================================================== --- chitem/trunk/resource.h 2009-06-12 20:12:40 UTC (rev 6409) +++ chitem/trunk/resource.h 2009-06-12 20:18:54 UTC (rev 6410) @@ -1861,7 +1861,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 233 #define _APS_NEXT_COMMAND_VALUE 33047 -#define _APS_NEXT_CONTROL_VALUE 2347 +#define _APS_NEXT_CONTROL_VALUE 2348 #define _APS_NEXT_SYMED_VALUE 120 #endif #endif Modified: chitem/trunk/seekers.cpp =================================================================== --- chitem/trunk/seekers.cpp 2009-06-12 20:12:40 UTC (rev 6409) +++ chitem/trunk/seekers.cpp 2009-06-12 20:18:54 UTC (rev 6410) @@ -3081,12 +3081,61 @@ } } } - if(!found) return false; + if(!found) + { + memcpy(tmpdata.resource,the_projectile.header.wavc1,8); + if(searchdata.resource[0]) + { + if(!strnicmp(tmpdata.resource,searchdata.resource,8) ) + { + found=3; + } + } + } + if(!found) + { + memcpy(tmpdata.resource,the_projectile.header.wavc2,8); + if(searchdata.resource[0]) + { + if(!strnicmp(tmpdata.resource,searchdata.resource,8) ) + { + found=4; + } + } + } } + else found=1; + + if(found) + { + if(searchflags&MT) + { + if(searchdata.itemtype&the_projectile.extension.aoe) + { + tmpdata.itemtype=(short) (searchdata.itemtype&the_projectile.extension.aoe); + } + else found=0; + } + } + + if(!found) return false; + if(searchflags&MR) { - if(tmpdata.resource[0]) log("Found resource '%-.8s' in bam%d",tmpdata.resource, found); + if(found>2) + { + if(tmpdata.resource[0]) log("Found resource '%-.8s' in sound%d",tmpdata.resource, found-2); + } + else + { + if(tmpdata.resource[0]) log("Found resource '%-.8s' in bam%d",tmpdata.resource, found); + } } + + if(searchflags&MT) + { + log("Found AOE flag: %0x", tmpdata.itemtype); + } return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-06-14 08:47:35
|
Revision: 6422 http://gemrb.svn.sourceforge.net/gemrb/?rev=6422&view=rev Author: avenger_teambg Date: 2009-06-14 08:47:31 +0000 (Sun, 14 Jun 2009) Log Message: ----------- dltcep 7.1c source Modified Paths: -------------- chitem/trunk/2da.cpp chitem/trunk/Chitem.cpp chitem/trunk/Chitem.h chitem/trunk/Structs.h chitem/trunk/chitem.clw chitem/trunk/chitem.rc chitem/trunk/chitemDlg.cpp chitem/trunk/chitemDlg.h chitem/trunk/resource.h chitem/trunk/seekers.cpp chitem/trunk/tbg.cpp Added Paths: ----------- chitem/trunk/ini.cpp chitem/trunk/ini.h Modified: chitem/trunk/2da.cpp =================================================================== --- chitem/trunk/2da.cpp 2009-06-14 08:41:28 UTC (rev 6421) +++ chitem/trunk/2da.cpp 2009-06-14 08:47:31 UTC (rev 6422) @@ -83,6 +83,13 @@ return 0; } +void SetupReader(int max) +{ + xorflag=0; + position=0; + maxlength=max; +} + int read_string(FILE *fpoi, char *pattern, char *tmpbuff=NULL, int length=0) { int i,j,k; Modified: chitem/trunk/Chitem.cpp =================================================================== --- chitem/trunk/Chitem.cpp 2009-06-14 08:41:28 UTC (rev 6421) +++ chitem/trunk/Chitem.cpp 2009-06-14 08:47:31 UTC (rev 6422) @@ -165,6 +165,7 @@ Cmus the_mus; Cchui the_chui; Csrc the_src; +Cini the_ini; long creature_strrefs[SND_SLOT_COUNT]; //2da, ids @@ -193,6 +194,7 @@ CIntMapString listinnates; //iwd2 innate list (number to resref mapping) CIntMapString listsongs; //iwd2 song list (number to resref mapping) CIntMapString listshapes; //iwd2 wildshape list (number to resref mapping) +CStringMapInt ini_entry; //acceptable spawn ini entries CColorPicker colordlg; CItemPicker pickerdlg; @@ -6061,6 +6063,89 @@ return tmpstr; } +void init_spawn_entries() +{ + ini_entry.RemoveAll(); + if(!has_xpvar() && !pst_compatible_var()) return; + + ini_entry["critters"]=INI_SPAWN; + ini_entry["interval"]=INI_SPAWN; + + //ini_entry["ai_alignment"]=INI_CREATURE; + ini_entry["ai_ea"]=INI_CREATURE; + ini_entry["ai_class"]=INI_CREATURE; + ini_entry["ai_faction"]=INI_CREATURE; + ini_entry["ai_gender"]=INI_CREATURE; + ini_entry["ai_general"]=INI_CREATURE; + ini_entry["ai_race"]=INI_CREATURE; + ini_entry["ai_specifics"]=INI_CREATURE; + ini_entry["ai_team"]=INI_CREATURE; + //ini_entry["auto_buddy"]=INI_CREATURE; + //ini_entry["control_var"]=INI_CREATURE; + //ini_entry["check_by_view_port"]=INI_CREATURE; //this seems to be unused by scripts, but exists in exe + //ini_entry["do_not_spawn"]=INI_CREATURE; + ini_entry["check_crowd"]=INI_CREATURE; + ini_entry["create_qty"]=INI_CREATURE; + ini_entry["cre_file"]=INI_CREATURE; + //ini_entry["death_faction"]=INI_CREATURE; + ini_entry["death_scriptname"]=INI_CREATURE; + //ini_entry["death_team"]=INI_CREATURE; + ini_entry["detail_level"]=INI_CREATURE; + ini_entry["dialog"]=INI_CREATURE; + ini_entry["facing"]=INI_CREATURE; + ini_entry["find_safest_point"]=INI_CREATURE; + //ini_entry["good_mod"]=INI_CREATURE; + //ini_entry["hold_selected_point_key"]=INI_CREATURE; + ini_entry["ignore_can_see"]=INI_CREATURE; + //ini_entry["inc_spawn_point_index"]=INI_CREATURE; + //ini_entry["lady_mod"]=INI_CREATURE; + //ini_entry["law_mod"]=INI_CREATURE; + //ini_entry["murder_mod"]=INI_CREATURE; + ini_entry["point_select"]=INI_CREATURE; + //ini_entry["point_select_var"]=INI_CREATURE; + ini_entry["save_selected_point"]=INI_CREATURE; + ini_entry["save_selected_facing"]=INI_CREATURE; + ini_entry["script_name"]=INI_CREATURE; + ini_entry["script_override"]=INI_CREATURE; + if(iwd2_structures()) + { + ini_entry["script_special_1"]=INI_CREATURE; + ini_entry["script_special_2"]=INI_CREATURE; + ini_entry["script_movement"]=INI_CREATURE; + ini_entry["script_special_3"]=INI_CREATURE; + ini_entry["script_combat"]=INI_CREATURE; + ini_entry["script_team"]=INI_CREATURE; + + ini_entry["area_diff_1"]=INI_CREATURE; + ini_entry["area_diff_2"]=INI_CREATURE; + ini_entry["area_diff_3"]=INI_CREATURE; + ini_entry["spec_var_inc"]=INI_CREATURE; + ini_entry["spec_var_operation"]=INI_CREATURE; + ini_entry["spec_var_value"]=INI_CREATURE; + } + else + { + ini_entry["script_area"]=INI_CREATURE; + ini_entry["script_class"]=INI_CREATURE; + ini_entry["script_default"]=INI_CREATURE; + ini_entry["script_general"]=INI_CREATURE; + ini_entry["script_race"]=INI_CREATURE; + ini_entry["script_specifics"]=INI_CREATURE; + } + ini_entry["spawn_facing_global"]=INI_CREATURE; + ini_entry["spawn_point"]=INI_CREATURE; + ini_entry["spawn_point_global"]=INI_CREATURE; + //ini_entry["spawn_time_of_day"]=INI_CREATURE; + ini_entry["spec"]=INI_CREATURE; + //ini_entry["spec_area"]=INI_CREATURE; + ini_entry["spec_var"]=INI_CREATURE; + ini_entry["spec_qty"]=INI_CREATURE; + //ini_entry["time_of_day"]=INI_CREATURE; + + //screwed up, this is what in the exe + //ini_entry["check_view_port"]=INI_CREATURE; +} + CString convert_musiclist(CString tmpstr, bool onlyinternal) { CString prefix; @@ -6980,7 +7065,7 @@ CStringMapCStringMapInt::~CStringMapCStringMapInt() { CString key; - CStringMapInt *value; + CStringMapInt *value = NULL; POSITION pos; pos=GetStartPosition(); Modified: chitem/trunk/Chitem.h =================================================================== --- chitem/trunk/Chitem.h 2009-06-14 08:41:28 UTC (rev 6421) +++ chitem/trunk/Chitem.h 2009-06-14 08:47:31 UTC (rev 6422) @@ -31,6 +31,7 @@ #include "mos.h" #include "chui.h" #include "src.h" +#include "ini.h" #include "ItemPicker.h" #include "ColorPicker.h" @@ -578,6 +579,7 @@ extern void init_colors(); extern CString colortitle(unsigned int value); +extern void init_spawn_entries(); extern int feature_resource(int feature); extern int *get_strref_opcodes(); CString convert_musiclist(CString tmpstr, bool onlyinternal); @@ -604,6 +606,7 @@ public: int query_count(CString key); }; + class CStringListLocEntry: public CList<stringloc_entry, stringloc_entry&> { public: @@ -724,6 +727,7 @@ extern Cmos the_mos; extern Cchui the_chui; extern Csrc the_src; +extern Cini the_ini; extern tlk_header tlk_headerinfo[2]; extern tlk_entry *tlk_entries[2]; @@ -768,7 +772,11 @@ extern CIntMapString listinnates; extern CIntMapString listsongs; extern CIntMapString listshapes; +extern CStringMapInt ini_entry; +#define INI_CREATURE 1 +#define INI_SPAWN 2 + //area animation flags #define AA_MIRROR 2048 Modified: chitem/trunk/Structs.h =================================================================== --- chitem/trunk/Structs.h 2009-06-14 08:41:28 UTC (rev 6421) +++ chitem/trunk/Structs.h 2009-06-14 08:47:31 UTC (rev 6422) @@ -2254,6 +2254,8 @@ typedef CMap<CString, LPCSTR, tooltip_data, tooltip_data&> CStringMapTooltip; typedef CMap<CString, LPCSTR, compiler_data, compiler_data&> CStringMapToCompiler; typedef CTypedPtrMap<CMapStringToOb, CString, CStringMapInt*> CStringMapToCStringMapInt; +typedef CMap<CString, LPCSTR, CString, LPCSTR> CStringMapString; +typedef CTypedPtrMap<CMapStringToOb, CString, CStringMapString*> CStringMapToCStringMapString; typedef COLORREF palettetype[256]; typedef struct Modified: chitem/trunk/chitem.clw =================================================================== --- chitem/trunk/chitem.clw 2009-06-14 08:41:28 UTC (rev 6421) +++ chitem/trunk/chitem.clw 2009-06-14 08:47:31 UTC (rev 6422) @@ -2,7 +2,7 @@ [General Info] Version=1 -LastClass=CProjGemRB +LastClass=CChitemDlg LastTemplate=CDialog NewFileInclude1=#include "stdafx.h" NewFileInclude2=#include "chitem.h" @@ -232,140 +232,140 @@ Resource123=IDD_GAMEGENERAL Class98=IcewindCre Resource124=IDR_SHORTCUT -Resource125=IDD_MAPEDIT (English (U.S.)) -Resource126=IDD_ITEMEFFECT (English (U.S.)) -Resource127=IDD_AREAINT (English (U.S.)) -Resource128=IDR_EFFECT (English (U.S.)) -Resource129=IDD_CREATURERES (English (U.S.)) -Resource130=IDD_CHECK (English (U.S.)) -Resource131=IDD_ITEMGENERAL (English (U.S.)) -Resource132=IDR_TILE (English (U.S.)) -Resource133=IDD_AREACONTAINER (English (U.S.)) -Resource134=IDD_WEDPOLY (English (U.S.)) -Resource135=IDD_AREADOOR (English (U.S.)) -Resource136=IDD_AREATRIGGERSTRINGS (English (U.S.)) -Resource137=IDD_VARIABLES (English (U.S.)) -Resource138=IDD_CHUIEDIT (English (U.S.)) -Resource139=IDD_SPELLEFFECT (English (U.S.)) -Resource140=IDR_ITEM (English (U.S.)) -Resource141=IDD_SPELLDESC (English (U.S.)) -Resource142=IDD_CREATURELEVELS (English (U.S.)) -Resource143=IDD_PROJEDIT (English (U.S.)) -Resource144=IDD_STOREEXTRA (English (U.S.)) -Resource145=IDD_SEARCHNODE (English (U.S.)) -Resource146=IDR_SCRIPT (English (U.S.)) -Resource147=IDD_STOREEDIT (English (U.S.)) -Resource148=IDD_ITEMPICKER (English (U.S.)) -Resource149=IDR_CREATURE (English (U.S.)) -Resource150=IDD_CREATUREGENERAL (English (U.S.)) -Resource151=IDD_SPELLEDIT (English (U.S.)) -Resource152=IDD_AREASPAWN (English (U.S.)) -Resource153=IDR_TREEMENU (English (U.S.)) -Resource154=IDR_MENUBAR (English (U.S.)) -Resource155=IDD_ITEMDESC (English (U.S.)) -Resource156=IDD_ADDLINK (English (U.S.)) -Resource157=IDD_SPELLEQUIP (English (U.S.)) -Resource158=IDD_SCHEDULE (English (U.S.)) -Resource159=IDR_CHUI (English (U.S.)) -Resource160=IDD_ITEMEXTRA (English (U.S.)) -Resource161=IDD_WEDTILE (English (U.S.)) -Resource162=IDD_CREATUREEDIT (English (U.S.)) -Resource163=IDD_MUSEDIT (English (U.S.)) -Resource164=IDD_PALETTE (English (U.S.)) -Resource165=IDD_SCRIPTEDIT (English (U.S.)) -Resource166=IDR_BAMMENU (English (U.S.)) -Resource167=IDD_VVCEDIT (English (U.S.)) -Resource168=IDD_AREAVARIABLE (English (U.S.)) -Resource169=IDD_CREATUREIWD (English (U.S.)) -Resource170=IDD_CREATUREEFF (English (U.S.)) -Resource171=IDD_ITEMEDIT (English (U.S.)) -Resource172=IDD_EXTRACT2 (English (U.S.)) -Resource173=IDD_STOREDRINKS (English (U.S.)) -Resource174=IDR_GAME (English (U.S.)) -Resource175=IDD_SPELLGENERAL (English (U.S.)) -Resource176=IDD_AREAENTRANCE (English (U.S.)) -Resource177=IDD_ITEMEQUIP (English (U.S.)) -Resource178=IDD_SRCEDIT (English (U.S.)) -Resource179=IDR_SPELL (English (U.S.)) -Resource180=IDR_VVC (English (U.S.)) -Resource181=IDD_STOREGENERAL (English (U.S.)) -Resource182=IDD_AREAACTOR (English (U.S.)) -Resource183=IDD_SAVHANDLE (English (U.S.)) -Resource184=IDD_PANICBUTTON (English (U.S.)) -Resource185=IDD_GAMEEDIT (English (U.S.)) -Resource186=IDD_BAMEDIT (English (U.S.)) -Resource187=IDD_WEDEDIT (English (U.S.)) -Resource188=IDR_TLKMENU (English (U.S.)) -Resource189=IDD_SPELLTOOL (English (U.S.)) -Resource190=IDD_ABOUTBOX (English (U.S.)) -Resource191=IDD_AREAGENERAL (English (U.S.)) -Resource192=IDD_CFB (English (U.S.)) -Resource193=IDD_GAMEPCINFO (English (U.S.)) -Resource194=IDD_ANIMDIALOG -Resource195=IDR_2DA (English (U.S.)) -Resource196=IDD_CREATURESKILLS (English (U.S.)) -Resource197=IDD_AREAMAP (English (U.S.)) -Resource198=IDD_EDIT (English (U.S.)) -Resource199=IDD_CREATUREUNKNOWN (English (U.S.)) -Resource200=IDD_PROJGEMRB (English (U.S.)) -Resource201=IDD_AREATRIGGER (English (U.S.)) -Resource202=IDD_STOREITEMS (English (U.S.)) -Resource203=IDD_WEIDU (English (U.S.)) -Resource204=IDD_SPELLEXTRA (English (U.S.)) -Resource205=IDD_STORERENTAL (English (U.S.)) -Resource206=IDD_CREATUREITEMS (English (U.S.)) -Resource207=IDD_EXTRACT (English (U.S.)) -Resource208=IDR_WEDMENU (English (U.S.)) -Resource209=IDD_IDSEDIT (English (U.S.)) -Resource210=IDD_TEXTVIEW (English (U.S.)) -Resource211=IDD_KEYEDIT (English (U.S.)) -Resource212=IDD_STRREFDLG (English (U.S.)) -Resource213=IDR_SRC (English (U.S.)) -Resource214=IDD_CREATUREIWD2 (English (U.S.)) -Resource215=IDD_AREAPROJ (English (U.S.)) -Resource216=IDD_2DAEDIT (English (U.S.)) -Resource217=IDD_CHITEM_DIALOG (English (U.S.)) -Resource218=IDD_COMPAT (English (U.S.)) -Resource219=IDD_PROGRESS (English (U.S.)) -Resource220=IDD_GAMESTATS (English (U.S.)) -Resource221=IDD_IAPDIALOG (English (U.S.)) -Resource222=IDD_COLORPICKER (English (U.S.)) -Resource223=IDD_CREATUREPST (English (U.S.)) -Resource224=IDR_MUSIC (English (U.S.)) -Resource225=IDD_CREATUREOVR (English (U.S.)) -Resource226=IDD_SHOWLOG (English (U.S.)) -Resource227=IDD_ITEMICONS (English (U.S.)) -Resource228=IDD_EFFEDIT (English (U.S.)) -Resource229=IDR_WORLDMAP (English (U.S.)) -Resource230=IDD_FINDITEM (English (U.S.)) -Resource231=IDD_MAPLINK (English (U.S.)) -Resource232=IDD_AREAEDIT (English (U.S.)) -Resource233=IDR_STORE (English (U.S.)) -Resource234=IDR_PROJECT (English (U.S.)) -Resource235=IDD_AREAAMBIENT (English (U.S.)) -Resource236=IDD_MOSEDIT (English (U.S.)) -Resource237=IDR_AREA (English (U.S.)) -Resource238=IDD_CREATURESTRINGS (English (U.S.)) -Resource239=IDD_IMAGEVIEW (English (U.S.)) -Resource240=IDD_POLYGON (English (U.S.)) -Resource241=IDD_DIALOGEDIT (English (U.S.)) -Resource242=IDR_IDS (English (U.S.)) -Resource243=IDD_GAMEGENERAL (English (U.S.)) -Resource244=IDD_MASSCLEAR (English (U.S.)) -Resource245=IDD_PROJEXT (English (U.S.)) +Resource125=IDD_ANIMDIALOG +Resource126=IDD_SAVHANDLE (English (U.S.)) +Resource127=IDR_PROJECT (English (U.S.)) +Resource128=IDD_CREATUREICONS (English (U.S.)) +Resource129=IDR_SCRIPT (English (U.S.)) +Resource130=IDD_EDIT (English (U.S.)) +Resource131=IDD_SCRIPTEDIT (English (U.S.)) +Resource132=IDD_SEARCHNODE (English (U.S.)) +Resource133=IDR_2DA (English (U.S.)) +Resource134=IDD_STOREGENERAL (English (U.S.)) +Resource135=IDR_IDS (English (U.S.)) +Resource136=IDD_SPELLEDIT (English (U.S.)) +Resource137=IDD_WEDTILE (English (U.S.)) +Resource138=IDD_ITEMEXTRA (English (U.S.)) +Resource139=IDD_AREATRIGGERSTRINGS (English (U.S.)) +Resource140=IDD_AREASPAWN (English (U.S.)) +Resource141=IDD_CREATUREIWD (English (U.S.)) +Resource142=IDD_AREAEDIT (English (U.S.)) +Resource143=IDR_BAMMENU (English (U.S.)) +Resource144=IDD_AREAMAP (English (U.S.)) +Resource145=IDR_CHITIN (English (U.S.)) +Resource146=IDD_AREAAMBIENT (English (U.S.)) +Resource147=IDD_WEDPOLY (English (U.S.)) +Resource148=IDD_PANICBUTTON (English (U.S.)) +Resource149=IDD_CREATURERES (English (U.S.)) +Resource150=IDR_EFFECT (English (U.S.)) +Resource151=IDD_CREATUREIWD2 (English (U.S.)) +Resource152=IDR_SPELL (English (U.S.)) +Resource153=IDD_AREATRIGGER (English (U.S.)) +Resource154=IDD_PROJEDIT (English (U.S.)) +Resource155=IDD_CREATUREPST (English (U.S.)) +Resource156=IDR_SRC (English (U.S.)) +Resource157=IDD_GAMEGENERAL (English (U.S.)) +Resource158=IDR_MENUBAR (English (U.S.)) +Resource159=IDD_ADDLINK (English (U.S.)) +Resource160=IDD_SRCEDIT (English (U.S.)) +Resource161=IDD_STORERENTAL (English (U.S.)) +Resource162=IDR_STORE (English (U.S.)) +Resource163=IDD_VVCEDIT (English (U.S.)) +Resource164=IDD_POLYGON (English (U.S.)) +Resource165=IDD_ITEMICONS (English (U.S.)) +Resource166=IDD_AREAENTRANCE (English (U.S.)) +Resource167=IDD_CREATUREEFF (English (U.S.)) +Resource168=IDR_MUSIC (English (U.S.)) +Resource169=IDD_SPELLEFFECT (English (U.S.)) +Resource170=IDD_CFB (English (U.S.)) +Resource171=IDD_AREAANIM (English (U.S.)) +Resource172=IDD_CREATUREOVR (English (U.S.)) +Resource173=IDD_PALETTE (English (U.S.)) +Resource174=IDD_CREATUREUNKNOWN (English (U.S.)) +Resource175=IDD_TEXTVIEW (English (U.S.)) +Resource176=IDR_TREEMENU (English (U.S.)) +Resource177=IDD_STRREFDLG (English (U.S.)) +Resource178=IDD_STOREEXTRA (English (U.S.)) +Resource179=IDD_CREATUREEDIT (English (U.S.)) +Resource180=IDD_AREAINT (English (U.S.)) +Resource181=IDD_MASSCLEAR (English (U.S.)) +Resource182=IDD_PROJGEMRB (English (U.S.)) +Resource183=IDD_ITEMPICKER (English (U.S.)) +Resource184=IDD_EXTRACT (English (U.S.)) +Resource185=IDR_CHUI (English (U.S.)) +Resource186=IDD_STOREDRINKS (English (U.S.)) +Resource187=IDD_STOREEDIT (English (U.S.)) +Resource188=IDD_AREASONGS (English (U.S.)) +Resource189=IDD_COMPAT (English (U.S.)) +Resource190=IDD_2DAEDIT (English (U.S.)) +Resource191=IDD_CREATURELEVELS (English (U.S.)) +Resource192=IDD_WEDEDIT (English (U.S.)) +Resource193=IDD_SPELLDESC (English (U.S.)) +Resource194=IDR_WEDMENU (English (U.S.)) +Resource195=IDD_AREADOOR (English (U.S.)) +Resource196=IDR_CREATURE (English (U.S.)) +Resource197=IDD_BAMEDIT (English (U.S.)) +Resource198=IDD_PROGRESS (English (U.S.)) +Resource199=IDR_TLKMENU (English (U.S.)) +Resource200=IDD_SCHEDULE (English (U.S.)) +Resource201=IDR_ITEM (English (U.S.)) +Resource202=IDD_TISDIALOG (English (U.S.)) +Resource203=IDD_CREATUREITEMS (English (U.S.)) +Resource204=IDD_GAMEPCINFO (English (U.S.)) +Resource205=IDD_SPELLTOOL (English (U.S.)) +Resource206=IDD_IMAGEVIEW (English (U.S.)) +Resource207=IDD_MUSEDIT (English (U.S.)) +Resource208=IDD_GAMEEDIT (English (U.S.)) +Resource209=IDD_CHECK (English (U.S.)) +Resource210=IDD_ITEMDESC (English (U.S.)) +Resource211=IDD_VARIABLES (English (U.S.)) +Resource212=IDD_ITEMEFFECT (English (U.S.)) +Resource213=IDD_PROJEXT (English (U.S.)) +Resource214=IDD_EXTRACT2 (English (U.S.)) +Resource215=IDD_AREAACTOR (English (U.S.)) +Resource216=IDD_CHITEM_DIALOG (English (U.S.)) +Resource217=IDD_IDSEDIT (English (U.S.)) +Resource218=IDD_CHUIEDIT (English (U.S.)) +Resource219=IDD_IAPDIALOG (English (U.S.)) +Resource220=IDD_SPELLEQUIP (English (U.S.)) +Resource221=IDD_FINDITEM (English (U.S.)) +Resource222=IDD_ITEMEDIT (English (U.S.)) +Resource223=IDD_ITEMUSE (English (U.S.)) +Resource224=IDD_DIALOGEDIT (English (U.S.)) +Resource225=IDD_AREAGENERAL (English (U.S.)) +Resource226=IDD_ITEMEQUIP (English (U.S.)) +Resource227=IDD_SHOWLOG (English (U.S.)) +Resource228=IDD_KEYEDIT (English (U.S.)) +Resource229=IDD_CREATURESTRINGS (English (U.S.)) +Resource230=IDD_COLORPICKER (English (U.S.)) +Resource231=IDD_WEIDU (English (U.S.)) +Resource232=IDD_AREAPROJ (English (U.S.)) +Resource233=IDD_CREATUREGENERAL (English (U.S.)) +Resource234=IDD_AREACONTAINER (English (U.S.)) +Resource235=IDR_VVC (English (U.S.)) +Resource236=IDD_ABOUTBOX (English (U.S.)) +Resource237=IDD_CREATURESKILLS (English (U.S.)) +Resource238=IDR_AREA (English (U.S.)) +Resource239=IDD_MOSEDIT (English (U.S.)) +Resource240=IDD_SPELLGENERAL (English (U.S.)) +Resource241=IDR_TILE (English (U.S.)) +Resource242=IDD_AREAVARIABLE (English (U.S.)) +Resource243=IDD_SPELLEXTRA (English (U.S.)) +Resource244=IDD_STOREITEMS (English (U.S.)) +Resource245=IDD_MAPLINK (English (U.S.)) Class99=CAreaTriggerString Class100=CPCInfo -Resource246=IDD_ITEMUSE (English (U.S.)) +Resource246=IDD_GAMESTATS (English (U.S.)) Class101=CCreatureOverlay -Resource247=IDD_AREAANIM (English (U.S.)) +Resource247=IDD_ITEMGENERAL (English (U.S.)) Class102=IWD2Creature -Resource248=IDR_CHITIN (English (U.S.)) +Resource248=IDD_MAPEDIT (English (U.S.)) Class103=CAnimDialog -Resource249=IDD_AREASONGS (English (U.S.)) +Resource249=IDR_WORLDMAP (English (U.S.)) Class104=CCreatureLevels -Resource250=IDD_TISDIALOG (English (U.S.)) +Resource250=IDD_EFFEDIT (English (U.S.)) Class105=CAreaProj -Resource251=IDD_CREATUREICONS (English (U.S.)) +Resource251=IDR_GAME (English (U.S.)) Class106=CProjGemRB Resource252=IDR_SHORTCUT (English (U.S.)) @@ -383,7 +383,7 @@ Filter=D BaseClass=CDialog VirtualFilter=dWC -LastObject=ID_SEARCH_PROJECTILE +LastObject=ID_CHECK_SPAWNINI [CLS:CAboutDlg] Type=0 @@ -9595,50 +9595,51 @@ Command51=ID_CHECK_ITEM Command52=ID_CHECK_PROJECTILE Command53=ID_CHECK_SCRIPT -Command54=ID_CHECK_SPELL -Command55=ID_CHECK_STORE -Command56=ID_CHECK_2DA -Command57=ID_CHECK_UI -Command58=ID_CHECK_VVC -Command59=ID_CHECK_WORLDMAP -Command60=ID_CHECK_AVATAR2DA -Command61=ID_FILE_EXTRACT -Command62=ID_FILE_SEARCH -Command63=ID_UNCOMPRESSBIF -Command64=ID_UNCOMPRESSSAV -Command65=ID_UNCOMPRESSCBF -Command66=ID_SKIMSAV -Command67=ID_EXTRACTION_RECOMPRESSSAV -Command68=ID_FILE_BUILDBIF -Command69=ID_REORDERBIF -Command70=ID_COMPRESSBIF -Command71=ID_COMPRESSCBF -Command72=ID_WAVCTOWAV -Command73=ID_WAVCTOWAV2 -Command74=ID_WAVTOWAVC -Command75=ID_ACMTOWAV -Command76=ID_ACMTOWAV2 -Command77=ID_WAVTOACM -Command78=ID_ADDCFBTOSPELLS -Command79=ID_CLEARCFBFROMSPELLS -Command80=ID_TOOLS_DECOMPILE -Command81=ID_TOOLS_LOOKUPSTRREF -Command82=ID_AVATARS -Command83=ID_SCANVARIABLES -Command84=ID_TOOLS_SCANJOURNALENTRIES -Command85=ID_TISPACK -Command86=ID_LOGGING_NONE -Command87=ID_LOGGING_SCREEN -Command88=ID_LOGGING_FILE -Command89=ID_PROGRESS -Command90=ID_READONLY -Command91=ID_USEDIALOGF -Command92=ID_COMPAT -Command93=ID_SAVESETTINGS -Command94=IDM_ABOUTBOX -Command95=ID_TOOLTIPS -Command96=ID_HELP_README -CommandCount=96 +Command54=ID_CHECK_SPAWNINI +Command55=ID_CHECK_SPELL +Command56=ID_CHECK_STORE +Command57=ID_CHECK_2DA +Command58=ID_CHECK_UI +Command59=ID_CHECK_VVC +Command60=ID_CHECK_WORLDMAP +Command61=ID_CHECK_AVATAR2DA +Command62=ID_FILE_EXTRACT +Command63=ID_FILE_SEARCH +Command64=ID_UNCOMPRESSBIF +Command65=ID_UNCOMPRESSSAV +Command66=ID_UNCOMPRESSCBF +Command67=ID_SKIMSAV +Command68=ID_EXTRACTION_RECOMPRESSSAV +Command69=ID_FILE_BUILDBIF +Command70=ID_REORDERBIF +Command71=ID_COMPRESSBIF +Command72=ID_COMPRESSCBF +Command73=ID_WAVCTOWAV +Command74=ID_WAVCTOWAV2 +Command75=ID_WAVTOWAVC +Command76=ID_ACMTOWAV +Command77=ID_ACMTOWAV2 +Command78=ID_WAVTOACM +Command79=ID_ADDCFBTOSPELLS +Command80=ID_CLEARCFBFROMSPELLS +Command81=ID_TOOLS_DECOMPILE +Command82=ID_TOOLS_LOOKUPSTRREF +Command83=ID_AVATARS +Command84=ID_SCANVARIABLES +Command85=ID_TOOLS_SCANJOURNALENTRIES +Command86=ID_TISPACK +Command87=ID_LOGGING_NONE +Command88=ID_LOGGING_SCREEN +Command89=ID_LOGGING_FILE +Command90=ID_PROGRESS +Command91=ID_READONLY +Command92=ID_USEDIALOGF +Command93=ID_COMPAT +Command94=ID_SAVESETTINGS +Command95=IDM_ABOUTBOX +Command96=ID_TOOLTIPS +Command97=ID_HELP_README +CommandCount=97 [MNU:IDR_BAMMENU (English (U.S.))] Type=1 Modified: chitem/trunk/chitem.rc =================================================================== --- chitem/trunk/chitem.rc 2009-06-14 08:41:28 UTC (rev 6421) +++ chitem/trunk/chitem.rc 2009-06-14 08:47:31 UTC (rev 6422) @@ -145,12 +145,12 @@ BEGIN ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20 LTEXT "",IDC_VERSION,40,10,119,8,SS_NOPREFIX - LTEXT "Copyright (C) 2002-2008 Avenger",IDC_STATIC,40,23,119,8 + LTEXT "Copyright (C) 2002-2009 Avenger",IDC_STATIC,40,23,119,8 DEFPUSHBUTTON "OK",IDOK,178,7,50,14,WS_GROUP LTEXT "Source: http://gemrb.sourceforge.net",IDC_STATIC,40,36, 119,8 - LTEXT "DLTC home: http://forums.gibberlings3.net",IDC_STATIC, - 40,49,136,8 + LTEXT "Forums: http://forums.gibberlings3.net",IDC_STATIC,40, + 49,120,8 END IDD_CHITEM_DIALOG DIALOGEX 0, 0, 319, 274 @@ -6211,8 +6211,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 7,1,0,2 - PRODUCTVERSION 7,1,0,2 + FILEVERSION 7,1,0,3 + PRODUCTVERSION 7,1,0,3 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -6227,17 +6227,17 @@ BEGIN BLOCK "040904b0" BEGIN - VALUE "Comments", "www.dragonlancetc.com\0" + VALUE "Comments", "forums.gibberlings3.net\0" VALUE "CompanyName", "GemRB Project (gemrb.sourceforge.net)\0" VALUE "FileDescription", "DragonLance Total Conversion Editor Pro\0" - VALUE "FileVersion", "7, 1, 0, 2\0" + VALUE "FileVersion", "7, 1, 0, 3\0" VALUE "InternalName", "dltcep\0" VALUE "LegalCopyright", "Copyright (C) 2002-2009 Avenger\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "chitem.EXE\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "DLTC Editor Pro 7.1b\0" - VALUE "ProductVersion", "7, 1, 0, 2\0" + VALUE "ProductName", "DLTC Editor Pro 7.1c\0" + VALUE "ProductVersion", "7, 1, 0, 3\0" VALUE "SpecialBuild", "\0" END END @@ -6339,6 +6339,7 @@ MENUITEM "&Item", ID_CHECK_ITEM MENUITEM "&Projectile", ID_CHECK_PROJECTILE MENUITEM "Sc&ript", ID_CHECK_SCRIPT + MENUITEM "Spaw&n (INI)", ID_CHECK_SPAWNINI MENUITEM "&Spell", ID_CHECK_SPELL MENUITEM "S&tore", ID_CHECK_STORE MENUITEM "Table (&2DA)", ID_CHECK_2DA Modified: chitem/trunk/chitemDlg.cpp =================================================================== --- chitem/trunk/chitemDlg.cpp 2009-06-14 08:41:28 UTC (rev 6421) +++ chitem/trunk/chitemDlg.cpp 2009-06-14 08:47:31 UTC (rev 6422) @@ -3,7 +3,7 @@ #include "stdafx.h" -#define PRG_VERSION "7.1b" +#define PRG_VERSION "7.1c" #include <fcntl.h> #include <direct.h> @@ -217,6 +217,7 @@ ON_COMMAND(ID_EXTRACTION_RECOMPRESSSAV, OnRecompresssav) ON_COMMAND(ID_USEDIALOGF, OnUsedialogf) ON_COMMAND(ID_TOOLS_DECOMPILE, OnToolsDecompile) + ON_COMMAND(ID_CHECK_AVATAR2DA, OnCheckAvatar2da) ON_COMMAND(ID_SEARCH_AREA, OnFindArea) ON_COMMAND(ID_EDIT_ITEM, OnEditItem) ON_COMMAND(ID_EDIT_CREATURE, OnEditCreature) @@ -241,7 +242,7 @@ ON_COMMAND(ID_RESCAN3, OnRescan3) ON_COMMAND(ID_RESCAN4, OnRescan4) ON_COMMAND(ID_RESCAN5, OnRescan5) - ON_COMMAND(ID_CHECK_AVATAR2DA, OnCheckAvatar2da) + ON_COMMAND(ID_CHECK_SPAWNINI, OnCheckSpawnini) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -578,6 +579,8 @@ int i; init_colors(); + init_spawn_entries(); + pos=idsmaps.GetStartPosition(); while(pos) { @@ -2198,6 +2201,55 @@ return gret; } +int CChitemDlg::process_spawninis() +{ + int gret, ret; + POSITION pos; + CString key; + loc_entry fileloc, dummy; + + m_event.Empty(); + UpdateData(UD_DISPLAY); + gret=0; + + log("Checking spawns..."); + pos=inis.GetStartPosition(); + start_panic(); + while(pos && m_panicbutton) + { + ret=-1; + inis.GetNextAssoc(pos,key,fileloc); //cannot skip original bams, there are too many + if(!(chkflg&SKIPSOA)) //skipping SoA items + { + if(fileloc.bifname.Left(5)=="data\\") + { + continue; + } + } + + changeitemname(key); + //this is not an area ini + if(!areas.Lookup(key,dummy)) + { + log("no area"); + continue; + } + + ret=read_next_spawnini(fileloc); + if(ret) gret=1; + if(ret>=0) + { + ret=check_spawnini(); + the_ini.RemoveAll(); + } + newitem=FALSE; + if(ret) gret=1; + } + end_panic(); + log("Done."); + return gret; +} + int CChitemDlg::process_maps() { int gret, ret; @@ -2332,6 +2384,36 @@ MessageBox("No problem found!","User interface check",MB_OK|MB_ICONINFORMATION); } +void CChitemDlg::OnCheckSpawnini() +{ + if(bgfolder.IsEmpty()) + { + MessageBox("Use the setup first!","Warning",MB_ICONEXCLAMATION|MB_OK); + return; + } + + if(!pst_compatible_var() && !has_xpvar()) + { + MessageBox("Spawn inis exist only in IWD or PST!","Warning",MB_ICONEXCLAMATION|MB_OK); + return; + } + + if(process_spawninis()) //has only check + { + switch(logtype) + { + case 0: + MessageBox("There were inconsistencies, change the logging type to see them!","Ini check",MB_OK|MB_ICONINFORMATION); + break; + case 2: + MessageBox("See the chitem.log for details on the inconsistencies!","Ini check",MB_OK|MB_ICONINFORMATION); + break; + } + return; + } + MessageBox("No problem found!","Ini check",MB_OK|MB_ICONINFORMATION); +} + void CChitemDlg::OnCheckStore() { if(bgfolder.IsEmpty()) @@ -4287,7 +4369,6 @@ { int ret; int fhandle; - CString key, tmp; fhandle=locate_file(fileloc, 0); if(fhandle<1) return -2; @@ -4327,7 +4408,6 @@ { int ret; int fhandle; - CString key, tmp; fhandle=locate_file(fileloc, 0); if(fhandle<1) return -2; @@ -4355,7 +4435,6 @@ { int ret; int fhandle; - CString key, tmp; fhandle=locate_file(fileloc, 0); if(fhandle<1) return -2; @@ -4383,7 +4462,6 @@ { int ret; int fhandle; - CString key, tmp; fhandle=locate_file(fileloc, 0); if(fhandle<1) return -2; @@ -4405,7 +4483,6 @@ { int ret; int fhandle; - CString tmp; fhandle=locate_file(fileloc, 0); if(fhandle<1) return -2; @@ -4429,7 +4506,6 @@ { int ret; int fhandle; - CString tmp; fhandle=locate_file(fileloc, 0); if(fhandle<1) return -2; @@ -4453,7 +4529,6 @@ { int ret; int fhandle; - CString key, tmp; fhandle=locate_file(fileloc, 0); if(fhandle<1) return -2; @@ -4608,7 +4683,7 @@ { int ret; int fhandle; - CString key, tmp; + CString tmp; loc_entry wedfileloc; fhandle=locate_file(fileloc, 0); @@ -4669,7 +4744,6 @@ { int ret; int fhandle; - CString key, tmp; fhandle=locate_file(fileloc, 0); if(fhandle<1) return -2; @@ -4695,7 +4769,6 @@ { int ret; int fhandle; - CString key, tmp; fhandle=locate_file(fileloc, 0); if(fhandle<1) return -2; @@ -4721,7 +4794,6 @@ { int ret; int fhandle; - CString key, tmp; fhandle=locate_file(fileloc, 0); if(fhandle<1) return -2; @@ -4743,6 +4815,31 @@ return ret; } +int CChitemDlg::read_next_spawnini(loc_entry fileloc) +{ + int ret; + int fhandle; + + fhandle=locate_file(fileloc, 0); + if(fhandle<1) return -2; + ret=the_ini.ReadIniFromFile(fhandle, fileloc.size); + close(fhandle); + switch(ret) + { + case -1: + if(chkflg&NOSTRUCT) break; + log("Game file is inconsistent."); + break; + case 0: + break; + default: //serious error + if(chkflg&NOSTRUCT) break; + log("Serious error while looking up save game."); + break; + } + return ret; +} + void CChitemDlg::OnLookupstrref() { CStrRefDlg dlg; @@ -5036,3 +5133,4 @@ dlg.m_file="readme.txt"; dlg.DoModal(); } + Modified: chitem/trunk/chitemDlg.h =================================================================== --- chitem/trunk/chitemDlg.h 2009-06-14 08:41:28 UTC (rev 6421) +++ chitem/trunk/chitemDlg.h 2009-06-14 08:47:31 UTC (rev 6422) @@ -60,6 +60,7 @@ int check_game(); int check_map(); int check_bam(); + int check_spawnini(); int check_dialog(int check_or_scan); int check_script(int check_or_scan); @@ -131,6 +132,7 @@ int process_tables(); //only search int process_games(); // only check int process_maps(); // only check + int process_spawninis(); // only check int check_scriptitems(); bool match_bam(); bool match_projectile(); @@ -160,6 +162,14 @@ int read_next_bam(loc_entry fileloc, bool onlyheader); int read_next_game(loc_entry fileloc); int read_next_map(loc_entry fileloc); + int read_next_spawnini(loc_entry fileloc); + + bool check_value(CString section, CString key, bool error); + void check_keys(CString section, int type); + void check_creature_section(CString section, CString referenced); + int check_section(CString section); + void check_spawn_section(CString section, CString referenced); + int check_point_string(CString point); int check_area_actors(); int check_area_trigger(); int check_area_spawn(); @@ -350,6 +360,7 @@ afx_msg void OnUsedialogf(); afx_msg void OnToolsDecompile(); afx_msg void OnCheckAvatar2da(); + afx_msg void OnCheckSpawnini(); //}}AFX_MSG afx_msg void OnOk5(); afx_msg void OnOk6(); Added: chitem/trunk/ini.cpp =================================================================== --- chitem/trunk/ini.cpp (rev 0) +++ chitem/trunk/ini.cpp 2009-06-14 08:47:31 UTC (rev 6422) @@ -0,0 +1,176 @@ +// ini.cpp: implementation of the Cini class. +// +////////////////////////////////////////////////////////////////////// + +#include "stdafx.h" +#include "chitem.h" +#include "ini.h" +#include "ChitemDlg.h" + +#ifdef _DEBUG +#undef THIS_FILE +static char THIS_FILE[]=__FILE__; +#define new DEBUG_NEW +#endif + +////////////////////////////////////////////////////////////////////// +// Construction/Destruction +////////////////////////////////////////////////////////////////////// + +extern int read_string(FILE *fpoi, char *pattern, char *tmpbuff=NULL, int length=0); +extern void SetupReader(int max); + +Cini::Cini() +{ + +} + +void Cini::RemoveAll() +{ + CString key; + CStringMapString *value = NULL; + POSITION pos; + + pos=GetStartPosition(); + while(pos) + { + GetNextAssoc(pos, key, value); + if(value) + { + delete value; + value=NULL; + } + } + CTypedPtrMap<CMapStringToOb, CString, CStringMapString*>::RemoveAll(); + valid.RemoveAll(); +} + +Cini::~Cini() +{ + RemoveAll(); +} + +void Cini::AddValid(CString what) +{ + valid.AddTail(what); +} + +void Cini::AddValid(CString *what, int cnt) +{ + while(cnt--) + { + valid.AddTail(what[cnt]); + } +} + +bool Cini::IsValid(CString what) +{ + if(valid.Find(what)) return true; + return false; +} + +bool Cini::HasSection(CString what) +{ + CStringMapString *sect = NULL; + + return !!Lookup(what, sect); +} + +CString Cini::GetValue(CString section, CString key) +{ + CStringMapString *sect = NULL; + CString value; + + Lookup(section, sect); + if(!sect) return value; //it is empty at this point + sect->Lookup(key, value); + return value; +} + +int Cini::ReadIniFromFile(int fh, long ml) +{ + FILE *fpoi; + int ret; + int res; + char line[MAXBUFFSIZE]; + CString tmpstr; + CString section; + CString key; + CString value; + CStringMapString *sect = NULL; + + RemoveAll(); + ret=0; + fhandle=fh; //for safe string reads + if(ml==-1) maxlen=filelength(fhandle); + else maxlen=ml; + if(maxlen<1) return -1; //short file, invalid item + + fpoi=fdopen(fhandle,"rb"); + if(!fpoi) + { + close(fhandle); + return -1; + } + + SetupReader(maxlen); + do + { + res=read_string(fpoi,"\n", line, sizeof(line)); + tmpstr=line; + tmpstr.TrimLeft(); + tmpstr.TrimRight(); + if(tmpstr.IsEmpty()) continue; + if(tmpstr[0]==';') continue; + + if(tmpstr[0]=='[' && tmpstr.GetLength()>3) + { + section=tmpstr.Mid(1,tmpstr.GetLength()-2); + if(Lookup(section, sect) ) + { + ((CChitemDlg *) AfxGetMainWnd())->log("duplicate section entry: %s", section); + } + else + { + section.MakeLower(); + SetAt(section, new CStringMapString); + } + continue; + } + + if (section.GetLength()) + { + int separator = tmpstr.Find("="); + if (separator>1) + { + if (!Lookup(section, sect) || !sect) + { + fclose(fpoi); + return -4; //internal error + } + key=tmpstr.Left(separator); + value=tmpstr.Mid(separator+1); + key.TrimRight(); + value.TrimLeft(); + if(key.GetLength()) + { + key.MakeLower(); + value.MakeLower(); + sect->SetAt(key, value); + } + } + else + { + res=-3; //invalid entry + } + } + else + { + res=-2; //invalid spawn ini file starts without section + } + } + while(res==1); + if (res==2) res=0; + fclose(fpoi); + return res; +} Added: chitem/trunk/ini.h =================================================================== --- chitem/trunk/ini.h (rev 0) +++ chitem/trunk/ini.h 2009-06-14 08:47:31 UTC (rev 6422) @@ -0,0 +1,34 @@ +// ini.h: interface for the Cini class. +// +////////////////////////////////////////////////////////////////////// + +#if !defined(AFX_INI_H__14AB31A7_EC8E_41A0_A456_EE34709F8C5F__INCLUDED_) +#define AFX_INI_H__14AB31A7_EC8E_41A0_A456_EE34709F8C5F__INCLUDED_ + +#if _MSC_VER > 1000 +#pragma once +#endif // _MSC_VER > 1000 + +class Cini:public CStringMapToCStringMapString +{ +private: + int fhandle; + int startpoint; + int maxlen; + +public: + Cini(); + ~Cini(); + + CStringList valid; + + bool IsValid(CString what); + void AddValid(CString what); + void AddValid(CString *what, int cnt); + bool HasSection(CString what); + CString GetValue(CString section, CString key); + void RemoveAll(); + int ReadIniFromFile(int fh, long ml); +}; + +#endif // !defined(AFX_INI_H__14AB31A7_EC8E_41A0_A456_EE34709F8C5F__INCLUDED_) Modified: chitem/trunk/resource.h =================================================================== --- chitem/trunk/resource.h 2009-06-14 08:41:28 UTC (rev 6421) +++ chitem/trunk/resource.h 2009-06-14 08:47:31 UTC (rev 6422) @@ -1853,6 +1853,7 @@ #define ID_EXTRACTION_RECOMPRESSSAV 33044 #define ID_TOOLS_PLAYSOUND 33045 #define ID_CHECK_AVATAR2DA 33046 +#define ID_CHECK_SPAWNINI 33047 #define ID_CONTEXT 0xF180 // Next default values for new objects @@ -1860,7 +1861,7 @@ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 233 -#define _APS_NEXT_COMMAND_VALUE 33047 +#define _APS_NEXT_COMMAND_VALUE 33048 #define _APS_NEXT_CONTROL_VALUE 2348 #define _APS_NEXT_SYMED_VALUE 120 #endif Modified: chitem/trunk/seekers.cpp =================================================================== --- chitem/trunk/seekers.cpp 2009-06-14 08:41:28 UTC (rev 6421) +++ chitem/trunk/seekers.cpp 2009-06-14 08:47:31 UTC (rev 6422) @@ -5578,6 +5578,235 @@ return ret; } +int CChitemDlg::check_point_string(CString point) +{ + int a, b; + + if(point.GetLength()<2 || point[0]!='[' || point[point.GetLength()-1]!=']') + { + return -1; + } + a=-1; + b=-1; + sscanf(point, "[%d.%d]", &a, &b); + if(a==-1 || b==-1) return -1; + //return -2 if the area has no such point + return 0; +} + +bool CChitemDlg::check_value(CString section, CString key, bool error) +{ + if(the_ini.GetValue(section, key).IsEmpty()) + { + if(error) + { + log("Missing %s key in section %s", key, section); + } + return true; + } + return false; +} + +void CChitemDlg::check_keys(CString section, int type) +{ + CString key, value; + POSITION pos; + int tmp; + CStringMapString *sect = NULL; + + the_ini.Lookup(section, sect); + + pos=sect->GetStartPosition(); + while(pos) + { + sect->GetNextAssoc(pos, key, value); + tmp = -1; + ini_entry.Lookup(key, tmp); + + if(tmp!=type) + { + log("Invalid key: %s in section: %s", key, section); + } + } +} + +void CChitemDlg::check_creature_section(CString section, CString referenced) +{ + + if(section.IsEmpty()) return; + + if(!the_ini.HasSection(section)) + { + log("There is no %s spawn section, but it is referenced in %s", section, referenced); + return; + } + check_keys(section, INI_CREATURE); + + check_value(section, "cre_file", true); + if(check_value(section, "spec", !has_xpvar())) + { + if(has_xpvar()) + { + check_value(section,"spec_var", true); + } + } + CString ps = the_ini.GetValue(section,"point_select"); + if(check_value(section, "spawn_point", false)) + { + if(check_value(section, "spawn_point_global", false)) + { + log("Neither spawn_spoint nor spawn_point_global keys exist in section %s", section); + return; + } + if(ps.Compare("e")) + { + log("Point_select isn't set to 'e' but it needs for spawn_point_global in section %s", section); + return; + } + } + else + { + int a, b, c; + CString tmpstr = the_ini.GetValue(section,"spawn_point"); + + a=-1; + b=-1; + c=-1; + sscanf(tmpstr,"[%d.%d:%d]", &a, &b, &c); + if(b==-1) + { + sscanf(tmpstr,"[%d.%d]", &a, &b); + } + if(b==-1 || a==-1) + { + log("Invalid spawn_point value: %s in section %s", tmpstr, section); + } + } + + if(!ps.Compare("r") && !ps.Compare("s") && !ps.Compare("e") ) + { + log("Point_select should be either [e,r,s] in section %s", section); + } + + int cnt; + loc_entry dummy; + CString *lines = explode(the_ini.GetValue(section, "cre_file"),',', cnt); + if(lines) + { + while(cnt--) + { + lines[cnt].TrimLeft(); + lines[cnt].TrimRight(); + lines[cnt].MakeUpper(); + if(!creatures.Lookup(lines[cnt], dummy)) + { + log("Invalid creature reference %s in cre_file of section %s", lines[cnt], section); + } + } + delete [] lines; + } +} + +void CChitemDlg::check_spawn_section(CString section, CString referenced) +{ + if(section.IsEmpty()) return; + + if(!the_ini.HasSection(section)) + { + log("No %s spawn section referenced in %s", section, referenced); + return; + } + check_value(section, "critters", true); + + int cnt; + CString *lines = explode(the_ini.GetValue(section,"critters"), ',', cnt); + the_ini.AddValid(lines, cnt); + + if(lines) + { + while(cnt--) + { + check_creature_section( lines[cnt], section+":critters"); + } + delete [] lines; + } +} + +int CChitemDlg::check_section(CString key) +{ + if(!key.Compare("nameless")) return 0; + if(!key.Compare("namelessvar")) return 0; + if(!key.Compare("locals")) return 0; + if(!key.Compare("spawn_main")) return 0; + + if(the_ini.IsValid(key)) return 0; + + return 1; +} + +int CChitemDlg::check_spawnini() +{ + CStringMapString *value = NULL; + CString key; + POSITION pos; + int ret; + + ret=0; + if(pst_compatible_var() && !the_ini.HasSection("nameless")) + { + log("No nameless spawn section"); + } + + if(the_ini.GetValue("nameless","destare").GetLength()) + { + CString point = the_ini.GetValue("nameless","point"); + switch(check_point_string(point)) + { + case -1: + log("Invalid nameless respawn point:%s", point); + break; + case -2: + break; + } + //syntax checking of point + CString state = the_ini.GetValue("nameless","state"); + int stnum = atoi(state); + + if(stnum<0 || stnum>40) + { + log("Invalid nameless respawn state:%s", state); + } + } + key = the_ini.GetValue("spawn_main","enter"); + check_spawn_section(key, "spawn_main:enter"); + the_ini.AddValid(key); + + int cnt; + CString *lines = explode(the_ini.GetValue("spawn_main","events"), ',', cnt); + the_ini.AddValid(lines, cnt); + + if(lines) + { + while(cnt--) + { + check_spawn_section( lines[cnt], "spawn_main:events"); + } + delete [] lines; + } + + pos=the_ini.GetStartPosition(); + while(pos) + { + the_ini.GetNextAssoc(pos, key, value); + if(check_section(key) && !(chkflg&WARNINGS)) + { + log("Invalid section %s", key); + } + } + + return ret; +} + int fill_links(short *links, int from, int count, int area, int max) { int i; Modified: chitem/trunk/tbg.cpp =================================================================== --- chitem/trunk/tbg.cpp 2009-06-14 08:41:28 UTC (rev 6421) +++ chitem/trunk/tbg.cpp 2009-06-14 08:47:31 UTC (rev 6422) @@ -64,9 +64,9 @@ int Ctbg::get_genre() { if(iwd2_structures()) return 5; //IWD2 - else if(pst_compatible_var()) return 3; //IWD - else if(has_xpvar()) return 1; //PST - else if(bg1_compatible_area()) return 2; //BG1 + else if(pst_compatible_var()) return 2; //PST + else if(has_xpvar()) return 3; //IWD + else if(bg1_compatible_area()) return 1; //BG1 else return 4; //BG2 } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-06-14 15:47:36
|
Revision: 6428 http://gemrb.svn.sourceforge.net/gemrb/?rev=6428&view=rev Author: avenger_teambg Date: 2009-06-14 15:46:51 +0000 (Sun, 14 Jun 2009) Log Message: ----------- added the new projectile flags to the editor Modified Paths: -------------- chitem/trunk/Chitem.h chitem/trunk/ProjGemRB.cpp chitem/trunk/ProjGemRB.h chitem/trunk/chitem.clw chitem/trunk/chitem.rc Modified: chitem/trunk/Chitem.h =================================================================== --- chitem/trunk/Chitem.h 2009-06-14 15:27:56 UTC (rev 6427) +++ chitem/trunk/Chitem.h 2009-06-14 15:46:51 UTC (rev 6428) @@ -533,7 +533,10 @@ #define PROJ_CONTINUE 2 //continue as travel projectile after triggered #define PROJ_FREEZE 4 //freeze after trigger and slowly fade out #define PROJ_NO_TRAVEL 8 //appear immediately on target -#define PROJ_TRAIL_FACE 16 ///trail bams also use face +#define PROJ_TRAIL_FACE 16 //trail bams also use face +#define PROJ_CURVE 32 //curved path +#define PROJ_RANDOM 64 //random starting frame +#define PROJ_PILLAR 128 //pillar projectile #define TRANSPARENT_GREEN 0x00ff00 Modified: chitem/trunk/ProjGemRB.cpp =================================================================== --- chitem/trunk/ProjGemRB.cpp 2009-06-14 15:27:56 UTC (rev 6427) +++ chitem/trunk/ProjGemRB.cpp 2009-06-14 15:46:51 UTC (rev 6428) @@ -58,6 +58,10 @@ ON_BN_CLICKED(IDC_FLAG2, OnFlag2) ON_BN_CLICKED(IDC_FLAG3, OnFlag3) ON_BN_CLICKED(IDC_FLAG4, OnFlag4) + ON_BN_CLICKED(IDC_FLAG5, OnFlag5) + ON_BN_CLICKED(IDC_FLAG6, OnFlag6) + ON_BN_CLICKED(IDC_FLAG7, OnFlag7) + ON_BN_CLICKED(IDC_FLAG8, OnFlag8) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -88,3 +92,27 @@ the_projectile.header.extflags^=PROJ_NO_TRAVEL; UpdateData(UD_DISPLAY); } + +void CProjGemRB::OnFlag5() +{ + the_projectile.header.extflags^=PROJ_TRAIL_FACE; + UpdateData(UD_DISPLAY); +} + +void CProjGemRB::OnFlag6() +{ + the_projectile.header.extflags^=PROJ_CURVE; + UpdateData(UD_DISPLAY); +} + +void CProjGemRB::OnFlag7() +{ + the_projectile.header.extflags^=PROJ_RANDOM; + UpdateData(UD_DISPLAY); +} + +void CProjGemRB::OnFlag8() +{ + the_projectile.header.extflags^=PROJ_PILLAR; + UpdateData(UD_DISPLAY); +} Modified: chitem/trunk/ProjGemRB.h =================================================================== --- chitem/trunk/ProjGemRB.h 2009-06-14 15:27:56 UTC (rev 6427) +++ chitem/trunk/ProjGemRB.h 2009-06-14 15:46:51 UTC (rev 6428) @@ -39,6 +39,10 @@ afx_msg void OnFlag2(); afx_msg void OnFlag3(); afx_msg void OnFlag4(); + afx_msg void OnFlag5(); + afx_msg void OnFlag6(); + afx_msg void OnFlag7(); + afx_msg void OnFlag8(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: chitem/trunk/chitem.clw =================================================================== --- chitem/trunk/chitem.clw 2009-06-14 15:27:56 UTC (rev 6427) +++ chitem/trunk/chitem.clw 2009-06-14 15:46:51 UTC (rev 6428) @@ -2,7 +2,7 @@ [General Info] Version=1 -LastClass=CChitemDlg +LastClass=CProjGemRB LastTemplate=CDialog NewFileInclude1=#include "stdafx.h" NewFileInclude2=#include "chitem.h" @@ -232,140 +232,140 @@ Resource123=IDD_GAMEGENERAL Class98=IcewindCre Resource124=IDR_SHORTCUT -Resource125=IDD_ANIMDIALOG -Resource126=IDD_SAVHANDLE (English (U.S.)) -Resource127=IDR_PROJECT (English (U.S.)) -Resource128=IDD_CREATUREICONS (English (U.S.)) -Resource129=IDR_SCRIPT (English (U.S.)) -Resource130=IDD_EDIT (English (U.S.)) -Resource131=IDD_SCRIPTEDIT (English (U.S.)) -Resource132=IDD_SEARCHNODE (English (U.S.)) -Resource133=IDR_2DA (English (U.S.)) -Resource134=IDD_STOREGENERAL (English (U.S.)) -Resource135=IDR_IDS (English (U.S.)) -Resource136=IDD_SPELLEDIT (English (U.S.)) -Resource137=IDD_WEDTILE (English (U.S.)) -Resource138=IDD_ITEMEXTRA (English (U.S.)) -Resource139=IDD_AREATRIGGERSTRINGS (English (U.S.)) -Resource140=IDD_AREASPAWN (English (U.S.)) -Resource141=IDD_CREATUREIWD (English (U.S.)) -Resource142=IDD_AREAEDIT (English (U.S.)) -Resource143=IDR_BAMMENU (English (U.S.)) -Resource144=IDD_AREAMAP (English (U.S.)) -Resource145=IDR_CHITIN (English (U.S.)) -Resource146=IDD_AREAAMBIENT (English (U.S.)) -Resource147=IDD_WEDPOLY (English (U.S.)) -Resource148=IDD_PANICBUTTON (English (U.S.)) -Resource149=IDD_CREATURERES (English (U.S.)) -Resource150=IDR_EFFECT (English (U.S.)) -Resource151=IDD_CREATUREIWD2 (English (U.S.)) -Resource152=IDR_SPELL (English (U.S.)) -Resource153=IDD_AREATRIGGER (English (U.S.)) -Resource154=IDD_PROJEDIT (English (U.S.)) -Resource155=IDD_CREATUREPST (English (U.S.)) -Resource156=IDR_SRC (English (U.S.)) -Resource157=IDD_GAMEGENERAL (English (U.S.)) -Resource158=IDR_MENUBAR (English (U.S.)) -Resource159=IDD_ADDLINK (English (U.S.)) -Resource160=IDD_SRCEDIT (English (U.S.)) -Resource161=IDD_STORERENTAL (English (U.S.)) -Resource162=IDR_STORE (English (U.S.)) -Resource163=IDD_VVCEDIT (English (U.S.)) -Resource164=IDD_POLYGON (English (U.S.)) -Resource165=IDD_ITEMICONS (English (U.S.)) -Resource166=IDD_AREAENTRANCE (English (U.S.)) -Resource167=IDD_CREATUREEFF (English (U.S.)) -Resource168=IDR_MUSIC (English (U.S.)) -Resource169=IDD_SPELLEFFECT (English (U.S.)) -Resource170=IDD_CFB (English (U.S.)) -Resource171=IDD_AREAANIM (English (U.S.)) -Resource172=IDD_CREATUREOVR (English (U.S.)) -Resource173=IDD_PALETTE (English (U.S.)) -Resource174=IDD_CREATUREUNKNOWN (English (U.S.)) -Resource175=IDD_TEXTVIEW (English (U.S.)) -Resource176=IDR_TREEMENU (English (U.S.)) -Resource177=IDD_STRREFDLG (English (U.S.)) -Resource178=IDD_STOREEXTRA (English (U.S.)) -Resource179=IDD_CREATUREEDIT (English (U.S.)) -Resource180=IDD_AREAINT (English (U.S.)) -Resource181=IDD_MASSCLEAR (English (U.S.)) -Resource182=IDD_PROJGEMRB (English (U.S.)) -Resource183=IDD_ITEMPICKER (English (U.S.)) -Resource184=IDD_EXTRACT (English (U.S.)) -Resource185=IDR_CHUI (English (U.S.)) -Resource186=IDD_STOREDRINKS (English (U.S.)) -Resource187=IDD_STOREEDIT (English (U.S.)) -Resource188=IDD_AREASONGS (English (U.S.)) -Resource189=IDD_COMPAT (English (U.S.)) -Resource190=IDD_2DAEDIT (English (U.S.)) -Resource191=IDD_CREATURELEVELS (English (U.S.)) -Resource192=IDD_WEDEDIT (English (U.S.)) -Resource193=IDD_SPELLDESC (English (U.S.)) -Resource194=IDR_WEDMENU (English (U.S.)) -Resource195=IDD_AREADOOR (English (U.S.)) -Resource196=IDR_CREATURE (English (U.S.)) -Resource197=IDD_BAMEDIT (English (U.S.)) -Resource198=IDD_PROGRESS (English (U.S.)) -Resource199=IDR_TLKMENU (English (U.S.)) -Resource200=IDD_SCHEDULE (English (U.S.)) -Resource201=IDR_ITEM (English (U.S.)) -Resource202=IDD_TISDIALOG (English (U.S.)) -Resource203=IDD_CREATUREITEMS (English (U.S.)) -Resource204=IDD_GAMEPCINFO (English (U.S.)) -Resource205=IDD_SPELLTOOL (English (U.S.)) -Resource206=IDD_IMAGEVIEW (English (U.S.)) -Resource207=IDD_MUSEDIT (English (U.S.)) -Resource208=IDD_GAMEEDIT (English (U.S.)) -Resource209=IDD_CHECK (English (U.S.)) -Resource210=IDD_ITEMDESC (English (U.S.)) -Resource211=IDD_VARIABLES (English (U.S.)) -Resource212=IDD_ITEMEFFECT (English (U.S.)) -Resource213=IDD_PROJEXT (English (U.S.)) -Resource214=IDD_EXTRACT2 (English (U.S.)) -Resource215=IDD_AREAACTOR (English (U.S.)) -Resource216=IDD_CHITEM_DIALOG (English (U.S.)) -Resource217=IDD_IDSEDIT (English (U.S.)) -Resource218=IDD_CHUIEDIT (English (U.S.)) -Resource219=IDD_IAPDIALOG (English (U.S.)) -Resource220=IDD_SPELLEQUIP (English (U.S.)) -Resource221=IDD_FINDITEM (English (U.S.)) -Resource222=IDD_ITEMEDIT (English (U.S.)) -Resource223=IDD_ITEMUSE (English (U.S.)) -Resource224=IDD_DIALOGEDIT (English (U.S.)) -Resource225=IDD_AREAGENERAL (English (U.S.)) -Resource226=IDD_ITEMEQUIP (English (U.S.)) -Resource227=IDD_SHOWLOG (English (U.S.)) -Resource228=IDD_KEYEDIT (English (U.S.)) -Resource229=IDD_CREATURESTRINGS (English (U.S.)) -Resource230=IDD_COLORPICKER (English (U.S.)) -Resource231=IDD_WEIDU (English (U.S.)) -Resource232=IDD_AREAPROJ (English (U.S.)) -Resource233=IDD_CREATUREGENERAL (English (U.S.)) -Resource234=IDD_AREACONTAINER (English (U.S.)) -Resource235=IDR_VVC (English (U.S.)) -Resource236=IDD_ABOUTBOX (English (U.S.)) -Resource237=IDD_CREATURESKILLS (English (U.S.)) -Resource238=IDR_AREA (English (U.S.)) -Resource239=IDD_MOSEDIT (English (U.S.)) -Resource240=IDD_SPELLGENERAL (English (U.S.)) -Resource241=IDR_TILE (English (U.S.)) -Resource242=IDD_AREAVARIABLE (English (U.S.)) -Resource243=IDD_SPELLEXTRA (English (U.S.)) -Resource244=IDD_STOREITEMS (English (U.S.)) -Resource245=IDD_MAPLINK (English (U.S.)) +Resource125=IDR_SRC (English (U.S.)) +Resource126=IDD_CREATUREIWD (English (U.S.)) +Resource127=IDD_ITEMEFFECT (English (U.S.)) +Resource128=IDD_IDSEDIT (English (U.S.)) +Resource129=IDD_ITEMICONS (English (U.S.)) +Resource130=IDD_STOREDRINKS (English (U.S.)) +Resource131=IDD_GAMESTATS (English (U.S.)) +Resource132=IDD_WEDEDIT (English (U.S.)) +Resource133=IDD_ITEMPICKER (English (U.S.)) +Resource134=IDD_AREAACTOR (English (U.S.)) +Resource135=IDD_GAMEEDIT (English (U.S.)) +Resource136=IDD_SPELLEXTRA (English (U.S.)) +Resource137=IDR_TREEMENU (English (U.S.)) +Resource138=IDD_CREATUREEDIT (English (U.S.)) +Resource139=IDR_2DA (English (U.S.)) +Resource140=IDD_PROJEDIT (English (U.S.)) +Resource141=IDR_PROJECT (English (U.S.)) +Resource142=IDD_TISDIALOG (English (U.S.)) +Resource143=IDR_CHITIN (English (U.S.)) +Resource144=IDR_EFFECT (English (U.S.)) +Resource145=IDD_AREASPAWN (English (U.S.)) +Resource146=IDD_SHOWLOG (English (U.S.)) +Resource147=IDD_AREAPROJ (English (U.S.)) +Resource148=IDR_TILE (English (U.S.)) +Resource149=IDD_IAPDIALOG (English (U.S.)) +Resource150=IDD_CHITEM_DIALOG (English (U.S.)) +Resource151=IDD_STOREEDIT (English (U.S.)) +Resource152=IDD_CREATURESTRINGS (English (U.S.)) +Resource153=IDD_MAPLINK (English (U.S.)) +Resource154=IDD_AREAEDIT (English (U.S.)) +Resource155=IDD_ITEMEQUIP (English (U.S.)) +Resource156=IDD_STOREGENERAL (English (U.S.)) +Resource157=IDR_SCRIPT (English (U.S.)) +Resource158=IDR_WEDMENU (English (U.S.)) +Resource159=IDD_WEDPOLY (English (U.S.)) +Resource160=IDR_STORE (English (U.S.)) +Resource161=IDD_AREATRIGGER (English (U.S.)) +Resource162=IDD_ABOUTBOX (English (U.S.)) +Resource163=IDD_EXTRACT2 (English (U.S.)) +Resource164=IDR_CREATURE (English (U.S.)) +Resource165=IDD_SPELLEQUIP (English (U.S.)) +Resource166=IDD_MAPEDIT (English (U.S.)) +Resource167=IDD_CREATUREOVR (English (U.S.)) +Resource168=IDD_VVCEDIT (English (U.S.)) +Resource169=IDD_AREACONTAINER (English (U.S.)) +Resource170=IDD_AREAGENERAL (English (U.S.)) +Resource171=IDD_CREATUREPST (English (U.S.)) +Resource172=IDR_MUSIC (English (U.S.)) +Resource173=IDD_AREAANIM (English (U.S.)) +Resource174=IDD_CREATURESKILLS (English (U.S.)) +Resource175=IDR_WORLDMAP (English (U.S.)) +Resource176=IDD_ANIMDIALOG +Resource177=IDD_GAMEPCINFO (English (U.S.)) +Resource178=IDD_CREATUREGENERAL (English (U.S.)) +Resource179=IDD_AREAENTRANCE (English (U.S.)) +Resource180=IDD_STRREFDLG (English (U.S.)) +Resource181=IDD_PROJGEMRB (English (U.S.)) +Resource182=IDD_VARIABLES (English (U.S.)) +Resource183=IDD_SPELLEFFECT (English (U.S.)) +Resource184=IDD_SPELLEDIT (English (U.S.)) +Resource185=IDR_IDS (English (U.S.)) +Resource186=IDR_AREA (English (U.S.)) +Resource187=IDD_EXTRACT (English (U.S.)) +Resource188=IDD_SCRIPTEDIT (English (U.S.)) +Resource189=IDD_EFFEDIT (English (U.S.)) +Resource190=IDD_SRCEDIT (English (U.S.)) +Resource191=IDD_AREATRIGGERSTRINGS (English (U.S.)) +Resource192=IDD_CREATURELEVELS (English (U.S.)) +Resource193=IDD_AREAINT (English (U.S.)) +Resource194=IDD_STOREITEMS (English (U.S.)) +Resource195=IDD_PANICBUTTON (English (U.S.)) +Resource196=IDD_PROGRESS (English (U.S.)) +Resource197=IDD_CREATUREICONS (English (U.S.)) +Resource198=IDD_PALETTE (English (U.S.)) +Resource199=IDD_ITEMGENERAL (English (U.S.)) +Resource200=IDD_PROJEXT (English (U.S.)) +Resource201=IDD_WEIDU (English (U.S.)) +Resource202=IDR_MENUBAR (English (U.S.)) +Resource203=IDD_SPELLTOOL (English (U.S.)) +Resource204=IDR_VVC (English (U.S.)) +Resource205=IDR_ITEM (English (U.S.)) +Resource206=IDD_COMPAT (English (U.S.)) +Resource207=IDD_CREATUREIWD2 (English (U.S.)) +Resource208=IDD_SEARCHNODE (English (U.S.)) +Resource209=IDD_IMAGEVIEW (English (U.S.)) +Resource210=IDD_BAMEDIT (English (U.S.)) +Resource211=IDD_MOSEDIT (English (U.S.)) +Resource212=IDD_SPELLDESC (English (U.S.)) +Resource213=IDD_MASSCLEAR (English (U.S.)) +Resource214=IDD_AREAVARIABLE (English (U.S.)) +Resource215=IDD_ADDLINK (English (U.S.)) +Resource216=IDD_STOREEXTRA (English (U.S.)) +Resource217=IDD_AREAMAP (English (U.S.)) +Resource218=IDR_SPELL (English (U.S.)) +Resource219=IDD_POLYGON (English (U.S.)) +Resource220=IDD_SAVHANDLE (English (U.S.)) +Resource221=IDD_SPELLGENERAL (English (U.S.)) +Resource222=IDD_ITEMDESC (English (U.S.)) +Resource223=IDD_CREATUREUNKNOWN (English (U.S.)) +Resource224=IDD_CREATUREEFF (English (U.S.)) +Resource225=IDD_DIALOGEDIT (English (U.S.)) +Resource226=IDD_ITEMEDIT (English (U.S.)) +Resource227=IDD_GAMEGENERAL (English (U.S.)) +Resource228=IDR_BAMMENU (English (U.S.)) +Resource229=IDD_COLORPICKER (English (U.S.)) +Resource230=IDD_TEXTVIEW (English (U.S.)) +Resource231=IDD_STORERENTAL (English (U.S.)) +Resource232=IDR_CHUI (English (U.S.)) +Resource233=IDD_2DAEDIT (English (U.S.)) +Resource234=IDD_AREASONGS (English (U.S.)) +Resource235=IDR_GAME (English (U.S.)) +Resource236=IDD_ITEMEXTRA (English (U.S.)) +Resource237=IDD_EDIT (English (U.S.)) +Resource238=IDD_CHECK (English (U.S.)) +Resource239=IDD_CHUIEDIT (English (U.S.)) +Resource240=IDD_CREATURERES (English (U.S.)) +Resource241=IDD_CFB (English (U.S.)) +Resource242=IDD_MUSEDIT (English (U.S.)) +Resource243=IDD_AREAAMBIENT (English (U.S.)) +Resource244=IDD_SCHEDULE (English (U.S.)) +Resource245=IDD_WEDTILE (English (U.S.)) Class99=CAreaTriggerString Class100=CPCInfo -Resource246=IDD_GAMESTATS (English (U.S.)) +Resource246=IDR_TLKMENU (English (U.S.)) Class101=CCreatureOverlay -Resource247=IDD_ITEMGENERAL (English (U.S.)) +Resource247=IDD_ITEMUSE (English (U.S.)) Class102=IWD2Creature -Resource248=IDD_MAPEDIT (English (U.S.)) +Resource248=IDD_KEYEDIT (English (U.S.)) Class103=CAnimDialog -Resource249=IDR_WORLDMAP (English (U.S.)) +Resource249=IDD_FINDITEM (English (U.S.)) Class104=CCreatureLevels -Resource250=IDD_EFFEDIT (English (U.S.)) +Resource250=IDD_CREATUREITEMS (English (U.S.)) Class105=CAreaProj -Resource251=IDR_GAME (English (U.S.)) +Resource251=IDD_AREADOOR (English (U.S.)) Class106=CProjGemRB Resource252=IDR_SHORTCUT (English (U.S.)) @@ -10272,7 +10272,7 @@ [DLG:IDD_PROJGEMRB (English (U.S.))] Type=1 Class=CProjGemRB -ControlCount=7 +ControlCount=11 Control1=IDOK,button,1342242816 Control2=IDC_FLAGS,edit,1350631552 Control3=IDC_STATIC,static,1342308352 @@ -10280,6 +10280,10 @@ Control5=IDC_FLAG2,button,1342242819 Control6=IDC_FLAG3,button,1342242819 Control7=IDC_FLAG4,button,1342242819 +Control8=IDC_FLAG5,button,1342242819 +Control9=IDC_FLAG6,button,1342242819 +Control10=IDC_FLAG7,button,1342242819 +Control11=IDC_FLAG8,button,1342242819 [CLS:CProjGemRB] Type=0 @@ -10287,6 +10291,6 @@ ImplementationFile=ProjGemRB.cpp BaseClass=CDialog Filter=D -LastObject=IDC_FLAG4 +LastObject=CProjGemRB VirtualFilter=dWC Modified: chitem/trunk/chitem.rc =================================================================== --- chitem/trunk/chitem.rc 2009-06-14 15:27:56 UTC (rev 6427) +++ chitem/trunk/chitem.rc 2009-06-14 15:46:51 UTC (rev 6428) @@ -5318,16 +5318,24 @@ FONT 8, "MS Sans Serif" BEGIN PUSHBUTTON "Back",IDOK,170,143,50,14 - EDITTEXT IDC_FLAGS,9,20,48,14,ES_AUTOHSCROLL + EDITTEXT IDC_FLAGS,9,19,48,14,ES_AUTOHSCROLL LTEXT "Additional flags",IDC_STATIC,9,7,48,8 CONTROL "Bounce",IDC_FLAG1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 9,39,41,10 + 9,37,41,10 CONTROL "Continue",IDC_FLAG2,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,9,54,44,10 + WS_TABSTOP,9,51,44,10 CONTROL "Freeze on hit",IDC_FLAG3,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,9,69,57,10 + WS_TABSTOP,9,65,57,10 CONTROL "No travel path",IDC_FLAG4,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,9,84,61,10 + WS_TABSTOP,9,79,61,10 + CONTROL "Oriented trail",IDC_FLAG5,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,9,93,55,10 + CONTROL "Curved path",IDC_FLAG6,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,9,107,55,10 + CONTROL "Random frame",IDC_FLAG7,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,9,121,62,10 + CONTROL "Pillar",IDC_FLAG8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 9,135,31,10 END This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-06-15 18:21:28
|
Revision: 6459 http://gemrb.svn.sourceforge.net/gemrb/?rev=6459&view=rev Author: avenger_teambg Date: 2009-06-15 18:21:26 +0000 (Mon, 15 Jun 2009) Log Message: ----------- dltcep update (gemrb specific projectile flags) Modified Paths: -------------- chitem/trunk/Chitem.h chitem/trunk/ProjGemRB.cpp chitem/trunk/ProjGemRB.h chitem/trunk/chitem.clw chitem/trunk/chitem.dsp chitem/trunk/chitem.rc Modified: chitem/trunk/Chitem.h =================================================================== --- chitem/trunk/Chitem.h 2009-06-15 18:19:50 UTC (rev 6458) +++ chitem/trunk/Chitem.h 2009-06-15 18:21:26 UTC (rev 6459) @@ -529,14 +529,15 @@ #define PROJ_AFFECT_ONE 0x8000 //extended flags for gemrb -#define PROJ_BOUNCE 1 //bounce from walls -#define PROJ_CONTINUE 2 //continue as travel projectile after triggered -#define PROJ_FREEZE 4 //freeze after trigger and slowly fade out -#define PROJ_NO_TRAVEL 8 //appear immediately on target -#define PROJ_TRAIL_FACE 16 //trail bams also use face -#define PROJ_CURVE 32 //curved path -#define PROJ_RANDOM 64 //random starting frame -#define PROJ_PILLAR 128 //pillar projectile +#define PROJ_BOUNCE 1 //bounce from walls +#define PROJ_CONTINUE 2 //continue as travel projectile after triggered +#define PROJ_FREEZE 4 //freeze after trigger and slowly fade out +#define PROJ_NO_TRAVEL 8 //appear immediately on target +#define PROJ_TRAIL_FACE 16 //trail bams also use face +#define PROJ_CURVE 32 //curved path +#define PROJ_RANDOM 64 //random starting frame +#define PROJ_PILLAR 128 //pillar projectile +#define PROJ_TRANSLUCENT 256 //half-transparent travel projectile #define TRANSPARENT_GREEN 0x00ff00 Modified: chitem/trunk/ProjGemRB.cpp =================================================================== --- chitem/trunk/ProjGemRB.cpp 2009-06-15 18:19:50 UTC (rev 6458) +++ chitem/trunk/ProjGemRB.cpp 2009-06-15 18:21:26 UTC (rev 6459) @@ -62,6 +62,7 @@ ON_BN_CLICKED(IDC_FLAG6, OnFlag6) ON_BN_CLICKED(IDC_FLAG7, OnFlag7) ON_BN_CLICKED(IDC_FLAG8, OnFlag8) + ON_BN_CLICKED(IDC_FLAG9, OnFlag9) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -116,3 +117,9 @@ the_projectile.header.extflags^=PROJ_PILLAR; UpdateData(UD_DISPLAY); } + +void CProjGemRB::OnFlag9() +{ + the_projectile.header.extflags^=PROJ_TRANSLUCENT; + UpdateData(UD_DISPLAY); +} Modified: chitem/trunk/ProjGemRB.h =================================================================== --- chitem/trunk/ProjGemRB.h 2009-06-15 18:19:50 UTC (rev 6458) +++ chitem/trunk/ProjGemRB.h 2009-06-15 18:21:26 UTC (rev 6459) @@ -43,6 +43,7 @@ afx_msg void OnFlag6(); afx_msg void OnFlag7(); afx_msg void OnFlag8(); + afx_msg void OnFlag9(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: chitem/trunk/chitem.clw =================================================================== --- chitem/trunk/chitem.clw 2009-06-15 18:19:50 UTC (rev 6458) +++ chitem/trunk/chitem.clw 2009-06-15 18:21:26 UTC (rev 6459) @@ -232,140 +232,140 @@ Resource123=IDD_GAMEGENERAL Class98=IcewindCre Resource124=IDR_SHORTCUT -Resource125=IDR_SRC (English (U.S.)) -Resource126=IDD_CREATUREIWD (English (U.S.)) -Resource127=IDD_ITEMEFFECT (English (U.S.)) -Resource128=IDD_IDSEDIT (English (U.S.)) -Resource129=IDD_ITEMICONS (English (U.S.)) -Resource130=IDD_STOREDRINKS (English (U.S.)) -Resource131=IDD_GAMESTATS (English (U.S.)) -Resource132=IDD_WEDEDIT (English (U.S.)) -Resource133=IDD_ITEMPICKER (English (U.S.)) -Resource134=IDD_AREAACTOR (English (U.S.)) -Resource135=IDD_GAMEEDIT (English (U.S.)) -Resource136=IDD_SPELLEXTRA (English (U.S.)) -Resource137=IDR_TREEMENU (English (U.S.)) -Resource138=IDD_CREATUREEDIT (English (U.S.)) -Resource139=IDR_2DA (English (U.S.)) -Resource140=IDD_PROJEDIT (English (U.S.)) -Resource141=IDR_PROJECT (English (U.S.)) -Resource142=IDD_TISDIALOG (English (U.S.)) -Resource143=IDR_CHITIN (English (U.S.)) -Resource144=IDR_EFFECT (English (U.S.)) -Resource145=IDD_AREASPAWN (English (U.S.)) -Resource146=IDD_SHOWLOG (English (U.S.)) -Resource147=IDD_AREAPROJ (English (U.S.)) -Resource148=IDR_TILE (English (U.S.)) -Resource149=IDD_IAPDIALOG (English (U.S.)) -Resource150=IDD_CHITEM_DIALOG (English (U.S.)) -Resource151=IDD_STOREEDIT (English (U.S.)) -Resource152=IDD_CREATURESTRINGS (English (U.S.)) -Resource153=IDD_MAPLINK (English (U.S.)) -Resource154=IDD_AREAEDIT (English (U.S.)) -Resource155=IDD_ITEMEQUIP (English (U.S.)) -Resource156=IDD_STOREGENERAL (English (U.S.)) -Resource157=IDR_SCRIPT (English (U.S.)) -Resource158=IDR_WEDMENU (English (U.S.)) -Resource159=IDD_WEDPOLY (English (U.S.)) -Resource160=IDR_STORE (English (U.S.)) -Resource161=IDD_AREATRIGGER (English (U.S.)) -Resource162=IDD_ABOUTBOX (English (U.S.)) -Resource163=IDD_EXTRACT2 (English (U.S.)) -Resource164=IDR_CREATURE (English (U.S.)) -Resource165=IDD_SPELLEQUIP (English (U.S.)) -Resource166=IDD_MAPEDIT (English (U.S.)) -Resource167=IDD_CREATUREOVR (English (U.S.)) -Resource168=IDD_VVCEDIT (English (U.S.)) -Resource169=IDD_AREACONTAINER (English (U.S.)) -Resource170=IDD_AREAGENERAL (English (U.S.)) -Resource171=IDD_CREATUREPST (English (U.S.)) -Resource172=IDR_MUSIC (English (U.S.)) -Resource173=IDD_AREAANIM (English (U.S.)) -Resource174=IDD_CREATURESKILLS (English (U.S.)) -Resource175=IDR_WORLDMAP (English (U.S.)) -Resource176=IDD_ANIMDIALOG -Resource177=IDD_GAMEPCINFO (English (U.S.)) -Resource178=IDD_CREATUREGENERAL (English (U.S.)) -Resource179=IDD_AREAENTRANCE (English (U.S.)) -Resource180=IDD_STRREFDLG (English (U.S.)) -Resource181=IDD_PROJGEMRB (English (U.S.)) -Resource182=IDD_VARIABLES (English (U.S.)) -Resource183=IDD_SPELLEFFECT (English (U.S.)) -Resource184=IDD_SPELLEDIT (English (U.S.)) -Resource185=IDR_IDS (English (U.S.)) -Resource186=IDR_AREA (English (U.S.)) -Resource187=IDD_EXTRACT (English (U.S.)) -Resource188=IDD_SCRIPTEDIT (English (U.S.)) -Resource189=IDD_EFFEDIT (English (U.S.)) -Resource190=IDD_SRCEDIT (English (U.S.)) -Resource191=IDD_AREATRIGGERSTRINGS (English (U.S.)) -Resource192=IDD_CREATURELEVELS (English (U.S.)) -Resource193=IDD_AREAINT (English (U.S.)) -Resource194=IDD_STOREITEMS (English (U.S.)) -Resource195=IDD_PANICBUTTON (English (U.S.)) -Resource196=IDD_PROGRESS (English (U.S.)) -Resource197=IDD_CREATUREICONS (English (U.S.)) -Resource198=IDD_PALETTE (English (U.S.)) -Resource199=IDD_ITEMGENERAL (English (U.S.)) -Resource200=IDD_PROJEXT (English (U.S.)) -Resource201=IDD_WEIDU (English (U.S.)) -Resource202=IDR_MENUBAR (English (U.S.)) -Resource203=IDD_SPELLTOOL (English (U.S.)) -Resource204=IDR_VVC (English (U.S.)) -Resource205=IDR_ITEM (English (U.S.)) -Resource206=IDD_COMPAT (English (U.S.)) -Resource207=IDD_CREATUREIWD2 (English (U.S.)) -Resource208=IDD_SEARCHNODE (English (U.S.)) -Resource209=IDD_IMAGEVIEW (English (U.S.)) -Resource210=IDD_BAMEDIT (English (U.S.)) -Resource211=IDD_MOSEDIT (English (U.S.)) -Resource212=IDD_SPELLDESC (English (U.S.)) -Resource213=IDD_MASSCLEAR (English (U.S.)) -Resource214=IDD_AREAVARIABLE (English (U.S.)) -Resource215=IDD_ADDLINK (English (U.S.)) -Resource216=IDD_STOREEXTRA (English (U.S.)) -Resource217=IDD_AREAMAP (English (U.S.)) -Resource218=IDR_SPELL (English (U.S.)) -Resource219=IDD_POLYGON (English (U.S.)) -Resource220=IDD_SAVHANDLE (English (U.S.)) -Resource221=IDD_SPELLGENERAL (English (U.S.)) -Resource222=IDD_ITEMDESC (English (U.S.)) -Resource223=IDD_CREATUREUNKNOWN (English (U.S.)) -Resource224=IDD_CREATUREEFF (English (U.S.)) -Resource225=IDD_DIALOGEDIT (English (U.S.)) -Resource226=IDD_ITEMEDIT (English (U.S.)) -Resource227=IDD_GAMEGENERAL (English (U.S.)) -Resource228=IDR_BAMMENU (English (U.S.)) -Resource229=IDD_COLORPICKER (English (U.S.)) -Resource230=IDD_TEXTVIEW (English (U.S.)) -Resource231=IDD_STORERENTAL (English (U.S.)) -Resource232=IDR_CHUI (English (U.S.)) -Resource233=IDD_2DAEDIT (English (U.S.)) -Resource234=IDD_AREASONGS (English (U.S.)) -Resource235=IDR_GAME (English (U.S.)) -Resource236=IDD_ITEMEXTRA (English (U.S.)) -Resource237=IDD_EDIT (English (U.S.)) -Resource238=IDD_CHECK (English (U.S.)) -Resource239=IDD_CHUIEDIT (English (U.S.)) -Resource240=IDD_CREATURERES (English (U.S.)) -Resource241=IDD_CFB (English (U.S.)) -Resource242=IDD_MUSEDIT (English (U.S.)) -Resource243=IDD_AREAAMBIENT (English (U.S.)) -Resource244=IDD_SCHEDULE (English (U.S.)) -Resource245=IDD_WEDTILE (English (U.S.)) +Resource125=IDD_PANICBUTTON (English (U.S.)) +Resource126=IDD_CREATURESTRINGS (English (U.S.)) +Resource127=IDD_TEXTVIEW (English (U.S.)) +Resource128=IDD_VARIABLES (English (U.S.)) +Resource129=IDD_MOSEDIT (English (U.S.)) +Resource130=IDD_AREATRIGGER (English (U.S.)) +Resource131=IDD_CREATUREICONS (English (U.S.)) +Resource132=IDD_SPELLDESC (English (U.S.)) +Resource133=IDD_CREATUREPST (English (U.S.)) +Resource134=IDR_2DA (English (U.S.)) +Resource135=IDD_VVCEDIT (English (U.S.)) +Resource136=IDR_CREATURE (English (U.S.)) +Resource137=IDD_SEARCHNODE (English (U.S.)) +Resource138=IDR_WEDMENU (English (U.S.)) +Resource139=IDD_AREAANIM (English (U.S.)) +Resource140=IDR_MUSIC (English (U.S.)) +Resource141=IDD_GAMEGENERAL (English (U.S.)) +Resource142=IDD_EXTRACT2 (English (U.S.)) +Resource143=IDD_CREATUREEFF (English (U.S.)) +Resource144=IDD_MAPEDIT (English (U.S.)) +Resource145=IDR_SRC (English (U.S.)) +Resource146=IDD_PALETTE (English (U.S.)) +Resource147=IDD_AREACONTAINER (English (U.S.)) +Resource148=IDD_STRREFDLG (English (U.S.)) +Resource149=IDD_COMPAT (English (U.S.)) +Resource150=IDD_KEYEDIT (English (U.S.)) +Resource151=IDD_CREATUREIWD (English (U.S.)) +Resource152=IDD_ABOUTBOX (English (U.S.)) +Resource153=IDD_STOREEDIT (English (U.S.)) +Resource154=IDR_PROJECT (English (U.S.)) +Resource155=IDD_POLYGON (English (U.S.)) +Resource156=IDD_SHOWLOG (English (U.S.)) +Resource157=IDD_EDIT (English (U.S.)) +Resource158=IDD_AREAPROJ (English (U.S.)) +Resource159=IDD_SPELLEFFECT (English (U.S.)) +Resource160=IDD_GAMEEDIT (English (U.S.)) +Resource161=IDR_CHUI (English (U.S.)) +Resource162=IDD_TISDIALOG (English (U.S.)) +Resource163=IDR_SCRIPT (English (U.S.)) +Resource164=IDD_CREATUREITEMS (English (U.S.)) +Resource165=IDR_AREA (English (U.S.)) +Resource166=IDD_CFB (English (U.S.)) +Resource167=IDD_AREAAMBIENT (English (U.S.)) +Resource168=IDD_COLORPICKER (English (U.S.)) +Resource169=IDD_ITEMEDIT (English (U.S.)) +Resource170=IDR_VVC (English (U.S.)) +Resource171=IDD_CREATUREGENERAL (English (U.S.)) +Resource172=IDD_AREATRIGGERSTRINGS (English (U.S.)) +Resource173=IDD_STOREEXTRA (English (U.S.)) +Resource174=IDD_WEIDU (English (U.S.)) +Resource175=IDD_STOREDRINKS (English (U.S.)) +Resource176=IDD_AREADOOR (English (U.S.)) +Resource177=IDD_CREATURERES (English (U.S.)) +Resource178=IDR_CHITIN (English (U.S.)) +Resource179=IDR_TILE (English (U.S.)) +Resource180=IDD_SPELLGENERAL (English (U.S.)) +Resource181=IDD_WEDEDIT (English (U.S.)) +Resource182=IDD_CREATURELEVELS (English (U.S.)) +Resource183=IDR_GAME (English (U.S.)) +Resource184=IDR_TLKMENU (English (U.S.)) +Resource185=IDD_SCRIPTEDIT (English (U.S.)) +Resource186=IDD_MAPLINK (English (U.S.)) +Resource187=IDD_GAMESTATS (English (U.S.)) +Resource188=IDD_BAMEDIT (English (U.S.)) +Resource189=IDD_CREATUREOVR (English (U.S.)) +Resource190=IDD_PROJEDIT (English (U.S.)) +Resource191=IDD_CREATUREUNKNOWN (English (U.S.)) +Resource192=IDD_AREAINT (English (U.S.)) +Resource193=IDD_FINDITEM (English (U.S.)) +Resource194=IDD_CREATUREIWD2 (English (U.S.)) +Resource195=IDD_ITEMUSE (English (U.S.)) +Resource196=IDD_SPELLTOOL (English (U.S.)) +Resource197=IDD_ANIMDIALOG +Resource198=IDR_ITEM (English (U.S.)) +Resource199=IDD_AREAMAP (English (U.S.)) +Resource200=IDD_EXTRACT (English (U.S.)) +Resource201=IDD_WEDPOLY (English (U.S.)) +Resource202=IDD_AREAVARIABLE (English (U.S.)) +Resource203=IDD_AREAACTOR (English (U.S.)) +Resource204=IDD_IAPDIALOG (English (U.S.)) +Resource205=IDD_ADDLINK (English (U.S.)) +Resource206=IDD_PROJGEMRB (English (U.S.)) +Resource207=IDD_AREASONGS (English (U.S.)) +Resource208=IDD_ITEMEFFECT (English (U.S.)) +Resource209=IDD_MASSCLEAR (English (U.S.)) +Resource210=IDR_TREEMENU (English (U.S.)) +Resource211=IDD_STOREITEMS (English (U.S.)) +Resource212=IDR_WORLDMAP (English (U.S.)) +Resource213=IDD_SPELLEDIT (English (U.S.)) +Resource214=IDD_ITEMICONS (English (U.S.)) +Resource215=IDD_ITEMPICKER (English (U.S.)) +Resource216=IDR_BAMMENU (English (U.S.)) +Resource217=IDD_AREAENTRANCE (English (U.S.)) +Resource218=IDD_PROJEXT (English (U.S.)) +Resource219=IDD_AREASPAWN (English (U.S.)) +Resource220=IDD_ITEMDESC (English (U.S.)) +Resource221=IDR_SPELL (English (U.S.)) +Resource222=IDR_STORE (English (U.S.)) +Resource223=IDD_CHITEM_DIALOG (English (U.S.)) +Resource224=IDD_SPELLEXTRA (English (U.S.)) +Resource225=IDD_ITEMEQUIP (English (U.S.)) +Resource226=IDD_SRCEDIT (English (U.S.)) +Resource227=IDD_CREATURESKILLS (English (U.S.)) +Resource228=IDD_DIALOGEDIT (English (U.S.)) +Resource229=IDD_ITEMEXTRA (English (U.S.)) +Resource230=IDD_CREATUREEDIT (English (U.S.)) +Resource231=IDD_MUSEDIT (English (U.S.)) +Resource232=IDD_SAVHANDLE (English (U.S.)) +Resource233=IDD_EFFEDIT (English (U.S.)) +Resource234=IDD_CHECK (English (U.S.)) +Resource235=IDD_2DAEDIT (English (U.S.)) +Resource236=IDR_MENUBAR (English (U.S.)) +Resource237=IDD_STORERENTAL (English (U.S.)) +Resource238=IDD_WEDTILE (English (U.S.)) +Resource239=IDD_SCHEDULE (English (U.S.)) +Resource240=IDD_IMAGEVIEW (English (U.S.)) +Resource241=IDD_GAMEPCINFO (English (U.S.)) +Resource242=IDD_SPELLEQUIP (English (U.S.)) +Resource243=IDD_PROGRESS (English (U.S.)) +Resource244=IDR_IDS (English (U.S.)) +Resource245=IDD_AREAEDIT (English (U.S.)) Class99=CAreaTriggerString Class100=CPCInfo -Resource246=IDR_TLKMENU (English (U.S.)) +Resource246=IDD_IDSEDIT (English (U.S.)) Class101=CCreatureOverlay -Resource247=IDD_ITEMUSE (English (U.S.)) +Resource247=IDR_EFFECT (English (U.S.)) Class102=IWD2Creature -Resource248=IDD_KEYEDIT (English (U.S.)) +Resource248=IDD_AREAGENERAL (English (U.S.)) Class103=CAnimDialog -Resource249=IDD_FINDITEM (English (U.S.)) +Resource249=IDD_CHUIEDIT (English (U.S.)) Class104=CCreatureLevels -Resource250=IDD_CREATUREITEMS (English (U.S.)) +Resource250=IDD_STOREGENERAL (English (U.S.)) Class105=CAreaProj -Resource251=IDD_AREADOOR (English (U.S.)) +Resource251=IDD_ITEMGENERAL (English (U.S.)) Class106=CProjGemRB Resource252=IDR_SHORTCUT (English (U.S.)) @@ -10272,7 +10272,7 @@ [DLG:IDD_PROJGEMRB (English (U.S.))] Type=1 Class=CProjGemRB -ControlCount=11 +ControlCount=12 Control1=IDOK,button,1342242816 Control2=IDC_FLAGS,edit,1350631552 Control3=IDC_STATIC,static,1342308352 @@ -10284,6 +10284,7 @@ Control9=IDC_FLAG6,button,1342242819 Control10=IDC_FLAG7,button,1342242819 Control11=IDC_FLAG8,button,1342242819 +Control12=IDC_FLAG9,button,1342242819 [CLS:CProjGemRB] Type=0 Modified: chitem/trunk/chitem.dsp =================================================================== --- chitem/trunk/chitem.dsp 2009-06-15 18:19:50 UTC (rev 6458) +++ chitem/trunk/chitem.dsp 2009-06-15 18:21:26 UTC (rev 6459) @@ -273,6 +273,10 @@ # End Source File # Begin Source File +SOURCE=.\ini.cpp +# End Source File +# Begin Source File + SOURCE=.\item.cpp # End Source File # Begin Source File @@ -686,6 +690,10 @@ # End Source File # Begin Source File +SOURCE=.\ini.h +# End Source File +# Begin Source File + SOURCE=.\item.h # End Source File # Begin Source File Modified: chitem/trunk/chitem.rc =================================================================== --- chitem/trunk/chitem.rc 2009-06-15 18:19:50 UTC (rev 6458) +++ chitem/trunk/chitem.rc 2009-06-15 18:21:26 UTC (rev 6459) @@ -5336,6 +5336,8 @@ WS_TABSTOP,9,121,62,10 CONTROL "Pillar",IDC_FLAG8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 9,135,31,10 + CONTROL "Translucent",IDC_FLAG9,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,125,37,53,10 END This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-06-15 20:51:57
|
Revision: 6466 http://gemrb.svn.sourceforge.net/gemrb/?rev=6466&view=rev Author: avenger_teambg Date: 2009-06-15 20:51:49 +0000 (Mon, 15 Jun 2009) Log Message: ----------- projectile tint flag in dltcep Modified Paths: -------------- chitem/trunk/Chitem.h chitem/trunk/ProjGemRB.cpp chitem/trunk/ProjGemRB.h chitem/trunk/chitem.clw chitem/trunk/chitem.rc Modified: chitem/trunk/Chitem.h =================================================================== --- chitem/trunk/Chitem.h 2009-06-15 20:50:23 UTC (rev 6465) +++ chitem/trunk/Chitem.h 2009-06-15 20:51:49 UTC (rev 6466) @@ -538,6 +538,7 @@ #define PROJ_RANDOM 64 //random starting frame #define PROJ_PILLAR 128 //pillar projectile #define PROJ_TRANSLUCENT 256 //half-transparent travel projectile +#define PROJ_TINTED 512 //tinted by gradient (better than paletted animations) #define TRANSPARENT_GREEN 0x00ff00 Modified: chitem/trunk/ProjGemRB.cpp =================================================================== --- chitem/trunk/ProjGemRB.cpp 2009-06-15 20:50:23 UTC (rev 6465) +++ chitem/trunk/ProjGemRB.cpp 2009-06-15 20:51:49 UTC (rev 6466) @@ -63,6 +63,7 @@ ON_BN_CLICKED(IDC_FLAG7, OnFlag7) ON_BN_CLICKED(IDC_FLAG8, OnFlag8) ON_BN_CLICKED(IDC_FLAG9, OnFlag9) + ON_BN_CLICKED(IDC_FLAG10, OnFlag10) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -123,3 +124,9 @@ the_projectile.header.extflags^=PROJ_TRANSLUCENT; UpdateData(UD_DISPLAY); } + +void CProjGemRB::OnFlag10() +{ + the_projectile.header.extflags^=PROJ_TINTED; + UpdateData(UD_DISPLAY); +} Modified: chitem/trunk/ProjGemRB.h =================================================================== --- chitem/trunk/ProjGemRB.h 2009-06-15 20:50:23 UTC (rev 6465) +++ chitem/trunk/ProjGemRB.h 2009-06-15 20:51:49 UTC (rev 6466) @@ -44,6 +44,7 @@ afx_msg void OnFlag7(); afx_msg void OnFlag8(); afx_msg void OnFlag9(); + afx_msg void OnFlag10(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: chitem/trunk/chitem.clw =================================================================== --- chitem/trunk/chitem.clw 2009-06-15 20:50:23 UTC (rev 6465) +++ chitem/trunk/chitem.clw 2009-06-15 20:51:49 UTC (rev 6466) @@ -232,142 +232,142 @@ Resource123=IDD_GAMEGENERAL Class98=IcewindCre Resource124=IDR_SHORTCUT -Resource125=IDD_PANICBUTTON (English (U.S.)) -Resource126=IDD_CREATURESTRINGS (English (U.S.)) -Resource127=IDD_TEXTVIEW (English (U.S.)) -Resource128=IDD_VARIABLES (English (U.S.)) -Resource129=IDD_MOSEDIT (English (U.S.)) -Resource130=IDD_AREATRIGGER (English (U.S.)) -Resource131=IDD_CREATUREICONS (English (U.S.)) -Resource132=IDD_SPELLDESC (English (U.S.)) -Resource133=IDD_CREATUREPST (English (U.S.)) -Resource134=IDR_2DA (English (U.S.)) -Resource135=IDD_VVCEDIT (English (U.S.)) -Resource136=IDR_CREATURE (English (U.S.)) -Resource137=IDD_SEARCHNODE (English (U.S.)) -Resource138=IDR_WEDMENU (English (U.S.)) -Resource139=IDD_AREAANIM (English (U.S.)) -Resource140=IDR_MUSIC (English (U.S.)) -Resource141=IDD_GAMEGENERAL (English (U.S.)) -Resource142=IDD_EXTRACT2 (English (U.S.)) -Resource143=IDD_CREATUREEFF (English (U.S.)) -Resource144=IDD_MAPEDIT (English (U.S.)) -Resource145=IDR_SRC (English (U.S.)) -Resource146=IDD_PALETTE (English (U.S.)) -Resource147=IDD_AREACONTAINER (English (U.S.)) -Resource148=IDD_STRREFDLG (English (U.S.)) -Resource149=IDD_COMPAT (English (U.S.)) -Resource150=IDD_KEYEDIT (English (U.S.)) -Resource151=IDD_CREATUREIWD (English (U.S.)) -Resource152=IDD_ABOUTBOX (English (U.S.)) -Resource153=IDD_STOREEDIT (English (U.S.)) -Resource154=IDR_PROJECT (English (U.S.)) -Resource155=IDD_POLYGON (English (U.S.)) -Resource156=IDD_SHOWLOG (English (U.S.)) -Resource157=IDD_EDIT (English (U.S.)) -Resource158=IDD_AREAPROJ (English (U.S.)) -Resource159=IDD_SPELLEFFECT (English (U.S.)) -Resource160=IDD_GAMEEDIT (English (U.S.)) -Resource161=IDR_CHUI (English (U.S.)) -Resource162=IDD_TISDIALOG (English (U.S.)) -Resource163=IDR_SCRIPT (English (U.S.)) -Resource164=IDD_CREATUREITEMS (English (U.S.)) -Resource165=IDR_AREA (English (U.S.)) -Resource166=IDD_CFB (English (U.S.)) -Resource167=IDD_AREAAMBIENT (English (U.S.)) -Resource168=IDD_COLORPICKER (English (U.S.)) -Resource169=IDD_ITEMEDIT (English (U.S.)) -Resource170=IDR_VVC (English (U.S.)) -Resource171=IDD_CREATUREGENERAL (English (U.S.)) -Resource172=IDD_AREATRIGGERSTRINGS (English (U.S.)) -Resource173=IDD_STOREEXTRA (English (U.S.)) -Resource174=IDD_WEIDU (English (U.S.)) -Resource175=IDD_STOREDRINKS (English (U.S.)) -Resource176=IDD_AREADOOR (English (U.S.)) -Resource177=IDD_CREATURERES (English (U.S.)) -Resource178=IDR_CHITIN (English (U.S.)) -Resource179=IDR_TILE (English (U.S.)) -Resource180=IDD_SPELLGENERAL (English (U.S.)) -Resource181=IDD_WEDEDIT (English (U.S.)) -Resource182=IDD_CREATURELEVELS (English (U.S.)) -Resource183=IDR_GAME (English (U.S.)) -Resource184=IDR_TLKMENU (English (U.S.)) -Resource185=IDD_SCRIPTEDIT (English (U.S.)) -Resource186=IDD_MAPLINK (English (U.S.)) -Resource187=IDD_GAMESTATS (English (U.S.)) -Resource188=IDD_BAMEDIT (English (U.S.)) -Resource189=IDD_CREATUREOVR (English (U.S.)) -Resource190=IDD_PROJEDIT (English (U.S.)) -Resource191=IDD_CREATUREUNKNOWN (English (U.S.)) -Resource192=IDD_AREAINT (English (U.S.)) -Resource193=IDD_FINDITEM (English (U.S.)) -Resource194=IDD_CREATUREIWD2 (English (U.S.)) -Resource195=IDD_ITEMUSE (English (U.S.)) -Resource196=IDD_SPELLTOOL (English (U.S.)) -Resource197=IDD_ANIMDIALOG -Resource198=IDR_ITEM (English (U.S.)) -Resource199=IDD_AREAMAP (English (U.S.)) -Resource200=IDD_EXTRACT (English (U.S.)) -Resource201=IDD_WEDPOLY (English (U.S.)) -Resource202=IDD_AREAVARIABLE (English (U.S.)) -Resource203=IDD_AREAACTOR (English (U.S.)) -Resource204=IDD_IAPDIALOG (English (U.S.)) -Resource205=IDD_ADDLINK (English (U.S.)) -Resource206=IDD_PROJGEMRB (English (U.S.)) -Resource207=IDD_AREASONGS (English (U.S.)) -Resource208=IDD_ITEMEFFECT (English (U.S.)) -Resource209=IDD_MASSCLEAR (English (U.S.)) -Resource210=IDR_TREEMENU (English (U.S.)) -Resource211=IDD_STOREITEMS (English (U.S.)) -Resource212=IDR_WORLDMAP (English (U.S.)) -Resource213=IDD_SPELLEDIT (English (U.S.)) -Resource214=IDD_ITEMICONS (English (U.S.)) -Resource215=IDD_ITEMPICKER (English (U.S.)) -Resource216=IDR_BAMMENU (English (U.S.)) -Resource217=IDD_AREAENTRANCE (English (U.S.)) -Resource218=IDD_PROJEXT (English (U.S.)) -Resource219=IDD_AREASPAWN (English (U.S.)) -Resource220=IDD_ITEMDESC (English (U.S.)) -Resource221=IDR_SPELL (English (U.S.)) -Resource222=IDR_STORE (English (U.S.)) -Resource223=IDD_CHITEM_DIALOG (English (U.S.)) -Resource224=IDD_SPELLEXTRA (English (U.S.)) -Resource225=IDD_ITEMEQUIP (English (U.S.)) -Resource226=IDD_SRCEDIT (English (U.S.)) -Resource227=IDD_CREATURESKILLS (English (U.S.)) -Resource228=IDD_DIALOGEDIT (English (U.S.)) -Resource229=IDD_ITEMEXTRA (English (U.S.)) -Resource230=IDD_CREATUREEDIT (English (U.S.)) -Resource231=IDD_MUSEDIT (English (U.S.)) -Resource232=IDD_SAVHANDLE (English (U.S.)) -Resource233=IDD_EFFEDIT (English (U.S.)) -Resource234=IDD_CHECK (English (U.S.)) -Resource235=IDD_2DAEDIT (English (U.S.)) -Resource236=IDR_MENUBAR (English (U.S.)) -Resource237=IDD_STORERENTAL (English (U.S.)) -Resource238=IDD_WEDTILE (English (U.S.)) -Resource239=IDD_SCHEDULE (English (U.S.)) -Resource240=IDD_IMAGEVIEW (English (U.S.)) -Resource241=IDD_GAMEPCINFO (English (U.S.)) -Resource242=IDD_SPELLEQUIP (English (U.S.)) -Resource243=IDD_PROGRESS (English (U.S.)) -Resource244=IDR_IDS (English (U.S.)) -Resource245=IDD_AREAEDIT (English (U.S.)) +Resource125=IDD_VARIABLES (English (U.S.)) +Resource126=IDR_MUSIC (English (U.S.)) +Resource127=IDD_EXTRACT2 (English (U.S.)) +Resource128=IDD_TEXTVIEW (English (U.S.)) +Resource129=IDD_ITEMICONS (English (U.S.)) +Resource130=IDR_GAME (English (U.S.)) +Resource131=IDR_PROJECT (English (U.S.)) +Resource132=IDR_MENUBAR (English (U.S.)) +Resource133=IDD_AREAGENERAL (English (U.S.)) +Resource134=IDD_MAPEDIT (English (U.S.)) +Resource135=IDD_SPELLTOOL (English (U.S.)) +Resource136=IDD_AREADOOR (English (U.S.)) +Resource137=IDD_ABOUTBOX (English (U.S.)) +Resource138=IDD_EDIT (English (U.S.)) +Resource139=IDD_CFB (English (U.S.)) +Resource140=IDD_CREATUREITEMS (English (U.S.)) +Resource141=IDD_AREAACTOR (English (U.S.)) +Resource142=IDR_ITEM (English (U.S.)) +Resource143=IDD_COMPAT (English (U.S.)) +Resource144=IDD_FINDITEM (English (U.S.)) +Resource145=IDD_IDSEDIT (English (U.S.)) +Resource146=IDD_AREATRIGGERSTRINGS (English (U.S.)) +Resource147=IDR_CHITIN (English (U.S.)) +Resource148=IDD_STOREITEMS (English (U.S.)) +Resource149=IDD_IAPDIALOG (English (U.S.)) +Resource150=IDD_SPELLGENERAL (English (U.S.)) +Resource151=IDD_PROJEDIT (English (U.S.)) +Resource152=IDD_SHOWLOG (English (U.S.)) +Resource153=IDD_MAPLINK (English (U.S.)) +Resource154=IDD_GAMEEDIT (English (U.S.)) +Resource155=IDD_SPELLEDIT (English (U.S.)) +Resource156=IDD_STOREGENERAL (English (U.S.)) +Resource157=IDD_ITEMPICKER (English (U.S.)) +Resource158=IDD_CREATUREGENERAL (English (U.S.)) +Resource159=IDR_BAMMENU (English (U.S.)) +Resource160=IDD_PROGRESS (English (U.S.)) +Resource161=IDD_2DAEDIT (English (U.S.)) +Resource162=IDD_PALETTE (English (U.S.)) +Resource163=IDD_ADDLINK (English (U.S.)) +Resource164=IDD_ITEMGENERAL (English (U.S.)) +Resource165=IDD_CREATUREEFF (English (U.S.)) +Resource166=IDD_CHUIEDIT (English (U.S.)) +Resource167=IDR_SRC (English (U.S.)) +Resource168=IDD_VVCEDIT (English (U.S.)) +Resource169=IDD_AREACONTAINER (English (U.S.)) +Resource170=IDD_PROJEXT (English (U.S.)) +Resource171=IDR_VVC (English (U.S.)) +Resource172=IDD_AREAENTRANCE (English (U.S.)) +Resource173=IDD_GAMEPCINFO (English (U.S.)) +Resource174=IDD_AREAANIM (English (U.S.)) +Resource175=IDD_SPELLEFFECT (English (U.S.)) +Resource176=IDD_ANIMDIALOG +Resource177=IDR_IDS (English (U.S.)) +Resource178=IDD_GAMESTATS (English (U.S.)) +Resource179=IDD_MOSEDIT (English (U.S.)) +Resource180=IDD_CREATUREIWD2 (English (U.S.)) +Resource181=IDD_ITEMEXTRA (English (U.S.)) +Resource182=IDD_CREATUREEDIT (English (U.S.)) +Resource183=IDD_DIALOGEDIT (English (U.S.)) +Resource184=IDD_SEARCHNODE (English (U.S.)) +Resource185=IDD_STOREEDIT (English (U.S.)) +Resource186=IDD_ITEMEDIT (English (U.S.)) +Resource187=IDD_AREAEDIT (English (U.S.)) +Resource188=IDD_CREATUREIWD (English (U.S.)) +Resource189=IDD_AREASPAWN (English (U.S.)) +Resource190=IDR_CREATURE (English (U.S.)) +Resource191=IDR_TILE (English (U.S.)) +Resource192=IDR_WEDMENU (English (U.S.)) +Resource193=IDD_AREAINT (English (U.S.)) +Resource194=IDD_AREATRIGGER (English (U.S.)) +Resource195=IDD_CREATURELEVELS (English (U.S.)) +Resource196=IDD_ITEMUSE (English (U.S.)) +Resource197=IDD_CREATUREICONS (English (U.S.)) +Resource198=IDD_CREATUREUNKNOWN (English (U.S.)) +Resource199=IDD_SPELLDESC (English (U.S.)) +Resource200=IDD_WEDTILE (English (U.S.)) +Resource201=IDD_STOREEXTRA (English (U.S.)) +Resource202=IDD_WEIDU (English (U.S.)) +Resource203=IDR_EFFECT (English (U.S.)) +Resource204=IDD_EXTRACT (English (U.S.)) +Resource205=IDD_CHITEM_DIALOG (English (U.S.)) +Resource206=IDD_COLORPICKER (English (U.S.)) +Resource207=IDR_CHUI (English (U.S.)) +Resource208=IDD_TISDIALOG (English (U.S.)) +Resource209=IDD_BAMEDIT (English (U.S.)) +Resource210=IDD_CREATURESTRINGS (English (U.S.)) +Resource211=IDD_STOREDRINKS (English (U.S.)) +Resource212=IDD_AREAVARIABLE (English (U.S.)) +Resource213=IDR_TREEMENU (English (U.S.)) +Resource214=IDD_WEDPOLY (English (U.S.)) +Resource215=IDD_KEYEDIT (English (U.S.)) +Resource216=IDD_CREATURERES (English (U.S.)) +Resource217=IDR_WORLDMAP (English (U.S.)) +Resource218=IDD_CHECK (English (U.S.)) +Resource219=IDR_TLKMENU (English (U.S.)) +Resource220=IDD_CREATUREOVR (English (U.S.)) +Resource221=IDD_AREASONGS (English (U.S.)) +Resource222=IDD_AREAAMBIENT (English (U.S.)) +Resource223=IDD_STRREFDLG (English (U.S.)) +Resource224=IDR_SHORTCUT (English (U.S.)) +Resource225=IDD_MASSCLEAR (English (U.S.)) +Resource226=IDD_SPELLEXTRA (English (U.S.)) +Resource227=IDR_2DA (English (U.S.)) +Resource228=IDD_IMAGEVIEW (English (U.S.)) +Resource229=IDD_GAMEGENERAL (English (U.S.)) +Resource230=IDR_SCRIPT (English (U.S.)) +Resource231=IDD_STORERENTAL (English (U.S.)) +Resource232=IDD_EFFEDIT (English (U.S.)) +Resource233=IDD_POLYGON (English (U.S.)) +Resource234=IDD_SAVHANDLE (English (U.S.)) +Resource235=IDD_ITEMEQUIP (English (U.S.)) +Resource236=IDD_CREATURESKILLS (English (U.S.)) +Resource237=IDD_CREATUREPST (English (U.S.)) +Resource238=IDD_ITEMDESC (English (U.S.)) +Resource239=IDR_AREA (English (U.S.)) +Resource240=IDD_SCRIPTEDIT (English (U.S.)) +Resource241=IDD_SCHEDULE (English (U.S.)) +Resource242=IDD_AREAPROJ (English (U.S.)) +Resource243=IDD_PANICBUTTON (English (U.S.)) +Resource244=IDD_SRCEDIT (English (U.S.)) +Resource245=IDR_STORE (English (U.S.)) Class99=CAreaTriggerString Class100=CPCInfo -Resource246=IDD_IDSEDIT (English (U.S.)) +Resource246=IDD_ITEMEFFECT (English (U.S.)) Class101=CCreatureOverlay -Resource247=IDR_EFFECT (English (U.S.)) +Resource247=IDD_MUSEDIT (English (U.S.)) Class102=IWD2Creature -Resource248=IDD_AREAGENERAL (English (U.S.)) +Resource248=IDR_SPELL (English (U.S.)) Class103=CAnimDialog -Resource249=IDD_CHUIEDIT (English (U.S.)) +Resource249=IDD_SPELLEQUIP (English (U.S.)) Class104=CCreatureLevels -Resource250=IDD_STOREGENERAL (English (U.S.)) +Resource250=IDD_AREAMAP (English (U.S.)) Class105=CAreaProj -Resource251=IDD_ITEMGENERAL (English (U.S.)) +Resource251=IDD_WEDEDIT (English (U.S.)) Class106=CProjGemRB -Resource252=IDR_SHORTCUT (English (U.S.)) +Resource252=IDD_PROJGEMRB (English (U.S.)) [CLS:CChitemApp] Type=0 @@ -10272,7 +10272,7 @@ [DLG:IDD_PROJGEMRB (English (U.S.))] Type=1 Class=CProjGemRB -ControlCount=12 +ControlCount=13 Control1=IDOK,button,1342242816 Control2=IDC_FLAGS,edit,1350631552 Control3=IDC_STATIC,static,1342308352 @@ -10285,6 +10285,7 @@ Control10=IDC_FLAG7,button,1342242819 Control11=IDC_FLAG8,button,1342242819 Control12=IDC_FLAG9,button,1342242819 +Control13=IDC_FLAG10,button,1342242819 [CLS:CProjGemRB] Type=0 Modified: chitem/trunk/chitem.rc =================================================================== --- chitem/trunk/chitem.rc 2009-06-15 20:50:23 UTC (rev 6465) +++ chitem/trunk/chitem.rc 2009-06-15 20:51:49 UTC (rev 6466) @@ -5320,10 +5320,10 @@ PUSHBUTTON "Back",IDOK,170,143,50,14 EDITTEXT IDC_FLAGS,9,19,48,14,ES_AUTOHSCROLL LTEXT "Additional flags",IDC_STATIC,9,7,48,8 - CONTROL "Bounce",IDC_FLAG1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 9,37,41,10 - CONTROL "Continue",IDC_FLAG2,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,9,51,44,10 + CONTROL "Bounce from walls",IDC_FLAG1,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,9,37,73,10 + CONTROL "Continue after hit",IDC_FLAG2,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,9,51,69,10 CONTROL "Freeze on hit",IDC_FLAG3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,65,57,10 CONTROL "No travel path",IDC_FLAG4,"Button",BS_AUTOCHECKBOX | @@ -5338,6 +5338,8 @@ 9,135,31,10 CONTROL "Translucent",IDC_FLAG9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,37,53,10 + CONTROL "Tinted by gradient",IDC_FLAG10,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,125,51,73,10 END This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-06-16 20:56:01
|
Revision: 6481 http://gemrb.svn.sourceforge.net/gemrb/?rev=6481&view=rev Author: avenger_teambg Date: 2009-06-16 20:56:00 +0000 (Tue, 16 Jun 2009) Log Message: ----------- new projectile flag (missile iteration) in dltcep Modified Paths: -------------- chitem/trunk/Chitem.h chitem/trunk/ProjGemRB.cpp chitem/trunk/ProjGemRB.h chitem/trunk/chitem.clw chitem/trunk/chitem.rc Modified: chitem/trunk/Chitem.h =================================================================== --- chitem/trunk/Chitem.h 2009-06-16 20:54:18 UTC (rev 6480) +++ chitem/trunk/Chitem.h 2009-06-16 20:56:00 UTC (rev 6481) @@ -539,6 +539,7 @@ #define PROJ_PILLAR 128 //pillar projectile #define PROJ_TRANSLUCENT 256 //half-transparent travel projectile #define PROJ_TINTED 512 //tinted by gradient (better than paletted animations) +#define PROJ_ITERATION 1024 //create another projectile with projectile ID-1 #define TRANSPARENT_GREEN 0x00ff00 Modified: chitem/trunk/ProjGemRB.cpp =================================================================== --- chitem/trunk/ProjGemRB.cpp 2009-06-16 20:54:18 UTC (rev 6480) +++ chitem/trunk/ProjGemRB.cpp 2009-06-16 20:56:00 UTC (rev 6481) @@ -64,6 +64,7 @@ ON_BN_CLICKED(IDC_FLAG8, OnFlag8) ON_BN_CLICKED(IDC_FLAG9, OnFlag9) ON_BN_CLICKED(IDC_FLAG10, OnFlag10) + ON_BN_CLICKED(IDC_FLAG11, OnFlag11) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -130,3 +131,9 @@ the_projectile.header.extflags^=PROJ_TINTED; UpdateData(UD_DISPLAY); } + +void CProjGemRB::OnFlag11() +{ + the_projectile.header.extflags^=PROJ_ITERATION; + UpdateData(UD_DISPLAY); +} Modified: chitem/trunk/ProjGemRB.h =================================================================== --- chitem/trunk/ProjGemRB.h 2009-06-16 20:54:18 UTC (rev 6480) +++ chitem/trunk/ProjGemRB.h 2009-06-16 20:56:00 UTC (rev 6481) @@ -45,6 +45,7 @@ afx_msg void OnFlag8(); afx_msg void OnFlag9(); afx_msg void OnFlag10(); + afx_msg void OnFlag11(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: chitem/trunk/chitem.clw =================================================================== --- chitem/trunk/chitem.clw 2009-06-16 20:54:18 UTC (rev 6480) +++ chitem/trunk/chitem.clw 2009-06-16 20:56:00 UTC (rev 6481) @@ -232,140 +232,140 @@ Resource123=IDD_GAMEGENERAL Class98=IcewindCre Resource124=IDR_SHORTCUT -Resource125=IDD_VARIABLES (English (U.S.)) -Resource126=IDR_MUSIC (English (U.S.)) -Resource127=IDD_EXTRACT2 (English (U.S.)) -Resource128=IDD_TEXTVIEW (English (U.S.)) -Resource129=IDD_ITEMICONS (English (U.S.)) -Resource130=IDR_GAME (English (U.S.)) -Resource131=IDR_PROJECT (English (U.S.)) -Resource132=IDR_MENUBAR (English (U.S.)) -Resource133=IDD_AREAGENERAL (English (U.S.)) -Resource134=IDD_MAPEDIT (English (U.S.)) -Resource135=IDD_SPELLTOOL (English (U.S.)) -Resource136=IDD_AREADOOR (English (U.S.)) -Resource137=IDD_ABOUTBOX (English (U.S.)) -Resource138=IDD_EDIT (English (U.S.)) -Resource139=IDD_CFB (English (U.S.)) -Resource140=IDD_CREATUREITEMS (English (U.S.)) -Resource141=IDD_AREAACTOR (English (U.S.)) -Resource142=IDR_ITEM (English (U.S.)) -Resource143=IDD_COMPAT (English (U.S.)) -Resource144=IDD_FINDITEM (English (U.S.)) -Resource145=IDD_IDSEDIT (English (U.S.)) -Resource146=IDD_AREATRIGGERSTRINGS (English (U.S.)) -Resource147=IDR_CHITIN (English (U.S.)) -Resource148=IDD_STOREITEMS (English (U.S.)) -Resource149=IDD_IAPDIALOG (English (U.S.)) -Resource150=IDD_SPELLGENERAL (English (U.S.)) -Resource151=IDD_PROJEDIT (English (U.S.)) -Resource152=IDD_SHOWLOG (English (U.S.)) -Resource153=IDD_MAPLINK (English (U.S.)) -Resource154=IDD_GAMEEDIT (English (U.S.)) -Resource155=IDD_SPELLEDIT (English (U.S.)) -Resource156=IDD_STOREGENERAL (English (U.S.)) -Resource157=IDD_ITEMPICKER (English (U.S.)) -Resource158=IDD_CREATUREGENERAL (English (U.S.)) -Resource159=IDR_BAMMENU (English (U.S.)) -Resource160=IDD_PROGRESS (English (U.S.)) -Resource161=IDD_2DAEDIT (English (U.S.)) -Resource162=IDD_PALETTE (English (U.S.)) -Resource163=IDD_ADDLINK (English (U.S.)) -Resource164=IDD_ITEMGENERAL (English (U.S.)) -Resource165=IDD_CREATUREEFF (English (U.S.)) -Resource166=IDD_CHUIEDIT (English (U.S.)) -Resource167=IDR_SRC (English (U.S.)) -Resource168=IDD_VVCEDIT (English (U.S.)) -Resource169=IDD_AREACONTAINER (English (U.S.)) -Resource170=IDD_PROJEXT (English (U.S.)) -Resource171=IDR_VVC (English (U.S.)) -Resource172=IDD_AREAENTRANCE (English (U.S.)) -Resource173=IDD_GAMEPCINFO (English (U.S.)) -Resource174=IDD_AREAANIM (English (U.S.)) -Resource175=IDD_SPELLEFFECT (English (U.S.)) -Resource176=IDD_ANIMDIALOG -Resource177=IDR_IDS (English (U.S.)) -Resource178=IDD_GAMESTATS (English (U.S.)) -Resource179=IDD_MOSEDIT (English (U.S.)) -Resource180=IDD_CREATUREIWD2 (English (U.S.)) -Resource181=IDD_ITEMEXTRA (English (U.S.)) -Resource182=IDD_CREATUREEDIT (English (U.S.)) -Resource183=IDD_DIALOGEDIT (English (U.S.)) -Resource184=IDD_SEARCHNODE (English (U.S.)) -Resource185=IDD_STOREEDIT (English (U.S.)) -Resource186=IDD_ITEMEDIT (English (U.S.)) -Resource187=IDD_AREAEDIT (English (U.S.)) -Resource188=IDD_CREATUREIWD (English (U.S.)) -Resource189=IDD_AREASPAWN (English (U.S.)) -Resource190=IDR_CREATURE (English (U.S.)) -Resource191=IDR_TILE (English (U.S.)) -Resource192=IDR_WEDMENU (English (U.S.)) -Resource193=IDD_AREAINT (English (U.S.)) -Resource194=IDD_AREATRIGGER (English (U.S.)) -Resource195=IDD_CREATURELEVELS (English (U.S.)) -Resource196=IDD_ITEMUSE (English (U.S.)) -Resource197=IDD_CREATUREICONS (English (U.S.)) -Resource198=IDD_CREATUREUNKNOWN (English (U.S.)) -Resource199=IDD_SPELLDESC (English (U.S.)) -Resource200=IDD_WEDTILE (English (U.S.)) -Resource201=IDD_STOREEXTRA (English (U.S.)) -Resource202=IDD_WEIDU (English (U.S.)) -Resource203=IDR_EFFECT (English (U.S.)) -Resource204=IDD_EXTRACT (English (U.S.)) -Resource205=IDD_CHITEM_DIALOG (English (U.S.)) -Resource206=IDD_COLORPICKER (English (U.S.)) -Resource207=IDR_CHUI (English (U.S.)) -Resource208=IDD_TISDIALOG (English (U.S.)) -Resource209=IDD_BAMEDIT (English (U.S.)) -Resource210=IDD_CREATURESTRINGS (English (U.S.)) -Resource211=IDD_STOREDRINKS (English (U.S.)) -Resource212=IDD_AREAVARIABLE (English (U.S.)) -Resource213=IDR_TREEMENU (English (U.S.)) -Resource214=IDD_WEDPOLY (English (U.S.)) -Resource215=IDD_KEYEDIT (English (U.S.)) -Resource216=IDD_CREATURERES (English (U.S.)) -Resource217=IDR_WORLDMAP (English (U.S.)) -Resource218=IDD_CHECK (English (U.S.)) -Resource219=IDR_TLKMENU (English (U.S.)) -Resource220=IDD_CREATUREOVR (English (U.S.)) -Resource221=IDD_AREASONGS (English (U.S.)) -Resource222=IDD_AREAAMBIENT (English (U.S.)) -Resource223=IDD_STRREFDLG (English (U.S.)) -Resource224=IDR_SHORTCUT (English (U.S.)) -Resource225=IDD_MASSCLEAR (English (U.S.)) -Resource226=IDD_SPELLEXTRA (English (U.S.)) -Resource227=IDR_2DA (English (U.S.)) -Resource228=IDD_IMAGEVIEW (English (U.S.)) -Resource229=IDD_GAMEGENERAL (English (U.S.)) -Resource230=IDR_SCRIPT (English (U.S.)) -Resource231=IDD_STORERENTAL (English (U.S.)) -Resource232=IDD_EFFEDIT (English (U.S.)) -Resource233=IDD_POLYGON (English (U.S.)) -Resource234=IDD_SAVHANDLE (English (U.S.)) -Resource235=IDD_ITEMEQUIP (English (U.S.)) -Resource236=IDD_CREATURESKILLS (English (U.S.)) -Resource237=IDD_CREATUREPST (English (U.S.)) -Resource238=IDD_ITEMDESC (English (U.S.)) -Resource239=IDR_AREA (English (U.S.)) -Resource240=IDD_SCRIPTEDIT (English (U.S.)) -Resource241=IDD_SCHEDULE (English (U.S.)) -Resource242=IDD_AREAPROJ (English (U.S.)) -Resource243=IDD_PANICBUTTON (English (U.S.)) -Resource244=IDD_SRCEDIT (English (U.S.)) -Resource245=IDR_STORE (English (U.S.)) +Resource125=IDR_TREEMENU (English (U.S.)) +Resource126=IDD_CREATUREEFF (English (U.S.)) +Resource127=IDR_MUSIC (English (U.S.)) +Resource128=IDD_CREATURESTRINGS (English (U.S.)) +Resource129=IDD_GAMEGENERAL (English (U.S.)) +Resource130=IDD_AREAANIM (English (U.S.)) +Resource131=IDD_SAVHANDLE (English (U.S.)) +Resource132=IDD_GAMEEDIT (English (U.S.)) +Resource133=IDR_TILE (English (U.S.)) +Resource134=IDD_VARIABLES (English (U.S.)) +Resource135=IDD_AREASPAWN (English (U.S.)) +Resource136=IDD_EXTRACT (English (U.S.)) +Resource137=IDD_SRCEDIT (English (U.S.)) +Resource138=IDD_PALETTE (English (U.S.)) +Resource139=IDD_CREATURELEVELS (English (U.S.)) +Resource140=IDD_COMPAT (English (U.S.)) +Resource141=IDR_SRC (English (U.S.)) +Resource142=IDD_CREATUREITEMS (English (U.S.)) +Resource143=IDR_SPELL (English (U.S.)) +Resource144=IDD_TEXTVIEW (English (U.S.)) +Resource145=IDD_BAMEDIT (English (U.S.)) +Resource146=IDD_AREADOOR (English (U.S.)) +Resource147=IDD_KEYEDIT (English (U.S.)) +Resource148=IDR_MENUBAR (English (U.S.)) +Resource149=IDD_SPELLGENERAL (English (U.S.)) +Resource150=IDR_WORLDMAP (English (U.S.)) +Resource151=IDR_CHITIN (English (U.S.)) +Resource152=IDD_SPELLEXTRA (English (U.S.)) +Resource153=IDD_STORERENTAL (English (U.S.)) +Resource154=IDD_EFFEDIT (English (U.S.)) +Resource155=IDR_IDS (English (U.S.)) +Resource156=IDR_SHORTCUT (English (U.S.)) +Resource157=IDD_AREATRIGGERSTRINGS (English (U.S.)) +Resource158=IDD_CHITEM_DIALOG (English (U.S.)) +Resource159=IDD_MAPEDIT (English (U.S.)) +Resource160=IDD_POLYGON (English (U.S.)) +Resource161=IDD_STOREEXTRA (English (U.S.)) +Resource162=IDR_CREATURE (English (U.S.)) +Resource163=IDD_STOREGENERAL (English (U.S.)) +Resource164=IDD_IAPDIALOG (English (U.S.)) +Resource165=IDD_AREAGENERAL (English (U.S.)) +Resource166=IDD_CREATUREEDIT (English (U.S.)) +Resource167=IDD_MASSCLEAR (English (U.S.)) +Resource168=IDD_CREATUREOVR (English (U.S.)) +Resource169=IDD_ITEMPICKER (English (U.S.)) +Resource170=IDD_STOREITEMS (English (U.S.)) +Resource171=IDD_STRREFDLG (English (U.S.)) +Resource172=IDD_ANIMDIALOG +Resource173=IDD_AREAINT (English (U.S.)) +Resource174=IDD_ITEMUSE (English (U.S.)) +Resource175=IDR_2DA (English (U.S.)) +Resource176=IDD_PROJEXT (English (U.S.)) +Resource177=IDD_MUSEDIT (English (U.S.)) +Resource178=IDD_AREASONGS (English (U.S.)) +Resource179=IDD_ITEMEXTRA (English (U.S.)) +Resource180=IDD_AREAVARIABLE (English (U.S.)) +Resource181=IDR_STORE (English (U.S.)) +Resource182=IDD_ABOUTBOX (English (U.S.)) +Resource183=IDD_CFB (English (U.S.)) +Resource184=IDD_STOREEDIT (English (U.S.)) +Resource185=IDD_AREAPROJ (English (U.S.)) +Resource186=IDD_CREATUREPST (English (U.S.)) +Resource187=IDR_CHUI (English (U.S.)) +Resource188=IDD_AREACONTAINER (English (U.S.)) +Resource189=IDD_IMAGEVIEW (English (U.S.)) +Resource190=IDD_GAMESTATS (English (U.S.)) +Resource191=IDD_WEDEDIT (English (U.S.)) +Resource192=IDD_TISDIALOG (English (U.S.)) +Resource193=IDD_ITEMEFFECT (English (U.S.)) +Resource194=IDD_WEIDU (English (U.S.)) +Resource195=IDD_SEARCHNODE (English (U.S.)) +Resource196=IDR_TLKMENU (English (U.S.)) +Resource197=IDD_CHECK (English (U.S.)) +Resource198=IDD_ITEMGENERAL (English (U.S.)) +Resource199=IDR_PROJECT (English (U.S.)) +Resource200=IDD_AREATRIGGER (English (U.S.)) +Resource201=IDR_EFFECT (English (U.S.)) +Resource202=IDD_SPELLTOOL (English (U.S.)) +Resource203=IDD_IDSEDIT (English (U.S.)) +Resource204=IDD_CREATUREIWD2 (English (U.S.)) +Resource205=IDD_AREAMAP (English (U.S.)) +Resource206=IDD_ITEMDESC (English (U.S.)) +Resource207=IDD_WEDPOLY (English (U.S.)) +Resource208=IDD_PROJEDIT (English (U.S.)) +Resource209=IDR_AREA (English (U.S.)) +Resource210=IDD_ITEMEDIT (English (U.S.)) +Resource211=IDD_CREATURESKILLS (English (U.S.)) +Resource212=IDD_VVCEDIT (English (U.S.)) +Resource213=IDD_MAPLINK (English (U.S.)) +Resource214=IDD_AREAACTOR (English (U.S.)) +Resource215=IDD_AREAENTRANCE (English (U.S.)) +Resource216=IDD_FINDITEM (English (U.S.)) +Resource217=IDD_COLORPICKER (English (U.S.)) +Resource218=IDD_MOSEDIT (English (U.S.)) +Resource219=IDD_SCRIPTEDIT (English (U.S.)) +Resource220=IDD_DIALOGEDIT (English (U.S.)) +Resource221=IDD_ITEMICONS (English (U.S.)) +Resource222=IDD_ITEMEQUIP (English (U.S.)) +Resource223=IDD_SPELLDESC (English (U.S.)) +Resource224=IDD_WEDTILE (English (U.S.)) +Resource225=IDD_SCHEDULE (English (U.S.)) +Resource226=IDR_VVC (English (U.S.)) +Resource227=IDD_PANICBUTTON (English (U.S.)) +Resource228=IDD_CHUIEDIT (English (U.S.)) +Resource229=IDD_AREAAMBIENT (English (U.S.)) +Resource230=IDD_SHOWLOG (English (U.S.)) +Resource231=IDR_ITEM (English (U.S.)) +Resource232=IDR_BAMMENU (English (U.S.)) +Resource233=IDD_CREATURERES (English (U.S.)) +Resource234=IDD_SPELLEFFECT (English (U.S.)) +Resource235=IDD_GAMEPCINFO (English (U.S.)) +Resource236=IDD_PROGRESS (English (U.S.)) +Resource237=IDD_CREATUREUNKNOWN (English (U.S.)) +Resource238=IDR_GAME (English (U.S.)) +Resource239=IDD_EDIT (English (U.S.)) +Resource240=IDD_SPELLEQUIP (English (U.S.)) +Resource241=IDR_WEDMENU (English (U.S.)) +Resource242=IDD_ADDLINK (English (U.S.)) +Resource243=IDD_SPELLEDIT (English (U.S.)) +Resource244=IDD_CREATUREGENERAL (English (U.S.)) +Resource245=IDD_2DAEDIT (English (U.S.)) Class99=CAreaTriggerString Class100=CPCInfo -Resource246=IDD_ITEMEFFECT (English (U.S.)) +Resource246=IDD_CREATUREIWD (English (U.S.)) Class101=CCreatureOverlay -Resource247=IDD_MUSEDIT (English (U.S.)) +Resource247=IDD_EXTRACT2 (English (U.S.)) Class102=IWD2Creature -Resource248=IDR_SPELL (English (U.S.)) +Resource248=IDD_STOREDRINKS (English (U.S.)) Class103=CAnimDialog -Resource249=IDD_SPELLEQUIP (English (U.S.)) +Resource249=IDR_SCRIPT (English (U.S.)) Class104=CCreatureLevels -Resource250=IDD_AREAMAP (English (U.S.)) +Resource250=IDD_CREATUREICONS (English (U.S.)) Class105=CAreaProj -Resource251=IDD_WEDEDIT (English (U.S.)) +Resource251=IDD_AREAEDIT (English (U.S.)) Class106=CProjGemRB Resource252=IDD_PROJGEMRB (English (U.S.)) @@ -10272,7 +10272,7 @@ [DLG:IDD_PROJGEMRB (English (U.S.))] Type=1 Class=CProjGemRB -ControlCount=13 +ControlCount=14 Control1=IDOK,button,1342242816 Control2=IDC_FLAGS,edit,1350631552 Control3=IDC_STATIC,static,1342308352 @@ -10286,6 +10286,7 @@ Control11=IDC_FLAG8,button,1342242819 Control12=IDC_FLAG9,button,1342242819 Control13=IDC_FLAG10,button,1342242819 +Control14=IDC_FLAG11,button,1342242819 [CLS:CProjGemRB] Type=0 Modified: chitem/trunk/chitem.rc =================================================================== --- chitem/trunk/chitem.rc 2009-06-16 20:54:18 UTC (rev 6480) +++ chitem/trunk/chitem.rc 2009-06-16 20:56:00 UTC (rev 6481) @@ -5340,6 +5340,8 @@ WS_TABSTOP,125,37,53,10 CONTROL "Tinted by gradient",IDC_FLAG10,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,51,73,10 + CONTROL "Create iteration",IDC_FLAG11,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,125,65,63,10 END This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-06-20 15:06:34
|
Revision: 6540 http://gemrb.svn.sourceforge.net/gemrb/?rev=6540&view=rev Author: avenger_teambg Date: 2009-06-20 15:06:21 +0000 (Sat, 20 Jun 2009) Log Message: ----------- dltcep update (some more gemrb specific projectile flags) Modified Paths: -------------- chitem/trunk/Chitem.h chitem/trunk/ProjGemRB.cpp chitem/trunk/ProjGemRB.h chitem/trunk/chitem.clw chitem/trunk/chitem.rc Modified: chitem/trunk/Chitem.h =================================================================== --- chitem/trunk/Chitem.h 2009-06-20 15:04:21 UTC (rev 6539) +++ chitem/trunk/Chitem.h 2009-06-20 15:06:21 UTC (rev 6540) @@ -540,6 +540,13 @@ #define PROJ_TRANSLUCENT 256 //half-transparent travel projectile #define PROJ_TINTED 512 //tinted by gradient (better than paletted animations) #define PROJ_ITERATION 1024 //create another projectile with projectile ID-1 +#define PROJ_TILE 2048 //place the travel bam all over the AOE +#define PROJ_FALLING 4096 //the projectile will fall from above target (y=target.y, x=target-100) +#define PROJ_INCOMING 8192 //the projectile will fall from above caster (y=caster.y, x=target-100) +#define PROJ_LINE 16384 //solid line from source to target (ignore caster) +#define PROJ_WALL 32768 //diagonal across the AOE circle, firewall type +#define PROJ_BACKGROUND 65536 //draw behind target +#define PROJ_POP 0x20000 //pop in/hold/pop out animation chain (use shadow for hold) #define TRANSPARENT_GREEN 0x00ff00 Modified: chitem/trunk/ProjGemRB.cpp =================================================================== --- chitem/trunk/ProjGemRB.cpp 2009-06-20 15:04:21 UTC (rev 6539) +++ chitem/trunk/ProjGemRB.cpp 2009-06-20 15:06:21 UTC (rev 6540) @@ -39,7 +39,7 @@ DDX_Text(pDX, IDC_FLAGS, tmpstr); the_projectile.header.extflags=strtonum(tmpstr); j=1; - for(i=0;i<16;i++) + for(i=0;i<18;i++) { cb=(CButton *) GetDlgItem(IDC_FLAG1+i); if (cb) @@ -65,6 +65,13 @@ ON_BN_CLICKED(IDC_FLAG9, OnFlag9) ON_BN_CLICKED(IDC_FLAG10, OnFlag10) ON_BN_CLICKED(IDC_FLAG11, OnFlag11) + ON_BN_CLICKED(IDC_FLAG12, OnFlag12) + ON_BN_CLICKED(IDC_FLAG13, OnFlag13) + ON_BN_CLICKED(IDC_FLAG14, OnFlag14) + ON_BN_CLICKED(IDC_FLAG15, OnFlag15) + ON_BN_CLICKED(IDC_FLAG16, OnFlag16) + ON_BN_CLICKED(IDC_FLAG17, OnFlag17) + ON_BN_CLICKED(IDC_FLAG18, OnFlag18) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -137,3 +144,45 @@ the_projectile.header.extflags^=PROJ_ITERATION; UpdateData(UD_DISPLAY); } + +void CProjGemRB::OnFlag12() +{ + the_projectile.header.extflags^=PROJ_TILE; + UpdateData(UD_DISPLAY); +} + +void CProjGemRB::OnFlag13() +{ + the_projectile.header.extflags^=PROJ_FALLING; + UpdateData(UD_DISPLAY); +} + +void CProjGemRB::OnFlag14() +{ + the_projectile.header.extflags^=PROJ_INCOMING; + UpdateData(UD_DISPLAY); +} + +void CProjGemRB::OnFlag15() +{ + the_projectile.header.extflags^=PROJ_LINE; + UpdateData(UD_DISPLAY); +} + +void CProjGemRB::OnFlag16() +{ + the_projectile.header.extflags^=PROJ_WALL; + UpdateData(UD_DISPLAY); +} + +void CProjGemRB::OnFlag17() +{ + the_projectile.header.extflags^=PROJ_BACKGROUND; + UpdateData(UD_DISPLAY); +} + +void CProjGemRB::OnFlag18() +{ + the_projectile.header.extflags^=PROJ_POP; + UpdateData(UD_DISPLAY); +} Modified: chitem/trunk/ProjGemRB.h =================================================================== --- chitem/trunk/ProjGemRB.h 2009-06-20 15:04:21 UTC (rev 6539) +++ chitem/trunk/ProjGemRB.h 2009-06-20 15:06:21 UTC (rev 6540) @@ -46,6 +46,13 @@ afx_msg void OnFlag9(); afx_msg void OnFlag10(); afx_msg void OnFlag11(); + afx_msg void OnFlag12(); + afx_msg void OnFlag13(); + afx_msg void OnFlag14(); + afx_msg void OnFlag15(); + afx_msg void OnFlag16(); + afx_msg void OnFlag17(); + afx_msg void OnFlag18(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: chitem/trunk/chitem.clw =================================================================== --- chitem/trunk/chitem.clw 2009-06-20 15:04:21 UTC (rev 6539) +++ chitem/trunk/chitem.clw 2009-06-20 15:06:21 UTC (rev 6540) @@ -232,142 +232,142 @@ Resource123=IDD_GAMEGENERAL Class98=IcewindCre Resource124=IDR_SHORTCUT -Resource125=IDR_TREEMENU (English (U.S.)) -Resource126=IDD_CREATUREEFF (English (U.S.)) -Resource127=IDR_MUSIC (English (U.S.)) -Resource128=IDD_CREATURESTRINGS (English (U.S.)) -Resource129=IDD_GAMEGENERAL (English (U.S.)) -Resource130=IDD_AREAANIM (English (U.S.)) -Resource131=IDD_SAVHANDLE (English (U.S.)) -Resource132=IDD_GAMEEDIT (English (U.S.)) -Resource133=IDR_TILE (English (U.S.)) -Resource134=IDD_VARIABLES (English (U.S.)) -Resource135=IDD_AREASPAWN (English (U.S.)) -Resource136=IDD_EXTRACT (English (U.S.)) -Resource137=IDD_SRCEDIT (English (U.S.)) -Resource138=IDD_PALETTE (English (U.S.)) -Resource139=IDD_CREATURELEVELS (English (U.S.)) -Resource140=IDD_COMPAT (English (U.S.)) -Resource141=IDR_SRC (English (U.S.)) -Resource142=IDD_CREATUREITEMS (English (U.S.)) -Resource143=IDR_SPELL (English (U.S.)) -Resource144=IDD_TEXTVIEW (English (U.S.)) -Resource145=IDD_BAMEDIT (English (U.S.)) -Resource146=IDD_AREADOOR (English (U.S.)) -Resource147=IDD_KEYEDIT (English (U.S.)) -Resource148=IDR_MENUBAR (English (U.S.)) -Resource149=IDD_SPELLGENERAL (English (U.S.)) -Resource150=IDR_WORLDMAP (English (U.S.)) -Resource151=IDR_CHITIN (English (U.S.)) -Resource152=IDD_SPELLEXTRA (English (U.S.)) -Resource153=IDD_STORERENTAL (English (U.S.)) -Resource154=IDD_EFFEDIT (English (U.S.)) -Resource155=IDR_IDS (English (U.S.)) -Resource156=IDR_SHORTCUT (English (U.S.)) -Resource157=IDD_AREATRIGGERSTRINGS (English (U.S.)) -Resource158=IDD_CHITEM_DIALOG (English (U.S.)) -Resource159=IDD_MAPEDIT (English (U.S.)) -Resource160=IDD_POLYGON (English (U.S.)) -Resource161=IDD_STOREEXTRA (English (U.S.)) -Resource162=IDR_CREATURE (English (U.S.)) -Resource163=IDD_STOREGENERAL (English (U.S.)) -Resource164=IDD_IAPDIALOG (English (U.S.)) -Resource165=IDD_AREAGENERAL (English (U.S.)) -Resource166=IDD_CREATUREEDIT (English (U.S.)) -Resource167=IDD_MASSCLEAR (English (U.S.)) -Resource168=IDD_CREATUREOVR (English (U.S.)) -Resource169=IDD_ITEMPICKER (English (U.S.)) -Resource170=IDD_STOREITEMS (English (U.S.)) -Resource171=IDD_STRREFDLG (English (U.S.)) -Resource172=IDD_ANIMDIALOG -Resource173=IDD_AREAINT (English (U.S.)) -Resource174=IDD_ITEMUSE (English (U.S.)) -Resource175=IDR_2DA (English (U.S.)) -Resource176=IDD_PROJEXT (English (U.S.)) -Resource177=IDD_MUSEDIT (English (U.S.)) -Resource178=IDD_AREASONGS (English (U.S.)) -Resource179=IDD_ITEMEXTRA (English (U.S.)) -Resource180=IDD_AREAVARIABLE (English (U.S.)) -Resource181=IDR_STORE (English (U.S.)) -Resource182=IDD_ABOUTBOX (English (U.S.)) -Resource183=IDD_CFB (English (U.S.)) -Resource184=IDD_STOREEDIT (English (U.S.)) -Resource185=IDD_AREAPROJ (English (U.S.)) -Resource186=IDD_CREATUREPST (English (U.S.)) -Resource187=IDR_CHUI (English (U.S.)) -Resource188=IDD_AREACONTAINER (English (U.S.)) -Resource189=IDD_IMAGEVIEW (English (U.S.)) -Resource190=IDD_GAMESTATS (English (U.S.)) -Resource191=IDD_WEDEDIT (English (U.S.)) -Resource192=IDD_TISDIALOG (English (U.S.)) -Resource193=IDD_ITEMEFFECT (English (U.S.)) -Resource194=IDD_WEIDU (English (U.S.)) -Resource195=IDD_SEARCHNODE (English (U.S.)) -Resource196=IDR_TLKMENU (English (U.S.)) -Resource197=IDD_CHECK (English (U.S.)) -Resource198=IDD_ITEMGENERAL (English (U.S.)) -Resource199=IDR_PROJECT (English (U.S.)) -Resource200=IDD_AREATRIGGER (English (U.S.)) -Resource201=IDR_EFFECT (English (U.S.)) -Resource202=IDD_SPELLTOOL (English (U.S.)) -Resource203=IDD_IDSEDIT (English (U.S.)) -Resource204=IDD_CREATUREIWD2 (English (U.S.)) -Resource205=IDD_AREAMAP (English (U.S.)) -Resource206=IDD_ITEMDESC (English (U.S.)) -Resource207=IDD_WEDPOLY (English (U.S.)) -Resource208=IDD_PROJEDIT (English (U.S.)) -Resource209=IDR_AREA (English (U.S.)) -Resource210=IDD_ITEMEDIT (English (U.S.)) -Resource211=IDD_CREATURESKILLS (English (U.S.)) -Resource212=IDD_VVCEDIT (English (U.S.)) -Resource213=IDD_MAPLINK (English (U.S.)) -Resource214=IDD_AREAACTOR (English (U.S.)) -Resource215=IDD_AREAENTRANCE (English (U.S.)) -Resource216=IDD_FINDITEM (English (U.S.)) -Resource217=IDD_COLORPICKER (English (U.S.)) -Resource218=IDD_MOSEDIT (English (U.S.)) -Resource219=IDD_SCRIPTEDIT (English (U.S.)) -Resource220=IDD_DIALOGEDIT (English (U.S.)) -Resource221=IDD_ITEMICONS (English (U.S.)) -Resource222=IDD_ITEMEQUIP (English (U.S.)) -Resource223=IDD_SPELLDESC (English (U.S.)) -Resource224=IDD_WEDTILE (English (U.S.)) -Resource225=IDD_SCHEDULE (English (U.S.)) -Resource226=IDR_VVC (English (U.S.)) -Resource227=IDD_PANICBUTTON (English (U.S.)) -Resource228=IDD_CHUIEDIT (English (U.S.)) -Resource229=IDD_AREAAMBIENT (English (U.S.)) -Resource230=IDD_SHOWLOG (English (U.S.)) -Resource231=IDR_ITEM (English (U.S.)) -Resource232=IDR_BAMMENU (English (U.S.)) -Resource233=IDD_CREATURERES (English (U.S.)) -Resource234=IDD_SPELLEFFECT (English (U.S.)) -Resource235=IDD_GAMEPCINFO (English (U.S.)) -Resource236=IDD_PROGRESS (English (U.S.)) -Resource237=IDD_CREATUREUNKNOWN (English (U.S.)) -Resource238=IDR_GAME (English (U.S.)) -Resource239=IDD_EDIT (English (U.S.)) -Resource240=IDD_SPELLEQUIP (English (U.S.)) -Resource241=IDR_WEDMENU (English (U.S.)) -Resource242=IDD_ADDLINK (English (U.S.)) -Resource243=IDD_SPELLEDIT (English (U.S.)) -Resource244=IDD_CREATUREGENERAL (English (U.S.)) -Resource245=IDD_2DAEDIT (English (U.S.)) +Resource125=IDD_CREATUREPST (English (U.S.)) +Resource126=IDD_STOREDRINKS (English (U.S.)) +Resource127=IDD_CHECK (English (U.S.)) +Resource128=IDD_AREAGENERAL (English (U.S.)) +Resource129=IDD_MASSCLEAR (English (U.S.)) +Resource130=IDD_SPELLEDIT (English (U.S.)) +Resource131=IDD_MAPEDIT (English (U.S.)) +Resource132=IDD_CREATURERES (English (U.S.)) +Resource133=IDD_PROGRESS (English (U.S.)) +Resource134=IDD_AREADOOR (English (U.S.)) +Resource135=IDD_FINDITEM (English (U.S.)) +Resource136=IDD_WEIDU (English (U.S.)) +Resource137=IDD_CREATUREIWD2 (English (U.S.)) +Resource138=IDD_EXTRACT (English (U.S.)) +Resource139=IDD_SRCEDIT (English (U.S.)) +Resource140=IDD_ITEMICONS (English (U.S.)) +Resource141=IDD_CHITEM_DIALOG (English (U.S.)) +Resource142=IDD_AREASONGS (English (U.S.)) +Resource143=IDD_COLORPICKER (English (U.S.)) +Resource144=IDD_CREATUREEFF (English (U.S.)) +Resource145=IDD_ITEMPICKER (English (U.S.)) +Resource146=IDD_STOREITEMS (English (U.S.)) +Resource147=IDD_GAMEGENERAL (English (U.S.)) +Resource148=IDD_POLYGON (English (U.S.)) +Resource149=IDD_AREAACTOR (English (U.S.)) +Resource150=IDD_CREATUREOVR (English (U.S.)) +Resource151=IDR_WORLDMAP (English (U.S.)) +Resource152=IDD_AREATRIGGER (English (U.S.)) +Resource153=IDD_ITEMGENERAL (English (U.S.)) +Resource154=IDD_SPELLEQUIP (English (U.S.)) +Resource155=IDR_ITEM (English (U.S.)) +Resource156=IDR_GAME (English (U.S.)) +Resource157=IDD_WEDTILE (English (U.S.)) +Resource158=IDR_PROJECT (English (U.S.)) +Resource159=IDD_CREATURESTRINGS (English (U.S.)) +Resource160=IDD_MUSEDIT (English (U.S.)) +Resource161=IDR_TLKMENU (English (U.S.)) +Resource162=IDD_STRREFDLG (English (U.S.)) +Resource163=IDR_SPELL (English (U.S.)) +Resource164=IDD_AREAVARIABLE (English (U.S.)) +Resource165=IDD_ITEMEXTRA (English (U.S.)) +Resource166=IDD_ITEMEDIT (English (U.S.)) +Resource167=IDD_EDIT (English (U.S.)) +Resource168=IDD_CHUIEDIT (English (U.S.)) +Resource169=IDD_ANIMDIALOG +Resource170=IDR_STORE (English (U.S.)) +Resource171=IDD_GAMEEDIT (English (U.S.)) +Resource172=IDD_MOSEDIT (English (U.S.)) +Resource173=IDD_CREATUREITEMS (English (U.S.)) +Resource174=IDR_IDS (English (U.S.)) +Resource175=IDR_TREEMENU (English (U.S.)) +Resource176=IDD_CREATURESKILLS (English (U.S.)) +Resource177=IDD_PROJEDIT (English (U.S.)) +Resource178=IDD_VVCEDIT (English (U.S.)) +Resource179=IDD_ITEMEQUIP (English (U.S.)) +Resource180=IDD_AREASPAWN (English (U.S.)) +Resource181=IDD_AREAANIM (English (U.S.)) +Resource182=IDR_VVC (English (U.S.)) +Resource183=IDD_ABOUTBOX (English (U.S.)) +Resource184=IDR_AREA (English (U.S.)) +Resource185=IDD_AREAMAP (English (U.S.)) +Resource186=IDD_WEDEDIT (English (U.S.)) +Resource187=IDR_EFFECT (English (U.S.)) +Resource188=IDD_STOREGENERAL (English (U.S.)) +Resource189=IDR_SCRIPT (English (U.S.)) +Resource190=IDD_WEDPOLY (English (U.S.)) +Resource191=IDD_2DAEDIT (English (U.S.)) +Resource192=IDD_IAPDIALOG (English (U.S.)) +Resource193=IDR_CHITIN (English (U.S.)) +Resource194=IDD_ITEMEFFECT (English (U.S.)) +Resource195=IDD_CREATUREGENERAL (English (U.S.)) +Resource196=IDD_AREAPROJ (English (U.S.)) +Resource197=IDR_2DA (English (U.S.)) +Resource198=IDR_CHUI (English (U.S.)) +Resource199=IDR_BAMMENU (English (U.S.)) +Resource200=IDD_ITEMUSE (English (U.S.)) +Resource201=IDD_CREATUREIWD (English (U.S.)) +Resource202=IDD_SCRIPTEDIT (English (U.S.)) +Resource203=IDD_AREACONTAINER (English (U.S.)) +Resource204=IDD_SPELLTOOL (English (U.S.)) +Resource205=IDD_SAVHANDLE (English (U.S.)) +Resource206=IDD_CFB (English (U.S.)) +Resource207=IDD_IDSEDIT (English (U.S.)) +Resource208=IDD_SPELLGENERAL (English (U.S.)) +Resource209=IDD_SHOWLOG (English (U.S.)) +Resource210=IDR_TILE (English (U.S.)) +Resource211=IDD_SEARCHNODE (English (U.S.)) +Resource212=IDD_IMAGEVIEW (English (U.S.)) +Resource213=IDD_PALETTE (English (U.S.)) +Resource214=IDD_BAMEDIT (English (U.S.)) +Resource215=IDD_AREAAMBIENT (English (U.S.)) +Resource216=IDR_MUSIC (English (U.S.)) +Resource217=IDD_DIALOGEDIT (English (U.S.)) +Resource218=IDD_ITEMDESC (English (U.S.)) +Resource219=IDD_KEYEDIT (English (U.S.)) +Resource220=IDD_CREATUREEDIT (English (U.S.)) +Resource221=IDR_SRC (English (U.S.)) +Resource222=IDR_WEDMENU (English (U.S.)) +Resource223=IDD_EFFEDIT (English (U.S.)) +Resource224=IDD_GAMEPCINFO (English (U.S.)) +Resource225=IDD_CREATUREUNKNOWN (English (U.S.)) +Resource226=IDR_MENUBAR (English (U.S.)) +Resource227=IDD_MAPLINK (English (U.S.)) +Resource228=IDD_AREATRIGGERSTRINGS (English (U.S.)) +Resource229=IDD_SCHEDULE (English (U.S.)) +Resource230=IDD_PROJEXT (English (U.S.)) +Resource231=IDD_GAMESTATS (English (U.S.)) +Resource232=IDD_TEXTVIEW (English (U.S.)) +Resource233=IDD_EXTRACT2 (English (U.S.)) +Resource234=IDD_VARIABLES (English (U.S.)) +Resource235=IDD_TISDIALOG (English (U.S.)) +Resource236=IDD_STOREEDIT (English (U.S.)) +Resource237=IDD_AREAEDIT (English (U.S.)) +Resource238=IDD_CREATURELEVELS (English (U.S.)) +Resource239=IDD_SPELLEXTRA (English (U.S.)) +Resource240=IDD_AREAENTRANCE (English (U.S.)) +Resource241=IDR_CREATURE (English (U.S.)) +Resource242=IDD_CREATUREICONS (English (U.S.)) +Resource243=IDD_STORERENTAL (English (U.S.)) +Resource244=IDD_SPELLDESC (English (U.S.)) +Resource245=IDD_AREAINT (English (U.S.)) Class99=CAreaTriggerString Class100=CPCInfo -Resource246=IDD_CREATUREIWD (English (U.S.)) +Resource246=IDD_ADDLINK (English (U.S.)) Class101=CCreatureOverlay -Resource247=IDD_EXTRACT2 (English (U.S.)) +Resource247=IDD_COMPAT (English (U.S.)) Class102=IWD2Creature -Resource248=IDD_STOREDRINKS (English (U.S.)) +Resource248=IDD_PANICBUTTON (English (U.S.)) Class103=CAnimDialog -Resource249=IDR_SCRIPT (English (U.S.)) +Resource249=IDD_PROJGEMRB (English (U.S.)) Class104=CCreatureLevels -Resource250=IDD_CREATUREICONS (English (U.S.)) +Resource250=IDD_SPELLEFFECT (English (U.S.)) Class105=CAreaProj -Resource251=IDD_AREAEDIT (English (U.S.)) +Resource251=IDD_STOREEXTRA (English (U.S.)) Class106=CProjGemRB -Resource252=IDD_PROJGEMRB (English (U.S.)) +Resource252=IDR_SHORTCUT (English (U.S.)) [CLS:CChitemApp] Type=0 @@ -10272,7 +10272,7 @@ [DLG:IDD_PROJGEMRB (English (U.S.))] Type=1 Class=CProjGemRB -ControlCount=14 +ControlCount=21 Control1=IDOK,button,1342242816 Control2=IDC_FLAGS,edit,1350631552 Control3=IDC_STATIC,static,1342308352 @@ -10287,6 +10287,13 @@ Control12=IDC_FLAG9,button,1342242819 Control13=IDC_FLAG10,button,1342242819 Control14=IDC_FLAG11,button,1342242819 +Control15=IDC_FLAG12,button,1342242819 +Control16=IDC_FLAG13,button,1342242819 +Control17=IDC_FLAG14,button,1342242819 +Control18=IDC_FLAG15,button,1342242819 +Control19=IDC_FLAG16,button,1342242819 +Control20=IDC_FLAG17,button,1342242819 +Control21=IDC_FLAG18,button,1342242819 [CLS:CProjGemRB] Type=0 Modified: chitem/trunk/chitem.rc =================================================================== --- chitem/trunk/chitem.rc 2009-06-20 15:04:21 UTC (rev 6539) +++ chitem/trunk/chitem.rc 2009-06-20 15:06:21 UTC (rev 6540) @@ -5312,12 +5312,12 @@ PUSHBUTTON "Add effect",IDC_ADD2,411,90,62,14 END -IDD_PROJGEMRB DIALOG DISCARDABLE 0, 0, 227, 164 +IDD_PROJGEMRB DIALOG DISCARDABLE 0, 0, 306, 179 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "GemRB specific data" FONT 8, "MS Sans Serif" BEGIN - PUSHBUTTON "Back",IDOK,170,143,50,14 + PUSHBUTTON "Back",IDOK,249,158,50,14 EDITTEXT IDC_FLAGS,9,19,48,14,ES_AUTOHSCROLL LTEXT "Additional flags",IDC_STATIC,9,7,48,8 CONTROL "Bounce from walls",IDC_FLAG1,"Button",BS_AUTOCHECKBOX | @@ -5337,11 +5337,25 @@ CONTROL "Pillar",IDC_FLAG8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 9,135,31,10 CONTROL "Translucent",IDC_FLAG9,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,125,37,53,10 + WS_TABSTOP,124,37,53,10 CONTROL "Tinted by gradient",IDC_FLAG10,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,125,51,73,10 + WS_TABSTOP,124,51,73,10 CONTROL "Create iteration",IDC_FLAG11,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,125,65,63,10 + WS_TABSTOP,124,65,63,10 + CONTROL "Tiled area of effect",IDC_FLAG12,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,124,79,75,10 + CONTROL "Falling path",IDC_FLAG13,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,124,93,52,10 + CONTROL "Incoming path",IDC_FLAG14,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,124,107,61,10 + CONTROL "Line area of effect",IDC_FLAG15,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,124,121,73,10 + CONTROL "Wall area of effect",IDC_FLAG16,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,124,135,74,10 + CONTROL "Draw behind target",IDC_FLAG17,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,219,36,76,10 + CONTROL "Pop in and out",IDC_FLAG18,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,219,51,62,10 END @@ -6172,9 +6186,9 @@ IDD_PROJGEMRB, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 220 + RIGHTMARGIN, 299 TOPMARGIN, 7 - BOTTOMMARGIN, 157 + BOTTOMMARGIN, 172 END END #endif // APSTUDIO_INVOKED This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-06-23 22:18:08
|
Revision: 6606 http://gemrb.svn.sourceforge.net/gemrb/?rev=6606&view=rev Author: avenger_teambg Date: 2009-06-23 22:18:07 +0000 (Tue, 23 Jun 2009) Log Message: ----------- dltcep update Modified Paths: -------------- chitem/trunk/chitem.clw chitem/trunk/chitem.rc chitem/trunk/chitemDlg.cpp chitem/trunk/seekers.cpp chitem/trunk/variables.cpp Modified: chitem/trunk/chitem.clw =================================================================== --- chitem/trunk/chitem.clw 2009-06-23 22:17:07 UTC (rev 6605) +++ chitem/trunk/chitem.clw 2009-06-23 22:18:07 UTC (rev 6606) @@ -2,7 +2,7 @@ [General Info] Version=1 -LastClass=CProjGemRB +LastClass=CChitemDlg LastTemplate=CDialog NewFileInclude1=#include "stdafx.h" NewFileInclude2=#include "chitem.h" @@ -232,140 +232,140 @@ Resource123=IDD_GAMEGENERAL Class98=IcewindCre Resource124=IDR_SHORTCUT -Resource125=IDD_CREATUREPST (English (U.S.)) -Resource126=IDD_STOREDRINKS (English (U.S.)) -Resource127=IDD_CHECK (English (U.S.)) -Resource128=IDD_AREAGENERAL (English (U.S.)) -Resource129=IDD_MASSCLEAR (English (U.S.)) -Resource130=IDD_SPELLEDIT (English (U.S.)) -Resource131=IDD_MAPEDIT (English (U.S.)) -Resource132=IDD_CREATURERES (English (U.S.)) -Resource133=IDD_PROGRESS (English (U.S.)) -Resource134=IDD_AREADOOR (English (U.S.)) -Resource135=IDD_FINDITEM (English (U.S.)) -Resource136=IDD_WEIDU (English (U.S.)) -Resource137=IDD_CREATUREIWD2 (English (U.S.)) -Resource138=IDD_EXTRACT (English (U.S.)) -Resource139=IDD_SRCEDIT (English (U.S.)) -Resource140=IDD_ITEMICONS (English (U.S.)) -Resource141=IDD_CHITEM_DIALOG (English (U.S.)) -Resource142=IDD_AREASONGS (English (U.S.)) -Resource143=IDD_COLORPICKER (English (U.S.)) -Resource144=IDD_CREATUREEFF (English (U.S.)) -Resource145=IDD_ITEMPICKER (English (U.S.)) -Resource146=IDD_STOREITEMS (English (U.S.)) -Resource147=IDD_GAMEGENERAL (English (U.S.)) -Resource148=IDD_POLYGON (English (U.S.)) -Resource149=IDD_AREAACTOR (English (U.S.)) -Resource150=IDD_CREATUREOVR (English (U.S.)) -Resource151=IDR_WORLDMAP (English (U.S.)) -Resource152=IDD_AREATRIGGER (English (U.S.)) -Resource153=IDD_ITEMGENERAL (English (U.S.)) -Resource154=IDD_SPELLEQUIP (English (U.S.)) -Resource155=IDR_ITEM (English (U.S.)) -Resource156=IDR_GAME (English (U.S.)) -Resource157=IDD_WEDTILE (English (U.S.)) -Resource158=IDR_PROJECT (English (U.S.)) -Resource159=IDD_CREATURESTRINGS (English (U.S.)) -Resource160=IDD_MUSEDIT (English (U.S.)) -Resource161=IDR_TLKMENU (English (U.S.)) -Resource162=IDD_STRREFDLG (English (U.S.)) -Resource163=IDR_SPELL (English (U.S.)) -Resource164=IDD_AREAVARIABLE (English (U.S.)) -Resource165=IDD_ITEMEXTRA (English (U.S.)) -Resource166=IDD_ITEMEDIT (English (U.S.)) -Resource167=IDD_EDIT (English (U.S.)) -Resource168=IDD_CHUIEDIT (English (U.S.)) +Resource125=IDR_SCRIPT (English (U.S.)) +Resource126=IDR_WORLDMAP (English (U.S.)) +Resource127=IDD_SPELLGENERAL (English (U.S.)) +Resource128=IDD_ADDLINK (English (U.S.)) +Resource129=IDR_BAMMENU (English (U.S.)) +Resource130=IDD_DIALOGEDIT (English (U.S.)) +Resource131=IDD_SPELLTOOL (English (U.S.)) +Resource132=IDD_AREAANIM (English (U.S.)) +Resource133=IDD_ITEMDESC (English (U.S.)) +Resource134=IDD_CREATUREEFF (English (U.S.)) +Resource135=IDD_ITEMUSE (English (U.S.)) +Resource136=IDD_ITEMEXTRA (English (U.S.)) +Resource137=IDR_TILE (English (U.S.)) +Resource138=IDD_AREAGENERAL (English (U.S.)) +Resource139=IDR_AREA (English (U.S.)) +Resource140=IDD_SPELLDESC (English (U.S.)) +Resource141=IDD_PALETTE (English (U.S.)) +Resource142=IDD_STRREFDLG (English (U.S.)) +Resource143=IDD_GAMESTATS (English (U.S.)) +Resource144=IDD_AREAPROJ (English (U.S.)) +Resource145=IDD_EXTRACT2 (English (U.S.)) +Resource146=IDD_AREAENTRANCE (English (U.S.)) +Resource147=IDR_PROJECT (English (U.S.)) +Resource148=IDR_GAME (English (U.S.)) +Resource149=IDD_GAMEEDIT (English (U.S.)) +Resource150=IDR_CHUI (English (U.S.)) +Resource151=IDD_ITEMGENERAL (English (U.S.)) +Resource152=IDD_MOSEDIT (English (U.S.)) +Resource153=IDD_SPELLEXTRA (English (U.S.)) +Resource154=IDD_AREAINT (English (U.S.)) +Resource155=IDD_ABOUTBOX (English (U.S.)) +Resource156=IDD_ITEMICONS (English (U.S.)) +Resource157=IDR_SPELL (English (U.S.)) +Resource158=IDD_EXTRACT (English (U.S.)) +Resource159=IDD_SCRIPTEDIT (English (U.S.)) +Resource160=IDD_CREATURELEVELS (English (U.S.)) +Resource161=IDD_ITEMEQUIP (English (U.S.)) +Resource162=IDD_AREATRIGGERSTRINGS (English (U.S.)) +Resource163=IDD_CHITEM_DIALOG (English (U.S.)) +Resource164=IDD_WEDEDIT (English (U.S.)) +Resource165=IDD_CREATUREICONS (English (U.S.)) +Resource166=IDD_SPELLEQUIP (English (U.S.)) +Resource167=IDD_TEXTVIEW (English (U.S.)) +Resource168=IDR_EFFECT (English (U.S.)) Resource169=IDD_ANIMDIALOG -Resource170=IDR_STORE (English (U.S.)) -Resource171=IDD_GAMEEDIT (English (U.S.)) -Resource172=IDD_MOSEDIT (English (U.S.)) -Resource173=IDD_CREATUREITEMS (English (U.S.)) -Resource174=IDR_IDS (English (U.S.)) -Resource175=IDR_TREEMENU (English (U.S.)) -Resource176=IDD_CREATURESKILLS (English (U.S.)) -Resource177=IDD_PROJEDIT (English (U.S.)) -Resource178=IDD_VVCEDIT (English (U.S.)) -Resource179=IDD_ITEMEQUIP (English (U.S.)) -Resource180=IDD_AREASPAWN (English (U.S.)) -Resource181=IDD_AREAANIM (English (U.S.)) -Resource182=IDR_VVC (English (U.S.)) -Resource183=IDD_ABOUTBOX (English (U.S.)) -Resource184=IDR_AREA (English (U.S.)) -Resource185=IDD_AREAMAP (English (U.S.)) -Resource186=IDD_WEDEDIT (English (U.S.)) -Resource187=IDR_EFFECT (English (U.S.)) -Resource188=IDD_STOREGENERAL (English (U.S.)) -Resource189=IDR_SCRIPT (English (U.S.)) -Resource190=IDD_WEDPOLY (English (U.S.)) -Resource191=IDD_2DAEDIT (English (U.S.)) -Resource192=IDD_IAPDIALOG (English (U.S.)) -Resource193=IDR_CHITIN (English (U.S.)) -Resource194=IDD_ITEMEFFECT (English (U.S.)) -Resource195=IDD_CREATUREGENERAL (English (U.S.)) -Resource196=IDD_AREAPROJ (English (U.S.)) -Resource197=IDR_2DA (English (U.S.)) -Resource198=IDR_CHUI (English (U.S.)) -Resource199=IDR_BAMMENU (English (U.S.)) -Resource200=IDD_ITEMUSE (English (U.S.)) -Resource201=IDD_CREATUREIWD (English (U.S.)) -Resource202=IDD_SCRIPTEDIT (English (U.S.)) -Resource203=IDD_AREACONTAINER (English (U.S.)) -Resource204=IDD_SPELLTOOL (English (U.S.)) -Resource205=IDD_SAVHANDLE (English (U.S.)) -Resource206=IDD_CFB (English (U.S.)) -Resource207=IDD_IDSEDIT (English (U.S.)) -Resource208=IDD_SPELLGENERAL (English (U.S.)) -Resource209=IDD_SHOWLOG (English (U.S.)) -Resource210=IDR_TILE (English (U.S.)) -Resource211=IDD_SEARCHNODE (English (U.S.)) +Resource170=IDD_CHECK (English (U.S.)) +Resource171=IDD_WEDTILE (English (U.S.)) +Resource172=IDD_AREAMAP (English (U.S.)) +Resource173=IDD_SRCEDIT (English (U.S.)) +Resource174=IDD_CFB (English (U.S.)) +Resource175=IDD_STOREEXTRA (English (U.S.)) +Resource176=IDD_COLORPICKER (English (U.S.)) +Resource177=IDD_MAPLINK (English (U.S.)) +Resource178=IDD_AREAEDIT (English (U.S.)) +Resource179=IDD_SPELLEFFECT (English (U.S.)) +Resource180=IDD_2DAEDIT (English (U.S.)) +Resource181=IDD_GAMEGENERAL (English (U.S.)) +Resource182=IDD_ITEMPICKER (English (U.S.)) +Resource183=IDD_BAMEDIT (English (U.S.)) +Resource184=IDD_FINDITEM (English (U.S.)) +Resource185=IDR_CREATURE (English (U.S.)) +Resource186=IDD_PROJGEMRB (English (U.S.)) +Resource187=IDD_PROGRESS (English (U.S.)) +Resource188=IDD_PROJEDIT (English (U.S.)) +Resource189=IDD_ITEMEFFECT (English (U.S.)) +Resource190=IDR_MENUBAR (English (U.S.)) +Resource191=IDD_STOREDRINKS (English (U.S.)) +Resource192=IDD_CREATUREPST (English (U.S.)) +Resource193=IDD_STORERENTAL (English (U.S.)) +Resource194=IDD_SPELLEDIT (English (U.S.)) +Resource195=IDD_EDIT (English (U.S.)) +Resource196=IDR_WEDMENU (English (U.S.)) +Resource197=IDD_VVCEDIT (English (U.S.)) +Resource198=IDD_STOREITEMS (English (U.S.)) +Resource199=IDD_WEIDU (English (U.S.)) +Resource200=IDD_AREAAMBIENT (English (U.S.)) +Resource201=IDR_IDS (English (U.S.)) +Resource202=IDD_GAMEPCINFO (English (U.S.)) +Resource203=IDD_MUSEDIT (English (U.S.)) +Resource204=IDR_STORE (English (U.S.)) +Resource205=IDD_CREATUREIWD2 (English (U.S.)) +Resource206=IDD_AREAACTOR (English (U.S.)) +Resource207=IDD_POLYGON (English (U.S.)) +Resource208=IDD_CREATUREUNKNOWN (English (U.S.)) +Resource209=IDD_CREATUREIWD (English (U.S.)) +Resource210=IDD_STOREGENERAL (English (U.S.)) +Resource211=IDD_MASSCLEAR (English (U.S.)) Resource212=IDD_IMAGEVIEW (English (U.S.)) -Resource213=IDD_PALETTE (English (U.S.)) -Resource214=IDD_BAMEDIT (English (U.S.)) -Resource215=IDD_AREAAMBIENT (English (U.S.)) -Resource216=IDR_MUSIC (English (U.S.)) -Resource217=IDD_DIALOGEDIT (English (U.S.)) -Resource218=IDD_ITEMDESC (English (U.S.)) -Resource219=IDD_KEYEDIT (English (U.S.)) -Resource220=IDD_CREATUREEDIT (English (U.S.)) -Resource221=IDR_SRC (English (U.S.)) -Resource222=IDR_WEDMENU (English (U.S.)) -Resource223=IDD_EFFEDIT (English (U.S.)) -Resource224=IDD_GAMEPCINFO (English (U.S.)) -Resource225=IDD_CREATUREUNKNOWN (English (U.S.)) -Resource226=IDR_MENUBAR (English (U.S.)) -Resource227=IDD_MAPLINK (English (U.S.)) -Resource228=IDD_AREATRIGGERSTRINGS (English (U.S.)) -Resource229=IDD_SCHEDULE (English (U.S.)) -Resource230=IDD_PROJEXT (English (U.S.)) -Resource231=IDD_GAMESTATS (English (U.S.)) -Resource232=IDD_TEXTVIEW (English (U.S.)) -Resource233=IDD_EXTRACT2 (English (U.S.)) -Resource234=IDD_VARIABLES (English (U.S.)) -Resource235=IDD_TISDIALOG (English (U.S.)) -Resource236=IDD_STOREEDIT (English (U.S.)) -Resource237=IDD_AREAEDIT (English (U.S.)) -Resource238=IDD_CREATURELEVELS (English (U.S.)) -Resource239=IDD_SPELLEXTRA (English (U.S.)) -Resource240=IDD_AREAENTRANCE (English (U.S.)) -Resource241=IDR_CREATURE (English (U.S.)) -Resource242=IDD_CREATUREICONS (English (U.S.)) -Resource243=IDD_STORERENTAL (English (U.S.)) -Resource244=IDD_SPELLDESC (English (U.S.)) -Resource245=IDD_AREAINT (English (U.S.)) +Resource213=IDD_CREATURESTRINGS (English (U.S.)) +Resource214=IDD_CREATURERES (English (U.S.)) +Resource215=IDD_SAVHANDLE (English (U.S.)) +Resource216=IDD_STOREEDIT (English (U.S.)) +Resource217=IDD_WEDPOLY (English (U.S.)) +Resource218=IDD_AREASONGS (English (U.S.)) +Resource219=IDR_ITEM (English (U.S.)) +Resource220=IDD_IDSEDIT (English (U.S.)) +Resource221=IDD_EFFEDIT (English (U.S.)) +Resource222=IDD_VARIABLES (English (U.S.)) +Resource223=IDD_AREATRIGGER (English (U.S.)) +Resource224=IDR_2DA (English (U.S.)) +Resource225=IDD_SHOWLOG (English (U.S.)) +Resource226=IDD_COMPAT (English (U.S.)) +Resource227=IDD_CHUIEDIT (English (U.S.)) +Resource228=IDR_MUSIC (English (U.S.)) +Resource229=IDD_MAPEDIT (English (U.S.)) +Resource230=IDD_KEYEDIT (English (U.S.)) +Resource231=IDR_VVC (English (U.S.)) +Resource232=IDR_TLKMENU (English (U.S.)) +Resource233=IDD_SEARCHNODE (English (U.S.)) +Resource234=IDD_AREASPAWN (English (U.S.)) +Resource235=IDR_TREEMENU (English (U.S.)) +Resource236=IDD_SCHEDULE (English (U.S.)) +Resource237=IDD_PROJEXT (English (U.S.)) +Resource238=IDR_SRC (English (U.S.)) +Resource239=IDD_AREACONTAINER (English (U.S.)) +Resource240=IDD_CREATUREITEMS (English (U.S.)) +Resource241=IDD_ITEMEDIT (English (U.S.)) +Resource242=IDD_IAPDIALOG (English (U.S.)) +Resource243=IDD_CREATUREEDIT (English (U.S.)) +Resource244=IDD_AREADOOR (English (U.S.)) +Resource245=IDD_PANICBUTTON (English (U.S.)) Class99=CAreaTriggerString Class100=CPCInfo -Resource246=IDD_ADDLINK (English (U.S.)) +Resource246=IDD_TISDIALOG (English (U.S.)) Class101=CCreatureOverlay -Resource247=IDD_COMPAT (English (U.S.)) +Resource247=IDD_CREATUREGENERAL (English (U.S.)) Class102=IWD2Creature -Resource248=IDD_PANICBUTTON (English (U.S.)) +Resource248=IDD_CREATUREOVR (English (U.S.)) Class103=CAnimDialog -Resource249=IDD_PROJGEMRB (English (U.S.)) +Resource249=IDR_CHITIN (English (U.S.)) Class104=CCreatureLevels -Resource250=IDD_SPELLEFFECT (English (U.S.)) +Resource250=IDD_AREAVARIABLE (English (U.S.)) Class105=CAreaProj -Resource251=IDD_STOREEXTRA (English (U.S.)) +Resource251=IDD_CREATURESKILLS (English (U.S.)) Class106=CProjGemRB Resource252=IDR_SHORTCUT (English (U.S.)) @@ -383,7 +383,7 @@ Filter=D BaseClass=CDialog VirtualFilter=dWC -LastObject=ID_CHECK_SPAWNINI +LastObject=ID_EXTRACTION_RECOMPRESSSAV [CLS:CAboutDlg] Type=0 Modified: chitem/trunk/chitem.rc =================================================================== --- chitem/trunk/chitem.rc 2009-06-23 22:17:07 UTC (rev 6605) +++ chitem/trunk/chitem.rc 2009-06-23 22:18:07 UTC (rev 6606) @@ -6239,8 +6239,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 7,1,0,3 - PRODUCTVERSION 7,1,0,3 + FILEVERSION 7,1,0,4 + PRODUCTVERSION 7,1,0,4 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -6258,14 +6258,14 @@ VALUE "Comments", "forums.gibberlings3.net\0" VALUE "CompanyName", "GemRB Project (gemrb.sourceforge.net)\0" VALUE "FileDescription", "DragonLance Total Conversion Editor Pro\0" - VALUE "FileVersion", "7, 1, 0, 3\0" + VALUE "FileVersion", "7, 1, 0, 4\0" VALUE "InternalName", "dltcep\0" VALUE "LegalCopyright", "Copyright (C) 2002-2009 Avenger\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "chitem.EXE\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "DLTC Editor Pro 7.1c\0" - VALUE "ProductVersion", "7, 1, 0, 3\0" + VALUE "ProductName", "DLTC Editor Pro 7.1d\0" + VALUE "ProductVersion", "7, 1, 0, 4\0" VALUE "SpecialBuild", "\0" END END Modified: chitem/trunk/chitemDlg.cpp =================================================================== --- chitem/trunk/chitemDlg.cpp 2009-06-23 22:17:07 UTC (rev 6605) +++ chitem/trunk/chitemDlg.cpp 2009-06-23 22:18:07 UTC (rev 6606) @@ -3,7 +3,7 @@ #include "stdafx.h" -#define PRG_VERSION "7.1c" +#define PRG_VERSION "7.1d" #include <fcntl.h> #include <direct.h> @@ -3042,7 +3042,7 @@ CFindItem dlg; int ret; - dlg.mask=0x4c; + dlg.mask=0x4f; dlg.flags=searchflags; dlg.searchdata=searchdata; dlg.title="Find projectiles"; Modified: chitem/trunk/seekers.cpp =================================================================== --- chitem/trunk/seekers.cpp 2009-06-23 22:17:07 UTC (rev 6605) +++ chitem/trunk/seekers.cpp 2009-06-23 22:18:07 UTC (rev 6606) @@ -1466,7 +1466,6 @@ int featblock, featblock2; search_data tmpdata; int loc, cnt; - POSITION pos; #if 0 for(int i=0;i<the_item.extheadcount;i++) @@ -1578,16 +1577,7 @@ } if(searchflags&MP) { - pos=pro_references.FindIndex(tmpdata.projectile); - if(pos) - { - tmpstr=pro_references.GetAt(pos); - if(!tmpstr.GetLength() ) tmpstr="Unknown"; - } - else - { - tmpstr="Unknown"; - } + tmpstr=get_projectile_id(tmpdata.projectile,0); log("Found projectile %d-%s in extended header #%d",tmpdata.projectile,tmpstr,exthead+1); } if(searchflags&MF) @@ -1731,7 +1721,6 @@ int featblock, featblock2; search_data tmpdata; int loc, cnt; - POSITION pos; #if 0 if (the_spell.header.splattr) { @@ -1827,16 +1816,7 @@ } if(searchflags&MP) { - pos=pro_references.FindIndex(tmpdata.projectile); - if(pos) - { - tmpstr=pro_references.GetAt(pos); - if(!tmpstr.GetLength() ) tmpstr="Unknown"; - } - else - { - tmpstr="Unknown"; - } + tmpstr=get_projectile_id(tmpdata.projectile,0); log("Found projectile %d-%s in extended header #%d",tmpdata.projectile,tmpstr,exthead+1); } if(searchflags&MF) @@ -3055,6 +3035,7 @@ bool CChitemDlg::match_projectile() { + CString tmpstr; int found; search_data tmpdata; @@ -3118,6 +3099,18 @@ } } + if(found) + { + if(searchflags&MP) + { + if(searchdata.projectile<=the_projectile.extension.projectile && + searchdata.projectile2>=the_projectile.extension.projectile) + { + tmpdata.projectile=the_projectile.extension.projectile; + } + else found = 0; + } + } if(!found) return false; if(searchflags&MR) @@ -3136,6 +3129,12 @@ { log("Found AOE flag: %0x", tmpdata.itemtype); } + + if(searchflags&MP) + { + tmpstr=get_projectile_id(tmpdata.projectile,0); + log("Found projectile %d-%s",tmpdata.projectile,tmpstr); + } return true; } Modified: chitem/trunk/variables.cpp =================================================================== --- chitem/trunk/variables.cpp 2009-06-23 22:17:07 UTC (rev 6605) +++ chitem/trunk/variables.cpp 2009-06-23 22:18:07 UTC (rev 6606) @@ -1177,6 +1177,7 @@ if(varname.Mid(6)==m_varpicker) { m_area=varname.Left(6); + m_value=value; goto endofquest; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-06-29 21:20:59
|
Revision: 6656 http://gemrb.svn.sourceforge.net/gemrb/?rev=6656&view=rev Author: avenger_teambg Date: 2009-06-29 21:20:52 +0000 (Mon, 29 Jun 2009) Log Message: ----------- dltcep update for the new projectile flags Modified Paths: -------------- chitem/trunk/Chitem.h chitem/trunk/ProjGemRB.cpp chitem/trunk/ProjGemRB.h chitem/trunk/Structs.h chitem/trunk/chitem.clw chitem/trunk/chitem.rc chitem/trunk/chitemDlg.cpp chitem/trunk/chitemDlg.h chitem/trunk/resource.h Modified: chitem/trunk/Chitem.h =================================================================== --- chitem/trunk/Chitem.h 2009-06-29 21:19:09 UTC (rev 6655) +++ chitem/trunk/Chitem.h 2009-06-29 21:20:52 UTC (rev 6656) @@ -529,24 +529,28 @@ #define PROJ_AFFECT_ONE 0x8000 //extended flags for gemrb -#define PROJ_BOUNCE 1 //bounce from walls -#define PROJ_CONTINUE 2 //continue as travel projectile after triggered -#define PROJ_FREEZE 4 //freeze after trigger and slowly fade out -#define PROJ_NO_TRAVEL 8 //appear immediately on target -#define PROJ_TRAIL_FACE 16 //trail bams also use face -#define PROJ_CURVE 32 //curved path -#define PROJ_RANDOM 64 //random starting frame -#define PROJ_PILLAR 128 //pillar projectile -#define PROJ_TRANSLUCENT 256 //half-transparent travel projectile -#define PROJ_TINTED 512 //tinted by gradient (better than paletted animations) -#define PROJ_ITERATION 1024 //create another projectile with projectile ID-1 -#define PROJ_TILE 2048 //place the travel bam all over the AOE -#define PROJ_FALLING 4096 //the projectile will fall from above target (y=target.y, x=target-100) -#define PROJ_INCOMING 8192 //the projectile will fall from above caster (y=caster.y, x=target-100) -#define PROJ_LINE 16384 //solid line from source to target (ignore caster) -#define PROJ_WALL 32768 //diagonal across the AOE circle, firewall type -#define PROJ_BACKGROUND 65536 //draw behind target -#define PROJ_POP 0x20000 //pop in/hold/pop out animation chain (use shadow for hold) +#define PROJ_BOUNCE 1 //bounce from walls +#define PROJ_CONTINUE 2 //continue as travel projectile after triggered +#define PROJ_FREEZE 4 //freeze after trigger and slowly fade out +#define PROJ_NO_TRAVEL 8 //appear immediately on target +#define PROJ_TRAIL_FACE 16 //trail bams also use face +#define PROJ_CURVE 32 //curved path +#define PROJ_RANDOM 64 //random starting frame +#define PROJ_PILLAR 128 //pillar projectile +#define PROJ_TRANSLUCENT 256 //half-transparent travel projectile +#define PROJ_TINTED 512 //tinted by gradient (better than paletted animations) +#define PROJ_ITERATION 1024 //create another projectile with projectile ID-1 +#define PROJ_TILE 2048 //place the travel bam all over the AOE +#define PROJ_FALLING 4096 //the projectile will fall from above target (y=target.y, x=target-100) +#define PROJ_INCOMING 8192 //the projectile will fall from above caster (y=caster.y, x=target-100) +#define PROJ_LINE 16384 //solid line from source to target (ignore caster) +#define PROJ_WALL 32768 //diagonal across the AOE circle, firewall type +#define PROJ_BACKGROUND 65536 //draw behind target +#define PROJ_POP 0x20000 //pop in/hold/pop out animation chain (use shadow for hold) +#define PROJ_POP_OUT 0x40000 //internal flag for pop out phase +#define PROJ_FADE 0x80000 //fade after explode +#define PROJ_TEXT 0x100000 //display text when the projectile is created +#define PROJ_WANDERING 0x200000 //the projectile moves randomly #define TRANSPARENT_GREEN 0x00ff00 Modified: chitem/trunk/ProjGemRB.cpp =================================================================== --- chitem/trunk/ProjGemRB.cpp 2009-06-29 21:19:09 UTC (rev 6655) +++ chitem/trunk/ProjGemRB.cpp 2009-06-29 21:20:52 UTC (rev 6656) @@ -4,6 +4,7 @@ #include "stdafx.h" #include "chitem.h" #include "ProjGemRB.h" +#include "options.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -14,16 +15,16 @@ ///////////////////////////////////////////////////////////////////////////// // CProjGemRB dialog +static int textids[]={IDC_TEXT, IDC_STRREF,0}; CProjGemRB::CProjGemRB(CWnd* pParent /*=NULL*/) : CDialog(CProjGemRB::IDD, pParent) { //{{AFX_DATA_INIT(CProjGemRB) - // NOTE: the ClassWizard will add member initialization here + m_text = _T(""); //}}AFX_DATA_INIT } - void CProjGemRB::DoDataExchange(CDataExchange* pDX) { CButton *cb; @@ -33,13 +34,13 @@ CDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CProjGemRB) - // NOTE: the ClassWizard will add DDX and DDV calls here + DDX_Text(pDX, IDC_STRING, m_text); //}}AFX_DATA_MAP tmpstr.Format("%d", the_projectile.header.extflags); DDX_Text(pDX, IDC_FLAGS, tmpstr); the_projectile.header.extflags=strtonum(tmpstr); j=1; - for(i=0;i<18;i++) + for(i=0;i<24;i++) { cb=(CButton *) GetDlgItem(IDC_FLAG1+i); if (cb) @@ -49,6 +50,9 @@ j<<=1; } } + tmpstr.Format("%d", the_projectile.header.text); + DDX_Text(pDX, IDC_STRREF, tmpstr); + the_projectile.header.text=strtonum(tmpstr); } @@ -72,6 +76,13 @@ ON_BN_CLICKED(IDC_FLAG16, OnFlag16) ON_BN_CLICKED(IDC_FLAG17, OnFlag17) ON_BN_CLICKED(IDC_FLAG18, OnFlag18) + ON_EN_KILLFOCUS(IDC_FLAGS, OnKillfocus) + ON_BN_CLICKED(IDC_FLAG19, OnFlag19) + ON_EN_KILLFOCUS(IDC_STRING, OnKillfocusString) + ON_BN_CLICKED(IDC_FLAG20, OnFlag20) + ON_BN_CLICKED(IDC_FLAG21, OnFlag21) + ON_EN_KILLFOCUS(IDC_STRREF, OnKillfocus) + ON_BN_CLICKED(IDC_FLAG22, OnFlag22) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -186,3 +197,68 @@ the_projectile.header.extflags^=PROJ_POP; UpdateData(UD_DISPLAY); } + +void CProjGemRB::OnFlag19() +{ + the_projectile.header.extflags^=PROJ_POP_OUT; + UpdateData(UD_DISPLAY); +} + +void CProjGemRB::OnFlag20() +{ + the_projectile.header.extflags^=PROJ_FADE; + UpdateData(UD_DISPLAY); +} + +void CProjGemRB::OnFlag21() +{ + the_projectile.header.extflags^=PROJ_TEXT; + UpdateData(UD_DISPLAY); +} + +void CProjGemRB::OnFlag22() +{ + the_projectile.header.extflags^=PROJ_WANDERING; + UpdateData(UD_DISPLAY); +} + +void CProjGemRB::RefreshStrings() +{ + m_text=resolve_tlk_text(the_projectile.header.text); +} + +void CProjGemRB::OnKillfocus() +{ + UpdateData(UD_RETRIEVE); + RefreshStrings(); + UpdateData(UD_DISPLAY); +} + +void CProjGemRB::OnKillfocusString() +{ + CString tmpstr; + + UpdateData(UD_RETRIEVE); + tmpstr=resolve_tlk_text(the_projectile.header.text); + if(tmpstr!=m_text) + { + if(editflg&TLKCHANGE) + { + if(MessageBox("Do you want to update dialog.tlk?","Area editor",MB_YESNO)!=IDYES) + { + return; + } + } + the_projectile.header.text=store_tlk_text(the_projectile.header.text,m_text); + } + UpdateData(UD_DISPLAY); +} + +BOOL CProjGemRB::OnInitDialog() +{ + CDialog::OnInitDialog(); + + RefreshStrings(); + UpdateData(UD_DISPLAY); + return TRUE; +} Modified: chitem/trunk/ProjGemRB.h =================================================================== --- chitem/trunk/ProjGemRB.h 2009-06-29 21:19:09 UTC (rev 6655) +++ chitem/trunk/ProjGemRB.h 2009-06-29 21:20:52 UTC (rev 6656) @@ -19,7 +19,7 @@ // Dialog Data //{{AFX_DATA(CProjGemRB) enum { IDD = IDD_PROJGEMRB }; - // NOTE: the ClassWizard will add data members here + CString m_text; //}}AFX_DATA @@ -31,7 +31,8 @@ //}}AFX_VIRTUAL // Implementation -protected: +protected: + void RefreshStrings(); // Generated message map functions //{{AFX_MSG(CProjGemRB) @@ -53,6 +54,13 @@ afx_msg void OnFlag16(); afx_msg void OnFlag17(); afx_msg void OnFlag18(); + afx_msg void OnKillfocus(); + afx_msg void OnFlag19(); + afx_msg void OnKillfocusString(); + virtual BOOL OnInitDialog(); + afx_msg void OnFlag20(); + afx_msg void OnFlag21(); + afx_msg void OnFlag22(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: chitem/trunk/Structs.h =================================================================== --- chitem/trunk/Structs.h 2009-06-29 21:19:09 UTC (rev 6655) +++ chitem/trunk/Structs.h 2009-06-29 21:20:52 UTC (rev 6656) @@ -536,8 +536,9 @@ char wavc2[8]; char wavc3[8]; long spkcolour; //cannot be 0 if there are sparks (must be 1-12) - long extflags; //flags used by gemrb - char unknown30[208]; //unknown till next 256 block + long extflags; //0x2c //flags used by gemrb + long text; //0x30 //text strref + char unknown34[204]; //unknown till next 256 block unsigned long attr; char bam1[8]; char bam2[8]; Modified: chitem/trunk/chitem.clw =================================================================== --- chitem/trunk/chitem.clw 2009-06-29 21:19:09 UTC (rev 6655) +++ chitem/trunk/chitem.clw 2009-06-29 21:20:52 UTC (rev 6656) @@ -2,7 +2,7 @@ [General Info] Version=1 -LastClass=CChitemDlg +LastClass=CProjGemRB LastTemplate=CDialog NewFileInclude1=#include "stdafx.h" NewFileInclude2=#include "chitem.h" @@ -232,140 +232,140 @@ Resource123=IDD_GAMEGENERAL Class98=IcewindCre Resource124=IDR_SHORTCUT -Resource125=IDR_SCRIPT (English (U.S.)) -Resource126=IDR_WORLDMAP (English (U.S.)) -Resource127=IDD_SPELLGENERAL (English (U.S.)) -Resource128=IDD_ADDLINK (English (U.S.)) -Resource129=IDR_BAMMENU (English (U.S.)) -Resource130=IDD_DIALOGEDIT (English (U.S.)) -Resource131=IDD_SPELLTOOL (English (U.S.)) -Resource132=IDD_AREAANIM (English (U.S.)) -Resource133=IDD_ITEMDESC (English (U.S.)) -Resource134=IDD_CREATUREEFF (English (U.S.)) -Resource135=IDD_ITEMUSE (English (U.S.)) -Resource136=IDD_ITEMEXTRA (English (U.S.)) -Resource137=IDR_TILE (English (U.S.)) -Resource138=IDD_AREAGENERAL (English (U.S.)) -Resource139=IDR_AREA (English (U.S.)) -Resource140=IDD_SPELLDESC (English (U.S.)) -Resource141=IDD_PALETTE (English (U.S.)) -Resource142=IDD_STRREFDLG (English (U.S.)) -Resource143=IDD_GAMESTATS (English (U.S.)) -Resource144=IDD_AREAPROJ (English (U.S.)) -Resource145=IDD_EXTRACT2 (English (U.S.)) -Resource146=IDD_AREAENTRANCE (English (U.S.)) -Resource147=IDR_PROJECT (English (U.S.)) -Resource148=IDR_GAME (English (U.S.)) -Resource149=IDD_GAMEEDIT (English (U.S.)) -Resource150=IDR_CHUI (English (U.S.)) -Resource151=IDD_ITEMGENERAL (English (U.S.)) -Resource152=IDD_MOSEDIT (English (U.S.)) -Resource153=IDD_SPELLEXTRA (English (U.S.)) -Resource154=IDD_AREAINT (English (U.S.)) -Resource155=IDD_ABOUTBOX (English (U.S.)) -Resource156=IDD_ITEMICONS (English (U.S.)) -Resource157=IDR_SPELL (English (U.S.)) -Resource158=IDD_EXTRACT (English (U.S.)) -Resource159=IDD_SCRIPTEDIT (English (U.S.)) -Resource160=IDD_CREATURELEVELS (English (U.S.)) -Resource161=IDD_ITEMEQUIP (English (U.S.)) -Resource162=IDD_AREATRIGGERSTRINGS (English (U.S.)) -Resource163=IDD_CHITEM_DIALOG (English (U.S.)) -Resource164=IDD_WEDEDIT (English (U.S.)) -Resource165=IDD_CREATUREICONS (English (U.S.)) -Resource166=IDD_SPELLEQUIP (English (U.S.)) -Resource167=IDD_TEXTVIEW (English (U.S.)) -Resource168=IDR_EFFECT (English (U.S.)) -Resource169=IDD_ANIMDIALOG -Resource170=IDD_CHECK (English (U.S.)) -Resource171=IDD_WEDTILE (English (U.S.)) -Resource172=IDD_AREAMAP (English (U.S.)) -Resource173=IDD_SRCEDIT (English (U.S.)) -Resource174=IDD_CFB (English (U.S.)) -Resource175=IDD_STOREEXTRA (English (U.S.)) -Resource176=IDD_COLORPICKER (English (U.S.)) -Resource177=IDD_MAPLINK (English (U.S.)) -Resource178=IDD_AREAEDIT (English (U.S.)) -Resource179=IDD_SPELLEFFECT (English (U.S.)) -Resource180=IDD_2DAEDIT (English (U.S.)) -Resource181=IDD_GAMEGENERAL (English (U.S.)) -Resource182=IDD_ITEMPICKER (English (U.S.)) -Resource183=IDD_BAMEDIT (English (U.S.)) -Resource184=IDD_FINDITEM (English (U.S.)) -Resource185=IDR_CREATURE (English (U.S.)) -Resource186=IDD_PROJGEMRB (English (U.S.)) -Resource187=IDD_PROGRESS (English (U.S.)) -Resource188=IDD_PROJEDIT (English (U.S.)) -Resource189=IDD_ITEMEFFECT (English (U.S.)) -Resource190=IDR_MENUBAR (English (U.S.)) -Resource191=IDD_STOREDRINKS (English (U.S.)) -Resource192=IDD_CREATUREPST (English (U.S.)) -Resource193=IDD_STORERENTAL (English (U.S.)) -Resource194=IDD_SPELLEDIT (English (U.S.)) -Resource195=IDD_EDIT (English (U.S.)) -Resource196=IDR_WEDMENU (English (U.S.)) -Resource197=IDD_VVCEDIT (English (U.S.)) -Resource198=IDD_STOREITEMS (English (U.S.)) -Resource199=IDD_WEIDU (English (U.S.)) -Resource200=IDD_AREAAMBIENT (English (U.S.)) -Resource201=IDR_IDS (English (U.S.)) -Resource202=IDD_GAMEPCINFO (English (U.S.)) -Resource203=IDD_MUSEDIT (English (U.S.)) -Resource204=IDR_STORE (English (U.S.)) -Resource205=IDD_CREATUREIWD2 (English (U.S.)) -Resource206=IDD_AREAACTOR (English (U.S.)) -Resource207=IDD_POLYGON (English (U.S.)) -Resource208=IDD_CREATUREUNKNOWN (English (U.S.)) -Resource209=IDD_CREATUREIWD (English (U.S.)) -Resource210=IDD_STOREGENERAL (English (U.S.)) -Resource211=IDD_MASSCLEAR (English (U.S.)) -Resource212=IDD_IMAGEVIEW (English (U.S.)) -Resource213=IDD_CREATURESTRINGS (English (U.S.)) -Resource214=IDD_CREATURERES (English (U.S.)) -Resource215=IDD_SAVHANDLE (English (U.S.)) -Resource216=IDD_STOREEDIT (English (U.S.)) -Resource217=IDD_WEDPOLY (English (U.S.)) -Resource218=IDD_AREASONGS (English (U.S.)) -Resource219=IDR_ITEM (English (U.S.)) -Resource220=IDD_IDSEDIT (English (U.S.)) -Resource221=IDD_EFFEDIT (English (U.S.)) -Resource222=IDD_VARIABLES (English (U.S.)) -Resource223=IDD_AREATRIGGER (English (U.S.)) -Resource224=IDR_2DA (English (U.S.)) -Resource225=IDD_SHOWLOG (English (U.S.)) -Resource226=IDD_COMPAT (English (U.S.)) -Resource227=IDD_CHUIEDIT (English (U.S.)) -Resource228=IDR_MUSIC (English (U.S.)) -Resource229=IDD_MAPEDIT (English (U.S.)) -Resource230=IDD_KEYEDIT (English (U.S.)) -Resource231=IDR_VVC (English (U.S.)) -Resource232=IDR_TLKMENU (English (U.S.)) -Resource233=IDD_SEARCHNODE (English (U.S.)) -Resource234=IDD_AREASPAWN (English (U.S.)) -Resource235=IDR_TREEMENU (English (U.S.)) -Resource236=IDD_SCHEDULE (English (U.S.)) -Resource237=IDD_PROJEXT (English (U.S.)) -Resource238=IDR_SRC (English (U.S.)) -Resource239=IDD_AREACONTAINER (English (U.S.)) -Resource240=IDD_CREATUREITEMS (English (U.S.)) -Resource241=IDD_ITEMEDIT (English (U.S.)) -Resource242=IDD_IAPDIALOG (English (U.S.)) -Resource243=IDD_CREATUREEDIT (English (U.S.)) -Resource244=IDD_AREADOOR (English (U.S.)) -Resource245=IDD_PANICBUTTON (English (U.S.)) +Resource125=IDD_ITEMGENERAL (English (U.S.)) +Resource126=IDD_WEDTILE (English (U.S.)) +Resource127=IDD_PROJGEMRB (English (U.S.)) +Resource128=IDD_SPELLEXTRA (English (U.S.)) +Resource129=IDD_PANICBUTTON (English (U.S.)) +Resource130=IDD_ITEMUSE (English (U.S.)) +Resource131=IDD_SPELLEFFECT (English (U.S.)) +Resource132=IDD_AREASPAWN (English (U.S.)) +Resource133=IDD_WEIDU (English (U.S.)) +Resource134=IDD_CREATUREUNKNOWN (English (U.S.)) +Resource135=IDD_IMAGEVIEW (English (U.S.)) +Resource136=IDR_CHUI (English (U.S.)) +Resource137=IDD_GAMESTATS (English (U.S.)) +Resource138=IDR_CREATURE (English (U.S.)) +Resource139=IDD_TISDIALOG (English (U.S.)) +Resource140=IDD_CHECK (English (U.S.)) +Resource141=IDR_CHITIN (English (U.S.)) +Resource142=IDD_CREATUREICONS (English (U.S.)) +Resource143=IDD_MOSEDIT (English (U.S.)) +Resource144=IDD_SHOWLOG (English (U.S.)) +Resource145=IDD_ITEMEDIT (English (U.S.)) +Resource146=IDD_EXTRACT (English (U.S.)) +Resource147=IDD_STOREDRINKS (English (U.S.)) +Resource148=IDD_GAMEEDIT (English (U.S.)) +Resource149=IDD_DIALOGEDIT (English (U.S.)) +Resource150=IDD_COLORPICKER (English (U.S.)) +Resource151=IDR_SPELL (English (U.S.)) +Resource152=IDD_AREAEDIT (English (U.S.)) +Resource153=IDD_CHITEM_DIALOG (English (U.S.)) +Resource154=IDD_BAMEDIT (English (U.S.)) +Resource155=IDD_MUSEDIT (English (U.S.)) +Resource156=IDR_STORE (English (U.S.)) +Resource157=IDD_WEDEDIT (English (U.S.)) +Resource158=IDR_WORLDMAP (English (U.S.)) +Resource159=IDD_CREATUREEDIT (English (U.S.)) +Resource160=IDD_SCRIPTEDIT (English (U.S.)) +Resource161=IDR_EFFECT (English (U.S.)) +Resource162=IDD_IAPDIALOG (English (U.S.)) +Resource163=IDD_CREATUREEFF (English (U.S.)) +Resource164=IDD_AREASONGS (English (U.S.)) +Resource165=IDD_STOREITEMS (English (U.S.)) +Resource166=IDD_ABOUTBOX (English (U.S.)) +Resource167=IDD_MAPLINK (English (U.S.)) +Resource168=IDD_MASSCLEAR (English (U.S.)) +Resource169=IDD_SAVHANDLE (English (U.S.)) +Resource170=IDR_MENUBAR (English (U.S.)) +Resource171=IDD_SPELLDESC (English (U.S.)) +Resource172=IDD_AREAGENERAL (English (U.S.)) +Resource173=IDD_ADDLINK (English (U.S.)) +Resource174=IDD_ITEMEFFECT (English (U.S.)) +Resource175=IDD_CREATUREOVR (English (U.S.)) +Resource176=IDD_AREATRIGGER (English (U.S.)) +Resource177=IDD_EXTRACT2 (English (U.S.)) +Resource178=IDD_ITEMICONS (English (U.S.)) +Resource179=IDD_PROGRESS (English (U.S.)) +Resource180=IDD_AREAACTOR (English (U.S.)) +Resource181=IDD_POLYGON (English (U.S.)) +Resource182=IDD_SRCEDIT (English (U.S.)) +Resource183=IDR_WEDMENU (English (U.S.)) +Resource184=IDR_TREEMENU (English (U.S.)) +Resource185=IDD_KEYEDIT (English (U.S.)) +Resource186=IDD_STRREFDLG (English (U.S.)) +Resource187=IDD_WEDPOLY (English (U.S.)) +Resource188=IDD_ITEMPICKER (English (U.S.)) +Resource189=IDD_CHUIEDIT (English (U.S.)) +Resource190=IDD_CREATUREIWD2 (English (U.S.)) +Resource191=IDD_SPELLTOOL (English (U.S.)) +Resource192=IDD_CREATUREITEMS (English (U.S.)) +Resource193=IDR_MUSIC (English (U.S.)) +Resource194=IDD_FINDITEM (English (U.S.)) +Resource195=IDD_PROJEDIT (English (U.S.)) +Resource196=IDD_CREATUREIWD (English (U.S.)) +Resource197=IDD_AREAAMBIENT (English (U.S.)) +Resource198=IDR_PROJECT (English (U.S.)) +Resource199=IDR_SRC (English (U.S.)) +Resource200=IDD_STOREEXTRA (English (U.S.)) +Resource201=IDD_IDSEDIT (English (U.S.)) +Resource202=IDD_TEXTVIEW (English (U.S.)) +Resource203=IDD_CREATURESTRINGS (English (U.S.)) +Resource204=IDR_BAMMENU (English (U.S.)) +Resource205=IDD_GAMEGENERAL (English (U.S.)) +Resource206=IDD_ITEMEQUIP (English (U.S.)) +Resource207=IDD_MAPEDIT (English (U.S.)) +Resource208=IDD_COMPAT (English (U.S.)) +Resource209=IDD_EDIT (English (U.S.)) +Resource210=IDR_VVC (English (U.S.)) +Resource211=IDD_AREAINT (English (U.S.)) +Resource212=IDD_CREATURELEVELS (English (U.S.)) +Resource213=IDD_STORERENTAL (English (U.S.)) +Resource214=IDD_VARIABLES (English (U.S.)) +Resource215=IDD_CREATURESKILLS (English (U.S.)) +Resource216=IDR_SCRIPT (English (U.S.)) +Resource217=IDD_ITEMDESC (English (U.S.)) +Resource218=IDD_ITEMEXTRA (English (U.S.)) +Resource219=IDD_ANIMDIALOG +Resource220=IDD_SCHEDULE (English (U.S.)) +Resource221=IDD_CFB (English (U.S.)) +Resource222=IDR_IDS (English (U.S.)) +Resource223=IDD_VVCEDIT (English (U.S.)) +Resource224=IDD_2DAEDIT (English (U.S.)) +Resource225=IDD_CREATUREGENERAL (English (U.S.)) +Resource226=IDR_TILE (English (U.S.)) +Resource227=IDD_SEARCHNODE (English (U.S.)) +Resource228=IDD_CREATUREPST (English (U.S.)) +Resource229=IDD_SPELLEDIT (English (U.S.)) +Resource230=IDD_AREADOOR (English (U.S.)) +Resource231=IDD_AREAMAP (English (U.S.)) +Resource232=IDR_AREA (English (U.S.)) +Resource233=IDD_SPELLEQUIP (English (U.S.)) +Resource234=IDR_2DA (English (U.S.)) +Resource235=IDD_AREAPROJ (English (U.S.)) +Resource236=IDR_TLKMENU (English (U.S.)) +Resource237=IDD_AREAVARIABLE (English (U.S.)) +Resource238=IDD_AREAANIM (English (U.S.)) +Resource239=IDD_PALETTE (English (U.S.)) +Resource240=IDD_PROJEXT (English (U.S.)) +Resource241=IDR_ITEM (English (U.S.)) +Resource242=IDD_AREAENTRANCE (English (U.S.)) +Resource243=IDD_STOREEDIT (English (U.S.)) +Resource244=IDD_SPELLGENERAL (English (U.S.)) +Resource245=IDD_CREATURERES (English (U.S.)) Class99=CAreaTriggerString Class100=CPCInfo -Resource246=IDD_TISDIALOG (English (U.S.)) +Resource246=IDD_AREACONTAINER (English (U.S.)) Class101=CCreatureOverlay -Resource247=IDD_CREATUREGENERAL (English (U.S.)) +Resource247=IDD_STOREGENERAL (English (U.S.)) Class102=IWD2Creature -Resource248=IDD_CREATUREOVR (English (U.S.)) +Resource248=IDD_GAMEPCINFO (English (U.S.)) Class103=CAnimDialog -Resource249=IDR_CHITIN (English (U.S.)) +Resource249=IDD_AREATRIGGERSTRINGS (English (U.S.)) Class104=CCreatureLevels -Resource250=IDD_AREAVARIABLE (English (U.S.)) +Resource250=IDR_GAME (English (U.S.)) Class105=CAreaProj -Resource251=IDD_CREATURESKILLS (English (U.S.)) +Resource251=IDD_EFFEDIT (English (U.S.)) Class106=CProjGemRB Resource252=IDR_SHORTCUT (English (U.S.)) @@ -383,7 +383,7 @@ Filter=D BaseClass=CDialog VirtualFilter=dWC -LastObject=ID_EXTRACTION_RECOMPRESSSAV +LastObject=ID_SEARCH_BAM [CLS:CAboutDlg] Type=0 @@ -9575,71 +9575,72 @@ Command31=ID_EDIT_WORLDMAP Command32=ID_SEARCH_AREA Command33=ID_SEARCH_BAM -Command34=ID_SEARCH_CREATURE -Command35=ID_SEARCH_DIALOG -Command36=ID_SEARCH_EFFECT -Command37=ID_SEARCH_ITEM -Command38=ID_SEARCH_PROJECTILE -Command39=ID_SEARCH_SCRIPT -Command40=ID_SEARCH_SPELL -Command41=ID_SEARCH_STORE -Command42=ID_SEARCH_2DA -Command43=ID_SEARCH_UI -Command44=ID_SEARCH_VVC -Command45=ID_CHECK_AREA -Command46=ID_CHECK_ANIMATION -Command47=ID_CHECK_CREATURE -Command48=ID_CHECK_DIALOG -Command49=ID_CHECK_EFFECT -Command50=ID_CHECK_GAME -Command51=ID_CHECK_ITEM -Command52=ID_CHECK_PROJECTILE -Command53=ID_CHECK_SCRIPT -Command54=ID_CHECK_SPAWNINI -Command55=ID_CHECK_SPELL -Command56=ID_CHECK_STORE -Command57=ID_CHECK_2DA -Command58=ID_CHECK_UI -Command59=ID_CHECK_VVC -Command60=ID_CHECK_WORLDMAP -Command61=ID_CHECK_AVATAR2DA -Command62=ID_FILE_EXTRACT -Command63=ID_FILE_SEARCH -Command64=ID_UNCOMPRESSBIF -Command65=ID_UNCOMPRESSSAV -Command66=ID_UNCOMPRESSCBF -Command67=ID_SKIMSAV -Command68=ID_EXTRACTION_RECOMPRESSSAV -Command69=ID_FILE_BUILDBIF -Command70=ID_REORDERBIF -Command71=ID_COMPRESSBIF -Command72=ID_COMPRESSCBF -Command73=ID_WAVCTOWAV -Command74=ID_WAVCTOWAV2 -Command75=ID_WAVTOWAVC -Command76=ID_ACMTOWAV -Command77=ID_ACMTOWAV2 -Command78=ID_WAVTOACM -Command79=ID_ADDCFBTOSPELLS -Command80=ID_CLEARCFBFROMSPELLS -Command81=ID_TOOLS_DECOMPILE -Command82=ID_TOOLS_LOOKUPSTRREF -Command83=ID_AVATARS -Command84=ID_SCANVARIABLES -Command85=ID_TOOLS_SCANJOURNALENTRIES -Command86=ID_TISPACK -Command87=ID_LOGGING_NONE -Command88=ID_LOGGING_SCREEN -Command89=ID_LOGGING_FILE -Command90=ID_PROGRESS -Command91=ID_READONLY -Command92=ID_USEDIALOGF -Command93=ID_COMPAT -Command94=ID_SAVESETTINGS -Command95=IDM_ABOUTBOX -Command96=ID_TOOLTIPS -Command97=ID_HELP_README -CommandCount=97 +Command34=ID_SEARCH_BMP +Command35=ID_SEARCH_CREATURE +Command36=ID_SEARCH_DIALOG +Command37=ID_SEARCH_EFFECT +Command38=ID_SEARCH_ITEM +Command39=ID_SEARCH_PROJECTILE +Command40=ID_SEARCH_SCRIPT +Command41=ID_SEARCH_SPELL +Command42=ID_SEARCH_STORE +Command43=ID_SEARCH_2DA +Command44=ID_SEARCH_UI +Command45=ID_SEARCH_VVC +Command46=ID_CHECK_AREA +Command47=ID_CHECK_ANIMATION +Command48=ID_CHECK_CREATURE +Command49=ID_CHECK_DIALOG +Command50=ID_CHECK_EFFECT +Command51=ID_CHECK_GAME +Command52=ID_CHECK_ITEM +Command53=ID_CHECK_PROJECTILE +Command54=ID_CHECK_SCRIPT +Command55=ID_CHECK_SPAWNINI +Command56=ID_CHECK_SPELL +Command57=ID_CHECK_STORE +Command58=ID_CHECK_2DA +Command59=ID_CHECK_UI +Command60=ID_CHECK_VVC +Command61=ID_CHECK_WORLDMAP +Command62=ID_CHECK_AVATAR2DA +Command63=ID_FILE_EXTRACT +Command64=ID_FILE_SEARCH +Command65=ID_UNCOMPRESSBIF +Command66=ID_UNCOMPRESSSAV +Command67=ID_UNCOMPRESSCBF +Command68=ID_SKIMSAV +Command69=ID_EXTRACTION_RECOMPRESSSAV +Command70=ID_FILE_BUILDBIF +Command71=ID_REORDERBIF +Command72=ID_COMPRESSBIF +Command73=ID_COMPRESSCBF +Command74=ID_WAVCTOWAV +Command75=ID_WAVCTOWAV2 +Command76=ID_WAVTOWAVC +Command77=ID_ACMTOWAV +Command78=ID_ACMTOWAV2 +Command79=ID_WAVTOACM +Command80=ID_ADDCFBTOSPELLS +Command81=ID_CLEARCFBFROMSPELLS +Command82=ID_TOOLS_DECOMPILE +Command83=ID_TOOLS_LOOKUPSTRREF +Command84=ID_AVATARS +Command85=ID_SCANVARIABLES +Command86=ID_TOOLS_SCANJOURNALENTRIES +Command87=ID_TISPACK +Command88=ID_LOGGING_NONE +Command89=ID_LOGGING_SCREEN +Command90=ID_LOGGING_FILE +Command91=ID_PROGRESS +Command92=ID_READONLY +Command93=ID_USEDIALOGF +Command94=ID_COMPAT +Command95=ID_SAVESETTINGS +Command96=IDM_ABOUTBOX +Command97=ID_TOOLTIPS +Command98=ID_HELP_README +CommandCount=98 [MNU:IDR_BAMMENU (English (U.S.))] Type=1 @@ -10272,7 +10273,7 @@ [DLG:IDD_PROJGEMRB (English (U.S.))] Type=1 Class=CProjGemRB -ControlCount=21 +ControlCount=28 Control1=IDOK,button,1342242816 Control2=IDC_FLAGS,edit,1350631552 Control3=IDC_STATIC,static,1342308352 @@ -10294,6 +10295,13 @@ Control19=IDC_FLAG16,button,1342242819 Control20=IDC_FLAG17,button,1342242819 Control21=IDC_FLAG18,button,1342242819 +Control22=IDC_STRREF,edit,1350631552 +Control23=IDC_FLAG19,button,1342242819 +Control24=IDC_STATIC,static,1342308352 +Control25=IDC_STRING,edit,1350631552 +Control26=IDC_FLAG20,button,1342242819 +Control27=IDC_FLAG21,button,1342242819 +Control28=IDC_FLAG22,button,1342242819 [CLS:CProjGemRB] Type=0 Modified: chitem/trunk/chitem.rc =================================================================== --- chitem/trunk/chitem.rc 2009-06-29 21:19:09 UTC (rev 6655) +++ chitem/trunk/chitem.rc 2009-06-29 21:20:52 UTC (rev 6656) @@ -1949,7 +1949,7 @@ EXSTYLE WS_EX_CONTROLPARENT CAPTION "Edit Area:" MENU IDR_AREA -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "Load Area",IDC_LOAD,7,229,50,14 PUSHBUTTON "Load external area",IDC_LOADEX,90,229,64,14 @@ -2111,7 +2111,7 @@ EXSTYLE WS_EX_CONTROLPARENT CAPTION "Edit Projectile:" MENU IDR_PROJECT -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN COMBOBOX IDC_TYPE,7,20,88,57,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP @@ -3423,7 +3423,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTROLPARENT CAPTION "Area extension header" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN EDITTEXT IDC_DURATION,142,72,55,14,ES_AUTOHSCROLL PUSHBUTTON "Back",IDOK,352,170,50,14 @@ -5312,12 +5312,12 @@ PUSHBUTTON "Add effect",IDC_ADD2,411,90,62,14 END -IDD_PROJGEMRB DIALOG DISCARDABLE 0, 0, 306, 179 +IDD_PROJGEMRB DIALOG DISCARDABLE 0, 0, 306, 219 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "GemRB specific data" FONT 8, "MS Sans Serif" BEGIN - PUSHBUTTON "Back",IDOK,249,158,50,14 + PUSHBUTTON "Back",IDOK,249,198,50,14 EDITTEXT IDC_FLAGS,9,19,48,14,ES_AUTOHSCROLL LTEXT "Additional flags",IDC_STATIC,9,7,48,8 CONTROL "Bounce from walls",IDC_FLAG1,"Button",BS_AUTOCHECKBOX | @@ -5356,6 +5356,17 @@ WS_TABSTOP,219,36,76,10 CONTROL "Pop in and out",IDC_FLAG18,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,219,51,62,10 + EDITTEXT IDC_STRREF,7,161,40,14,ES_AUTOHSCROLL + CONTROL "Pop out phase",IDC_FLAG19,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,219,65,62,10 + LTEXT "Text displayed",IDC_STATIC,11,150,46,8 + EDITTEXT IDC_STRING,52,161,237,14,ES_AUTOHSCROLL + CONTROL "Fade after explode",IDC_FLAG20,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,219,79,75,10 + CONTROL "Display string",IDC_FLAG21,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,219,93,57,10 + CONTROL "Random movement",IDC_FLAG22,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,219,107,77,10 END @@ -6188,7 +6199,7 @@ LEFTMARGIN, 7 RIGHTMARGIN, 299 TOPMARGIN, 7 - BOTTOMMARGIN, 172 + BOTTOMMARGIN, 212 END END #endif // APSTUDIO_INVOKED @@ -6344,6 +6355,7 @@ BEGIN MENUITEM "&Area", ID_SEARCH_AREA MENUITEM "&BAM", ID_SEARCH_BAM + MENUITEM "B&MP", ID_SEARCH_BMP MENUITEM "&Creature", ID_SEARCH_CREATURE MENUITEM "&Dialog", ID_SEARCH_DIALOG MENUITEM "&Effect", ID_SEARCH_EFFECT Modified: chitem/trunk/chitemDlg.cpp =================================================================== --- chitem/trunk/chitemDlg.cpp 2009-06-29 21:19:09 UTC (rev 6655) +++ chitem/trunk/chitemDlg.cpp 2009-06-29 21:20:52 UTC (rev 6656) @@ -218,6 +218,7 @@ ON_COMMAND(ID_USEDIALOGF, OnUsedialogf) ON_COMMAND(ID_TOOLS_DECOMPILE, OnToolsDecompile) ON_COMMAND(ID_CHECK_AVATAR2DA, OnCheckAvatar2da) + ON_COMMAND(ID_CHECK_SPAWNINI, OnCheckSpawnini) ON_COMMAND(ID_SEARCH_AREA, OnFindArea) ON_COMMAND(ID_EDIT_ITEM, OnEditItem) ON_COMMAND(ID_EDIT_CREATURE, OnEditCreature) @@ -242,7 +243,7 @@ ON_COMMAND(ID_RESCAN3, OnRescan3) ON_COMMAND(ID_RESCAN4, OnRescan4) ON_COMMAND(ID_RESCAN5, OnRescan5) - ON_COMMAND(ID_CHECK_SPAWNINI, OnCheckSpawnini) + ON_COMMAND(ID_SEARCH_BMP, OnSearchBmp) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -3134,6 +3135,25 @@ } } +void CChitemDlg::OnSearchBmp() +{ + CFindItem dlg; + int ret; + + dlg.mask=0x3c; + dlg.flags=searchflags; + dlg.searchdata=searchdata; + dlg.title="Find bitmaps"; + dlg.mtype_title="Match size"; + ret=dlg.DoModal(); + if(ret==IDOK) + { + searchflags=dlg.flags; + searchdata=dlg.searchdata; + process_bams(MATCHING); //perform matches + } +} + void CChitemDlg::OnFindArea() { CFindItem dlg; @@ -5133,4 +5153,3 @@ dlg.m_file="readme.txt"; dlg.DoModal(); } - Modified: chitem/trunk/chitemDlg.h =================================================================== --- chitem/trunk/chitemDlg.h 2009-06-29 21:19:09 UTC (rev 6655) +++ chitem/trunk/chitemDlg.h 2009-06-29 21:20:52 UTC (rev 6656) @@ -361,6 +361,7 @@ afx_msg void OnToolsDecompile(); afx_msg void OnCheckAvatar2da(); afx_msg void OnCheckSpawnini(); + afx_msg void OnSearchBmp(); //}}AFX_MSG afx_msg void OnOk5(); afx_msg void OnOk6(); Modified: chitem/trunk/resource.h =================================================================== --- chitem/trunk/resource.h 2009-06-29 21:19:09 UTC (rev 6655) +++ chitem/trunk/resource.h 2009-06-29 21:20:52 UTC (rev 6656) @@ -451,7 +451,6 @@ #define IDC_X27 1125 #define IDC_GENERAL 1126 #define IDC_PAR_DAMAGE 1127 -#define IDC_EXTPASTE 1128 #define IDC_PAR_SPECIAL 1128 #define IDC_GENERAL2 1129 #define IDC_VARNAME 1130 @@ -496,10 +495,10 @@ #define IDC_FLAG16 1169 #define IDC_FLAG17 1170 #define IDC_FLAG18 1171 -#define IDC_TARGETNUM 1172 -#define IDC_PROJFRAME 1173 -#define IDC_DURATION 1174 -#define IDC_TIMING 1175 +#define IDC_FLAG19 1172 +#define IDC_FLAG20 1173 +#define IDC_FLAG21 1174 +#define IDC_FLAG22 1175 #define IDC_CONVREF 1176 #define IDC_DURATIONLABEL 1177 #define IDC_THAC0 1178 @@ -802,6 +801,7 @@ #define IDC_UNKNOWN16 1475 #define IDC_UNKNOWN22 1476 #define IDC_UNKNOWN1A 1477 +#define IDC_TARGETNUM 1478 #define IDC_WEAPON 1479 #define IDC_NORTHRES 1480 #define IDC_U48 1481 @@ -881,6 +881,7 @@ #define IDC_POS2Y2 1555 #define IDC_LONGNAMEREF 1556 #define IDC_LOCKED 1557 +#define IDC_EXTPASTE 1558 #define IDC_SHORTNAMEREF 1559 #define IDC_XPVALUE 1560 #define IDC_CURRXP 1561 @@ -1077,6 +1078,7 @@ #define IDC_MAXITEM 1752 #define IDC_ITEMNUMPICKER 1753 #define IDC_VOLUMED 1754 +#define IDC_PROJFRAME 1755 #define IDC_UNKNOWN20 1756 #define IDC_CLASS 1757 #define IDC_EXTEFFPASTE 1758 @@ -1094,10 +1096,12 @@ #define IDC_SCRIPTNAME2 1770 #define IDC_DOORPICKER 1771 #define IDC_DELEXP 1772 -#define IDC_DOORID 1773 #define IDC_EXPLORED 1773 #define IDC_OPEN 1774 #define IDC_U54 1775 +#define IDC_DOORID 1776 +#define IDC_DURATION 1777 +#define IDC_TIMING 1778 #define IDC_DIALOGTREE 1779 #define IDC_OPTION 1780 #define IDC_CONDITION 1781 @@ -1854,6 +1858,7 @@ #define ID_TOOLS_PLAYSOUND 33045 #define ID_CHECK_AVATAR2DA 33046 #define ID_CHECK_SPAWNINI 33047 +#define ID_SEARCH_BMP 33048 #define ID_CONTEXT 0xF180 // Next default values for new objects @@ -1861,8 +1866,8 @@ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 233 -#define _APS_NEXT_COMMAND_VALUE 33048 -#define _APS_NEXT_CONTROL_VALUE 2348 +#define _APS_NEXT_COMMAND_VALUE 33049 +#define _APS_NEXT_CONTROL_VALUE 2349 #define _APS_NEXT_SYMED_VALUE 120 #endif #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-07-02 20:49:28
|
Revision: 6681 http://gemrb.svn.sourceforge.net/gemrb/?rev=6681&view=rev Author: avenger_teambg Date: 2009-07-02 20:48:28 +0000 (Thu, 02 Jul 2009) Log Message: ----------- DLTCEP can edit the new projectile fields Modified Paths: -------------- chitem/trunk/Chitem.h chitem/trunk/ProjEdit.cpp chitem/trunk/ProjGemRB.cpp chitem/trunk/ProjGemRB.h chitem/trunk/Structs.h chitem/trunk/chitem.clw chitem/trunk/chitem.rc chitem/trunk/resource.h Modified: chitem/trunk/Chitem.h =================================================================== --- chitem/trunk/Chitem.h 2009-07-02 20:47:23 UTC (rev 6680) +++ chitem/trunk/Chitem.h 2009-07-02 20:48:28 UTC (rev 6681) @@ -552,6 +552,17 @@ #define PROJ_TEXT 0x100000 //display text when the projectile is created #define PROJ_WANDERING 0x200000 //the projectile moves randomly + +//extended area flags for gemrb +#define APF_TINT 1 +#define APF_FILL 2 +#define APF_SCATTER 4 +#define APF_VVCPAL 8 +#define APF_SPREAD 16 +#define APF_PALETTE 32 +#define APF_BOTH 64 +#define APF_RESERVED 128 + #define TRANSPARENT_GREEN 0x00ff00 #define COLORNUM 256 Modified: chitem/trunk/ProjEdit.cpp =================================================================== --- chitem/trunk/ProjEdit.cpp 2009-07-02 20:47:23 UTC (rev 6680) +++ chitem/trunk/ProjEdit.cpp 2009-07-02 20:48:28 UTC (rev 6681) @@ -1362,8 +1362,9 @@ void CProjExt::OnUnknown() { - // TODO: Add your control notification handler code here + CProjAreaGemRB dlg; + dlg.DoModal(); } BOOL CProjExt::PreTranslateMessage(MSG* pMsg) Modified: chitem/trunk/ProjGemRB.cpp =================================================================== --- chitem/trunk/ProjGemRB.cpp 2009-07-02 20:47:23 UTC (rev 6680) +++ chitem/trunk/ProjGemRB.cpp 2009-07-02 20:48:28 UTC (rev 6681) @@ -262,3 +262,182 @@ UpdateData(UD_DISPLAY); return TRUE; } +///////////////////////////////////////////////////////////////////////////// +// CProjAreaGemRB dialog + + +CProjAreaGemRB::CProjAreaGemRB(CWnd* pParent /*=NULL*/) + : CDialog(CProjAreaGemRB::IDD, pParent) +{ + //{{AFX_DATA_INIT(CProjAreaGemRB) + // NOTE: the ClassWizard will add member initialization here + //}}AFX_DATA_INIT +} + + +void CProjAreaGemRB::DoDataExchange(CDataExchange* pDX) +{ + CButton *cb; + CString tmpstr; + int i,j; + int flg; + + CDialog::DoDataExchange(pDX); + //{{AFX_DATA_MAP(CProjAreaGemRB) + // NOTE: the ClassWizard will add DDX and DDV calls here + //}}AFX_DATA_MAP + tmpstr.Format("%d", the_projectile.extension.gemrbflags); + DDX_Text(pDX, IDC_FLAGS, tmpstr); + the_projectile.extension.gemrbflags=strtonum(tmpstr); + j=1; + for(i=0;i<8;i++) + { + cb=(CButton *) GetDlgItem(IDC_FLAG1+i); + if (cb) + { + flg=!!(the_projectile.extension.gemrbflags&j); + cb->SetCheck(flg); + j<<=1; + } + } + RetrieveResref(tmpstr,the_projectile.extension.wavc2); + DDX_Text(pDX, IDC_SOUND1, tmpstr); + DDV_MaxChars(pDX, tmpstr, 8); + StoreResref(tmpstr,the_projectile.extension.wavc2); + + RetrieveResref(tmpstr,the_projectile.extension.spread); + DDX_Text(pDX, IDC_BAM1, tmpstr); + DDV_MaxChars(pDX, tmpstr, 8); + StoreResref(tmpstr,the_projectile.extension.spread); + + RetrieveResref(tmpstr,the_projectile.extension.second); + DDX_Text(pDX, IDC_BAM2, tmpstr); + DDV_MaxChars(pDX, tmpstr, 8); + StoreResref(tmpstr,the_projectile.extension.second); +} + + +BEGIN_MESSAGE_MAP(CProjAreaGemRB, CDialog) + //{{AFX_MSG_MAP(CProjAreaGemRB) + ON_BN_CLICKED(IDC_FLAG1, OnFlag1) + ON_BN_CLICKED(IDC_FLAG2, OnFlag2) + ON_BN_CLICKED(IDC_FLAG3, OnFlag3) + ON_BN_CLICKED(IDC_FLAG4, OnFlag4) + ON_BN_CLICKED(IDC_FLAG5, OnFlag5) + ON_BN_CLICKED(IDC_FLAG6, OnFlag6) + ON_BN_CLICKED(IDC_FLAG7, OnFlag7) + ON_BN_CLICKED(IDC_FLAG8, OnFlag8) + ON_EN_KILLFOCUS(IDC_FLAGS, OnKillfocus) + ON_BN_CLICKED(IDC_BROWSE1, OnBrowse1) + ON_BN_CLICKED(IDC_BROWSE2, OnBrowse2) + ON_BN_CLICKED(IDC_BROWSE3, OnBrowse3) + ON_EN_KILLFOCUS(IDC_SOUND1, OnKillfocus) + ON_EN_KILLFOCUS(IDC_BAM1, OnKillfocus) + ON_EN_KILLFOCUS(IDC_BAM2, OnKillfocus) + ON_BN_CLICKED(IDC_PLAY1, OnPlay1) + //}}AFX_MSG_MAP +END_MESSAGE_MAP() + +///////////////////////////////////////////////////////////////////////////// +// CProjAreaGemRB message handlers + +void CProjAreaGemRB::OnFlag1() +{ + the_projectile.extension.gemrbflags^=APF_TINT; + UpdateData(UD_DISPLAY); +} + +void CProjAreaGemRB::OnFlag2() +{ + the_projectile.extension.gemrbflags^=APF_FILL; + UpdateData(UD_DISPLAY); +} + +void CProjAreaGemRB::OnFlag3() +{ + the_projectile.extension.gemrbflags^=APF_SCATTER; + UpdateData(UD_DISPLAY); +} + +void CProjAreaGemRB::OnFlag4() +{ + the_projectile.extension.gemrbflags^=APF_VVCPAL; + UpdateData(UD_DISPLAY); +} + +void CProjAreaGemRB::OnFlag5() +{ + the_projectile.extension.gemrbflags^=APF_SPREAD; + UpdateData(UD_DISPLAY); +} + +void CProjAreaGemRB::OnFlag6() +{ + the_projectile.extension.gemrbflags^=APF_PALETTE; + UpdateData(UD_DISPLAY); +} + +void CProjAreaGemRB::OnFlag7() +{ + the_projectile.extension.gemrbflags^=APF_BOTH; + UpdateData(UD_DISPLAY); +} + +void CProjAreaGemRB::OnFlag8() +{ + the_projectile.extension.gemrbflags^=APF_RESERVED; + UpdateData(UD_DISPLAY); +} + +void CProjAreaGemRB::OnKillfocus() +{ + UpdateData(UD_RETRIEVE); + UpdateData(UD_DISPLAY); +} + +void CProjAreaGemRB::OnBrowse1() +{ + CString tmpstr; + + pickerdlg.m_restype=REF_WAV; + RetrieveResref(pickerdlg.m_picked,the_projectile.extension.wavc2); + if(pickerdlg.DoModal()==IDOK) + { + StoreResref(pickerdlg.m_picked,the_projectile.extension.wavc2); + } + UpdateData(UD_DISPLAY); +} + +void CProjAreaGemRB::OnBrowse2() +{ + CString tmpstr; + + pickerdlg.m_restype=REF_BAM; + RetrieveResref(pickerdlg.m_picked,the_projectile.extension.spread); + if(pickerdlg.DoModal()==IDOK) + { + StoreResref(pickerdlg.m_picked,the_projectile.extension.spread); + } + UpdateData(UD_DISPLAY); +} + +void CProjAreaGemRB::OnBrowse3() +{ + CString tmpstr; + + pickerdlg.m_restype=REF_BAM; + RetrieveResref(pickerdlg.m_picked,the_projectile.extension.second); + if(pickerdlg.DoModal()==IDOK) + { + StoreResref(pickerdlg.m_picked,the_projectile.extension.second); + } + UpdateData(UD_DISPLAY); +} + +void CProjAreaGemRB::OnPlay1() +{ + CString tmpstr; + + RetrieveResref(tmpstr, the_projectile.extension.wavc2); + play_acm(tmpstr,false,false); +} Modified: chitem/trunk/ProjGemRB.h =================================================================== --- chitem/trunk/ProjGemRB.h 2009-07-02 20:47:23 UTC (rev 6680) +++ chitem/trunk/ProjGemRB.h 2009-07-02 20:48:28 UTC (rev 6681) @@ -65,6 +65,50 @@ DECLARE_MESSAGE_MAP() }; +///////////////////////////////////////////////////////////////////////////// +// CProjAreaGemRB dialog + +class CProjAreaGemRB : public CDialog +{ +// Construction +public: + CProjAreaGemRB(CWnd* pParent = NULL); // standard constructor + +// Dialog Data + //{{AFX_DATA(CProjAreaGemRB) + enum { IDD = IDD_PROJAREAGEMRB }; + // NOTE: the ClassWizard will add data members here + //}}AFX_DATA + + +// Overrides + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(CProjAreaGemRB) + protected: + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + //}}AFX_VIRTUAL + +// Implementation +protected: + + // Generated message map functions + //{{AFX_MSG(CProjAreaGemRB) + afx_msg void OnFlag1(); + afx_msg void OnFlag2(); + afx_msg void OnFlag3(); + afx_msg void OnFlag4(); + afx_msg void OnFlag5(); + afx_msg void OnFlag6(); + afx_msg void OnFlag7(); + afx_msg void OnFlag8(); + afx_msg void OnKillfocus(); + afx_msg void OnBrowse1(); + afx_msg void OnBrowse2(); + afx_msg void OnBrowse3(); + afx_msg void OnPlay1(); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() +}; //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. Modified: chitem/trunk/Structs.h =================================================================== --- chitem/trunk/Structs.h 2009-07-02 20:47:23 UTC (rev 6680) +++ chitem/trunk/Structs.h 2009-07-02 20:48:28 UTC (rev 6681) @@ -570,9 +570,14 @@ unsigned char expgr2; //set off short expclr; short projectile; //another projectile comes now - char vvc[8]; + char vvc[8]; //center animation (x) short conewidth; - char unknown26[218]; + short unknown26; + char spread[8]; //spread animation (a) 0x30 + char second[8]; //recoil animation? (r) 0x38 + char wavc2[8]; //area sound 0x40 + long gemrbflags; //gemrb specific area flags 0x48 + char unknown44[188]; } proj_extension; typedef struct Modified: chitem/trunk/chitem.clw =================================================================== --- chitem/trunk/chitem.clw 2009-07-02 20:47:23 UTC (rev 6680) +++ chitem/trunk/chitem.clw 2009-07-02 20:48:28 UTC (rev 6681) @@ -2,17 +2,17 @@ [General Info] Version=1 -LastClass=CProjGemRB +LastClass=CProjAreaGemRB LastTemplate=CDialog NewFileInclude1=#include "stdafx.h" NewFileInclude2=#include "chitem.h" -ClassCount=106 +ClassCount=107 Class1=CChitemApp Class2=CChitemDlg Class3=CAboutDlg -ResourceCount=252 +ResourceCount=253 Resource1=IDD_AREASPAWN Resource2=IDR_MAINFRAME Resource3=IDD_STOREITEMS @@ -232,142 +232,144 @@ Resource123=IDD_GAMEGENERAL Class98=IcewindCre Resource124=IDR_SHORTCUT -Resource125=IDD_ITEMGENERAL (English (U.S.)) -Resource126=IDD_WEDTILE (English (U.S.)) -Resource127=IDD_PROJGEMRB (English (U.S.)) -Resource128=IDD_SPELLEXTRA (English (U.S.)) -Resource129=IDD_PANICBUTTON (English (U.S.)) -Resource130=IDD_ITEMUSE (English (U.S.)) -Resource131=IDD_SPELLEFFECT (English (U.S.)) -Resource132=IDD_AREASPAWN (English (U.S.)) -Resource133=IDD_WEIDU (English (U.S.)) -Resource134=IDD_CREATUREUNKNOWN (English (U.S.)) -Resource135=IDD_IMAGEVIEW (English (U.S.)) -Resource136=IDR_CHUI (English (U.S.)) -Resource137=IDD_GAMESTATS (English (U.S.)) -Resource138=IDR_CREATURE (English (U.S.)) -Resource139=IDD_TISDIALOG (English (U.S.)) -Resource140=IDD_CHECK (English (U.S.)) -Resource141=IDR_CHITIN (English (U.S.)) -Resource142=IDD_CREATUREICONS (English (U.S.)) -Resource143=IDD_MOSEDIT (English (U.S.)) -Resource144=IDD_SHOWLOG (English (U.S.)) -Resource145=IDD_ITEMEDIT (English (U.S.)) -Resource146=IDD_EXTRACT (English (U.S.)) -Resource147=IDD_STOREDRINKS (English (U.S.)) -Resource148=IDD_GAMEEDIT (English (U.S.)) -Resource149=IDD_DIALOGEDIT (English (U.S.)) -Resource150=IDD_COLORPICKER (English (U.S.)) -Resource151=IDR_SPELL (English (U.S.)) -Resource152=IDD_AREAEDIT (English (U.S.)) -Resource153=IDD_CHITEM_DIALOG (English (U.S.)) -Resource154=IDD_BAMEDIT (English (U.S.)) -Resource155=IDD_MUSEDIT (English (U.S.)) -Resource156=IDR_STORE (English (U.S.)) -Resource157=IDD_WEDEDIT (English (U.S.)) -Resource158=IDR_WORLDMAP (English (U.S.)) -Resource159=IDD_CREATUREEDIT (English (U.S.)) -Resource160=IDD_SCRIPTEDIT (English (U.S.)) -Resource161=IDR_EFFECT (English (U.S.)) -Resource162=IDD_IAPDIALOG (English (U.S.)) -Resource163=IDD_CREATUREEFF (English (U.S.)) -Resource164=IDD_AREASONGS (English (U.S.)) -Resource165=IDD_STOREITEMS (English (U.S.)) -Resource166=IDD_ABOUTBOX (English (U.S.)) -Resource167=IDD_MAPLINK (English (U.S.)) -Resource168=IDD_MASSCLEAR (English (U.S.)) -Resource169=IDD_SAVHANDLE (English (U.S.)) -Resource170=IDR_MENUBAR (English (U.S.)) -Resource171=IDD_SPELLDESC (English (U.S.)) -Resource172=IDD_AREAGENERAL (English (U.S.)) -Resource173=IDD_ADDLINK (English (U.S.)) -Resource174=IDD_ITEMEFFECT (English (U.S.)) -Resource175=IDD_CREATUREOVR (English (U.S.)) -Resource176=IDD_AREATRIGGER (English (U.S.)) -Resource177=IDD_EXTRACT2 (English (U.S.)) -Resource178=IDD_ITEMICONS (English (U.S.)) -Resource179=IDD_PROGRESS (English (U.S.)) -Resource180=IDD_AREAACTOR (English (U.S.)) -Resource181=IDD_POLYGON (English (U.S.)) -Resource182=IDD_SRCEDIT (English (U.S.)) -Resource183=IDR_WEDMENU (English (U.S.)) -Resource184=IDR_TREEMENU (English (U.S.)) -Resource185=IDD_KEYEDIT (English (U.S.)) -Resource186=IDD_STRREFDLG (English (U.S.)) -Resource187=IDD_WEDPOLY (English (U.S.)) -Resource188=IDD_ITEMPICKER (English (U.S.)) -Resource189=IDD_CHUIEDIT (English (U.S.)) -Resource190=IDD_CREATUREIWD2 (English (U.S.)) -Resource191=IDD_SPELLTOOL (English (U.S.)) -Resource192=IDD_CREATUREITEMS (English (U.S.)) -Resource193=IDR_MUSIC (English (U.S.)) -Resource194=IDD_FINDITEM (English (U.S.)) -Resource195=IDD_PROJEDIT (English (U.S.)) -Resource196=IDD_CREATUREIWD (English (U.S.)) -Resource197=IDD_AREAAMBIENT (English (U.S.)) -Resource198=IDR_PROJECT (English (U.S.)) -Resource199=IDR_SRC (English (U.S.)) -Resource200=IDD_STOREEXTRA (English (U.S.)) -Resource201=IDD_IDSEDIT (English (U.S.)) -Resource202=IDD_TEXTVIEW (English (U.S.)) -Resource203=IDD_CREATURESTRINGS (English (U.S.)) -Resource204=IDR_BAMMENU (English (U.S.)) -Resource205=IDD_GAMEGENERAL (English (U.S.)) -Resource206=IDD_ITEMEQUIP (English (U.S.)) -Resource207=IDD_MAPEDIT (English (U.S.)) -Resource208=IDD_COMPAT (English (U.S.)) -Resource209=IDD_EDIT (English (U.S.)) -Resource210=IDR_VVC (English (U.S.)) -Resource211=IDD_AREAINT (English (U.S.)) -Resource212=IDD_CREATURELEVELS (English (U.S.)) -Resource213=IDD_STORERENTAL (English (U.S.)) -Resource214=IDD_VARIABLES (English (U.S.)) -Resource215=IDD_CREATURESKILLS (English (U.S.)) -Resource216=IDR_SCRIPT (English (U.S.)) -Resource217=IDD_ITEMDESC (English (U.S.)) -Resource218=IDD_ITEMEXTRA (English (U.S.)) -Resource219=IDD_ANIMDIALOG -Resource220=IDD_SCHEDULE (English (U.S.)) -Resource221=IDD_CFB (English (U.S.)) -Resource222=IDR_IDS (English (U.S.)) -Resource223=IDD_VVCEDIT (English (U.S.)) -Resource224=IDD_2DAEDIT (English (U.S.)) -Resource225=IDD_CREATUREGENERAL (English (U.S.)) -Resource226=IDR_TILE (English (U.S.)) -Resource227=IDD_SEARCHNODE (English (U.S.)) -Resource228=IDD_CREATUREPST (English (U.S.)) -Resource229=IDD_SPELLEDIT (English (U.S.)) -Resource230=IDD_AREADOOR (English (U.S.)) -Resource231=IDD_AREAMAP (English (U.S.)) -Resource232=IDR_AREA (English (U.S.)) -Resource233=IDD_SPELLEQUIP (English (U.S.)) -Resource234=IDR_2DA (English (U.S.)) -Resource235=IDD_AREAPROJ (English (U.S.)) -Resource236=IDR_TLKMENU (English (U.S.)) -Resource237=IDD_AREAVARIABLE (English (U.S.)) -Resource238=IDD_AREAANIM (English (U.S.)) -Resource239=IDD_PALETTE (English (U.S.)) -Resource240=IDD_PROJEXT (English (U.S.)) -Resource241=IDR_ITEM (English (U.S.)) -Resource242=IDD_AREAENTRANCE (English (U.S.)) -Resource243=IDD_STOREEDIT (English (U.S.)) -Resource244=IDD_SPELLGENERAL (English (U.S.)) -Resource245=IDD_CREATURERES (English (U.S.)) +Resource125=IDD_POLYGON (English (U.S.)) +Resource126=IDD_MAPEDIT (English (U.S.)) +Resource127=IDD_AREAACTOR (English (U.S.)) +Resource128=IDR_WORLDMAP (English (U.S.)) +Resource129=IDD_AREACONTAINER (English (U.S.)) +Resource130=IDR_AREA (English (U.S.)) +Resource131=IDD_ITEMEFFECT (English (U.S.)) +Resource132=IDD_STORERENTAL (English (U.S.)) +Resource133=IDR_BAMMENU (English (U.S.)) +Resource134=IDD_AREAAMBIENT (English (U.S.)) +Resource135=IDD_ABOUTBOX (English (U.S.)) +Resource136=IDD_PANICBUTTON (English (U.S.)) +Resource137=IDD_AREAANIM (English (U.S.)) +Resource138=IDD_STOREDRINKS (English (U.S.)) +Resource139=IDD_PROJEXT (English (U.S.)) +Resource140=IDR_STORE (English (U.S.)) +Resource141=IDD_WEDEDIT (English (U.S.)) +Resource142=IDD_CREATURERES (English (U.S.)) +Resource143=IDD_EFFEDIT (English (U.S.)) +Resource144=IDD_AREASONGS (English (U.S.)) +Resource145=IDD_ITEMICONS (English (U.S.)) +Resource146=IDR_2DA (English (U.S.)) +Resource147=IDD_IDSEDIT (English (U.S.)) +Resource148=IDD_MAPLINK (English (U.S.)) +Resource149=IDD_EXTRACT2 (English (U.S.)) +Resource150=IDD_STOREEXTRA (English (U.S.)) +Resource151=IDD_GAMEEDIT (English (U.S.)) +Resource152=IDD_CFB (English (U.S.)) +Resource153=IDD_CHECK (English (U.S.)) +Resource154=IDD_CHITEM_DIALOG (English (U.S.)) +Resource155=IDD_SPELLEXTRA (English (U.S.)) +Resource156=IDR_EFFECT (English (U.S.)) +Resource157=IDD_MASSCLEAR (English (U.S.)) +Resource158=IDR_GAME (English (U.S.)) +Resource159=IDD_COMPAT (English (U.S.)) +Resource160=IDD_CREATUREUNKNOWN (English (U.S.)) +Resource161=IDD_SRCEDIT (English (U.S.)) +Resource162=IDD_CREATURESKILLS (English (U.S.)) +Resource163=IDD_AREAVARIABLE (English (U.S.)) +Resource164=IDD_ITEMUSE (English (U.S.)) +Resource165=IDR_SRC (English (U.S.)) +Resource166=IDR_ITEM (English (U.S.)) +Resource167=IDD_AREAENTRANCE (English (U.S.)) +Resource168=IDD_ADDLINK (English (U.S.)) +Resource169=IDD_MUSEDIT (English (U.S.)) +Resource170=IDD_DIALOGEDIT (English (U.S.)) +Resource171=IDD_ITEMEQUIP (English (U.S.)) +Resource172=IDD_VVCEDIT (English (U.S.)) +Resource173=IDD_EXTRACT (English (U.S.)) +Resource174=IDD_GAMESTATS (English (U.S.)) +Resource175=IDD_AREAINT (English (U.S.)) +Resource176=IDD_VARIABLES (English (U.S.)) +Resource177=IDD_SPELLTOOL (English (U.S.)) +Resource178=IDR_TLKMENU (English (U.S.)) +Resource179=IDD_CHUIEDIT (English (U.S.)) +Resource180=IDR_IDS (English (U.S.)) +Resource181=IDD_EDIT (English (U.S.)) +Resource182=IDD_MOSEDIT (English (U.S.)) +Resource183=IDR_CHITIN (English (U.S.)) +Resource184=IDD_KEYEDIT (English (U.S.)) +Resource185=IDD_AREAEDIT (English (U.S.)) +Resource186=IDD_ITEMDESC (English (U.S.)) +Resource187=IDD_SEARCHNODE (English (U.S.)) +Resource188=IDR_PROJECT (English (U.S.)) +Resource189=IDD_CREATUREITEMS (English (U.S.)) +Resource190=IDD_CREATURELEVELS (English (U.S.)) +Resource191=IDD_SCHEDULE (English (U.S.)) +Resource192=IDD_PROJAREAGEMRB (English (U.S.)) +Resource193=IDD_CREATUREIWD2 (English (U.S.)) +Resource194=IDR_CREATURE (English (U.S.)) +Resource195=IDR_TILE (English (U.S.)) +Resource196=IDD_STRREFDLG (English (U.S.)) +Resource197=IDD_SPELLEQUIP (English (U.S.)) +Resource198=IDD_GAMEPCINFO (English (U.S.)) +Resource199=IDD_AREAPROJ (English (U.S.)) +Resource200=IDR_TREEMENU (English (U.S.)) +Resource201=IDD_CREATUREGENERAL (English (U.S.)) +Resource202=IDD_IAPDIALOG (English (U.S.)) +Resource203=IDD_SPELLGENERAL (English (U.S.)) +Resource204=IDD_TISDIALOG (English (U.S.)) +Resource205=IDD_SCRIPTEDIT (English (U.S.)) +Resource206=IDD_AREAGENERAL (English (U.S.)) +Resource207=IDD_PROJEDIT (English (U.S.)) +Resource208=IDD_WEIDU (English (U.S.)) +Resource209=IDD_CREATUREICONS (English (U.S.)) +Resource210=IDD_COLORPICKER (English (U.S.)) +Resource211=IDD_AREADOOR (English (U.S.)) +Resource212=IDD_PROJGEMRB (English (U.S.)) +Resource213=IDD_ANIMDIALOG +Resource214=IDD_CREATUREEFF (English (U.S.)) +Resource215=IDD_SHOWLOG (English (U.S.)) +Resource216=IDR_VVC (English (U.S.)) +Resource217=IDD_FINDITEM (English (U.S.)) +Resource218=IDD_IMAGEVIEW (English (U.S.)) +Resource219=IDD_WEDPOLY (English (U.S.)) +Resource220=IDD_STOREGENERAL (English (U.S.)) +Resource221=IDR_MUSIC (English (U.S.)) +Resource222=IDD_AREATRIGGERSTRINGS (English (U.S.)) +Resource223=IDD_STOREEDIT (English (U.S.)) +Resource224=IDD_CREATUREEDIT (English (U.S.)) +Resource225=IDD_ITEMEXTRA (English (U.S.)) +Resource226=IDD_CREATUREOVR (English (U.S.)) +Resource227=IDD_ITEMPICKER (English (U.S.)) +Resource228=IDD_GAMEGENERAL (English (U.S.)) +Resource229=IDR_SCRIPT (English (U.S.)) +Resource230=IDD_SPELLEFFECT (English (U.S.)) +Resource231=IDD_2DAEDIT (English (U.S.)) +Resource232=IDD_AREAMAP (English (U.S.)) +Resource233=IDD_ITEMGENERAL (English (U.S.)) +Resource234=IDD_CREATUREIWD (English (U.S.)) +Resource235=IDD_AREATRIGGER (English (U.S.)) +Resource236=IDD_CREATUREPST (English (U.S.)) +Resource237=IDD_SPELLEDIT (English (U.S.)) +Resource238=IDD_BAMEDIT (English (U.S.)) +Resource239=IDD_WEDTILE (English (U.S.)) +Resource240=IDR_MENUBAR (English (U.S.)) +Resource241=IDR_SPELL (English (U.S.)) +Resource242=IDD_AREASPAWN (English (U.S.)) +Resource243=IDD_STOREITEMS (English (U.S.)) +Resource244=IDD_PROGRESS (English (U.S.)) +Resource245=IDD_PALETTE (English (U.S.)) Class99=CAreaTriggerString Class100=CPCInfo -Resource246=IDD_AREACONTAINER (English (U.S.)) +Resource246=IDD_SPELLDESC (English (U.S.)) Class101=CCreatureOverlay -Resource247=IDD_STOREGENERAL (English (U.S.)) +Resource247=IDR_CHUI (English (U.S.)) Class102=IWD2Creature -Resource248=IDD_GAMEPCINFO (English (U.S.)) +Resource248=IDD_CREATURESTRINGS (English (U.S.)) Class103=CAnimDialog -Resource249=IDD_AREATRIGGERSTRINGS (English (U.S.)) +Resource249=IDD_SAVHANDLE (English (U.S.)) Class104=CCreatureLevels -Resource250=IDR_GAME (English (U.S.)) +Resource250=IDD_TEXTVIEW (English (U.S.)) Class105=CAreaProj -Resource251=IDD_EFFEDIT (English (U.S.)) +Resource251=IDR_WEDMENU (English (U.S.)) Class106=CProjGemRB -Resource252=IDR_SHORTCUT (English (U.S.)) +Resource252=IDD_ITEMEDIT (English (U.S.)) +Class107=CProjAreaGemRB +Resource253=IDR_SHORTCUT (English (U.S.)) [CLS:CChitemApp] Type=0 @@ -10309,6 +10311,43 @@ ImplementationFile=ProjGemRB.cpp BaseClass=CDialog Filter=D -LastObject=CProjGemRB +LastObject=IDC_FLAG9 VirtualFilter=dWC +[DLG:IDD_PROJAREAGEMRB (English (U.S.))] +Type=1 +Class=CProjAreaGemRB +ControlCount=23 +Control1=IDOK,button,1342242816 +Control2=IDC_UNKNOWN26,edit,1350631552 +Control3=IDC_STATIC,static,1342308352 +Control4=IDC_FLAG1,button,1342242819 +Control5=IDC_FLAG2,button,1342242819 +Control6=IDC_FLAG3,button,1342242819 +Control7=IDC_FLAG4,button,1342242819 +Control8=IDC_FLAG5,button,1342242819 +Control9=IDC_FLAG6,button,1342242819 +Control10=IDC_FLAG7,button,1342242819 +Control11=IDC_FLAG8,button,1342242819 +Control12=IDC_FLAGS,edit,1350631552 +Control13=IDC_SOUND1,edit,1350631552 +Control14=IDC_BAM1,edit,1350631552 +Control15=IDC_STATIC,static,1342308352 +Control16=IDC_BAM2,edit,1350631552 +Control17=IDC_STATIC,static,1342308352 +Control18=IDC_STATIC,static,1342308352 +Control19=IDC_STATIC,static,1342308352 +Control20=IDC_BROWSE1,button,1342242816 +Control21=IDC_BROWSE2,button,1342242816 +Control22=IDC_BROWSE3,button,1342242816 +Control23=IDC_PLAY1,button,1342242816 + +[CLS:CProjAreaGemRB] +Type=0 +HeaderFile=ProjGemRB.h +ImplementationFile=ProjGemRB.cpp +BaseClass=CDialog +Filter=D +LastObject=CProjAreaGemRB +VirtualFilter=dWC + Modified: chitem/trunk/chitem.rc =================================================================== --- chitem/trunk/chitem.rc 2009-07-02 20:47:23 UTC (rev 6680) +++ chitem/trunk/chitem.rc 2009-07-02 20:48:28 UTC (rev 6681) @@ -3423,7 +3423,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTROLPARENT CAPTION "Area extension header" -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Sans Serif" BEGIN EDITTEXT IDC_DURATION,142,72,55,14,ES_AUTOHSCROLL PUSHBUTTON "Back",IDOK,352,170,50,14 @@ -3495,7 +3495,7 @@ LTEXT "Explosion projectile (projectl.ids)",IDC_STATIC,249,89, 100,8 EDITTEXT IDC_VVC,200,165,55,14,ES_UPPERCASE | ES_AUTOHSCROLL - PUSHBUTTON "Edit unknowns at 0x226",IDC_UNKNOWN,322,146,81,14 + PUSHBUTTON "GemRB specific",IDC_UNKNOWN,322,146,81,14 PUSHBUTTON "Browse",IDC_BROWSE,260,165,28,14 PUSHBUTTON "Browse",IDC_BROWSE2,375,126,28,14 END @@ -5369,7 +5369,45 @@ WS_TABSTOP,219,107,77,10 END +IDD_PROJAREAGEMRB DIALOG DISCARDABLE 0, 0, 252, 219 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "GemRB specific area data" +FONT 8, "MS Sans Serif" +BEGIN + PUSHBUTTON "Back",IDOK,195,198,50,14 + EDITTEXT IDC_UNKNOWN26,65,19,48,14,ES_AUTOHSCROLL + LTEXT "0x26",IDC_STATIC,65,7,16,8 + CONTROL "Use explosion color for tint",IDC_FLAG1,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,9,37,99,10 + CONTROL "Fill entire area",IDC_FLAG2,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,9,51,59,10 + CONTROL "Start scattered",IDC_FLAG3,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,9,65,62,10 + CONTROL "Paletted center",IDC_FLAG4,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,9,79,64,10 + CONTROL "Repeated scatter",IDC_FLAG5,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,9,93,71,10 + CONTROL "Paletted spread animation",IDC_FLAG6,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,9,107,97,10 + CONTROL "Use recoil field for spread",IDC_FLAG7,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,9,121,95,10 + CONTROL "Reserved",IDC_FLAG8,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,9,135,47,10 + EDITTEXT IDC_FLAGS,9,19,48,14,ES_AUTOHSCROLL + EDITTEXT IDC_SOUND1,122,19,48,14,ES_AUTOHSCROLL + EDITTEXT IDC_BAM1,7,162,48,14,ES_AUTOHSCROLL + LTEXT "Area sound",IDC_STATIC,122,7,37,8 + EDITTEXT IDC_BAM2,122,162,48,14,ES_AUTOHSCROLL + LTEXT "Flags",IDC_STATIC,11,7,18,8 + LTEXT "Spread animation",IDC_STATIC,7,150,56,8 + LTEXT "Recoil animation",IDC_STATIC,122,150,53,8 + PUSHBUTTON "Browse",IDC_BROWSE1,177,19,28,14 + PUSHBUTTON "Browse",IDC_BROWSE2,65,161,50,14 + PUSHBUTTON "Browse",IDC_BROWSE3,177,162,50,14 + PUSHBUTTON "Play",IDC_PLAY1,212,19,28,14 +END + ///////////////////////////////////////////////////////////////////////////// // // DESIGNINFO @@ -6201,6 +6239,14 @@ TOPMARGIN, 7 BOTTOMMARGIN, 212 END + + IDD_PROJAREAGEMRB, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 245 + TOPMARGIN, 7 + BOTTOMMARGIN, 212 + END END #endif // APSTUDIO_INVOKED Modified: chitem/trunk/resource.h =================================================================== --- chitem/trunk/resource.h 2009-07-02 20:47:23 UTC (rev 6680) +++ chitem/trunk/resource.h 2009-07-02 20:48:28 UTC (rev 6681) @@ -270,6 +270,7 @@ #define IDS_TISEXTRACT 234 #define IDD_PROJGEMRB 234 #define IDS_OVERLAY 235 +#define IDD_PROJAREAGEMRB 235 #define IDS_VEF 236 #define IDS_INI 237 #define IDS_FEATURE 238 @@ -1867,7 +1868,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 233 #define _APS_NEXT_COMMAND_VALUE 33049 -#define _APS_NEXT_CONTROL_VALUE 2349 +#define _APS_NEXT_CONTROL_VALUE 2351 #define _APS_NEXT_SYMED_VALUE 120 #endif #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-07-04 18:15:07
|
Revision: 6699 http://gemrb.svn.sourceforge.net/gemrb/?rev=6699&view=rev Author: avenger_teambg Date: 2009-07-04 18:15:05 +0000 (Sat, 04 Jul 2009) Log Message: ----------- dltcep update Modified Paths: -------------- chitem/trunk/AreaEdit.cpp chitem/trunk/AreaProperties.cpp chitem/trunk/AreaProperties.h chitem/trunk/Chitem.h chitem/trunk/ImageView.cpp chitem/trunk/MapEdit.cpp chitem/trunk/MapEdit.h chitem/trunk/ProjGemRB.cpp chitem/trunk/ProjGemRB.h chitem/trunk/area.cpp chitem/trunk/area.h chitem/trunk/chitem.clw chitem/trunk/chitem.rc chitem/trunk/chitemDlg.cpp chitem/trunk/resource.h chitem/trunk/seekers.cpp Modified: chitem/trunk/AreaEdit.cpp =================================================================== --- chitem/trunk/AreaEdit.cpp 2009-07-04 15:15:13 UTC (rev 6698) +++ chitem/trunk/AreaEdit.cpp 2009-07-04 18:15:05 UTC (rev 6699) @@ -588,6 +588,17 @@ } goto endofquest; } + + if(the_area.changedmap[0] ||the_area.changedmap[1] ||the_area.changedmap[2] ) { + tmpstr.Format("Changes have been made to one or more auxiliary maps.\n" + "Do you want to quit without save?\n"); + if(MessageBox(tmpstr,"Warning",MB_YESNO)==IDNO) + { + return; + } + goto endofquest; + } + endofquest: CDialog::OnCancel(); } Modified: chitem/trunk/AreaProperties.cpp =================================================================== --- chitem/trunk/AreaProperties.cpp 2009-07-04 15:15:13 UTC (rev 6698) +++ chitem/trunk/AreaProperties.cpp 2009-07-04 18:15:05 UTC (rev 6699) @@ -6449,7 +6449,6 @@ CAreaMap::CAreaMap() : CPropertyPage(CAreaMap::IDD) { //{{AFX_DATA_INIT(CAreaMap) - m_maptype = 0; //}}AFX_DATA_INIT bgcolor=RGB(32,32,32); m_set = 0; @@ -6458,6 +6457,8 @@ the_palette = NULL; m_function=0; m_adjust=0; + if(the_area.m_smallpalette) m_maptype=0; + else m_maptype=4; } CAreaMap::~CAreaMap() @@ -6475,6 +6476,8 @@ { cw->EnableWindow(!iwd2_structures() && the_area.WedAvailable()&&(the_area.header.areatype&EXTENDED_NIGHT) ); } + if(the_area.m_smallpalette) m_maptype=0; + else m_maptype=4; } BOOL CAreaMap::OnInitDialog() @@ -6492,10 +6495,11 @@ m_tooltip.SetMaxTipWidth(200); m_tooltip.SetTipBkColor(RGB(240,224,160)); } + UpdateData(UD_DISPLAY); return TRUE; } -static int maptypes[4]={MT_HEIGHT,MT_LIGHT, MT_LIGHT,MT_SEARCH}; +static int maptypes[5]={MT_HEIGHT,MT_LIGHT, MT_LIGHT,MT_SEARCH,MT_HEIGHT8}; void CAreaMap::ResetCombo() { @@ -6503,7 +6507,7 @@ int maptype; maptype=maptypes[m_maptype]; - if(maptype==MT_LIGHT) max=256; + if(maptype==MT_LIGHT || maptype==MT_HEIGHT8) max=256; else max=16; m_value_control.ResetContent(); for(i=0;i<max;i++) @@ -6531,6 +6535,12 @@ m_special_control.SetWindowText(""); m_special_control.EnableWindow(false); break; + case 4: //height 8 bits + the_map=the_area.heightmap; + the_palette=the_area.ht8pal; + m_special_control.SetWindowText(""); + m_special_control.EnableWindow(false); + break; case 1: the_area.m_night=false; the_map=the_area.lightmap; @@ -6582,7 +6592,6 @@ //{{AFX_MSG_MAP(CAreaMap) ON_BN_CLICKED(IDC_HEIGHTMAP, OnHeightmap) ON_BN_CLICKED(IDC_LIGHTMAP, OnLightmap) - ON_BN_CLICKED(IDC_NIGHTMAP, OnNightmap) ON_BN_CLICKED(IDC_SEARCHMAP, OnSearchmap) ON_CBN_KILLFOCUS(IDC_VALUE, OnDefaultKillfocus) ON_BN_CLICKED(IDC_CLEAR, OnClear) @@ -6594,6 +6603,8 @@ ON_BN_CLICKED(IDC_PALETTE, OnPalette) ON_BN_CLICKED(IDC_SPECIAL, OnSpecial) ON_COMMAND(ID_REFRESH, OnRefresh) + ON_BN_CLICKED(IDC_NIGHTMAP, OnNightmap) + ON_BN_CLICKED(IDC_HEIGHTMAP2, OnHeightmap2) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -6602,10 +6613,18 @@ void CAreaMap::OnHeightmap() { + the_area.m_smallpalette=true; UpdateData(UD_RETRIEVE); UpdateData(UD_DISPLAY); } +void CAreaMap::OnHeightmap2() +{ + the_area.m_smallpalette=false; + UpdateData(UD_RETRIEVE); + UpdateData(UD_DISPLAY); +} + void CAreaMap::OnLightmap() { if(GetLightMap(false)) m_maptype=2; @@ -6639,9 +6658,11 @@ int size=(the_area.m_width/GR_WIDTH)*((the_area.m_height+GR_HEIGHT-1)/GR_HEIGHT); the_map=new BYTE[size]; } + int maptype = maptypes[m_maptype]; + if(maptype==MT_HEIGHT8) maptype=MT_HEIGHT; switch(m_maptype) { - case 0: + case 0: case 4: the_area.heightmap = the_map; break; case 1: @@ -6656,7 +6677,7 @@ the_area.searchmap = the_map; break; } - the_area.changedmap[maptypes[m_maptype]]=TRUE; + the_area.changedmap[maptype]=TRUE; } void CAreaMap::OnClear() @@ -6665,7 +6686,9 @@ if(the_map) delete [] the_map; Allocatemap(true); memset(the_map,0,(the_area.m_width/GR_WIDTH)*((the_area.m_height+GR_HEIGHT-1)/GR_HEIGHT) ); - the_area.changedmap[maptypes[m_maptype]]=TRUE; + int maptype = maptypes[m_maptype]; + if(maptype==MT_HEIGHT8) maptype=MT_HEIGHT; + the_area.changedmap[maptype]=TRUE; UpdateData(UD_DISPLAY); } @@ -6678,7 +6701,9 @@ if(m_set>15) m_set=15; } memset(the_map,m_set,(the_area.m_width/GR_WIDTH)*((the_area.m_height+GR_HEIGHT-1)/GR_HEIGHT) ); - the_area.changedmap[maptypes[m_maptype]]=TRUE; + int maptype = maptypes[m_maptype]; + if(maptype==MT_HEIGHT8) maptype=MT_HEIGHT; + the_area.changedmap[maptype]=TRUE; UpdateData(UD_DISPLAY); } @@ -6697,6 +6722,13 @@ maptype=maptypes[m_maptype]; switch(maptype) { + case MT_HEIGHT8: + //FIXME: this is not correct, but something + for(i=0;i<256;i++) + { + the_palette[i]=RGB(i, i, i); + } + break; case MT_HEIGHT: for(i=0;i<16;i++) { @@ -6749,7 +6781,14 @@ memcpy(the_palette, srpalette, sizeof(srpalette) ); break; } - the_area.changedmap[maptype]=TRUE; + if(maptype==MT_HEIGHT8) + { + the_area.changedmap[MT_HEIGHT]=TRUE; + } + else + { + the_area.changedmap[maptype]=TRUE; + } UpdateData(UD_DISPLAY); } @@ -6757,7 +6796,7 @@ { CPaletteEdit dlg; - if(maptypes[m_maptype]!=MT_LIGHT) + if(maptypes[m_maptype]!=MT_LIGHT && maptypes[m_maptype]!=MT_HEIGHT8) { dlg.m_max=16; } Modified: chitem/trunk/AreaProperties.h =================================================================== --- chitem/trunk/AreaProperties.h 2009-07-04 15:15:13 UTC (rev 6698) +++ chitem/trunk/AreaProperties.h 2009-07-04 18:15:05 UTC (rev 6699) @@ -811,6 +811,7 @@ afx_msg void OnSpecial(); afx_msg void OnRefresh(); afx_msg void OnNightmap(); + afx_msg void OnHeightmap2(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: chitem/trunk/Chitem.h =================================================================== --- chitem/trunk/Chitem.h 2009-07-04 15:15:13 UTC (rev 6698) +++ chitem/trunk/Chitem.h 2009-07-04 18:15:05 UTC (rev 6699) @@ -69,6 +69,7 @@ #define MT_DOOR 10 #define MT_BAM 11 #define MT_EXPLORED 12 +#define MT_HEIGHT8 13 //getpoint units (for ImageView) #define GP_POINT 0 @@ -551,8 +552,8 @@ #define PROJ_FADE 0x80000 //fade after explode #define PROJ_TEXT 0x100000 //display text when the projectile is created #define PROJ_WANDERING 0x200000 //the projectile moves randomly +#define PROJ_CYCLE 0x400000 //the projectile will have a random cycle - //extended area flags for gemrb #define APF_TINT 1 #define APF_FILL 2 @@ -561,8 +562,9 @@ #define APF_SPREAD 16 #define APF_PALETTE 32 #define APF_BOTH 64 -#define APF_RESERVED 128 - +#define APF_MORE 128 +#define APF_FAILSPELL 256 + #define TRANSPARENT_GREEN 0x00ff00 #define COLORNUM 256 Modified: chitem/trunk/ImageView.cpp =================================================================== --- chitem/trunk/ImageView.cpp 2009-07-04 15:15:13 UTC (rev 6698) +++ chitem/trunk/ImageView.cpp 2009-07-04 18:15:05 UTC (rev 6699) @@ -201,6 +201,10 @@ m_palette=the_area.htpal; m_max=15; break; + case MT_HEIGHT8: + m_palette=the_area.ht8pal; + m_max=255; + break; case MT_LIGHT: m_palette=the_area.lmpal; m_max=255; @@ -914,7 +918,7 @@ { switch(m_maptype) { - case MT_HEIGHT: SetWindowText("Edit heightmap: "+itemname+"HT"); break; + case MT_HEIGHT8: case MT_HEIGHT: SetWindowText("Edit heightmap: "+itemname+"HT"); break; case MT_LIGHT: if(the_area.m_night) tmpstr="LN"; else tmpstr="LM"; @@ -1104,6 +1108,9 @@ case MT_EXPLORED:case MT_BLOCK: //changed area itself, no flag yet break; + case MT_HEIGHT8: + the_area.changedmap[0]=true; + break; default: the_area.changedmap[m_maptype]=true; } Modified: chitem/trunk/MapEdit.cpp =================================================================== --- chitem/trunk/MapEdit.cpp 2009-07-04 15:15:13 UTC (rev 6698) +++ chitem/trunk/MapEdit.cpp 2009-07-04 18:15:05 UTC (rev 6699) @@ -1368,8 +1368,10 @@ void CMapLink::DoDataExchange(CDataExchange* pDX) { + CButton *cb; CString tmpstr; - int i; + int i,j; + int flg; CDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CMapLink) @@ -1389,6 +1391,19 @@ DDX_Text(pDX,IDC_DISTANCE,the_map.arealinks[m_map][m_first+m_linkpicker].distancescale); DDX_Text(pDX, IDC_FLAGS, the_map.arealinks[m_map][m_first+m_linkpicker].flags); + + j=1; + for(i=0;i<4;i++) + { + cb=(CButton *) GetDlgItem(IDC_FLAG1+i); + if (cb) + { + flg=!!(the_map.arealinks[m_map][m_first+m_linkpicker].flags&j); + cb->SetCheck(flg); + j<<=1; + } + } + for(i=0;i<5;i++) { RetrieveResref(tmpstr, the_map.arealinks[m_map][m_first+m_linkpicker].encounters[i]); @@ -1404,6 +1419,7 @@ static int linkboxids[]={IDC_LINKPICKER, IDC_AREALINK, IDC_ENTRANCE, IDC_REMOVE, IDC_CHANCE,IDC_FLAGS, IDC_DISTANCE,IDC_U1,IDC_U2,IDC_U3,IDC_U4,IDC_U5, IDC_BROWSE1,IDC_BROWSE2,IDC_BROWSE3,IDC_BROWSE4,IDC_BROWSE5, +IDC_FLAG1,IDC_FLAG2,IDC_FLAG3,IDC_FLAG4, 0}; void CMapLink::RefreshLink() @@ -1536,6 +1552,10 @@ ON_CBN_SELCHANGE(IDC_ENTRANCE, OnSelchangeEntrance) ON_BN_CLICKED(IDC_ADD, OnAdd) ON_BN_CLICKED(IDC_REMOVE, OnRemove) + ON_BN_CLICKED(IDC_FLAG1, OnFlag1) + ON_BN_CLICKED(IDC_FLAG2, OnFlag2) + ON_BN_CLICKED(IDC_FLAG3, OnFlag3) + ON_BN_CLICKED(IDC_FLAG4, OnFlag4) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -1624,6 +1644,30 @@ UpdateData(UD_DISPLAY); } +void CMapLink::OnFlag1() +{ + the_map.arealinks[m_map][m_first+m_linkpicker].flags^=1; + UpdateData(UD_DISPLAY); +} + +void CMapLink::OnFlag2() +{ + the_map.arealinks[m_map][m_first+m_linkpicker].flags^=2; + UpdateData(UD_DISPLAY); +} + +void CMapLink::OnFlag3() +{ + the_map.arealinks[m_map][m_first+m_linkpicker].flags^=4; + UpdateData(UD_DISPLAY); +} + +void CMapLink::OnFlag4() +{ + the_map.arealinks[m_map][m_first+m_linkpicker].flags^=8; + UpdateData(UD_DISPLAY); +} + void CMapLink::OnKillfocusU1() { UpdateData(UD_RETRIEVE); Modified: chitem/trunk/MapEdit.h =================================================================== --- chitem/trunk/MapEdit.h 2009-07-04 15:15:13 UTC (rev 6698) +++ chitem/trunk/MapEdit.h 2009-07-04 18:15:05 UTC (rev 6699) @@ -178,6 +178,10 @@ afx_msg void OnSelchangeEntrance(); afx_msg void OnAdd(); afx_msg void OnRemove(); + afx_msg void OnFlag1(); + afx_msg void OnFlag2(); + afx_msg void OnFlag3(); + afx_msg void OnFlag4(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: chitem/trunk/ProjGemRB.cpp =================================================================== --- chitem/trunk/ProjGemRB.cpp 2009-07-04 15:15:13 UTC (rev 6698) +++ chitem/trunk/ProjGemRB.cpp 2009-07-04 18:15:05 UTC (rev 6699) @@ -81,8 +81,9 @@ ON_EN_KILLFOCUS(IDC_STRING, OnKillfocusString) ON_BN_CLICKED(IDC_FLAG20, OnFlag20) ON_BN_CLICKED(IDC_FLAG21, OnFlag21) + ON_BN_CLICKED(IDC_FLAG22, OnFlag22) ON_EN_KILLFOCUS(IDC_STRREF, OnKillfocus) - ON_BN_CLICKED(IDC_FLAG22, OnFlag22) + ON_BN_CLICKED(IDC_FLAG23, OnFlag23) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -222,6 +223,12 @@ UpdateData(UD_DISPLAY); } +void CProjGemRB::OnFlag23() +{ + the_projectile.header.extflags^=PROJ_CYCLE; + UpdateData(UD_DISPLAY); +} + void CProjGemRB::RefreshStrings() { m_text=resolve_tlk_text(the_projectile.header.text); @@ -290,7 +297,7 @@ DDX_Text(pDX, IDC_FLAGS, tmpstr); the_projectile.extension.gemrbflags=strtonum(tmpstr); j=1; - for(i=0;i<8;i++) + for(i=0;i<16;i++) { cb=(CButton *) GetDlgItem(IDC_FLAG1+i); if (cb) @@ -331,10 +338,11 @@ ON_BN_CLICKED(IDC_BROWSE1, OnBrowse1) ON_BN_CLICKED(IDC_BROWSE2, OnBrowse2) ON_BN_CLICKED(IDC_BROWSE3, OnBrowse3) + ON_BN_CLICKED(IDC_PLAY1, OnPlay1) ON_EN_KILLFOCUS(IDC_SOUND1, OnKillfocus) ON_EN_KILLFOCUS(IDC_BAM1, OnKillfocus) ON_EN_KILLFOCUS(IDC_BAM2, OnKillfocus) - ON_BN_CLICKED(IDC_PLAY1, OnPlay1) + ON_BN_CLICKED(IDC_FLAG9, OnFlag9) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -385,10 +393,16 @@ void CProjAreaGemRB::OnFlag8() { - the_projectile.extension.gemrbflags^=APF_RESERVED; + the_projectile.extension.gemrbflags^=APF_MORE; UpdateData(UD_DISPLAY); } +void CProjAreaGemRB::OnFlag9() +{ + the_projectile.extension.gemrbflags^=APF_FAILSPELL; + UpdateData(UD_DISPLAY); +} + void CProjAreaGemRB::OnKillfocus() { UpdateData(UD_RETRIEVE); Modified: chitem/trunk/ProjGemRB.h =================================================================== --- chitem/trunk/ProjGemRB.h 2009-07-04 15:15:13 UTC (rev 6698) +++ chitem/trunk/ProjGemRB.h 2009-07-04 18:15:05 UTC (rev 6699) @@ -61,6 +61,7 @@ afx_msg void OnFlag20(); afx_msg void OnFlag21(); afx_msg void OnFlag22(); + afx_msg void OnFlag23(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; @@ -106,6 +107,7 @@ afx_msg void OnBrowse2(); afx_msg void OnBrowse3(); afx_msg void OnPlay1(); + afx_msg void OnFlag9(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: chitem/trunk/area.cpp =================================================================== --- chitem/trunk/area.cpp 2009-07-04 15:15:13 UTC (rev 6698) +++ chitem/trunk/area.cpp 2009-07-04 18:15:05 UTC (rev 6699) @@ -91,6 +91,7 @@ wedavailable=true; changedmap[0]=changedmap[1]=changedmap[2]=true; memset(&intheader,0,sizeof(intheader) ); + m_smallpalette=true; } Carea::~Carea() @@ -539,7 +540,14 @@ { if(changedmap[0]) { - WriteMap("HT",heightmap,htpal,16); + if(m_smallpalette) + { + WriteMap("HT",heightmap,htpal,16); + } + else + { + WriteMap("HT",heightmap,ht8pal,256); + } changedmap[0]=false; } } @@ -547,7 +555,8 @@ { if(changedmap[1]) { - if(m_night) { + if(m_night) + { WriteMap("LN",lightmap,lmpal,256); } else @@ -1488,6 +1497,7 @@ Cbam tmpbam; CString resname; int mapsize; + int ret; RetrieveResref(resname,header.wed); resname+=Suffix; @@ -1506,10 +1516,16 @@ Storage = new unsigned char[mapsize]; if(!Storage) return -3; memset(Storage, 0, mapsize); + ret = 0; + if(tmpbam.m_palettesize!=size) ret = 1; size = tmpbam.GetFrameDataSize(0); - if(size<mapsize) mapsize=size; + if(size<mapsize) + { + mapsize=size; + ret = 1; + } memcpy(Storage, tmpbam.GetFrameData(0), mapsize); - return 0; + return ret; } int Carea::ReadWedFromFile(int fh, long ml) @@ -1574,7 +1590,13 @@ ReadMap("LM", lightmap, lmpal, sizeof(lmpal) ); } ReadMap("SR", searchmap, srpal, sizeof(srpal) ); - ReadMap("HT", heightmap, htpal, sizeof(htpal) ); + m_smallpalette=true; + ret = ReadMap("HT", heightmap, htpal, sizeof(htpal) ); + if(ret==1) + { + m_smallpalette=false; + ReadMap("HT", heightmap, ht8pal, sizeof(ht8pal) ); + } wedchanged=false; for(ret=0;ret<3;ret++) changedmap[ret]=false; ret=0; Modified: chitem/trunk/area.h =================================================================== --- chitem/trunk/area.h 2009-07-04 15:15:13 UTC (rev 6698) +++ chitem/trunk/area.h 2009-07-04 18:15:05 UTC (rev 6699) @@ -51,9 +51,11 @@ unsigned char *heightmap; bool changedmap[3]; bool m_changed; + bool m_smallpalette; COLORREF lmpal[256]; COLORREF srpal[16]; COLORREF htpal[16]; + COLORREF ht8pal[256]; //.area int revision; Modified: chitem/trunk/chitem.clw =================================================================== --- chitem/trunk/chitem.clw 2009-07-04 15:15:13 UTC (rev 6698) +++ chitem/trunk/chitem.clw 2009-07-04 18:15:05 UTC (rev 6699) @@ -2,7 +2,7 @@ [General Info] Version=1 -LastClass=CProjAreaGemRB +LastClass=CMapLink LastTemplate=CDialog NewFileInclude1=#include "stdafx.h" NewFileInclude2=#include "chitem.h" @@ -232,142 +232,142 @@ Resource123=IDD_GAMEGENERAL Class98=IcewindCre Resource124=IDR_SHORTCUT -Resource125=IDD_POLYGON (English (U.S.)) -Resource126=IDD_MAPEDIT (English (U.S.)) -Resource127=IDD_AREAACTOR (English (U.S.)) -Resource128=IDR_WORLDMAP (English (U.S.)) -Resource129=IDD_AREACONTAINER (English (U.S.)) -Resource130=IDR_AREA (English (U.S.)) -Resource131=IDD_ITEMEFFECT (English (U.S.)) -Resource132=IDD_STORERENTAL (English (U.S.)) -Resource133=IDR_BAMMENU (English (U.S.)) -Resource134=IDD_AREAAMBIENT (English (U.S.)) -Resource135=IDD_ABOUTBOX (English (U.S.)) -Resource136=IDD_PANICBUTTON (English (U.S.)) -Resource137=IDD_AREAANIM (English (U.S.)) -Resource138=IDD_STOREDRINKS (English (U.S.)) -Resource139=IDD_PROJEXT (English (U.S.)) -Resource140=IDR_STORE (English (U.S.)) -Resource141=IDD_WEDEDIT (English (U.S.)) -Resource142=IDD_CREATURERES (English (U.S.)) -Resource143=IDD_EFFEDIT (English (U.S.)) -Resource144=IDD_AREASONGS (English (U.S.)) -Resource145=IDD_ITEMICONS (English (U.S.)) -Resource146=IDR_2DA (English (U.S.)) -Resource147=IDD_IDSEDIT (English (U.S.)) -Resource148=IDD_MAPLINK (English (U.S.)) -Resource149=IDD_EXTRACT2 (English (U.S.)) -Resource150=IDD_STOREEXTRA (English (U.S.)) -Resource151=IDD_GAMEEDIT (English (U.S.)) -Resource152=IDD_CFB (English (U.S.)) -Resource153=IDD_CHECK (English (U.S.)) -Resource154=IDD_CHITEM_DIALOG (English (U.S.)) -Resource155=IDD_SPELLEXTRA (English (U.S.)) -Resource156=IDR_EFFECT (English (U.S.)) -Resource157=IDD_MASSCLEAR (English (U.S.)) -Resource158=IDR_GAME (English (U.S.)) -Resource159=IDD_COMPAT (English (U.S.)) -Resource160=IDD_CREATUREUNKNOWN (English (U.S.)) -Resource161=IDD_SRCEDIT (English (U.S.)) -Resource162=IDD_CREATURESKILLS (English (U.S.)) -Resource163=IDD_AREAVARIABLE (English (U.S.)) -Resource164=IDD_ITEMUSE (English (U.S.)) -Resource165=IDR_SRC (English (U.S.)) -Resource166=IDR_ITEM (English (U.S.)) -Resource167=IDD_AREAENTRANCE (English (U.S.)) -Resource168=IDD_ADDLINK (English (U.S.)) -Resource169=IDD_MUSEDIT (English (U.S.)) -Resource170=IDD_DIALOGEDIT (English (U.S.)) -Resource171=IDD_ITEMEQUIP (English (U.S.)) -Resource172=IDD_VVCEDIT (English (U.S.)) -Resource173=IDD_EXTRACT (English (U.S.)) -Resource174=IDD_GAMESTATS (English (U.S.)) -Resource175=IDD_AREAINT (English (U.S.)) -Resource176=IDD_VARIABLES (English (U.S.)) -Resource177=IDD_SPELLTOOL (English (U.S.)) -Resource178=IDR_TLKMENU (English (U.S.)) -Resource179=IDD_CHUIEDIT (English (U.S.)) -Resource180=IDR_IDS (English (U.S.)) -Resource181=IDD_EDIT (English (U.S.)) -Resource182=IDD_MOSEDIT (English (U.S.)) -Resource183=IDR_CHITIN (English (U.S.)) -Resource184=IDD_KEYEDIT (English (U.S.)) -Resource185=IDD_AREAEDIT (English (U.S.)) -Resource186=IDD_ITEMDESC (English (U.S.)) -Resource187=IDD_SEARCHNODE (English (U.S.)) -Resource188=IDR_PROJECT (English (U.S.)) -Resource189=IDD_CREATUREITEMS (English (U.S.)) -Resource190=IDD_CREATURELEVELS (English (U.S.)) -Resource191=IDD_SCHEDULE (English (U.S.)) -Resource192=IDD_PROJAREAGEMRB (English (U.S.)) -Resource193=IDD_CREATUREIWD2 (English (U.S.)) -Resource194=IDR_CREATURE (English (U.S.)) -Resource195=IDR_TILE (English (U.S.)) -Resource196=IDD_STRREFDLG (English (U.S.)) -Resource197=IDD_SPELLEQUIP (English (U.S.)) -Resource198=IDD_GAMEPCINFO (English (U.S.)) -Resource199=IDD_AREAPROJ (English (U.S.)) -Resource200=IDR_TREEMENU (English (U.S.)) -Resource201=IDD_CREATUREGENERAL (English (U.S.)) -Resource202=IDD_IAPDIALOG (English (U.S.)) -Resource203=IDD_SPELLGENERAL (English (U.S.)) -Resource204=IDD_TISDIALOG (English (U.S.)) -Resource205=IDD_SCRIPTEDIT (English (U.S.)) -Resource206=IDD_AREAGENERAL (English (U.S.)) -Resource207=IDD_PROJEDIT (English (U.S.)) -Resource208=IDD_WEIDU (English (U.S.)) -Resource209=IDD_CREATUREICONS (English (U.S.)) -Resource210=IDD_COLORPICKER (English (U.S.)) -Resource211=IDD_AREADOOR (English (U.S.)) -Resource212=IDD_PROJGEMRB (English (U.S.)) -Resource213=IDD_ANIMDIALOG -Resource214=IDD_CREATUREEFF (English (U.S.)) -Resource215=IDD_SHOWLOG (English (U.S.)) -Resource216=IDR_VVC (English (U.S.)) -Resource217=IDD_FINDITEM (English (U.S.)) -Resource218=IDD_IMAGEVIEW (English (U.S.)) -Resource219=IDD_WEDPOLY (English (U.S.)) -Resource220=IDD_STOREGENERAL (English (U.S.)) -Resource221=IDR_MUSIC (English (U.S.)) -Resource222=IDD_AREATRIGGERSTRINGS (English (U.S.)) -Resource223=IDD_STOREEDIT (English (U.S.)) -Resource224=IDD_CREATUREEDIT (English (U.S.)) -Resource225=IDD_ITEMEXTRA (English (U.S.)) -Resource226=IDD_CREATUREOVR (English (U.S.)) -Resource227=IDD_ITEMPICKER (English (U.S.)) -Resource228=IDD_GAMEGENERAL (English (U.S.)) -Resource229=IDR_SCRIPT (English (U.S.)) -Resource230=IDD_SPELLEFFECT (English (U.S.)) -Resource231=IDD_2DAEDIT (English (U.S.)) -Resource232=IDD_AREAMAP (English (U.S.)) -Resource233=IDD_ITEMGENERAL (English (U.S.)) -Resource234=IDD_CREATUREIWD (English (U.S.)) -Resource235=IDD_AREATRIGGER (English (U.S.)) -Resource236=IDD_CREATUREPST (English (U.S.)) -Resource237=IDD_SPELLEDIT (English (U.S.)) -Resource238=IDD_BAMEDIT (English (U.S.)) -Resource239=IDD_WEDTILE (English (U.S.)) -Resource240=IDR_MENUBAR (English (U.S.)) -Resource241=IDR_SPELL (English (U.S.)) -Resource242=IDD_AREASPAWN (English (U.S.)) -Resource243=IDD_STOREITEMS (English (U.S.)) -Resource244=IDD_PROGRESS (English (U.S.)) -Resource245=IDD_PALETTE (English (U.S.)) +Resource125=IDD_VVCEDIT (English (U.S.)) +Resource126=IDR_GAME (English (U.S.)) +Resource127=IDD_MOSEDIT (English (U.S.)) +Resource128=IDD_AREAEDIT (English (U.S.)) +Resource129=IDR_TREEMENU (English (U.S.)) +Resource130=IDD_EXTRACT2 (English (U.S.)) +Resource131=IDD_MAPLINK (English (U.S.)) +Resource132=IDD_CREATURERES (English (U.S.)) +Resource133=IDD_CHECK (English (U.S.)) +Resource134=IDR_MENUBAR (English (U.S.)) +Resource135=IDD_CREATUREEFF (English (U.S.)) +Resource136=IDD_PROJAREAGEMRB (English (U.S.)) +Resource137=IDD_MAPEDIT (English (U.S.)) +Resource138=IDD_EXTRACT (English (U.S.)) +Resource139=IDR_CREATURE (English (U.S.)) +Resource140=IDD_SPELLEFFECT (English (U.S.)) +Resource141=IDD_CHITEM_DIALOG (English (U.S.)) +Resource142=IDD_CREATURELEVELS (English (U.S.)) +Resource143=IDR_EFFECT (English (U.S.)) +Resource144=IDD_CREATUREITEMS (English (U.S.)) +Resource145=IDD_GAMEEDIT (English (U.S.)) +Resource146=IDD_AREASPAWN (English (U.S.)) +Resource147=IDD_AREADOOR (English (U.S.)) +Resource148=IDD_AREASONGS (English (U.S.)) +Resource149=IDD_ITEMEXTRA (English (U.S.)) +Resource150=IDD_PANICBUTTON (English (U.S.)) +Resource151=IDR_WORLDMAP (English (U.S.)) +Resource152=IDD_IDSEDIT (English (U.S.)) +Resource153=IDD_AREAVARIABLE (English (U.S.)) +Resource154=IDD_WEDPOLY (English (U.S.)) +Resource155=IDR_TILE (English (U.S.)) +Resource156=IDD_SHOWLOG (English (U.S.)) +Resource157=IDD_PROGRESS (English (U.S.)) +Resource158=IDD_AREAACTOR (English (U.S.)) +Resource159=IDD_STRREFDLG (English (U.S.)) +Resource160=IDD_PROJGEMRB (English (U.S.)) +Resource161=IDD_ITEMEFFECT (English (U.S.)) +Resource162=IDR_CHITIN (English (U.S.)) +Resource163=IDD_CREATUREEDIT (English (U.S.)) +Resource164=IDD_STOREGENERAL (English (U.S.)) +Resource165=IDD_SPELLEDIT (English (U.S.)) +Resource166=IDD_SPELLEXTRA (English (U.S.)) +Resource167=IDD_ITEMUSE (English (U.S.)) +Resource168=IDD_ITEMGENERAL (English (U.S.)) +Resource169=IDD_IMAGEVIEW (English (U.S.)) +Resource170=IDR_STORE (English (U.S.)) +Resource171=IDD_EFFEDIT (English (U.S.)) +Resource172=IDD_2DAEDIT (English (U.S.)) +Resource173=IDD_PALETTE (English (U.S.)) +Resource174=IDD_MASSCLEAR (English (U.S.)) +Resource175=IDD_AREAENTRANCE (English (U.S.)) +Resource176=IDD_SCRIPTEDIT (English (U.S.)) +Resource177=IDD_ITEMICONS (English (U.S.)) +Resource178=IDD_SCHEDULE (English (U.S.)) +Resource179=IDD_ITEMEQUIP (English (U.S.)) +Resource180=IDD_IAPDIALOG (English (U.S.)) +Resource181=IDR_IDS (English (U.S.)) +Resource182=IDR_VVC (English (U.S.)) +Resource183=IDD_CREATUREUNKNOWN (English (U.S.)) +Resource184=IDD_CREATUREIWD (English (U.S.)) +Resource185=IDD_WEIDU (English (U.S.)) +Resource186=IDR_2DA (English (U.S.)) +Resource187=IDD_AREAANIM (English (U.S.)) +Resource188=IDD_AREATRIGGER (English (U.S.)) +Resource189=IDR_SCRIPT (English (U.S.)) +Resource190=IDD_STOREEXTRA (English (U.S.)) +Resource191=IDD_TEXTVIEW (English (U.S.)) +Resource192=IDR_TLKMENU (English (U.S.)) +Resource193=IDD_COMPAT (English (U.S.)) +Resource194=IDD_ITEMPICKER (English (U.S.)) +Resource195=IDD_CREATUREICONS (English (U.S.)) +Resource196=IDD_CREATUREOVR (English (U.S.)) +Resource197=IDD_TISDIALOG (English (U.S.)) +Resource198=IDD_ADDLINK (English (U.S.)) +Resource199=IDD_BAMEDIT (English (U.S.)) +Resource200=IDD_SPELLEQUIP (English (U.S.)) +Resource201=IDD_AREATRIGGERSTRINGS (English (U.S.)) +Resource202=IDR_MUSIC (English (U.S.)) +Resource203=IDD_WEDEDIT (English (U.S.)) +Resource204=IDD_FINDITEM (English (U.S.)) +Resource205=IDD_PROJEXT (English (U.S.)) +Resource206=IDD_AREAMAP (English (U.S.)) +Resource207=IDD_CREATUREPST (English (U.S.)) +Resource208=IDD_AREAAMBIENT (English (U.S.)) +Resource209=IDD_CREATUREIWD2 (English (U.S.)) +Resource210=IDD_KEYEDIT (English (U.S.)) +Resource211=IDR_ITEM (English (U.S.)) +Resource212=IDD_POLYGON (English (U.S.)) +Resource213=IDD_SPELLGENERAL (English (U.S.)) +Resource214=IDD_ABOUTBOX (English (U.S.)) +Resource215=IDR_WEDMENU (English (U.S.)) +Resource216=IDR_BAMMENU (English (U.S.)) +Resource217=IDD_SEARCHNODE (English (U.S.)) +Resource218=IDD_AREAINT (English (U.S.)) +Resource219=IDD_ITEMDESC (English (U.S.)) +Resource220=IDR_SPELL (English (U.S.)) +Resource221=IDD_CREATUREGENERAL (English (U.S.)) +Resource222=IDD_SPELLTOOL (English (U.S.)) +Resource223=IDD_EDIT (English (U.S.)) +Resource224=IDD_ITEMEDIT (English (U.S.)) +Resource225=IDD_SAVHANDLE (English (U.S.)) +Resource226=IDD_SRCEDIT (English (U.S.)) +Resource227=IDD_STOREDRINKS (English (U.S.)) +Resource228=IDD_STOREITEMS (English (U.S.)) +Resource229=IDD_STOREEDIT (English (U.S.)) +Resource230=IDD_STORERENTAL (English (U.S.)) +Resource231=IDD_AREACONTAINER (English (U.S.)) +Resource232=IDD_AREAGENERAL (English (U.S.)) +Resource233=IDR_SRC (English (U.S.)) +Resource234=IDD_WEDTILE (English (U.S.)) +Resource235=IDD_GAMEGENERAL (English (U.S.)) +Resource236=IDD_PROJEDIT (English (U.S.)) +Resource237=IDD_CREATURESKILLS (English (U.S.)) +Resource238=IDD_MUSEDIT (English (U.S.)) +Resource239=IDR_AREA (English (U.S.)) +Resource240=IDD_GAMESTATS (English (U.S.)) +Resource241=IDD_SPELLDESC (English (U.S.)) +Resource242=IDD_GAMEPCINFO (English (U.S.)) +Resource243=IDD_COLORPICKER (English (U.S.)) +Resource244=IDD_DIALOGEDIT (English (U.S.)) +Resource245=IDR_PROJECT (English (U.S.)) Class99=CAreaTriggerString Class100=CPCInfo -Resource246=IDD_SPELLDESC (English (U.S.)) +Resource246=IDD_VARIABLES (English (U.S.)) Class101=CCreatureOverlay -Resource247=IDR_CHUI (English (U.S.)) +Resource247=IDD_CHUIEDIT (English (U.S.)) Class102=IWD2Creature -Resource248=IDD_CREATURESTRINGS (English (U.S.)) +Resource248=IDD_AREAPROJ (English (U.S.)) Class103=CAnimDialog -Resource249=IDD_SAVHANDLE (English (U.S.)) +Resource249=IDD_ANIMDIALOG Class104=CCreatureLevels -Resource250=IDD_TEXTVIEW (English (U.S.)) +Resource250=IDD_CFB (English (U.S.)) Class105=CAreaProj -Resource251=IDR_WEDMENU (English (U.S.)) +Resource251=IDD_CREATURESTRINGS (English (U.S.)) Class106=CProjGemRB -Resource252=IDD_ITEMEDIT (English (U.S.)) +Resource252=IDR_CHUI (English (U.S.)) Class107=CProjAreaGemRB Resource253=IDR_SHORTCUT (English (U.S.)) @@ -3934,7 +3934,7 @@ ImplementationFile=MapEdit.cpp BaseClass=CDialog Filter=D -LastObject=IDC_ADD +LastObject=CMapLink VirtualFilter=dWC [DLG:IDD_CREATUREITEMS] @@ -6640,24 +6640,24 @@ Type=1 Class=CPaletteEdit ControlCount=57 -Control1=IDOK,button,1342242817 -Control2=IDCANCEL,button,1342242816 -Control3=IDC_PALETTE,static,1350570254 -Control4=IDC_STATIC,static,1342308352 -Control5=IDC_STATIC,static,1342308352 -Control6=IDC_STATIC,static,1342308352 -Control7=IDC_STATIC,static,1342308352 -Control8=IDC_STATIC,static,1342308352 -Control9=IDC_STATIC,static,1342308352 -Control10=IDC_STATIC,static,1342308352 -Control11=IDC_STATIC,static,1342308352 -Control12=IDC_STATIC,static,1342308352 -Control13=IDC_STATIC,static,1342308352 -Control14=IDC_STATIC,static,1342308352 -Control15=IDC_STATIC,static,1342308352 -Control16=IDC_STATIC,static,1342308352 -Control17=IDC_STATIC,static,1342308352 -Control18=IDC_STATIC,static,1342308352 +Control1=IDC_PALETTE,static,1350570254 +Control2=IDC_IDX,edit,1350631552 +Control3=IDC_BLUE,edit,1350631552 +Control4=IDC_BLUE2,edit,1350631552 +Control5=IDC_GREEN,edit,1350631552 +Control6=IDC_GREEN2,edit,1350631552 +Control7=IDC_RED,edit,1350631552 +Control8=IDC_RED2,edit,1350631552 +Control9=IDC_ALL,button,1342242816 +Control10=IDC_FROM,edit,1350631552 +Control11=IDC_TO,edit,1350631552 +Control12=IDC_SMOOTH,button,1342242816 +Control13=IDC_FUNCTION,combobox,1344339971 +Control14=IDC_SWAP,button,1342242816 +Control15=IDC_RGB,button,1342242816 +Control16=IDC_KEEPGRAY,button,1342246915 +Control17=IDOK,button,1342242817 +Control18=IDCANCEL,button,1342242816 Control19=IDC_STATIC,static,1342308352 Control20=IDC_STATIC,static,1342308352 Control21=IDC_STATIC,static,1342308352 @@ -6675,28 +6675,28 @@ Control33=IDC_STATIC,static,1342308352 Control34=IDC_STATIC,static,1342308352 Control35=IDC_STATIC,static,1342308352 -Control36=IDC_RED,edit,1350631552 -Control37=IDC_GREEN,edit,1350631552 -Control38=IDC_BLUE,edit,1350631552 +Control36=IDC_STATIC,static,1342308352 +Control37=IDC_STATIC,static,1342308352 +Control38=IDC_STATIC,static,1342308352 Control39=IDC_STATIC,static,1342308352 Control40=IDC_STATIC,static,1342308352 Control41=IDC_STATIC,static,1342308352 -Control42=IDC_IDX,edit,1350631552 +Control42=IDC_STATIC,static,1342308352 Control43=IDC_STATIC,static,1342308352 -Control44=IDC_SMOOTH,button,1342242816 -Control45=IDC_TO,edit,1350631552 -Control46=IDC_FROM,edit,1350631552 +Control44=IDC_STATIC,static,1342308352 +Control45=IDC_STATIC,static,1342308352 +Control46=IDC_STATIC,static,1342308352 Control47=IDC_STATIC,static,1342308352 -Control48=IDC_RGB,button,1342242816 -Control49=IDC_FUNCTION,combobox,1344339971 -Control50=IDC_KEEPGRAY,button,1342246915 -Control51=IDC_ALL,button,1342242816 +Control48=IDC_STATIC,static,1342308352 +Control49=IDC_STATIC,static,1342308352 +Control50=IDC_STATIC,static,1342308352 +Control51=IDC_STATIC,static,1342308352 Control52=IDC_STATIC,static,1342308352 -Control53=IDC_BLUE2,edit,1350631552 -Control54=IDC_GREEN2,edit,1350631552 -Control55=IDC_RED2,edit,1350631552 +Control53=IDC_STATIC,static,1342308352 +Control54=IDC_STATIC,static,1342308352 +Control55=IDC_STATIC,static,1342308352 Control56=IDC_STATIC,static,1342308352 -Control57=IDC_SWAP,button,1342242816 +Control57=IDC_STATIC,static,1342308352 [DLG:IDD_SPELLGENERAL (English (U.S.))] Type=1 @@ -8420,7 +8420,7 @@ [DLG:IDD_MAPLINK (English (U.S.))] Type=1 Class=CMapLink -ControlCount=33 +ControlCount=37 Control1=IDCANCEL,button,1342242816 Control2=IDC_MAXDIR,static,1342308352 Control3=IDC_LINKPICKER,combobox,1344339971 @@ -8454,6 +8454,10 @@ Control31=IDC_STATIC,static,1342308352 Control32=IDC_ADD,button,1342242816 Control33=IDC_REMOVE,button,1342242816 +Control34=IDC_FLAG1,button,1342242819 +Control35=IDC_FLAG2,button,1342242819 +Control36=IDC_FLAG3,button,1342242819 +Control37=IDC_FLAG4,button,1342242819 [DLG:IDD_CREATUREITEMS (English (U.S.))] Type=1 @@ -9226,25 +9230,26 @@ [DLG:IDD_AREAMAP (English (U.S.))] Type=1 Class=CAreaMap -ControlCount=18 +ControlCount=19 Control1=IDC_HEIGHTMAP,button,1342373897 Control2=IDC_LIGHTMAP,button,1342177289 Control3=IDC_NIGHTMAP,button,1342177289 Control4=IDC_SEARCHMAP,button,1342177289 -Control5=IDC_SET,button,1342373888 -Control6=IDC_VALUE,combobox,1344339970 -Control7=IDC_CLEAR,button,1342373888 -Control8=IDC_SPECIAL,button,1342242816 -Control9=IDC_INIT,button,1342242816 -Control10=IDC_PALETTE,button,1342242816 -Control11=IDC_EDIT,button,1342242816 -Control12=IDC_UNDO,button,1342242816 -Control13=IDC_STATIC,button,1342177287 -Control14=IDC_MAP,static,1342177550 -Control15=IDC_HEIGHT,edit,1350633600 -Control16=IDC_WIDTH,edit,1350633600 -Control17=IDC_STATIC,static,1342308352 +Control5=IDC_HEIGHTMAP2,button,1342177289 +Control6=IDC_WIDTH,edit,1350764672 +Control7=IDC_HEIGHT,edit,1350633600 +Control8=IDC_SET,button,1342373888 +Control9=IDC_VALUE,combobox,1344339970 +Control10=IDC_CLEAR,button,1342373888 +Control11=IDC_SPECIAL,button,1342242816 +Control12=IDC_INIT,button,1342242816 +Control13=IDC_PALETTE,button,1342242816 +Control14=IDC_EDIT,button,1342242816 +Control15=IDC_UNDO,button,1342242816 +Control16=IDC_STATIC,button,1342177287 +Control17=IDC_MAP,static,1342177550 Control18=IDC_STATIC,static,1342308352 +Control19=IDC_STATIC,static,1342308352 [DLG:IDD_STOREDRINKS (English (U.S.))] Type=1 @@ -10275,7 +10280,7 @@ [DLG:IDD_PROJGEMRB (English (U.S.))] Type=1 Class=CProjGemRB -ControlCount=28 +ControlCount=29 Control1=IDOK,button,1342242816 Control2=IDC_FLAGS,edit,1350631552 Control3=IDC_STATIC,static,1342308352 @@ -10304,6 +10309,7 @@ Control26=IDC_FLAG20,button,1342242819 Control27=IDC_FLAG21,button,1342242819 Control28=IDC_FLAG22,button,1342242819 +Control29=IDC_FLAG23,button,1342242819 [CLS:CProjGemRB] Type=0 @@ -10317,7 +10323,7 @@ [DLG:IDD_PROJAREAGEMRB (English (U.S.))] Type=1 Class=CProjAreaGemRB -ControlCount=23 +ControlCount=24 Control1=IDOK,button,1342242816 Control2=IDC_UNKNOWN26,edit,1350631552 Control3=IDC_STATIC,static,1342308352 @@ -10341,6 +10347,7 @@ Control21=IDC_BROWSE2,button,1342242816 Control22=IDC_BROWSE3,button,1342242816 Control23=IDC_PLAY1,button,1342242816 +Control24=IDC_FLAG9,button,1342242819 [CLS:CProjAreaGemRB] Type=0 Modified: chitem/trunk/chitem.rc =================================================================== --- chitem/trunk/chitem.rc 2009-07-04 15:15:13 UTC (rev 6698) +++ chitem/trunk/chitem.rc 2009-07-04 18:15:05 UTC (rev 6699) @@ -1390,12 +1390,29 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTROLPARENT CAPTION "Edit Palette" -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Sans Serif" BEGIN + CONTROL "",IDC_PALETTE,"Static",SS_BITMAP | SS_NOTIFY | + SS_SUNKEN | WS_BORDER,23,24,17,15,0,HIDC_PALETTE + EDITTEXT IDC_IDX,249,16,22,14,ES_AUTOHSCROLL + EDITTEXT IDC_BLUE,249,35,22,14,ES_AUTOHSCROLL + EDITTEXT IDC_BLUE2,276,35,22,14,ES_AUTOHSCROLL + EDITTEXT IDC_GREEN,249,54,22,14,ES_AUTOHSCROLL + EDITTEXT IDC_GREEN2,276,54,22,14,ES_AUTOHSCROLL + EDITTEXT IDC_RED,249,73,22,14,ES_AUTOHSCROLL + EDITTEXT IDC_RED2,276,73,22,14,ES_AUTOHSCROLL + PUSHBUTTON "All",IDC_ALL,225,102,20,14 + EDITTEXT IDC_FROM,249,102,22,14,ES_AUTOHSCROLL + EDITTEXT IDC_TO,276,102,22,14,ES_AUTOHSCROLL + PUSHBUTTON "Scale colours",IDC_SMOOTH,248,121,50,14 + COMBOBOX IDC_FUNCTION,225,148,86,60,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP + PUSHBUTTON "Swap",IDC_SWAP,225,164,20,14 + PUSHBUTTON "Modify RGB",IDC_RGB,248,164,50,14 + CONTROL "Keep gray",IDC_KEEPGRAY,"Button",BS_AUTOCHECKBOX | + BS_PUSHLIKE | WS_TABSTOP,250,183,48,10 DEFPUSHBUTTON "OK",IDOK,75,191,50,14 PUSHBUTTON "Cancel",IDCANCEL,189,191,50,14 - CONTROL "",IDC_PALETTE,"Static",SS_BITMAP | SS_NOTIFY | - SS_SUNKEN | WS_BORDER,23,24,17,15,0,HIDC_PALETTE LTEXT "1",IDC_STATIC,13,35,8,8 LTEXT "2",IDC_STATIC,13,45,8,8 LTEXT "3",IDC_STATIC,13,55,8,8 @@ -1428,30 +1445,13 @@ LTEXT "E",IDC_STATIC,179,13,8,8 LTEXT "F",IDC_STATIC,189,13,8,8 LTEXT "0",IDC_STATIC,25,13,8,8 - EDITTEXT IDC_RED,249,73,22,14,ES_AUTOHSCROLL - EDITTEXT IDC_GREEN,249,54,22,14,ES_AUTOHSCROLL - EDITTEXT IDC_BLUE,249,35,22,14,ES_AUTOHSCROLL LTEXT "Red",IDC_STATIC,231,35,14,8 LTEXT "Green",IDC_STATIC,225,54,20,8 LTEXT "Blue",IDC_STATIC,230,73,15,8 - EDITTEXT IDC_IDX,249,16,22,14,ES_AUTOHSCROLL LTEXT "Colour #",IDC_STATIC,217,16,28,8 - PUSHBUTTON "Scale colours",IDC_SMOOTH,248,121,50,14 - EDITTEXT IDC_TO,276,102,22,14,ES_AUTOHSCROLL - EDITTEXT IDC_FROM,249,102,22,14,ES_AUTOHSCROLL LTEXT "Changed interval",IDC_STATIC,248,91,54,8 - PUSHBUTTON "Modify RGB",IDC_RGB,248,164,50,14 - COMBOBOX IDC_FUNCTION,225,148,86,60,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - CONTROL "Keep gray",IDC_KEEPGRAY,"Button",BS_AUTOCHECKBOX | - BS_PUSHLIKE | WS_TABSTOP,250,183,48,10 - PUSHBUTTON "All",IDC_ALL,225,102,20,14 LTEXT "Function to perform",IDC_STATIC,225,138,62,8 - EDITTEXT IDC_BLUE2,276,35,22,14,ES_AUTOHSCROLL - EDITTEXT IDC_GREEN2,276,54,22,14,ES_AUTOHSCROLL - EDITTEXT IDC_RED2,276,73,22,14,ES_AUTOHSCROLL LTEXT "Adjustment",IDC_STATIC,276,20,36,8 - PUSHBUTTON "Swap",IDC_SWAP,225,164,20,14 END IDD_SPELLGENERAL DIALOG DISCARDABLE 0, 0, 400, 199 @@ -3452,13 +3452,13 @@ CONTROL "Cone shape",IDC_ATTR12,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,142,146,54,10 CONTROL "13",IDC_ATTR13,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13, - 139,24,10 + 134,24,10 CONTROL "No explosion ?",IDC_ATTR14,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,13,149,63,10 + WS_TABSTOP,13,144,63,10 CONTROL "Delayed explosion ?",IDC_ATTR15,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,13,159,79,10 + BS_AUTOCHECKBOX | WS_TABSTOP,13,154,79,10 CONTROL "Affect only one ?",IDC_ATTR16,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,13,169,69,10 + WS_TABSTOP,13,164,69,10 EDITTEXT IDC_ATTR,13,16,55,14,ES_AUTOHSCROLL LTEXT "Attributes (16 bits)",IDC_STATIC,13,7,57,8 EDITTEXT IDC_UNKNOWN2,76,16,55,14,ES_AUTOHSCROLL @@ -3698,10 +3698,10 @@ COMBOBOX IDC_ENTRANCE,101,50,147,146,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP LTEXT "Entrance",IDC_STATIC,101,37,30,8 - EDITTEXT IDC_DISTANCE,123,80,40,14,ES_AUTOHSCROLL - LTEXT "Distance scale",IDC_STATIC,123,67,48,8 - EDITTEXT IDC_FLAGS,123,112,40,14,ES_AUTOHSCROLL - LTEXT "Flags (0 will crash)",IDC_STATIC,123,99,58,8 + EDITTEXT IDC_DISTANCE,122,80,40,14,ES_AUTOHSCROLL + LTEXT "Distance scale",IDC_STATIC,122,67,48,8 + EDITTEXT IDC_FLAGS,122,112,40,14,ES_AUTOHSCROLL + LTEXT "Flags (0 will crash)",IDC_STATIC,122,99,58,8 EDITTEXT IDC_U1,7,80,60,14,ES_UPPERCASE | ES_AUTOHSCROLL LTEXT "1. random encounter area",IDC_STATIC,7,67,82,8 PUSHBUTTON "Browse",IDC_BROWSE1,79,80,28,14 @@ -3717,10 +3717,18 @@ EDITTEXT IDC_U5,7,208,60,14,ES_UPPERCASE | ES_AUTOHSCROLL LTEXT "5. random encounter area",IDC_STATIC,7,195,82,8 PUSHBUTTON "Browse",IDC_BROWSE5,79,208,28,14 - EDITTEXT IDC_CHANCE,123,144,40,14,ES_AUTOHSCROLL - LTEXT "Chance of encounter",IDC_STATIC,123,131,68,8 + EDITTEXT IDC_CHANCE,183,80,40,14,ES_AUTOHSCROLL + LTEXT "Chance of encounter",IDC_STATIC,183,67,68,8 PUSHBUTTON "Add link",IDC_ADD,201,168,50,14 PUSHBUTTON "Remove link",IDC_REMOVE,201,189,50,14 + CONTROL "North",IDC_FLAG1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 122,136,33,10 + CONTROL "East",IDC_FLAG2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 122,153,30,10 + CONTROL "South",IDC_FLAG3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 122,170,35,10 + CONTROL "West",IDC_FLAG4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 122,187,33,10 END IDD_CREATUREITEMS DIALOG DISCARDABLE 0, 0, 400, 199 @@ -4765,13 +4773,18 @@ FONT 8, "MS Sans Serif" BEGIN CONTROL "Height map",IDC_HEIGHTMAP,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,400,15,54,10 - CONTROL "Light map",IDC_LIGHTMAP,"Button",BS_AUTORADIOBUTTON,400, + WS_GROUP | WS_TABSTOP,361,15,54,10 + CONTROL "Light map",IDC_LIGHTMAP,"Button",BS_AUTORADIOBUTTON,361, 26,54,10 CONTROL "Night light map",IDC_NIGHTMAP,"Button", - BS_AUTORADIOBUTTON,400,37,63,10 + BS_AUTORADIOBUTTON,361,37,63,10 CONTROL "Search map",IDC_SEARCHMAP,"Button",BS_AUTORADIOBUTTON, - 400,48,54,10 + 361,48,54,10 + CONTROL "8 bits",IDC_HEIGHTMAP2,"Button",BS_AUTORADIOBUTTON,421, + 15,33,10 + EDITTEXT IDC_WIDTH,400,77,20,14,ES_AUTOHSCROLL | ES_READONLY | + WS_GROUP + EDITTEXT IDC_HEIGHT,434,77,20,14,ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "Set to",IDC_SET,355,96,35,14,WS_GROUP COMBOBOX IDC_VALUE,394,96,76,112,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP @@ -4781,10 +4794,8 @@ PUSHBUTTON "Edit palette",IDC_PALETTE,421,146,52,14 PUSHBUTTON "Edit map",IDC_EDIT,355,172,52,14 PUSHBUTTON "Undo floodfill",IDC_UNDO,421,172,52,14 - GROUPBOX "Choose map type",IDC_STATIC,390,1,80,61 + GROUPBOX "Choose map type",IDC_STATIC,356,1,114,61 CONTROL "",IDC_MAP,"Static",SS_BITMAP | SS_NOTIFY,7,1,15,13 - EDITTEXT IDC_HEIGHT,434,77,20,14,ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_WIDTH,400,77,20,14,ES_AUTOHSCROLL | ES_READONLY LTEXT "Map dimensions",IDC_STATIC,400,64,52,8 LTEXT "x",IDC_STATIC,426,80,8,8 END @@ -5367,6 +5378,8 @@ WS_TABSTOP,219,93,57,10 CONTROL "Random movement",IDC_FLAG22,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,219,107,77,10 + CONTROL "Random cycle",IDC_FLAG23,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,219,121,61,10 END IDD_PROJAREAGEMRB DIALOG DISCARDABLE 0, 0, 252, 219 @@ -5391,8 +5404,8 @@ BS_AUTOCHECKBOX | WS_TABSTOP,9,107,97,10 CONTROL "Use recoil field for spread",IDC_FLAG7,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,9,121,95,10 - CONTROL "Reserved",IDC_FLAG8,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,9,135,47,10 + CONTROL "Double child projectiles",IDC_FLAG8,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,9,135,89,10 EDITTEXT IDC_FLAGS,9,19,48,14,ES_AUTOHSCROLL EDITTEXT IDC_SOUND1,122,19,48,14,ES_AUTOHSCROLL EDITTEXT IDC_BAM1,7,162,48,14,ES_AUTOHSCROLL @@ -5405,6 +5418,8 @@ PUSHBUTTON "Browse",IDC_BROWSE2,65,161,50,14 PUSHBUTTON "Browse",IDC_BROWSE3,177,162,50,14 PUSHBUTTON "Play",IDC_PLAY1,212,19,28,14 + CONTROL "Apply spell on caster if failed",IDC_FLAG9,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,125,37,105,10 END @@ -6296,8 +6311,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 7,1,0,4 - PRODUCTVERSION 7,1,0,4 + FILEVERSION 7,1,0,5 + PRODUCTVERSION 7,1,0,5 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -6315,14 +6330,14 @@ VALUE "Comments", "forums.gibberlings3.net\0" VALUE "CompanyName", "GemRB Project (gemrb.sourceforge.net)\0" VALUE "FileDescription", "DragonLance Total Conversion Editor Pro\0" - VALUE "FileVersion", "7, 1, 0, 4\0" + VALUE "FileVersion", "7, 1, 0, 5\0" VALUE "InternalName", "dltcep\0" VALUE "LegalCopyright", "Copyright (C) 2002-2009 Avenger\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "chitem.EXE\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "DLTC Editor Pro 7.1d\0" - VALUE "ProductVersion", "7, 1, 0, 4\0" + VALUE "ProductName", "DLTC Editor Pro 7.1e\0" + VALUE "ProductVersion", "7, 1, 0, 5\0" VALUE "SpecialBuild", "\0" END END Modified: chitem/trunk/chitemDlg.cpp =================================================================== --- chitem/trunk/chitemDlg.cpp 2009-07-04 15:15:13 UTC (rev 6698) +++ chitem/trunk/chitemDlg.cpp 2009-07-04 18:15:05 UTC (rev 6699) @@ -3,7 +3,7 @@ #include "stdafx.h" -#define PRG_VERSION "7.1d" +#define PRG_VERSION "7.1e" #include <fcntl.h> #include <direct.h> Modified: chitem/trunk/resource.h =================================================================== --- chitem/trunk/resource.h 2009-07-04 15:15:13 UTC (rev 6698) +++ chitem/trunk/resource.h 2009-07-04 18:15:05 UTC (rev 6699) @@ -501,6 +501,7 @@ #define IDC_FLAG21 1174 #define IDC_FLAG22 1175 #define IDC_CONVREF 1176 +#define IDC_FLAG23 1176 #define IDC_DURATIONLABEL 1177 #define IDC_THAC0 1178 #define IDC_ROLL 1179 @@ -1423,6 +1424,7 @@ #define IDC_SEARCHMAP 2097 #define IDC_HEIGHTMAP 2098 #define IDC_NOID 2099 +#define IDC_HEIGHTMAP2 2099 #define IDC_FRAME2 2100 #define IDC_SET 2101 #define IDC_FIND 2102 @@ -1868,7 +1870,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 233 #define _APS_NEXT_COMMAND_VALUE 33049 -#define _APS_NEXT_CONTROL_VALUE 2351 +#define _APS_NEXT_CONTROL_VALUE 2352 #define _APS_NEXT_SYMED_VALUE 120 #endif #endif Modified: chitem/trunk/seekers.cpp =================================================================== --- chitem/trunk/seekers.cpp 2009-07-04 15:15:13 UTC (rev 6698) +++ chitem/trunk/seekers.cpp 2009-07-04 18:15:05 UTC (rev 6699) @@ -3135,6 +3135,11 @@ tmpstr=get_projectile_id(tmpdata.projectile,0); log("Found projectile %d-%s",tmpdata.projectile,tmpstr); } + // debug + if(the_projectile.header.type==3 && the_projectile.extension.expgr2!=0xff) { + log("Projectile with areapro.2da index!"); + } + // return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-07-09 18:07:28
|
Revision: 6728 http://gemrb.svn.sourceforge.net/gemrb/?rev=6728&view=rev Author: avenger_teambg Date: 2009-07-09 18:07:20 +0000 (Thu, 09 Jul 2009) Log Message: ----------- dltcep updates Modified Paths: -------------- chitem/trunk/AreaEdit.cpp chitem/trunk/Chitem.cpp chitem/trunk/Chitem.h chitem/trunk/ProjEdit.cpp chitem/trunk/ProjEdit.h chitem/trunk/ProjGemRB.cpp chitem/trunk/ProjGemRB.h chitem/trunk/Structs.h chitem/trunk/chitem.clw chitem/trunk/chitem.rc chitem/trunk/creature.cpp chitem/trunk/resource.h chitem/trunk/tbg.cpp chitem/trunk/tbg.h Modified: chitem/trunk/AreaEdit.cpp =================================================================== --- chitem/trunk/AreaEdit.cpp 2009-07-09 18:05:22 UTC (rev 6727) +++ chitem/trunk/AreaEdit.cpp 2009-07-09 18:07:20 UTC (rev 6728) @@ -310,12 +310,12 @@ void CAreaEdit::OnFileTbg() { - ExportTBG(this, REF_ARE, 0); + ExportTBG(this, REF_ARE, 0); } void CAreaEdit::OnFileTp2() { - ExportTBG(this, REF_ARE, 1); + ExportTBG(this, REF_ARE, 1); } void CAreaEdit::OnCheck() Modified: chitem/trunk/Chitem.cpp =================================================================== --- chitem/trunk/Chitem.cpp 2009-07-09 18:05:22 UTC (rev 6727) +++ chitem/trunk/Chitem.cpp 2009-07-09 18:07:20 UTC (rev 6728) @@ -52,8 +52,8 @@ char tbgext[NUM_OBJTYPE+1]={ 0,'r',0,'a',0,'b',0,'h','c','d',//10 - 'e','n',0,0,'-',0,0,0,0,0,'s', //21 - 'p','t',0,0,0,0,0,0,'w', //30 + 'e','n',0,0,'-',0,0,0,0,'m', //20 + 's','p','t',0,0,0,0,0,0,'w', //30 }; int idstrings[NUM_OBJTYPE+1]={IDS_UNKNOWN,IDS_2DA,IDS_MUSIC,IDS_AREA, //4 Modified: chitem/trunk/Chitem.h =================================================================== --- chitem/trunk/Chitem.h 2009-07-09 18:05:22 UTC (rev 6727) +++ chitem/trunk/Chitem.h 2009-07-09 18:07:20 UTC (rev 6728) @@ -553,17 +553,19 @@ #define PROJ_TEXT 0x100000 //display text when the projectile is created #define PROJ_WANDERING 0x200000 //the projectile moves randomly #define PROJ_CYCLE 0x400000 //the projectile will have a random cycle +#define PROJ_RGB 0x800000 //the target will have a single color pulse effect //extended area flags for gemrb -#define APF_TINT 1 -#define APF_FILL 2 -#define APF_SCATTER 4 -#define APF_VVCPAL 8 -#define APF_SPREAD 16 -#define APF_PALETTE 32 -#define APF_BOTH 64 -#define APF_MORE 128 -#define APF_FAILSPELL 256 +#define APF_TINT 1 //use tint for spread animation +#define APF_FILL 2 //fill entire area +#define APF_SCATTER 4 //start scattered +#define APF_VVCPAL 8 //use palette for central animation +#define APF_SPREAD 16 //refill emptied slots +#define APF_PALETTE 32 //use palette gradient for spread animation +#define APF_BOTH 64 //halve projectile count and draw both animations +#define APF_MORE 128 //double child projectile count +#define APF_FAILSPELL 256 //apply spell on caster if no one was hit +#define APF_MULTIPLE 512 //shoot multiple single projectiles (based on cone width) #define TRANSPARENT_GREEN 0x00ff00 Modified: chitem/trunk/ProjEdit.cpp =================================================================== --- chitem/trunk/ProjEdit.cpp 2009-07-09 18:05:22 UTC (rev 6727) +++ chitem/trunk/ProjEdit.cpp 2009-07-09 18:07:20 UTC (rev 6728) @@ -10,6 +10,7 @@ #include "ProjEdit.h" #include "ProjgemRB.h" #include "ColorPicker.h" +#include "tbg.h" #include "MyFileDialog.h" #ifdef _DEBUG @@ -257,6 +258,8 @@ ON_BN_CLICKED(IDC_BROWSE7, OnBrowse7) ON_BN_CLICKED(IDC_BROWSE8, OnBrowse8) ON_BN_CLICKED(IDC_BROWSE13, OnBrowse9) + ON_BN_CLICKED(IDC_FLAG4, OnFlag4) + ON_COMMAND(ID_FILE_TBG, OnFileTbg) ON_CBN_KILLFOCUS(IDC_TYPE, DefaultKillfocus) ON_EN_KILLFOCUS(IDC_SPEED, DefaultKillfocus) ON_EN_KILLFOCUS(IDC_FLAGS, DefaultKillfocus) @@ -298,7 +301,7 @@ ON_COMMAND(ID_FILE_LOADEXTERNALSCRIPT, OnLoadex) ON_COMMAND(ID_FILE_SAVEAS, OnSaveas) ON_COMMAND(ID_CHECK, OnCheck) - ON_BN_CLICKED(IDC_FLAG4, OnFlag4) + ON_COMMAND(ID_FILE_TP2, OnFileTp2) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -1373,3 +1376,13 @@ return CDialog::PreTranslateMessage(pMsg); } + +void CProjEdit::OnFileTbg() +{ + ExportTBG(this, REF_PRO, 0); +} + +void CProjEdit::OnFileTp2() +{ + ExportTBG(this, REF_PRO, 1); +} Modified: chitem/trunk/ProjEdit.h =================================================================== --- chitem/trunk/ProjEdit.h 2009-07-09 18:05:22 UTC (rev 6727) +++ chitem/trunk/ProjEdit.h 2009-07-09 18:07:20 UTC (rev 6728) @@ -113,6 +113,8 @@ afx_msg void OnBrowse9(); virtual void OnCancel(); afx_msg void OnFlag4(); + afx_msg void OnFileTbg(); + afx_msg void OnFileTp2(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: chitem/trunk/ProjGemRB.cpp =================================================================== --- chitem/trunk/ProjGemRB.cpp 2009-07-09 18:05:22 UTC (rev 6727) +++ chitem/trunk/ProjGemRB.cpp 2009-07-09 18:07:20 UTC (rev 6728) @@ -50,9 +50,15 @@ j<<=1; } } - tmpstr.Format("%d", the_projectile.header.text); + tmpstr.Format("%d", the_projectile.header.text); DDX_Text(pDX, IDC_STRREF, tmpstr); the_projectile.header.text=strtonum(tmpstr); + + tmpstr.Format("0x%08x", the_projectile.header.rgb); + DDX_Text(pDX, IDC_RGB, tmpstr); + the_projectile.header.rgb=strtonum(tmpstr); + DDX_Text(pDX, IDC_SPEED, the_projectile.header.pulsespeed); + DDX_Text(pDX, IDC_SCREEN, the_projectile.header.shake); } @@ -76,14 +82,19 @@ ON_BN_CLICKED(IDC_FLAG16, OnFlag16) ON_BN_CLICKED(IDC_FLAG17, OnFlag17) ON_BN_CLICKED(IDC_FLAG18, OnFlag18) - ON_EN_KILLFOCUS(IDC_FLAGS, OnKillfocus) ON_BN_CLICKED(IDC_FLAG19, OnFlag19) - ON_EN_KILLFOCUS(IDC_STRING, OnKillfocusString) ON_BN_CLICKED(IDC_FLAG20, OnFlag20) ON_BN_CLICKED(IDC_FLAG21, OnFlag21) ON_BN_CLICKED(IDC_FLAG22, OnFlag22) + ON_BN_CLICKED(IDC_FLAG23, OnFlag23) + ON_BN_CLICKED(IDC_FLAG24, OnFlag24) + ON_BN_CLICKED(IDC_COLOR, OnColor) ON_EN_KILLFOCUS(IDC_STRREF, OnKillfocus) - ON_BN_CLICKED(IDC_FLAG23, OnFlag23) + ON_EN_KILLFOCUS(IDC_RGB, OnKillfocus) + ON_EN_KILLFOCUS(IDC_SPEED, OnKillfocus) + ON_EN_KILLFOCUS(IDC_SCREEN, OnKillfocus) + ON_EN_KILLFOCUS(IDC_FLAGS, OnKillfocus) + ON_EN_KILLFOCUS(IDC_STRING, OnKillfocusString) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -229,6 +240,12 @@ UpdateData(UD_DISPLAY); } +void CProjGemRB::OnFlag24() +{ + the_projectile.header.extflags^=PROJ_RGB; + UpdateData(UD_DISPLAY); +} + void CProjGemRB::RefreshStrings() { m_text=resolve_tlk_text(the_projectile.header.text); @@ -261,6 +278,26 @@ UpdateData(UD_DISPLAY); } +void CProjGemRB::OnColor() +{ + int color; + CColorDialog dlg; + COLORREF predef[16]; + + for(int i=0;i<16;i++) + { + predef[i]=the_projectile.header.rgb; + } + dlg.m_cc.lpTemplateName="Pick a colour for the RGB effect"; + dlg.m_cc.lpCustColors=predef; + if(dlg.DoModal()==IDOK) + { + color=dlg.GetColor(); + the_projectile.header.rgb=color; + } + UpdateData(UD_DISPLAY); +} + BOOL CProjGemRB::OnInitDialog() { CDialog::OnInitDialog(); @@ -334,15 +371,16 @@ ON_BN_CLICKED(IDC_FLAG6, OnFlag6) ON_BN_CLICKED(IDC_FLAG7, OnFlag7) ON_BN_CLICKED(IDC_FLAG8, OnFlag8) - ON_EN_KILLFOCUS(IDC_FLAGS, OnKillfocus) + ON_BN_CLICKED(IDC_FLAG9, OnFlag9) + ON_BN_CLICKED(IDC_FLAG10, OnFlag10) ON_BN_CLICKED(IDC_BROWSE1, OnBrowse1) ON_BN_CLICKED(IDC_BROWSE2, OnBrowse2) ON_BN_CLICKED(IDC_BROWSE3, OnBrowse3) ON_BN_CLICKED(IDC_PLAY1, OnPlay1) + ON_EN_KILLFOCUS(IDC_FLAGS, OnKillfocus) ON_EN_KILLFOCUS(IDC_SOUND1, OnKillfocus) ON_EN_KILLFOCUS(IDC_BAM1, OnKillfocus) ON_EN_KILLFOCUS(IDC_BAM2, OnKillfocus) - ON_BN_CLICKED(IDC_FLAG9, OnFlag9) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -403,6 +441,12 @@ UpdateData(UD_DISPLAY); } +void CProjAreaGemRB::OnFlag10() +{ + the_projectile.extension.gemrbflags^=APF_MULTIPLE; + UpdateData(UD_DISPLAY); +} + void CProjAreaGemRB::OnKillfocus() { UpdateData(UD_RETRIEVE); Modified: chitem/trunk/ProjGemRB.h =================================================================== --- chitem/trunk/ProjGemRB.h 2009-07-09 18:05:22 UTC (rev 6727) +++ chitem/trunk/ProjGemRB.h 2009-07-09 18:07:20 UTC (rev 6728) @@ -62,6 +62,8 @@ afx_msg void OnFlag21(); afx_msg void OnFlag22(); afx_msg void OnFlag23(); + afx_msg void OnColor(); + afx_msg void OnFlag24(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; @@ -108,6 +110,7 @@ afx_msg void OnBrowse3(); afx_msg void OnPlay1(); afx_msg void OnFlag9(); + afx_msg void OnFlag10(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: chitem/trunk/Structs.h =================================================================== --- chitem/trunk/Structs.h 2009-07-09 18:05:22 UTC (rev 6727) +++ chitem/trunk/Structs.h 2009-07-09 18:07:20 UTC (rev 6728) @@ -538,7 +538,10 @@ long spkcolour; //cannot be 0 if there are sparks (must be 1-12) long extflags; //0x2c //flags used by gemrb long text; //0x30 //text strref - char unknown34[204]; //unknown till next 256 block + long rgb; //0x34 //rgb single pulse color + short pulsespeed; //0x36 //pulse speed + short shake; //0x38 //screen shake + char unknown3c[196]; //unknown till next 256 block unsigned long attr; char bam1[8]; char bam2[8]; Modified: chitem/trunk/chitem.clw =================================================================== --- chitem/trunk/chitem.clw 2009-07-09 18:05:22 UTC (rev 6727) +++ chitem/trunk/chitem.clw 2009-07-09 18:07:20 UTC (rev 6728) @@ -2,7 +2,7 @@ [General Info] Version=1 -LastClass=CMapLink +LastClass=CProjGemRB LastTemplate=CDialog NewFileInclude1=#include "stdafx.h" NewFileInclude2=#include "chitem.h" @@ -232,142 +232,142 @@ Resource123=IDD_GAMEGENERAL Class98=IcewindCre Resource124=IDR_SHORTCUT -Resource125=IDD_VVCEDIT (English (U.S.)) -Resource126=IDR_GAME (English (U.S.)) -Resource127=IDD_MOSEDIT (English (U.S.)) -Resource128=IDD_AREAEDIT (English (U.S.)) -Resource129=IDR_TREEMENU (English (U.S.)) -Resource130=IDD_EXTRACT2 (English (U.S.)) -Resource131=IDD_MAPLINK (English (U.S.)) -Resource132=IDD_CREATURERES (English (U.S.)) -Resource133=IDD_CHECK (English (U.S.)) -Resource134=IDR_MENUBAR (English (U.S.)) -Resource135=IDD_CREATUREEFF (English (U.S.)) -Resource136=IDD_PROJAREAGEMRB (English (U.S.)) -Resource137=IDD_MAPEDIT (English (U.S.)) -Resource138=IDD_EXTRACT (English (U.S.)) -Resource139=IDR_CREATURE (English (U.S.)) -Resource140=IDD_SPELLEFFECT (English (U.S.)) -Resource141=IDD_CHITEM_DIALOG (English (U.S.)) -Resource142=IDD_CREATURELEVELS (English (U.S.)) -Resource143=IDR_EFFECT (English (U.S.)) -Resource144=IDD_CREATUREITEMS (English (U.S.)) -Resource145=IDD_GAMEEDIT (English (U.S.)) -Resource146=IDD_AREASPAWN (English (U.S.)) -Resource147=IDD_AREADOOR (English (U.S.)) -Resource148=IDD_AREASONGS (English (U.S.)) -Resource149=IDD_ITEMEXTRA (English (U.S.)) -Resource150=IDD_PANICBUTTON (English (U.S.)) -Resource151=IDR_WORLDMAP (English (U.S.)) -Resource152=IDD_IDSEDIT (English (U.S.)) -Resource153=IDD_AREAVARIABLE (English (U.S.)) -Resource154=IDD_WEDPOLY (English (U.S.)) -Resource155=IDR_TILE (English (U.S.)) -Resource156=IDD_SHOWLOG (English (U.S.)) -Resource157=IDD_PROGRESS (English (U.S.)) -Resource158=IDD_AREAACTOR (English (U.S.)) -Resource159=IDD_STRREFDLG (English (U.S.)) -Resource160=IDD_PROJGEMRB (English (U.S.)) -Resource161=IDD_ITEMEFFECT (English (U.S.)) -Resource162=IDR_CHITIN (English (U.S.)) -Resource163=IDD_CREATUREEDIT (English (U.S.)) -Resource164=IDD_STOREGENERAL (English (U.S.)) -Resource165=IDD_SPELLEDIT (English (U.S.)) -Resource166=IDD_SPELLEXTRA (English (U.S.)) -Resource167=IDD_ITEMUSE (English (U.S.)) -Resource168=IDD_ITEMGENERAL (English (U.S.)) -Resource169=IDD_IMAGEVIEW (English (U.S.)) -Resource170=IDR_STORE (English (U.S.)) -Resource171=IDD_EFFEDIT (English (U.S.)) -Resource172=IDD_2DAEDIT (English (U.S.)) -Resource173=IDD_PALETTE (English (U.S.)) -Resource174=IDD_MASSCLEAR (English (U.S.)) -Resource175=IDD_AREAENTRANCE (English (U.S.)) -Resource176=IDD_SCRIPTEDIT (English (U.S.)) -Resource177=IDD_ITEMICONS (English (U.S.)) -Resource178=IDD_SCHEDULE (English (U.S.)) -Resource179=IDD_ITEMEQUIP (English (U.S.)) -Resource180=IDD_IAPDIALOG (English (U.S.)) -Resource181=IDR_IDS (English (U.S.)) -Resource182=IDR_VVC (English (U.S.)) -Resource183=IDD_CREATUREUNKNOWN (English (U.S.)) -Resource184=IDD_CREATUREIWD (English (U.S.)) -Resource185=IDD_WEIDU (English (U.S.)) -Resource186=IDR_2DA (English (U.S.)) -Resource187=IDD_AREAANIM (English (U.S.)) -Resource188=IDD_AREATRIGGER (English (U.S.)) -Resource189=IDR_SCRIPT (English (U.S.)) -Resource190=IDD_STOREEXTRA (English (U.S.)) -Resource191=IDD_TEXTVIEW (English (U.S.)) -Resource192=IDR_TLKMENU (English (U.S.)) -Resource193=IDD_COMPAT (English (U.S.)) -Resource194=IDD_ITEMPICKER (English (U.S.)) -Resource195=IDD_CREATUREICONS (English (U.S.)) -Resource196=IDD_CREATUREOVR (English (U.S.)) -Resource197=IDD_TISDIALOG (English (U.S.)) -Resource198=IDD_ADDLINK (English (U.S.)) -Resource199=IDD_BAMEDIT (English (U.S.)) -Resource200=IDD_SPELLEQUIP (English (U.S.)) -Resource201=IDD_AREATRIGGERSTRINGS (English (U.S.)) -Resource202=IDR_MUSIC (English (U.S.)) -Resource203=IDD_WEDEDIT (English (U.S.)) -Resource204=IDD_FINDITEM (English (U.S.)) -Resource205=IDD_PROJEXT (English (U.S.)) -Resource206=IDD_AREAMAP (English (U.S.)) -Resource207=IDD_CREATUREPST (English (U.S.)) -Resource208=IDD_AREAAMBIENT (English (U.S.)) -Resource209=IDD_CREATUREIWD2 (English (U.S.)) -Resource210=IDD_KEYEDIT (English (U.S.)) -Resource211=IDR_ITEM (English (U.S.)) -Resource212=IDD_POLYGON (English (U.S.)) -Resource213=IDD_SPELLGENERAL (English (U.S.)) -Resource214=IDD_ABOUTBOX (English (U.S.)) -Resource215=IDR_WEDMENU (English (U.S.)) -Resource216=IDR_BAMMENU (English (U.S.)) -Resource217=IDD_SEARCHNODE (English (U.S.)) -Resource218=IDD_AREAINT (English (U.S.)) -Resource219=IDD_ITEMDESC (English (U.S.)) -Resource220=IDR_SPELL (English (U.S.)) -Resource221=IDD_CREATUREGENERAL (English (U.S.)) -Resource222=IDD_SPELLTOOL (English (U.S.)) -Resource223=IDD_EDIT (English (U.S.)) -Resource224=IDD_ITEMEDIT (English (U.S.)) -Resource225=IDD_SAVHANDLE (English (U.S.)) -Resource226=IDD_SRCEDIT (English (U.S.)) -Resource227=IDD_STOREDRINKS (English (U.S.)) -Resource228=IDD_STOREITEMS (English (U.S.)) -Resource229=IDD_STOREEDIT (English (U.S.)) -Resource230=IDD_STORERENTAL (English (U.S.)) -Resource231=IDD_AREACONTAINER (English (U.S.)) -Resource232=IDD_AREAGENERAL (English (U.S.)) -Resource233=IDR_SRC (English (U.S.)) -Resource234=IDD_WEDTILE (English (U.S.)) -Resource235=IDD_GAMEGENERAL (English (U.S.)) -Resource236=IDD_PROJEDIT (English (U.S.)) -Resource237=IDD_CREATURESKILLS (English (U.S.)) -Resource238=IDD_MUSEDIT (English (U.S.)) -Resource239=IDR_AREA (English (U.S.)) -Resource240=IDD_GAMESTATS (English (U.S.)) -Resource241=IDD_SPELLDESC (English (U.S.)) -Resource242=IDD_GAMEPCINFO (English (U.S.)) -Resource243=IDD_COLORPICKER (English (U.S.)) -Resource244=IDD_DIALOGEDIT (English (U.S.)) -Resource245=IDR_PROJECT (English (U.S.)) +Resource125=IDD_SEARCHNODE (English (U.S.)) +Resource126=IDD_AREACONTAINER (English (U.S.)) +Resource127=IDD_WEDTILE (English (U.S.)) +Resource128=IDD_MASSCLEAR (English (U.S.)) +Resource129=IDD_COMPAT (English (U.S.)) +Resource130=IDD_WEDEDIT (English (U.S.)) +Resource131=IDR_ITEM (English (U.S.)) +Resource132=IDD_IDSEDIT (English (U.S.)) +Resource133=IDD_CREATURERES (English (U.S.)) +Resource134=IDD_VARIABLES (English (U.S.)) +Resource135=IDD_AREATRIGGERSTRINGS (English (U.S.)) +Resource136=IDR_TILE (English (U.S.)) +Resource137=IDR_TREEMENU (English (U.S.)) +Resource138=IDD_SPELLDESC (English (U.S.)) +Resource139=IDD_MAPEDIT (English (U.S.)) +Resource140=IDD_PROJGEMRB (English (U.S.)) +Resource141=IDD_CREATURESKILLS (English (U.S.)) +Resource142=IDD_STOREEDIT (English (U.S.)) +Resource143=IDD_CREATUREUNKNOWN (English (U.S.)) +Resource144=IDR_SPELL (English (U.S.)) +Resource145=IDR_BAMMENU (English (U.S.)) +Resource146=IDD_SRCEDIT (English (U.S.)) +Resource147=IDD_CREATUREOVR (English (U.S.)) +Resource148=IDD_GAMEPCINFO (English (U.S.)) +Resource149=IDD_CREATUREPST (English (U.S.)) +Resource150=IDR_IDS (English (U.S.)) +Resource151=IDD_ITEMUSE (English (U.S.)) +Resource152=IDD_ITEMGENERAL (English (U.S.)) +Resource153=IDD_SAVHANDLE (English (U.S.)) +Resource154=IDR_SRC (English (U.S.)) +Resource155=IDD_MAPLINK (English (U.S.)) +Resource156=IDD_VVCEDIT (English (U.S.)) +Resource157=IDD_STRREFDLG (English (U.S.)) +Resource158=IDD_TISDIALOG (English (U.S.)) +Resource159=IDD_AREASONGS (English (U.S.)) +Resource160=IDD_AREASPAWN (English (U.S.)) +Resource161=IDD_SPELLEXTRA (English (U.S.)) +Resource162=IDD_AREATRIGGER (English (U.S.)) +Resource163=IDR_WORLDMAP (English (U.S.)) +Resource164=IDD_GAMEEDIT (English (U.S.)) +Resource165=IDD_PROJAREAGEMRB (English (U.S.)) +Resource166=IDD_CREATURELEVELS (English (U.S.)) +Resource167=IDD_CREATUREIWD2 (English (U.S.)) +Resource168=IDD_AREAAMBIENT (English (U.S.)) +Resource169=IDR_WEDMENU (English (U.S.)) +Resource170=IDD_BAMEDIT (English (U.S.)) +Resource171=IDD_AREAACTOR (English (U.S.)) +Resource172=IDR_EFFECT (English (U.S.)) +Resource173=IDD_CREATUREGENERAL (English (U.S.)) +Resource174=IDD_STORERENTAL (English (U.S.)) +Resource175=IDD_SPELLTOOL (English (U.S.)) +Resource176=IDR_SCRIPT (English (U.S.)) +Resource177=IDD_ITEMDESC (English (U.S.)) +Resource178=IDD_KEYEDIT (English (U.S.)) +Resource179=IDD_SPELLEQUIP (English (U.S.)) +Resource180=IDD_AREAMAP (English (U.S.)) +Resource181=IDR_GAME (English (U.S.)) +Resource182=IDD_SPELLEFFECT (English (U.S.)) +Resource183=IDR_2DA (English (U.S.)) +Resource184=IDD_ITEMPICKER (English (U.S.)) +Resource185=IDD_CREATUREEDIT (English (U.S.)) +Resource186=IDD_EXTRACT2 (English (U.S.)) +Resource187=IDR_TLKMENU (English (U.S.)) +Resource188=IDD_CHUIEDIT (English (U.S.)) +Resource189=IDD_DIALOGEDIT (English (U.S.)) +Resource190=IDD_EDIT (English (U.S.)) +Resource191=IDD_ITEMEDIT (English (U.S.)) +Resource192=IDD_WEDPOLY (English (U.S.)) +Resource193=IDD_AREAENTRANCE (English (U.S.)) +Resource194=IDD_AREAVARIABLE (English (U.S.)) +Resource195=IDD_POLYGON (English (U.S.)) +Resource196=IDD_GAMEGENERAL (English (U.S.)) +Resource197=IDD_AREAPROJ (English (U.S.)) +Resource198=IDD_CREATUREEFF (English (U.S.)) +Resource199=IDD_IAPDIALOG (English (U.S.)) +Resource200=IDD_CREATURESTRINGS (English (U.S.)) +Resource201=IDD_EXTRACT (English (U.S.)) +Resource202=IDD_AREAEDIT (English (U.S.)) +Resource203=IDR_CHUI (English (U.S.)) +Resource204=IDD_PALETTE (English (U.S.)) +Resource205=IDR_MENUBAR (English (U.S.)) +Resource206=IDD_CHECK (English (U.S.)) +Resource207=IDR_AREA (English (U.S.)) +Resource208=IDD_CREATUREIWD (English (U.S.)) +Resource209=IDD_PROGRESS (English (U.S.)) +Resource210=IDD_ANIMDIALOG +Resource211=IDD_ITEMEXTRA (English (U.S.)) +Resource212=IDD_FINDITEM (English (U.S.)) +Resource213=IDD_AREAANIM (English (U.S.)) +Resource214=IDD_CREATUREICONS (English (U.S.)) +Resource215=IDD_2DAEDIT (English (U.S.)) +Resource216=IDD_COLORPICKER (English (U.S.)) +Resource217=IDD_MUSEDIT (English (U.S.)) +Resource218=IDD_EFFEDIT (English (U.S.)) +Resource219=IDD_SCRIPTEDIT (English (U.S.)) +Resource220=IDD_ITEMICONS (English (U.S.)) +Resource221=IDD_CREATUREITEMS (English (U.S.)) +Resource222=IDD_IMAGEVIEW (English (U.S.)) +Resource223=IDR_MUSIC (English (U.S.)) +Resource224=IDD_CHITEM_DIALOG (English (U.S.)) +Resource225=IDD_PROJEDIT (English (U.S.)) +Resource226=IDD_SPELLGENERAL (English (U.S.)) +Resource227=IDR_VVC (English (U.S.)) +Resource228=IDD_AREAINT (English (U.S.)) +Resource229=IDD_PROJEXT (English (U.S.)) +Resource230=IDD_MOSEDIT (English (U.S.)) +Resource231=IDD_SHOWLOG (English (U.S.)) +Resource232=IDD_AREADOOR (English (U.S.)) +Resource233=IDD_CFB (English (U.S.)) +Resource234=IDD_WEIDU (English (U.S.)) +Resource235=IDD_ITEMEQUIP (English (U.S.)) +Resource236=IDR_STORE (English (U.S.)) +Resource237=IDD_TEXTVIEW (English (U.S.)) +Resource238=IDD_STOREITEMS (English (U.S.)) +Resource239=IDR_PROJECT (English (U.S.)) +Resource240=IDD_SPELLEDIT (English (U.S.)) +Resource241=IDD_PANICBUTTON (English (U.S.)) +Resource242=IDD_AREAGENERAL (English (U.S.)) +Resource243=IDD_ITEMEFFECT (English (U.S.)) +Resource244=IDR_CHITIN (English (U.S.)) +Resource245=IDR_CREATURE (English (U.S.)) Class99=CAreaTriggerString Class100=CPCInfo -Resource246=IDD_VARIABLES (English (U.S.)) +Resource246=IDD_STOREDRINKS (English (U.S.)) Class101=CCreatureOverlay -Resource247=IDD_CHUIEDIT (English (U.S.)) +Resource247=IDD_ABOUTBOX (English (U.S.)) Class102=IWD2Creature -Resource248=IDD_AREAPROJ (English (U.S.)) +Resource248=IDD_STOREGENERAL (English (U.S.)) Class103=CAnimDialog -Resource249=IDD_ANIMDIALOG +Resource249=IDD_STOREEXTRA (English (U.S.)) Class104=CCreatureLevels -Resource250=IDD_CFB (English (U.S.)) +Resource250=IDD_ADDLINK (English (U.S.)) Class105=CAreaProj -Resource251=IDD_CREATURESTRINGS (English (U.S.)) +Resource251=IDD_GAMESTATS (English (U.S.)) Class106=CProjGemRB -Resource252=IDR_CHUI (English (U.S.)) +Resource252=IDD_SCHEDULE (English (U.S.)) Class107=CProjAreaGemRB Resource253=IDR_SHORTCUT (English (U.S.)) @@ -1777,7 +1777,7 @@ ImplementationFile=PaletteEdit.cpp BaseClass=CDialog Filter=D -LastObject=IDC_FUNCTION +LastObject=IDC_PALETTE VirtualFilter=dWC [DLG:IDD_SPELLGENERAL] @@ -2075,7 +2075,7 @@ HeaderFile=SpellEdit.h ImplementationFile=SpellEdit.cpp BaseClass=CDialog -LastObject=ID_SAVECFB +LastObject=ID_FILE_TP2 Filter=D VirtualFilter=dWC @@ -2216,7 +2216,7 @@ HeaderFile=AreaEdit.h ImplementationFile=AreaEdit.cpp BaseClass=CDialog -LastObject=CAreaEdit +LastObject=ID_FILE_TBG Filter=D VirtualFilter=dWC @@ -2481,7 +2481,7 @@ ImplementationFile=ProjEdit.cpp BaseClass=CDialog Filter=D -LastObject=IDC_FLAG4 +LastObject=ID_FILE_TP2 VirtualFilter=dWC [DLG:IDD_AREAENTRANCE] @@ -9755,7 +9755,7 @@ [MNU:IDR_SPELL (English (U.S.))] Type=1 -Class=? +Class=CSpellEdit Command1=ID_FILE_NEW Command2=ID_FILE_LOAD Command3=ID_FILE_LOADEXTERNALSCRIPT @@ -9921,15 +9921,17 @@ [MNU:IDR_PROJECT (English (U.S.))] Type=1 -Class=? +Class=CProjEdit Command1=ID_FILE_NEW Command2=ID_FILE_LOAD Command3=ID_FILE_LOADEXTERNALSCRIPT Command4=ID_FILE_SAVE Command5=ID_FILE_SAVEAS -Command6=IDCANCEL -Command7=ID_CHECK -CommandCount=7 +Command6=ID_FILE_TBG +Command7=ID_FILE_TP2 +Command8=IDCANCEL +Command9=ID_CHECK +CommandCount=9 [MNU:IDR_2DA (English (U.S.))] Type=1 @@ -10280,7 +10282,7 @@ [DLG:IDD_PROJGEMRB (English (U.S.))] Type=1 Class=CProjGemRB -ControlCount=29 +ControlCount=37 Control1=IDOK,button,1342242816 Control2=IDC_FLAGS,edit,1350631552 Control3=IDC_STATIC,static,1342308352 @@ -10310,6 +10312,14 @@ Control27=IDC_FLAG21,button,1342242819 Control28=IDC_FLAG22,button,1342242819 Control29=IDC_FLAG23,button,1342242819 +Control30=IDC_RGB,edit,1350631552 +Control31=IDC_STATIC,static,1342308352 +Control32=IDC_COLOR,button,1342242816 +Control33=IDC_FLAG24,button,1342242819 +Control34=IDC_SCREEN,edit,1350631552 +Control35=IDC_STATIC,static,1342308352 +Control36=IDC_SPEED,edit,1350631552 +Control37=IDC_STATIC,static,1342308352 [CLS:CProjGemRB] Type=0 @@ -10317,13 +10327,13 @@ ImplementationFile=ProjGemRB.cpp BaseClass=CDialog Filter=D -LastObject=IDC_FLAG9 +LastObject=IDC_SPEED VirtualFilter=dWC [DLG:IDD_PROJAREAGEMRB (English (U.S.))] Type=1 Class=CProjAreaGemRB -ControlCount=24 +ControlCount=25 Control1=IDOK,button,1342242816 Control2=IDC_UNKNOWN26,edit,1350631552 Control3=IDC_STATIC,static,1342308352 @@ -10336,10 +10346,10 @@ Control10=IDC_FLAG7,button,1342242819 Control11=IDC_FLAG8,button,1342242819 Control12=IDC_FLAGS,edit,1350631552 -Control13=IDC_SOUND1,edit,1350631552 -Control14=IDC_BAM1,edit,1350631552 +Control13=IDC_SOUND1,edit,1350631560 +Control14=IDC_BAM1,edit,1350631560 Control15=IDC_STATIC,static,1342308352 -Control16=IDC_BAM2,edit,1350631552 +Control16=IDC_BAM2,edit,1350631560 Control17=IDC_STATIC,static,1342308352 Control18=IDC_STATIC,static,1342308352 Control19=IDC_STATIC,static,1342308352 @@ -10348,6 +10358,7 @@ Control22=IDC_BROWSE3,button,1342242816 Control23=IDC_PLAY1,button,1342242816 Control24=IDC_FLAG9,button,1342242819 +Control25=IDC_FLAG10,button,1342242819 [CLS:CProjAreaGemRB] Type=0 Modified: chitem/trunk/chitem.rc =================================================================== --- chitem/trunk/chitem.rc 2009-07-09 18:05:22 UTC (rev 6727) +++ chitem/trunk/chitem.rc 2009-07-09 18:07:20 UTC (rev 6728) @@ -5380,6 +5380,15 @@ WS_TABSTOP,219,107,77,10 CONTROL "Random cycle",IDC_FLAG23,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,219,121,61,10 + EDITTEXT IDC_RGB,70,19,50,14,ES_AUTOHSCROLL + LTEXT "RGB color on hit",IDC_STATIC,70,7,53,8 + PUSHBUTTON "Pick color",IDC_COLOR,133,19,36,14 + CONTROL "RGB color on hit",IDC_FLAG24,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,219,135,68,10 + EDITTEXT IDC_SCREEN,235,19,40,14,ES_AUTOHSCROLL + LTEXT "Screenshake on hit",IDC_STATIC,235,7,62,8 + EDITTEXT IDC_SPEED,182,19,40,14,ES_AUTOHSCROLL + LTEXT "RGB speed",IDC_STATIC,182,7,38,8 END IDD_PROJAREAGEMRB DIALOG DISCARDABLE 0, 0, 252, 219 @@ -5407,10 +5416,10 @@ CONTROL "Double child projectiles",IDC_FLAG8,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,9,135,89,10 EDITTEXT IDC_FLAGS,9,19,48,14,ES_AUTOHSCROLL - EDITTEXT IDC_SOUND1,122,19,48,14,ES_AUTOHSCROLL - EDITTEXT IDC_BAM1,7,162,48,14,ES_AUTOHSCROLL + EDITTEXT IDC_SOUND1,122,19,48,14,ES_UPPERCASE | ES_AUTOHSCROLL + EDITTEXT IDC_BAM1,7,162,48,14,ES_UPPERCASE | ES_AUTOHSCROLL LTEXT "Area sound",IDC_STATIC,122,7,37,8 - EDITTEXT IDC_BAM2,122,162,48,14,ES_AUTOHSCROLL + EDITTEXT IDC_BAM2,122,162,48,14,ES_UPPERCASE | ES_AUTOHSCROLL LTEXT "Flags",IDC_STATIC,11,7,18,8 LTEXT "Spread animation",IDC_STATIC,7,150,56,8 LTEXT "Recoil animation",IDC_STATIC,122,150,53,8 @@ -5420,6 +5429,8 @@ PUSHBUTTON "Play",IDC_PLAY1,212,19,28,14 CONTROL "Apply spell on caster if failed",IDC_FLAG9,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,125,37,105,10 + CONTROL "Multiple directions (cone)",IDC_FLAG10,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,125,51,94,10 END @@ -6676,7 +6687,7 @@ MENUITEM "&Save spell", ID_FILE_SAVE MENUITEM "Save spell &As ...", ID_FILE_SAVEAS MENUITEM "Export &TBG spell file", ID_FILE_TBG - MENUITEM "Export TP&2 item file", ID_FILE_TP2 + MENUITEM "Export TP&2 spell file", ID_FILE_TP2 MENUITEM SEPARATOR MENUITEM "E&xit", IDCANCEL END @@ -6921,6 +6932,8 @@ MENUITEM "Load &external projectile", ID_FILE_LOADEXTERNALSCRIPT MENUITEM "&Save projectile", ID_FILE_SAVE MENUITEM "Save projectile &As ...", ID_FILE_SAVEAS + MENUITEM "Export &TBG missile file", ID_FILE_TBG + MENUITEM "Export TP&2 missile file", ID_FILE_TP2 MENUITEM SEPARATOR MENUITEM "E&xit", IDCANCEL END Modified: chitem/trunk/creature.cpp =================================================================== --- chitem/trunk/creature.cpp 2009-07-09 18:05:22 UTC (rev 6727) +++ chitem/trunk/creature.cpp 2009-07-09 18:07:20 UTC (rev 6728) @@ -88,13 +88,7 @@ tmpstr=resolve_tlk_text(header.shortname); StoreName(tmpstr,chrheader.name); } -/* -int Ccreature::WriteCharacterToFile(int fhandle, int calculate) -{ - int chrsize = WriteCreatureToFile(NULL,1); -} -*/ int Ccreature::WriteCreatureToFile(int fhandle, int calculate) { int chrsize, esize; Modified: chitem/trunk/resource.h =================================================================== --- chitem/trunk/resource.h 2009-07-09 18:05:22 UTC (rev 6727) +++ chitem/trunk/resource.h 2009-07-09 18:07:20 UTC (rev 6728) @@ -503,6 +503,7 @@ #define IDC_CONVREF 1176 #define IDC_FLAG23 1176 #define IDC_DURATIONLABEL 1177 +#define IDC_FLAG24 1177 #define IDC_THAC0 1178 #define IDC_ROLL 1179 #define IDC_DIE 1180 @@ -1869,8 +1870,8 @@ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 233 -#define _APS_NEXT_COMMAND_VALUE 33049 -#define _APS_NEXT_CONTROL_VALUE 2352 +#define _APS_NEXT_COMMAND_VALUE 33051 +#define _APS_NEXT_CONTROL_VALUE 2354 #define _APS_NEXT_SYMED_VALUE 120 #endif #endif Modified: chitem/trunk/tbg.cpp =================================================================== --- chitem/trunk/tbg.cpp 2009-07-09 18:05:22 UTC (rev 6727) +++ chitem/trunk/tbg.cpp 2009-07-09 18:07:20 UTC (rev 6728) @@ -1072,6 +1072,35 @@ return 0; } +int Ctbg::collect_prorefs() +{ + int count, pos; + + if(!(the_projectile.header.extflags&PROJ_TEXT)) + { + return 0; + } + + count=1; + pos=0; + tlkentries=new tbg_tlk_reference[count]; + if(!tlkentries) return -3; + tlkentrycount=count; //physical size + strrefs=new unsigned long[count]; + if(!strrefs) + { + delete [] tlkentries; + return -3; + } + strrefcount=count; + + strrefs[0]=calc_offset(the_projectile.header,text); + if(!resolve_tbg_entry(the_projectile.header.text,tlkentries[0])) pos=1; + header.tlkentrycount=pos; //logical size + header.strrefcount=pos; + return 0; +} + //alternative output, strrefs+offsets go to a tp2 file int Ctbg::OutputTP2(CString outfilename) { @@ -1183,6 +1212,10 @@ header.filelength=the_dialog.WriteDialogToFile(0,1); ret=collect_dlgrefs(); break; + case REF_PRO: + header.filelength=the_projectile.WriteProjectileToFile(0,1); + ret=collect_prorefs(); + break; default: ret=-99; } @@ -1274,6 +1307,7 @@ case REF_CHU: the_chui.WriteChuiToFile(fhandle,0); break; case REF_SRC: the_src.WriteStringToFile(fhandle,0); break; case REF_DLG: the_dialog.WriteDialogToFile(fhandle,0); break; + case REF_PRO: the_projectile.WriteProjectileToFile(fhandle,0); break; default: ret=-99; } for(i=0;i<header.tlkentrycount;i++) Modified: chitem/trunk/tbg.h =================================================================== --- chitem/trunk/tbg.h 2009-07-09 18:05:22 UTC (rev 6727) +++ chitem/trunk/tbg.h 2009-07-09 18:07:20 UTC (rev 6728) @@ -84,6 +84,7 @@ int collect_chuirefs(); int collect_srcrefs(); int collect_dlgrefs(); + int collect_prorefs(); int AddToFile(int fhandle, CString filename, CString internalname, int ml); int ImportFile(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-07-31 22:00:57
|
Revision: 6769 http://gemrb.svn.sourceforge.net/gemrb/?rev=6769&view=rev Author: avenger_teambg Date: 2009-07-31 22:00:38 +0000 (Fri, 31 Jul 2009) Log Message: ----------- dltcep update Modified Paths: -------------- chitem/trunk/Chitem.cpp chitem/trunk/ProjEdit.cpp chitem/trunk/Script.cpp chitem/trunk/Structs.h chitem/trunk/TormentCre.cpp chitem/trunk/TormentCre.h chitem/trunk/chitem.clw chitem/trunk/chitem.rc chitem/trunk/chitemDlg.cpp chitem/trunk/resource.h Modified: chitem/trunk/Chitem.cpp =================================================================== --- chitem/trunk/Chitem.cpp 2009-07-31 19:52:41 UTC (rev 6768) +++ chitem/trunk/Chitem.cpp 2009-07-31 22:00:38 UTC (rev 6769) @@ -2098,7 +2098,7 @@ "0x15-Hammer","0x16-Morning Star","0x17-Flail","0x18-Dart","0x19-Axe", "0x1A-Staff","0x1B-Crossbow","0x1C-Hand-to-Hand","0x1D-Spear","0x1E-Polearm", "0x1F-Bolt","0x20-Cloak","0x21-Coin","0x22-Gem","0x23-Wand","0x24-Bag/Eye/Broken armor", -"0x25-Broken shield/Bracelet","0x26-Broken sword/Earring","0x27-Tattoo","0x28-Lens", +"0x25-Broken shield/Bracelet","0x26-Broken sword/Earring/Familiar","0x27-Tattoo","0x28-Lens", "0x29-Buckler/Teeth","0x2A-Candle","0x2B-Child body","0x2C-Club","0x2D-Female body", "0x2E-Key","0x2F-Large shield","0x30-Male body","0x31-Medium shield", "0x32-Notes","0x33-Rod","0x34-Skull","0x35-Small shield", Modified: chitem/trunk/ProjEdit.cpp =================================================================== --- chitem/trunk/ProjEdit.cpp 2009-07-31 19:52:41 UTC (rev 6768) +++ chitem/trunk/ProjEdit.cpp 2009-07-31 22:00:38 UTC (rev 6769) @@ -260,6 +260,7 @@ ON_BN_CLICKED(IDC_BROWSE13, OnBrowse9) ON_BN_CLICKED(IDC_FLAG4, OnFlag4) ON_COMMAND(ID_FILE_TBG, OnFileTbg) + ON_COMMAND(ID_FILE_TP2, OnFileTp2) ON_CBN_KILLFOCUS(IDC_TYPE, DefaultKillfocus) ON_EN_KILLFOCUS(IDC_SPEED, DefaultKillfocus) ON_EN_KILLFOCUS(IDC_FLAGS, DefaultKillfocus) @@ -301,7 +302,8 @@ ON_COMMAND(ID_FILE_LOADEXTERNALSCRIPT, OnLoadex) ON_COMMAND(ID_FILE_SAVEAS, OnSaveas) ON_COMMAND(ID_CHECK, OnCheck) - ON_COMMAND(ID_FILE_TP2, OnFileTp2) + ON_EN_KILLFOCUS(IDC_SEQ1, DefaultKillfocus) + ON_EN_KILLFOCUS(IDC_SEQ2, DefaultKillfocus) //}}AFX_MSG_MAP END_MESSAGE_MAP() Modified: chitem/trunk/Script.cpp =================================================================== --- chitem/trunk/Script.cpp 2009-07-31 19:52:41 UTC (rev 6768) +++ chitem/trunk/Script.cpp 2009-07-31 22:00:38 UTC (rev 6769) @@ -920,6 +920,21 @@ } } } + + if((handle_trigger(trigger->opcode)&0xff)==CHECK_SPL2) + { + CString tmpstr = format_spell_id(trigger->bytes[0]); + memcpy(finddata.resource,tmpstr,8); + finddata.param1=bcnt; + if(searchdata.resource[0]) + { + if(!strnicmp(finddata.resource,searchdata.resource,8)) + { + return 1; + } + } + } + break; case FLG_MTYPE: item=trigger->opcode&0x3fff; @@ -989,6 +1004,20 @@ } } } + + if((handle_action(action->opcode)&0xff)==CHECK_SPL2) + { + CString tmpstr = format_spell_id(action->bytes[0]); + memcpy(finddata.resource,tmpstr,8); + finddata.param1=bcnt; + if(searchdata.resource[0]) + { + if(!strnicmp(finddata.resource,searchdata.resource,8)) + { + return 1; + } + } + } break; case FLG_MFEAT: item=action->opcode; Modified: chitem/trunk/Structs.h =================================================================== --- chitem/trunk/Structs.h 2009-07-31 19:52:41 UTC (rev 6768) +++ chitem/trunk/Structs.h 2009-07-31 22:00:38 UTC (rev 6769) @@ -847,13 +847,13 @@ long magexp; long thiefxp; char internals[20]; //2a4 - long unknown; //2b8 + char good, law, lady, murder; char bestiary[32]; //2bc unsigned char dialogradius; unsigned char feetcircle; unsigned char unknown2de; unsigned char colornum; - unsigned long techflags; + unsigned long killflags; short colours[7]; //24e unsigned char unknown2f2[3]; unsigned char colorslots[7]; Modified: chitem/trunk/TormentCre.cpp =================================================================== --- chitem/trunk/TormentCre.cpp 2009-07-31 19:52:41 UTC (rev 6768) +++ chitem/trunk/TormentCre.cpp 2009-07-31 22:00:38 UTC (rev 6769) @@ -24,9 +24,11 @@ void CTormentCre::DoDataExchange(CDataExchange* pDX) { + CButton *cb; CString tmpstr; int value; - int i; + int i,j; + int flg; CDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CTormentCre) @@ -43,6 +45,66 @@ DDX_Text(pDX, IDC_COLOR, the_creature.pstheader.colornum); DDV_MinMaxInt(pDX, the_creature.pstheader.colornum, 0,6); + value = the_creature.pstheader.good; + DDX_Text(pDX, IDC_GOOD, value); + DDV_MinMaxInt(pDX, the_creature.pstheader.good, -128, 127); + the_creature.pstheader.good=(char) value; + + value = the_creature.pstheader.law; + DDX_Text(pDX, IDC_LAWFUL, value); + DDV_MinMaxInt(pDX, the_creature.pstheader.law, -128, 127); + the_creature.pstheader.law=(char) value; + + value = the_creature.pstheader.lady; + DDX_Text(pDX, IDC_LADY, value); + DDV_MinMaxInt(pDX, the_creature.pstheader.lady, -128, 127); + the_creature.pstheader.lady=(char) value; + + value = the_creature.pstheader.murder; + DDX_Text(pDX, IDC_MURDER, value); + DDV_MinMaxInt(pDX, the_creature.pstheader.murder, -128, 127); + the_creature.pstheader.murder=(char) value; + + tmpstr.Format("0x%08x", the_creature.pstheader.killflags); + DDX_Text(pDX, IDC_FLAGS, tmpstr); + the_creature.pstheader.killflags=strtonum(tmpstr); + + j=1; + for(i=0;i<16;i++) + { + cb=(CButton *) GetDlgItem(IDC_FLAG1+i); + if (cb) + { + flg=!!(the_creature.pstheader.killflags&j); + cb->SetCheck(flg); + j<<=1; + } + } + + tmpstr.Format("0x%x %s",the_creature.pstheader.idsteam,IDSToken("TEAM",the_creature.pstheader.idsteam, true) ); + DDX_Text(pDX, IDC_TEAM, tmpstr); + value=IDSKey("TEAM", tmpstr); + if(value==-1) + { + the_creature.pstheader.idsteam=(BYTE) strtonum(tmpstr); + } + else + { + the_creature.pstheader.idsteam=(BYTE) value; + } + + tmpstr.Format("0x%x %s",the_creature.pstheader.idsfaction,IDSToken("FACTION",the_creature.pstheader.idsfaction, true) ); + DDX_Text(pDX, IDC_FACTION, tmpstr); + value=IDSKey("FACTION", tmpstr); + if(value==-1) + { + the_creature.pstheader.idsfaction=(BYTE) strtonum(tmpstr); + } + else + { + the_creature.pstheader.idsfaction=(BYTE) value; + } + tmpstr.Format("0x%x %s",the_creature.pstheader.idsspecies,IDSToken("RACE",the_creature.pstheader.idsspecies, true) ); DDX_Text(pDX, IDC_IDSSPECIES, tmpstr); value=IDSKey("RACE", tmpstr); @@ -78,6 +140,23 @@ ON_BN_CLICKED(IDC_BROWSE5, OnBrowse5) ON_BN_CLICKED(IDC_BROWSE6, OnBrowse6) ON_BN_CLICKED(IDC_BROWSE7, OnBrowse7) + ON_BN_CLICKED(IDC_OVERLAY, OnOverlay) + ON_BN_CLICKED(IDC_FLAG1, OnFlag1) + ON_BN_CLICKED(IDC_FLAG2, OnFlag2) + ON_BN_CLICKED(IDC_FLAG3, OnFlag3) + ON_BN_CLICKED(IDC_FLAG4, OnFlag4) + ON_BN_CLICKED(IDC_FLAG5, OnFlag5) + ON_BN_CLICKED(IDC_FLAG6, OnFlag6) + ON_BN_CLICKED(IDC_FLAG7, OnFlag7) + ON_BN_CLICKED(IDC_FLAG8, OnFlag8) + ON_BN_CLICKED(IDC_FLAG9, OnFlag9) + ON_BN_CLICKED(IDC_FLAG10, OnFlag10) + ON_BN_CLICKED(IDC_FLAG11, OnFlag11) + ON_BN_CLICKED(IDC_FLAG12, OnFlag12) + ON_BN_CLICKED(IDC_FLAG13, OnFlag13) + ON_BN_CLICKED(IDC_FLAG14, OnFlag14) + ON_BN_CLICKED(IDC_FLAG15, OnFlag15) + ON_BN_CLICKED(IDC_FLAG16, OnFlag16) ON_EN_KILLFOCUS(IDC_FEETCIRCLE, OnDefaultKillfocus) ON_CBN_KILLFOCUS(IDC_IDSSPECIES, OnDefaultKillfocus) ON_CBN_KILLFOCUS(IDC_DEATH, OnDefaultKillfocus) @@ -98,7 +177,13 @@ ON_CBN_KILLFOCUS(IDC_ATTR7, OnDefaultKillfocus) ON_EN_KILLFOCUS(IDC_XPOS, OnDefaultKillfocus) ON_EN_KILLFOCUS(IDC_XPOS2, OnDefaultKillfocus) - ON_BN_CLICKED(IDC_OVERLAY, OnOverlay) + ON_EN_KILLFOCUS(IDC_GOOD, OnDefaultKillfocus) + ON_EN_KILLFOCUS(IDC_LAWFUL, OnDefaultKillfocus) + ON_EN_KILLFOCUS(IDC_LADY, OnDefaultKillfocus) + ON_EN_KILLFOCUS(IDC_MURDER, OnDefaultKillfocus) + ON_CBN_KILLFOCUS(IDC_FACTION, OnDefaultKillfocus) + ON_EN_KILLFOCUS(IDC_FLAGS, OnDefaultKillfocus) + ON_CBN_KILLFOCUS(IDC_TEAM, OnDefaultKillfocus) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -134,6 +219,12 @@ cb->AddString(beastkillvars.GetNext(pos)); } + cb=(CComboBox *) GetDlgItem(IDC_TEAM); + FillCombo("TEAM",cb,2); + + cb=(CComboBox *) GetDlgItem(IDC_FACTION); + FillCombo("FACTION",cb,2); + cb=(CComboBox *) GetDlgItem(IDC_IDSSPECIES); FillCombo("RACE",cb,2); @@ -213,6 +304,102 @@ dlg.DoModal(); } +void CTormentCre::OnFlag1() +{ + the_creature.pstheader.killflags^=1; + UpdateData(UD_DISPLAY); +} + +void CTormentCre::OnFlag2() +{ + the_creature.pstheader.killflags^=2; + UpdateData(UD_DISPLAY); +} + +void CTormentCre::OnFlag3() +{ + the_creature.pstheader.killflags^=4; + UpdateData(UD_DISPLAY); +} + +void CTormentCre::OnFlag4() +{ + the_creature.pstheader.killflags^=8; + UpdateData(UD_DISPLAY); +} + +void CTormentCre::OnFlag5() +{ + the_creature.pstheader.killflags^=0x10; + UpdateData(UD_DISPLAY); +} + +void CTormentCre::OnFlag6() +{ + the_creature.pstheader.killflags^=0x20; + UpdateData(UD_DISPLAY); +} + +void CTormentCre::OnFlag7() +{ + the_creature.pstheader.killflags^=0x40; + UpdateData(UD_DISPLAY); +} + +void CTormentCre::OnFlag8() +{ + the_creature.pstheader.killflags^=0x80; + UpdateData(UD_DISPLAY); +} + +void CTormentCre::OnFlag9() +{ + the_creature.pstheader.killflags^=0x100; + UpdateData(UD_DISPLAY); +} + +void CTormentCre::OnFlag10() +{ + the_creature.pstheader.killflags^=0x200; + UpdateData(UD_DISPLAY); +} + +void CTormentCre::OnFlag11() +{ + the_creature.pstheader.killflags^=0x400; + UpdateData(UD_DISPLAY); +} + +void CTormentCre::OnFlag12() +{ + the_creature.pstheader.killflags^=0x800; + UpdateData(UD_DISPLAY); +} + +void CTormentCre::OnFlag13() +{ + the_creature.pstheader.killflags^=0x1000; + UpdateData(UD_DISPLAY); +} + +void CTormentCre::OnFlag14() +{ + the_creature.pstheader.killflags^=0x2000; + UpdateData(UD_DISPLAY); +} + +void CTormentCre::OnFlag15() +{ + the_creature.pstheader.killflags^=0x4000; + UpdateData(UD_DISPLAY); +} + +void CTormentCre::OnFlag16() +{ + the_creature.pstheader.killflags^=0x8000; + UpdateData(UD_DISPLAY); +} + BOOL CTormentCre::PreTranslateMessage(MSG* pMsg) { m_tooltip.RelayEvent(pMsg); Modified: chitem/trunk/TormentCre.h =================================================================== --- chitem/trunk/TormentCre.h 2009-07-31 19:52:41 UTC (rev 6768) +++ chitem/trunk/TormentCre.h 2009-07-31 22:00:38 UTC (rev 6769) @@ -50,6 +50,22 @@ afx_msg void OnBrowse6(); afx_msg void OnBrowse7(); afx_msg void OnOverlay(); + afx_msg void OnFlag1(); + afx_msg void OnFlag2(); + afx_msg void OnFlag3(); + afx_msg void OnFlag4(); + afx_msg void OnFlag5(); + afx_msg void OnFlag6(); + afx_msg void OnFlag7(); + afx_msg void OnFlag8(); + afx_msg void OnFlag9(); + afx_msg void OnFlag10(); + afx_msg void OnFlag11(); + afx_msg void OnFlag12(); + afx_msg void OnFlag13(); + afx_msg void OnFlag14(); + afx_msg void OnFlag15(); + afx_msg void OnFlag16(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: chitem/trunk/chitem.clw =================================================================== --- chitem/trunk/chitem.clw 2009-07-31 19:52:41 UTC (rev 6768) +++ chitem/trunk/chitem.clw 2009-07-31 22:00:38 UTC (rev 6769) @@ -2,7 +2,7 @@ [General Info] Version=1 -LastClass=CProjGemRB +LastClass=CTormentCre LastTemplate=CDialog NewFileInclude1=#include "stdafx.h" NewFileInclude2=#include "chitem.h" @@ -232,142 +232,142 @@ Resource123=IDD_GAMEGENERAL Class98=IcewindCre Resource124=IDR_SHORTCUT -Resource125=IDD_SEARCHNODE (English (U.S.)) -Resource126=IDD_AREACONTAINER (English (U.S.)) -Resource127=IDD_WEDTILE (English (U.S.)) -Resource128=IDD_MASSCLEAR (English (U.S.)) -Resource129=IDD_COMPAT (English (U.S.)) -Resource130=IDD_WEDEDIT (English (U.S.)) -Resource131=IDR_ITEM (English (U.S.)) -Resource132=IDD_IDSEDIT (English (U.S.)) -Resource133=IDD_CREATURERES (English (U.S.)) -Resource134=IDD_VARIABLES (English (U.S.)) -Resource135=IDD_AREATRIGGERSTRINGS (English (U.S.)) -Resource136=IDR_TILE (English (U.S.)) -Resource137=IDR_TREEMENU (English (U.S.)) -Resource138=IDD_SPELLDESC (English (U.S.)) -Resource139=IDD_MAPEDIT (English (U.S.)) -Resource140=IDD_PROJGEMRB (English (U.S.)) -Resource141=IDD_CREATURESKILLS (English (U.S.)) -Resource142=IDD_STOREEDIT (English (U.S.)) -Resource143=IDD_CREATUREUNKNOWN (English (U.S.)) -Resource144=IDR_SPELL (English (U.S.)) -Resource145=IDR_BAMMENU (English (U.S.)) -Resource146=IDD_SRCEDIT (English (U.S.)) -Resource147=IDD_CREATUREOVR (English (U.S.)) -Resource148=IDD_GAMEPCINFO (English (U.S.)) -Resource149=IDD_CREATUREPST (English (U.S.)) -Resource150=IDR_IDS (English (U.S.)) -Resource151=IDD_ITEMUSE (English (U.S.)) -Resource152=IDD_ITEMGENERAL (English (U.S.)) -Resource153=IDD_SAVHANDLE (English (U.S.)) -Resource154=IDR_SRC (English (U.S.)) -Resource155=IDD_MAPLINK (English (U.S.)) -Resource156=IDD_VVCEDIT (English (U.S.)) -Resource157=IDD_STRREFDLG (English (U.S.)) -Resource158=IDD_TISDIALOG (English (U.S.)) -Resource159=IDD_AREASONGS (English (U.S.)) -Resource160=IDD_AREASPAWN (English (U.S.)) -Resource161=IDD_SPELLEXTRA (English (U.S.)) -Resource162=IDD_AREATRIGGER (English (U.S.)) -Resource163=IDR_WORLDMAP (English (U.S.)) -Resource164=IDD_GAMEEDIT (English (U.S.)) -Resource165=IDD_PROJAREAGEMRB (English (U.S.)) -Resource166=IDD_CREATURELEVELS (English (U.S.)) -Resource167=IDD_CREATUREIWD2 (English (U.S.)) -Resource168=IDD_AREAAMBIENT (English (U.S.)) -Resource169=IDR_WEDMENU (English (U.S.)) -Resource170=IDD_BAMEDIT (English (U.S.)) -Resource171=IDD_AREAACTOR (English (U.S.)) -Resource172=IDR_EFFECT (English (U.S.)) -Resource173=IDD_CREATUREGENERAL (English (U.S.)) -Resource174=IDD_STORERENTAL (English (U.S.)) -Resource175=IDD_SPELLTOOL (English (U.S.)) -Resource176=IDR_SCRIPT (English (U.S.)) -Resource177=IDD_ITEMDESC (English (U.S.)) -Resource178=IDD_KEYEDIT (English (U.S.)) -Resource179=IDD_SPELLEQUIP (English (U.S.)) -Resource180=IDD_AREAMAP (English (U.S.)) -Resource181=IDR_GAME (English (U.S.)) -Resource182=IDD_SPELLEFFECT (English (U.S.)) -Resource183=IDR_2DA (English (U.S.)) -Resource184=IDD_ITEMPICKER (English (U.S.)) -Resource185=IDD_CREATUREEDIT (English (U.S.)) -Resource186=IDD_EXTRACT2 (English (U.S.)) -Resource187=IDR_TLKMENU (English (U.S.)) -Resource188=IDD_CHUIEDIT (English (U.S.)) -Resource189=IDD_DIALOGEDIT (English (U.S.)) -Resource190=IDD_EDIT (English (U.S.)) -Resource191=IDD_ITEMEDIT (English (U.S.)) -Resource192=IDD_WEDPOLY (English (U.S.)) -Resource193=IDD_AREAENTRANCE (English (U.S.)) -Resource194=IDD_AREAVARIABLE (English (U.S.)) -Resource195=IDD_POLYGON (English (U.S.)) -Resource196=IDD_GAMEGENERAL (English (U.S.)) -Resource197=IDD_AREAPROJ (English (U.S.)) -Resource198=IDD_CREATUREEFF (English (U.S.)) -Resource199=IDD_IAPDIALOG (English (U.S.)) -Resource200=IDD_CREATURESTRINGS (English (U.S.)) -Resource201=IDD_EXTRACT (English (U.S.)) -Resource202=IDD_AREAEDIT (English (U.S.)) -Resource203=IDR_CHUI (English (U.S.)) -Resource204=IDD_PALETTE (English (U.S.)) -Resource205=IDR_MENUBAR (English (U.S.)) -Resource206=IDD_CHECK (English (U.S.)) -Resource207=IDR_AREA (English (U.S.)) -Resource208=IDD_CREATUREIWD (English (U.S.)) -Resource209=IDD_PROGRESS (English (U.S.)) -Resource210=IDD_ANIMDIALOG -Resource211=IDD_ITEMEXTRA (English (U.S.)) -Resource212=IDD_FINDITEM (English (U.S.)) -Resource213=IDD_AREAANIM (English (U.S.)) -Resource214=IDD_CREATUREICONS (English (U.S.)) -Resource215=IDD_2DAEDIT (English (U.S.)) -Resource216=IDD_COLORPICKER (English (U.S.)) -Resource217=IDD_MUSEDIT (English (U.S.)) -Resource218=IDD_EFFEDIT (English (U.S.)) -Resource219=IDD_SCRIPTEDIT (English (U.S.)) -Resource220=IDD_ITEMICONS (English (U.S.)) -Resource221=IDD_CREATUREITEMS (English (U.S.)) -Resource222=IDD_IMAGEVIEW (English (U.S.)) -Resource223=IDR_MUSIC (English (U.S.)) -Resource224=IDD_CHITEM_DIALOG (English (U.S.)) -Resource225=IDD_PROJEDIT (English (U.S.)) -Resource226=IDD_SPELLGENERAL (English (U.S.)) -Resource227=IDR_VVC (English (U.S.)) -Resource228=IDD_AREAINT (English (U.S.)) -Resource229=IDD_PROJEXT (English (U.S.)) -Resource230=IDD_MOSEDIT (English (U.S.)) -Resource231=IDD_SHOWLOG (English (U.S.)) -Resource232=IDD_AREADOOR (English (U.S.)) -Resource233=IDD_CFB (English (U.S.)) -Resource234=IDD_WEIDU (English (U.S.)) -Resource235=IDD_ITEMEQUIP (English (U.S.)) -Resource236=IDR_STORE (English (U.S.)) -Resource237=IDD_TEXTVIEW (English (U.S.)) -Resource238=IDD_STOREITEMS (English (U.S.)) -Resource239=IDR_PROJECT (English (U.S.)) -Resource240=IDD_SPELLEDIT (English (U.S.)) -Resource241=IDD_PANICBUTTON (English (U.S.)) -Resource242=IDD_AREAGENERAL (English (U.S.)) -Resource243=IDD_ITEMEFFECT (English (U.S.)) -Resource244=IDR_CHITIN (English (U.S.)) -Resource245=IDR_CREATURE (English (U.S.)) +Resource125=IDD_CREATURESKILLS (English (U.S.)) +Resource126=IDD_ITEMGENERAL (English (U.S.)) +Resource127=IDD_SHOWLOG (English (U.S.)) +Resource128=IDD_EXTRACT2 (English (U.S.)) +Resource129=IDR_MENUBAR (English (U.S.)) +Resource130=IDD_SPELLEFFECT (English (U.S.)) +Resource131=IDD_GAMEEDIT (English (U.S.)) +Resource132=IDD_AREAVARIABLE (English (U.S.)) +Resource133=IDD_GAMEPCINFO (English (U.S.)) +Resource134=IDD_IDSEDIT (English (U.S.)) +Resource135=IDD_STOREEDIT (English (U.S.)) +Resource136=IDD_FINDITEM (English (U.S.)) +Resource137=IDD_PROJEXT (English (U.S.)) +Resource138=IDD_STORERENTAL (English (U.S.)) +Resource139=IDD_AREASONGS (English (U.S.)) +Resource140=IDR_GAME (English (U.S.)) +Resource141=IDD_ADDLINK (English (U.S.)) +Resource142=IDD_CREATUREIWD2 (English (U.S.)) +Resource143=IDD_AREATRIGGERSTRINGS (English (U.S.)) +Resource144=IDD_SPELLGENERAL (English (U.S.)) +Resource145=IDD_STOREEXTRA (English (U.S.)) +Resource146=IDD_AREAENTRANCE (English (U.S.)) +Resource147=IDD_AREAMAP (English (U.S.)) +Resource148=IDD_CREATURESTRINGS (English (U.S.)) +Resource149=IDD_CREATUREICONS (English (U.S.)) +Resource150=IDR_STORE (English (U.S.)) +Resource151=IDD_STOREITEMS (English (U.S.)) +Resource152=IDD_POLYGON (English (U.S.)) +Resource153=IDR_TILE (English (U.S.)) +Resource154=IDD_AREASPAWN (English (U.S.)) +Resource155=IDR_EFFECT (English (U.S.)) +Resource156=IDD_CREATUREIWD (English (U.S.)) +Resource157=IDR_MUSIC (English (U.S.)) +Resource158=IDD_AREAGENERAL (English (U.S.)) +Resource159=IDD_PROGRESS (English (U.S.)) +Resource160=IDD_SPELLDESC (English (U.S.)) +Resource161=IDR_WORLDMAP (English (U.S.)) +Resource162=IDD_STOREDRINKS (English (U.S.)) +Resource163=IDD_PROJGEMRB (English (U.S.)) +Resource164=IDR_SPELL (English (U.S.)) +Resource165=IDD_DIALOGEDIT (English (U.S.)) +Resource166=IDD_AREACONTAINER (English (U.S.)) +Resource167=IDD_STOREGENERAL (English (U.S.)) +Resource168=IDD_PANICBUTTON (English (U.S.)) +Resource169=IDD_CREATUREEDIT (English (U.S.)) +Resource170=IDR_ITEM (English (U.S.)) +Resource171=IDR_IDS (English (U.S.)) +Resource172=IDD_ITEMUSE (English (U.S.)) +Resource173=IDD_ANIMDIALOG +Resource174=IDD_PROJAREAGEMRB (English (U.S.)) +Resource175=IDD_STRREFDLG (English (U.S.)) +Resource176=IDR_BAMMENU (English (U.S.)) +Resource177=IDD_AREAAMBIENT (English (U.S.)) +Resource178=IDD_SCRIPTEDIT (English (U.S.)) +Resource179=IDR_CREATURE (English (U.S.)) +Resource180=IDD_MUSEDIT (English (U.S.)) +Resource181=IDD_EDIT (English (U.S.)) +Resource182=IDR_TLKMENU (English (U.S.)) +Resource183=IDD_CHITEM_DIALOG (English (U.S.)) +Resource184=IDD_IMAGEVIEW (English (U.S.)) +Resource185=IDD_TEXTVIEW (English (U.S.)) +Resource186=IDR_VVC (English (U.S.)) +Resource187=IDD_IAPDIALOG (English (U.S.)) +Resource188=IDD_SAVHANDLE (English (U.S.)) +Resource189=IDD_ITEMEFFECT (English (U.S.)) +Resource190=IDD_COMPAT (English (U.S.)) +Resource191=IDR_SRC (English (U.S.)) +Resource192=IDD_SPELLEDIT (English (U.S.)) +Resource193=IDR_CHUI (English (U.S.)) +Resource194=IDD_CREATUREGENERAL (English (U.S.)) +Resource195=IDD_WEDEDIT (English (U.S.)) +Resource196=IDD_EXTRACT (English (U.S.)) +Resource197=IDD_AREADOOR (English (U.S.)) +Resource198=IDR_WEDMENU (English (U.S.)) +Resource199=IDD_ITEMEXTRA (English (U.S.)) +Resource200=IDD_AREAACTOR (English (U.S.)) +Resource201=IDD_ABOUTBOX (English (U.S.)) +Resource202=IDD_PALETTE (English (U.S.)) +Resource203=IDD_AREATRIGGER (English (U.S.)) +Resource204=IDD_CFB (English (U.S.)) +Resource205=IDR_SCRIPT (English (U.S.)) +Resource206=IDD_ITEMDESC (English (U.S.)) +Resource207=IDD_MOSEDIT (English (U.S.)) +Resource208=IDD_SPELLTOOL (English (U.S.)) +Resource209=IDD_SRCEDIT (English (U.S.)) +Resource210=IDD_CREATUREITEMS (English (U.S.)) +Resource211=IDD_COLORPICKER (English (U.S.)) +Resource212=IDD_AREAINT (English (U.S.)) +Resource213=IDD_BAMEDIT (English (U.S.)) +Resource214=IDD_WEIDU (English (U.S.)) +Resource215=IDD_VARIABLES (English (U.S.)) +Resource216=IDD_GAMEGENERAL (English (U.S.)) +Resource217=IDD_SPELLEXTRA (English (U.S.)) +Resource218=IDD_2DAEDIT (English (U.S.)) +Resource219=IDR_2DA (English (U.S.)) +Resource220=IDR_CHITIN (English (U.S.)) +Resource221=IDR_AREA (English (U.S.)) +Resource222=IDD_KEYEDIT (English (U.S.)) +Resource223=IDD_PROJEDIT (English (U.S.)) +Resource224=IDD_CREATUREUNKNOWN (English (U.S.)) +Resource225=IDD_MASSCLEAR (English (U.S.)) +Resource226=IDD_SCHEDULE (English (U.S.)) +Resource227=IDD_AREAANIM (English (U.S.)) +Resource228=IDD_ITEMEDIT (English (U.S.)) +Resource229=IDD_VVCEDIT (English (U.S.)) +Resource230=IDD_EFFEDIT (English (U.S.)) +Resource231=IDD_MAPEDIT (English (U.S.)) +Resource232=IDD_ITEMICONS (English (U.S.)) +Resource233=IDD_CHECK (English (U.S.)) +Resource234=IDD_TISDIALOG (English (U.S.)) +Resource235=IDD_CREATUREPST (English (U.S.)) +Resource236=IDD_MAPLINK (English (U.S.)) +Resource237=IDD_WEDPOLY (English (U.S.)) +Resource238=IDD_CREATURELEVELS (English (U.S.)) +Resource239=IDD_AREAEDIT (English (U.S.)) +Resource240=IDD_SEARCHNODE (English (U.S.)) +Resource241=IDD_SPELLEQUIP (English (U.S.)) +Resource242=IDR_PROJECT (English (U.S.)) +Resource243=IDD_GAMESTATS (English (U.S.)) +Resource244=IDD_ITEMEQUIP (English (U.S.)) +Resource245=IDD_AREAPROJ (English (U.S.)) Class99=CAreaTriggerString Class100=CPCInfo -Resource246=IDD_STOREDRINKS (English (U.S.)) +Resource246=IDD_CREATUREEFF (English (U.S.)) Class101=CCreatureOverlay -Resource247=IDD_ABOUTBOX (English (U.S.)) +Resource247=IDD_WEDTILE (English (U.S.)) Class102=IWD2Creature -Resource248=IDD_STOREGENERAL (English (U.S.)) +Resource248=IDD_CREATUREOVR (English (U.S.)) Class103=CAnimDialog -Resource249=IDD_STOREEXTRA (English (U.S.)) +Resource249=IDR_TREEMENU (English (U.S.)) Class104=CCreatureLevels -Resource250=IDD_ADDLINK (English (U.S.)) +Resource250=IDD_CREATURERES (English (U.S.)) Class105=CAreaProj -Resource251=IDD_GAMESTATS (English (U.S.)) +Resource251=IDD_ITEMPICKER (English (U.S.)) Class106=CProjGemRB -Resource252=IDD_SCHEDULE (English (U.S.)) +Resource252=IDD_CHUIEDIT (English (U.S.)) Class107=CProjAreaGemRB Resource253=IDR_SHORTCUT (English (U.S.)) @@ -2481,7 +2481,7 @@ ImplementationFile=ProjEdit.cpp BaseClass=CDialog Filter=D -LastObject=ID_FILE_TP2 +LastObject=IDC_PALETTE VirtualFilter=dWC [DLG:IDD_AREAENTRANCE] @@ -5467,7 +5467,7 @@ ImplementationFile=TormentCre.cpp BaseClass=CDialog Filter=D -LastObject=CTormentCre +LastObject=IDC_TEAM VirtualFilter=dWC [DLG:IDD_GAMESTATS] @@ -9323,9 +9323,9 @@ [DLG:IDD_CREATUREPST (English (U.S.))] Type=1 Class=CTormentCre -ControlCount=39 -Control1=IDC_DIALOG,edit,1350631552 -Control2=IDC_FEETCIRCLE,edit,1350631552 +ControlCount=69 +Control1=IDC_DIALOG,edit,1350639744 +Control2=IDC_FEETCIRCLE,edit,1350639744 Control3=IDC_IDSSPECIES,combobox,1344340226 Control4=IDC_DEATH,combobox,1344340226 Control5=IDCANCEL,button,1342242816 @@ -9355,14 +9355,44 @@ Control29=IDC_BROWSE6,button,1342242816 Control30=IDC_CHAIR,edit,1350631552 Control31=IDC_BROWSE7,button,1342242816 -Control32=IDC_COLOR,edit,1350631552 +Control32=IDC_COLOR,edit,1350639744 Control33=IDC_STATIC,static,1342308352 Control34=IDC_STATIC,static,1342308352 -Control35=IDC_XPOS,edit,1350631552 +Control35=IDC_XPOS,edit,1350639744 Control36=IDC_STATIC,static,1342308352 -Control37=IDC_XPOS2,edit,1350631552 +Control37=IDC_XPOS2,edit,1350639744 Control38=IDC_STATIC,static,1342308352 Control39=IDC_OVERLAY,button,1342242816 +Control40=IDC_FLAGS,edit,1350631552 +Control41=IDC_STATIC,static,1342308352 +Control42=IDC_GOOD,edit,1350631552 +Control43=IDC_LAWFUL,edit,1350631552 +Control44=IDC_LADY,edit,1350631552 +Control45=IDC_MURDER,edit,1350631552 +Control46=IDC_STATIC,static,1342308352 +Control47=IDC_STATIC,static,1342308352 +Control48=IDC_STATIC,static,1342308352 +Control49=IDC_STATIC,static,1342308352 +Control50=IDC_FLAG1,button,1342242819 +Control51=IDC_FLAG2,button,1342242819 +Control52=IDC_FLAG3,button,1342242819 +Control53=IDC_FLAG4,button,1342242819 +Control54=IDC_FLAG5,button,1342242819 +Control55=IDC_FLAG6,button,1342242819 +Control56=IDC_FLAG7,button,1342242819 +Control57=IDC_FLAG8,button,1342242819 +Control58=IDC_FLAG9,button,1342242819 +Control59=IDC_FLAG10,button,1342242819 +Control60=IDC_FLAG11,button,1342242819 +Control61=IDC_FLAG12,button,1342242819 +Control62=IDC_FLAG13,button,1342242819 +Control63=IDC_FLAG14,button,1342242819 +Control64=IDC_FLAG15,button,1342242819 +Control65=IDC_FLAG16,button,1342242819 +Control66=IDC_STATIC,static,1342308352 +Control67=IDC_FACTION,combobox,1344340226 +Control68=IDC_TEAM,combobox,1344340226 +Control69=IDC_STATIC,static,1342308352 [DLG:IDD_GAMESTATS (English (U.S.))] Type=1 Modified: chitem/trunk/chitem.rc =================================================================== --- chitem/trunk/chitem.rc 2009-07-31 19:52:41 UTC (rev 6768) +++ chitem/trunk/chitem.rc 2009-07-31 22:00:38 UTC (rev 6769) @@ -4890,22 +4890,22 @@ PUSHBUTTON "Back",IDCANCEL,211,304,42,14 END -IDD_CREATUREPST DIALOG DISCARDABLE 0, 0, 327, 233 +IDD_CREATUREPST DIALOG DISCARDABLE 0, 0, 459, 233 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Torment specific" FONT 8, "MS Sans Serif" BEGIN - EDITTEXT IDC_DIALOG,7,21,40,14,ES_AUTOHSCROLL - EDITTEXT IDC_FEETCIRCLE,62,21,40,14,ES_AUTOHSCROLL - COMBOBOX IDC_IDSSPECIES,119,21,93,161,CBS_DROPDOWN | CBS_SORT | + EDITTEXT IDC_DIALOG,7,21,40,14,ES_AUTOHSCROLL | ES_NUMBER + EDITTEXT IDC_FEETCIRCLE,58,21,40,14,ES_AUTOHSCROLL | ES_NUMBER + COMBOBOX IDC_IDSSPECIES,114,21,93,161,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_DEATH,217,21,96,134,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Back",IDCANCEL,138,212,50,14 LTEXT "Dialog radius",IDC_STATIC,7,7,42,8 - LTEXT "Feet circle size",IDC_STATIC,62,7,48,8 + LTEXT "Feet circle size",IDC_STATIC,58,7,48,8 LTEXT "Beast name",IDC_STATIC,217,7,38,8 - LTEXT "Species",IDC_STATIC,119,7,26,8 + LTEXT "Species",IDC_STATIC,114,7,26,8 COMBOBOX IDC_ATTR1,7,85,75,139,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_ATTR2,7,103,75,121,CBS_DROPDOWN | CBS_SORT | @@ -4935,14 +4935,62 @@ PUSHBUTTON "Browse",IDC_BROWSE6,185,175,28,14 EDITTEXT IDC_CHAIR,91,193,87,14,ES_AUTOHSCROLL PUSHBUTTON "Browse",IDC_BROWSE7,185,193,28,14 - EDITTEXT IDC_COLOR,7,53,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_COLOR,7,53,40,14,ES_AUTOHSCROLL | ES_NUMBER LTEXT "# of colors",IDC_STATIC,7,41,34,8 LTEXT "Color gradient",IDC_STATIC,91,71,44,8 - EDITTEXT IDC_XPOS,67,53,78,14,ES_AUTOHSCROLL - LTEXT "XP Mage",IDC_STATIC,67,41,30,8 - EDITTEXT IDC_XPOS2,165,53,78,14,ES_AUTOHSCROLL - LTEXT "XP Thief",IDC_STATIC,165,41,28,8 - PUSHBUTTON "Edit overlays",IDC_OVERLAY,263,53,50,14 + EDITTEXT IDC_XPOS,58,53,78,14,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "XP Mage",IDC_STATIC,58,41,30,8 + EDITTEXT IDC_XPOS2,147,53,78,14,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "XP Thief",IDC_STATIC,152,41,28,8 + PUSHBUTTON "Edit overlays",IDC_OVERLAY,7,212,50,14 + EDITTEXT IDC_FLAGS,235,53,57,14,ES_AUTOHSCROLL + LTEXT "Appearance flags",IDC_STATIC,235,39,56,8 + EDITTEXT IDC_GOOD,297,53,28,14,ES_AUTOHSCROLL + EDITTEXT IDC_LAWFUL,336,53,28,14,ES_AUTOHSCROLL + EDITTEXT IDC_LADY,375,53,28,14,ES_AUTOHSCROLL + EDITTEXT IDC_MURDER,414,53,28,14,ES_AUTOHSCROLL + LTEXT "Good",IDC_STATIC,297,41,18,8 + LTEXT "Lawful",IDC_STATIC,336,41,22,8 + LTEXT "Lady",IDC_STATIC,375,41,16,8 + LTEXT "Murder",IDC_STATIC,414,41,23,8 + CONTROL "Unknown",IDC_FLAG1,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,236,85,47,10 + CONTROL "Transparent",IDC_FLAG2,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,236,103,54,10 + CONTROL "Unknown",IDC_FLAG3,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,236,121,47,10 + CONTROL "Unknown",IDC_FLAG4,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,236,139,47,10 + CONTROL "Scriptname",IDC_FLAG5,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,236,157,51,10 + CONTROL "Character type",IDC_FLAG6,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,236,175,62,10 + CONTROL "Unknown",IDC_FLAG7,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,236,193,47,10 + CONTROL "Faction",IDC_FLAG8,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,236,211,39,10 + CONTROL "Team",IDC_FLAG9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 297,85,34,10 + CONTROL "Invulnerable",IDC_FLAG10,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,297,103,55,10 + CONTROL "Good count",IDC_FLAG11,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,297,121,53,10 + CONTROL "Law count",IDC_FLAG12,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,297,139,49,10 + CONTROL "Lady count",IDC_FLAG13,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,297,157,51,10 + CONTROL "Murder count",IDC_FLAG14,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,297,175,58,10 + CONTROL "Don't face",IDC_FLAG15,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,297,193,49,10 + CONTROL "Auto buddy",IDC_FLAG16,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,297,211,52,10 + LTEXT "Faction",IDC_STATIC,389,7,24,8 + COMBOBOX IDC_FACTION,389,21,63,205,CBS_DROPDOWN | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_TEAM,318,21,63,205,CBS_DROPDOWN | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "Team",IDC_STATIC,318,7,19,8 END IDD_GAMESTATS DIALOG DISCARDABLE 0, 0, 227, 199 @@ -6181,7 +6229,7 @@ IDD_CREATUREPST, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 320 + RIGHTMARGIN, 452 TOPMARGIN, 7 BOTTOMMARGIN, 226 END @@ -6322,8 +6370,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 7,1,0,5 - PRODUCTVERSION 7,1,0,5 + FILEVERSION 7,1,0,6 + PRODUCTVERSION 7,1,0,6 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -6341,14 +6389,14 @@ VALUE "Comments", "forums.gibberlings3.net\0" VALUE "CompanyName", "GemRB Project (gemrb.sourceforge.net)\0" VALUE "FileDescription", "DragonLance Total Conversion Editor Pro\0" - VALUE "FileVersion", "7, 1, 0, 5\0" + VALUE "FileVersion", "7, 1, 0, 6\0" VALUE "InternalName", "dltcep\0" VALUE "LegalCopyright", "Copyright (C) 2002-2009 Avenger\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "chitem.EXE\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "DLTC Editor Pro 7.1e\0" - VALUE "ProductVersion", "7, 1, 0, 5\0" + VALUE "ProductName", "DLTC Editor Pro 7.1f\0" + VALUE "ProductVersion", "7, 1, 0, 6\0" VALUE "SpecialBuild", "\0" END END Modified: chitem/trunk/chitemDlg.cpp =================================================================== --- chitem/trunk/chitemDlg.cpp 2009-07-31 19:52:41 UTC (rev 6768) +++ chitem/trunk/chitemDlg.cpp 2009-07-31 22:00:38 UTC (rev 6769) @@ -3,7 +3,7 @@ #include "stdafx.h" -#define PRG_VERSION "7.1e" +#define PRG_VERSION "7.1f" #include <fcntl.h> #include <direct.h> Modified: chitem/trunk/resource.h =================================================================== --- chitem/trunk/resource.h 2009-07-31 19:52:41 UTC (rev 6768) +++ chitem/trunk/resource.h 2009-07-31 22:00:38 UTC (rev 6769) @@ -1646,6 +1646,10 @@ #define IDC_PROJPICKER 2340 #define IDC_DAYMOVIE 2342 #define IDC_NIGHTMOVIE 2343 +#define IDC_LADY 2357 +#define IDC_MURDER 2358 +#define IDC_FACTION 2362 +#define IDC_TEAM 2363 #define ID_RESCAN 32771 #define ID_RESCAN2 32772 #define ID_EDIT_ITEM 32773 @@ -1871,7 +1875,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 233 #define _APS_NEXT_COMMAND_VALUE 33051 -#define _APS_NEXT_CONTROL_VALUE 2354 +#define _APS_NEXT_CONTROL_VALUE 2363 #define _APS_NEXT_SYMED_VALUE 120 #endif #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-08-18 10:41:18
|
Revision: 6922 http://gemrb.svn.sourceforge.net/gemrb/?rev=6922&view=rev Author: avenger_teambg Date: 2009-08-18 10:41:10 +0000 (Tue, 18 Aug 2009) Log Message: ----------- dltcep update Modified Paths: -------------- chitem/trunk/AreaProperties.cpp chitem/trunk/AreaProperties.h chitem/trunk/Chitem.cpp chitem/trunk/Chitem.h chitem/trunk/EffEdit.cpp chitem/trunk/EffEdit.h chitem/trunk/ImageView.cpp chitem/trunk/ImageView.h chitem/trunk/ProjEdit.cpp chitem/trunk/Structs.h chitem/trunk/chitem.clw chitem/trunk/chitem.rc chitem/trunk/chitemDlg.cpp chitem/trunk/resource.h Modified: chitem/trunk/AreaProperties.cpp =================================================================== --- chitem/trunk/AreaProperties.cpp 2009-08-18 10:35:35 UTC (rev 6921) +++ chitem/trunk/AreaProperties.cpp 2009-08-18 10:41:10 UTC (rev 6922) @@ -2945,8 +2945,8 @@ static int ambientboxids[]={IDC_AMBIENTPICKER,IDC_WAVRES, IDC_POSX,IDC_POSY, IDC_RADIUS,IDC_HEIGHT, IDC_VOLUME, IDC_AMBINUMPICKER,IDC_ADDWAV, IDC_DELWAV, IDC_PLAY, IDC_BROWSE, IDC_NUM, IDC_GAP, IDC_SOUNDNUM, IDC_FLAG1,IDC_FLAG2,IDC_FLAG3,IDC_FLAG4, -IDC_U28, IDC_U2C, IDC_FLAGS,IDC_U90, IDC_SCHEDULE, IDC_UNKNOWN,IDC_MAXWAV, IDC_SET, -IDC_COPY, IDC_PASTE, IDC_REMOVE, +IDC_FLAG5,IDC_U28, IDC_U2C, IDC_FLAGS,IDC_U90, IDC_SCHEDULE, IDC_UNKNOWN, +IDC_MAXWAV, IDC_SET,IDC_COPY, IDC_PASTE, IDC_REMOVE, 0}; #pragma warning(disable:4706) @@ -3009,7 +3009,7 @@ DDX_Text(pDX, IDC_FLAGS, the_area.ambientheaders[m_ambientnum].flags); DDX_Text(pDX, IDC_U90, the_area.ambientheaders[m_ambientnum].unknown90); j=1; - for(i=0;i<4;i++) + for(i=0;i<5;i++) { cb2=(CButton *) GetDlgItem(IDC_FLAG1+i); if(the_area.ambientheaders[m_ambientnum].flags&j) cb2->SetCheck(true); @@ -3140,6 +3140,7 @@ ON_EN_KILLFOCUS(IDC_U90, OnKillfocusU90) ON_EN_KILLFOCUS(IDC_FLAGS, OnKillfocusFlags) ON_BN_CLICKED(IDC_SET, OnSet) + ON_BN_CLICKED(IDC_FLAG5, OnFlag5) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -3436,6 +3437,12 @@ UpdateData(UD_DISPLAY); } +void CAreaAmbient::OnFlag5() +{ + the_area.ambientheaders[m_ambientnum].flags^=16; + UpdateData(UD_DISPLAY); +} + void CAreaAmbient::OnAddwav() { if(the_area.ambientheaders[m_ambientnum].ambientnum<10) @@ -7154,3 +7161,4 @@ //{{AFX_MSG_MAP(CAreaPropertySheet) //}}AFX_MSG_MAP END_MESSAGE_MAP() + Modified: chitem/trunk/AreaProperties.h =================================================================== --- chitem/trunk/AreaProperties.h 2009-08-18 10:35:35 UTC (rev 6921) +++ chitem/trunk/AreaProperties.h 2009-08-18 10:41:10 UTC (rev 6922) @@ -415,6 +415,7 @@ afx_msg void OnKillfocusU90(); afx_msg void OnKillfocusFlags(); afx_msg void OnSet(); + afx_msg void OnFlag5(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: chitem/trunk/Chitem.cpp =================================================================== --- chitem/trunk/Chitem.cpp 2009-08-18 10:35:35 UTC (rev 6921) +++ chitem/trunk/Chitem.cpp 2009-08-18 10:41:10 UTC (rev 6922) @@ -2975,8 +2975,8 @@ CString timing_types[NUM_TMTYPE]={ "0-Duration","1-Permanent","2-While equiped","3-Delayed duration", - "4-Delayed","5-Delayed?","6-Delayed duration absolute","7-Delayed absolute","8-Permanent not saved", - "9-Permanent after death","10-Trigger" + "4-Delayed","5-Delayed unsaved","6-Delayed duration absolute","7-Delayed absolute","8-Permanent not saved", + "9-Permanent after death","10-Trigger","0x1000-Duration absolute" }; int has_duration[]={TIMING_DURATION,TIMING_DELDDUR,TIMING_DELAYED, @@ -2991,7 +2991,9 @@ { CString tmp; - if(tmtype<0 || tmtype>=NUM_TMTYPE) + if(tmtype==0x1000) return timing_types[NUM_TMTYPE-1]; //special + + if(tmtype<0 || tmtype>=NUM_TMTYPE-1) { tmp.Format("0x%x-Unknown",tmtype); return tmp; Modified: chitem/trunk/Chitem.h =================================================================== --- chitem/trunk/Chitem.h 2009-08-18 10:35:35 UTC (rev 6921) +++ chitem/trunk/Chitem.h 2009-08-18 10:41:10 UTC (rev 6922) @@ -337,7 +337,7 @@ #define NUM_FEATS 458 //hardcoded feature number (iwd2) -#define NUM_TMTYPE 11 +#define NUM_TMTYPE 12 //effect duration types #define TIMING_DURATION 0 #define TIMING_PERMANENT 1 Modified: chitem/trunk/EffEdit.cpp =================================================================== --- chitem/trunk/EffEdit.cpp 2009-08-18 10:35:35 UTC (rev 6921) +++ chitem/trunk/EffEdit.cpp 2009-08-18 10:41:10 UTC (rev 6922) @@ -42,6 +42,7 @@ m_text2 = _T(""); //}}AFX_DATA_INIT m_par_type=0; + m_hexadecimal=0; the_ids.new_ids(); m_idsname=""; } @@ -99,7 +100,7 @@ tmpstr=get_timing_type(the_effect.header.timing); DDX_Text(pDX, IDC_TIMING, tmpstr); - the_effect.header.timing=(BYTE) strtonum(tmpstr); + the_effect.header.timing=(unsigned short) strtonum(tmpstr); DDX_Text(pDX, IDC_UNKNOWN, (short &) the_effect.header.unknown2); //part of timing @@ -216,23 +217,30 @@ int *strref_opcodes; CButton *cb; CString tmp; + CString longformat; int strref; + if(m_hexadecimal) { + longformat="0x%08x"; + } else { + longformat="%ld"; + } + SetWindowText("Edit effect: "+itemname); cb=(CButton *) GetDlgItem(IDC_PLAY); cb->EnableWindow(feature_resource(the_effect.header.feature)==REF_WAV); switch(m_par_type) { case 0: - m_param2.Format("%ld",the_effect.header.par2.parl); + m_param2.Format(longformat,the_effect.header.par2.parl); cb=(CButton *) GetDlgItem(IDC_PAR_UNDEFINED); break; case 1: //colour - m_param2.Format("%ld",the_effect.header.par2.parl); + m_param2.Format(longformat,the_effect.header.par2.parl); cb=(CButton *) GetDlgItem(IDC_PAR_COLOR); break; case 2: //ids - tmp=IDSName(the_effect.header.par2.parl, true); + tmp=IDSName2(the_effect.header.par2.parl, true); if((unsigned long) the_effect.header.par2.parl <9) { m_param2.Format("%d-%s",the_effect.header.par2.parl, IDSType(the_effect.header.par2.parl, true) ); @@ -244,11 +252,11 @@ cb=(CButton *) GetDlgItem(IDC_PAR_IDS); break; case 3: - m_param2.Format("%d-%s",the_effect.header.par2.parl,DamageType(the_effect.header.par2.parl)+DamageStyle(the_effect.header.par2.parl)); + m_param2.Format(longformat+"-%s",the_effect.header.par2.parl,DamageType(the_effect.header.par2.parl)+DamageStyle(the_effect.header.par2.parl)); cb=(CButton *) GetDlgItem(IDC_PAR_DAMAGE); break; case 4: - m_param2.Format("%d",the_effect.header.par2.parl); + m_param2.Format(longformat,the_effect.header.par2.parl); cb=(CButton *) GetDlgItem(IDC_PAR_SPECIAL); break; } @@ -259,12 +267,12 @@ m_param1=colortitle(the_effect.header.par1.parl); break; case 0:case 3: - m_param1.Format("%ld",the_effect.header.par1.parl); + m_param1.Format(longformat,the_effect.header.par1.parl); break; case 2: //ids tmp=IDSToken(tmp, the_effect.header.par1.parl, false); if(tmp.IsEmpty()) tmp="unknown"; - m_param1.Format("%ld-%s",the_effect.header.par1.parl, tmp); + m_param1.Format(longformat+"-%s",the_effect.header.par1.parl, tmp); break; case 4: m_param1.Format("0x%04x %s",the_effect.header.par1.parl,IDSToken("ANIMATE",the_effect.header.par1.parl, false) ); @@ -347,10 +355,11 @@ } } - for(i=0;i<NUM_TMTYPE;i++) + for(i=0;i<NUM_TMTYPE-1;i++) { m_timing_control.AddString(get_timing_type(i)); } + m_timing_control.AddString(get_timing_type(0x1000)); for(i=0;i<NUM_ETTYPE;i++) { @@ -536,6 +545,7 @@ ON_CBN_SELCHANGE(IDC_EFFOPCODE2, OnSelchangeEffopcode) ON_EN_KILLFOCUS(IDC_POS1X, DefaultKillfocus) ON_EN_KILLFOCUS(IDC_POS1Y, DefaultKillfocus) + ON_BN_CLICKED(IDC_HEXADECIMAL, OnHexadecimal) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -949,6 +959,11 @@ RefreshDialog(); } +void CEffEdit::OnHexadecimal() +{ + m_hexadecimal = !m_hexadecimal; + RefreshDialog(); +} void CEffEdit::OnParSpecial() { Modified: chitem/trunk/EffEdit.h =================================================================== --- chitem/trunk/EffEdit.h 2009-08-18 10:35:35 UTC (rev 6921) +++ chitem/trunk/EffEdit.h 2009-08-18 10:41:10 UTC (rev 6922) @@ -48,6 +48,7 @@ CString m_idsname; CString m_opcode; int m_par_type; + int m_hexadecimal; int m_limitedeffect; int m_defduration; CIntMapInt m_efftext; @@ -109,6 +110,7 @@ afx_msg void OnToolsIdsbrowser(); afx_msg void OnDefaultKillfocus(); afx_msg void OnParSpecial(); + afx_msg void OnHexadecimal(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: chitem/trunk/ImageView.cpp =================================================================== --- chitem/trunk/ImageView.cpp 2009-08-18 10:35:35 UTC (rev 6921) +++ chitem/trunk/ImageView.cpp 2009-08-18 10:41:10 UTC (rev 6922) @@ -23,6 +23,7 @@ m_showgrid = FALSE; m_fill = FALSE; //}}AFX_DATA_INIT + m_text=true; m_max=15; m_bm=NULL; m_clipx=0; @@ -59,6 +60,7 @@ CDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CImageView) DDX_Control(pDX, IDC_FILL, m_fill_control); + DDX_Control(pDX, IDC_OVERLAY, m_overlay_control); DDX_Control(pDX, IDC_SHOWGRID, m_showgrid_control); DDX_Control(pDX, IDC_VALUE, m_value_control); DDX_Control(pDX, IDC_SHOWALL, m_showall_control); @@ -72,6 +74,7 @@ DDX_Check(pDX, IDC_SHOWALL, m_showall); DDX_Check(pDX, IDC_SHOWGRID, m_showgrid); DDX_Check(pDX, IDC_FILL, m_fill); + DDX_Check(pDX, IDC_OVERLAY, m_text); //}}AFX_DATA_MAP if(m_max && (m_value!=-1) ) @@ -99,6 +102,7 @@ ON_CBN_SELCHANGE(IDC_VALUE, OnSelchangeValue) ON_BN_CLICKED(IDC_SHOWGRID, OnShowgrid) ON_BN_CLICKED(IDC_FILL, OnFill) + ON_BN_CLICKED(IDC_OVERLAY, OnOverlay) //}}AFX_MSG_MAP ON_COMMAND(ID_REFRESH, RefreshDialog) END_MESSAGE_MAP() @@ -185,6 +189,11 @@ } } +void CImageView::SetOverlay(bool type) +{ + m_text=type; +} + unsigned long boolean_palette[2]={0,1}; void CImageView::SetMapType(int maptype, LPBYTE map) @@ -696,13 +705,25 @@ { if(m_showall || (m_map[p]==m_value) ) { - if(m_max==255) tmpstr.Format("%02x",m_map[p]); - else tmpstr.Format("%d",m_map[p]); - int tx=i+(xs-10)/2; - if(tx<0) tx=0; - int ty=j+(ys-12)/2; - if(ty<0) ty=0; - dcBmp.TextOut(tx,ty,tmpstr); + if (m_text) { + if(m_max==255) tmpstr.Format("%02x",m_map[p]); + else tmpstr.Format("%d",m_map[p]); + int tx=i+(xs-10)/2; + if(tx<0) tx=0; + int ty=j+(ys-12)/2; + if(ty<0) ty=0; + dcBmp.TextOut(tx,ty,tmpstr); + } else { + CRect r; + COLORREF c = m_palette[m_map[p]]; + + CBrush b((c&0xff)<<16 | (c&0xff0000)>>16 | c&0xff00 ); + r.left=i+xs/3; + r.top=j+ys/3; + r.right=i+2*xs/3; + r.bottom=j+2*ys/3; + dcBmp.FrameRect(r, &b); + } } p++; } @@ -874,6 +895,7 @@ if(m_max>1) { m_showall_control.ShowWindow(!!(m_enablebutton&IW_SHOWALL)); + m_overlay_control.ShowWindow(!!(m_enablebutton&IW_SHOWALL)); } m_showgrid_control.ShowWindow(!!(m_enablebutton&IW_SHOWGRID)); @@ -883,6 +905,7 @@ if(m_enablebutton&IW_SHOWALL) { m_showall_control.SetWindowPos(0,(rect.Width()-brect.Width())*3/4+140,rect.Height()+adjustx+25 ,0,0, SWP_SHOWWINDOW|SWP_NOZORDER|SWP_NOSIZE); + m_overlay_control.SetWindowPos(0,(rect.Width()-brect.Width())*3/4+210,rect.Height()+adjustx+25 ,0,0, SWP_SHOWWINDOW|SWP_NOZORDER|SWP_NOSIZE); } if(m_enablebutton&(IW_EDITMAP|IW_GETPOLYGON) ) { @@ -1390,6 +1413,12 @@ PostMessage(WM_COMMAND,ID_REFRESH,0); } +void CImageView::OnOverlay() +{ + UpdateData(UD_RETRIEVE); + PostMessage(WM_COMMAND,ID_REFRESH,0); +} + void CImageView::OnSelchangeValue() { m_value=((CComboBox *) GetDlgItem(IDC_VALUE))->GetCurSel(); Modified: chitem/trunk/ImageView.h =================================================================== --- chitem/trunk/ImageView.h 2009-08-18 10:35:35 UTC (rev 6921) +++ chitem/trunk/ImageView.h 2009-08-18 10:41:10 UTC (rev 6922) @@ -37,6 +37,7 @@ CImageView(CWnd* pParent = NULL); // standard constructor void InitView(int flags, Cmos *my_mos=NULL); //sets the viewer to the current mos dimensions void SetMapType(int maptype, LPBYTE map); + void SetOverlay(bool type); void RedrawContent(); void RefreshDialog(); void SetupAnimationPlacement(Cbam *bam, int orgx, int orgy, int frame); @@ -47,6 +48,7 @@ //{{AFX_DATA(CImageView) enum { IDD = IDD_IMAGEVIEW }; CButton m_fill_control; + CButton m_overlay_control; CButton m_showgrid_control; CComboBox m_value_control; CButton m_showall_control; @@ -61,6 +63,7 @@ BOOL m_showall; BOOL m_showgrid; BOOL m_fill; + BOOL m_text; //}}AFX_DATA int m_actvertex, m_vertexcount; int m_max; @@ -130,6 +133,7 @@ afx_msg void OnSelchangeValue(); afx_msg void OnShowgrid(); afx_msg void OnFill(); + afx_msg void OnOverlay(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: chitem/trunk/ProjEdit.cpp =================================================================== --- chitem/trunk/ProjEdit.cpp 2009-08-18 10:35:35 UTC (rev 6921) +++ chitem/trunk/ProjEdit.cpp 2009-08-18 10:41:10 UTC (rev 6922) @@ -33,7 +33,7 @@ hbs=hbb=0; } -static int sparkboxids[]={ IDC_SPARKCOLOUR, IDC_UNKNOWN0E, 0}; +static int sparkboxids[]={ IDC_SPARKCOLOUR, IDC_UNKNOWN0E, IDC_UNKNOWN2A, 0}; static int bamcolorids[]={IDC_MPTRAVEL, IDC_U1, IDC_U2, IDC_U3, IDC_U4, IDC_U5, IDC_U6, IDC_U7, 0}; static int smokeboxids[]={IDC_DELAY, IDC_MPSMOKE, IDC_SMOKETYPE, @@ -72,6 +72,7 @@ DDX_Text(pDX, IDC_FLAGS, the_projectile.header.sparks); DDX_Text(pDX, IDC_UNKNOWN0E, the_projectile.header.unknown0e); + DDX_Text(pDX, IDC_UNKNOWN2A, the_projectile.header.spknumber); RetrieveResref(tmpstr,the_projectile.header.wavc1); DDX_Text(pDX, IDC_SOUND1, tmpstr); @@ -90,7 +91,7 @@ tmpstr=get_spark_colour(the_projectile.header.spkcolour); DDX_Text(pDX, IDC_SPARKCOLOUR, tmpstr); - the_projectile.header.spkcolour=strtonum(tmpstr); + the_projectile.header.spkcolour=(short) strtonum(tmpstr); tmpstr.Format("%d", the_projectile.header.attr); DDX_Text(pDX, IDC_ATTR, tmpstr); @@ -200,6 +201,14 @@ BEGIN_MESSAGE_MAP(CProjEdit, CDialog) //{{AFX_MSG_MAP(CProjEdit) + ON_COMMAND(ID_FILE_SAVE, OnSave) + ON_COMMAND(ID_FILE_TBG, OnFileTbg) + ON_COMMAND(ID_FILE_TP2, OnFileTp2) + ON_COMMAND(ID_FILE_NEW, OnNew) + ON_COMMAND(ID_FILE_LOAD, OnLoad) + ON_COMMAND(ID_FILE_LOADEXTERNALSCRIPT, OnLoadex) + ON_COMMAND(ID_FILE_SAVEAS, OnSaveas) + ON_COMMAND(ID_CHECK, OnCheck) ON_BN_CLICKED(IDC_LOAD, OnLoad) ON_BN_CLICKED(IDC_LOADEX, OnLoadex) ON_BN_CLICKED(IDC_SAVEAS, OnSaveas) @@ -238,7 +247,6 @@ ON_BN_CLICKED(IDC_UNKNOWN154, OnUnknown154) ON_BN_CLICKED(IDC_FLAG3, OnFlag3) ON_BN_CLICKED(IDC_CHECK, OnCheck) - ON_COMMAND(ID_FILE_SAVE, OnSave) ON_BN_CLICKED(IDC_UNKNOWN2C, OnUnknown2c) ON_EN_SETFOCUS(IDC_U1, OnSetfocusU1) ON_EN_SETFOCUS(IDC_U2, OnSetfocusU2) @@ -259,8 +267,6 @@ ON_BN_CLICKED(IDC_BROWSE8, OnBrowse8) ON_BN_CLICKED(IDC_BROWSE13, OnBrowse9) ON_BN_CLICKED(IDC_FLAG4, OnFlag4) - ON_COMMAND(ID_FILE_TBG, OnFileTbg) - ON_COMMAND(ID_FILE_TP2, OnFileTp2) ON_CBN_KILLFOCUS(IDC_TYPE, DefaultKillfocus) ON_EN_KILLFOCUS(IDC_SPEED, DefaultKillfocus) ON_EN_KILLFOCUS(IDC_FLAGS, DefaultKillfocus) @@ -297,13 +303,9 @@ ON_EN_KILLFOCUS(IDC_U5, DefaultKillfocus) ON_EN_KILLFOCUS(IDC_U6, DefaultKillfocus) ON_EN_KILLFOCUS(IDC_U7, DefaultKillfocus) - ON_COMMAND(ID_FILE_NEW, OnNew) - ON_COMMAND(ID_FILE_LOAD, OnLoad) - ON_COMMAND(ID_FILE_LOADEXTERNALSCRIPT, OnLoadex) - ON_COMMAND(ID_FILE_SAVEAS, OnSaveas) - ON_COMMAND(ID_CHECK, OnCheck) ON_EN_KILLFOCUS(IDC_SEQ1, DefaultKillfocus) ON_EN_KILLFOCUS(IDC_SEQ2, DefaultKillfocus) + ON_EN_KILLFOCUS(IDC_UNKNOWN2A, DefaultKillfocus) //}}AFX_MSG_MAP END_MESSAGE_MAP() Modified: chitem/trunk/Structs.h =================================================================== --- chitem/trunk/Structs.h 2009-08-18 10:35:35 UTC (rev 6921) +++ chitem/trunk/Structs.h 2009-08-18 10:41:10 UTC (rev 6922) @@ -535,7 +535,8 @@ char wavc1[8]; char wavc2[8]; char wavc3[8]; - long spkcolour; //cannot be 0 if there are sparks (must be 1-12) + short spkcolour; //cannot be 0 if there are sparks (must be 1-12) + short spknumber; long extflags; //0x2c //flags used by gemrb long text; //0x30 //text strref long rgb; //0x34 //rgb single pulse color @@ -596,9 +597,8 @@ unsigned long power; parameter par1; parameter par2; - unsigned char timing; - unsigned char unknown; - unsigned short unknown2; + unsigned short timing; + unsigned short unknown2; //part of timing unsigned long duration; unsigned short prob2; unsigned short prob1; Modified: chitem/trunk/chitem.clw =================================================================== --- chitem/trunk/chitem.clw 2009-08-18 10:35:35 UTC (rev 6921) +++ chitem/trunk/chitem.clw 2009-08-18 10:41:10 UTC (rev 6922) @@ -2,7 +2,7 @@ [General Info] Version=1 -LastClass=CTormentCre +LastClass=CAreaAmbient LastTemplate=CDialog NewFileInclude1=#include "stdafx.h" NewFileInclude2=#include "chitem.h" @@ -232,142 +232,142 @@ Resource123=IDD_GAMEGENERAL Class98=IcewindCre Resource124=IDR_SHORTCUT -Resource125=IDD_CREATURESKILLS (English (U.S.)) -Resource126=IDD_ITEMGENERAL (English (U.S.)) -Resource127=IDD_SHOWLOG (English (U.S.)) -Resource128=IDD_EXTRACT2 (English (U.S.)) -Resource129=IDR_MENUBAR (English (U.S.)) -Resource130=IDD_SPELLEFFECT (English (U.S.)) -Resource131=IDD_GAMEEDIT (English (U.S.)) -Resource132=IDD_AREAVARIABLE (English (U.S.)) -Resource133=IDD_GAMEPCINFO (English (U.S.)) -Resource134=IDD_IDSEDIT (English (U.S.)) -Resource135=IDD_STOREEDIT (English (U.S.)) -Resource136=IDD_FINDITEM (English (U.S.)) -Resource137=IDD_PROJEXT (English (U.S.)) -Resource138=IDD_STORERENTAL (English (U.S.)) -Resource139=IDD_AREASONGS (English (U.S.)) -Resource140=IDR_GAME (English (U.S.)) -Resource141=IDD_ADDLINK (English (U.S.)) -Resource142=IDD_CREATUREIWD2 (English (U.S.)) -Resource143=IDD_AREATRIGGERSTRINGS (English (U.S.)) -Resource144=IDD_SPELLGENERAL (English (U.S.)) -Resource145=IDD_STOREEXTRA (English (U.S.)) -Resource146=IDD_AREAENTRANCE (English (U.S.)) -Resource147=IDD_AREAMAP (English (U.S.)) -Resource148=IDD_CREATURESTRINGS (English (U.S.)) -Resource149=IDD_CREATUREICONS (English (U.S.)) -Resource150=IDR_STORE (English (U.S.)) -Resource151=IDD_STOREITEMS (English (U.S.)) -Resource152=IDD_POLYGON (English (U.S.)) -Resource153=IDR_TILE (English (U.S.)) -Resource154=IDD_AREASPAWN (English (U.S.)) -Resource155=IDR_EFFECT (English (U.S.)) -Resource156=IDD_CREATUREIWD (English (U.S.)) -Resource157=IDR_MUSIC (English (U.S.)) -Resource158=IDD_AREAGENERAL (English (U.S.)) -Resource159=IDD_PROGRESS (English (U.S.)) -Resource160=IDD_SPELLDESC (English (U.S.)) -Resource161=IDR_WORLDMAP (English (U.S.)) -Resource162=IDD_STOREDRINKS (English (U.S.)) -Resource163=IDD_PROJGEMRB (English (U.S.)) -Resource164=IDR_SPELL (English (U.S.)) -Resource165=IDD_DIALOGEDIT (English (U.S.)) -Resource166=IDD_AREACONTAINER (English (U.S.)) -Resource167=IDD_STOREGENERAL (English (U.S.)) -Resource168=IDD_PANICBUTTON (English (U.S.)) -Resource169=IDD_CREATUREEDIT (English (U.S.)) -Resource170=IDR_ITEM (English (U.S.)) -Resource171=IDR_IDS (English (U.S.)) -Resource172=IDD_ITEMUSE (English (U.S.)) -Resource173=IDD_ANIMDIALOG -Resource174=IDD_PROJAREAGEMRB (English (U.S.)) -Resource175=IDD_STRREFDLG (English (U.S.)) -Resource176=IDR_BAMMENU (English (U.S.)) -Resource177=IDD_AREAAMBIENT (English (U.S.)) -Resource178=IDD_SCRIPTEDIT (English (U.S.)) -Resource179=IDR_CREATURE (English (U.S.)) -Resource180=IDD_MUSEDIT (English (U.S.)) -Resource181=IDD_EDIT (English (U.S.)) -Resource182=IDR_TLKMENU (English (U.S.)) -Resource183=IDD_CHITEM_DIALOG (English (U.S.)) -Resource184=IDD_IMAGEVIEW (English (U.S.)) -Resource185=IDD_TEXTVIEW (English (U.S.)) -Resource186=IDR_VVC (English (U.S.)) -Resource187=IDD_IAPDIALOG (English (U.S.)) -Resource188=IDD_SAVHANDLE (English (U.S.)) -Resource189=IDD_ITEMEFFECT (English (U.S.)) -Resource190=IDD_COMPAT (English (U.S.)) -Resource191=IDR_SRC (English (U.S.)) -Resource192=IDD_SPELLEDIT (English (U.S.)) -Resource193=IDR_CHUI (English (U.S.)) -Resource194=IDD_CREATUREGENERAL (English (U.S.)) -Resource195=IDD_WEDEDIT (English (U.S.)) -Resource196=IDD_EXTRACT (English (U.S.)) -Resource197=IDD_AREADOOR (English (U.S.)) -Resource198=IDR_WEDMENU (English (U.S.)) -Resource199=IDD_ITEMEXTRA (English (U.S.)) -Resource200=IDD_AREAACTOR (English (U.S.)) -Resource201=IDD_ABOUTBOX (English (U.S.)) -Resource202=IDD_PALETTE (English (U.S.)) -Resource203=IDD_AREATRIGGER (English (U.S.)) -Resource204=IDD_CFB (English (U.S.)) -Resource205=IDR_SCRIPT (English (U.S.)) -Resource206=IDD_ITEMDESC (English (U.S.)) -Resource207=IDD_MOSEDIT (English (U.S.)) -Resource208=IDD_SPELLTOOL (English (U.S.)) -Resource209=IDD_SRCEDIT (English (U.S.)) -Resource210=IDD_CREATUREITEMS (English (U.S.)) -Resource211=IDD_COLORPICKER (English (U.S.)) -Resource212=IDD_AREAINT (English (U.S.)) -Resource213=IDD_BAMEDIT (English (U.S.)) -Resource214=IDD_WEIDU (English (U.S.)) -Resource215=IDD_VARIABLES (English (U.S.)) -Resource216=IDD_GAMEGENERAL (English (U.S.)) -Resource217=IDD_SPELLEXTRA (English (U.S.)) -Resource218=IDD_2DAEDIT (English (U.S.)) -Resource219=IDR_2DA (English (U.S.)) -Resource220=IDR_CHITIN (English (U.S.)) -Resource221=IDR_AREA (English (U.S.)) -Resource222=IDD_KEYEDIT (English (U.S.)) -Resource223=IDD_PROJEDIT (English (U.S.)) -Resource224=IDD_CREATUREUNKNOWN (English (U.S.)) -Resource225=IDD_MASSCLEAR (English (U.S.)) -Resource226=IDD_SCHEDULE (English (U.S.)) -Resource227=IDD_AREAANIM (English (U.S.)) -Resource228=IDD_ITEMEDIT (English (U.S.)) -Resource229=IDD_VVCEDIT (English (U.S.)) -Resource230=IDD_EFFEDIT (English (U.S.)) -Resource231=IDD_MAPEDIT (English (U.S.)) -Resource232=IDD_ITEMICONS (English (U.S.)) -Resource233=IDD_CHECK (English (U.S.)) -Resource234=IDD_TISDIALOG (English (U.S.)) -Resource235=IDD_CREATUREPST (English (U.S.)) -Resource236=IDD_MAPLINK (English (U.S.)) -Resource237=IDD_WEDPOLY (English (U.S.)) -Resource238=IDD_CREATURELEVELS (English (U.S.)) -Resource239=IDD_AREAEDIT (English (U.S.)) -Resource240=IDD_SEARCHNODE (English (U.S.)) -Resource241=IDD_SPELLEQUIP (English (U.S.)) -Resource242=IDR_PROJECT (English (U.S.)) -Resource243=IDD_GAMESTATS (English (U.S.)) -Resource244=IDD_ITEMEQUIP (English (U.S.)) -Resource245=IDD_AREAPROJ (English (U.S.)) +Resource125=IDD_POLYGON (English (U.S.)) +Resource126=IDD_AREASONGS (English (U.S.)) +Resource127=IDR_SCRIPT (English (U.S.)) +Resource128=IDD_SEARCHNODE (English (U.S.)) +Resource129=IDD_EFFEDIT (English (U.S.)) +Resource130=IDD_PANICBUTTON (English (U.S.)) +Resource131=IDR_MENUBAR (English (U.S.)) +Resource132=IDD_CREATUREOVR (English (U.S.)) +Resource133=IDD_ITEMEQUIP (English (U.S.)) +Resource134=IDR_EFFECT (English (U.S.)) +Resource135=IDD_VVCEDIT (English (U.S.)) +Resource136=IDD_IAPDIALOG (English (U.S.)) +Resource137=IDD_PROJAREAGEMRB (English (U.S.)) +Resource138=IDD_CHITEM_DIALOG (English (U.S.)) +Resource139=IDD_GAMEGENERAL (English (U.S.)) +Resource140=IDD_ITEMICONS (English (U.S.)) +Resource141=IDR_TREEMENU (English (U.S.)) +Resource142=IDD_EXTRACT (English (U.S.)) +Resource143=IDD_SPELLDESC (English (U.S.)) +Resource144=IDD_COLORPICKER (English (U.S.)) +Resource145=IDD_IDSEDIT (English (U.S.)) +Resource146=IDD_WEDTILE (English (U.S.)) +Resource147=IDD_STOREEXTRA (English (U.S.)) +Resource148=IDR_WEDMENU (English (U.S.)) +Resource149=IDD_ABOUTBOX (English (U.S.)) +Resource150=IDD_CREATUREEDIT (English (U.S.)) +Resource151=IDD_GAMEEDIT (English (U.S.)) +Resource152=IDD_PROGRESS (English (U.S.)) +Resource153=IDD_CREATURESKILLS (English (U.S.)) +Resource154=IDD_CHUIEDIT (English (U.S.)) +Resource155=IDR_PROJECT (English (U.S.)) +Resource156=IDD_ITEMEFFECT (English (U.S.)) +Resource157=IDD_AREAVARIABLE (English (U.S.)) +Resource158=IDD_WEDEDIT (English (U.S.)) +Resource159=IDD_AREAMAP (English (U.S.)) +Resource160=IDD_AREADOOR (English (U.S.)) +Resource161=IDD_ITEMDESC (English (U.S.)) +Resource162=IDD_CHECK (English (U.S.)) +Resource163=IDD_STOREGENERAL (English (U.S.)) +Resource164=IDD_ITEMEXTRA (English (U.S.)) +Resource165=IDD_CREATURELEVELS (English (U.S.)) +Resource166=IDD_AREATRIGGERSTRINGS (English (U.S.)) +Resource167=IDD_PROJEDIT (English (U.S.)) +Resource168=IDR_2DA (English (U.S.)) +Resource169=IDD_SRCEDIT (English (U.S.)) +Resource170=IDD_SAVHANDLE (English (U.S.)) +Resource171=IDD_CFB (English (U.S.)) +Resource172=IDD_AREAAMBIENT (English (U.S.)) +Resource173=IDD_MAPEDIT (English (U.S.)) +Resource174=IDR_BAMMENU (English (U.S.)) +Resource175=IDR_VVC (English (U.S.)) +Resource176=IDD_VARIABLES (English (U.S.)) +Resource177=IDD_AREATRIGGER (English (U.S.)) +Resource178=IDD_ITEMEDIT (English (U.S.)) +Resource179=IDR_GAME (English (U.S.)) +Resource180=IDD_AREAINT (English (U.S.)) +Resource181=IDR_AREA (English (U.S.)) +Resource182=IDD_KEYEDIT (English (U.S.)) +Resource183=IDD_2DAEDIT (English (U.S.)) +Resource184=IDD_CREATUREITEMS (English (U.S.)) +Resource185=IDD_GAMESTATS (English (U.S.)) +Resource186=IDD_ITEMPICKER (English (U.S.)) +Resource187=IDR_CREATURE (English (U.S.)) +Resource188=IDD_CREATUREICONS (English (U.S.)) +Resource189=IDR_ITEM (English (U.S.)) +Resource190=IDD_MOSEDIT (English (U.S.)) +Resource191=IDD_SCHEDULE (English (U.S.)) +Resource192=IDD_MUSEDIT (English (U.S.)) +Resource193=IDD_STOREITEMS (English (U.S.)) +Resource194=IDD_EDIT (English (U.S.)) +Resource195=IDD_MASSCLEAR (English (U.S.)) +Resource196=IDD_AREAGENERAL (English (U.S.)) +Resource197=IDD_CREATUREIWD2 (English (U.S.)) +Resource198=IDD_PROJEXT (English (U.S.)) +Resource199=IDD_BAMEDIT (English (U.S.)) +Resource200=IDD_AREAANIM (English (U.S.)) +Resource201=IDD_CREATUREGENERAL (English (U.S.)) +Resource202=IDD_CREATURESTRINGS (English (U.S.)) +Resource203=IDD_SPELLTOOL (English (U.S.)) +Resource204=IDD_CREATUREEFF (English (U.S.)) +Resource205=IDD_SPELLEXTRA (English (U.S.)) +Resource206=IDR_SRC (English (U.S.)) +Resource207=IDR_SPELL (English (U.S.)) +Resource208=IDD_WEIDU (English (U.S.)) +Resource209=IDD_STOREDRINKS (English (U.S.)) +Resource210=IDD_AREACONTAINER (English (U.S.)) +Resource211=IDR_WORLDMAP (English (U.S.)) +Resource212=IDD_CREATUREIWD (English (U.S.)) +Resource213=IDD_CREATURERES (English (U.S.)) +Resource214=IDD_MAPLINK (English (U.S.)) +Resource215=IDD_AREASPAWN (English (U.S.)) +Resource216=IDD_ITEMUSE (English (U.S.)) +Resource217=IDD_STRREFDLG (English (U.S.)) +Resource218=IDR_STORE (English (U.S.)) +Resource219=IDD_SPELLEDIT (English (U.S.)) +Resource220=IDD_AREAENTRANCE (English (U.S.)) +Resource221=IDD_PALETTE (English (U.S.)) +Resource222=IDR_CHITIN (English (U.S.)) +Resource223=IDD_AREAEDIT (English (U.S.)) +Resource224=IDD_ADDLINK (English (U.S.)) +Resource225=IDD_SPELLEQUIP (English (U.S.)) +Resource226=IDD_TISDIALOG (English (U.S.)) +Resource227=IDR_TILE (English (U.S.)) +Resource228=IDD_CREATUREUNKNOWN (English (U.S.)) +Resource229=IDD_DIALOGEDIT (English (U.S.)) +Resource230=IDD_GAMEPCINFO (English (U.S.)) +Resource231=IDD_AREAACTOR (English (U.S.)) +Resource232=IDD_CREATUREPST (English (U.S.)) +Resource233=IDD_SPELLGENERAL (English (U.S.)) +Resource234=IDD_ANIMDIALOG +Resource235=IDR_TLKMENU (English (U.S.)) +Resource236=IDD_PROJGEMRB (English (U.S.)) +Resource237=IDR_CHUI (English (U.S.)) +Resource238=IDD_EXTRACT2 (English (U.S.)) +Resource239=IDD_WEDPOLY (English (U.S.)) +Resource240=IDD_AREAPROJ (English (U.S.)) +Resource241=IDD_SHOWLOG (English (U.S.)) +Resource242=IDR_IDS (English (U.S.)) +Resource243=IDD_ITEMGENERAL (English (U.S.)) +Resource244=IDD_SPELLEFFECT (English (U.S.)) +Resource245=IDD_STOREEDIT (English (U.S.)) Class99=CAreaTriggerString Class100=CPCInfo -Resource246=IDD_CREATUREEFF (English (U.S.)) +Resource246=IDR_MUSIC (English (U.S.)) Class101=CCreatureOverlay -Resource247=IDD_WEDTILE (English (U.S.)) +Resource247=IDD_SCRIPTEDIT (English (U.S.)) Class102=IWD2Creature -Resource248=IDD_CREATUREOVR (English (U.S.)) +Resource248=IDD_FINDITEM (English (U.S.)) Class103=CAnimDialog -Resource249=IDR_TREEMENU (English (U.S.)) +Resource249=IDD_STORERENTAL (English (U.S.)) Class104=CCreatureLevels -Resource250=IDD_CREATURERES (English (U.S.)) +Resource250=IDD_TEXTVIEW (English (U.S.)) Class105=CAreaProj -Resource251=IDD_ITEMPICKER (English (U.S.)) +Resource251=IDD_COMPAT (English (U.S.)) Class106=CProjGemRB -Resource252=IDD_CHUIEDIT (English (U.S.)) +Resource252=IDD_IMAGEVIEW (English (U.S.)) Class107=CProjAreaGemRB Resource253=IDR_SHORTCUT (English (U.S.)) @@ -1341,7 +1341,7 @@ ImplementationFile=EffEdit.cpp BaseClass=CDialog Filter=D -LastObject=IDC_POS1Y +LastObject=CEffEdit VirtualFilter=dWC [DLG:IDD_VARIABLES] @@ -2481,7 +2481,7 @@ ImplementationFile=ProjEdit.cpp BaseClass=CDialog Filter=D -LastObject=IDC_PALETTE +LastObject=IDC_UNKNOWN2A VirtualFilter=dWC [DLG:IDD_AREAENTRANCE] @@ -3169,7 +3169,7 @@ HeaderFile=AreaProperties.h ImplementationFile=AreaProperties.cpp BaseClass=CPropertyPage -LastObject=IDC_AMBIENTPICKER +LastObject=CAreaAmbient Filter=D VirtualFilter=dWC @@ -5666,7 +5666,7 @@ [DLG:IDD_IMAGEVIEW (English (U.S.))] Type=1 Class=CImageView -ControlCount=11 +ControlCount=12 Control1=IDCANCEL,button,1342242817 Control2=IDC_BITMAP,static,1342177550 Control3=IDC_HORIZONTAL,scrollbar,1342177282 @@ -5678,6 +5678,7 @@ Control9=IDC_VALUE,combobox,1075904578 Control10=IDC_SHOWGRID,button,1073807363 Control11=IDC_FILL,button,1073807363 +Control12=IDC_OVERLAY,button,1342242819 [DLG:IDD_ABOUTBOX (English (U.S.))] Type=1 @@ -6300,102 +6301,104 @@ [DLG:IDD_EFFEDIT (English (U.S.))] Type=1 Class=CEffEdit -ControlCount=95 +ControlCount=97 Control1=IDC_EFFOPCODE,combobox,1075904578 Control2=IDC_EFFTARGET,combobox,1344340034 Control3=IDC_TIMING,combobox,1344340034 Control4=IDC_DURATION,edit,1350639744 Control5=IDC_PAR1,edit,1350631552 -Control6=IDC_EXPLODE1,button,1342246915 -Control7=IDC_PROB1,edit,1350639744 -Control8=IDC_PROB2,edit,1350639744 -Control9=IDC_UNKNOWN,edit,1350631552 -Control10=IDC_TEXT,edit,1350631552 -Control11=IDC_TEXT2,edit,1350631552 -Control12=IDC_PAR2,edit,1350631552 -Control13=IDC_EXPLODE2,button,1342246915 -Control14=IDC_ROLL2,edit,1350639744 -Control15=IDC_DIE2,edit,1350639744 -Control16=IDC_POWER,edit,1350639744 -Control17=IDC_UNKNOWN2C,edit,1350631552 -Control18=IDC_PAR_UNDEFINED,button,1342312457 -Control19=IDC_PAR_COLOR,button,1342181385 -Control20=IDC_PAR_IDS,button,1342181385 -Control21=IDC_PAR_DAMAGE,button,1342181385 -Control22=IDC_SAVETYPE,combobox,1344339970 -Control23=IDC_SAVEBONUS,edit,1350631552 -Control24=IDC_RESIST,combobox,1344340034 -Control25=IDC_SCHOOL,combobox,1344340034 -Control26=IDC_RESOURCE,edit,1350631560 -Control27=IDC_BROWSE,button,1342242816 -Control28=IDC_PLAY,button,1342242816 -Control29=IDC_VVC,edit,1350631560 -Control30=IDC_BROWSE2,button,1342242816 -Control31=IDC_RESOURCE3,edit,1350631560 -Control32=IDC_BROWSE4,button,1342242816 -Control33=IDC_SECTYPE,combobox,1344340034 -Control34=IDC_VARNAME,edit,1350631560 -Control35=IDC_PAR3,edit,1350631552 -Control36=IDC_PAR4,edit,1350631552 -Control37=IDC_U3,edit,1350631552 -Control38=IDC_U4,edit,1350631552 -Control39=IDC_U5,edit,1350631552 -Control40=IDC_SOURCE,edit,1350631552 -Control41=IDC_BROWSE3,button,1342242816 -Control42=IDC_LOAD,button,1342242817 -Control43=IDC_LOADEX,button,1342242816 -Control44=IDC_SAVEAS,button,1342242816 -Control45=IDC_NEW,button,1342242816 -Control46=IDC_CHECK,button,1342242816 -Control47=IDCANCEL,button,1342242816 -Control48=IDC_DESCRIPTION,edit,1352734980 -Control49=IDC_STATIC,static,1342308352 -Control50=IDC_STATIC,static,1342308352 -Control51=IDC_PARLABEL1,static,1342308352 -Control52=IDC_PARLABEL2,static,1342308352 -Control53=IDC_DURATIONLABEL,static,1342308352 -Control54=IDC_STATIC,static,1342308352 -Control55=IDC_STATIC,static,1342308352 -Control56=IDC_STATIC,static,1342308352 -Control57=IDC_STATIC,static,1342308352 -Control58=IDC_STATIC,static,1342308352 -Control59=IDC_STATIC,static,1342308352 -Control60=IDC_STATIC,static,1342308352 -Control61=IDC_STATIC,button,1342210055 -Control62=IDC_STATIC,static,1342308352 +Control6=IDC_PAR1B1,edit,1082196096 +Control7=IDC_PAR1B2,edit,1082196096 +Control8=IDC_PAR1B3,edit,1082196096 +Control9=IDC_PAR1B4,edit,1082196096 +Control10=IDC_EXPLODE1,button,1342246915 +Control11=IDC_PROB1,edit,1350639744 +Control12=IDC_PROB2,edit,1350639744 +Control13=IDC_UNKNOWN,edit,1350631552 +Control14=IDC_TEXT,edit,1350631552 +Control15=IDC_TEXT2,edit,1350631552 +Control16=IDC_PAR2,edit,1350631552 +Control17=IDC_PAR2B1,edit,1082196096 +Control18=IDC_PAR2B2,edit,1082196096 +Control19=IDC_PAR2B3,edit,1082196096 +Control20=IDC_PAR2B4,edit,1082196096 +Control21=IDC_EXPLODE2,button,1342246915 +Control22=IDC_ROLL2,edit,1350639744 +Control23=IDC_DIE2,edit,1350639744 +Control24=IDC_POWER,edit,1350639744 +Control25=IDC_UNKNOWN2C,edit,1350631552 +Control26=IDC_PAR_UNDEFINED,button,1342312457 +Control27=IDC_PAR_COLOR,button,1342181385 +Control28=IDC_PAR_IDS,button,1342181385 +Control29=IDC_PAR_DAMAGE,button,1342181385 +Control30=IDC_PAR_ANIM,button,1342181385 +Control31=IDC_HEXADECIMAL,button,1342242819 +Control32=IDC_SAVETYPE,combobox,1344339970 +Control33=IDC_SAVEBONUS,edit,1350631552 +Control34=IDC_RESIST,combobox,1344340034 +Control35=IDC_SCHOOL,combobox,1344340034 +Control36=IDC_RESOURCE,edit,1350631560 +Control37=IDC_BROWSE,button,1342242816 +Control38=IDC_PLAY,button,1342242816 +Control39=IDC_VVC,edit,1350631560 +Control40=IDC_BROWSE2,button,1342242816 +Control41=IDC_RESOURCE3,edit,1350631560 +Control42=IDC_BROWSE4,button,1342242816 +Control43=IDC_SECTYPE,combobox,1344340034 +Control44=IDC_VARNAME,edit,1350631560 +Control45=IDC_PAR3,edit,1350631552 +Control46=IDC_PAR4,edit,1350631552 +Control47=IDC_U3,edit,1350631552 +Control48=IDC_U4,edit,1350631552 +Control49=IDC_U5,edit,1350631552 +Control50=IDC_SOURCE,edit,1350631552 +Control51=IDC_BROWSE3,button,1342242816 +Control52=IDC_POS1X,edit,1350631552 +Control53=IDC_POS1Y,edit,1350631552 +Control54=IDC_POS2X,edit,1350631552 +Control55=IDC_POS2Y,edit,1350631552 +Control56=IDC_LOAD,button,1342242817 +Control57=IDC_LOADEX,button,1342242816 +Control58=IDC_SAVEAS,button,1342242816 +Control59=IDC_NEW,button,1342242816 +Control60=IDC_CHECK,button,1342242816 +Control61=IDCANCEL,button,1342242816 +Control62=IDC_DESCRIPTION,edit,1352734980 Control63=IDC_STATIC,static,1342308352 Control64=IDC_STATIC,static,1342308352 -Control65=IDC_STATIC,static,1342308352 -Control66=IDC_STATIC,static,1342308352 -Control67=IDC_STATIC,static,1342308352 -Control68=IDC_PAR1B1,edit,1082196096 -Control69=IDC_PAR1B2,edit,1082196096 -Control70=IDC_PAR1B3,edit,1082196096 -Control71=IDC_PAR1B4,edit,1082196096 -Control72=IDC_PAR2B1,edit,1082196096 -Control73=IDC_PAR2B2,edit,1082196096 -Control74=IDC_PAR2B3,edit,1082196096 -Control75=IDC_PAR2B4,edit,1082196096 +Control65=IDC_PARLABEL1,static,1342308352 +Control66=IDC_PARLABEL2,static,1342308352 +Control67=IDC_DURATIONLABEL,static,1342308352 +Control68=IDC_STATIC,static,1342308352 +Control69=IDC_STATIC,static,1342308352 +Control70=IDC_STATIC,static,1342308352 +Control71=IDC_STATIC,static,1342308352 +Control72=IDC_STATIC,static,1342308352 +Control73=IDC_STATIC,static,1342308352 +Control74=IDC_STATIC,static,1342308352 +Control75=IDC_STATIC,button,1342210055 Control76=IDC_STATIC,static,1342308352 Control77=IDC_STATIC,static,1342308352 -Control78=IDC_EFFOPCODE2,combobox,1075904834 +Control78=IDC_STATIC,static,1342308352 Control79=IDC_STATIC,static,1342308352 Control80=IDC_STATIC,static,1342308352 Control81=IDC_STATIC,static,1342308352 Control82=IDC_STATIC,static,1342308352 Control83=IDC_STATIC,static,1342308352 -Control84=IDC_STATIC,static,1342308352 +Control84=IDC_EFFOPCODE2,combobox,1075904834 Control85=IDC_STATIC,static,1342308352 Control86=IDC_STATIC,static,1342308352 Control87=IDC_STATIC,static,1342308352 Control88=IDC_STATIC,static,1342308352 -Control89=IDC_POS1X,edit,1350631552 +Control89=IDC_STATIC,static,1342308352 Control90=IDC_STATIC,static,1342308352 -Control91=IDC_POS1Y,edit,1350631552 +Control91=IDC_STATIC,static,1342308352 Control92=IDC_STATIC,static,1342308352 -Control93=IDC_POS2X,edit,1350631552 -Control94=IDC_POS2Y,edit,1350631552 +Control93=IDC_STATIC,static,1342308352 +Control94=IDC_STATIC,static,1342308352 Control95=IDC_STATIC,static,1342308352 +Control96=IDC_STATIC,static,1342308352 +Control97=IDC_STATIC,static,1342308352 [DLG:IDD_VARIABLES (English (U.S.))] Type=1 @@ -7183,118 +7186,120 @@ [DLG:IDD_PROJEDIT (English (U.S.))] Type=1 Class=CProjEdit -ControlCount=111 -Control1=IDC_TYPE,combobox,1344339970 -Control2=IDC_SPEED,edit,1350631552 -Control3=IDC_SOUND1,edit,1350631560 -Control4=IDC_BROWSE1,button,1342242816 -Control5=IDC_PLAY1,button,1342242816 -Control6=IDC_SOUND2,edit,1350631560 -Control7=IDC_BROWSE2,button,1342242816 -Control8=IDC_PLAY2,button,1342242816 -Control9=IDC_SOUND3,edit,1350631560 -Control10=IDC_BROWSE3,button,1342242816 -Control11=IDC_PLAY3,button,1342242816 -Control12=IDC_BAM1,edit,1350631560 -Control13=IDC_BROWSE4,button,1342242816 -Control14=IDC_SEQ1,edit,1350631552 -Control15=IDC_BAM2,edit,1350631560 -Control16=IDC_BROWSE5,button,1342242816 -Control17=IDC_SEQ2,edit,1350631552 -Control18=IDC_PALETTE,edit,1350631560 -Control19=IDC_BROWSE6,button,1342242816 -Control20=IDC_FLAGS,edit,1350631552 -Control21=IDC_FLAG1,button,1342242819 -Control22=IDC_FLAG2,button,1342242819 -Control23=IDC_SPARKCOLOUR,combobox,1344339970 -Control24=IDC_UNKNOWN0E,edit,1350631552 -Control25=IDC_X,edit,1350631552 -Control26=IDC_Y,edit,1350631552 -Control27=IDC_Z,edit,1350631552 -Control28=IDC_DELAY,edit,1350631552 -Control29=IDC_SMOKETYPE,combobox,1344340226 -Control30=IDC_ATTR,edit,1350631552 -Control31=IDC_AIM,combobox,1344339970 -Control32=IDC_ATTR1,button,1342242819 -Control33=IDC_ATTR2,button,1342242819 -Control34=IDC_ATTR3,button,1342242819 -Control35=IDC_ATTR4,button,1342242819 -Control36=IDC_ATTR5,button,1342242819 -Control37=IDC_ATTR6,button,1342242819 -Control38=IDC_ATTR7,button,1342242819 -Control39=IDC_ATTR8,button,1342242819 -Control40=IDC_ATTR9,button,1342242819 -Control41=IDC_ATTR10,button,1342242819 -Control42=IDC_ATTR11,button,1342242819 -Control43=IDC_ATTR12,button,1342242819 -Control44=IDC_ATTR13,button,1342242819 -Control45=IDC_ATTR14,button,1342242819 -Control46=IDC_ATTR15,button,1342242819 -Control47=IDC_ATTR16,button,1342242819 -Control48=IDC_BAM3,edit,1350631560 -Control49=IDC_FREQ1,edit,1350631552 -Control50=IDC_BAM4,edit,1350631560 -Control51=IDC_FREQ2,edit,1350631552 -Control52=IDC_BAM5,edit,1350631560 -Control53=IDC_FREQ3,edit,1350631552 -Control54=IDC_EXTENSION,button,1342242816 -Control55=IDC_UNKNOWN2C,button,1342242816 -Control56=IDC_UNKNOWN154,button,1342242816 -Control57=IDC_LOAD,button,1342242817 -Control58=IDC_LOADEX,button,1342242816 -Control59=IDC_SAVEAS,button,1342242816 -Control60=IDC_NEW,button,1342242816 -Control61=IDCANCEL,button,1342242816 -Control62=IDC_STATIC,button,1342210055 -Control63=IDC_STATIC,button,1342210055 -Control64=IDC_STATIC,button,1342210055 -Control65=IDC_STATIC,button,1342210055 -Control66=IDC_STATIC,static,1342308352 -Control67=IDC_STATIC,static,1342308352 -Control68=IDC_STATIC,static,1342308352 -Control69=IDC_STATIC,static,1342308352 -Control70=IDC_STATIC,static,1342308352 -Control71=IDC_STATIC,static,1342308352 -Control72=IDC_STATIC,static,1342308352 -Control73=IDC_STATIC,static,1342308352 -Control74=IDC_STATIC,static,1342308352 -Control75=IDC_STATIC,static,1342308352 -Control76=IDC_STATIC,static,1342308352 -Control77=IDC_STATIC,static,1342308352 -Control78=IDC_STATIC,static,1342308352 -Control79=IDC_STATIC,static,1342308352 -Control80=IDC_STATIC,static,1342308352 -Control81=IDC_STATIC,static,1342308352 -Control82=IDC_STATIC,static,1342308352 -Control83=IDC_STATIC,static,1342308352 +ControlCount=113 +Control1=IDC_LOAD,button,1342242817 +Control2=IDC_LOADEX,button,1342242816 +Control3=IDC_SAVEAS,button,1342242816 +Control4=IDC_NEW,button,1342242816 +Control5=IDC_CHECK,button,1342242816 +Control6=IDCANCEL,button,1342242816 +Control7=IDC_TYPE,combobox,1344339970 +Control8=IDC_SPEED,edit,1350631552 +Control9=IDC_SOUND1,edit,1350631560 +Control10=IDC_BROWSE1,button,1342242816 +Control11=IDC_PLAY1,button,1342242816 +Control12=IDC_SOUND2,edit,1350631560 +Control13=IDC_BROWSE2,button,1342242816 +Control14=IDC_PLAY2,button,1342242816 +Control15=IDC_SOUND3,edit,1350631560 +Control16=IDC_BROWSE3,button,1342242816 +Control17=IDC_PLAY3,button,1342242816 +Control18=IDC_BAM1,edit,1350631560 +Control19=IDC_BROWSE4,button,1342242816 +Control20=IDC_SEQ1,edit,1350631552 +Control21=IDC_BAM2,edit,1350631560 +Control22=IDC_BROWSE5,button,1342242816 +Control23=IDC_SEQ2,edit,1350631552 +Control24=IDC_PALETTE,edit,1350631560 +Control25=IDC_BROWSE6,button,1342242816 +Control26=IDC_U1,edit,1350631552 +Control27=IDC_U2,edit,1350631552 +Control28=IDC_U3,edit,1350631552 +Control29=IDC_U4,edit,1350631552 +Control30=IDC_U5,edit,1350631552 +Control31=IDC_U6,edit,1350631552 +Control32=IDC_U7,edit,1350631552 +Control33=IDC_FLAGS,edit,1350631552 +Control34=IDC_FLAG1,button,1342242819 +Control35=IDC_FLAG2,button,1342242819 +Control36=IDC_STATIC,static,1342308352 +Control37=IDC_FLAG5,button,1342242819 +Control38=IDC_SPARKCOLOUR,combobox,1344339970 +Control39=IDC_UNKNOWN0E,edit,1350631552 +Control40=IDC_UNKNOWN2A,edit,1350631552 +Control41=IDC_X,edit,1350631552 +Control42=IDC_Y,edit,1350631552 +Control43=IDC_Z,edit,1350631552 +Control44=IDC_SMOKETYPE,combobox,1344340226 +Control45=IDC_DELAY,edit,1350631552 +Control46=IDC_U11,edit,1350631552 +Control47=IDC_U12,edit,1350631552 +Control48=IDC_U13,edit,1350631552 +Control49=IDC_U14,edit,1350631552 +Control50=IDC_U15,edit,1350631552 +Control51=IDC_U16,edit,1350631552 +Control52=IDC_U17,edit,1350631552 +Control53=IDC_ATTR,edit,1350631552 +Control54=IDC_AIM,combobox,1344339970 +Control55=IDC_ATTR1,button,1342242819 +Control56=IDC_ATTR2,button,1342242819 +Control57=IDC_ATTR3,button,1342242819 +Control58=IDC_ATTR4,button,1342242819 +Control59=IDC_ATTR5,button,1342242819 +Control60=IDC_ATTR6,button,1342242819 +Control61=IDC_ATTR7,button,1342242819 +Control62=IDC_ATTR8,button,1342242819 +Control63=IDC_ATTR9,button,1342242819 +Control64=IDC_ATTR10,button,1342242819 +Control65=IDC_ATTR11,button,1342242819 +Control66=IDC_ATTR12,button,1342242819 +Control67=IDC_ATTR13,button,1342242819 +Control68=IDC_ATTR14,button,1342242819 +Control69=IDC_ATTR15,button,1342242819 +Control70=IDC_ATTR16,button,1342242819 +Control71=IDC_BAM3,edit,1350631560 +Control72=IDC_FREQ1,edit,1350631552 +Control73=IDC_BAM4,edit,1350631560 +Control74=IDC_FREQ2,edit,1350631552 +Control75=IDC_BAM5,edit,1350631560 +Control76=IDC_FREQ3,edit,1350631552 +Control77=IDC_EXTENSION,button,1342242816 +Control78=IDC_UNKNOWN2C,button,1342242816 +Control79=IDC_UNKNOWN154,button,1342242816 +Control80=IDC_STATIC,button,1342210055 +Control81=IDC_STATIC,button,1342210055 +Control82=IDC_STATIC,button,1342210055 +Control83=IDC_STATIC,button,1342210055 Control84=IDC_STATIC,static,1342308352 Control85=IDC_STATIC,static,1342308352 Control86=IDC_STATIC,static,1342308352 -Control87=IDC_MPTRAVEL,static,1342177550 -Control88=IDC_MPSMOKE,static,1342177550 +Control87=IDC_STATIC,static,1342308352 +Control88=IDC_STATIC,static,1342308352 Control89=IDC_STATIC,static,1342308352 Control90=IDC_STATIC,static,1342308352 -Control91=IDC_U1,edit,1350631552 -Control92=IDC_U2,edit,1350631552 -Control93=IDC_U3,edit,1350631552 -Control94=IDC_U4,edit,1350631552 -Control95=IDC_U5,edit,1350631552 -Control96=IDC_U6,edit,1350631552 -Control97=IDC_U7,edit,1350631552 -Control98=IDC_U11,edit,1350631552 -Control99=IDC_U12,edit,1350631552 -Control100=IDC_U13,edit,1350631552 -Control101=IDC_U14,edit,1350631552 -Control102=IDC_U15,edit,1350631552 -Control103=IDC_U16,edit,1350631552 -Control104=IDC_U17,edit,1350631552 -Control105=IDC_FLAG3,button,1342242819 -Control106=IDC_CHECK,button,1342242816 -Control107=IDC_FLAG5,button,1342242819 -Control108=IDC_BROWSE7,button,1342242816 -Control109=IDC_BROWSE8,button,1342242816 -Control110=IDC_BROWSE13,button,1342242816 -Control111=IDC_FLAG4,button,1342242819 +Control91=IDC_STATIC,static,1342308352 +Control92=IDC_STATIC,static,1342308352 +Control93=IDC_STATIC,static,1342308352 +Control94=IDC_STATIC,static,1342308352 +Control95=IDC_STATIC,static,1342308352 +Control96=IDC_STATIC,static,1342308352 +Control97=IDC_STATIC,static,1342308352 +Control98=IDC_STATIC,static,1342308352 +Control99=IDC_STATIC,static,1342308352 +Control100=IDC_STATIC,static,1342308352 +Control101=IDC_STATIC,static,1342308352 +Control102=IDC_STATIC,static,1342308352 +Control103=IDC_STATIC,static,1342308352 +Control104=IDC_MPTRAVEL,static,1342177550 +Control105=IDC_MPSMOKE,static,1342177550 +Control106=IDC_STATIC,static,1342308352 +Control107=IDC_STATIC,static,1342308352 +Control108=IDC_FLAG3,button,1342242819 +Control109=IDC_BROWSE7,button,1342242816 +Control110=IDC_BROWSE8,button,1342242816 +Control111=IDC_BROWSE13,button,1342242816 +Control112=IDC_FLAG4,button,1342242819 +Control113=IDC_STATIC,static,1342308352 [DLG:IDD_AREAENTRANCE (English (U.S.))] Type=1 @@ -7781,7 +7786,7 @@ [DLG:IDD_AREAAMBIENT (English (U.S.))] Type=1 Class=CAreaAmbient -ControlCount=48 +ControlCount=49 Control1=IDC_AMBIENTPICKER,combobox,1344339970 Control2=IDC_POSX,edit,1350631552 Control3=IDC_POSY,edit,1350631552 @@ -7830,6 +7835,7 @@ Control46=IDC_STATIC,static,1342308352 Control47=IDC_STATIC,static,1342308352 Control48=IDC_STATIC,static,1342308352 +Control49=IDC_FLAG5,button,1342242819 [DLG:IDD_AREAINT (English (U.S.))] Type=1 @@ -10313,42 +10319,42 @@ Type=1 Class=CProjGemRB ControlCount=37 -Control1=IDOK,button,1342242816 -Control2=IDC_FLAGS,edit,1350631552 -Control3=IDC_STATIC,static,1342308352 -Control4=IDC_FLAG1,button,1342242819 -Control5=IDC_FLAG2,button,1342242819 -Control6=IDC_FLAG3,button,1342242819 -Control7=IDC_FLAG4,button,1342242819 -Control8=IDC_FLAG5,button,1342242819 -Control9=IDC_FLAG6,button,1342242819 -Control10=IDC_FLAG7,button,1342242819 -Control11=IDC_FLAG8,button,1342242819 -Control12=IDC_FLAG9,button,1342242819 -Control13=IDC_FLAG10,button,1342242819 -Control14=IDC_FLAG11,button,1342242819 -Control15=IDC_FLAG12,button,1342242819 -Control16=IDC_FLAG13,button,1342242819 -Control17=IDC_FLAG14,button,1342242819 -Control18=IDC_FLAG15,button,1342242819 -Control19=IDC_FLAG16,button,1342242819 -Control20=IDC_FLAG17,button,1342242819 -Control21=IDC_FLAG18,button,1342242819 -Control22=IDC_STRREF,edit,1350631552 -Control23=IDC_FLAG19,button,1342242819 -Control24=IDC_STATIC,static,1342308352 -Control25=IDC_STRING,edit,1350631552 -Control26=IDC_FLAG20,button,1342242819 -Control27=IDC_FLAG21,button,1342242819 -Control28=IDC_FLAG22,button,1342242819 -Control29=IDC_FLAG23,button,1342242819 -Control30=IDC_RGB,edit,1350631552 -Control31=IDC_STATIC,static,1342308352 -Control32=IDC_COLOR,button,1342242816 -Control33=IDC_FLAG24,button,1342242819 -Control34=IDC_SCREEN,edit,1350631552 +Control1=IDC_FLAGS,edit,1350631552 +Control2=IDC_RGB,edit,1350631552 +Control3=IDC_COLOR,button,1342242816 +Control4=IDC_SPEED,edit,1350631552 +Control5=IDC_SCREEN,edit,1350631552 +Control6=IDC_FLAG1,button,1342242819 +Control7=IDC_FLAG2,button,1342242819 +Control8=IDC_FLAG3,button,1342242819 +Control9=IDC_FLAG4,button,1342242819 +Control10=IDC_FLAG5,button,1342242819 +Control11=IDC_FLAG6,button,1342242819 +Control12=IDC_FLAG7,button,1342242819 +Control13=IDC_FLAG8,button,1342242819 +Control14=IDC_FLAG9,button,1342242819 +Control15=IDC_FLAG10,button,1342242819 +Control16=IDC_FLAG11,button,1342242819 +Control17=IDC_FLAG12,button,1342242819 +Control18=IDC_FLAG13,button,1342242819 +Control19=IDC_FLAG14,button,1342242819 +Control20=IDC_FLAG15,button,1342242819 +Control21=IDC_FLAG16,button,1342242819 +Control22=IDC_FLAG17,button,1342242819 +Control23=IDC_FLAG18,button,1342242819 +Control24=IDC_FLAG19,button,1342242819 +Control25=IDC_FLAG20,button,1342242819 +Control26=IDC_FLAG21,button,1342242819 +Control27=IDC_FLAG22,button,1342242819 +Control28=IDC_FLAG23,button,1342242819 +Control29=IDC_FLAG24,button,1342242819 +Control30=IDC_STRREF,edit,1350631552 +Control31=IDC_STRING,edit,1350631552 +Control32=IDOK,button,1342242816 +Control33=IDC_STATIC,static,1342308352 +Control34=IDC_STATIC,static,1342308352 Control35=IDC_STATIC,static,1342308352 -Control36=IDC_SPEED,edit,1350631552 +Control36=IDC_STATIC,static,1342308352 Control37=IDC_STATIC,static,1342308352 [CLS:CProjGemRB] Modified: chitem/trunk/chitem.rc =================================================================== --- chitem/trunk/chitem.rc 2009-08-18 10:35:35 UTC (rev 6921) +++ chitem/trunk/chitem.rc 2009-08-18 10:41:10 UTC (rev 6922) @@ -136,6 +136,8 @@ WS_VISIBLE | WS_TABSTOP,33,63,47,10 CONTROL "Floodfill",IDC_FILL,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,76,51,39,10 + CONTROL "Overlay",IDC_OVERLAY,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,72,60,40,10 END IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 235, 71 @@ -985,6 +987,10 @@ WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_DURATION,176,46,50,14,ES_AUTOHSCROLL | ES_NUMBER EDITTEXT IDC_PAR1,7,76,70,14,ES_AUTOHSCROLL + EDITTEXT IDC_PAR1B1,7,76,16,14,ES_AUTOHSCROLL | NOT WS_VISIBLE + EDITTEXT IDC_PAR1B2,25,76,16,14,ES_AUTOHSCROLL | NOT WS_VISIBLE + EDITTEXT IDC_PAR1B3,43,76,16,14,ES_AUTOHSCROLL | NOT WS_VISIBLE + EDITTEXT IDC_PAR1B4,61,76,16,14,ES_AUTOHSCROLL | NOT WS_VISIBLE CONTROL "Explode",IDC_EXPLODE1,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,80,79,38,10 EDITTEXT IDC_PROB1,120,76,23,14,ES_AUTOHSCROLL | ES_NUMBER @@ -993,20 +999,28 @@ EDITTEXT IDC_TEXT,7,104,112,14,ES_AUTOHSCROLL EDITTEXT IDC_TEXT2,123,104,112,14,ES_AUTOHSCROLL EDITTEXT IDC_PAR2,7,133,70,14,ES_AUTOHSCROLL + EDITTEXT IDC_PAR2B1,7,133,16,14,ES_AUTOHSCROLL | NOT WS_VISIBLE + EDITTEXT IDC_PAR2B2,25,133,16,14,ES_AUTOHSCROLL | NOT WS_VISIBLE + EDITTEXT IDC_PAR2B3,43,133,16,14,ES_AUTOHSCROLL | NOT WS_VISIBLE + EDITTEXT IDC_PAR2B4,61,133,16,14,ES_AUTOHSCROLL | NOT WS_VISIBLE CONTROL "Explode",IDC_EXPLODE2,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,80,136,38,10 EDITTEXT IDC_ROLL2,120,133,23,14,ES_AUTOHSCROLL | ES_NUMBER EDITTEXT IDC_DIE2,152,133,23,14,ES_AUTOHSCROLL | ES_NUMBER - EDITTEXT IDC_POWER,181,133,23,14,ES_AUTOHSCROLL | ES_NUMBER - EDITTEXT IDC_UNKNOWN2C,210,133,23,14,ES_AUTOHSCROLL + EDITTEXT IDC_POWER,180,133,23,14,ES_AUTOHSCROLL | ES_NUMBER + EDITTEXT IDC_UNKNOWN2C,208,133,23,14,ES_AUTOHSCROLL CONTROL "Undefined",IDC_PAR_UNDEFINED,"Button", BS_AUTORADIOBUTTON | BS_PUSHLIKE | WS_GROUP,11,165,41,10 CONTROL "Colour",IDC_PAR_COLOR,"Button",BS_AUTORADIOBUTTON | - BS_PUSHLIKE,58,165,36,10 + BS_PUSHLIKE,53,165,36,10 CONTROL "IDS",IDC_PAR_IDS,"Button",BS_AUTORADIOBUTTON | - BS_PUSHLIKE,101,165,28,10 + BS_PUSHLIKE,90,165,28,10 CONTROL "Damage",IDC_PAR_DAMAGE,"Button",BS_AUTORADIOBUTTON | - BS_PUSHLIKE,136,165,43,10 + BS_PUSHLIKE,119,165,43,10 + CONTROL "Anim",IDC_PAR_ANIM,"Button",BS_AUTORADIOBUTTON | + BS_PUSHLIKE,163,165,31,10 + CONTROL "Hexa",IDC_HEXADECIMAL,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,195,165,33,10 COMBOBOX IDC_SAVETYPE,7,195,153,116,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_SAVEBONUS,164,195,23,14,ES_AUTOHSCROLL @@ -1032,6 +1046,10 @@ EDITTEXT IDC_U5,283,253,23,14,ES_AUTOHSCROLL EDITTEXT IDC_SOURCE,314,253,49,14,ES_AUTOHSCROLL PUSHBUTTON "Browse",IDC_BROWSE3,370,253,28,14 + EDITTEXT IDC_POS1X,7,281,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_POS1Y,54,281,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_POS2X,108,281,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_POS2Y,155,281,40,14,ES_AUTOHSCROLL DEFPUSHBUTTON "Load Effect",IDC_LOAD,7,301,42,14 PUSHBUTTON "Load external Effect",IDC_LOADEX,58,301,68,14 PUSHBUTTON "Save Effect As...",IDC_SAVEAS,135,301,60,14 @@ -1054,25 +1072,17 @@ LTEXT "Dice/level limit",IDC_STATIC,120,121,47,8 GROUPBOX "Parameter style",IDC_STATIC,7,153,229,27,BS_FLAT LTEXT "Saving throw",IDC_STATIC,7,184,42,8 - LTEXT "Power",IDC_STATIC,181,121,21,8 + LTEXT "Power",IDC_STATIC,180,121,21,8 LTEXT "Bonus",IDC_STATIC,164,184,21,8 LTEXT "1. Resource",IDC_STATIC,7,212,40,8 LTEXT "VVC (2. resource)",IDC_STATIC,133,212,56,8 LTEXT "Local variable name",IDC_STATIC,7,242,64,8 - EDITTEXT IDC_PAR1B1,7,76,16,14,ES_AUTOHSCROLL | NOT WS_VISIBLE - EDITTEXT IDC_PAR1B2,25,76,16,14,ES_AUTOHSCROLL | NOT WS_VISIBLE - EDITTEXT IDC_PAR1B3,43,76,16,14,ES_AUTOHSCROLL | NOT WS_VISIBLE - EDITTEXT IDC_PAR1B4,61,76,16,14,ES_AUTOHSCROLL | NOT WS_VISIBLE - EDITTEXT IDC_PAR2B1,7,133,16,14,ES_AUTOHSCROLL | NOT WS_VISIBLE - EDITTEXT IDC_PAR2B2,25,133,16,14,ES_AUTOHSCROLL | NOT WS_VISIBLE - EDITTEXT IDC_PAR2B3,43,133,16,14,ES_AUTOHSCROLL | NOT WS_VISIBLE - EDITTEXT IDC_PAR2B4,61,133,16,14,ES_AUTOHSCROLL | NOT WS_VISIBLE LTEXT "Resist",IDC_STATIC,195,184,20,8 LTEXT "Edit TLK entry (param 1 based)",IDC_STATIC,7,93,98,8 COMBOBOX IDC_EFFOPCODE2,7,16,225,143,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "Variable?",IDC_STATIC,210,121,30,8 + LTEXT "Variable?",IDC_STATIC,208,121,30,8 LTEXT "Timing ?",IDC_STATIC,199,63,28,8 LTEXT "Parameters 3 && 4",IDC_STATIC,151,242,54,8 LTEXT "Spell school",IDC_STATIC,314,185,39,8 @@ -1082,12 +1092,8 @@ LTEXT "Level",IDC_STATIC,253,241,18,8 LTEXT "Efftext entry (opcode based)",IDC_STATIC,123,93,90,8 LTEXT "Projectile",IDC_STATIC,223,241,30,8 - EDITTEXT IDC_POS1X,7,281,40,14,ES_AUTOHSCROLL LTEXT "Position",IDC_STATIC,7,271,26,8 - EDITTEXT IDC_POS1Y,54,281,40,14,ES_AUTOHSCROLL LTEXT "Slot",IDC_STATIC,283,241,13,8 - EDITTEXT IDC_POS2X,108,281,40,14,ES_AUTOHSCROLL - EDITTEXT IDC_POS2Y,155,281,40,14,ES_AUTOHSCROLL LTEXT "Target",IDC_STATIC,107,271,22,8 END @@ -2111,8 +2117,14 @@ EXSTYLE WS_EX_CONTROLPARENT CAPTION "Edit Projectile:" MENU IDR_PROJECT -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Sans Serif" BEGIN + DEFPUSHBUTTON "Load Projectile",IDC_LOAD,7,245,52,14 + PUSHBUTTON "Load external projectile",IDC_LOADEX,69,245,78,14 + PUSHBUTTON "Save Projectile As...",IDC_SAVEAS,157,245,68,14 + PUSHBUTTON "New Projectile",IDC_NEW,235,245,50,14 + PUSHBUTTON "Check Projectile",IDC_CHECK,295,245,56,14 + PUSHBUTTON "E&xit",IDCANCEL,361,245,42,14 COMBOBOX IDC_TYPE,7,20,88,57,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_SPEED,101,20,28,14,ES_AUTOHSCROLL @@ -2133,20 +2145,38 @@ EDITTEXT IDC_SEQ2,101,167,28,14,ES_AUTOHSCROLL EDITTEXT IDC_PALETTE,7,197,49,14,ES_UPPERCASE | ES_AUTOHSCROLL PUSHBUTTON "Browse",IDC_BROWSE6,65,197,28,14 + EDITTEXT IDC_U1,7,227,16,14,ES_AUTOHSCROLL + EDITTEXT IDC_U2,25,227,16,14,ES_AUTOHSCROLL + EDITTEXT IDC_U3,43,227,16,14,ES_AUTOHSCROLL + EDITTEXT IDC_U4,61,227,16,14,ES_AUTOHSCROLL + EDITTEXT IDC_U5,79,227,16,14,ES_AUTOHSCROLL + EDITTEXT IDC_U6,97,227,16,14,ES_AUTOHSCROLL + EDITTEXT IDC_U7,115,227,16,14,ES_AUTOHSCROLL EDITTEXT IDC_FLAGS,141,20,40,14,ES_AUTOHSCROLL CONTROL "Sparks",IDC_FLAG1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 188,15,38,10 CONTROL "Flying",IDC_FLAG2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 188,26,34,10 - COMBOBOX IDC_SPARKCOLOUR,142,49,100,194,CBS_DROPDOWN | WS_VSCROLL | + LTEXT "Spark colour",IDC_STATIC,141,36,41,8 + CONTROL "Ignore center",IDC_FLAG5,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,188,37,58,10 + COMBOBOX IDC_SPARKCOLOUR,141,49,100,194,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_UNKNOWN0E,167,65,28,14,ES_AUTOHSCROLL + EDITTEXT IDC_UNKNOWN0E,161,66,28,14,ES_AUTOHSCROLL + EDITTEXT IDC_UNKNOWN2A,213,66,28,14,ES_AUTOHSCROLL EDITTEXT IDC_X,154,97,28,14,ES_AUTOHSCROLL EDITTEXT IDC_Y,200,97,28,14,ES_AUTOHSCROLL EDITTEXT IDC_Z,246,97,28,14,ES_AUTOHSCROLL - EDITTEXT IDC_DELAY,174,151,28,14,ES_AUTOHSCROLL COMBOBOX IDC_SMOKETYPE,138,134,100,89,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_DELAY,174,151,28,14,ES_AUTOHSCROLL + EDITTEXT IDC_U11,138,187,16,14,ES_AUTOHSCROLL + EDITTEXT IDC_U12,157,187,16,14,ES_AUTOHSCROLL + EDITTEXT IDC_U13,176,187,16,14,ES_AUTOHSCROLL + EDITTEXT IDC_U14,195,187,16,14,ES_AUTOHSCROLL + EDITTEXT IDC_U15,214,187,16,14,ES_AUTOHSCROLL + EDITTEXT IDC_U16,233,187,16,14,ES_AUTOHSCROLL + EDITTEXT IDC_U17,252,187,16,14,ES_AUTOHSCROLL EDITTEXT IDC_ATTR,249,20,40,14,ES_AUTOHSCROLL COMBOBOX IDC_AIM,293,20,110,67,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP @@ -2191,22 +2221,16 @@ PUSHBUTTON "Edit area extension",IDC_EXTENSION,135,213,141,14 PUSHBUTTON "GemRB specific",IDC_UNKNOWN2C,335,202,68,14 PUSHBUTTON "Unknowns at 0x154",IDC_UNKNOWN154,335,223,68,14 - DEFPUSHBUTTON "Load Projectile",IDC_LOAD,7,245,52,14 - PUSHBUTTON "Load external projectile",IDC_LOADEX,69,245,78,14 - PUSHBUTTON "Save Projectile As...",IDC_SAVEAS,157,245,68,14 - PUSHBUTTON "New Projectile",IDC_NEW,235,245,50,14 - PUSHBUTTON "E&xit",IDCANCEL,361,245,42,14 GROUPBOX "Sparks",IDC_STATIC,135,7,112,81,BS_FLAT GROUPBOX "Light spot",IDC_STATIC,135,83,141,39,BS_FLAT GROUPBOX "Projectile trail ",IDC_STATIC,275,117,128,78,BS_FLAT GROUPBOX "Smoke",IDC_STATIC,135,117,141,90,BS_FLAT LTEXT "Projectile type",IDC_STATIC,7,7,45,8 LTEXT "Speed",IDC_STATIC,101,7,22,8 - LTEXT "0x0e",IDC_STATIC,142,69,16,8 + LTEXT "0x0e",IDC_STATIC,141,69,16,8 LTEXT "Sound resource 1",IDC_STATIC,7,35,57,8 LTEXT "Sound resource 2",IDC_STATIC,7,65,57,8 LTEXT "Sound resource 3",IDC_STATIC,7,95,57,8 - LTEXT "Spark colour",IDC_STATIC,142,36,41,8 LTEXT "Attributes",IDC_STATIC,249,7,30,8 LTEXT "Projectile BAM",IDC_STATIC,7,125,47,8 LTEXT "Shadow BAM",IDC_STATIC,7,155,44,8 @@ -2227,30 +2251,14 @@ 15,WS_EX_DLGMODALFRAME LTEXT "Smoke colour gradients",IDC_STATIC,138,172,75,8 LTEXT "Smoke animation",IDC_STATIC,183,124,55,8 - EDITTEXT IDC_U1,7,227,16,14,ES_AUTOHSCROLL - EDITTEXT IDC_U2,25,227,16,14,ES_AUTOHSCROLL - EDITTEXT IDC_U3,43,227,16,14,ES_AUTOHSCROLL - EDITTEXT IDC_U4,61,227,16,14,ES_AUTOHSCROLL - EDITTEXT IDC_U5,79,227,16,14,ES_AUTOHSCROLL - EDITTEXT IDC_U6,97,227,16,14,ES_AUTOHSCROLL - EDITTEXT IDC_U7,115,227,16,14,ES_AUTOHSCROLL - EDITTEXT IDC_U11,138,187,16,14,ES_AUTOHSCROLL - EDITTEXT IDC_U12,157,187,16,14,ES_AUTOHSCROLL - EDITTEXT IDC_U13,176,187,16,14,ES_AUTOHSCROLL - EDITTEXT IDC_U14,195,187,16,14,ES_AUTOHSCROLL - EDITTEXT IDC_U15,214,187,16,14,ES_AUTOHSCROLL - EDITTEXT IDC_U16,233,187,16,14,ES_AUTOHSCROLL - EDITTEXT IDC... [truncated message content] |
From: <ave...@us...> - 2009-08-23 18:16:49
|
Revision: 7035 http://gemrb.svn.sourceforge.net/gemrb/?rev=7035&view=rev Author: avenger_teambg Date: 2009-08-23 18:16:40 +0000 (Sun, 23 Aug 2009) Log Message: ----------- dltcep update Modified Paths: -------------- chitem/trunk/ChuiEdit.cpp chitem/trunk/ChuiEdit.h chitem/trunk/CreatureProperties.cpp chitem/trunk/CreatureProperties.h chitem/trunk/GameGeneral.cpp chitem/trunk/Structs.h chitem/trunk/chitem.clw chitem/trunk/chitem.rc chitem/trunk/game.cpp chitem/trunk/game.h Modified: chitem/trunk/ChuiEdit.cpp =================================================================== --- chitem/trunk/ChuiEdit.cpp 2009-08-23 18:15:35 UTC (rev 7034) +++ chitem/trunk/ChuiEdit.cpp 2009-08-23 18:16:40 UTC (rev 7035) @@ -28,8 +28,8 @@ //}}AFX_DATA_INIT } -static int labelbits[8]={1,2,4,8,16,32,64,128}; -static int buttonbits[8]={0,0,0,1,2,4,0,8}; +static int labelbits[9]={1,2,4,8,16,32,64,128,0}; +static int buttonbits[9]={0,0,0,1,2,4,0,8,32}; static int winids[]={IDC_WINDOWPICKER, 0}; @@ -47,7 +47,7 @@ static int buttonboxids[]={IDC_BAM, IDC_BROWSE2, IDC_CYCLE, IDC_BAMFRAME1,IDC_BAMFRAME2, IDC_BAMFRAME3,IDC_BAMFRAME4, IDC_BUTTONCYCLE, IDC_BUTTONBAM, IDC_BUTTONFLAG, IDC_BAM2, -IDC_FLAG4, IDC_FLAG5, IDC_FLAG6, IDC_FLAG8, +IDC_FLAG4, IDC_FLAG5, IDC_FLAG6, IDC_FLAG8, IDC_FLAG9, IDC_BUTTONFRAME1,IDC_BUTTONFRAME2, IDC_BUTTONFRAME3,IDC_BUTTONFRAME4, 0}; @@ -64,7 +64,7 @@ 0}; static int editboxids[]={IDC_BAM, IDC_BAM2, IDC_BAM3, IDC_BAM4, IDC_BAM5, -IDC_BROWSE2,IDC_BROWSE3,IDC_BROWSE4,IDC_BROWSE5,IDC_BROWSE6, +IDC_BROWSE2,IDC_BROWSE3,IDC_BROWSE4,IDC_BROWSE5,IDC_BROWSE6, IDC_BAMFRAME6, IDC_EDITMOS1,IDC_EDITMOS2,IDC_EDITMOS3,IDC_UNKNOWN4, IDC_UNKNOWN5, IDC_UNKNOWN6, 0}; @@ -141,7 +141,7 @@ DDX_Text(pDX, IDC_BAMFRAME2, cc->pressed); DDX_Text(pDX, IDC_BAMFRAME3, cc->disabled); DDX_Text(pDX, IDC_BAMFRAME4, cc->selected); - for(i=0;i<8;i++) + for(i=0;i<9;i++) { k=!!(cc->flags&buttonbits[i]); DDX_Check(pDX,IDC_FLAG1+i,k); @@ -216,6 +216,7 @@ DDX_Text(pDX, IDC_UNKNOWN4, cc->length); DDX_Text(pDX, IDC_UNKNOWN5, cc->xpos); DDX_Text(pDX, IDC_UNKNOWN6, cc->ypos); + DDX_Text(pDX, IDC_BAMFRAME6, cc->uppercase); } break; case CC_TEXT: @@ -262,7 +263,7 @@ DDX_Text(pDX,IDC_BAMFRAME6, cc->justify); - for(i=0;i<8;i++) + for(i=0;i<9;i++) { k=!!(cc->justify&labelbits[i]); DDX_Check(pDX,IDC_FLAG1+i,k); @@ -407,6 +408,7 @@ ON_BN_CLICKED(IDC_FLAG6, OnFlag6) ON_BN_CLICKED(IDC_FLAG7, OnFlag7) ON_BN_CLICKED(IDC_FLAG8, OnFlag8) + ON_BN_CLICKED(IDC_FLAG9, OnFlag9) ON_BN_CLICKED(IDC_LOAD, OnLoad) ON_BN_CLICKED(IDC_LOADEX, OnLoadex) ON_BN_CLICKED(IDC_SAVEAS, OnSaveas) @@ -1396,6 +1398,11 @@ OnLabelFlag(7); } +void CChuiEdit::OnFlag9() +{ + OnLabelFlag(8); +} + void CChuiEdit::OnPreview() { CImageView preview; Modified: chitem/trunk/ChuiEdit.h =================================================================== --- chitem/trunk/ChuiEdit.h 2009-08-23 18:15:35 UTC (rev 7034) +++ chitem/trunk/ChuiEdit.h 2009-08-23 18:16:40 UTC (rev 7035) @@ -86,6 +86,7 @@ afx_msg void OnFlag6(); afx_msg void OnFlag7(); afx_msg void OnFlag8(); + afx_msg void OnFlag9(); afx_msg void OnKillfocusId2(); //}}AFX_MSG DECLARE_MESSAGE_MAP() Modified: chitem/trunk/CreatureProperties.cpp =================================================================== --- chitem/trunk/CreatureProperties.cpp 2009-08-23 18:15:35 UTC (rev 7034) +++ chitem/trunk/CreatureProperties.cpp 2009-08-23 18:16:40 UTC (rev 7035) @@ -1806,6 +1806,7 @@ ON_BN_CLICKED(IDC_PASTE, OnPaste) ON_BN_CLICKED(IDC_EXPORT, OnExport) ON_BN_CLICKED(IDC_IMPORT, OnImport) + ON_BN_CLICKED(IDC_CLEAR, OnClear) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -1947,6 +1948,12 @@ UpdateData(UD_DISPLAY); } + +void CCreatureStrings::OnClear() +{ + memset(the_creature.header.strrefs, -1, m_stringcount*sizeof(long) ); +} + void CCreatureStrings::OnExport() { ExportTBG(this, REF_CRE|TBG_ALT, 0); @@ -3178,6 +3185,7 @@ the_creature.KillItems(); memset(the_creature.itemslots,-1,sizeof(the_creature.itemslots) ); *(int *) (the_creature.itemslots+the_creature.slotcount)=1000; + the_creature.header.itemcnt=0; the_creature.m_changed=true; RefreshItem(); UpdateData(UD_DISPLAY); Modified: chitem/trunk/CreatureProperties.h =================================================================== --- chitem/trunk/CreatureProperties.h 2009-08-23 18:15:35 UTC (rev 7034) +++ chitem/trunk/CreatureProperties.h 2009-08-23 18:16:40 UTC (rev 7035) @@ -350,6 +350,7 @@ afx_msg void OnPaste(); afx_msg void OnExport(); afx_msg void OnImport(); + afx_msg void OnClear(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: chitem/trunk/GameGeneral.cpp =================================================================== --- chitem/trunk/GameGeneral.cpp 2009-08-23 18:15:35 UTC (rev 7034) +++ chitem/trunk/GameGeneral.cpp 2009-08-23 18:16:40 UTC (rev 7035) @@ -125,6 +125,7 @@ ON_EN_KILLFOCUS(IDC_U4, OnDefaultKillfocus) ON_EN_KILLFOCUS(IDC_U5, OnDefaultKillfocus) ON_EN_KILLFOCUS(IDC_AREA, OnDefaultKillfocus) + ON_EN_KILLFOCUS(IDC_UNKNOWN64, OnDefaultKillfocus) //}}AFX_MSG_MAP ON_NOTIFY(NM_RELEASEDCAPTURE, IDC_SLIDER, OnDefaultKillfocusX) END_MESSAGE_MAP() Modified: chitem/trunk/Structs.h =================================================================== --- chitem/trunk/Structs.h 2009-08-23 18:15:35 UTC (rev 7034) +++ chitem/trunk/Structs.h 2009-08-23 18:16:40 UTC (rev 7035) @@ -244,14 +244,15 @@ char mos2[8]; char mos3[8]; char cursor[8]; //cursor bam - long unknown1; + short cycle; + short frame; short xpos; short ypos; long unknown2; char font[8]; //font bam char unknown3[34]; short length; - long unknown4; + long uppercase; } chui_editbox; typedef struct//5 @@ -1733,7 +1734,9 @@ long slocoffset; long sloccount; long realtime; - char unknown78[60]; + long ppoffset; + long ppcount; + char unknown80[52]; } gam_header; typedef struct { Modified: chitem/trunk/chitem.clw =================================================================== --- chitem/trunk/chitem.clw 2009-08-23 18:15:35 UTC (rev 7034) +++ chitem/trunk/chitem.clw 2009-08-23 18:16:40 UTC (rev 7035) @@ -2,7 +2,7 @@ [General Info] Version=1 -LastClass=CAreaAmbient +LastClass=CGameGeneral LastTemplate=CDialog NewFileInclude1=#include "stdafx.h" NewFileInclude2=#include "chitem.h" @@ -232,142 +232,142 @@ Resource123=IDD_GAMEGENERAL Class98=IcewindCre Resource124=IDR_SHORTCUT -Resource125=IDD_POLYGON (English (U.S.)) -Resource126=IDD_AREASONGS (English (U.S.)) -Resource127=IDR_SCRIPT (English (U.S.)) -Resource128=IDD_SEARCHNODE (English (U.S.)) -Resource129=IDD_EFFEDIT (English (U.S.)) -Resource130=IDD_PANICBUTTON (English (U.S.)) -Resource131=IDR_MENUBAR (English (U.S.)) -Resource132=IDD_CREATUREOVR (English (U.S.)) -Resource133=IDD_ITEMEQUIP (English (U.S.)) -Resource134=IDR_EFFECT (English (U.S.)) -Resource135=IDD_VVCEDIT (English (U.S.)) -Resource136=IDD_IAPDIALOG (English (U.S.)) -Resource137=IDD_PROJAREAGEMRB (English (U.S.)) -Resource138=IDD_CHITEM_DIALOG (English (U.S.)) -Resource139=IDD_GAMEGENERAL (English (U.S.)) -Resource140=IDD_ITEMICONS (English (U.S.)) -Resource141=IDR_TREEMENU (English (U.S.)) -Resource142=IDD_EXTRACT (English (U.S.)) -Resource143=IDD_SPELLDESC (English (U.S.)) -Resource144=IDD_COLORPICKER (English (U.S.)) -Resource145=IDD_IDSEDIT (English (U.S.)) -Resource146=IDD_WEDTILE (English (U.S.)) -Resource147=IDD_STOREEXTRA (English (U.S.)) -Resource148=IDR_WEDMENU (English (U.S.)) -Resource149=IDD_ABOUTBOX (English (U.S.)) -Resource150=IDD_CREATUREEDIT (English (U.S.)) -Resource151=IDD_GAMEEDIT (English (U.S.)) -Resource152=IDD_PROGRESS (English (U.S.)) -Resource153=IDD_CREATURESKILLS (English (U.S.)) -Resource154=IDD_CHUIEDIT (English (U.S.)) -Resource155=IDR_PROJECT (English (U.S.)) -Resource156=IDD_ITEMEFFECT (English (U.S.)) -Resource157=IDD_AREAVARIABLE (English (U.S.)) -Resource158=IDD_WEDEDIT (English (U.S.)) -Resource159=IDD_AREAMAP (English (U.S.)) -Resource160=IDD_AREADOOR (English (U.S.)) -Resource161=IDD_ITEMDESC (English (U.S.)) -Resource162=IDD_CHECK (English (U.S.)) -Resource163=IDD_STOREGENERAL (English (U.S.)) -Resource164=IDD_ITEMEXTRA (English (U.S.)) -Resource165=IDD_CREATURELEVELS (English (U.S.)) -Resource166=IDD_AREATRIGGERSTRINGS (English (U.S.)) -Resource167=IDD_PROJEDIT (English (U.S.)) -Resource168=IDR_2DA (English (U.S.)) -Resource169=IDD_SRCEDIT (English (U.S.)) -Resource170=IDD_SAVHANDLE (English (U.S.)) -Resource171=IDD_CFB (English (U.S.)) -Resource172=IDD_AREAAMBIENT (English (U.S.)) -Resource173=IDD_MAPEDIT (English (U.S.)) -Resource174=IDR_BAMMENU (English (U.S.)) -Resource175=IDR_VVC (English (U.S.)) -Resource176=IDD_VARIABLES (English (U.S.)) -Resource177=IDD_AREATRIGGER (English (U.S.)) -Resource178=IDD_ITEMEDIT (English (U.S.)) -Resource179=IDR_GAME (English (U.S.)) -Resource180=IDD_AREAINT (English (U.S.)) -Resource181=IDR_AREA (English (U.S.)) -Resource182=IDD_KEYEDIT (English (U.S.)) -Resource183=IDD_2DAEDIT (English (U.S.)) -Resource184=IDD_CREATUREITEMS (English (U.S.)) -Resource185=IDD_GAMESTATS (English (U.S.)) -Resource186=IDD_ITEMPICKER (English (U.S.)) -Resource187=IDR_CREATURE (English (U.S.)) -Resource188=IDD_CREATUREICONS (English (U.S.)) -Resource189=IDR_ITEM (English (U.S.)) -Resource190=IDD_MOSEDIT (English (U.S.)) -Resource191=IDD_SCHEDULE (English (U.S.)) -Resource192=IDD_MUSEDIT (English (U.S.)) -Resource193=IDD_STOREITEMS (English (U.S.)) -Resource194=IDD_EDIT (English (U.S.)) -Resource195=IDD_MASSCLEAR (English (U.S.)) -Resource196=IDD_AREAGENERAL (English (U.S.)) -Resource197=IDD_CREATUREIWD2 (English (U.S.)) -Resource198=IDD_PROJEXT (English (U.S.)) -Resource199=IDD_BAMEDIT (English (U.S.)) -Resource200=IDD_AREAANIM (English (U.S.)) -Resource201=IDD_CREATUREGENERAL (English (U.S.)) -Resource202=IDD_CREATURESTRINGS (English (U.S.)) -Resource203=IDD_SPELLTOOL (English (U.S.)) -Resource204=IDD_CREATUREEFF (English (U.S.)) -Resource205=IDD_SPELLEXTRA (English (U.S.)) -Resource206=IDR_SRC (English (U.S.)) -Resource207=IDR_SPELL (English (U.S.)) -Resource208=IDD_WEIDU (English (U.S.)) -Resource209=IDD_STOREDRINKS (English (U.S.)) -Resource210=IDD_AREACONTAINER (English (U.S.)) -Resource211=IDR_WORLDMAP (English (U.S.)) -Resource212=IDD_CREATUREIWD (English (U.S.)) -Resource213=IDD_CREATURERES (English (U.S.)) -Resource214=IDD_MAPLINK (English (U.S.)) -Resource215=IDD_AREASPAWN (English (U.S.)) -Resource216=IDD_ITEMUSE (English (U.S.)) -Resource217=IDD_STRREFDLG (English (U.S.)) -Resource218=IDR_STORE (English (U.S.)) -Resource219=IDD_SPELLEDIT (English (U.S.)) -Resource220=IDD_AREAENTRANCE (English (U.S.)) -Resource221=IDD_PALETTE (English (U.S.)) -Resource222=IDR_CHITIN (English (U.S.)) -Resource223=IDD_AREAEDIT (English (U.S.)) -Resource224=IDD_ADDLINK (English (U.S.)) -Resource225=IDD_SPELLEQUIP (English (U.S.)) -Resource226=IDD_TISDIALOG (English (U.S.)) -Resource227=IDR_TILE (English (U.S.)) -Resource228=IDD_CREATUREUNKNOWN (English (U.S.)) -Resource229=IDD_DIALOGEDIT (English (U.S.)) -Resource230=IDD_GAMEPCINFO (English (U.S.)) -Resource231=IDD_AREAACTOR (English (U.S.)) -Resource232=IDD_CREATUREPST (English (U.S.)) -Resource233=IDD_SPELLGENERAL (English (U.S.)) -Resource234=IDD_ANIMDIALOG -Resource235=IDR_TLKMENU (English (U.S.)) -Resource236=IDD_PROJGEMRB (English (U.S.)) -Resource237=IDR_CHUI (English (U.S.)) -Resource238=IDD_EXTRACT2 (English (U.S.)) -Resource239=IDD_WEDPOLY (English (U.S.)) -Resource240=IDD_AREAPROJ (English (U.S.)) -Resource241=IDD_SHOWLOG (English (U.S.)) -Resource242=IDR_IDS (English (U.S.)) -Resource243=IDD_ITEMGENERAL (English (U.S.)) -Resource244=IDD_SPELLEFFECT (English (U.S.)) -Resource245=IDD_STOREEDIT (English (U.S.)) +Resource125=IDD_PROJEXT (English (U.S.)) +Resource126=IDD_STORERENTAL (English (U.S.)) +Resource127=IDD_CHUIEDIT (English (U.S.)) +Resource128=IDD_ITEMDESC (English (U.S.)) +Resource129=IDR_VVC (English (U.S.)) +Resource130=IDD_CREATUREICONS (English (U.S.)) +Resource131=IDD_STRREFDLG (English (U.S.)) +Resource132=IDR_EFFECT (English (U.S.)) +Resource133=IDR_SPELL (English (U.S.)) +Resource134=IDD_WEDPOLY (English (U.S.)) +Resource135=IDR_CREATURE (English (U.S.)) +Resource136=IDD_SCHEDULE (English (U.S.)) +Resource137=IDD_SPELLDESC (English (U.S.)) +Resource138=IDD_AREAPROJ (English (U.S.)) +Resource139=IDD_ITEMEXTRA (English (U.S.)) +Resource140=IDD_2DAEDIT (English (U.S.)) +Resource141=IDD_PANICBUTTON (English (U.S.)) +Resource142=IDR_AREA (English (U.S.)) +Resource143=IDD_ABOUTBOX (English (U.S.)) +Resource144=IDD_SHOWLOG (English (U.S.)) +Resource145=IDD_AREAEDIT (English (U.S.)) +Resource146=IDD_AREACONTAINER (English (U.S.)) +Resource147=IDR_TILE (English (U.S.)) +Resource148=IDD_GAMEPCINFO (English (U.S.)) +Resource149=IDD_CREATURELEVELS (English (U.S.)) +Resource150=IDD_VVCEDIT (English (U.S.)) +Resource151=IDD_SPELLEXTRA (English (U.S.)) +Resource152=IDD_PROJAREAGEMRB (English (U.S.)) +Resource153=IDD_STOREGENERAL (English (U.S.)) +Resource154=IDD_AREAVARIABLE (English (U.S.)) +Resource155=IDD_AREAMAP (English (U.S.)) +Resource156=IDR_STORE (English (U.S.)) +Resource157=IDD_IDSEDIT (English (U.S.)) +Resource158=IDD_STOREEDIT (English (U.S.)) +Resource159=IDD_BAMEDIT (English (U.S.)) +Resource160=IDD_SEARCHNODE (English (U.S.)) +Resource161=IDR_CHITIN (English (U.S.)) +Resource162=IDD_PROJGEMRB (English (U.S.)) +Resource163=IDR_TLKMENU (English (U.S.)) +Resource164=IDD_SPELLEDIT (English (U.S.)) +Resource165=IDD_COLORPICKER (English (U.S.)) +Resource166=IDD_PALETTE (English (U.S.)) +Resource167=IDD_ITEMEQUIP (English (U.S.)) +Resource168=IDD_STOREDRINKS (English (U.S.)) +Resource169=IDD_ITEMEDIT (English (U.S.)) +Resource170=IDD_CREATUREGENERAL (English (U.S.)) +Resource171=IDD_SCRIPTEDIT (English (U.S.)) +Resource172=IDD_AREATRIGGERSTRINGS (English (U.S.)) +Resource173=IDD_PROJEDIT (English (U.S.)) +Resource174=IDD_SAVHANDLE (English (U.S.)) +Resource175=IDD_SRCEDIT (English (U.S.)) +Resource176=IDR_PROJECT (English (U.S.)) +Resource177=IDD_ITEMPICKER (English (U.S.)) +Resource178=IDR_BAMMENU (English (U.S.)) +Resource179=IDD_WEDTILE (English (U.S.)) +Resource180=IDD_CREATUREITEMS (English (U.S.)) +Resource181=IDD_MASSCLEAR (English (U.S.)) +Resource182=IDD_AREAINT (English (U.S.)) +Resource183=IDD_MUSEDIT (English (U.S.)) +Resource184=IDR_MUSIC (English (U.S.)) +Resource185=IDD_EXTRACT (English (U.S.)) +Resource186=IDD_IAPDIALOG (English (U.S.)) +Resource187=IDR_CHUI (English (U.S.)) +Resource188=IDD_CREATURESTRINGS (English (U.S.)) +Resource189=IDD_AREAGENERAL (English (U.S.)) +Resource190=IDD_EDIT (English (U.S.)) +Resource191=IDD_ADDLINK (English (U.S.)) +Resource192=IDD_CREATURESKILLS (English (U.S.)) +Resource193=IDR_SCRIPT (English (U.S.)) +Resource194=IDD_AREAACTOR (English (U.S.)) +Resource195=IDD_AREASONGS (English (U.S.)) +Resource196=IDD_FINDITEM (English (U.S.)) +Resource197=IDD_EXTRACT2 (English (U.S.)) +Resource198=IDD_SPELLEQUIP (English (U.S.)) +Resource199=IDD_TISDIALOG (English (U.S.)) +Resource200=IDD_AREAENTRANCE (English (U.S.)) +Resource201=IDD_CFB (English (U.S.)) +Resource202=IDD_EFFEDIT (English (U.S.)) +Resource203=IDD_COMPAT (English (U.S.)) +Resource204=IDD_CREATURERES (English (U.S.)) +Resource205=IDD_IMAGEVIEW (English (U.S.)) +Resource206=IDD_GAMEGENERAL (English (U.S.)) +Resource207=IDD_CREATUREEFF (English (U.S.)) +Resource208=IDD_CREATUREIWD2 (English (U.S.)) +Resource209=IDD_ITEMICONS (English (U.S.)) +Resource210=IDD_STOREEXTRA (English (U.S.)) +Resource211=IDD_KEYEDIT (English (U.S.)) +Resource212=IDR_ITEM (English (U.S.)) +Resource213=IDD_STOREITEMS (English (U.S.)) +Resource214=IDD_SPELLEFFECT (English (U.S.)) +Resource215=IDR_MENUBAR (English (U.S.)) +Resource216=IDD_ANIMDIALOG +Resource217=IDD_CREATUREEDIT (English (U.S.)) +Resource218=IDD_WEDEDIT (English (U.S.)) +Resource219=IDD_CHECK (English (U.S.)) +Resource220=IDD_ITEMEFFECT (English (U.S.)) +Resource221=IDR_SRC (English (U.S.)) +Resource222=IDD_CREATUREIWD (English (U.S.)) +Resource223=IDD_DIALOGEDIT (English (U.S.)) +Resource224=IDD_MAPEDIT (English (U.S.)) +Resource225=IDD_WEIDU (English (U.S.)) +Resource226=IDD_GAMESTATS (English (U.S.)) +Resource227=IDD_CREATUREPST (English (U.S.)) +Resource228=IDD_GAMEEDIT (English (U.S.)) +Resource229=IDD_SPELLGENERAL (English (U.S.)) +Resource230=IDD_MOSEDIT (English (U.S.)) +Resource231=IDD_ITEMGENERAL (English (U.S.)) +Resource232=IDD_ITEMUSE (English (U.S.)) +Resource233=IDR_WEDMENU (English (U.S.)) +Resource234=IDD_AREADOOR (English (U.S.)) +Resource235=IDD_SPELLTOOL (English (U.S.)) +Resource236=IDR_WORLDMAP (English (U.S.)) +Resource237=IDD_AREAAMBIENT (English (U.S.)) +Resource238=IDD_PROGRESS (English (U.S.)) +Resource239=IDD_CREATUREUNKNOWN (English (U.S.)) +Resource240=IDD_AREAANIM (English (U.S.)) +Resource241=IDD_AREASPAWN (English (U.S.)) +Resource242=IDD_POLYGON (English (U.S.)) +Resource243=IDR_TREEMENU (English (U.S.)) +Resource244=IDD_CHITEM_DIALOG (English (U.S.)) +Resource245=IDR_GAME (English (U.S.)) Class99=CAreaTriggerString Class100=CPCInfo -Resource246=IDR_MUSIC (English (U.S.)) +Resource246=IDD_TEXTVIEW (English (U.S.)) Class101=CCreatureOverlay -Resource247=IDD_SCRIPTEDIT (English (U.S.)) +Resource247=IDD_AREATRIGGER (English (U.S.)) Class102=IWD2Creature -Resource248=IDD_FINDITEM (English (U.S.)) +Resource248=IDD_MAPLINK (English (U.S.)) Class103=CAnimDialog -Resource249=IDD_STORERENTAL (English (U.S.)) +Resource249=IDR_2DA (English (U.S.)) Class104=CCreatureLevels -Resource250=IDD_TEXTVIEW (English (U.S.)) +Resource250=IDD_VARIABLES (English (U.S.)) Class105=CAreaProj -Resource251=IDD_COMPAT (English (U.S.)) +Resource251=IDR_IDS (English (U.S.)) Class106=CProjGemRB -Resource252=IDD_IMAGEVIEW (English (U.S.)) +Resource252=IDD_CREATUREOVR (English (U.S.)) Class107=CProjAreaGemRB Resource253=IDR_SHORTCUT (English (U.S.)) @@ -2982,7 +2982,7 @@ HeaderFile=CreatureProperties.h ImplementationFile=CreatureProperties.cpp BaseClass=CPropertyPage -LastObject=IDC_SLOTPICKER +LastObject=CCreatureStrings Filter=D VirtualFilter=dWC @@ -5548,7 +5548,7 @@ ImplementationFile=GameGeneral.cpp BaseClass=CDialog Filter=W -LastObject=IDC_AREA +LastObject=IDC_UNKNOWN64 VirtualFilter=dWC [DLG:IDD_GAMEPCINFO] @@ -7697,23 +7697,24 @@ [DLG:IDD_CREATURESTRINGS (English (U.S.))] Type=1 Class=CCreatureStrings -ControlCount=16 +ControlCount=17 Control1=IDC_BUDDY,edit,1082196096 -Control2=IDC_SLOTPICKER,combobox,1344339970 -Control3=IDC_SLOTSPIN,msctls_updown32,1342177330 -Control4=IDC_REF,edit,1350631552 -Control5=IDC_TAGGED,button,1342242851 -Control6=IDC_SOUNDREF,edit,1350631560 -Control7=IDC_PLAY,button,1342242816 -Control8=IDC_TEXT,edit,1352732676 -Control9=IDC_STATIC,static,1342308352 -Control10=IDC_STATIC,static,1342308352 -Control11=IDC_STATIC,static,1342308352 -Control12=IDC_STATIC,static,1342308352 -Control13=IDC_COPY,button,1342242816 -Control14=IDC_PASTE,button,1342242816 -Control15=IDC_EXPORT,button,1342242816 -Control16=IDC_IMPORT,button,1342242816 +Control2=IDC_CLEAR,button,1342242816 +Control3=IDC_COPY,button,1342242816 +Control4=IDC_PASTE,button,1342242816 +Control5=IDC_EXPORT,button,1342242816 +Control6=IDC_IMPORT,button,1342242816 +Control7=IDC_SLOTPICKER,combobox,1344339970 +Control8=IDC_SLOTSPIN,msctls_updown32,1342177330 +Control9=IDC_REF,edit,1350631552 +Control10=IDC_TAGGED,button,1342242851 +Control11=IDC_SOUNDREF,edit,1350631560 +Control12=IDC_PLAY,button,1342242816 +Control13=IDC_TEXT,edit,1352732676 +Control14=IDC_STATIC,static,1342308352 +Control15=IDC_STATIC,static,1342308352 +Control16=IDC_STATIC,static,1342308352 +Control17=IDC_STATIC,static,1342308352 [DLG:IDD_CREATUREUNKNOWN (English (U.S.))] Type=1 @@ -9441,10 +9442,10 @@ [DLG:IDD_GAMEGENERAL (English (U.S.))] Type=1 Class=CGameGeneral -ControlCount=38 +ControlCount=40 Control1=IDC_STARTAREA,edit,1350631560 -Control2=IDC_GAMETIME,edit,1350631552 -Control3=IDC_GOLD,edit,1350631552 +Control2=IDC_GAMETIME,edit,1350639744 +Control3=IDC_GOLD,edit,1350639744 Control4=IDCANCEL,button,1342242816 Control5=IDC_STATIC,static,1342308352 Control6=IDC_STATIC,static,1342308352 @@ -9461,7 +9462,7 @@ Control17=IDC_STATIC,static,1342308352 Control18=IDC_UNKNOWN1C,edit,1350631552 Control19=IDC_STATIC,static,1342308352 -Control20=IDC_UNKNOWN48,edit,1350631552 +Control20=IDC_UNKNOWN48,edit,1350639744 Control21=IDC_STATIC,static,1342308352 Control22=IDC_BROWSE,button,1342242816 Control23=IDC_SCREEN,edit,1350631552 @@ -9478,8 +9479,10 @@ Control34=IDC_BROWSE2,button,1342242816 Control35=IDC_AREA,edit,1350631560 Control36=IDC_STATIC,static,1342308352 -Control37=IDC_REALTIME,edit,1350631552 +Control37=IDC_REALTIME,edit,1350639744 Control38=IDC_STATIC,static,1342308352 +Control39=IDC_UNKNOWN64,edit,1350639744 +Control40=IDC_STATIC,static,1342308352 [DLG:IDD_GAMEPCINFO (English (U.S.))] Type=1 Modified: chitem/trunk/chitem.rc =================================================================== --- chitem/trunk/chitem.rc 2009-08-23 18:15:35 UTC (rev 7034) +++ chitem/trunk/chitem.rc 2009-08-23 18:16:40 UTC (rev 7035) @@ -1396,7 +1396,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTROLPARENT CAPTION "Edit Palette" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN CONTROL "",IDC_PALETTE,"Static",SS_BITMAP | SS_NOTIFY | SS_SUNKEN | WS_BORDER,23,24,17,15,0,HIDC_PALETTE @@ -2117,7 +2117,7 @@ EXSTYLE WS_EX_CONTROLPARENT CAPTION "Edit Projectile:" MENU IDR_PROJECT -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "Load Projectile",IDC_LOAD,7,245,52,14 PUSHBUTTON "Load external projectile",IDC_LOADEX,69,245,78,14 @@ -2727,7 +2727,12 @@ CAPTION "Soundset" FONT 8, "MS Sans Serif" BEGIN - EDITTEXT IDC_BUDDY,57,6,40,14,ES_AUTOHSCROLL | NOT WS_VISIBLE + EDITTEXT IDC_BUDDY,50,6,40,14,ES_AUTOHSCROLL | NOT WS_VISIBLE + PUSHBUTTON "Clear slots",IDC_CLEAR,98,6,50,14 + PUSHBUTTON "Copy slots",IDC_COPY,156,6,50,14 + PUSHBUTTON "Paste slots",IDC_PASTE,214,6,50,14 + PUSHBUTTON "Export soundset",IDC_EXPORT,272,6,56,14 + PUSHBUTTON "Import soundset",IDC_IMPORT,336,6,55,14 COMBOBOX IDC_SLOTPICKER,7,22,375,170,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP CONTROL "Spin1",IDC_SLOTSPIN,"msctls_updown32",UDS_SETBUDDYINT | @@ -2743,10 +2748,6 @@ LTEXT "Sound ref.:",IDC_STATIC,245,45,36,8 LTEXT "Choose slot",IDC_STATIC,7,8,38,8 LTEXT "String reference",IDC_STATIC,68,45,51,8 - PUSHBUTTON "Copy slots",IDC_COPY,141,6,50,14 - PUSHBUTTON "Paste slots",IDC_PASTE,204,6,50,14 - PUSHBUTTON "Export soundset",IDC_EXPORT,267,6,56,14 - PUSHBUTTON "Import soundset",IDC_IMPORT,336,6,55,14 END IDD_CREATUREUNKNOWN DIALOG DISCARDABLE 0, 0, 400, 199 @@ -3433,7 +3434,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTROLPARENT CAPTION "Area extension header" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN EDITTEXT IDC_DURATION,142,72,55,14,ES_AUTOHSCROLL PUSHBUTTON "Back",IDOK,352,170,50,14 @@ -4735,10 +4736,12 @@ 328,178,33,10 CONTROL "Top",IDC_FLAG6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 296,192,29,10 - CONTROL "7",IDC_FLAG7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,221, - 161,20,10 + CONTROL "7",IDC_FLAG7,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,296,161,51,10 CONTROL "Bottom",IDC_FLAG8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 328,192,38,10 + CONTROL "Lowercase",IDC_FLAG9,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,296,161,51,10 LTEXT "Text justification",IDC_BUTTONFLAG,240,122,52,8 LTEXT "Steps",IDC_STEPS,193,150,19,8 END @@ -5053,8 +5056,8 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN EDITTEXT IDC_STARTAREA,7,19,48,14,ES_UPPERCASE | ES_AUTOHSCROLL - EDITTEXT IDC_GAMETIME,115,19,48,14,ES_AUTOHSCROLL - EDITTEXT IDC_GOLD,185,19,48,14,ES_AUTOHSCROLL + EDITTEXT IDC_GAMETIME,115,19,48,14,ES_AUTOHSCROLL | ES_NUMBER + EDITTEXT IDC_GOLD,185,19,48,14,ES_AUTOHSCROLL | ES_NUMBER PUSHBUTTON "&Back",IDCANCEL,195,161,46,14 LTEXT "Start area",IDC_STATIC,7,4,32,8 LTEXT "Gametime",IDC_STATIC,115,4,32,8 @@ -5079,8 +5082,8 @@ LTEXT "Weather",IDC_STATIC,7,67,28,8 EDITTEXT IDC_UNKNOWN1C,61,82,32,14,ES_AUTOHSCROLL LTEXT "0x1C",IDC_STATIC,61,67,17,8 - EDITTEXT IDC_UNKNOWN48,185,82,48,14,ES_AUTOHSCROLL - LTEXT "0x48",IDC_STATIC,185,67,16,8 + EDITTEXT IDC_UNKNOWN48,185,48,48,14,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "0x48",IDC_STATIC,185,37,16,8 PUSHBUTTON "Browse",IDC_BROWSE,61,19,50,14 EDITTEXT IDC_SCREEN,115,82,48,14,ES_AUTOHSCROLL LTEXT "Controls on screen",IDC_STATIC,115,67,60,8 @@ -5097,8 +5100,10 @@ PUSHBUTTON "Browse",IDC_BROWSE2,61,48,50,14 EDITTEXT IDC_AREA,7,48,48,14,ES_UPPERCASE | ES_AUTOHSCROLL LTEXT "Master area",IDC_STATIC,7,37,38,8 - EDITTEXT IDC_REALTIME,115,48,48,14,ES_AUTOHSCROLL + EDITTEXT IDC_REALTIME,115,48,48,14,ES_AUTOHSCROLL | ES_NUMBER LTEXT "Realtime",IDC_STATIC,115,37,28,8 + EDITTEXT IDC_UNKNOWN64,185,82,48,14,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "0x64",IDC_STATIC,185,67,16,8 END IDD_GAMEPCINFO DIALOG DISCARDABLE 0, 0, 313, 259 Modified: chitem/trunk/game.cpp =================================================================== --- chitem/trunk/game.cpp 2009-08-23 18:15:35 UTC (rev 7034) +++ chitem/trunk/game.cpp 2009-08-23 18:16:40 UTC (rev 7035) @@ -33,6 +33,7 @@ pcextensions=NULL; deathvariables=NULL; slocs=NULL; + pplocs=NULL; //memset(qslots,0,sizeof(qslots)); npccount=0; @@ -46,7 +47,7 @@ journalcount=0; deathvariablecount=0; sloccount=0; - + ppcount=0; revision=20; //bg2 revision is 2.0 } @@ -63,6 +64,7 @@ KillMazeData(); KillJournals(); KillSavedLocs(); + KillPPLocs(); KillDeathVariables(); } @@ -261,6 +263,8 @@ if(revision==22) fullsize+=4; header.slocoffset=fullsize; fullsize+=header.sloccount*sizeof(gam_sloc); + header.ppoffset=fullsize; + fullsize+=header.ppcount*sizeof(gam_sloc); } if(calculate) @@ -390,6 +394,11 @@ { return -2; } + esize=ppcount*sizeof(gam_sloc); + if(write(fhandle,pplocs,esize)!=esize) + { + return -2; + } return 0; } @@ -764,8 +773,35 @@ return -2; } fullsize+=esize; - } else sloccount = 0; + + flg=adjust_actpoint(header.ppoffset); + if(flg<0) + { + return flg; + } + if(flg) ret|=flg; + + if(ppcount!=header.ppcount) + { + KillPPLocs(); + pplocs = new gam_sloc[header.ppcount]; + if(!slocs) return -3; + ppcount=header.ppcount; + } + esize =sizeof(gam_sloc)*header.ppcount; + if(read(fhandle,pplocs, esize)!=esize) + { + return -2; + } + fullsize+=esize; + } + else + { + sloccount = 0; + ppcount = 0; + } + if(revision==22) //this is a hack for iwd2 { fullsize+=4; Modified: chitem/trunk/game.h =================================================================== --- chitem/trunk/game.h 2009-08-23 18:15:35 UTC (rev 7034) +++ chitem/trunk/game.h 2009-08-23 18:16:40 UTC (rev 7035) @@ -30,7 +30,7 @@ int journalcount; int pcstructcount, npcstructcount; int pcextensioncount, npcextensioncount; - int sloccount; + int sloccount, ppcount; gam_variable *variables, *deathvariables; gam_npc *pcs, *npcs; @@ -38,6 +38,7 @@ gam_mazedata *mazedata; gam_journal *journals; gam_sloc *slocs; + gam_sloc *pplocs; char **npcstructs; char **pcstructs; gam_npc_extension *pcextensions, *npcextensions; @@ -172,6 +173,15 @@ sloccount=0; } } + inline void KillPPLocs() + { + if(pplocs) + { + delete[] pplocs; + pplocs=NULL; + ppcount=0; + } + } private: int ReadCreData(int offset, int size, char *&pointer,int &fullsize); int ReadExtension(char *pointer, int &fullsize, int mysize); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-09-06 07:22:29
|
Revision: 7095 http://gemrb.svn.sourceforge.net/gemrb/?rev=7095&view=rev Author: avenger_teambg Date: 2009-09-06 07:22:20 +0000 (Sun, 06 Sep 2009) Log Message: ----------- dltcep update Modified Paths: -------------- chitem/trunk/AreaProperties.cpp chitem/trunk/AreaProperties.h chitem/trunk/EffEdit.cpp chitem/trunk/chitem.clw Modified: chitem/trunk/AreaProperties.cpp =================================================================== --- chitem/trunk/AreaProperties.cpp 2009-09-05 16:37:24 UTC (rev 7094) +++ chitem/trunk/AreaProperties.cpp 2009-09-06 07:22:20 UTC (rev 7095) @@ -7007,6 +7007,7 @@ ON_CBN_KILLFOCUS(IDC_PROJPICKER, OnKillfocusProjpicker) ON_CBN_SELCHANGE(IDC_PROJPICKER, OnSelchangeProjpicker) ON_BN_CLICKED(IDC_BROWSE, OnBrowse) + ON_BN_CLICKED(IDC_ADD, OnAdd) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -7104,6 +7105,12 @@ UpdateData(UD_DISPLAY); } +void CAreaProj::OnAdd() +{ + // TODO: Add your control notification handler code here + +} + BOOL CAreaProj::PreTranslateMessage(MSG* pMsg) { m_tooltip.RelayEvent(pMsg); Modified: chitem/trunk/AreaProperties.h =================================================================== --- chitem/trunk/AreaProperties.h 2009-09-05 16:37:24 UTC (rev 7094) +++ chitem/trunk/AreaProperties.h 2009-09-06 07:22:20 UTC (rev 7095) @@ -859,9 +859,9 @@ virtual BOOL OnInitDialog(); afx_msg void OnKillfocusProjpicker(); afx_msg void OnSelchangeProjpicker(); - afx_msg void OnAdd(); afx_msg void OnRemove(); afx_msg void OnBrowse(); + afx_msg void OnAdd(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: chitem/trunk/EffEdit.cpp =================================================================== --- chitem/trunk/EffEdit.cpp 2009-09-05 16:37:24 UTC (rev 7094) +++ chitem/trunk/EffEdit.cpp 2009-09-06 07:22:20 UTC (rev 7095) @@ -511,6 +511,7 @@ ON_COMMAND(ID_TOOLS_IDSBROWSER, OnToolsIdsbrowser) ON_EN_KILLFOCUS(IDC_PAR4, OnDefaultKillfocus) ON_BN_CLICKED(IDC_PAR_SPECIAL, OnParSpecial) + ON_BN_CLICKED(IDC_HEXADECIMAL, OnHexadecimal) ON_CBN_KILLFOCUS(IDC_TIMING, DefaultKillfocus) ON_CBN_KILLFOCUS(IDC_EFFTARGET, DefaultKillfocus) ON_EN_KILLFOCUS(IDC_DURATION, DefaultKillfocus) @@ -545,7 +546,8 @@ ON_CBN_SELCHANGE(IDC_EFFOPCODE2, OnSelchangeEffopcode) ON_EN_KILLFOCUS(IDC_POS1X, DefaultKillfocus) ON_EN_KILLFOCUS(IDC_POS1Y, DefaultKillfocus) - ON_BN_CLICKED(IDC_HEXADECIMAL, OnHexadecimal) + ON_EN_KILLFOCUS(IDC_POS2X, DefaultKillfocus) + ON_EN_KILLFOCUS(IDC_POS2Y, DefaultKillfocus) //}}AFX_MSG_MAP END_MESSAGE_MAP() Modified: chitem/trunk/chitem.clw =================================================================== --- chitem/trunk/chitem.clw 2009-09-05 16:37:24 UTC (rev 7094) +++ chitem/trunk/chitem.clw 2009-09-06 07:22:20 UTC (rev 7095) @@ -2,7 +2,7 @@ [General Info] Version=1 -LastClass=CGameGeneral +LastClass=CEffEdit LastTemplate=CDialog NewFileInclude1=#include "stdafx.h" NewFileInclude2=#include "chitem.h" @@ -232,142 +232,142 @@ Resource123=IDD_GAMEGENERAL Class98=IcewindCre Resource124=IDR_SHORTCUT -Resource125=IDD_PROJEXT (English (U.S.)) -Resource126=IDD_STORERENTAL (English (U.S.)) -Resource127=IDD_CHUIEDIT (English (U.S.)) -Resource128=IDD_ITEMDESC (English (U.S.)) -Resource129=IDR_VVC (English (U.S.)) -Resource130=IDD_CREATUREICONS (English (U.S.)) -Resource131=IDD_STRREFDLG (English (U.S.)) -Resource132=IDR_EFFECT (English (U.S.)) -Resource133=IDR_SPELL (English (U.S.)) -Resource134=IDD_WEDPOLY (English (U.S.)) -Resource135=IDR_CREATURE (English (U.S.)) -Resource136=IDD_SCHEDULE (English (U.S.)) -Resource137=IDD_SPELLDESC (English (U.S.)) -Resource138=IDD_AREAPROJ (English (U.S.)) -Resource139=IDD_ITEMEXTRA (English (U.S.)) -Resource140=IDD_2DAEDIT (English (U.S.)) -Resource141=IDD_PANICBUTTON (English (U.S.)) -Resource142=IDR_AREA (English (U.S.)) -Resource143=IDD_ABOUTBOX (English (U.S.)) -Resource144=IDD_SHOWLOG (English (U.S.)) -Resource145=IDD_AREAEDIT (English (U.S.)) -Resource146=IDD_AREACONTAINER (English (U.S.)) -Resource147=IDR_TILE (English (U.S.)) -Resource148=IDD_GAMEPCINFO (English (U.S.)) -Resource149=IDD_CREATURELEVELS (English (U.S.)) -Resource150=IDD_VVCEDIT (English (U.S.)) -Resource151=IDD_SPELLEXTRA (English (U.S.)) -Resource152=IDD_PROJAREAGEMRB (English (U.S.)) -Resource153=IDD_STOREGENERAL (English (U.S.)) -Resource154=IDD_AREAVARIABLE (English (U.S.)) -Resource155=IDD_AREAMAP (English (U.S.)) -Resource156=IDR_STORE (English (U.S.)) -Resource157=IDD_IDSEDIT (English (U.S.)) -Resource158=IDD_STOREEDIT (English (U.S.)) -Resource159=IDD_BAMEDIT (English (U.S.)) -Resource160=IDD_SEARCHNODE (English (U.S.)) -Resource161=IDR_CHITIN (English (U.S.)) -Resource162=IDD_PROJGEMRB (English (U.S.)) -Resource163=IDR_TLKMENU (English (U.S.)) -Resource164=IDD_SPELLEDIT (English (U.S.)) -Resource165=IDD_COLORPICKER (English (U.S.)) -Resource166=IDD_PALETTE (English (U.S.)) -Resource167=IDD_ITEMEQUIP (English (U.S.)) -Resource168=IDD_STOREDRINKS (English (U.S.)) -Resource169=IDD_ITEMEDIT (English (U.S.)) -Resource170=IDD_CREATUREGENERAL (English (U.S.)) -Resource171=IDD_SCRIPTEDIT (English (U.S.)) -Resource172=IDD_AREATRIGGERSTRINGS (English (U.S.)) -Resource173=IDD_PROJEDIT (English (U.S.)) -Resource174=IDD_SAVHANDLE (English (U.S.)) -Resource175=IDD_SRCEDIT (English (U.S.)) -Resource176=IDR_PROJECT (English (U.S.)) -Resource177=IDD_ITEMPICKER (English (U.S.)) -Resource178=IDR_BAMMENU (English (U.S.)) -Resource179=IDD_WEDTILE (English (U.S.)) -Resource180=IDD_CREATUREITEMS (English (U.S.)) -Resource181=IDD_MASSCLEAR (English (U.S.)) -Resource182=IDD_AREAINT (English (U.S.)) -Resource183=IDD_MUSEDIT (English (U.S.)) -Resource184=IDR_MUSIC (English (U.S.)) -Resource185=IDD_EXTRACT (English (U.S.)) -Resource186=IDD_IAPDIALOG (English (U.S.)) -Resource187=IDR_CHUI (English (U.S.)) -Resource188=IDD_CREATURESTRINGS (English (U.S.)) -Resource189=IDD_AREAGENERAL (English (U.S.)) -Resource190=IDD_EDIT (English (U.S.)) -Resource191=IDD_ADDLINK (English (U.S.)) -Resource192=IDD_CREATURESKILLS (English (U.S.)) -Resource193=IDR_SCRIPT (English (U.S.)) -Resource194=IDD_AREAACTOR (English (U.S.)) -Resource195=IDD_AREASONGS (English (U.S.)) -Resource196=IDD_FINDITEM (English (U.S.)) -Resource197=IDD_EXTRACT2 (English (U.S.)) -Resource198=IDD_SPELLEQUIP (English (U.S.)) -Resource199=IDD_TISDIALOG (English (U.S.)) -Resource200=IDD_AREAENTRANCE (English (U.S.)) -Resource201=IDD_CFB (English (U.S.)) -Resource202=IDD_EFFEDIT (English (U.S.)) -Resource203=IDD_COMPAT (English (U.S.)) -Resource204=IDD_CREATURERES (English (U.S.)) -Resource205=IDD_IMAGEVIEW (English (U.S.)) -Resource206=IDD_GAMEGENERAL (English (U.S.)) -Resource207=IDD_CREATUREEFF (English (U.S.)) -Resource208=IDD_CREATUREIWD2 (English (U.S.)) -Resource209=IDD_ITEMICONS (English (U.S.)) -Resource210=IDD_STOREEXTRA (English (U.S.)) -Resource211=IDD_KEYEDIT (English (U.S.)) -Resource212=IDR_ITEM (English (U.S.)) -Resource213=IDD_STOREITEMS (English (U.S.)) -Resource214=IDD_SPELLEFFECT (English (U.S.)) -Resource215=IDR_MENUBAR (English (U.S.)) -Resource216=IDD_ANIMDIALOG -Resource217=IDD_CREATUREEDIT (English (U.S.)) -Resource218=IDD_WEDEDIT (English (U.S.)) -Resource219=IDD_CHECK (English (U.S.)) -Resource220=IDD_ITEMEFFECT (English (U.S.)) -Resource221=IDR_SRC (English (U.S.)) -Resource222=IDD_CREATUREIWD (English (U.S.)) -Resource223=IDD_DIALOGEDIT (English (U.S.)) -Resource224=IDD_MAPEDIT (English (U.S.)) -Resource225=IDD_WEIDU (English (U.S.)) -Resource226=IDD_GAMESTATS (English (U.S.)) -Resource227=IDD_CREATUREPST (English (U.S.)) -Resource228=IDD_GAMEEDIT (English (U.S.)) -Resource229=IDD_SPELLGENERAL (English (U.S.)) -Resource230=IDD_MOSEDIT (English (U.S.)) -Resource231=IDD_ITEMGENERAL (English (U.S.)) -Resource232=IDD_ITEMUSE (English (U.S.)) -Resource233=IDR_WEDMENU (English (U.S.)) -Resource234=IDD_AREADOOR (English (U.S.)) -Resource235=IDD_SPELLTOOL (English (U.S.)) -Resource236=IDR_WORLDMAP (English (U.S.)) -Resource237=IDD_AREAAMBIENT (English (U.S.)) -Resource238=IDD_PROGRESS (English (U.S.)) -Resource239=IDD_CREATUREUNKNOWN (English (U.S.)) -Resource240=IDD_AREAANIM (English (U.S.)) -Resource241=IDD_AREASPAWN (English (U.S.)) -Resource242=IDD_POLYGON (English (U.S.)) -Resource243=IDR_TREEMENU (English (U.S.)) -Resource244=IDD_CHITEM_DIALOG (English (U.S.)) -Resource245=IDR_GAME (English (U.S.)) +Resource125=IDD_SPELLEXTRA (English (U.S.)) +Resource126=IDR_IDS (English (U.S.)) +Resource127=IDD_DIALOGEDIT (English (U.S.)) +Resource128=IDD_ANIMDIALOG +Resource129=IDD_AREAMAP (English (U.S.)) +Resource130=IDD_STOREGENERAL (English (U.S.)) +Resource131=IDD_CREATUREGENERAL (English (U.S.)) +Resource132=IDD_MASSCLEAR (English (U.S.)) +Resource133=IDD_WEDEDIT (English (U.S.)) +Resource134=IDD_AREASONGS (English (U.S.)) +Resource135=IDD_KEYEDIT (English (U.S.)) +Resource136=IDD_ITEMEQUIP (English (U.S.)) +Resource137=IDD_CHITEM_DIALOG (English (U.S.)) +Resource138=IDD_CREATUREIWD2 (English (U.S.)) +Resource139=IDR_TILE (English (U.S.)) +Resource140=IDD_AREAEDIT (English (U.S.)) +Resource141=IDD_CREATURESKILLS (English (U.S.)) +Resource142=IDD_TISDIALOG (English (U.S.)) +Resource143=IDD_AREAPROJ (English (U.S.)) +Resource144=IDD_CREATUREEDIT (English (U.S.)) +Resource145=IDD_ITEMGENERAL (English (U.S.)) +Resource146=IDD_BAMEDIT (English (U.S.)) +Resource147=IDD_GAMESTATS (English (U.S.)) +Resource148=IDD_2DAEDIT (English (U.S.)) +Resource149=IDD_AREAANIM (English (U.S.)) +Resource150=IDR_WORLDMAP (English (U.S.)) +Resource151=IDD_ABOUTBOX (English (U.S.)) +Resource152=IDD_STRREFDLG (English (U.S.)) +Resource153=IDR_SCRIPT (English (U.S.)) +Resource154=IDD_SPELLGENERAL (English (U.S.)) +Resource155=IDD_ADDLINK (English (U.S.)) +Resource156=IDD_WEDPOLY (English (U.S.)) +Resource157=IDD_AREAACTOR (English (U.S.)) +Resource158=IDR_TLKMENU (English (U.S.)) +Resource159=IDR_SRC (English (U.S.)) +Resource160=IDD_ITEMUSE (English (U.S.)) +Resource161=IDD_AREATRIGGERSTRINGS (English (U.S.)) +Resource162=IDD_SHOWLOG (English (U.S.)) +Resource163=IDD_CHUIEDIT (English (U.S.)) +Resource164=IDD_PROGRESS (English (U.S.)) +Resource165=IDD_AREAENTRANCE (English (U.S.)) +Resource166=IDR_WEDMENU (English (U.S.)) +Resource167=IDR_STORE (English (U.S.)) +Resource168=IDD_PROJEXT (English (U.S.)) +Resource169=IDR_TREEMENU (English (U.S.)) +Resource170=IDD_STOREEDIT (English (U.S.)) +Resource171=IDD_AREASPAWN (English (U.S.)) +Resource172=IDD_EDIT (English (U.S.)) +Resource173=IDD_ITEMEFFECT (English (U.S.)) +Resource174=IDD_CREATUREICONS (English (U.S.)) +Resource175=IDD_SEARCHNODE (English (U.S.)) +Resource176=IDD_STOREDRINKS (English (U.S.)) +Resource177=IDR_AREA (English (U.S.)) +Resource178=IDD_PANICBUTTON (English (U.S.)) +Resource179=IDD_AREADOOR (English (U.S.)) +Resource180=IDD_EXTRACT2 (English (U.S.)) +Resource181=IDD_AREAAMBIENT (English (U.S.)) +Resource182=IDD_STOREEXTRA (English (U.S.)) +Resource183=IDD_CREATURERES (English (U.S.)) +Resource184=IDD_CREATUREPST (English (U.S.)) +Resource185=IDR_CREATURE (English (U.S.)) +Resource186=IDD_PROJEDIT (English (U.S.)) +Resource187=IDD_GAMEGENERAL (English (U.S.)) +Resource188=IDD_VARIABLES (English (U.S.)) +Resource189=IDD_ITEMEDIT (English (U.S.)) +Resource190=IDD_SCHEDULE (English (U.S.)) +Resource191=IDD_SPELLEQUIP (English (U.S.)) +Resource192=IDD_STOREITEMS (English (U.S.)) +Resource193=IDD_SRCEDIT (English (U.S.)) +Resource194=IDD_ITEMICONS (English (U.S.)) +Resource195=IDD_COMPAT (English (U.S.)) +Resource196=IDR_BAMMENU (English (U.S.)) +Resource197=IDD_FINDITEM (English (U.S.)) +Resource198=IDD_IMAGEVIEW (English (U.S.)) +Resource199=IDD_AREAINT (English (U.S.)) +Resource200=IDD_ITEMPICKER (English (U.S.)) +Resource201=IDR_GAME (English (U.S.)) +Resource202=IDR_PROJECT (English (U.S.)) +Resource203=IDR_MUSIC (English (U.S.)) +Resource204=IDD_EFFEDIT (English (U.S.)) +Resource205=IDD_CREATURELEVELS (English (U.S.)) +Resource206=IDD_MOSEDIT (English (U.S.)) +Resource207=IDD_CREATURESTRINGS (English (U.S.)) +Resource208=IDD_IAPDIALOG (English (U.S.)) +Resource209=IDR_SPELL (English (U.S.)) +Resource210=IDR_CHUI (English (U.S.)) +Resource211=IDD_AREACONTAINER (English (U.S.)) +Resource212=IDD_CREATUREEFF (English (U.S.)) +Resource213=IDR_VVC (English (U.S.)) +Resource214=IDD_CHECK (English (U.S.)) +Resource215=IDD_SAVHANDLE (English (U.S.)) +Resource216=IDD_SCRIPTEDIT (English (U.S.)) +Resource217=IDD_CFB (English (U.S.)) +Resource218=IDD_CREATUREUNKNOWN (English (U.S.)) +Resource219=IDD_PROJAREAGEMRB (English (U.S.)) +Resource220=IDR_EFFECT (English (U.S.)) +Resource221=IDD_GAMEPCINFO (English (U.S.)) +Resource222=IDD_IDSEDIT (English (U.S.)) +Resource223=IDD_ITEMDESC (English (U.S.)) +Resource224=IDD_SPELLEFFECT (English (U.S.)) +Resource225=IDD_CREATUREOVR (English (U.S.)) +Resource226=IDD_CREATUREITEMS (English (U.S.)) +Resource227=IDD_MAPLINK (English (U.S.)) +Resource228=IDD_SPELLDESC (English (U.S.)) +Resource229=IDR_CHITIN (English (U.S.)) +Resource230=IDD_AREAGENERAL (English (U.S.)) +Resource231=IDR_ITEM (English (U.S.)) +Resource232=IDD_WEIDU (English (U.S.)) +Resource233=IDD_CREATUREIWD (English (U.S.)) +Resource234=IDD_PALETTE (English (U.S.)) +Resource235=IDD_AREAVARIABLE (English (U.S.)) +Resource236=IDD_WEDTILE (English (U.S.)) +Resource237=IDD_ITEMEXTRA (English (U.S.)) +Resource238=IDR_MENUBAR (English (U.S.)) +Resource239=IDD_STORERENTAL (English (U.S.)) +Resource240=IDD_AREATRIGGER (English (U.S.)) +Resource241=IDD_VVCEDIT (English (U.S.)) +Resource242=IDD_GAMEEDIT (English (U.S.)) +Resource243=IDD_MUSEDIT (English (U.S.)) +Resource244=IDD_PROJGEMRB (English (U.S.)) +Resource245=IDD_SPELLTOOL (English (U.S.)) Class99=CAreaTriggerString Class100=CPCInfo -Resource246=IDD_TEXTVIEW (English (U.S.)) +Resource246=IDD_MAPEDIT (English (U.S.)) Class101=CCreatureOverlay -Resource247=IDD_AREATRIGGER (English (U.S.)) +Resource247=IDD_EXTRACT (English (U.S.)) Class102=IWD2Creature -Resource248=IDD_MAPLINK (English (U.S.)) +Resource248=IDD_SPELLEDIT (English (U.S.)) Class103=CAnimDialog -Resource249=IDR_2DA (English (U.S.)) +Resource249=IDD_POLYGON (English (U.S.)) Class104=CCreatureLevels -Resource250=IDD_VARIABLES (English (U.S.)) +Resource250=IDR_2DA (English (U.S.)) Class105=CAreaProj -Resource251=IDR_IDS (English (U.S.)) +Resource251=IDD_TEXTVIEW (English (U.S.)) Class106=CProjGemRB -Resource252=IDD_CREATUREOVR (English (U.S.)) +Resource252=IDD_COLORPICKER (English (U.S.)) Class107=CProjAreaGemRB Resource253=IDR_SHORTCUT (English (U.S.)) @@ -1341,7 +1341,7 @@ ImplementationFile=EffEdit.cpp BaseClass=CDialog Filter=D -LastObject=CEffEdit +LastObject=IDC_UNKNOWN VirtualFilter=dWC [DLG:IDD_VARIABLES] @@ -9094,7 +9094,7 @@ [DLG:IDD_CHUIEDIT (English (U.S.))] Type=1 Class=CChuiEdit -ControlCount=112 +ControlCount=113 Control1=IDC_WINDOWPICKER,combobox,1344340035 Control2=IDC_ID,edit,1350631552 Control3=IDC_XPOS,edit,1350631552 @@ -9205,8 +9205,9 @@ Control108=IDC_FLAG6,button,1342242819 Control109=IDC_FLAG7,button,1342242819 Control110=IDC_FLAG8,button,1342242819 -Control111=IDC_BUTTONFLAG,static,1342308352 -Control112=IDC_STEPS,static,1342308352 +Control111=IDC_FLAG9,button,1342242819 +Control112=IDC_BUTTONFLAG,static,1342308352 +Control113=IDC_STEPS,static,1342308352 [DLG:IDD_SRCEDIT (English (U.S.))] Type=1 @@ -10316,7 +10317,7 @@ BaseClass=CPropertyPage Filter=D VirtualFilter=idWC -LastObject=IDC_PROJPICKER +LastObject=CAreaProj [DLG:IDD_PROJGEMRB (English (U.S.))] Type=1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-09-13 19:33:32
|
Revision: 7139 http://gemrb.svn.sourceforge.net/gemrb/?rev=7139&view=rev Author: avenger_teambg Date: 2009-09-13 19:33:23 +0000 (Sun, 13 Sep 2009) Log Message: ----------- dltcep update Modified Paths: -------------- chitem/trunk/chitem.clw chitem/trunk/chitem.rc chitem/trunk/chitemDlg.cpp chitem/trunk/creature.cpp Modified: chitem/trunk/chitem.clw =================================================================== --- chitem/trunk/chitem.clw 2009-09-13 19:31:36 UTC (rev 7138) +++ chitem/trunk/chitem.clw 2009-09-13 19:33:23 UTC (rev 7139) @@ -232,142 +232,142 @@ Resource123=IDD_GAMEGENERAL Class98=IcewindCre Resource124=IDR_SHORTCUT -Resource125=IDD_SPELLEXTRA (English (U.S.)) -Resource126=IDR_IDS (English (U.S.)) -Resource127=IDD_DIALOGEDIT (English (U.S.)) -Resource128=IDD_ANIMDIALOG -Resource129=IDD_AREAMAP (English (U.S.)) -Resource130=IDD_STOREGENERAL (English (U.S.)) -Resource131=IDD_CREATUREGENERAL (English (U.S.)) -Resource132=IDD_MASSCLEAR (English (U.S.)) -Resource133=IDD_WEDEDIT (English (U.S.)) -Resource134=IDD_AREASONGS (English (U.S.)) -Resource135=IDD_KEYEDIT (English (U.S.)) -Resource136=IDD_ITEMEQUIP (English (U.S.)) -Resource137=IDD_CHITEM_DIALOG (English (U.S.)) -Resource138=IDD_CREATUREIWD2 (English (U.S.)) -Resource139=IDR_TILE (English (U.S.)) -Resource140=IDD_AREAEDIT (English (U.S.)) -Resource141=IDD_CREATURESKILLS (English (U.S.)) -Resource142=IDD_TISDIALOG (English (U.S.)) -Resource143=IDD_AREAPROJ (English (U.S.)) -Resource144=IDD_CREATUREEDIT (English (U.S.)) -Resource145=IDD_ITEMGENERAL (English (U.S.)) -Resource146=IDD_BAMEDIT (English (U.S.)) -Resource147=IDD_GAMESTATS (English (U.S.)) -Resource148=IDD_2DAEDIT (English (U.S.)) -Resource149=IDD_AREAANIM (English (U.S.)) -Resource150=IDR_WORLDMAP (English (U.S.)) -Resource151=IDD_ABOUTBOX (English (U.S.)) -Resource152=IDD_STRREFDLG (English (U.S.)) -Resource153=IDR_SCRIPT (English (U.S.)) -Resource154=IDD_SPELLGENERAL (English (U.S.)) -Resource155=IDD_ADDLINK (English (U.S.)) -Resource156=IDD_WEDPOLY (English (U.S.)) -Resource157=IDD_AREAACTOR (English (U.S.)) -Resource158=IDR_TLKMENU (English (U.S.)) -Resource159=IDR_SRC (English (U.S.)) -Resource160=IDD_ITEMUSE (English (U.S.)) -Resource161=IDD_AREATRIGGERSTRINGS (English (U.S.)) -Resource162=IDD_SHOWLOG (English (U.S.)) -Resource163=IDD_CHUIEDIT (English (U.S.)) -Resource164=IDD_PROGRESS (English (U.S.)) -Resource165=IDD_AREAENTRANCE (English (U.S.)) -Resource166=IDR_WEDMENU (English (U.S.)) -Resource167=IDR_STORE (English (U.S.)) -Resource168=IDD_PROJEXT (English (U.S.)) -Resource169=IDR_TREEMENU (English (U.S.)) -Resource170=IDD_STOREEDIT (English (U.S.)) -Resource171=IDD_AREASPAWN (English (U.S.)) -Resource172=IDD_EDIT (English (U.S.)) -Resource173=IDD_ITEMEFFECT (English (U.S.)) -Resource174=IDD_CREATUREICONS (English (U.S.)) -Resource175=IDD_SEARCHNODE (English (U.S.)) -Resource176=IDD_STOREDRINKS (English (U.S.)) -Resource177=IDR_AREA (English (U.S.)) -Resource178=IDD_PANICBUTTON (English (U.S.)) -Resource179=IDD_AREADOOR (English (U.S.)) -Resource180=IDD_EXTRACT2 (English (U.S.)) -Resource181=IDD_AREAAMBIENT (English (U.S.)) -Resource182=IDD_STOREEXTRA (English (U.S.)) -Resource183=IDD_CREATURERES (English (U.S.)) -Resource184=IDD_CREATUREPST (English (U.S.)) -Resource185=IDR_CREATURE (English (U.S.)) -Resource186=IDD_PROJEDIT (English (U.S.)) -Resource187=IDD_GAMEGENERAL (English (U.S.)) -Resource188=IDD_VARIABLES (English (U.S.)) -Resource189=IDD_ITEMEDIT (English (U.S.)) -Resource190=IDD_SCHEDULE (English (U.S.)) -Resource191=IDD_SPELLEQUIP (English (U.S.)) -Resource192=IDD_STOREITEMS (English (U.S.)) -Resource193=IDD_SRCEDIT (English (U.S.)) -Resource194=IDD_ITEMICONS (English (U.S.)) -Resource195=IDD_COMPAT (English (U.S.)) -Resource196=IDR_BAMMENU (English (U.S.)) -Resource197=IDD_FINDITEM (English (U.S.)) -Resource198=IDD_IMAGEVIEW (English (U.S.)) -Resource199=IDD_AREAINT (English (U.S.)) -Resource200=IDD_ITEMPICKER (English (U.S.)) -Resource201=IDR_GAME (English (U.S.)) -Resource202=IDR_PROJECT (English (U.S.)) -Resource203=IDR_MUSIC (English (U.S.)) -Resource204=IDD_EFFEDIT (English (U.S.)) -Resource205=IDD_CREATURELEVELS (English (U.S.)) -Resource206=IDD_MOSEDIT (English (U.S.)) -Resource207=IDD_CREATURESTRINGS (English (U.S.)) -Resource208=IDD_IAPDIALOG (English (U.S.)) -Resource209=IDR_SPELL (English (U.S.)) -Resource210=IDR_CHUI (English (U.S.)) -Resource211=IDD_AREACONTAINER (English (U.S.)) -Resource212=IDD_CREATUREEFF (English (U.S.)) -Resource213=IDR_VVC (English (U.S.)) -Resource214=IDD_CHECK (English (U.S.)) -Resource215=IDD_SAVHANDLE (English (U.S.)) -Resource216=IDD_SCRIPTEDIT (English (U.S.)) -Resource217=IDD_CFB (English (U.S.)) -Resource218=IDD_CREATUREUNKNOWN (English (U.S.)) -Resource219=IDD_PROJAREAGEMRB (English (U.S.)) -Resource220=IDR_EFFECT (English (U.S.)) -Resource221=IDD_GAMEPCINFO (English (U.S.)) -Resource222=IDD_IDSEDIT (English (U.S.)) -Resource223=IDD_ITEMDESC (English (U.S.)) -Resource224=IDD_SPELLEFFECT (English (U.S.)) -Resource225=IDD_CREATUREOVR (English (U.S.)) -Resource226=IDD_CREATUREITEMS (English (U.S.)) -Resource227=IDD_MAPLINK (English (U.S.)) -Resource228=IDD_SPELLDESC (English (U.S.)) -Resource229=IDR_CHITIN (English (U.S.)) -Resource230=IDD_AREAGENERAL (English (U.S.)) -Resource231=IDR_ITEM (English (U.S.)) -Resource232=IDD_WEIDU (English (U.S.)) -Resource233=IDD_CREATUREIWD (English (U.S.)) -Resource234=IDD_PALETTE (English (U.S.)) -Resource235=IDD_AREAVARIABLE (English (U.S.)) -Resource236=IDD_WEDTILE (English (U.S.)) -Resource237=IDD_ITEMEXTRA (English (U.S.)) -Resource238=IDR_MENUBAR (English (U.S.)) -Resource239=IDD_STORERENTAL (English (U.S.)) -Resource240=IDD_AREATRIGGER (English (U.S.)) -Resource241=IDD_VVCEDIT (English (U.S.)) -Resource242=IDD_GAMEEDIT (English (U.S.)) -Resource243=IDD_MUSEDIT (English (U.S.)) -Resource244=IDD_PROJGEMRB (English (U.S.)) -Resource245=IDD_SPELLTOOL (English (U.S.)) +Resource125=IDR_SPELL (English (U.S.)) +Resource126=IDD_IAPDIALOG (English (U.S.)) +Resource127=IDD_FINDITEM (English (U.S.)) +Resource128=IDD_PANICBUTTON (English (U.S.)) +Resource129=IDD_AREAEDIT (English (U.S.)) +Resource130=IDD_GAMEGENERAL (English (U.S.)) +Resource131=IDR_WORLDMAP (English (U.S.)) +Resource132=IDD_SPELLEQUIP (English (U.S.)) +Resource133=IDD_ITEMDESC (English (U.S.)) +Resource134=IDD_WEIDU (English (U.S.)) +Resource135=IDD_SPELLDESC (English (U.S.)) +Resource136=IDD_SRCEDIT (English (U.S.)) +Resource137=IDD_WEDPOLY (English (U.S.)) +Resource138=IDD_CREATURESKILLS (English (U.S.)) +Resource139=IDD_AREAANIM (English (U.S.)) +Resource140=IDR_GAME (English (U.S.)) +Resource141=IDR_SRC (English (U.S.)) +Resource142=IDD_SPELLEXTRA (English (U.S.)) +Resource143=IDD_CREATUREUNKNOWN (English (U.S.)) +Resource144=IDR_MUSIC (English (U.S.)) +Resource145=IDD_SPELLTOOL (English (U.S.)) +Resource146=IDD_PROJGEMRB (English (U.S.)) +Resource147=IDD_AREATRIGGER (English (U.S.)) +Resource148=IDD_CFB (English (U.S.)) +Resource149=IDD_VARIABLES (English (U.S.)) +Resource150=IDD_MAPEDIT (English (U.S.)) +Resource151=IDD_WEDEDIT (English (U.S.)) +Resource152=IDD_ITEMEXTRA (English (U.S.)) +Resource153=IDD_MOSEDIT (English (U.S.)) +Resource154=IDR_MENUBAR (English (U.S.)) +Resource155=IDD_ITEMGENERAL (English (U.S.)) +Resource156=IDD_ITEMUSE (English (U.S.)) +Resource157=IDR_TLKMENU (English (U.S.)) +Resource158=IDD_CREATUREITEMS (English (U.S.)) +Resource159=IDD_SHOWLOG (English (U.S.)) +Resource160=IDR_TREEMENU (English (U.S.)) +Resource161=IDD_CREATUREICONS (English (U.S.)) +Resource162=IDD_COMPAT (English (U.S.)) +Resource163=IDD_EXTRACT2 (English (U.S.)) +Resource164=IDD_TISDIALOG (English (U.S.)) +Resource165=IDR_PROJECT (English (U.S.)) +Resource166=IDD_STRREFDLG (English (U.S.)) +Resource167=IDD_SEARCHNODE (English (U.S.)) +Resource168=IDD_ITEMICONS (English (U.S.)) +Resource169=IDD_AREADOOR (English (U.S.)) +Resource170=IDD_GAMESTATS (English (U.S.)) +Resource171=IDR_IDS (English (U.S.)) +Resource172=IDD_STOREGENERAL (English (U.S.)) +Resource173=IDD_AREAMAP (English (U.S.)) +Resource174=IDR_CHUI (English (U.S.)) +Resource175=IDD_ITEMEDIT (English (U.S.)) +Resource176=IDD_AREAACTOR (English (U.S.)) +Resource177=IDD_PROJEXT (English (U.S.)) +Resource178=IDD_BAMEDIT (English (U.S.)) +Resource179=IDR_TILE (English (U.S.)) +Resource180=IDR_CREATURE (English (U.S.)) +Resource181=IDD_IMAGEVIEW (English (U.S.)) +Resource182=IDD_AREAPROJ (English (U.S.)) +Resource183=IDR_WEDMENU (English (U.S.)) +Resource184=IDD_AREAENTRANCE (English (U.S.)) +Resource185=IDD_GAMEEDIT (English (U.S.)) +Resource186=IDR_VVC (English (U.S.)) +Resource187=IDD_AREASPAWN (English (U.S.)) +Resource188=IDD_AREATRIGGERSTRINGS (English (U.S.)) +Resource189=IDD_WEDTILE (English (U.S.)) +Resource190=IDR_SCRIPT (English (U.S.)) +Resource191=IDR_ITEM (English (U.S.)) +Resource192=IDD_GAMEPCINFO (English (U.S.)) +Resource193=IDD_AREAGENERAL (English (U.S.)) +Resource194=IDD_CHUIEDIT (English (U.S.)) +Resource195=IDD_CREATUREOVR (English (U.S.)) +Resource196=IDD_AREACONTAINER (English (U.S.)) +Resource197=IDD_KEYEDIT (English (U.S.)) +Resource198=IDD_CREATUREEFF (English (U.S.)) +Resource199=IDD_ABOUTBOX (English (U.S.)) +Resource200=IDD_STOREDRINKS (English (U.S.)) +Resource201=IDD_MAPLINK (English (U.S.)) +Resource202=IDD_IDSEDIT (English (U.S.)) +Resource203=IDD_COLORPICKER (English (U.S.)) +Resource204=IDD_CREATUREIWD (English (U.S.)) +Resource205=IDD_CREATURESTRINGS (English (U.S.)) +Resource206=IDD_VVCEDIT (English (U.S.)) +Resource207=IDR_CHITIN (English (U.S.)) +Resource208=IDD_STOREITEMS (English (U.S.)) +Resource209=IDD_DIALOGEDIT (English (U.S.)) +Resource210=IDD_SCRIPTEDIT (English (U.S.)) +Resource211=IDD_CHITEM_DIALOG (English (U.S.)) +Resource212=IDD_SPELLGENERAL (English (U.S.)) +Resource213=IDD_2DAEDIT (English (U.S.)) +Resource214=IDD_MASSCLEAR (English (U.S.)) +Resource215=IDD_STOREEXTRA (English (U.S.)) +Resource216=IDD_STORERENTAL (English (U.S.)) +Resource217=IDD_CREATUREPST (English (U.S.)) +Resource218=IDD_ANIMDIALOG +Resource219=IDD_AREAAMBIENT (English (U.S.)) +Resource220=IDD_ADDLINK (English (U.S.)) +Resource221=IDD_CREATUREEDIT (English (U.S.)) +Resource222=IDD_STOREEDIT (English (U.S.)) +Resource223=IDR_BAMMENU (English (U.S.)) +Resource224=IDR_EFFECT (English (U.S.)) +Resource225=IDD_CREATURERES (English (U.S.)) +Resource226=IDD_EXTRACT (English (U.S.)) +Resource227=IDD_ITEMPICKER (English (U.S.)) +Resource228=IDR_STORE (English (U.S.)) +Resource229=IDD_SAVHANDLE (English (U.S.)) +Resource230=IDD_CHECK (English (U.S.)) +Resource231=IDD_AREAVARIABLE (English (U.S.)) +Resource232=IDD_MUSEDIT (English (U.S.)) +Resource233=IDD_CREATUREGENERAL (English (U.S.)) +Resource234=IDD_PROJAREAGEMRB (English (U.S.)) +Resource235=IDD_PROGRESS (English (U.S.)) +Resource236=IDD_SPELLEFFECT (English (U.S.)) +Resource237=IDD_CREATURELEVELS (English (U.S.)) +Resource238=IDD_AREAINT (English (U.S.)) +Resource239=IDD_CREATUREIWD2 (English (U.S.)) +Resource240=IDR_2DA (English (U.S.)) +Resource241=IDD_TEXTVIEW (English (U.S.)) +Resource242=IDD_ITEMEQUIP (English (U.S.)) +Resource243=IDD_PALETTE (English (U.S.)) +Resource244=IDD_AREASONGS (English (U.S.)) +Resource245=IDD_SPELLEDIT (English (U.S.)) Class99=CAreaTriggerString Class100=CPCInfo -Resource246=IDD_MAPEDIT (English (U.S.)) +Resource246=IDD_ITEMEFFECT (English (U.S.)) Class101=CCreatureOverlay -Resource247=IDD_EXTRACT (English (U.S.)) +Resource247=IDD_POLYGON (English (U.S.)) Class102=IWD2Creature -Resource248=IDD_SPELLEDIT (English (U.S.)) +Resource248=IDR_AREA (English (U.S.)) Class103=CAnimDialog -Resource249=IDD_POLYGON (English (U.S.)) +Resource249=IDD_SCHEDULE (English (U.S.)) Class104=CCreatureLevels -Resource250=IDR_2DA (English (U.S.)) +Resource250=IDD_EDIT (English (U.S.)) Class105=CAreaProj -Resource251=IDD_TEXTVIEW (English (U.S.)) +Resource251=IDD_PROJEDIT (English (U.S.)) Class106=CProjGemRB -Resource252=IDD_COLORPICKER (English (U.S.)) +Resource252=IDD_EFFEDIT (English (U.S.)) Class107=CProjAreaGemRB Resource253=IDR_SHORTCUT (English (U.S.)) Modified: chitem/trunk/chitem.rc =================================================================== --- chitem/trunk/chitem.rc 2009-09-13 19:31:36 UTC (rev 7138) +++ chitem/trunk/chitem.rc 2009-09-13 19:33:23 UTC (rev 7139) @@ -476,8 +476,8 @@ WS_TABSTOP,307,7,33,10 CONTROL "Cold Iron",IDC_COLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,307,22,44,10 - CONTROL "Unsellable (stolen item)",IDC_STOLEN,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,307,39,88,10 + CONTROL "Lefthanded (buggy)",IDC_STOLEN,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,307,39,77,10 CONTROL "Conversible",IDC_CONVERSIBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,307,54,53,10 CONTROL "Pulsating (PST)",IDC_FLAG1,"Button",BS_AUTOCHECKBOX | @@ -4736,11 +4736,11 @@ 328,178,33,10 CONTROL "Top",IDC_FLAG6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 296,192,29,10 - CONTROL "7",IDC_FLAG7,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,296,161,51,10 + CONTROL "7",IDC_FLAG7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,296, + 161,51,10 CONTROL "Bottom",IDC_FLAG8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 328,192,38,10 - CONTROL "Lowercase",IDC_FLAG9,"Button",BS_AUTOCHECKBOX | + CONTROL "Lowercase",IDC_FLAG9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,296,161,51,10 LTEXT "Text justification",IDC_BUTTONFLAG,240,122,52,8 LTEXT "Steps",IDC_STEPS,193,150,19,8 @@ -6385,8 +6385,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 7,1,0,7 - PRODUCTVERSION 7,1,0,7 + FILEVERSION 7,1,0,8 + PRODUCTVERSION 7,1,0,8 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -6404,14 +6404,14 @@ VALUE "Comments", "forums.gibberlings3.net\0" VALUE "CompanyName", "GemRB Project (gemrb.sourceforge.net)\0" VALUE "FileDescription", "DragonLance Total Conversion Editor Pro\0" - VALUE "FileVersion", "7, 1, 0, 7\0" + VALUE "FileVersion", "7, 1, 0, 8\0" VALUE "InternalName", "dltcep\0" VALUE "LegalCopyright", "Copyright (C) 2002-2009 Avenger\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "chitem.EXE\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "DLTC Editor Pro 7.1g\0" - VALUE "ProductVersion", "7, 1, 0, 7\0" + VALUE "ProductName", "DLTC Editor Pro 7.1h\0" + VALUE "ProductVersion", "7, 1, 0, 8\0" VALUE "SpecialBuild", "\0" END END Modified: chitem/trunk/chitemDlg.cpp =================================================================== --- chitem/trunk/chitemDlg.cpp 2009-09-13 19:31:36 UTC (rev 7138) +++ chitem/trunk/chitemDlg.cpp 2009-09-13 19:33:23 UTC (rev 7139) @@ -3,7 +3,7 @@ #include "stdafx.h" -#define PRG_VERSION "7.1g" +#define PRG_VERSION "7.1h" #include <fcntl.h> #include <direct.h> Modified: chitem/trunk/creature.cpp =================================================================== --- chitem/trunk/creature.cpp 2009-09-13 19:31:36 UTC (rev 7138) +++ chitem/trunk/creature.cpp 2009-09-13 19:33:23 UTC (rev 7139) @@ -453,6 +453,7 @@ } delete [] items; items=newitems; + header.itemcnt=itemcount; return ret; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |