Diff of /chitem.clw [8f212d] .. [f76c33] Maximize Restore

  Switch to side-by-side view

--- a/chitem.clw
+++ b/chitem.clw
@@ -2,7 +2,7 @@
 
 [General Info]
 Version=1
-LastClass=CGameGeneral
+LastClass=CAreaActor
 LastTemplate=CDialog
 NewFileInclude1=#include "stdafx.h"
 NewFileInclude2=#include "chitem.h"
@@ -12,23 +12,23 @@
 Class2=CChitemDlg
 Class3=CAboutDlg
 
-ResourceCount=122
-Resource1=IDD_AREAVARIABLE
+ResourceCount=123
+Resource1=IDD_STOREEXTRA
 Resource2=IDR_MAINFRAME
-Resource3=IDD_STOREEDIT
+Resource3=IDR_MENUBAR
 Class4=Coptions
-Resource4=IDR_MENUBAR
-Resource5=IDR_STORE
+Resource4=IDR_PROJECT
+Resource5=IDD_PROGRESS
 Class5=progressbar
-Resource6=IDD_VVCEDIT
+Resource6=IDD_AREAEDIT
 Class6=CFindItem
-Resource7=IDR_SCRIPT
+Resource7=IDD_ITEMPICKER
 Class7=CItemEdit
-Resource8=IDD_ITEMEXTRA
-Resource9=IDR_CREATURE
-Resource10=IDD_STRREFDLG
-Resource11=IDD_AREATRIGGER
-Resource12=IDD_PALETTE
+Resource8=IDD_CREATUREICONS
+Resource9=IDD_ITEMGENERAL
+Resource10=IDD_CREATUREUNKNOWN
+Resource11=IDD_MOSEDIT
+Resource12=IDD_CREATURESTRINGS
 Resource13=IDR_TREEMENU1
 Class8=CItemPropertySheet
 Class9=CItemPicker
@@ -38,64 +38,64 @@
 Class13=CItemGeneral
 Class14=CItemIcons
 Class15=CItemUsability
-Resource14=IDD_CREATURERES
-Resource15=IDD_MAPEDIT
+Resource14=IDD_AREAANIM
+Resource15=IDD_SPELLTOOL
 Class16=CFileExtract
-Resource16=IDR_PROJECT
+Resource16=IDD_CREATUREGENERAL
 Class17=CVVCEdit
-Resource17=IDD_PROGRESS
+Resource17=IDD_ITEMDESC
 Class18=CCFBDialog
-Resource18=IDD_BAMEDIT
+Resource18=IDD_CREATURERES
 Class19=CStoreEdit
-Resource19=IDD_SPELLEXTRA
+Resource19=IDD_AREACONTAINER
 Resource20=IDD_WEIDU (Hungarian)
-Resource21=IDD_CREATUREPST
+Resource21=IDR_SRC
 Class20=CEffEdit
-Resource22=IDD_SPELLEQUIP
+Resource22=IDD_AREAINT
 Class21=Cvariable
-Resource23=IDD_TISDIALOG
+Resource23=IDD_AREAENTRANCE
 Class22=CStoreGeneral
 Class23=CStoreItems
 Class24=CStoreRental
-Resource24=IDD_CREATUREICONS
+Resource24=IDD_IDSEDIT
 Class25=Ccompat
-Resource25=IDD_IMAGEVIEW
+Resource25=IDD_WEDEDIT
 Class26=CItemExtra
-Resource26=IDR_2DA
+Resource26=IDD_CFB
 Class27=CStoreExtra
-Resource27=IDD_AREAAMBIENT
+Resource27=IDD_SAVHANDLE
 Class28=CBamEdit
-Resource28=IDD_IDSEDIT
-Resource29=IDD_MASSCLEAR
+Resource28=IDD_POLYGON
+Resource29=IDR_CREATURE
 Class29=CPaletteEdit
-Resource30=IDD_GAMEGENERAL
-Resource31=IDD_AREASPAWN
+Resource30=IDR_CHITIN
+Resource31=IDD_2DAEDIT
 Class30=CSpellGeneral
-Resource32=IDD_STOREGENERAL
-Resource33=IDR_SRC
-Resource34=IDD_ITEMICONS
-Resource35=IDD_STOREEXTRA
-Resource36=IDD_POLYGON
+Resource32=IDD_PROJEDIT
+Resource33=IDD_COLORPICKER
+Resource34=IDD_SPELLDESC
+Resource35=IDD_ABOUTBOX
+Resource36=IDR_BAMMENU
 Class31=CSpellEdit
 Class32=CFileExtract2
 Class33=CSpellExtra
