[Gemrb-commits] Utilities/chitem Chitem.cpp, 1.20, 1.21 chitem.clw, 1.20, 1.21 chitem.rc, 1.21, 1.22 chitemDlg.cpp, 1.21, 1.22 options.cpp, 1.9, 1.10 options.h, 1.9, 1.10 resource.h, 1.20, 1.21 seekers.cpp, 1.15, 1.16 tbg.cpp, 1.8, 1.9

[Laszlo T. <ave...@us...>]

Update of /cvsroot/gemrb/Utilities/chitem
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14734

Modified Files:
	Chitem.cpp chitem.clw chitem.rc chitemDlg.cpp options.cpp 
	options.h resource.h seekers.cpp tbg.cpp 
Log Message:
dltcep updates to 7.0a


Index: options.h
===================================================================
RCS file: /cvsroot/gemrb/Utilities/chitem/options.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** options.h	15 Jul 2006 10:31:25 -0000	1.9
--- options.h	29 Aug 2006 21:26:58 -0000	1.10
***************
*** 76,81 ****
  #define CHECKSIZE        0x4000000//ignore filesizes
  #define IGNORECD         0x8000000//ignore cd locations in game cfg
! #define INTERNALDECOMP   0x10000000
! #define INTERNALCOMPILER 0x20000000
  
  /////////////////////////////////////////////////////////////////////////////
--- 76,82 ----
  #define CHECKSIZE        0x4000000//ignore filesizes
  #define IGNORECD         0x8000000//ignore cd locations in game cfg
! #define INTERNALDECOMP   0x10000000//use internal decompiler
! #define INTERNALCOMPILER 0x20000000//use internal compiler
! #define FORCENEW         0x40000000//force new strrefs
  
  /////////////////////////////////////////////////////////////////////////////
***************
*** 215,218 ****
--- 216,220 ----
  	afx_msg void OnIntdecomp();
  	afx_msg void OnIntcomp();
+ 	afx_msg void OnForcenew();
  	//}}AFX_MSG
  	DECLARE_MESSAGE_MAP()

Index: chitem.clw
===================================================================
RCS file: /cvsroot/gemrb/Utilities/chitem/chitem.clw,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** chitem.clw	27 Aug 2006 19:32:15 -0000	1.20
--- chitem.clw	29 Aug 2006 21:26:58 -0000	1.21
***************
*** 233,360 ****
  Class98=IcewindCre
  Resource124=IDR_SHORTCUT
