Menu
▾
▴
[Gemrb-commits] SF.net SVN: gemrb: [4645] chitem/trunk
|
From: <ave...@us...> - 2007-05-06 20:05:26
|
Revision: 4645
http://gemrb.svn.sourceforge.net/gemrb/?rev=4645&view=rev
Author: avenger_teambg
Date: 2007-05-06 13:05:28 -0700 (Sun, 06 May 2007)
Log Message:
-----------
dltcep source update
Modified Paths:
--------------
chitem/trunk/2DAEdit.cpp
chitem/trunk/AreaEdit.cpp
chitem/trunk/BamEdit.cpp
chitem/trunk/CFBDialog.cpp
chitem/trunk/Chitem.cpp
chitem/trunk/Chitem.h
chitem/trunk/ChuiEdit.cpp
chitem/trunk/CreatureEdit.cpp
chitem/trunk/CreatureProperties.cpp
chitem/trunk/CreatureProperties.h
chitem/trunk/DialogEdit.cpp
chitem/trunk/EffEdit.cpp
chitem/trunk/FileExtract.cpp
chitem/trunk/GameEdit.cpp
chitem/trunk/GameGeneral.cpp
chitem/trunk/IapDialog.cpp
chitem/trunk/ItemEdit.cpp
chitem/trunk/ItemProperties.cpp
chitem/trunk/KeyEdit.cpp
chitem/trunk/MapEdit.cpp
chitem/trunk/MosEdit.cpp
chitem/trunk/Polygon.cpp
chitem/trunk/ProjEdit.cpp
chitem/trunk/SRCEdit.cpp
chitem/trunk/ScriptEdit.cpp
chitem/trunk/SpellEdit.cpp
chitem/trunk/StoreEdit.cpp
chitem/trunk/TisDialog.cpp
chitem/trunk/VVCEdit.cpp
chitem/trunk/WedPolygon.cpp
chitem/trunk/WedTile.cpp
chitem/trunk/chitem.clw
chitem/trunk/chitem.dsp
chitem/trunk/chitem.rc
chitem/trunk/chitemDlg.cpp
chitem/trunk/compat.cpp
chitem/trunk/options.cpp
chitem/trunk/resource.h
chitem/trunk/tbg.cpp
Added Paths:
-----------
chitem/trunk/MyFileDialog.cpp
chitem/trunk/MyFileDialog.h
Modified: chitem/trunk/2DAEdit.cpp
===================================================================
--- chitem/trunk/2DAEdit.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/2DAEdit.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -12,6 +12,7 @@
#include "StrRefDlg.h"
#include "progressbar.h"
#include "ColorPicker.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -165,7 +166,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, "2da", makeitemname(".2da",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(TRUE, "2da", makeitemname(".2da",0), res, szFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
@@ -224,7 +225,7 @@
return;
}
res=OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(FALSE, "2da", makeitemname(".2da",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(FALSE, "2da", makeitemname(".2da",0), res, szFilter);
if(save)
{
@@ -1016,7 +1017,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, "ids", makeitemname(".ids",0), res, szFilter2);
+ CMyFileDialog m_getfiledlg(TRUE, "ids", makeitemname(".ids",0), res, szFilter2);
restart:
if( m_getfiledlg.DoModal() == IDOK )
@@ -1083,7 +1084,7 @@
return;
}
res=OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(FALSE, "ids", makeitemname(".ids",0), res, szFilter2);
+ CMyFileDialog m_getfiledlg(FALSE, "ids", makeitemname(".ids",0), res, szFilter2);
if(save)
{
@@ -1549,7 +1550,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, "mus", makeitemname(".mus",4), res, szFilter3);
+ CMyFileDialog m_getfiledlg(TRUE, "mus", makeitemname(".mus",4), res, szFilter3);
restart:
if( m_getfiledlg.DoModal() == IDOK )
@@ -1599,8 +1600,8 @@
return;
}
res=OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- //CFileDialog m_getfiledlg(FALSE, "mus", bgfolder+"music\\"+itemname+".mus", res, szFilter3);
- CFileDialog m_getfiledlg(FALSE, "mus", makeitemname(".mus",4), res, szFilter3);
+ //CMyFileDialog m_getfiledlg(FALSE, "mus", bgfolder+"music\\"+itemname+".mus", res, szFilter3);
+ CMyFileDialog m_getfiledlg(FALSE, "mus", makeitemname(".mus",4), res, szFilter3);
restart:
if( m_getfiledlg.DoModal() == IDOK )
{
Modified: chitem/trunk/AreaEdit.cpp
===================================================================
--- chitem/trunk/AreaEdit.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/AreaEdit.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -11,6 +11,7 @@
#include "WedEdit.h"
#include "StrRefDlg.h"
#include "tbg.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -133,7 +134,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, "are", makeitemname(".are",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(TRUE, "are", makeitemname(".are",0), res, szFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
@@ -214,7 +215,7 @@
return;
}
res=OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(FALSE, "are", makeitemname(".are",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(FALSE, "are", makeitemname(".are",0), res, szFilter);
if(save)
{
Modified: chitem/trunk/BamEdit.cpp
===================================================================
--- chitem/trunk/BamEdit.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/BamEdit.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -9,7 +9,7 @@
#include "chitemDlg.h"
#include "BamEdit.h"
#include "PaletteEdit.h"
-#include ".\bamedit.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -636,7 +636,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, "bam", makeitemname(".bam",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(TRUE, "bam", makeitemname(".bam",0), res, szFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
@@ -707,7 +707,7 @@
the_bam.m_bCompressed=0;
}
res=OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(FALSE, "", makeitemname(".bam",0), res, ImageFilter(0x35));
+ CMyFileDialog m_getfiledlg(FALSE, "", makeitemname(".bam",0), res, ImageFilter(0x35));
if(save)
{
@@ -1006,7 +1006,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, NULL, makeitemname(".bam",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(TRUE, NULL, makeitemname(".bam",0), res, szFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
@@ -1375,7 +1375,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, "bmp", makeitemname(".bmp",0), res, szFilter2);
+ CMyFileDialog m_getfiledlg(TRUE, "bmp", makeitemname(".bmp",0), res, szFilter2);
restart:
if( m_getfiledlg.DoModal() == IDOK )
Modified: chitem/trunk/CFBDialog.cpp
===================================================================
--- chitem/trunk/CFBDialog.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/CFBDialog.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -7,9 +7,9 @@
#include <direct.h>
#include <sys/stat.h>
#include <shlobj.h>
-
#include "chitem.h"
#include "CFBDialog.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -141,7 +141,7 @@
if(mode&1)
{
flg=OFN_FILEMUSTEXIST|OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(TRUE, "bin", bgfolder+"cfb.bin", flg, cfbFilter);
+ CMyFileDialog m_getfiledlg(TRUE, "bin", bgfolder+"cfb.bin", flg, cfbFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
Modified: chitem/trunk/Chitem.cpp
===================================================================
--- chitem/trunk/Chitem.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/Chitem.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -2007,7 +2007,7 @@
return tmp;
}
-CString spelltypes[NUM_SPELLTYPE+1]={"0-Special","1-Wizard","2-Cleric","3-Unknown","4-Innate","5-Song"};
+CString spelltypes[NUM_SPELLTYPE+1]={"0-Special","1-Wizard","2-Cleric","3-Psionic","4-Innate","5-Song"};
CString format_spelltype(unsigned int spelltype)
{
@@ -6164,18 +6164,6 @@
return IDCANCEL;
}
-//this is a special hack, to get this file selection box
-//working on multi selection correctly
-void HackForLargeList(CFileDialog &m_getfiledlg)
-{
- if (m_getfiledlg.m_ofn.nMaxFile<MAXBUFFSIZE)
- {
- strncpy(external,m_getfiledlg.m_ofn.lpstrFile,MAXBUFFSIZE);
- m_getfiledlg.m_ofn.lpstrFile=external;
- m_getfiledlg.m_ofn.nMaxFile=MAXBUFFSIZE;
- }
-}
-
int ReadTempCreature(char *&creature, long &esize)
{
int fhandle;
Modified: chitem/trunk/Chitem.h
===================================================================
--- chitem/trunk/Chitem.h 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/Chitem.h 2007-05-06 20:05:28 UTC (rev 4645)
@@ -546,6 +546,13 @@
CString initial;
} folderbrowse_t;
+struct OPENFILENAMEEX : public OPENFILENAME
+{
+ void * pvReserved;
+ DWORD dwReserved;
+ DWORD FlagsEx;
+};
+
extern colortype colors[COLORNUM];
extern void init_colors();
@@ -558,7 +565,6 @@
void ConvertToV20Eff(creature_effect *v20effect, const feat_block *v10effect);
int CheckDestination(CString area, CString entrance);
int BrowseForFolder(folderbrowse_t *pfb, HWND hwnd);
-void HackForLargeList(CFileDialog &m_getfiledlg);
int ReadTempCreature(char *&creature, long &esize);
int WriteTempCreature(char *creature, long esize);
Modified: chitem/trunk/ChuiEdit.cpp
===================================================================
--- chitem/trunk/ChuiEdit.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/ChuiEdit.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -10,6 +10,7 @@
#include "options.h"
#include "ChuiEdit.h"
#include "tbg.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -558,7 +559,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, "chu", makeitemname(".chu",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(TRUE, "chu", makeitemname(".chu",0), res, szFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
@@ -629,7 +630,7 @@
return;
}
res=OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(FALSE, "chu", makeitemname(".chu",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(FALSE, "chu", makeitemname(".chu",0), res, szFilter);
if(save)
{
Modified: chitem/trunk/CreatureEdit.cpp
===================================================================
--- chitem/trunk/CreatureEdit.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/CreatureEdit.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -11,6 +11,7 @@
#include "2da.h"
#include "2daEdit.h"
#include "tbg.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -153,7 +154,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, "cre", makeitemname(".cre",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(TRUE, "cre", makeitemname(".cre",0), res, szFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
@@ -249,7 +250,7 @@
return;
}
res=OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(FALSE, "cre", makeitemname(".cre",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(FALSE, "cre", makeitemname(".cre",0), res, szFilter);
if(save)
{
Modified: chitem/trunk/CreatureProperties.cpp
===================================================================
--- chitem/trunk/CreatureProperties.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/CreatureProperties.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -49,9 +49,10 @@
CString CCreatureGeneral::FindKit(unsigned int kit)
{
CString tmpstr, kitname;
+
if(the_creature.revision!=22)
{
- kitname = IDSToken("KIT", kit>>16, false); //not iwd2
+ kitname = IDSToken("KIT", (kit>>16)|(kit<<16), false); //not iwd2
}
else
{
@@ -343,13 +344,13 @@
ON_EN_KILLFOCUS(IDC_THAC0, OnKillfocusThac0)
ON_CBN_KILLFOCUS(IDC_NUMATTACKS, OnKillfocusNumattacks)
ON_CBN_KILLFOCUS(IDC_DUALFLAGS, OnKillfocusDualflags)
- ON_EN_KILLFOCUS(IDC_KIT, OnKillfocusKit)
ON_BN_CLICKED(IDC_V10, OnV10)
ON_BN_CLICKED(IDC_V22, OnV22)
ON_BN_CLICKED(IDC_V90, OnV90)
ON_BN_CLICKED(IDC_V12, OnV12)
ON_BN_CLICKED(IDC_NEW1, OnNew1)
ON_BN_CLICKED(IDC_NEW2, OnNew2)
+ ON_CBN_KILLFOCUS(IDC_KIT, OnKillfocusKit)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
@@ -3321,6 +3322,7 @@
the_creature.selects[pos].index+the_creature.selects[pos].count>m_spellslot)
{
RemoveSpell(pos);
+ break;
}
}
RefreshItem();
Modified: chitem/trunk/CreatureProperties.h
===================================================================
--- chitem/trunk/CreatureProperties.h 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/CreatureProperties.h 2007-05-06 20:05:28 UTC (rev 4645)
@@ -76,13 +76,13 @@
afx_msg void OnKillfocusThac0();
afx_msg void OnKillfocusNumattacks();
afx_msg void OnKillfocusDualflags();
- afx_msg void OnKillfocusKit();
afx_msg void OnV10();
afx_msg void OnV22();
afx_msg void OnV90();
afx_msg void OnV12();
afx_msg void OnNew1();
afx_msg void OnNew2();
+ afx_msg void OnKillfocusKit();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
Modified: chitem/trunk/DialogEdit.cpp
===================================================================
--- chitem/trunk/DialogEdit.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/DialogEdit.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -16,7 +16,7 @@
#include "tbg.h"
#include "2da.h"
#include "2daEdit.h"
-#include ".\dialogedit.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -838,7 +838,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, "dlg", makeitemname(".dlg",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(TRUE, "dlg", makeitemname(".dlg",0), res, szFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
@@ -949,7 +949,7 @@
return;
}
res=OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(FALSE, "dlg", makeitemname(".dlg",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(FALSE, "dlg", makeitemname(".dlg",0), res, szFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
@@ -2948,7 +2948,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, "d", makeitemname(".d",0), res, szFilterWeidu);
+ CMyFileDialog m_getfiledlg(TRUE, "d", makeitemname(".d",0), res, szFilterWeidu);
restart:
if( m_getfiledlg.DoModal() == IDOK )
Modified: chitem/trunk/EffEdit.cpp
===================================================================
--- chitem/trunk/EffEdit.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/EffEdit.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -12,6 +12,7 @@
#include "2daEdit.h"
#include "tbg.h"
#include "options.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -571,7 +572,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, "eff", makeitemname(".eff",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(TRUE, "eff", makeitemname(".eff",0), res, szFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
@@ -628,7 +629,7 @@
return;
}
res=OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(FALSE, "eff", makeitemname(".eff",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(FALSE, "eff", makeitemname(".eff",0), res, szFilter);
if(save)
{
Modified: chitem/trunk/FileExtract.cpp
===================================================================
--- chitem/trunk/FileExtract.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/FileExtract.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -8,6 +8,7 @@
#include "chitem.h"
#include "FileExtract.h"
#include "zlib.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -362,7 +363,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
itemname="new ";
- CFileDialog m_getfiledlg(TRUE, cbf_or_sav?"cbf":"sav", makeitemname(cbf_or_sav?".cbf":".sav",cbf_or_sav+2), res, szFilter);
+ CMyFileDialog m_getfiledlg(TRUE, cbf_or_sav?"cbf":"sav", makeitemname(cbf_or_sav?".cbf":".sav",cbf_or_sav+2), res, szFilter);
m_getfiledlg.m_ofn.lpstrTitle="Which archive to uncompress from?";
if( m_getfiledlg.DoModal() == IDOK )
Modified: chitem/trunk/GameEdit.cpp
===================================================================
--- chitem/trunk/GameEdit.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/GameEdit.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -12,6 +12,7 @@
#include "GameGeneral.h"
#include "GameStatistics.h"
#include "PCInfo.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -540,7 +541,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, "gam", makeitemname(".gam",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(TRUE, "gam", makeitemname(".gam",0), res, szFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
@@ -606,7 +607,7 @@
return;
}
res=OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(FALSE, "gam", makeitemname(".gam",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(FALSE, "gam", makeitemname(".gam",0), res, szFilter);
if(save)
{
Modified: chitem/trunk/GameGeneral.cpp
===================================================================
--- chitem/trunk/GameGeneral.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/GameGeneral.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -38,6 +38,7 @@
//}}AFX_DATA_MAP
DDX_Text(pDX, IDC_GAMETIME, the_game.header.gametime);
+
DDX_Text(pDX, IDC_GOLD, the_game.header.gold);
if (the_game.revision==12)
{
@@ -59,9 +60,12 @@
cw = GetDlgItem(IDC_U1+i);
cw->ShowWindow(false);
}
+ cw=GetDlgItem(IDC_REALTIME);
+ cw->EnableWindow(false);
}
else
{
+ DDX_Text(pDX, IDC_REALTIME, the_game.header.realtime);
DDX_Text(pDX, IDC_REPUTATION, the_game.header.reputation);
RetrieveResref(tmpstr,the_game.header.mainarea);
DDX_Text(pDX, IDC_STARTAREA, tmpstr);
Modified: chitem/trunk/IapDialog.cpp
===================================================================
--- chitem/trunk/IapDialog.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/IapDialog.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -8,6 +8,7 @@
#include "chitem.h"
#include "IapDialog.h"
#include "options.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -175,7 +176,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, "iap", makeitemname(".iap",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(TRUE, "iap", makeitemname(".iap",0), res, szFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
@@ -226,7 +227,7 @@
return;
}
res=OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT|OFN_ENABLESIZING;
- CFileDialog m_getfiledlg(FALSE, "iap", makeitemname(".iap",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(FALSE, "iap", makeitemname(".iap",0), res, szFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
@@ -364,8 +365,7 @@
flg=OFN_FILEMUSTEXIST|OFN_HIDEREADONLY|OFN_ALLOWMULTISELECT|OFN_ENABLESIZING;
- CFileDialog m_getfiledlg(TRUE, NULL, bgfolder+"override\\*.*", flg, szFilter1);
- HackForLargeList(m_getfiledlg);
+ CMyFileDialog m_getfiledlg(TRUE, NULL, bgfolder+"override\\*.*", flg, szFilter1);
m_getfiledlg.m_ofn.lpstrTitle="Select game files!";
if( m_getfiledlg.DoModal() == IDOK )
@@ -386,8 +386,7 @@
int flg;
flg=OFN_FILEMUSTEXIST|OFN_HIDEREADONLY|OFN_ALLOWMULTISELECT|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(TRUE, "tbg", bgfolder+"*.tbg", flg, szFilterTbg);
- HackForLargeList(m_getfiledlg);
+ CMyFileDialog m_getfiledlg(TRUE, "tbg", bgfolder+"*.tbg", flg, szFilterTbg);
m_getfiledlg.m_ofn.lpstrTitle="Select TBG files!";
if( m_getfiledlg.DoModal() == IDOK )
Modified: chitem/trunk/ItemEdit.cpp
===================================================================
--- chitem/trunk/ItemEdit.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/ItemEdit.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -10,6 +10,7 @@
#include "ItemEdit.h"
#include "StrRefDlg.h"
#include "tbg.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -130,7 +131,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, "itm", makeitemname(".itm",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(TRUE, "itm", makeitemname(".itm",0), res, szFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
@@ -204,7 +205,7 @@
return;
}
res=OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(FALSE, "itm", makeitemname(".itm",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(FALSE, "itm", makeitemname(".itm",0), res, szFilter);
if(save)
{
Modified: chitem/trunk/ItemProperties.cpp
===================================================================
--- chitem/trunk/ItemProperties.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/ItemProperties.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -60,10 +60,10 @@
"Mage/Thief","Solamnic Knight","Ranger","Thief",
"Elf","Dwarf","Half-Elf","Kender",
"Human","Gnome","Monk","Druid","Minotaur",
- "0x01000000","0x02000000","0x04000000","0x08000000","0x10000000","0x20000000","0x40000000","0x80000000",
- "0x00010000","0x00020000","0x00040000","0x00080000","Handler","0x00200000","0x00400000","0x00800000",
- "Diviner","Enchanter","Evoker","Illusionist","Necromancer","Transmuter","Baseclass","0x00008000",
- "0x00000001","0x00000002","0x00000004","0x00000008","0x00000010","0x00000020","Abjurer","Conjurer"
+ "Kiri-Jolith","Branchala","Habbakuk","Gilean","Reorx","Zivilyn","Wildmage","Barbarian",
+ "Hiddukel","Zeboim","0x00040000","0x00080000","Handler","Paladine","Mishakal","Majere",
+ "Diviner","Enchanter","Evoker","Illusionist","Necromancer","Transmuter","Baseclass","Chemosh",
+ "Sirrion","Shinare","Chislev","Takhisis","Sargonnas","Morgion","Abjurer","Conjurer"
};
//gets the starting feature block counter for this extended header
Modified: chitem/trunk/KeyEdit.cpp
===================================================================
--- chitem/trunk/KeyEdit.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/KeyEdit.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -5,11 +5,11 @@
#include <fcntl.h>
#include <sys/stat.h>
#include <direct.h>
-
#include "chitem.h"
#include "chitemDlg.h"
#include "options.h"
#include "KeyEdit.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -989,7 +989,7 @@
MessageBox("To readd a BIF you must have an old chitin.key and the BIF file","Key editor",MB_OK|MB_ICONINFORMATION);
flg=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER|OFN_READONLY;
{
- CFileDialog m_getfiledlg(TRUE, NULL, bgfolder+"chitin.key", flg, szFilterKey);
+ CMyFileDialog m_getfiledlg(TRUE, NULL, bgfolder+"chitin.key", flg, szFilterKey);
if( m_getfiledlg.DoModal() != IDOK )
{
return;
@@ -998,7 +998,7 @@
}
{
- CFileDialog m_getfiledlg(TRUE, NULL, bgfolder+"*.bif", flg, szFilterBif);
+ CMyFileDialog m_getfiledlg(TRUE, NULL, bgfolder+"*.bif", flg, szFilterBif);
if( m_getfiledlg.DoModal() != IDOK )
{
return;
Modified: chitem/trunk/MapEdit.cpp
===================================================================
--- chitem/trunk/MapEdit.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/MapEdit.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -11,6 +11,7 @@
#include "options.h"
#include "tbg.h"
#include "ImageView.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -407,7 +408,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, "wmp", makeitemname(".wmp",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(TRUE, "wmp", makeitemname(".wmp",0), res, szFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
@@ -474,7 +475,7 @@
return;
}
res=OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(FALSE, "wmp", makeitemname(".wmp",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(FALSE, "wmp", makeitemname(".wmp",0), res, szFilter);
if(save)
{
Modified: chitem/trunk/MosEdit.cpp
===================================================================
--- chitem/trunk/MosEdit.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/MosEdit.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -12,6 +12,7 @@
#include "ImageView.h"
#include "TisDialog.h"
#include "options.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -255,7 +256,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, (tis_or_mos&TM_TIS)?"tis":"mos", makeitemname(tis_or_mos?".tis":".mos",0), res, ImageFilter(tis_or_mos?0x0312:0x0321) );
+ CMyFileDialog m_getfiledlg(TRUE, (tis_or_mos&TM_TIS)?"tis":"mos", makeitemname(tis_or_mos?".tis":".mos",0), res, ImageFilter(tis_or_mos?0x0312:0x0321) );
restart:
if( m_getfiledlg.DoModal() == IDOK )
@@ -330,7 +331,7 @@
return -1;
}
res=OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(FALSE, (tis_or_mos&TM_TIS)?"tis":"mos", makeitemname("",0), res, ImageFilter(tis_or_mos?0x03142:0x03421));
+ CMyFileDialog m_getfiledlg(FALSE, (tis_or_mos&TM_TIS)?"tis":"mos", makeitemname("",0), res, ImageFilter(tis_or_mos?0x03142:0x03421));
if(save)
{
Added: chitem/trunk/MyFileDialog.cpp
===================================================================
--- chitem/trunk/MyFileDialog.cpp (rev 0)
+++ chitem/trunk/MyFileDialog.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -0,0 +1,40 @@
+// MyFileDialog.cpp: implementation of the CMyFileDialog class.
+//
+//////////////////////////////////////////////////////////////////////
+
+#include "stdafx.h"
+#include "chitem.h"
+#include "MyFileDialog.h"
+
+#ifdef _DEBUG
+#undef THIS_FILE
+static char THIS_FILE[]=__FILE__;
+#define new DEBUG_NEW
+#endif
+
+//////////////////////////////////////////////////////////////////////
+// Construction/Destruction
+//////////////////////////////////////////////////////////////////////
+
+CMyFileDialog::CMyFileDialog(BOOL bOpenFileDialog,LPCTSTR lpszDefExt,LPCTSTR lpszFileName,
+ DWORD dwFlags,LPCTSTR lpszFilter, CWnd *pParentWnd) :
+CFileDialog(bOpenFileDialog, lpszDefExt, lpszFileName, dwFlags, lpszFilter, pParentWnd)
+{
+ if ((DWORD)(LOBYTE(LOWORD(::GetVersion())))>=5) {
+ if (m_ofn.lStructSize<sizeof(OPENFILENAMEEX)) {
+ m_ofn.lStructSize = sizeof(OPENFILENAMEEX);
+ }
+ }
+
+ if (m_ofn.nMaxFile<MAXBUFFSIZE)
+ {
+ strncpy(external,m_ofn.lpstrFile,MAXBUFFSIZE);
+ m_ofn.lpstrFile=external;
+ m_ofn.nMaxFile=MAXBUFFSIZE;
+ }
+};
+
+CMyFileDialog::~CMyFileDialog()
+{
+
+}
Property changes on: chitem/trunk/MyFileDialog.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Added: chitem/trunk/MyFileDialog.h
===================================================================
--- chitem/trunk/MyFileDialog.h (rev 0)
+++ chitem/trunk/MyFileDialog.h 2007-05-06 20:05:28 UTC (rev 4645)
@@ -0,0 +1,23 @@
+// MyFileDialog.h: interface for the CMyFileDialog class.
+//
+//////////////////////////////////////////////////////////////////////
+
+#if !defined(AFX_MYFILEDIALOG_H__0AEABC04_9EEE_4D60_91FF_D764D224BECD__INCLUDED_)
+#define AFX_MYFILEDIALOG_H__0AEABC04_9EEE_4D60_91FF_D764D224BECD__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#include <afxdlgs.h>
+
+class CMyFileDialog : public CFileDialog
+{
+public:
+ CMyFileDialog(BOOL bOpenFileDialog,LPCTSTR lpszDefExt,LPCTSTR lpszFileName,
+ DWORD dwFlags,LPCTSTR lpszFilter, CWnd *pParentWnd = NULL);
+ virtual ~CMyFileDialog();
+
+};
+
+#endif // !defined(AFX_MYFILEDIALOG_H__0AEABC04_9EEE_4D60_91FF_D764D224BECD__INCLUDED_)
Property changes on: chitem/trunk/MyFileDialog.h
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: chitem/trunk/Polygon.cpp
===================================================================
--- chitem/trunk/Polygon.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/Polygon.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -8,6 +8,7 @@
#include "chitem.h"
#include "Polygon.h"
#include "options.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -372,7 +373,7 @@
int fhandle;
res=OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(FALSE, "ply", makeitemname(".ply",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(FALSE, "ply", makeitemname(".ply",0), res, szFilter);
if( m_getfiledlg.DoModal() == IDOK )
{
@@ -397,7 +398,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, "ply", makeitemname(".ply",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(TRUE, "ply", makeitemname(".ply",0), res, szFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
Modified: chitem/trunk/ProjEdit.cpp
===================================================================
--- chitem/trunk/ProjEdit.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/ProjEdit.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -9,6 +9,7 @@
#include "chitemDlg.h"
#include "ProjEdit.h"
#include "ColorPicker.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -348,7 +349,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, "pro", makeitemname(".pro",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(TRUE, "pro", makeitemname(".pro",0), res, szFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
@@ -410,7 +411,7 @@
return;
}
res=OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(FALSE, "pro", makeitemname(".pro",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(FALSE, "pro", makeitemname(".pro",0), res, szFilter);
if(save)
{
Modified: chitem/trunk/SRCEdit.cpp
===================================================================
--- chitem/trunk/SRCEdit.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/SRCEdit.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -8,6 +8,7 @@
#include "chitem.h"
#include "options.h"
#include "SRCEdit.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -240,7 +241,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, "src", makeitemname(".src",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(TRUE, "src", makeitemname(".src",0), res, szFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
@@ -307,7 +308,7 @@
return;
}
res=OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(FALSE, "src", makeitemname(".src",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(FALSE, "src", makeitemname(".src",0), res, szFilter);
if(save)
{
Modified: chitem/trunk/ScriptEdit.cpp
===================================================================
--- chitem/trunk/ScriptEdit.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/ScriptEdit.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -15,6 +15,7 @@
#include "WeiduLog.h"
#include "StrRefDlg.h"
#include "Decompiler.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -435,7 +436,7 @@
{
szFilter=szFilterb;
}
- CFileDialog m_getfiledlg(TRUE, m_bcs?"bcs":"baf", m_bcs ? makeitemname(".bcs",0): makeitemname(".baf",1), res, szFilter);
+ CMyFileDialog m_getfiledlg(TRUE, m_bcs?"bcs":"baf", m_bcs ? makeitemname(".bcs",0): makeitemname(".baf",1), res, szFilter);
if( m_getfiledlg.DoModal() == IDOK )
{
@@ -542,7 +543,7 @@
szFilter=szFilterb;
tmpstr=makeitemname(".baf",1);
}
- CFileDialog m_getfiledlg(FALSE, m_bcs?"bcs":"baf", tmpstr, res, szFilter);
+ CMyFileDialog m_getfiledlg(FALSE, m_bcs?"bcs":"baf", tmpstr, res, szFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
Modified: chitem/trunk/SpellEdit.cpp
===================================================================
--- chitem/trunk/SpellEdit.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/SpellEdit.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -10,6 +10,7 @@
#include "SpellEdit.h"
#include "StrRefDlg.h"
#include "tbg.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -120,7 +121,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, "spl", makeitemname(".spl",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(TRUE, "spl", makeitemname(".spl",0), res, szFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
@@ -194,7 +195,7 @@
return;
}
res=OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(FALSE, "spl",makeitemname(".spl",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(FALSE, "spl",makeitemname(".spl",0), res, szFilter);
if(save)
{
@@ -280,7 +281,7 @@
int fhandle;
flg=OFN_FILEMUSTEXIST|OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(TRUE, "bin", bgfolder+"cfb.bin", flg, cfbFilter);
+ CMyFileDialog m_getfiledlg(TRUE, "bin", bgfolder+"cfb.bin", flg, cfbFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
@@ -325,7 +326,7 @@
int fhandle;
flg=OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(FALSE, "bin", bgfolder+"cfb.bin", flg, cfbFilter);
+ CMyFileDialog m_getfiledlg(FALSE, "bin", bgfolder+"cfb.bin", flg, cfbFilter);
if( m_getfiledlg.DoModal() == IDOK )
{
Modified: chitem/trunk/StoreEdit.cpp
===================================================================
--- chitem/trunk/StoreEdit.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/StoreEdit.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -9,6 +9,7 @@
#include "chitemDlg.h"
#include "StoreEdit.h"
#include "tbg.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -160,7 +161,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, "sto", makeitemname(".sto",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(TRUE, "sto", makeitemname(".sto",0), res, szFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
@@ -227,7 +228,7 @@
return;
}
res=OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(FALSE, "sto", makeitemname(".sto",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(FALSE, "sto", makeitemname(".sto",0), res, szFilter);
if(save)
{
Modified: chitem/trunk/TisDialog.cpp
===================================================================
--- chitem/trunk/TisDialog.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/TisDialog.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -8,6 +8,7 @@
#include "ImageView.h"
#include "TisDialog.h"
#include "options.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -203,7 +204,7 @@
return;
}
res=OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(FALSE, how?"tis":"bmp", makeitemname(how?".tis":".bmp",0), res, ImageFilter(how?2:3) );
+ CMyFileDialog m_getfiledlg(FALSE, how?"tis":"bmp", makeitemname(how?".tis":".bmp",0), res, ImageFilter(how?2:3) );
restart:
if( m_getfiledlg.DoModal() == IDOK )
Modified: chitem/trunk/VVCEdit.cpp
===================================================================
--- chitem/trunk/VVCEdit.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/VVCEdit.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -8,6 +8,7 @@
#include "chitem.h"
#include "chitemDlg.h"
#include "VVCEdit.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -332,7 +333,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, "vvc", makeitemname(".vvc",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(TRUE, "vvc", makeitemname(".vvc",0), res, szFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
@@ -394,7 +395,7 @@
return;
}
res=OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(FALSE, "vvc", makeitemname(".vvc",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(FALSE, "vvc", makeitemname(".vvc",0), res, szFilter);
if(save)
{
Modified: chitem/trunk/WedPolygon.cpp
===================================================================
--- chitem/trunk/WedPolygon.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/WedPolygon.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -8,6 +8,7 @@
#include "chitem.h"
#include "WedPolygon.h"
#include "options.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -513,7 +514,7 @@
int fhandle;
res=OFN_HIDEREADONLY|OFN_ENABLESIZING|OFN_EXPLORER;
- CFileDialog m_getfiledlg(FALSE, "ply", makeitemname(".ply",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(FALSE, "ply", makeitemname(".ply",0), res, szFilter);
if( m_getfiledlg.DoModal() == IDOK )
{
@@ -539,7 +540,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
- CFileDialog m_getfiledlg(TRUE, "ply", makeitemname(".ply",0), res, szFilter);
+ CMyFileDialog m_getfiledlg(TRUE, "ply", makeitemname(".ply",0), res, szFilter);
restart:
if( m_getfiledlg.DoModal() == IDOK )
Modified: chitem/trunk/WedTile.cpp
===================================================================
--- chitem/trunk/WedTile.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/WedTile.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -7,6 +7,7 @@
#include "chitem.h"
#include "chitemDlg.h"
#include "WedTile.h"
+#include "MyFileDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -607,7 +608,7 @@
res=OFN_FILEMUSTEXIST|OFN_ENABLESIZING|OFN_EXPLORER;
if(readonly) res|=OFN_READONLY;
bmportis=3;
- CFileDialog m_getfiledlg(TRUE, "bmp", makeitemname(".bmp",0), res, ImageFilter(0x032) );
+ CMyFileDialog m_getfiledlg(TRUE, "bmp", makeitemname(".bmp",0), res, ImageFilter(0x032) );
restart:
if( m_getfiledlg.DoModal() == IDOK )
Modified: chitem/trunk/chitem.clw
===================================================================
--- chitem/trunk/chitem.clw 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/chitem.clw 2007-05-06 20:05:28 UTC (rev 4645)
@@ -2,7 +2,7 @@
[General Info]
Version=1
-LastClass=CItemExtended
+LastClass=CCreatureGeneral
LastTemplate=CDialog
NewFileInclude1=#include "stdafx.h"
NewFileInclude2=#include "chitem.h"
@@ -232,132 +232,132 @@
Resource123=IDD_GAMEGENERAL
Class98=IcewindCre
Resource124=IDR_SHORTCUT
-Resource125=IDR_CHUI (English (U.S.))
-Resource126=IDD_AREAAMBIENT (English (U.S.))
-Resource127=IDR_GAME (English (U.S.))
-Resource128=IDD_POLYGON (English (U.S.))
-Resource129=IDD_EFFEDIT (English (U.S.))
-Resource130=IDR_CHITIN (English (U.S.))
-Resource131=IDR_WORLDMAP (English (U.S.))
-Resource132=IDD_CHITEM_DIALOG (English (U.S.))
-Resource133=IDR_SRC (English (U.S.))
-Resource134=IDD_KEYEDIT (English (U.S.))
-Resource135=IDD_PROJEDIT (English (U.S.))
-Resource136=IDD_AREAEDIT (English (U.S.))
-Resource137=IDD_PROJEXT (English (U.S.))
-Resource138=IDD_SPELLGENERAL (English (U.S.))
-Resource139=IDD_SPELLTOOL (English (U.S.))
+Resource125=IDD_STRREFDLG (English (U.S.))
+Resource126=IDD_ITEMGENERAL (English (U.S.))
+Resource127=IDD_MOSEDIT (English (U.S.))
+Resource128=IDD_COMPAT (English (U.S.))
+Resource129=IDD_AREATRIGGERSTRINGS (English (U.S.))
+Resource130=IDD_MUSEDIT (English (U.S.))
+Resource131=IDD_EXTRACT (English (U.S.))
+Resource132=IDD_MASSCLEAR (English (U.S.))
+Resource133=IDD_SAVHANDLE (English (U.S.))
+Resource134=IDD_SCHEDULE (English (U.S.))
+Resource135=IDD_SPELLDESC (English (U.S.))
+Resource136=IDR_IDS (English (U.S.))
+Resource137=IDD_PROJEDIT (English (U.S.))
+Resource138=IDR_STORE (English (U.S.))
+Resource139=IDD_CREATURESKILLS (English (U.S.))
Resource140=IDD_ITEMUSE (English (U.S.))
Resource141=IDR_MUSIC (English (U.S.))
-Resource142=IDD_AREAINT (English (U.S.))
-Resource143=IDD_AREACONTAINER (English (U.S.))
-Resource144=IDD_CREATUREEFF (English (U.S.))
-Resource145=IDD_WEDPOLY (English (U.S.))
-Resource146=IDD_BAMEDIT (English (U.S.))
-Resource147=IDR_IDS (English (U.S.))
-Resource148=IDR_SPELL (English (U.S.))
-Resource149=IDD_AREAMAP (English (U.S.))
-Resource150=IDD_PALETTE (English (U.S.))
-Resource151=IDR_CREATURE (English (U.S.))
-Resource152=IDD_MUSEDIT (English (U.S.))
-Resource153=IDD_MAPEDIT (English (U.S.))
-Resource154=IDD_ABOUTBOX (English (U.S.))
-Resource155=IDD_EDIT (English (U.S.))
-Resource156=IDD_STOREITEMS (English (U.S.))
-Resource157=IDD_SPELLEQUIP (English (U.S.))
-Resource158=IDD_ADDLINK (English (U.S.))
-Resource159=IDD_AREATRIGGERSTRINGS (English (U.S.))
-Resource160=IDD_CREATURESKILLS (English (U.S.))
-Resource161=IDR_VVC (English (U.S.))
-Resource162=IDD_SEARCHNODE (English (U.S.))
-Resource163=IDR_PROJECT (English (U.S.))
-Resource164=IDD_ITEMEFFECT (English (U.S.))
-Resource165=IDD_GAMEGENERAL (English (U.S.))
-Resource166=IDD_GAMEEDIT (English (U.S.))
-Resource167=IDD_AREAANIM (English (U.S.))
-Resource168=IDR_STORE (English (U.S.))
-Resource169=IDD_AREAENTRANCE (English (U.S.))
-Resource170=IDD_AREAACTOR (English (U.S.))
-Resource171=IDD_STOREEXTRA (English (U.S.))
-Resource172=IDD_CREATURESTRINGS (English (U.S.))
-Resource173=IDD_SAVHANDLE (English (U.S.))
-Resource174=IDD_MASSCLEAR (English (U.S.))
-Resource175=IDD_PANICBUTTON (English (U.S.))
-Resource176=IDD_CREATUREEDIT (English (U.S.))
-Resource177=IDD_CREATUREGENERAL (English (U.S.))
-Resource178=IDD_ITEMPICKER (English (U.S.))
-Resource179=IDD_FINDITEM (English (U.S.))
-Resource180=IDR_TLKMENU (English (U.S.))
-Resource181=IDD_AREAVARIABLE (English (U.S.))
-Resource182=IDD_SPELLEFFECT (English (U.S.))
-Resource183=IDD_IAPDIALOG (English (U.S.))
-Resource184=IDD_CREATUREPST (English (U.S.))
-Resource185=IDD_IDSEDIT (English (U.S.))
-Resource186=IDD_SPELLEDIT (English (U.S.))
-Resource187=IDD_CREATUREIWD (English (U.S.))
-Resource188=IDR_BAMMENU (English (U.S.))
-Resource189=IDD_GAMEPCINFO (English (U.S.))
-Resource190=IDD_2DAEDIT (English (U.S.))
-Resource191=IDD_AREATRIGGER (English (U.S.))
-Resource192=IDD_WEDTILE (English (U.S.))
-Resource193=IDD_SCRIPTEDIT (English (U.S.))
-Resource194=IDD_ITEMEDIT (English (U.S.))
-Resource195=IDD_AREADOOR (English (U.S.))
-Resource196=IDD_CHUIEDIT (English (U.S.))
-Resource197=IDD_SRCEDIT (English (U.S.))
-Resource198=IDR_TILE (English (U.S.))
-Resource199=IDD_CREATUREICONS (English (U.S.))
-Resource200=IDD_CREATUREOVR (English (U.S.))
-Resource201=IDR_2DA (English (U.S.))
-Resource202=IDD_EXTRACT (English (U.S.))
-Resource203=IDD_CREATUREUNKNOWN (English (U.S.))
-Resource204=IDD_PROGRESS (English (U.S.))
-Resource205=IDD_SHOWLOG (English (U.S.))
-Resource206=IDD_WEIDU (English (U.S.))
-Resource207=IDD_ITEMDESC (English (U.S.))
-Resource208=IDD_AREASPAWN (English (U.S.))
-Resource209=IDD_STORERENTAL (English (U.S.))
-Resource210=IDD_VVCEDIT (English (U.S.))
-Resource211=IDD_ITEMGENERAL (English (U.S.))
-Resource212=IDD_STOREGENERAL (English (U.S.))
-Resource213=IDD_STRREFDLG (English (U.S.))
-Resource214=IDD_CHECK (English (U.S.))
-Resource215=IDR_MENUBAR (English (U.S.))
-Resource216=IDD_TEXTVIEW (English (U.S.))
-Resource217=IDR_WEDMENU (English (U.S.))
-Resource218=IDD_STOREEDIT (English (U.S.))
-Resource219=IDD_SPELLDESC (English (U.S.))
-Resource220=IDR_TREEMENU (English (U.S.))
-Resource221=IDD_AREASONGS (English (U.S.))
-Resource222=IDD_EXTRACT2 (English (U.S.))
-Resource223=IDD_COMPAT (English (U.S.))
-Resource224=IDD_ITEMICONS (English (U.S.))
-Resource225=IDD_CREATUREITEMS (English (U.S.))
-Resource226=IDD_AREAGENERAL (English (U.S.))
-Resource227=IDR_ITEM (English (U.S.))
-Resource228=IDD_CREATURERES (English (U.S.))
-Resource229=IDR_EFFECT (English (U.S.))
-Resource230=IDD_DIALOGEDIT (English (U.S.))
-Resource231=IDD_MAPLINK (English (U.S.))
-Resource232=IDD_ITEMEXTRA (English (U.S.))
-Resource233=IDD_WEDEDIT (English (U.S.))
-Resource234=IDD_CFB (English (U.S.))
-Resource235=IDD_GAMESTATS (English (U.S.))
-Resource236=IDD_STOREDRINKS (English (U.S.))
-Resource237=IDD_ITEMEQUIP (English (U.S.))
-Resource238=IDD_MOSEDIT (English (U.S.))
-Resource239=IDD_SCHEDULE (English (U.S.))
-Resource240=IDD_IMAGEVIEW (English (U.S.))
-Resource241=IDD_VARIABLES (English (U.S.))
-Resource242=IDR_SCRIPT (English (U.S.))
-Resource243=IDD_SPELLEXTRA (English (U.S.))
-Resource244=IDD_CREATUREIWD2 (English (U.S.))
-Resource245=IDD_TISDIALOG (English (U.S.))
+Resource142=IDD_ITEMICONS (English (U.S.))
+Resource143=IDR_SCRIPT (English (U.S.))
+Resource144=IDR_WORLDMAP (English (U.S.))
+Resource145=IDD_AREAGENERAL (English (U.S.))
+Resource146=IDD_ITEMDESC (English (U.S.))
+Resource147=IDD_AREAANIM (English (U.S.))
+Resource148=IDD_SPELLEQUIP (English (U.S.))
+Resource149=IDD_CREATUREEDIT (English (U.S.))
+Resource150=IDR_SPELL (English (U.S.))
+Resource151=IDD_MAPLINK (English (U.S.))
+Resource152=IDD_CREATUREEFF (English (U.S.))
+Resource153=IDD_STOREGENERAL (English (U.S.))
+Resource154=IDD_WEDPOLY (English (U.S.))
+Resource155=IDD_AREAINT (English (U.S.))
+Resource156=IDD_CREATUREIWD (English (U.S.))
+Resource157=IDR_CREATURE (English (U.S.))
+Resource158=IDD_CFB (English (U.S.))
+Resource159=IDD_STOREEXTRA (English (U.S.))
+Resource160=IDD_CHITEM_DIALOG (English (U.S.))
+Resource161=IDD_EDIT (English (U.S.))
+Resource162=IDR_VVC (English (U.S.))
+Resource163=IDD_IAPDIALOG (English (U.S.))
+Resource164=IDD_STOREDRINKS (English (U.S.))
+Resource165=IDD_CREATUREUNKNOWN (English (U.S.))
+Resource166=IDR_CHUI (English (U.S.))
+Resource167=IDD_SPELLGENERAL (English (U.S.))
+Resource168=IDD_PROJEXT (English (U.S.))
+Resource169=IDR_SRC (English (U.S.))
+Resource170=IDD_SCRIPTEDIT (English (U.S.))
+Resource171=IDR_TREEMENU (English (U.S.))
+Resource172=IDD_PROGRESS (English (U.S.))
+Resource173=IDD_ITEMEDIT (English (U.S.))
+Resource174=IDD_ITEMEQUIP (English (U.S.))
+Resource175=IDD_AREAENTRANCE (English (U.S.))
+Resource176=IDD_WEIDU (English (U.S.))
+Resource177=IDD_IMAGEVIEW (English (U.S.))
+Resource178=IDD_POLYGON (English (U.S.))
+Resource179=IDD_WEDTILE (English (U.S.))
+Resource180=IDR_2DA (English (U.S.))
+Resource181=IDD_ITEMPICKER (English (U.S.))
+Resource182=IDR_TLKMENU (English (U.S.))
+Resource183=IDD_BAMEDIT (English (U.S.))
+Resource184=IDD_CREATURERES (English (U.S.))
+Resource185=IDD_AREAAMBIENT (English (U.S.))
+Resource186=IDD_AREAMAP (English (U.S.))
+Resource187=IDR_MENUBAR (English (U.S.))
+Resource188=IDD_AREAVARIABLE (English (U.S.))
+Resource189=IDD_AREASONGS (English (U.S.))
+Resource190=IDD_CREATUREICONS (English (U.S.))
+Resource191=IDR_WEDMENU (English (U.S.))
+Resource192=IDD_AREAEDIT (English (U.S.))
+Resource193=IDD_CHECK (English (U.S.))
+Resource194=IDD_GAMEEDIT (English (U.S.))
+Resource195=IDD_ITEMEFFECT (English (U.S.))
+Resource196=IDD_AREATRIGGER (English (U.S.))
+Resource197=IDD_IDSEDIT (English (U.S.))
+Resource198=IDD_CREATURESTRINGS (English (U.S.))
+Resource199=IDD_VVCEDIT (English (U.S.))
+Resource200=IDD_AREAACTOR (English (U.S.))
+Resource201=IDD_GAMEGENERAL (English (U.S.))
+Resource202=IDD_TEXTVIEW (English (U.S.))
+Resource203=IDD_FINDITEM (English (U.S.))
+Resource204=IDD_KEYEDIT (English (U.S.))
+Resource205=IDR_AREA (English (U.S.))
+Resource206=IDD_VARIABLES (English (U.S.))
+Resource207=IDD_TISDIALOG (English (U.S.))
+Resource208=IDR_CHITIN (English (U.S.))
+Resource209=IDD_CREATUREOVR (English (U.S.))
+Resource210=IDD_CREATUREPST (English (U.S.))
+Resource211=IDD_CHUIEDIT (English (U.S.))
+Resource212=IDD_GAMEPCINFO (English (U.S.))
+Resource213=IDD_ADDLINK (English (U.S.))
+Resource214=IDD_SEARCHNODE (English (U.S.))
+Resource215=IDD_AREADOOR (English (U.S.))
+Resource216=IDD_STOREITEMS (English (U.S.))
+Resource217=IDD_ITEMEXTRA (English (U.S.))
+Resource218=IDD_COLORPICKER (English (U.S.))
+Resource219=IDR_GAME (English (U.S.))
+Resource220=IDD_DIALOGEDIT (English (U.S.))
+Resource221=IDR_EFFECT (English (U.S.))
+Resource222=IDR_PROJECT (English (U.S.))
+Resource223=IDD_PANICBUTTON (English (U.S.))
+Resource224=IDD_SRCEDIT (English (U.S.))
+Resource225=IDD_SPELLEFFECT (English (U.S.))
+Resource226=IDD_STOREEDIT (English (U.S.))
+Resource227=IDD_SPELLEXTRA (English (U.S.))
+Resource228=IDR_ITEM (English (U.S.))
+Resource229=IDD_2DAEDIT (English (U.S.))
+Resource230=IDD_SPELLEDIT (English (U.S.))
+Resource231=IDD_EFFEDIT (English (U.S.))
+Resource232=IDR_BAMMENU (English (U.S.))
+Resource233=IDD_EXTRACT2 (English (U.S.))
+Resource234=IDD_GAMESTATS (English (U.S.))
+Resource235=IDD_SHOWLOG (English (U.S.))
+Resource236=IDD_CREATUREGENERAL (English (U.S.))
+Resource237=IDD_CREATUREITEMS (English (U.S.))
+Resource238=IDD_STORERENTAL (English (U.S.))
+Resource239=IDR_TILE (English (U.S.))
+Resource240=IDD_WEDEDIT (English (U.S.))
+Resource241=IDD_CREATUREIWD2 (English (U.S.))
+Resource242=IDD_AREASPAWN (English (U.S.))
+Resource243=IDD_SPELLTOOL (English (U.S.))
+Resource244=IDD_AREACONTAINER (English (U.S.))
+Resource245=IDD_ABOUTBOX (English (U.S.))
Class99=CAreaTriggerString
Class100=CPCInfo
-Resource246=IDR_AREA (English (U.S.))
+Resource246=IDD_MAPEDIT (English (U.S.))
Class101=CCreatureOverlay
-Resource247=IDD_COLORPICKER (English (U.S.))
+Resource247=IDD_PALETTE (English (U.S.))
Class102=IWD2Creature
Resource248=IDR_SHORTCUT (English (U.S.))
@@ -703,7 +703,7 @@
HeaderFile=ItemProperties.h
ImplementationFile=ItemProperties.cpp
BaseClass=CPropertyPage
-LastObject=IDC_EXTADD
+LastObject=CItemExtended
Filter=D
VirtualFilter=idWC
@@ -2704,7 +2704,7 @@
Control19=IDC_THAC0,edit,1350631552
Control20=IDC_NUMATTACKS,combobox,1344339970
Control21=IDC_IDSRACE,combobox,1344340226
-Control22=IDC_KIT,edit,1350631552
+Control22=IDC_KIT,combobox,1350631552
Control23=IDC_CURRXP,edit,1350639744
Control24=IDC_MAXHP,edit,1350631552
Control25=IDC_HATED,combobox,1344340226
@@ -2758,7 +2758,7 @@
BaseClass=CPropertyPage
Filter=D
VirtualFilter=dWC
-LastObject=IDC_ANIMATION
+LastObject=IDC_KIT
[DLG:IDD_CREATUREICONS]
Type=1
@@ -7468,20 +7468,20 @@
Control19=IDC_THAC0,edit,1350631552
Control20=IDC_NUMATTACKS,combobox,1344339970
Control21=IDC_IDSRACE,combobox,1344340226
-Control22=IDC_KIT,edit,1350631552
-Control23=IDC_CURRXP,edit,1350639744
-Control24=IDC_MAXHP,edit,1350631552
-Control25=IDC_HATED,combobox,1344340226
-Control26=IDC_IDSCLASS,combobox,1344340226
-Control27=IDC_GOLD,edit,1350631552
-Control28=IDC_MORALE,edit,1350631552
-Control29=IDC_MRECOVERY,edit,1350631552
-Control30=IDC_MBREAK,edit,1350631552
-Control31=IDC_IDSSPECIFIC,combobox,1344340226
-Control32=IDC_V10,button,1342181385
-Control33=IDC_V12,button,1342181385
-Control34=IDC_V22,button,1342181385
-Control35=IDC_V90,button,1342181385
+Control22=IDC_CURRXP,edit,1350639744
+Control23=IDC_MAXHP,edit,1350631552
+Control24=IDC_HATED,combobox,1344340226
+Control25=IDC_IDSCLASS,combobox,1344340226
+Control26=IDC_GOLD,edit,1350631552
+Control27=IDC_MORALE,edit,1350631552
+Control28=IDC_MRECOVERY,edit,1350631552
+Control29=IDC_MBREAK,edit,1350631552
+Control30=IDC_IDSSPECIFIC,combobox,1344340226
+Control31=IDC_V10,button,1342181385
+Control32=IDC_V12,button,1342181385
+Control33=IDC_V22,button,1342181385
+Control34=IDC_V90,button,1342181385
+Control35=IDC_STATIC,static,1342308352
Control36=IDC_STATIC,static,1342308352
Control37=IDC_STATIC,static,1342308352
Control38=IDC_STATIC,static,1342308352
@@ -7506,14 +7506,14 @@
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
+Control60=IDC_STATIC,button,1342210055
+Control61=IDC_STATIC,static,1342308352
Control62=IDC_STATIC,static,1342308352
Control63=IDC_STATIC,static,1342308352
Control64=IDC_STATIC,static,1342308352
-Control65=IDC_STATIC,static,1342308352
-Control66=IDC_NEW1,button,1342242816
-Control67=IDC_NEW2,button,1342242816
+Control65=IDC_NEW1,button,1342242816
+Control66=IDC_NEW2,button,1342242816
+Control67=IDC_KIT,combobox,1344340034
[DLG:IDD_CREATUREICONS (English (U.S.))]
Type=1
@@ -9366,7 +9366,7 @@
[DLG:IDD_GAMEGENERAL (English (U.S.))]
Type=1
Class=CGameGeneral
-ControlCount=36
+ControlCount=38
Control1=IDC_STARTAREA,edit,1350631560
Control2=IDC_GAMETIME,edit,1350631552
Control3=IDC_GOLD,edit,1350631552
@@ -9403,6 +9403,8 @@
Control34=IDC_BROWSE2,button,1342242816
Control35=IDC_AREA,edit,1350631560
Control36=IDC_STATIC,static,1342308352
+Control37=IDC_REALTIME,edit,1350631552
+Control38=IDC_STATIC,static,1342308352
[DLG:IDD_GAMEPCINFO (English (U.S.))]
Type=1
@@ -10053,19 +10055,18 @@
[DLG:IDD_CREATUREOVR (English (U.S.))]
Type=1
Class=CCreatureOverlay
-ControlCount=12
-Control1=IDC_OVERLAYPICKER,combobox,1344339971
+ControlCount=11
+Control1=IDC_OVERLAYPICKER,combobox,1344339970
Control2=IDC_BAM,edit,1350631560
Control3=IDC_BROWSE,button,1342242816
-Control4=IDC_TIMING,edit,1350639744
+Control4=IDC_TIMING,edit,1350631552
Control5=IDC_TYPE,edit,1350631552
Control6=IDC_CLEAR,button,1342242816
-Control7=65535,static,1342308352
-Control8=65535,static,1342308352
-Control9=65535,static,1342308352
-Control10=65535,static,1342308352
-Control11=65535,static,1342308352
-Control12=IDOK,button,1342242816
+Control7=IDC_STATIC,static,1342308352
+Control8=IDC_STATIC,static,1342308352
+Control9=IDC_STATIC,static,1342308352
+Control10=IDC_STATIC,static,1342308352
+Control11=IDOK,button,1342242816
[CLS:CCreatureOverlay]
Type=0
@@ -10073,7 +10074,7 @@
ImplementationFile=CreatureOverlay.cpp
BaseClass=CDialog
Filter=D
-LastObject=CCreatureOverlay
+LastObject=IDC_BAM
VirtualFilter=dWC
[DLG:IDD_CREATUREIWD2 (English (U.S.))]
Modified: chitem/trunk/chitem.dsp
===================================================================
--- chitem/trunk/chitem.dsp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/chitem.dsp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -309,6 +309,10 @@
# End Source File
# Begin Source File
+SOURCE=.\MyFileDialog.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\oct_quan.cpp
# End Source File
# Begin Source File
@@ -718,6 +722,10 @@
# End Source File
# Begin Source File
+SOURCE=.\MyFileDialog.h
+# End Source File
+# Begin Source File
+
SOURCE=.\oct_quan.h
# End Source File
# Begin Source File
Modified: chitem/trunk/chitem.rc
===================================================================
--- chitem/trunk/chitem.rc 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/chitem.rc 2007-05-06 20:05:28 UTC (rev 4645)
@@ -1865,8 +1865,8 @@
LTEXT "Wedfile",IDC_STATIC,7,7,25,8
GROUPBOX "BG1 Area fields",IDC_STATIC,7,33,101,159,BS_FLAT
LTEXT "North",IDC_STATIC,11,45,18,8
- LTEXT "East",IDC_STATIC,11,135,15,8
- LTEXT "West",IDC_STATIC,11,75,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
@@ -2434,7 +2434,6 @@
WS_TABSTOP
COMBOBOX IDC_IDSRACE,202,114,93,161,CBS_DROPDOWN | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
- EDITTEXT IDC_KIT,300,114,93,14,ES_AUTOHSCROLL
EDITTEXT IDC_CURRXP,7,146,40,14,ES_AUTOHSCROLL | ES_NUMBER
EDITTEXT IDC_MAXHP,55,146,40,14,ES_AUTOHSCROLL
COMBOBOX IDC_HATED,104,147,93,182,CBS_DROPDOWN | CBS_SORT |
@@ -2487,6 +2486,8 @@
LTEXT "IWD",IDC_STATIC,334,172,16,8
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
END
IDD_CREATUREICONS DIALOG DISCARDABLE 0, 0, 400, 199
@@ -4904,7 +4905,7 @@
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTROLPARENT
CAPTION "Edit general game data"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
BEGIN
EDITTEXT IDC_STARTAREA,7,19,48,14,ES_UPPERCASE | ES_AUTOHSCROLL
EDITTEXT IDC_GAMETIME,115,19,48,14,ES_AUTOHSCROLL
@@ -4951,6 +4952,8 @@
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
+ LTEXT "Realtime",IDC_STATIC,115,37,28,8
END
IDD_GAMEPCINFO DIALOG DISCARDABLE 0, 0, 313, 259
@@ -5124,7 +5127,26 @@
LTEXT "0 set",IDC_COUNT,171,66,57,8
END
+IDD_CREATUREOVR DIALOG DISCARDABLE 0, 0, 200, 137
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "PST creature overlays"
+FONT 8, "MS Sans Serif"
+BEGIN
+ COMBOBOX IDC_OVERLAYPICKER,7,22,186,114,CBS_DROPDOWN | WS_VSCROLL |
+ WS_TABSTOP
+ EDITTEXT IDC_BAM,7,56,63,14,ES_UPPERCASE | ES_AUTOHSCROLL
+ PUSHBUTTON "Browse",IDC_BROWSE,79,55,43,14
+ EDITTEXT IDC_TIMING,7,92,38,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_TYPE,58,92,38,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Clear",IDC_CLEAR,139,55,43,14
+ LTEXT "Type",IDC_STATIC,7,81,17,8
+ LTEXT "Timing",IDC_STATIC,58,80,22,8
+ LTEXT "Select overlay",IDC_STATIC,7,7,46,8
+ LTEXT "Animation",IDC_STATIC,7,44,32,8
+ PUSHBUTTON "Back",IDOK,75,116,50,14
+END
+
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
@@ -5924,6 +5946,14 @@
TOPMARGIN, 7
BOTTOMMARGIN, 183
END
+
+ IDD_CREATUREOVR, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 193
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 130
+ END
END
#endif // APSTUDIO_INVOKED
@@ -5973,8 +6003,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 7,0,0,8
- PRODUCTVERSION 7,0,0,8
+ FILEVERSION 7,0,0,9
+ PRODUCTVERSION 7,0,0,9
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -5992,14 +6022,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, 8\0"
+ VALUE "FileVersion", "7, 0, 0, 9\0"
VALUE "InternalName", "dltcep\0"
VALUE "LegalCopyright", "Copyright (C) 2002-2007 Avenger\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "chitem.EXE\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "DLTC Editor Pro 7.0h\0"
- VALUE "ProductVersion", "7, 0, 0, 8\0"
+ VALUE "ProductName", "DLTC Editor Pro 7.0i\0"
+ VALUE "ProductVersion", "7, 0, 0, 9\0"
VALUE "SpecialBuild", "\0"
END
END
Modified: chitem/trunk/chitemDlg.cpp
===================================================================
--- chitem/trunk/chitemDlg.cpp 2007-05-06 10:19:32 UTC (rev 4644)
+++ chitem/trunk/chitemDlg.cpp 2007-05-06 20:05:28 UTC (rev 4645)
@@ -3,7 +3,7 @@
#include "stdafx.h"
-#define PRG_VERSION "7.0h"
+#define PRG_VERSION "7.0j"
#include <fcntl.h>
#include <direct.h>
@@ -23,6 +23,7 @@
#include "Bif.h"
#include "tispack.h"
#include "TextView.h"
+#include "MyFileDialog.h"
//editors
#include "ItemEdit.h"
@@ -3090,8 +3091,7 @@
return;
}
res=OFN_FILEMUSTEXIST|OFN_ALLOWMULTISELECT|OFN_HIDEREADONLY|OFN_ENABLESIZING;
- CFileDialog m_getfiledlg(TRUE, "d", bgfolder+weidudecompiled+"\\*.d;*.baf", res, szFilterWeiduAll);
- HackForLargeList(m_getfiledlg);
+ CMyFileDialog m_getfiledlg(TRUE, "d", bgfolder+weidudecompiled+"\\*.d;*.baf", res, szFilterWeiduAll);
m_getfiledlg.m_ofn.lpstrTitle="...
[truncated message content] |