-Resource37=IDD_SPELLTOOL
-Resource38=IDD_EXTRACT2
-Resource39=IDD_COMPAT
-Resource40=IDR_CHITIN
-Resource41=IDD_IAPDIALOG
-Resource42=IDD_2DAEDIT
-Resource43=IDR_MUSIC
-Resource44=IDD_ITEMEDIT
-Resource45=IDD_ITEMDESC
-Resource46=IDD_PANICBUTTON
-Resource47=IDD_PROJEDIT
-Resource48=IDD_ITEMPICKER
-Resource49=IDD_EDIT
-Resource50=IDR_ITEM
-Resource51=IDD_STORERENTAL
-Resource52=IDR_WEDMENU
-Resource53=IDD_MUSEDIT
+Resource37=IDD_VVCEDIT
+Resource38=IDD_SEARCHNODE
+Resource39=IDR_VVC
+Resource40=IDD_MUSEDIT
+Resource41=IDD_CREATUREPST
+Resource42=IDD_STOREDRINKS
+Resource43=IDR_IDS
+Resource44=IDD_SPELLEQUIP
+Resource45=IDD_AREASONGS
+Resource46=IDR_ITEM
+Resource47=IDD_MAPLINK
+Resource48=IDD_EXTRACT2
+Resource49=IDD_TEXTVIEW
+Resource50=IDD_CHITEM_DIALOG
+Resource51=IDD_CREATUREEDIT
+Resource52=IDD_GAMESTATS
+Resource53=IDD_AREAGENERAL
 Class34=CSpellExtended
 Class35=CSpellDescription
 Class36=CSpellEquip
@@ -116,52 +116,52 @@
 Class51=CCreatureUnknown
 Class52=CAreaSong
 Class53=CAreaAmbient
-Resource54=IDD_VARIABLES
+Resource54=IDR_TREEMENU
 Class54=CAreaInt
-Resource55=IDD_AREAANIM
+Resource55=IDD_GAMEGENERAL
 Class55=CAreaContainer
-Resource56=IDD_SCHEDULE
-Resource57=IDD_EFFEDIT
-Resource58=IDD_CHECK
-Resource59=IDD_SAVHANDLE
-Resource60=IDD_COLORPICKER
-Resource61=IDR_TILE
-Resource62=IDD_DIALOGEDIT
-Resource63=IDD_WEDTILE
-Resource64=IDD_STOREDRINKS
-Resource65=IDD_ITEMEQUIP
-Resource66=IDD_SPELLDESC
-Resource67=IDR_WORLDMAP
-Resource68=IDD_MAPLINK
-Resource69=IDR_TREEMENU
-Resource70=IDD_AREASONGS
-Resource71=IDR_CHUI
-Resource72=IDD_AREAACTOR
-Resource73=IDD_ITEMUSE
-Resource74=IDD_WEIDU
-Resource75=IDR_AREA
-Resource76=IDD_MOSEDIT
-Resource77=IDD_CHUIEDIT
-Resource78=IDD_AREAENTRANCE
-Resource79=IDR_IDS
-Resource80=IDD_ABOUTBOX
-Resource81=IDD_SHOWLOG
-Resource82=IDD_ITEMGENERAL
-Resource83=IDD_KEYEDIT
-Resource84=IDR_TLKMENU
-Resource85=IDR_BAMMENU
-Resource86=IDD_AREADOOR
-Resource87=IDD_GAMEEDIT
-Resource88=IDD_TEXTVIEW
-Resource89=IDD_CREATURESKILLS
-Resource90=IDD_AREAMAP
-Resource91=IDD_SPELLEFFECT
-Resource92=IDD_AREAEDIT
-Resource93=IDD_AREAGENERAL
-Resource94=IDD_WEDEDIT
-Resource95=IDD_CREATUREITEMS
-Resource96=IDD_PROJEXT
-Resource97=IDR_SPELL
+Resource56=IDD_STOREITEMS
+Resource57=IDD_AREATRIGGER
+Resource58=IDD_SPELLGENERAL
+Resource59=IDD_PANICBUTTON
+Resource60=IDD_STORERENTAL
+Resource61=IDD_MAPEDIT
+Resource62=IDD_WEDPOLY
+Resource63=IDR_GAME
+Resource64=IDR_MUSIC
+Resource65=IDD_SPELLEFFECT
+Resource66=IDD_WEIDU
+Resource67=IDD_KEYEDIT
+Resource68=IDD_CHUIEDIT
+Resource69=IDD_PALETTE
+Resource70=IDD_EFFEDIT
+Resource71=IDR_TLKMENU
+Resource72=IDD_GAMEEDIT
+Resource73=IDD_AREAAMBIENT
+Resource74=IDD_ITEMEXTRA
+Resource75=IDD_ITEMEDIT
+Resource76=IDD_AREAMAP
+Resource77=IDD_AREADOOR
+Resource78=IDD_CREATUREITEMS
+Resource79=IDD_STOREEDIT
+Resource80=IDD_BAMEDIT
+Resource81=IDD_SCHEDULE
+Resource82=IDD_SPELLEXTRA
+Resource83=IDD_STRREFDLG
+Resource84=IDD_AREAVARIABLE
+Resource85=IDD_IMAGEVIEW
+Resource86=IDD_CREATUREEFF
+Resource87=IDD_WEDTILE
+Resource88=IDR_CHUI
+Resource89=IDD_VARIABLES
+Resource90=IDD_STOREGENERAL
+Resource91=IDD_ITEMEFFECT
+Resource92=IDD_PROJEXT
+Resource93=IDD_ADDLINK
+Resource94=IDD_AREAACTOR
+Resource95=IDD_SRCEDIT
+Resource96=IDD_ITEMICONS
+Resource97=IDD_EDIT
 Class56=CAreaVariable
 Class57=CAreaDoor
 Class58=CDialogEdit