! Resource125=IDD_STORERENTAL (English (U.S.))
! Resource126=IDD_ITEMEQUIP (English (U.S.))
! Resource127=IDR_TLKMENU (English (U.S.))
! Resource128=IDD_STOREGENERAL (English (U.S.))
! Resource129=IDD_CREATURESKILLS (English (U.S.))
! Resource130=IDD_CREATUREPST (English (U.S.))
! Resource131=IDD_PROJEDIT (English (U.S.))
! Resource132=IDD_ITEMDESC (English (U.S.))
! Resource133=IDR_2DA (English (U.S.))
! Resource134=IDD_WEDTILE (English (U.S.))
! Resource135=IDD_DIALOGEDIT (English (U.S.))
! Resource136=IDD_GAMESTATS (English (U.S.))
! Resource137=IDD_IDSEDIT (English (U.S.))
! Resource138=IDD_STOREITEMS (English (U.S.))
! Resource139=IDD_AREAGENERAL (English (U.S.))
! Resource140=IDD_FINDITEM (English (U.S.))
! Resource141=IDD_AREASPAWN (English (U.S.))
! Resource142=IDR_ITEM (English (U.S.))
! Resource143=IDR_SPELL (English (U.S.))
! Resource144=IDR_PROJECT (English (U.S.))
! Resource145=IDD_EXTRACT (English (U.S.))
! Resource146=IDD_PALETTE (English (U.S.))
! Resource147=IDD_AREAAMBIENT (English (U.S.))
! Resource148=IDD_SPELLEQUIP (English (U.S.))
! Resource149=IDD_WEDPOLY (English (U.S.))
! Resource150=IDD_SRCEDIT (English (U.S.))
! Resource151=IDR_WORLDMAP (English (U.S.))
! Resource152=IDD_2DAEDIT (English (U.S.))
! Resource153=IDD_MASSCLEAR (English (U.S.))
! Resource154=IDD_SPELLGENERAL (English (U.S.))
! Resource155=IDD_SPELLEFFECT (English (U.S.))
! Resource156=IDD_CREATUREGENERAL (English (U.S.))
! Resource157=IDD_ITEMEFFECT (English (U.S.))
! Resource158=IDD_CREATUREEFF (English (U.S.))
! Resource159=IDD_STRREFDLG (English (U.S.))
! Resource160=IDD_SCRIPTEDIT (English (U.S.))
! Resource161=IDD_CFB (English (U.S.))
! Resource162=IDD_SEARCHNODE (English (U.S.))
! Resource163=IDD_WEIDU (English (U.S.))
! Resource164=IDD_AREASONGS (English (U.S.))
! Resource165=IDR_SRC (English (U.S.))
! Resource166=IDD_GAMEEDIT (English (U.S.))
! Resource167=IDD_GAMEPCINFO (English (U.S.))
! Resource168=IDD_SPELLEXTRA (English (U.S.))
! Resource169=IDR_WEDMENU (English (U.S.))
! Resource170=IDD_SCHEDULE (English (U.S.))
! Resource171=IDD_SHOWLOG (English (U.S.))
! Resource172=IDD_CHECK (English (U.S.))
! Resource173=IDD_PANICBUTTON (English (U.S.))
! Resource174=IDD_ITEMGENERAL (English (U.S.))
! Resource175=IDD_MUSEDIT (English (U.S.))
! Resource176=IDD_IAPDIALOG (English (U.S.))
! Resource177=IDD_CREATURERES (English (U.S.))
! Resource178=IDR_EFFECT (English (U.S.))
! Resource179=IDD_ITEMEDIT (English (U.S.))
! Resource180=IDD_AREAENTRANCE (English (U.S.))
! Resource181=IDD_ADDLINK (English (U.S.))
! Resource182=IDD_TISDIALOG (English (U.S.))
! Resource183=IDR_CHUI (English (U.S.))
! Resource184=IDD_BAMEDIT (English (U.S.))
! Resource185=IDR_MUSIC (English (U.S.))
! Resource186=IDD_CREATUREITEMS (English (U.S.))
! Resource187=IDD_CREATUREIWD (English (U.S.))
! Resource188=IDD_CHITEM_DIALOG (English (U.S.))
! Resource189=IDD_AREAEDIT (English (U.S.))
! Resource190=IDD_ITEMICONS (English (U.S.))
! Resource191=IDD_TEXTVIEW (English (U.S.))
! Resource192=IDR_GAME (English (U.S.))
! Resource193=IDR_CHITIN (English (U.S.))
! Resource194=IDD_SPELLDESC (English (U.S.))
! Resource195=IDR_STORE (English (U.S.))
! Resource196=IDR_TILE (English (U.S.))
! Resource197=IDD_AREAACTOR (English (U.S.))
! Resource198=IDD_VARIABLES (English (U.S.))
! Resource199=IDD_AREAANIM (English (U.S.))
  Resource200=IDD_CREATUREOVR (English (U.S.))
