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. |