@@ -190,28 +190,28 @@
 Class81=CCreatureEffect
 Class82=CWedEdit
 Class83=CWedPolygon
-Resource98=IDD_STOREITEMS
+Resource98=IDR_WORLDMAP
 Class84=massclear
-Resource99=IDD_CREATUREEFF
-Resource100=IDD_CFB
-Resource101=IDR_VVC
+Resource99=IDR_STORE
+Resource100=IDR_EFFECT
+Resource101=IDR_SCRIPT
 Class85=CTisDialog
-Resource102=IDR_EFFECT
+Resource102=IDD_FINDITEM
 Class86=CKeyEdit
-Resource103=IDD_AREACONTAINER
-Resource104=IDD_SRCEDIT
-Resource105=IDD_GAMESTATS
-Resource106=IDD_EXTRACT
-Resource107=IDD_SEARCHNODE
-Resource108=IDD_CREATUREUNKNOWN
-Resource109=IDD_ITEMEFFECT
-Resource110=IDD_CREATUREGENERAL
-Resource111=IDD_WEDPOLY
-Resource112=IDD_AREAINT
-Resource113=IDD_SPELLEDIT
-Resource114=IDD_CREATURESTRINGS
-Resource115=IDR_GAME
-Resource116=IDD_CREATUREEDIT
+Resource103=IDD_COMPAT
+Resource104=IDR_2DA
+Resource105=IDR_WEDMENU
+Resource106=IDR_SPELL
+Resource107=IDD_MASSCLEAR
+Resource108=IDD_SHOWLOG
+Resource109=IDD_SPELLEDIT
+Resource110=IDD_CHECK
+Resource111=IDD_IAPDIALOG
+Resource112=IDD_AREASPAWN
+Resource113=IDD_DIALOGEDIT
+Resource114=IDD_SCRIPTEDIT
+Resource115=IDD_ITEMEQUIP
+Resource116=IDR_AREA
 Class87=CWedTile
 Class88=CSpellTool
 Class89=CChuiEdit
@@ -219,16 +219,17 @@
 Class91=CAreaMap
 Class92=CStoreDrinks
 Class93=CPolygon
-Resource117=IDD_SPELLGENERAL
+Resource117=IDR_TILE
 Class94=CTextView
-Resource118=IDD_FINDITEM
+Resource118=IDD_ITEMUSE
 Class95=CTormentCre
-Resource119=IDD_ADDLINK
+Resource119=IDD_TISDIALOG
 Class96=CGameStatistics
-Resource120=IDD_SCRIPTEDIT
-Resource121=IDD_CHITEM_DIALOG
+Resource120=IDD_GAMEPCINFO
+Resource121=IDD_CREATURESKILLS
 Class97=CGameGeneral
-Resource122=IDR_SHORTCUT
+Resource122=IDD_EXTRACT
+Resource123=IDR_SHORTCUT
 
 [CLS:CChitemApp]
 Type=0
@@ -2160,7 +2161,7 @@
 HeaderFile=AreaProperties.h
 ImplementationFile=AreaProperties.cpp
 BaseClass=CPropertyPage