! Resource201=IDD_SPELLTOOL (English (U.S.))
! Resource202=IDD_VVCEDIT (English (U.S.))
! Resource203=IDD_SAVHANDLE (English (U.S.))
! Resource204=IDD_AREACONTAINER (English (U.S.))
! Resource205=IDD_AREATRIGGERSTRINGS (English (U.S.))
! Resource206=IDD_ITEMPICKER (English (U.S.))
! Resource207=IDD_AREAINT (English (U.S.))
! Resource208=IDD_WEDEDIT (English (U.S.))
! Resource209=IDD_GAMEGENERAL (English (U.S.))
! Resource210=IDD_STOREDRINKS (English (U.S.))
! Resource211=IDD_CHUIEDIT (English (U.S.))
! Resource212=IDD_AREATRIGGER (English (U.S.))
! Resource213=IDR_MENUBAR (English (U.S.))
! Resource214=IDR_SCRIPT (English (U.S.))
! Resource215=IDD_COLORPICKER (English (U.S.))
! Resource216=IDD_MAPEDIT (English (U.S.))
! Resource217=IDD_ITEMEXTRA (English (U.S.))
! Resource218=IDD_CREATUREUNKNOWN (English (U.S.))
! Resource219=IDD_MOSEDIT (English (U.S.))
! Resource220=IDD_EDIT (English (U.S.))
! Resource221=IDR_BAMMENU (English (U.S.))
! Resource222=IDD_PROJEXT (English (U.S.))
! Resource223=IDD_CREATUREEDIT (English (U.S.))
! Resource224=IDD_SPELLEDIT (English (U.S.))
! Resource225=IDD_ITEMUSE (English (U.S.))
! Resource226=IDR_IDS (English (U.S.))
! Resource227=IDD_PROGRESS (English (U.S.))
! Resource228=IDD_CREATURESTRINGS (English (U.S.))
! Resource229=IDR_AREA (English (U.S.))
! Resource230=IDD_KEYEDIT (English (U.S.))
! Resource231=IDR_VVC (English (U.S.))
! Resource232=IDD_EFFEDIT (English (U.S.))
! Resource233=IDD_AREADOOR (English (U.S.))
! Resource234=IDD_CREATUREICONS (English (U.S.))
! Resource235=IDD_ABOUTBOX (English (U.S.))
! Resource236=IDD_POLYGON (English (U.S.))
! Resource237=IDD_EXTRACT2 (English (U.S.))
! Resource238=IDD_COMPAT (English (U.S.))
! Resource239=IDD_STOREEXTRA (English (U.S.))
! Resource240=IDD_STOREEDIT (English (U.S.))
! Resource241=IDD_MAPLINK (English (U.S.))
! Resource242=IDD_AREAMAP (English (U.S.))
! Resource243=IDD_AREAVARIABLE (English (U.S.))
! Resource244=IDD_IMAGEVIEW (English (U.S.))
! Resource245=IDR_TREEMENU (English (U.S.))
  Class99=CAreaTriggerString
  Class100=CPCInfo
! Resource246=IDR_CREATURE (English (U.S.))
  Class101=CCreatureOverlay
  Resource247=IDR_SHORTCUT (English (U.S.))
--- 233,360 ----
  Class98=IcewindCre
  Resource124=IDR_SHORTCUT
