Menu
▾
▴
[Gemrb-commits] dltcep: branch master updated. d6df6ff8588d095c8085cd817b59b9c964ceddbf
|
From: Laszlo T. <ave...@us...> - 2011-05-15 10:52:44
|
dltcep: Viewer and editor for Infinity Engine data files
The branch master has been updated
via d6df6ff8588d095c8085cd817b59b9c964ceddbf (commit)
Summary of changes:
Chitem.h | 27 +++---
ProjEdit.cpp | 20 +++--
ProjEdit.h | 1 +
ProjGemRB.cpp | 26 +++++-
ProjGemRB.h | 1 +
Structs.h | 4 +-
chitem.clw | 279 +++++++++++++++++++++++++++++----------------------------
chitem.rc | 127 ++++++++++++++------------
resource.h | 2 +
9 files changed, 267 insertions(+), 220 deletions(-)
from 6bdbaac40f61792b9e267061d0dbc138d44215b4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/dltcep;a=commitdiff;h=d6df6ff8588d095c8085cd817b59b9c964ceddbf
commit d6df6ff8588d095c8085cd817b59b9c964ceddbf
Author: Avenger <ave...@so...>
Date: Sun May 15 12:52:11 2011 +0200
dltcep update
diff --git a/Chitem.h b/Chitem.h
index 36a09d3..6e21403 100644
--- a/Chitem.h
+++ b/Chitem.h
@@ -542,7 +542,7 @@ extern CString DELETED_REFERENCE;
#define PROJ_TRANSLUCENT 256 //half-transparent travel projectile
#define PROJ_TINTED 512 //tinted by gradient (better than paletted animations)
#define PROJ_ITERATION 1024 //create another projectile with projectile ID-1
-#define PROJ_TILE 2048 //place the travel bam all over the AOE
+#define PROJ_DEFSPELL 2048 //always apply default spell on caster
#define PROJ_FALLING 4096 //the projectile will fall from above target (y=target.y, x=target-100)
#define PROJ_INCOMING 8192 //the projectile will fall from above caster (y=caster.y, x=target-100)
#define PROJ_LINE 16384 //solid line from source to target (ignore caster)
@@ -562,18 +562,19 @@ extern CString DELETED_REFERENCE;
#define PROJ_DELAY 0x10000000//delay payload until initial animation finishes
//extended area flags for gemrb
-#define APF_TINT 1 //use tint for spread animation
-#define APF_FILL 2 //fill entire area
-#define APF_SCATTER 4 //start scattered
-#define APF_VVCPAL 8 //use palette for central animation
-#define APF_SPREAD 16 //refill emptied slots
-#define APF_PALETTE 32 //use palette gradient for spread animation
-#define APF_BOTH 64 //halve projectile count and draw both animations
-#define APF_MORE 128 //double child projectile count
-#define APF_FAILSPELL 256 //apply spell on caster if no one was hit
-#define APF_MULTIPLE 512 //shoot multiple single projectiles (based on cone width)
-#define APF_COUNT_HD 0x400//count enemies' HD (only if affect one is set)
-#define APF_REVERSE 0x800//reverse targeting of enemy and ally (party only/enemy)
+#define APF_TINT 1 //use tint for spread animation
+#define APF_FILL 2 //fill entire area
+#define APF_SCATTER 4 //start scattered
+#define APF_VVCPAL 8 //use palette for central animation
+#define APF_SPREAD 16 //refill emptied slots
+#define APF_PALETTE 32 //use palette gradient for spread animation
+#define APF_BOTH 64 //halve projectile count and draw both animations
+#define APF_MORE 128 //double child projectile count
+#define APF_FAILSPELL 256 //apply spell on caster if no one was hit
+#define APF_MULTIPLE 512 //shoot multiple single projectiles (based on cone width)
+#define APF_COUNT_HD 0x400 //count enemies' HD (only if affect one is set)
+#define APF_REVERSE 0x800 //reverse targeting of enemy and ally (party only/enemy)
+#define APF_TILE 0x1000//place the spread animation all over the AOE (cone is honoured)
#define TRANSPARENT_GREEN 0x00ff00
diff --git a/ProjEdit.cpp b/ProjEdit.cpp
index 0527ce1..5993ba1 100644
--- a/ProjEdit.cpp
+++ b/ProjEdit.cpp
@@ -160,7 +160,7 @@ void CProjEdit::DoDataExchange(CDataExchange* pDX)
}
j=1;
- for(i=0;i<5;i++)
+ for(i=0;i<6;i++)
{
cb=(CButton *) GetDlgItem(IDC_FLAG1+i);
if(cb)
@@ -200,6 +200,10 @@ BEGIN_MESSAGE_MAP(CProjEdit, CDialog)
ON_COMMAND(ID_FILE_NEW, OnNew)
ON_BN_CLICKED(IDC_FLAG1, OnFlag1)
ON_BN_CLICKED(IDC_FLAG2, OnFlag2)
+ ON_BN_CLICKED(IDC_FLAG3, OnFlag3)
+ ON_BN_CLICKED(IDC_FLAG4, OnFlag4)
+ ON_BN_CLICKED(IDC_FLAG5, OnFlag5)
+ ON_BN_CLICKED(IDC_FLAG6, OnFlag6)
ON_BN_CLICKED(IDC_BROWSE1, OnBrowse1)
ON_BN_CLICKED(IDC_PLAY1, OnPlay1)
ON_BN_CLICKED(IDC_PLAY2, OnPlay2)
@@ -216,8 +220,6 @@ BEGIN_MESSAGE_MAP(CProjEdit, CDialog)
ON_BN_CLICKED(IDC_ATTR6, OnAttr6)
ON_BN_CLICKED(IDC_ATTR7, OnAttr7)
ON_BN_CLICKED(IDC_ATTR8, OnAttr8)
- ON_BN_CLICKED(IDC_MPSMOKE, OnMpsmoke)
- ON_BN_CLICKED(IDC_MPTRAVEL, OnMptravel)
ON_BN_CLICKED(IDC_ATTR9, OnAttr9)
ON_BN_CLICKED(IDC_ATTR10, OnAttr10)
ON_BN_CLICKED(IDC_ATTR11, OnAttr11)
@@ -226,10 +228,11 @@ BEGIN_MESSAGE_MAP(CProjEdit, CDialog)
ON_BN_CLICKED(IDC_ATTR14, OnAttr14)
ON_BN_CLICKED(IDC_ATTR15, OnAttr15)
ON_BN_CLICKED(IDC_ATTR16, OnAttr16)
+ ON_BN_CLICKED(IDC_MPSMOKE, OnMpsmoke)
+ ON_BN_CLICKED(IDC_MPTRAVEL, OnMptravel)
ON_CBN_SELCHANGE(IDC_TYPE, OnSelchangeType)
ON_BN_CLICKED(IDC_EXTENSION, OnExtension)
ON_BN_CLICKED(IDC_UNKNOWN154, OnUnknown154)
- ON_BN_CLICKED(IDC_FLAG3, OnFlag3)
ON_COMMAND(ID_CHECK, OnCheck)
ON_COMMAND(ID_FILE_SAVE, OnSave)
ON_BN_CLICKED(IDC_UNKNOWN2C, OnUnknown2c)
@@ -247,11 +250,9 @@ BEGIN_MESSAGE_MAP(CProjEdit, CDialog)
ON_EN_SETFOCUS(IDC_U15, OnSetfocusU15)
ON_EN_SETFOCUS(IDC_U16, OnSetfocusU16)
ON_EN_SETFOCUS(IDC_U17, OnSetfocusU17)
- ON_BN_CLICKED(IDC_FLAG5, OnFlag5)
ON_BN_CLICKED(IDC_BROWSE7, OnBrowse7)
ON_BN_CLICKED(IDC_BROWSE8, OnBrowse8)
ON_BN_CLICKED(IDC_BROWSE13, OnBrowse9)
- ON_BN_CLICKED(IDC_FLAG4, OnFlag4)
ON_COMMAND(ID_FILE_TBG, OnFileTbg)
ON_COMMAND(ID_FILE_TP2, OnFileTp2)
ON_BN_CLICKED(IDC_LOAD, OnLoad)
@@ -589,6 +590,12 @@ void CProjEdit::OnFlag5()
UpdateData(UD_DISPLAY);
}
+void CProjEdit::OnFlag6()
+{
+ the_projectile.header.sparks^=32;
+ UpdateData(UD_DISPLAY);
+}
+
void CProjEdit::OnBrowse1()
{
pickerdlg.m_restype=REF_WAV;
@@ -1370,3 +1377,4 @@ void CProjEdit::OnFileTp2()
{
ExportTBG(this, REF_PRO, 1);
}
+
diff --git a/ProjEdit.h b/ProjEdit.h
index 2ce372f..943340f 100644
--- a/ProjEdit.h
+++ b/ProjEdit.h
@@ -114,6 +114,7 @@ protected:
afx_msg void OnFlag4();
afx_msg void OnFileTbg();
afx_msg void OnFileTp2();
+ afx_msg void OnFlag6();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
diff --git a/ProjGemRB.cpp b/ProjGemRB.cpp
index f87b6c7..d66d523 100644
--- a/ProjGemRB.cpp
+++ b/ProjGemRB.cpp
@@ -214,7 +214,8 @@ void CProjGemRB::OnFlag11()
void CProjGemRB::OnFlag12()
{
- the_projectile.header.extflags^=PROJ_TILE;
+ //unused bit
+ the_projectile.header.extflags^=PROJ_DEFSPELL;
UpdateData(UD_DISPLAY);
}
@@ -473,8 +474,10 @@ void CProjAreaGemRB::DoDataExchange(CDataExchange* pDX)
DDX_Text(pDX, IDC_COUNT, the_projectile.extension.dicecount);
DDX_Text(pDX, IDC_COUNT2, the_projectile.extension.dicesides);
-}
+ DDX_Text(pDX, IDC_TILEX, the_projectile.extension.tilex);
+ DDX_Text(pDX, IDC_TILEY, the_projectile.extension.tiley);
+}
BEGIN_MESSAGE_MAP(CProjAreaGemRB, CDialog)
//{{AFX_MSG_MAP(CProjAreaGemRB)
@@ -500,6 +503,9 @@ BEGIN_MESSAGE_MAP(CProjAreaGemRB, CDialog)
ON_EN_KILLFOCUS(IDC_BAM2, OnKillfocus)
ON_EN_KILLFOCUS(IDC_COUNT, OnKillfocus)
ON_EN_KILLFOCUS(IDC_COUNT2, OnKillfocus)
+ ON_EN_KILLFOCUS(IDC_TILEX, OnKillfocus)
+ ON_EN_KILLFOCUS(IDC_TILEY, OnKillfocus)
+ ON_BN_CLICKED(IDC_FLAG13, OnFlag13)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
@@ -572,13 +578,22 @@ void CProjAreaGemRB::OnFlag11()
UpdateData(UD_DISPLAY);
}
-
void CProjAreaGemRB::OnFlag12()
{
the_projectile.extension.gemrbflags^=APF_REVERSE;
UpdateData(UD_DISPLAY);
}
+void CProjAreaGemRB::OnFlag13()
+{
+ the_projectile.extension.gemrbflags^=APF_TILE;
+ int flag = the_projectile.extension.gemrbflags&APF_TILE;
+
+ GetDlgItem(IDC_TILEX)->EnableWindow(flag);
+ GetDlgItem(IDC_TILEY)->EnableWindow(flag);
+ UpdateData(UD_DISPLAY);
+}
+
void CProjAreaGemRB::OnKillfocus()
{
UpdateData(UD_RETRIEVE);
@@ -645,6 +660,11 @@ BOOL CProjAreaGemRB::OnInitDialog()
m_tooltip.AddTool(GetDlgItem(IDOK), IDS_CANCEL);
}
+ int flag = the_projectile.extension.gemrbflags&APF_TILE;
+
+ GetDlgItem(IDC_TILEX)->EnableWindow(flag);
+ GetDlgItem(IDC_TILEY)->EnableWindow(flag);
+
UpdateData(UD_DISPLAY);
return TRUE;
}
diff --git a/ProjGemRB.h b/ProjGemRB.h
index fbed589..17dbc56 100644
--- a/ProjGemRB.h
+++ b/ProjGemRB.h
@@ -128,6 +128,7 @@ protected:
afx_msg void OnFlag11();
afx_msg void OnFlag12();
virtual BOOL OnInitDialog();
+ afx_msg void OnFlag13();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
diff --git a/Structs.h b/Structs.h
index deea3e4..15f62a1 100644
--- a/Structs.h
+++ b/Structs.h
@@ -592,7 +592,9 @@ typedef struct {
long gemrbflags; //gemrb specific area flags 0x48
short dicecount;
short dicesides;
- char unknown45[184];
+ short tilex;
+ short tiley;
+ char unknown45[180];
} proj_extension;
typedef struct
diff --git a/chitem.clw b/chitem.clw
index ab6430b..9b861e6 100644
--- a/chitem.clw
+++ b/chitem.clw
@@ -2,7 +2,7 @@
[General Info]
Version=1
-LastClass=CAreaProj
+LastClass=CProjEdit
LastTemplate=CDialog
NewFileInclude1=#include "stdafx.h"
NewFileInclude2=#include "chitem.h"
@@ -232,142 +232,142 @@ Resource122=IDR_TLKMENU
Resource123=IDD_GAMEGENERAL
Class98=IcewindCre
Resource124=IDR_SHORTCUT
-Resource125=IDD_SHOWLOG (English (U.S.))
-Resource126=IDD_AREAEDIT (English (U.S.))
-Resource127=IDD_AREAAMBIENT (English (U.S.))
-Resource128=IDR_SCRIPT (English (U.S.))
-Resource129=IDR_SPELL (English (U.S.))
-Resource130=IDR_CHUI (English (U.S.))
-Resource131=IDD_AREAVARIABLE (English (U.S.))
-Resource132=IDD_CREATUREEFF (English (U.S.))
-Resource133=IDD_TEXTVIEW (English (U.S.))
-Resource134=IDD_ITEMEFFECT (English (U.S.))
-Resource135=IDD_WEDEDIT (English (U.S.))
-Resource136=IDR_GAME (English (U.S.))
-Resource137=IDD_SPELLTOOL (English (U.S.))
-Resource138=IDR_PROJECT (English (U.S.))
-Resource139=IDD_CHUIEDIT (English (U.S.))
-Resource140=IDR_MENUBAR (English (U.S.))
-Resource141=IDD_SPELLEQUIP (English (U.S.))
-Resource142=IDD_CREATUREPST (English (U.S.))
-Resource143=IDR_TREEMENU (English (U.S.))
-Resource144=IDD_AREAANIM (English (U.S.))
-Resource145=IDD_STRREFDLG (English (U.S.))
-Resource146=IDR_ITEM (English (U.S.))
-Resource147=IDD_EXTRACT2 (English (U.S.))
-Resource148=IDD_ITEMUSE (English (U.S.))
-Resource149=IDR_MUSIC (English (U.S.))
-Resource150=IDD_SPELLEFFECT (English (U.S.))
-Resource151=IDD_AREATRIGGERSTRINGS (English (U.S.))
-Resource152=IDD_PROJEDIT (English (U.S.))
-Resource153=IDD_SCRIPTEDIT (English (U.S.))
-Resource154=IDD_PROJEXT (English (U.S.))
-Resource155=IDD_AREAINT (English (U.S.))
-Resource156=IDD_WEIDU (English (U.S.))
-Resource157=IDD_EXTRACT (English (U.S.))
-Resource158=IDD_CREATUREOVR (English (U.S.))
-Resource159=IDD_PROJGEMRB (English (U.S.))
-Resource160=IDR_BAMMENU (English (U.S.))
-Resource161=IDD_CREATURESTRINGS (English (U.S.))
-Resource162=IDD_AREATRIGGER (English (U.S.))
-Resource163=IDR_SRC (English (U.S.))
-Resource164=IDD_ADDLINK (English (U.S.))
-Resource165=IDD_SAVHANDLE (English (U.S.))
-Resource166=IDD_CREATUREITEMS (English (U.S.))
-Resource167=IDD_BAMEDIT (English (U.S.))
-Resource168=IDD_AREADOOR (English (U.S.))
-Resource169=IDD_AREAENTRANCE (English (U.S.))
-Resource170=IDD_MUSEDIT (English (U.S.))
-Resource171=IDR_TILE (English (U.S.))
-Resource172=IDR_TLKMENU (English (U.S.))
-Resource173=IDD_CREATUREIWD2 (English (U.S.))
-Resource174=IDD_ITEMEDIT (English (U.S.))
-Resource175=IDD_AREAPROJ (English (U.S.))
-Resource176=IDD_IAPDIALOG (English (U.S.))
-Resource177=IDD_STOREITEMS (English (U.S.))
-Resource178=IDR_AREA (English (U.S.))
-Resource179=IDR_2DA (English (U.S.))
-Resource180=IDD_CREATUREGENERAL (English (U.S.))
-Resource181=IDD_EDIT (English (U.S.))
-Resource182=IDD_CREATUREEDIT (English (U.S.))
-Resource183=IDD_SCHEDULE (English (U.S.))
-Resource184=IDD_ANIMDIALOG
-Resource185=IDD_POLYGON (English (U.S.))
-Resource186=IDD_ITEMEXTRA (English (U.S.))
-Resource187=IDD_WEDTILE (English (U.S.))
-Resource188=IDR_IDS (English (U.S.))
-Resource189=IDD_ITEMPICKER (English (U.S.))
-Resource190=IDD_ITEMDESC (English (U.S.))
-Resource191=IDD_DIALOGEDIT (English (U.S.))
-Resource192=IDD_EFFEDIT (English (U.S.))
-Resource193=IDD_FINDITEM (English (U.S.))
-Resource194=IDD_CREATUREIWD (English (U.S.))
-Resource195=IDD_SEARCHNODE (English (U.S.))
-Resource196=IDD_COMPAT (English (U.S.))
-Resource197=IDD_AREASONGS (English (U.S.))
-Resource198=IDD_MOSEDIT (English (U.S.))
-Resource199=IDR_CREATURE (English (U.S.))
-Resource200=IDD_SPELLDESC (English (U.S.))
-Resource201=IDR_CHITIN (English (U.S.))
-Resource202=IDD_AREAACTOR (English (U.S.))
-Resource203=IDD_SPELLEXTRA (English (U.S.))
-Resource204=IDD_STOREEDIT (English (U.S.))
-Resource205=IDD_STOREGENERAL (English (U.S.))
-Resource206=IDD_AREACONTAINER (English (U.S.))
-Resource207=IDD_IMAGEVIEW (English (U.S.))
-Resource208=IDD_STORERENTAL (English (U.S.))
-Resource209=IDD_MAPLINK (English (U.S.))
-Resource210=IDD_ITEMEQUIP (English (U.S.))
-Resource211=IDD_STOREDRINKS (English (U.S.))
-Resource212=IDD_VARIABLES (English (U.S.))
-Resource213=IDD_STOREEXTRA (English (U.S.))
-Resource214=IDD_ITEMGENERAL (English (U.S.))
-Resource215=IDD_VVCEDIT (English (U.S.))
-Resource216=IDD_GAMEGENERAL (English (U.S.))
-Resource217=IDD_2DAEDIT (English (U.S.))
-Resource218=IDD_MAPEDIT (English (U.S.))
-Resource219=IDR_WORLDMAP (English (U.S.))
-Resource220=IDD_CFB (English (U.S.))
-Resource221=IDD_ITEMICONS (English (U.S.))
-Resource222=IDR_WEDMENU (English (U.S.))
-Resource223=IDR_STORE (English (U.S.))
-Resource224=IDD_PALETTE (English (U.S.))
-Resource225=IDD_SPELLGENERAL (English (U.S.))
-Resource226=IDD_CHITEM_DIALOG (English (U.S.))
-Resource227=IDD_CREATURESKILLS (English (U.S.))
-Resource228=IDD_MASSCLEAR (English (U.S.))
-Resource229=IDD_COLORPICKER (English (U.S.))
-Resource230=IDD_AREAGENERAL (English (U.S.))
-Resource231=IDD_WEDPOLY (English (U.S.))
-Resource232=IDD_PROGRESS (English (U.S.))
-Resource233=IDD_CREATURERES (English (U.S.))
-Resource234=IDD_TISDIALOG (English (U.S.))
-Resource235=IDD_SRCEDIT (English (U.S.))
-Resource236=IDD_CREATURELEVELS (English (U.S.))
-Resource237=IDD_GAMEEDIT (English (U.S.))
-Resource238=IDD_IDSEDIT (English (U.S.))
-Resource239=IDD_AREAMAP (English (U.S.))
-Resource240=IDR_VVC (English (U.S.))
-Resource241=IDD_SPELLEDIT (English (U.S.))
-Resource242=IDD_GAMESTATS (English (U.S.))
-Resource243=IDD_CREATUREICONS (English (U.S.))
-Resource244=IDD_CHECK (English (U.S.))
-Resource245=IDD_ABOUTBOX (English (U.S.))
+Resource125=IDD_SEARCHNODE (English (U.S.))
+Resource126=IDR_TREEMENU (English (U.S.))
+Resource127=IDR_MUSIC (English (U.S.))
+Resource128=IDD_CREATUREIWD2 (English (U.S.))
+Resource129=IDD_CREATURESTRINGS (English (U.S.))
+Resource130=IDD_CREATUREITEMS (English (U.S.))
+Resource131=IDR_WEDMENU (English (U.S.))
+Resource132=IDD_EFFEDIT (English (U.S.))
+Resource133=IDD_SPELLDESC (English (U.S.))
+Resource134=IDD_WEDPOLY (English (U.S.))
+Resource135=IDD_CREATUREGENERAL (English (U.S.))
+Resource136=IDD_CREATUREIWD (English (U.S.))
+Resource137=IDD_PALETTE (English (U.S.))
+Resource138=IDD_KEYEDIT (English (U.S.))
+Resource139=IDD_SPELLGENERAL (English (U.S.))
+Resource140=IDD_VARIABLES (English (U.S.))
+Resource141=IDD_SAVHANDLE (English (U.S.))
+Resource142=IDD_ADDLINK (English (U.S.))
+Resource143=IDD_AREADOOR (English (U.S.))
+Resource144=IDD_AREAGENERAL (English (U.S.))
+Resource145=IDD_CFB (English (U.S.))
+Resource146=IDD_CREATURERES (English (U.S.))
+Resource147=IDD_WEDEDIT (English (U.S.))
+Resource148=IDD_SPELLEXTRA (English (U.S.))
+Resource149=IDD_CHUIEDIT (English (U.S.))
+Resource150=IDD_PROJGEMRB (English (U.S.))
+Resource151=IDD_AREAACTOR (English (U.S.))
+Resource152=IDR_STORE (English (U.S.))
+Resource153=IDD_EXTRACT (English (U.S.))
+Resource154=IDD_EDIT (English (U.S.))
+Resource155=IDD_EXTRACT2 (English (U.S.))
+Resource156=IDD_GAMESTATS (English (U.S.))
+Resource157=IDD_TISDIALOG (English (U.S.))
+Resource158=IDD_STOREEDIT (English (U.S.))
+Resource159=IDD_AREASPAWN (English (U.S.))
+Resource160=IDD_CREATUREICONS (English (U.S.))
+Resource161=IDR_PROJECT (English (U.S.))
+Resource162=IDR_AREA (English (U.S.))
+Resource163=IDD_MOSEDIT (English (U.S.))
+Resource164=IDD_WEIDU (English (U.S.))
+Resource165=IDD_PROJEDIT (English (U.S.))
+Resource166=IDD_PROGRESS (English (U.S.))
+Resource167=IDD_GAMEGENERAL (English (U.S.))
+Resource168=IDR_SRC (English (U.S.))
+Resource169=IDR_EFFECT (English (U.S.))
+Resource170=IDD_SPELLTOOL (English (U.S.))
+Resource171=IDD_ABOUTBOX (English (U.S.))
+Resource172=IDD_AREAVARIABLE (English (U.S.))
+Resource173=IDD_SCHEDULE (English (U.S.))
+Resource174=IDD_ITEMICONS (English (U.S.))
+Resource175=IDD_AREATRIGGER (English (U.S.))
+Resource176=IDD_ITEMEQUIP (English (U.S.))
+Resource177=IDD_SRCEDIT (English (U.S.))
+Resource178=IDD_AREAAMBIENT (English (U.S.))
+Resource179=IDD_AREAPROJ (English (U.S.))
+Resource180=IDR_GAME (English (U.S.))
+Resource181=IDD_PANICBUTTON (English (U.S.))
+Resource182=IDD_STOREDRINKS (English (U.S.))
+Resource183=IDR_SPELL (English (U.S.))
+Resource184=IDD_IMAGEVIEW (English (U.S.))
+Resource185=IDD_DIALOGEDIT (English (U.S.))
+Resource186=IDD_CREATUREPST (English (U.S.))
+Resource187=IDD_BAMEDIT (English (U.S.))
+Resource188=IDD_GAMEEDIT (English (U.S.))
+Resource189=IDD_MASSCLEAR (English (U.S.))
+Resource190=IDD_AREATRIGGERSTRINGS (English (U.S.))
+Resource191=IDR_CHITIN (English (U.S.))
+Resource192=IDD_AREAMAP (English (U.S.))
+Resource193=IDD_VVCEDIT (English (U.S.))
+Resource194=IDD_AREAEDIT (English (U.S.))
+Resource195=IDD_ANIMDIALOG
+Resource196=IDD_STOREEXTRA (English (U.S.))
+Resource197=IDD_SPELLEFFECT (English (U.S.))
+Resource198=IDD_CREATURESKILLS (English (U.S.))
+Resource199=IDD_ITEMPICKER (English (U.S.))
+Resource200=IDD_PROJEXT (English (U.S.))
+Resource201=IDD_IDSEDIT (English (U.S.))
+Resource202=IDR_ITEM (English (U.S.))
+Resource203=IDR_IDS (English (U.S.))
+Resource204=IDD_STOREITEMS (English (U.S.))
+Resource205=IDD_MAPEDIT (English (U.S.))
+Resource206=IDR_CHUI (English (U.S.))
+Resource207=IDD_CHITEM_DIALOG (English (U.S.))
+Resource208=IDD_2DAEDIT (English (U.S.))
+Resource209=IDD_CHECK (English (U.S.))
+Resource210=IDD_PROJAREAGEMRB (English (U.S.))
+Resource211=IDD_SPELLEQUIP (English (U.S.))
+Resource212=IDR_WORLDMAP (English (U.S.))
+Resource213=IDD_IAPDIALOG (English (U.S.))
+Resource214=IDD_MUSEDIT (English (U.S.))
+Resource215=IDD_CREATURELEVELS (English (U.S.))
+Resource216=IDR_TILE (English (U.S.))
+Resource217=IDD_ITEMEDIT (English (U.S.))
+Resource218=IDD_COLORPICKER (English (U.S.))
+Resource219=IDD_AREACONTAINER (English (U.S.))
+Resource220=IDD_WEDTILE (English (U.S.))
+Resource221=IDD_CREATUREEFF (English (U.S.))
+Resource222=IDD_POLYGON (English (U.S.))
+Resource223=IDD_CREATUREUNKNOWN (English (U.S.))
+Resource224=IDD_GAMEPCINFO (English (U.S.))
+Resource225=IDD_SCRIPTEDIT (English (U.S.))
+Resource226=IDD_FINDITEM (English (U.S.))
+Resource227=IDR_SCRIPT (English (U.S.))
+Resource228=IDD_COMPAT (English (U.S.))
+Resource229=IDD_ITEMEFFECT (English (U.S.))
+Resource230=IDR_BAMMENU (English (U.S.))
+Resource231=IDD_STORERENTAL (English (U.S.))
+Resource232=IDD_STRREFDLG (English (U.S.))
+Resource233=IDR_VVC (English (U.S.))
+Resource234=IDD_ITEMEXTRA (English (U.S.))
+Resource235=IDD_ITEMDESC (English (U.S.))
+Resource236=IDD_AREAENTRANCE (English (U.S.))
+Resource237=IDD_MAPLINK (English (U.S.))
+Resource238=IDD_ITEMGENERAL (English (U.S.))
+Resource239=IDD_ITEMUSE (English (U.S.))
+Resource240=IDD_CREATUREOVR (English (U.S.))
+Resource241=IDR_MENUBAR (English (U.S.))
+Resource242=IDD_SPELLEDIT (English (U.S.))
+Resource243=IDR_TLKMENU (English (U.S.))
+Resource244=IDD_SHOWLOG (English (U.S.))
+Resource245=IDD_AREAANIM (English (U.S.))
Class99=CAreaTriggerString
Class100=CPCInfo
-Resource246=IDD_CREATUREUNKNOWN (English (U.S.))
+Resource246=IDR_2DA (English (U.S.))
Class101=CCreatureOverlay
-Resource247=IDD_KEYEDIT (English (U.S.))
+Resource247=IDD_TEXTVIEW (English (U.S.))
Class102=IWD2Creature
-Resource248=IDD_AREASPAWN (English (U.S.))
+Resource248=IDR_CREATURE (English (U.S.))
Class103=CAnimDialog
-Resource249=IDD_GAMEPCINFO (English (U.S.))
+Resource249=IDD_AREAINT (English (U.S.))
Class104=CCreatureLevels
-Resource250=IDD_PANICBUTTON (English (U.S.))
+Resource250=IDD_STOREGENERAL (English (U.S.))
Class105=CAreaProj
-Resource251=IDD_PROJAREAGEMRB (English (U.S.))
+Resource251=IDD_CREATUREEDIT (English (U.S.))
Class106=CProjGemRB
-Resource252=IDR_EFFECT (English (U.S.))
+Resource252=IDD_AREASONGS (English (U.S.))
Class107=CProjAreaGemRB
Resource253=IDR_SHORTCUT (English (U.S.))
@@ -2481,7 +2481,7 @@ HeaderFile=ProjEdit.h
ImplementationFile=ProjEdit.cpp
BaseClass=CDialog
Filter=D
-LastObject=ID_FILE_SAVE
+LastObject=IDC_FLAG6
VirtualFilter=dWC
[DLG:IDD_AREAENTRANCE]
@@ -7187,7 +7187,7 @@ Control36=IDC_PASTE,button,1342242816
[DLG:IDD_PROJEDIT (English (U.S.))]
Type=1
Class=CProjEdit
-ControlCount=112
+ControlCount=113
Control1=IDC_LOAD,button,1342242817
Control2=IDC_LOADEX,button,1342242816
Control3=IDC_SAVEAS,button,1342242816
@@ -7300,6 +7300,7 @@ Control109=IDC_BROWSE8,button,1342242816
Control110=IDC_BROWSE13,button,1342242816
Control111=IDC_FLAG4,button,1342242819
Control112=IDC_STATIC,static,1342308352
+Control113=IDC_FLAG6,button,1342242819
[DLG:IDD_AREAENTRANCE (English (U.S.))]
Type=1
@@ -8224,7 +8225,7 @@ Control9=IDC_STATIC,static,1342308352
Type=1
Class=CProjExt
ControlCount=48
-Control1=IDC_DURATION,edit,1350631552
+Control1=IDC_DURATION,edit,1350639744
Control2=IDOK,button,1342242816
Control3=IDC_ATTR1,button,1342242819
Control4=IDC_ATTR2,button,1342242819
@@ -8260,7 +8261,7 @@ Control33=IDC_STATIC,static,1342308352
Control34=IDC_STATIC,static,1342308352
Control35=IDC_FRAGMENT,combobox,1344340290
Control36=IDC_STATIC,static,1342308352
-Control37=IDC_DELAY,edit,1350631552
+Control37=IDC_DELAY,edit,1350639744
Control38=IDC_STATIC,static,1342308352
Control39=IDC_STATIC,static,1342308352
Control40=IDC_UNKNOWN14,combobox,1344340034
@@ -10397,7 +10398,7 @@ VirtualFilter=dWC
[DLG:IDD_PROJAREAGEMRB (English (U.S.))]
Type=1
Class=CProjAreaGemRB
-ControlCount=31
+ControlCount=35
Control1=IDOK,button,1342242816
Control2=IDC_UNKNOWN26,edit,1350631552
Control3=IDC_STATIC,static,1342308352
@@ -10423,12 +10424,16 @@ Control22=IDC_BROWSE3,button,1342242816
Control23=IDC_PLAY1,button,1342242816
Control24=IDC_FLAG9,button,1342242819
Control25=IDC_FLAG10,button,1342242819
-Control26=IDC_COUNT,edit,1350631552
+Control26=IDC_COUNT,edit,1350639744
Control27=IDC_STATIC,static,1342308352
Control28=IDC_STATIC,static,1342308352
-Control29=IDC_COUNT2,edit,1350631552
+Control29=IDC_COUNT2,edit,1350639744
Control30=IDC_FLAG11,button,1342242819
Control31=IDC_FLAG12,button,1342242819
+Control32=IDC_STATIC,static,1342308352
+Control33=IDC_TILEX,edit,1350639744
+Control34=IDC_TILEY,edit,1350639744
+Control35=IDC_FLAG13,button,1342242819
[CLS:CProjAreaGemRB]
Type=0
@@ -10436,6 +10441,6 @@ HeaderFile=ProjGemRB.h
ImplementationFile=ProjGemRB.cpp
BaseClass=CDialog
Filter=D
-LastObject=CProjAreaGemRB
+LastObject=IDC_FLAG13
VirtualFilter=dWC
diff --git a/chitem.rc b/chitem.rc
index 57809a0..312088c 100644
--- a/chitem.rc
+++ b/chitem.rc
@@ -2164,29 +2164,29 @@ BEGIN
CONTROL "Sparks",IDC_FLAG1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
188,15,38,10
CONTROL "Flying",IDC_FLAG2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
- 188,26,34,10
- LTEXT "Spark colour",IDC_STATIC,141,36,41,8
+ 188,25,34,10
+ LTEXT "Spark colour",IDC_STATIC,141,48,41,8
CONTROL "Ignore center",IDC_FLAG5,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,188,37,58,10
- COMBOBOX IDC_SPARKCOLOUR,141,49,100,194,CBS_DROPDOWN | WS_VSCROLL |
+ WS_TABSTOP,188,35,58,10
+ COMBOBOX IDC_SPARKCOLOUR,141,58,100,194,CBS_DROPDOWN | WS_VSCROLL |
WS_TABSTOP
- EDITTEXT IDC_UNKNOWN0E,161,66,28,14,ES_AUTOHSCROLL
- EDITTEXT IDC_UNKNOWN2A,213,66,28,14,ES_AUTOHSCROLL
- EDITTEXT IDC_X,154,97,28,14,ES_AUTOHSCROLL
- EDITTEXT IDC_Y,200,97,28,14,ES_AUTOHSCROLL
- EDITTEXT IDC_Z,246,97,28,14,ES_AUTOHSCROLL
- COMBOBOX IDC_SMOKETYPE,138,134,100,89,CBS_DROPDOWN | CBS_SORT |
+ EDITTEXT IDC_UNKNOWN0E,161,77,28,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_UNKNOWN2A,213,77,28,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_X,154,108,28,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_Y,200,108,28,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_Z,246,108,28,14,ES_AUTOHSCROLL
+ COMBOBOX IDC_SMOKETYPE,138,145,127,89,CBS_DROPDOWN | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
- EDITTEXT IDC_DELAY,174,151,28,14,ES_AUTOHSCROLL
- EDITTEXT IDC_U11,138,187,16,14,ES_AUTOHSCROLL
- EDITTEXT IDC_U12,157,187,16,14,ES_AUTOHSCROLL
- EDITTEXT IDC_U13,176,187,16,14,ES_AUTOHSCROLL
- EDITTEXT IDC_U14,195,187,16,14,ES_AUTOHSCROLL
- EDITTEXT IDC_U15,214,187,16,14,ES_AUTOHSCROLL
- EDITTEXT IDC_U16,233,187,16,14,ES_AUTOHSCROLL
- EDITTEXT IDC_U17,252,187,16,14,ES_AUTOHSCROLL
- EDITTEXT IDC_ATTR,249,20,40,14,ES_AUTOHSCROLL
- COMBOBOX IDC_AIM,293,20,110,67,CBS_DROPDOWN | WS_VSCROLL |
+ EDITTEXT IDC_DELAY,174,162,28,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_U11,138,198,16,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_U12,157,198,16,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_U13,176,198,16,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_U14,195,198,16,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_U15,214,198,16,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_U16,233,198,16,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_U17,252,198,16,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_ATTR,261,20,40,14,ES_AUTOHSCROLL
+ COMBOBOX IDC_AIM,309,20,94,67,CBS_DROPDOWN | WS_VSCROLL |
WS_TABSTOP
CONTROL "Coloured BAM",IDC_ATTR1,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,279,38,61,10
@@ -2196,18 +2196,18 @@ BEGIN
58,20,10
CONTROL "Dark projectile",IDC_ATTR4,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,279,68,61,10
- CONTROL "5",IDC_ATTR5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,279,
- 78,20,10
+ CONTROL "Use area height",IDC_ATTR5,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,279,78,66,10
CONTROL "Shadow enabled",IDC_ATTR6,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,279,88,69,10
CONTROL "Light spot enabled",IDC_ATTR7,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,279,98,74,10
CONTROL "Fix transparency ?",IDC_ATTR8,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,279,108,73,10
- CONTROL "9",IDC_ATTR9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,364,
- 38,20,10
- CONTROL "10",IDC_ATTR10,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
- 364,48,24,10
+ CONTROL "Brighten",IDC_ATTR9,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,364,38,42,10
+ CONTROL "Brighten2",IDC_ATTR10,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,364,48,46,10
CONTROL "11",IDC_ATTR11,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
364,58,24,10
CONTROL "12",IDC_ATTR12,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
@@ -2226,39 +2226,39 @@ BEGIN
EDITTEXT IDC_FREQ2,366,157,28,14,ES_AUTOHSCROLL
EDITTEXT IDC_BAM5,282,176,49,14,ES_UPPERCASE | ES_AUTOHSCROLL
EDITTEXT IDC_FREQ3,366,176,28,14,ES_AUTOHSCROLL
- PUSHBUTTON "Edit area extension",IDC_EXTENSION,135,213,141,14
+ PUSHBUTTON "Edit area extension",IDC_EXTENSION,135,223,141,14
PUSHBUTTON "GemRB specific",IDC_UNKNOWN2C,335,202,68,14
PUSHBUTTON "Unknowns at 0x154",IDC_UNKNOWN154,335,223,68,14
- GROUPBOX "Sparks",IDC_STATIC,135,7,112,81,BS_FLAT
- GROUPBOX "Light spot",IDC_STATIC,135,83,141,39,BS_FLAT
+ GROUPBOX "Sparks",IDC_STATIC,135,7,119,89,BS_FLAT
+ GROUPBOX "Light spot",IDC_STATIC,135,91,141,42,BS_FLAT
GROUPBOX "Projectile trail ",IDC_STATIC,275,117,128,78,BS_FLAT
- GROUPBOX "Smoke",IDC_STATIC,135,117,141,90,BS_FLAT
+ GROUPBOX "Smoke",IDC_STATIC,135,128,141,90,BS_FLAT
LTEXT "Projectile type",IDC_STATIC,7,7,45,8
LTEXT "Speed",IDC_STATIC,101,7,22,8
- LTEXT "0x0e",IDC_STATIC,141,69,16,8
+ LTEXT "0x0e",IDC_STATIC,141,77,16,8
LTEXT "Sound resource 1",IDC_STATIC,7,35,57,8
LTEXT "Sound resource 2",IDC_STATIC,7,65,57,8
LTEXT "Projectile VVC",IDC_STATIC,7,95,46,8
- LTEXT "Attributes",IDC_STATIC,249,7,30,8
+ LTEXT "Attributes",IDC_STATIC,261,7,30,8
LTEXT "Projectile BAM",IDC_STATIC,7,125,47,8
LTEXT "Shadow BAM",IDC_STATIC,7,155,44,8
LTEXT "Cycle",IDC_STATIC,101,125,18,8
LTEXT "Cycle",IDC_STATIC,101,155,18,8
- LTEXT "X",IDC_STATIC,141,100,8,8
- LTEXT "Y",IDC_STATIC,187,100,8,8
- LTEXT "Z",IDC_STATIC,233,100,8,8
+ LTEXT "X",IDC_STATIC,141,111,8,8
+ LTEXT "Y",IDC_STATIC,187,111,8,8
+ LTEXT "Z",IDC_STATIC,233,111,8,8
LTEXT "Palette BMP",IDC_STATIC,7,185,40,8
- LTEXT "Puff delay",IDC_STATIC,138,154,32,8
- LTEXT "Direction (cycle change) ?",IDC_STATIC,293,7,84,8
+ LTEXT "Puff delay",IDC_STATIC,138,165,32,8
+ LTEXT "Direction (cycle change) ?",IDC_STATIC,309,7,84,8
LTEXT "Projectile colour gradients",IDC_STATIC,7,215,82,8
LTEXT "Trail bams",IDC_STATIC,282,128,33,8
LTEXT "Frequency",IDC_STATIC,366,128,34,8
CONTROL "",IDC_MPTRAVEL,"Static",SS_BITMAP | SS_NOTIFY,96,208,17,
15,WS_EX_DLGMODALFRAME
- CONTROL "",IDC_MPSMOKE,"Static",SS_BITMAP | SS_NOTIFY,233,165,17,
+ CONTROL "",IDC_MPSMOKE,"Static",SS_BITMAP | SS_NOTIFY,233,176,17,
15,WS_EX_DLGMODALFRAME
- LTEXT "Smoke colour gradients",IDC_STATIC,138,172,75,8
- LTEXT "Smoke animation",IDC_STATIC,183,124,55,8
+ LTEXT "Smoke colour gradients",IDC_STATIC,138,183,75,8
+ LTEXT "Smoke animation",IDC_STATIC,183,135,55,8
CONTROL "Looping",IDC_FLAG3,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,88,35,41,10
PUSHBUTTON "Browse",IDC_BROWSE7,335,138,28,14
@@ -2266,7 +2266,9 @@ BEGIN
PUSHBUTTON "Browse",IDC_BROWSE13,335,176,28,14
CONTROL "Looping",IDC_FLAG4,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,88,65,41,10
- LTEXT "0x2a",IDC_STATIC,192,68,16,8
+ LTEXT "0x2a",IDC_STATIC,192,77,16,8
+ CONTROL "Draw first",IDC_FLAG6,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,188,45,56,10
END
IDD_AREAENTRANCE DIALOG DISCARDABLE 0, 0, 480, 198
@@ -3444,9 +3446,9 @@ IDD_PROJEXT DIALOGEX 0, 0, 410, 191
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTROLPARENT
CAPTION "Area extension header"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
BEGIN
- EDITTEXT IDC_DURATION,142,72,55,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_DURATION,142,72,55,14,ES_AUTOHSCROLL | ES_NUMBER
PUSHBUTTON "Back",IDOK,352,170,50,14
CONTROL "Projectile visible",IDC_ATTR1,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,13,34,66,10
@@ -3464,22 +3466,22 @@ BEGIN
WS_TABSTOP,13,94,79,10
CONTROL "Party only (with only enemies)",IDC_ATTR8,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,13,104,108,10
- CONTROL "Caster level * explosions",IDC_ATTR9,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,13,114,92,10
- CONTROL "Multiple set off",IDC_ATTR10,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,13,124,61,10
+ CONTROL "Mage level * explosions",IDC_ATTR9,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,13,114,90,10
+ CONTROL "Priest level * explosions",IDC_ATTR10,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,13,124,89,10
CONTROL "Use VVC",IDC_ATTR11,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,142,165,45,10
CONTROL "Cone shape",IDC_ATTR12,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,142,146,54,10
- CONTROL "13",IDC_ATTR13,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,
- 134,24,10
- CONTROL "No explosion ?",IDC_ATTR14,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,13,144,63,10
- CONTROL "Delayed explosion ?",IDC_ATTR15,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,13,154,79,10
- CONTROL "Affect only one ?",IDC_ATTR16,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,13,164,69,10
+ CONTROL "Pass walls",IDC_ATTR13,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,13,134,49,10
+ CONTROL "Wait for frame 30",IDC_ATTR14,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,13,144,70,10
+ CONTROL "Delayed explosion",IDC_ATTR15,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,13,154,73,10
+ CONTROL "Affect only one",IDC_ATTR16,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,13,164,63,10
EDITTEXT IDC_ATTR,13,16,55,14,ES_AUTOHSCROLL
LTEXT "Attributes (16 bits)",IDC_STATIC,13,7,57,8
EDITTEXT IDC_UNKNOWN2,76,16,55,14,ES_AUTOHSCROLL
@@ -3503,7 +3505,7 @@ BEGIN
COMBOBOX IDC_FRAGMENT,142,100,92,138,CBS_DROPDOWN |
CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
LTEXT "Fragment graphics animation",IDC_STATIC,142,89,91,8
- EDITTEXT IDC_DELAY,142,44,55,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_DELAY,142,44,55,14,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "Delay (between explosions)",IDC_STATIC,142,33,87,8
LTEXT "Secondary projectile (projectl.ids-1)",IDC_STATIC,249,
61,110,8
@@ -5432,8 +5434,8 @@ BEGIN
WS_TABSTOP,86,51,73,10
CONTROL "Create iteration",IDC_FLAG11,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,86,65,63,10
- CONTROL "Tiled area of effect",IDC_FLAG12,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,86,79,75,10
+ CONTROL "Apply default spell",IDC_FLAG12,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,86,79,73,10
CONTROL "Falling path",IDC_FLAG13,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,86,93,52,10
CONTROL "Incoming path",IDC_FLAG14,"Button",BS_AUTOCHECKBOX |
@@ -5531,14 +5533,19 @@ BEGIN
BS_AUTOCHECKBOX | WS_TABSTOP,125,37,105,10
CONTROL "Multiple directions (cone)",IDC_FLAG10,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,125,51,94,10
- EDITTEXT IDC_COUNT,7,195,23,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_COUNT,7,195,23,14,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "Target count (or HD)",IDC_STATIC,7,182,66,8
LTEXT "d",IDC_STATIC,32,198,8,8
- EDITTEXT IDC_COUNT2,42,195,23,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_COUNT2,42,195,23,14,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "Use hit die instead of count",IDC_FLAG11,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,125,65,102,10
CONTROL "Reverse EA targeting",IDC_FLAG12,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,125,79,83,10
+ LTEXT "Tile dimensions",IDC_STATIC,85,182,49,8
+ EDITTEXT IDC_TILEX,85,195,23,14,ES_AUTOHSCROLL | ES_NUMBER
+ EDITTEXT IDC_TILEY,119,195,23,14,ES_AUTOHSCROLL | ES_NUMBER
+ CONTROL "Tiled area of effect graphics",IDC_FLAG13,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,125,93,104,10
END
diff --git a/resource.h b/resource.h
index 6f0101b..263edeb 100644
--- a/resource.h
+++ b/resource.h
@@ -674,7 +674,9 @@
#define IDC_COUNT 1317
#define IDC_COUNT2 1318
#define IDC_STORETYPE 1319
+#define IDC_TILEX 1319
#define IDC_STORENAME 1320
+#define IDC_TILEY 1320
#define IDC_BUYING 1321
#define IDC_STEALING 1322
#define IDC_SELLINGPERCENT 1323
-----------------------------------------------------------------------
This is an automated email from the git hooks/post-receive script.
--
dltcep: Viewer and editor for Infinity Engine data files
|