-LastObject=CAreaActor
+LastObject=IDC_ACTORPICKER
 Filter=D
 VirtualFilter=dWC
 
@@ -3173,71 +3174,71 @@
 [DLG:IDD_AREADOOR]
 Type=1
 Class=CAreaDoor
-ControlCount=94
+ControlCount=90
 Control1=IDC_DOORPICKER,combobox,1344339970
 Control2=IDC_DOORID,edit,1350631560
 Control3=IDC_FLAGS,edit,1350631552
 Control4=IDC_TPOSX,edit,1350631552
 Control5=IDC_TPOSY,edit,1350631552
 Control6=IDC_SET,button,1342242816
-Control7=IDC_SHORTREF,edit,1350631552
-Control8=IDC_TAGGED,button,1342242851
-Control9=IDC_LONGNAME,edit,1350631552
-Control10=IDC_STRREF,edit,1350631552
-Control11=IDC_FLAG1,button,1342242819
-Control12=IDC_FLAG4,button,1342242819
-Control13=IDC_FLAG7,button,1342242819
-Control14=IDC_FLAG10,button,1342242819
-Control15=IDC_FLAG2,button,1342242819
-Control16=IDC_FLAG5,button,1342242819
-Control17=IDC_FLAG8,button,1342242819
-Control18=IDC_FLAG11,button,1342242819
-Control19=IDC_FLAG3,button,1342242819
-Control20=IDC_FLAG6,button,1342242819
-Control21=IDC_FLAG9,button,1342242819
-Control22=IDC_FLAG12,button,1342242819
-Control23=IDC_INFOSTR,edit,1350631552
-Control24=IDC_CURSORIDX,edit,1350631552
-Control25=IDC_SPINCURSOR,msctls_updown32,1342177463
-Control26=IDC_CURSOR,static,1342181390
-Control27=IDC_SOUND1,edit,1350631560
-Control28=IDC_BROWSE,button,1342242816
-Control29=IDC_PLAY,button,1342242816
-Control30=IDC_SOUND2,edit,1350631560
-Control31=IDC_BROWSE2,button,1342242816
-Control32=IDC_PLAYSOUND,button,1342242816
-Control33=IDC_U54,edit,1350631552
-Control34=IDC_LOCKED,edit,1350631552
-Control35=IDC_DIFF,edit,1350631552
-Control36=IDC_KEY,edit,1350631560
-Control37=IDC_DETECT,edit,1350631552
-Control38=IDC_REMOVAL,edit,1350631552
-Control39=IDC_SCRIPT,edit,1350631560
-Control40=IDC_TRAPPED,edit,1350631552
-Control41=IDC_DETECTED,edit,1350631552
-Control42=IDC_DIALOG,edit,1350631560
-Control43=IDC_BROWSE3,button,1342242816
-Control44=IDC_BROWSE5,button,1342242816
-Control45=IDC_BROWSE4,button,1342242816
-Control46=IDC_ADD,button,1342242816
-Control47=IDC_REMOVE,button,1342242816
-Control48=IDC_COPY,button,1342242816
-Control49=IDC_PASTE,button,1342242816
-Control50=IDC_OPEN,button,1342246915
-Control51=IDC_POS1X,edit,1350631552
-Control52=IDC_POS1Y,edit,1350631552
-Control53=IDC_POS2X,edit,1350631552
-Control54=IDC_POS2Y,edit,1350631552
-Control55=IDC_EDITBLOCK,button,1342242816
-Control56=IDC_EDITPOLYGON,button,1342242816
-Control57=IDC_RECALCBOX,button,1342242816
-Control58=IDC_UNKNOWN,button,1342242816
-Control59=IDC_MAXDOOR,static,1342308352
+Control7=IDC_STRREF,edit,1350631552
+Control8=IDC_FLAG1,button,1342242819
+Control9=IDC_FLAG4,button,1342242819
+Control10=IDC_FLAG7,button,1342242819
+Control11=IDC_FLAG10,button,1342242819
+Control12=IDC_FLAG2,button,1342242819
+Control13=IDC_FLAG5,button,1342242819
+Control14=IDC_FLAG8,button,1342242819
+Control15=IDC_FLAG11,button,1342242819
+Control16=IDC_FLAG3,button,1342242819
+Control17=IDC_FLAG6,button,1342242819
+Control18=IDC_FLAG9,button,1342242819
+Control19=IDC_FLAG12,button,1342242819
+Control20=IDC_INFOSTR,edit,1350631552
+Control21=IDC_CURSORIDX,edit,1350631552
+Control22=IDC_SPINCURSOR,msctls_updown32,1342177463
+Control23=IDC_CURSOR,static,1342181390
+Control24=IDC_SOUND1,edit,1350631560
+Control25=IDC_BROWSE,button,1342242816
+Control26=IDC_PLAY,button,1342242816
+Control27=IDC_SOUND2,edit,1350631560
+Control28=IDC_BROWSE2,button,1342242816
+Control29=IDC_PLAYSOUND,button,1342242816
+Control30=IDC_U54,edit,1350631552
+Control31=IDC_LOCKED,edit,1350631552
+Control32=IDC_DIFF,edit,1350631552
+Control33=IDC_KEY,edit,1350631560
+Control34=IDC_DETECT,edit,1350631552
+Control35=IDC_REMOVAL,edit,1350631552
+Control36=IDC_SCRIPT,edit,1350631560
+Control37=IDC_TRAPPED,edit,1350631552
+Control38=IDC_DETECTED,edit,1350631552
+Control39=IDC_DIALOG,edit,1350631560
+Control40=IDC_BROWSE3,button,1342242816
+Control41=IDC_BROWSE5,button,1342242816
+Control42=IDC_BROWSE4,button,1342242816
+Control43=IDC_ADD,button,1342242816
+Control44=IDC_REMOVE,button,1342242816
+Control45=IDC_COPY,button,1342242816
+Control46=IDC_PASTE,button,1342242816
+Control47=IDC_OPEN,button,1342246915
+Control48=IDC_POS1X,edit,1350631552
+Control49=IDC_POS1Y,edit,1350631552
+Control50=IDC_POS2X,edit,1350631552
+Control51=IDC_POS2Y,edit,1350631552
+Control52=IDC_EDITBLOCK,button,1342242816
+Control53=IDC_EDITPOLYGON,button,1342242816
+Control54=IDC_RECALCBOX,button,1342242816
+Control55=IDC_UNKNOWN,button,1342242816
+Control56=IDC_MAXDOOR,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,static,1342308352
+Control61=IDC_STATIC,button,1342210055
 Control62=IDC_STATIC,static,1342308352
 Control63=IDC_STATIC,static,1342308352