! Resource125=IDD_ABOUTBOX (English (U.S.))
! Resource126=IDR_PROJECT (English (U.S.))
! Resource127=IDD_POLYGON (English (U.S.))
! Resource128=IDD_2DAEDIT (English (U.S.))
! Resource129=IDD_ITEMDESC (English (U.S.))
! Resource130=IDD_PROGRESS (English (U.S.))
! Resource131=IDD_STORERENTAL (English (U.S.))
! Resource132=IDD_ITEMICONS (English (U.S.))
! Resource133=IDD_GAMEGENERAL (English (U.S.))
! Resource134=IDD_MOSEDIT (English (U.S.))
! Resource135=IDD_AREAACTOR (English (U.S.))
! Resource136=IDD_STRREFDLG (English (U.S.))
! Resource137=IDD_CREATURERES (English (U.S.))
! Resource138=IDR_CHITIN (English (U.S.))
! Resource139=IDD_STOREGENERAL (English (U.S.))
! Resource140=IDR_GAME (English (U.S.))
! Resource141=IDD_STOREEXTRA (English (U.S.))
! Resource142=IDD_TISDIALOG (English (U.S.))
! Resource143=IDD_KEYEDIT (English (U.S.))
! Resource144=IDD_GAMESTATS (English (U.S.))
! Resource145=IDR_MUSIC (English (U.S.))
! Resource146=IDD_ITEMEDIT (English (U.S.))
! Resource147=IDD_SPELLEFFECT (English (U.S.))
! Resource148=IDD_ITEMEFFECT (English (U.S.))
! Resource149=IDD_GAMEEDIT (English (U.S.))
! Resource150=IDD_EDIT (English (U.S.))
! Resource151=IDD_AREAMAP (English (U.S.))
! Resource152=IDD_CREATURESKILLS (English (U.S.))
! Resource153=IDD_MAPEDIT (English (U.S.))
! Resource154=IDD_ITEMGENERAL (English (U.S.))
! Resource155=IDD_VVCEDIT (English (U.S.))
! Resource156=IDD_PALETTE (English (U.S.))
! Resource157=IDD_PROJEXT (English (U.S.))
! Resource158=IDD_ADDLINK (English (U.S.))
! Resource159=IDD_AREADOOR (English (U.S.))
! Resource160=IDD_AREAINT (English (U.S.))
! Resource161=IDR_CHUI (English (U.S.))
! Resource162=IDD_SCHEDULE (English (U.S.))
! Resource163=IDD_CREATURESTRINGS (English (U.S.))
! Resource164=IDD_SPELLDESC (English (U.S.))
! Resource165=IDR_BAMMENU (English (U.S.))
! Resource166=IDD_AREATRIGGER (English (U.S.))
! Resource167=IDD_PANICBUTTON (English (U.S.))
! Resource168=IDD_ITEMPICKER (English (U.S.))
! Resource169=IDR_TREEMENU (English (U.S.))
! Resource170=IDD_VARIABLES (English (U.S.))
! Resource171=IDD_AREACONTAINER (English (U.S.))
! Resource172=IDR_SPELL (English (U.S.))
! Resource173=IDD_DIALOGEDIT (English (U.S.))
! Resource174=IDR_SCRIPT (English (U.S.))
! Resource175=IDD_SEARCHNODE (English (U.S.))
! Resource176=IDD_CREATUREUNKNOWN (English (U.S.))
! Resource177=IDD_ITEMUSE (English (U.S.))
! Resource178=IDD_SPELLTOOL (English (U.S.))
! Resource179=IDR_TLKMENU (English (U.S.))
! Resource180=IDD_COMPAT (English (U.S.))
! Resource181=IDD_PROJEDIT (English (U.S.))
! Resource182=IDD_MAPLINK (English (U.S.))
! Resource183=IDR_MENUBAR (English (U.S.))
! Resource184=IDD_FINDITEM (English (U.S.))
! Resource185=IDD_CREATUREIWD (English (U.S.))
! Resource186=IDD_CREATUREGENERAL (English (U.S.))
! Resource187=IDD_MUSEDIT (English (U.S.))
! Resource188=IDR_AREA (English (U.S.))
! Resource189=IDD_STOREITEMS (English (U.S.))
! Resource190=IDR_VVC (English (U.S.))
! Resource191=IDD_SCRIPTEDIT (English (U.S.))
! Resource192=IDD_STOREDRINKS (English (U.S.))
! Resource193=IDR_ITEM (English (U.S.))
! Resource194=IDD_EXTRACT (English (U.S.))
! Resource195=IDD_WEDTILE (English (U.S.))
! Resource196=IDD_AREATRIGGERSTRINGS (English (U.S.))
! Resource197=IDD_EFFEDIT (English (U.S.))
! Resource198=IDD_IMAGEVIEW (English (U.S.))
! Resource199=IDD_AREAAMBIENT (English (U.S.))
  Resource200=IDD_CREATUREOVR (English (U.S.))