-Control64=IDC_STATIC,button,1342210055
+Control64=IDC_STATIC,static,1342308352
 Control65=IDC_STATIC,static,1342308352
 Control66=IDC_STATIC,static,1342308352
 Control67=IDC_STATIC,static,1342308352
@@ -3254,20 +3255,16 @@
 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
-Control85=IDC_POS1X2,edit,1350631552
-Control86=IDC_POS1Y2,edit,1350631552
-Control87=IDC_POS2X2,edit,1350631552
-Control88=IDC_POS2Y2,edit,1350631552
-Control89=IDC_STATIC,static,1342308352
-Control90=IDC_STATIC,static,1342308352
-Control91=IDC_SET2,button,1342242816
-Control92=IDC_SET3,button,1342242816
-Control93=IDC_SELECTION,button,1342242816
-Control94=IDC_AREA,combobox,1344340226
+Control81=IDC_POS1X2,edit,1350631552
+Control82=IDC_POS1Y2,edit,1350631552
+Control83=IDC_POS2X2,edit,1350631552
+Control84=IDC_POS2Y2,edit,1350631552
+Control85=IDC_STATIC,static,1342308352
+Control86=IDC_STATIC,static,1342308352
+Control87=IDC_SET2,button,1342242816
+Control88=IDC_SET3,button,1342242816
+Control89=IDC_SELECTION,button,1342242816
+Control90=IDC_AREA,combobox,1344340226
 
 [DLG:IDD_AREAVARIABLE]
 Type=1
@@ -4386,7 +4383,7 @@
 BaseClass=CDialog
 Filter=D
 VirtualFilter=dWC
-LastObject=IDC_STRREF
+LastObject=CStrRefDlg
 
 [MNU:IDR_GAME]
 Type=1
@@ -5366,3 +5363,21 @@
 LastObject=IDC_WEATHER
 VirtualFilter=dWC
 
+[DLG:IDD_GAMEPCINFO]
+Type=1
+Class=?
+ControlCount=13
+Control1=IDCANCEL,button,1342242816
+Control2=IDC_AREA,edit,1350631560
+Control3=IDC_BROWSE1,button,1342242816
+Control4=IDC_XPOS,edit,1350631552
+Control5=IDC_YPOS,edit,1350631552
+Control6=IDC_CRERES,edit,1350631560
+Control7=IDC_BROWSE2,button,1342242816
+Control8=IDC_FACE,combobox,1344339970
+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
+