! Resource201=IDR_WEDMENU (English (U.S.))
! Resource202=IDR_TILE (English (U.S.))
! Resource203=IDD_AREAVARIABLE (English (U.S.))
! Resource204=IDD_EXTRACT2 (English (U.S.))
! Resource205=IDD_CREATUREEFF (English (U.S.))
! Resource206=IDR_IDS (English (U.S.))
! Resource207=IDD_SPELLEDIT (English (U.S.))
! Resource208=IDR_2DA (English (U.S.))
! Resource209=IDD_SAVHANDLE (English (U.S.))
! Resource210=IDD_COLORPICKER (English (U.S.))
! Resource211=IDD_IDSEDIT (English (U.S.))
! Resource212=IDD_ITEMEXTRA (English (U.S.))
! Resource213=IDD_WEDEDIT (English (U.S.))
! Resource214=IDD_TEXTVIEW (English (U.S.))
! Resource215=IDR_EFFECT (English (U.S.))
! Resource216=IDD_AREASPAWN (English (U.S.))
! Resource217=IDD_CHECK (English (U.S.))
! Resource218=IDD_SPELLEXTRA (English (U.S.))
! Resource219=IDD_CREATUREICONS (English (U.S.))
! Resource220=IDR_CREATURE (English (U.S.))
! Resource221=IDD_WEDPOLY (English (U.S.))
! Resource222=IDD_AREAENTRANCE (English (U.S.))
! Resource223=IDD_BAMEDIT (English (U.S.))
! Resource224=IDD_CFB (English (U.S.))
! Resource225=IDD_ITEMEQUIP (English (U.S.))
! Resource226=IDD_GAMEPCINFO (English (U.S.))
! Resource227=IDR_WORLDMAP (English (U.S.))
! Resource228=IDD_SPELLEQUIP (English (U.S.))
! Resource229=IDD_CHUIEDIT (English (U.S.))
! Resource230=IDD_CREATUREITEMS (English (U.S.))
! Resource231=IDD_CREATUREPST (English (U.S.))
! Resource232=IDD_WEIDU (English (U.S.))
! Resource233=IDD_AREAGENERAL (English (U.S.))
! Resource234=IDD_SPELLGENERAL (English (U.S.))
! Resource235=IDD_AREASONGS (English (U.S.))
! Resource236=IDD_AREAANIM (English (U.S.))
! Resource237=IDD_STOREEDIT (English (U.S.))
! Resource238=IDD_CHITEM_DIALOG (English (U.S.))
! Resource239=IDD_SHOWLOG (English (U.S.))
! Resource240=IDR_SRC (English (U.S.))
! Resource241=IDD_CREATUREEDIT (English (U.S.))
! Resource242=IDD_IAPDIALOG (English (U.S.))
! Resource243=IDD_AREAEDIT (English (U.S.))
! Resource244=IDR_STORE (English (U.S.))
! Resource245=IDD_MASSCLEAR (English (U.S.))
  Class99=CAreaTriggerString
  Class100=CPCInfo
! Resource246=IDD_SRCEDIT (English (U.S.))
  Class101=CCreatureOverlay
  Resource247=IDR_SHORTCUT (English (U.S.))
***************
*** 8575,8579 ****
  Type=1
  Class=CEditOpt
! ControlCount=34
  Control1=IDC_TLKCHANGE,button,1342242819
  Control2=IDC_RESOLVE,button,1342242819
--- 8575,8579 ----
  Type=1
  Class=CEditOpt
! ControlCount=35
  Control1=IDC_TLKCHANGE,button,1342242819
  Control2=IDC_RESOLVE,button,1342242819
***************
*** 8610,8613 ****
--- 8610,8614 ----
  Control33=IDC_INTDECOMP,button,1342242819
  Control34=IDC_INTCOMP,button,1342242819
+ Control35=IDC_FORCENEW,button,1342242819
  
  [DLG:IDD_IAPDIALOG (English (U.S.))]

Index: seekers.cpp
===================================================================
RCS file: /cvsroot/gemrb/Utilities/chitem/seekers.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** seekers.cpp	27 Aug 2006 19:32:16 -0000	1.15
--- seekers.cpp	29 Aug 2006 21:26:59 -0000	1.16
***************
*** 1437,1444 ****
    POSITION pos;
    
! #if 1
    for(int i=0;i<the_item.extheadcount;i++)
    {
!     if (the_item.extheaders[i].damtype>4)
      {
        log("Unusual damage type: %d",the_item.extheaders[i].damtype); 
--- 1437,1444 ----
    POSITION pos;
    
! #if 0
    for(int i=0;i<the_item.extheadcount;i++)
    {
!     if (the_item.extheaders[i].damtype>9)
      {
        log("Unusual damage type: %d",the_item.extheaders[i].damtype); 

Index: tbg.cpp
===================================================================
RCS file: /cvsroot/gemrb/Utilities/chitem/tbg.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tbg.cpp	27 Aug 2006 19:32:16 -0000	1.8
--- tbg.cpp	29 Aug 2006 21:26:59 -0000	1.9
***************
*** 1342,1347 ****
      }
      if(tmptext!=text || tmpsound!=sound)
!     {        
!       reference=store_tlk_data(-1, text, sound, 0);
        if (optflg&BOTHDIALOG)
        {
--- 1342,1351 ----
      }
      if(tmptext!=text || tmpsound!=sound)
!     {
!       if (!(editflg&FORCENEW))
!       {
!         reference=-1;
!       }
!       reference=store_tlk_data(reference, text, sound, 0);
        if (optflg&BOTHDIALOG)
        {

Index: options.cpp
===================================================================
RCS file: /cvsroot/gemrb/Utilities/chitem/options.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** options.cpp	15 Jul 2006 10:31:24 -0000	1.9
--- options.cpp	29 Aug 2006 21:26:58 -0000	1.10
***************
*** 32,36 ****
    IDC_WEIDUSTR, IDC_IDUSTR, IDC_PREVIEW, IDC_OCTREE, IDC_DITHER, //32768-0x80000
    IDC_W98,IDC_WEIDU, IDC_ZIP, IDC_WINDOWPICKER, IDC_CENTER, IDC_OVERRIDE,//0x100000-0x2000000
!   IDC_SIZECHECK, IDC_CD,IDC_INTDECOMP,IDC_INTCOMP,                  //0x4000000-0x20000000
  0};
  
--- 32,36 ----
    IDC_WEIDUSTR, IDC_IDUSTR, IDC_PREVIEW, IDC_OCTREE, IDC_DITHER, //32768-0x80000
    IDC_W98,IDC_WEIDU, IDC_ZIP, IDC_WINDOWPICKER, IDC_CENTER, IDC_OVERRIDE,//0x100000-0x2000000
!   IDC_SIZECHECK, IDC_CD,IDC_INTDECOMP,IDC_INTCOMP, IDC_FORCENEW,      //0x4000000-0x40000000
  0};
  
***************
*** 381,384 ****
--- 381,385 ----
  	ON_BN_CLICKED(IDC_INTDECOMP, OnIntdecomp)
  	ON_BN_CLICKED(IDC_INTCOMP, OnIntcomp)
+ 	ON_BN_CLICKED(IDC_FORCENEW, OnForcenew)
  	//}}AFX_MSG_MAP
  END_MESSAGE_MAP()
***************
*** 549,552 ****
--- 550,558 ----
  }
  
+ void CEditOpt::OnForcenew() 
+ {
+   editflg^=FORCENEW;
+ }
+ 
  BOOL CEditOpt::PreTranslateMessage(MSG* pMsg) 
  {

Index: chitemDlg.cpp
===================================================================
RCS file: /cvsroot/gemrb/Utilities/chitem/chitemDlg.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** chitemDlg.cpp	15 Jul 2006 10:31:24 -0000	1.21
--- chitemDlg.cpp	29 Aug 2006 21:26:58 -0000	1.22
***************
*** 4,8 ****
  #include "stdafx.h"
  
! #define PRG_VERSION "7.0"
  
  #include <fcntl.h>
--- 4,8 ----
  #include "stdafx.h"
  
! #define PRG_VERSION "7.0a"
  
  #include <fcntl.h>

Index: resource.h
===================================================================
RCS file: /cvsroot/gemrb/Utilities/chitem/resource.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** resource.h	27 Aug 2006 19:32:16 -0000	1.20
--- resource.h	29 Aug 2006 21:26:58 -0000	1.21
***************
*** 1,4 ****
  //{{NO_DEPENDENCIES}}
! // Microsoft Visual C++ generated include file.
  // Used by chitem.rc
  //
--- 1,4 ----
  //{{NO_DEPENDENCIES}}
! // Microsoft Developer Studio generated include file.
  // Used by chitem.rc
  //
***************
*** 1602,1605 ****
--- 1602,1606 ----
  #define IDC_CD                          2298
  #define IDC_UNKNOWN56                   2299
+ #define IDC_FORCENEW                    2302
  #define ID_RESCAN                       32771
  #define ID_RESCAN2                      32772
***************
*** 1822,1826 ****
  #define _APS_NEXT_RESOURCE_VALUE        217
  #define _APS_NEXT_COMMAND_VALUE         33044
! #define _APS_NEXT_CONTROL_VALUE         2302
  #define _APS_NEXT_SYMED_VALUE           120
  #endif
--- 1823,1827 ----
  #define _APS_NEXT_RESOURCE_VALUE        217
  #define _APS_NEXT_COMMAND_VALUE         33044
! #define _APS_NEXT_CONTROL_VALUE         2303
  #define _APS_NEXT_SYMED_VALUE           120
  #endif

Index: chitem.rc
===================================================================
RCS file: /cvsroot/gemrb/Utilities/chitem/chitem.rc,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** chitem.rc	27 Aug 2006 19:32:16 -0000	1.21
--- chitem.rc	29 Aug 2006 21:26:58 -0000	1.22
***************
*** 3835,3839 ****
  END
  
! IDD_EDIT DIALOG DISCARDABLE  0, 0, 288, 270
  STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Editor options"
--- 3835,3839 ----
  END
  
! IDD_EDIT DIALOG DISCARDABLE  0, 0, 288, 289
  STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Editor options"
***************
*** 3855,3859 ****
                      BS_AUTOCHECKBOX | WS_TABSTOP,7,103,69,10
      CONTROL         "Ignore spaces in dialog code",IDC_EATSPACE,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,7,119,107,10
      CONTROL         "Allow IDU strings in script source",IDC_IDUSTR,"Button",
                      BS_AUTOCHECKBOX | WS_TABSTOP,7,135,119,10
--- 3855,3859 ----
                      BS_AUTOCHECKBOX | WS_TABSTOP,7,103,69,10
      CONTROL         "Ignore spaces in dialog code",IDC_EATSPACE,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,7,247,107,10
      CONTROL         "Allow IDU strings in script source",IDC_IDUSTR,"Button",
                      BS_AUTOCHECKBOX | WS_TABSTOP,7,135,119,10
***************
*** 3876,3883 ****
      CONTROL         "Allow WeiDU strings in script source",IDC_WEIDUSTR,
                      "Button",BS_AUTOCHECKBOX | WS_TABSTOP,138,135,129,10
!     DEFPUSHBUTTON   "Back",IDOK,7,249,50,14
!     PUSHBUTTON      "Select All",IDC_ALLSET,81,249,50,14
!     PUSHBUTTON      "Deselect All",IDC_ALLUNSET,155,249,50,14
!     PUSHBUTTON      "Cancel",IDCANCEL,229,249,50,14
      CONTROL         "Use  Octree reduction (vs. DL1)",IDC_OCTREE,"Button",
                      BS_AUTOCHECKBOX | WS_TABSTOP,7,151,116,10
--- 3876,3883 ----
      CONTROL         "Allow WeiDU strings in script source",IDC_WEIDUSTR,
                      "Button",BS_AUTOCHECKBOX | WS_TABSTOP,138,135,129,10
!     DEFPUSHBUTTON   "Back",IDOK,7,268,50,14
!     PUSHBUTTON      "Select All",IDC_ALLSET,81,268,50,14
!     PUSHBUTTON      "Deselect All",IDC_ALLUNSET,155,268,50,14
!     PUSHBUTTON      "Cancel",IDCANCEL,229,268,50,14
      CONTROL         "Use  Octree reduction (vs. DL1)",IDC_OCTREE,"Button",
                      BS_AUTOCHECKBOX | WS_TABSTOP,7,151,116,10
***************
*** 3904,3907 ****
--- 3904,3909 ----
      CONTROL         "Use internal compiler",IDC_INTCOMP,"Button",
                      BS_AUTOCHECKBOX | WS_TABSTOP,138,231,81,10
+     CONTROL         "Force new strref",IDC_FORCENEW,"Button",BS_AUTOCHECKBOX | 
+                     WS_TABSTOP,7,119,67,10
  END
  
***************
*** 5633,5637 ****
          RIGHTMARGIN, 281
          TOPMARGIN, 7
!         BOTTOMMARGIN, 263
      END
  
--- 5635,5639 ----
          RIGHTMARGIN, 281
          TOPMARGIN, 7
!         BOTTOMMARGIN, 282
      END
  

Index: Chitem.cpp
===================================================================
RCS file: /cvsroot/gemrb/Utilities/chitem/Chitem.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Chitem.cpp	27 Aug 2006 19:32:14 -0000	1.20
--- Chitem.cpp	29 Aug 2006 21:26:58 -0000	1.21
***************
*** 2054,2064 ****
  "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",
! "0x29-Buckler/Teeth","0x2A-Candle","0x2B-Unknown","0x2C-Club","0x2D-Unknown",
! "0x2E-Unknown","0x2F-Large shield","0x30-Unknown","0x31-Medium shield",
! "0x32-Notes","0x33-Unknown","0x34-Unknown","0x35-Small shield",
! "0x36-Unknown","0x37-Telescope","0x38-Drink","0x39-Great sword",
  "0x3a-Container (IWD)","0x3b-Fur/pelt","0x3c-Leather armor","0x3d-Studded leather",
  "0x3e-Chain mail","0x3f-Splint mail","0x40-Half plate","0x41-Full plate",
! "0x42-Hide armor","0x43-Robe","0x44-Unknown","0x45-Bastard sword",
  "0x46-Scarf","0x47-Food (IWD2)","0x48-Hat","0x49-Gauntlet",
  "\?\?-Unknown"};
--- 2054,2064 ----
  "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",
! "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",
! "0x36-Spider body","0x37-Telescope","0x38-Drink","0x39-Great sword",
  "0x3a-Container (IWD)","0x3b-Fur/pelt","0x3c-Leather armor","0x3d-Studded leather",
  "0x3e-Chain mail","0x3f-Splint mail","0x40-Half plate","0x41-Full plate",
! "0x42-Hide armor","0x43-Robe","0x44-Scale mail","0x45-Bastard sword",
  "0x46-Scarf","0x47-Food (IWD2)","0x48-Hat","0x49-Gauntlet",
  "\?\?-Unknown"};