Menu
▾
▴
[Gemrb-commits] SF.net SVN: gemrb:[7035] chitem/trunk
|
From: <ave...@us...> - 2009-08-23 18:16:49
|
Revision: 7035
http://gemrb.svn.sourceforge.net/gemrb/?rev=7035&view=rev
Author: avenger_teambg
Date: 2009-08-23 18:16:40 +0000 (Sun, 23 Aug 2009)
Log Message:
-----------
dltcep update
Modified Paths:
--------------
chitem/trunk/ChuiEdit.cpp
chitem/trunk/ChuiEdit.h
chitem/trunk/CreatureProperties.cpp
chitem/trunk/CreatureProperties.h
chitem/trunk/GameGeneral.cpp
chitem/trunk/Structs.h
chitem/trunk/chitem.clw
chitem/trunk/chitem.rc
chitem/trunk/game.cpp
chitem/trunk/game.h
Modified: chitem/trunk/ChuiEdit.cpp
===================================================================
--- chitem/trunk/ChuiEdit.cpp 2009-08-23 18:15:35 UTC (rev 7034)
+++ chitem/trunk/ChuiEdit.cpp 2009-08-23 18:16:40 UTC (rev 7035)
@@ -28,8 +28,8 @@
//}}AFX_DATA_INIT
}
-static int labelbits[8]={1,2,4,8,16,32,64,128};
-static int buttonbits[8]={0,0,0,1,2,4,0,8};
+static int labelbits[9]={1,2,4,8,16,32,64,128,0};
+static int buttonbits[9]={0,0,0,1,2,4,0,8,32};
static int winids[]={IDC_WINDOWPICKER,
0};
@@ -47,7 +47,7 @@
static int buttonboxids[]={IDC_BAM, IDC_BROWSE2, IDC_CYCLE,
IDC_BAMFRAME1,IDC_BAMFRAME2, IDC_BAMFRAME3,IDC_BAMFRAME4,
IDC_BUTTONCYCLE, IDC_BUTTONBAM, IDC_BUTTONFLAG, IDC_BAM2,
-IDC_FLAG4, IDC_FLAG5, IDC_FLAG6, IDC_FLAG8,
+IDC_FLAG4, IDC_FLAG5, IDC_FLAG6, IDC_FLAG8, IDC_FLAG9,
IDC_BUTTONFRAME1,IDC_BUTTONFRAME2, IDC_BUTTONFRAME3,IDC_BUTTONFRAME4,
0};
@@ -64,7 +64,7 @@
0};
static int editboxids[]={IDC_BAM, IDC_BAM2, IDC_BAM3, IDC_BAM4, IDC_BAM5,
-IDC_BROWSE2,IDC_BROWSE3,IDC_BROWSE4,IDC_BROWSE5,IDC_BROWSE6,
+IDC_BROWSE2,IDC_BROWSE3,IDC_BROWSE4,IDC_BROWSE5,IDC_BROWSE6, IDC_BAMFRAME6,
IDC_EDITMOS1,IDC_EDITMOS2,IDC_EDITMOS3,IDC_UNKNOWN4, IDC_UNKNOWN5, IDC_UNKNOWN6,
0};
@@ -141,7 +141,7 @@
DDX_Text(pDX, IDC_BAMFRAME2, cc->pressed);
DDX_Text(pDX, IDC_BAMFRAME3, cc->disabled);
DDX_Text(pDX, IDC_BAMFRAME4, cc->selected);
- for(i=0;i<8;i++)
+ for(i=0;i<9;i++)
{
k=!!(cc->flags&buttonbits[i]);
DDX_Check(pDX,IDC_FLAG1+i,k);
@@ -216,6 +216,7 @@
DDX_Text(pDX, IDC_UNKNOWN4, cc->length);
DDX_Text(pDX, IDC_UNKNOWN5, cc->xpos);
DDX_Text(pDX, IDC_UNKNOWN6, cc->ypos);
+ DDX_Text(pDX, IDC_BAMFRAME6, cc->uppercase);
}
break;
case CC_TEXT:
@@ -262,7 +263,7 @@
DDX_Text(pDX,IDC_BAMFRAME6, cc->justify);
- for(i=0;i<8;i++)
+ for(i=0;i<9;i++)
{
k=!!(cc->justify&labelbits[i]);
DDX_Check(pDX,IDC_FLAG1+i,k);
@@ -407,6 +408,7 @@
ON_BN_CLICKED(IDC_FLAG6, OnFlag6)
ON_BN_CLICKED(IDC_FLAG7, OnFlag7)
ON_BN_CLICKED(IDC_FLAG8, OnFlag8)
+ ON_BN_CLICKED(IDC_FLAG9, OnFlag9)
ON_BN_CLICKED(IDC_LOAD, OnLoad)
ON_BN_CLICKED(IDC_LOADEX, OnLoadex)
ON_BN_CLICKED(IDC_SAVEAS, OnSaveas)
@@ -1396,6 +1398,11 @@
OnLabelFlag(7);
}
+void CChuiEdit::OnFlag9()
+{
+ OnLabelFlag(8);
+}
+
void CChuiEdit::OnPreview()
{
CImageView preview;
Modified: chitem/trunk/ChuiEdit.h
===================================================================
--- chitem/trunk/ChuiEdit.h 2009-08-23 18:15:35 UTC (rev 7034)
+++ chitem/trunk/ChuiEdit.h 2009-08-23 18:16:40 UTC (rev 7035)
@@ -86,6 +86,7 @@
afx_msg void OnFlag6();
afx_msg void OnFlag7();
afx_msg void OnFlag8();
+ afx_msg void OnFlag9();
afx_msg void OnKillfocusId2();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
Modified: chitem/trunk/CreatureProperties.cpp
===================================================================
--- chitem/trunk/CreatureProperties.cpp 2009-08-23 18:15:35 UTC (rev 7034)
+++ chitem/trunk/CreatureProperties.cpp 2009-08-23 18:16:40 UTC (rev 7035)
@@ -1806,6 +1806,7 @@
ON_BN_CLICKED(IDC_PASTE, OnPaste)
ON_BN_CLICKED(IDC_EXPORT, OnExport)
ON_BN_CLICKED(IDC_IMPORT, OnImport)
+ ON_BN_CLICKED(IDC_CLEAR, OnClear)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
@@ -1947,6 +1948,12 @@
UpdateData(UD_DISPLAY);
}
+
+void CCreatureStrings::OnClear()
+{
+ memset(the_creature.header.strrefs, -1, m_stringcount*sizeof(long) );
+}
+
void CCreatureStrings::OnExport()
{
ExportTBG(this, REF_CRE|TBG_ALT, 0);
@@ -3178,6 +3185,7 @@
the_creature.KillItems();
memset(the_creature.itemslots,-1,sizeof(the_creature.itemslots) );
*(int *) (the_creature.itemslots+the_creature.slotcount)=1000;
+ the_creature.header.itemcnt=0;
the_creature.m_changed=true;
RefreshItem();
UpdateData(UD_DISPLAY);
Modified: chitem/trunk/CreatureProperties.h
===================================================================
--- chitem/trunk/CreatureProperties.h 2009-08-23 18:15:35 UTC (rev 7034)
+++ chitem/trunk/CreatureProperties.h 2009-08-23 18:16:40 UTC (rev 7035)
@@ -350,6 +350,7 @@
afx_msg void OnPaste();
afx_msg void OnExport();
afx_msg void OnImport();
+ afx_msg void OnClear();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
Modified: chitem/trunk/GameGeneral.cpp
===================================================================
--- chitem/trunk/GameGeneral.cpp 2009-08-23 18:15:35 UTC (rev 7034)
+++ chitem/trunk/GameGeneral.cpp 2009-08-23 18:16:40 UTC (rev 7035)
@@ -125,6 +125,7 @@
ON_EN_KILLFOCUS(IDC_U4, OnDefaultKillfocus)
ON_EN_KILLFOCUS(IDC_U5, OnDefaultKillfocus)
ON_EN_KILLFOCUS(IDC_AREA, OnDefaultKillfocus)
+ ON_EN_KILLFOCUS(IDC_UNKNOWN64, OnDefaultKillfocus)
//}}AFX_MSG_MAP
ON_NOTIFY(NM_RELEASEDCAPTURE, IDC_SLIDER, OnDefaultKillfocusX)
END_MESSAGE_MAP()
Modified: chitem/trunk/Structs.h
===================================================================
--- chitem/trunk/Structs.h 2009-08-23 18:15:35 UTC (rev 7034)
+++ chitem/trunk/Structs.h 2009-08-23 18:16:40 UTC (rev 7035)
@@ -244,14 +244,15 @@
char mos2[8];
char mos3[8];
char cursor[8]; //cursor bam
- long unknown1;
+ short cycle;
+ short frame;
short xpos;
short ypos;
long unknown2;
char font[8]; //font bam
char unknown3[34];
short length;
- long unknown4;
+ long uppercase;
} chui_editbox;
typedef struct//5
@@ -1733,7 +1734,9 @@
long slocoffset;
long sloccount;
long realtime;
- char unknown78[60];
+ long ppoffset;
+ long ppcount;
+ char unknown80[52];
} gam_header;
typedef struct {
Modified: chitem/trunk/chitem.clw
===================================================================
--- chitem/trunk/chitem.clw 2009-08-23 18:15:35 UTC (rev 7034)
+++ chitem/trunk/chitem.clw 2009-08-23 18:16:40 UTC (rev 7035)
@@ -2,7 +2,7 @@
[General Info]
Version=1
-LastClass=CAreaAmbient
+LastClass=CGameGeneral
LastTemplate=CDialog
NewFileInclude1=#include "stdafx.h"
NewFileInclude2=#include "chitem.h"
@@ -232,142 +232,142 @@
Resource123=IDD_GAMEGENERAL
Class98=IcewindCre
Resource124=IDR_SHORTCUT
-Resource125=IDD_POLYGON (English (U.S.))
-Resource126=IDD_AREASONGS (English (U.S.))
-Resource127=IDR_SCRIPT (English (U.S.))
-Resource128=IDD_SEARCHNODE (English (U.S.))
-Resource129=IDD_EFFEDIT (English (U.S.))
-Resource130=IDD_PANICBUTTON (English (U.S.))
-Resource131=IDR_MENUBAR (English (U.S.))
-Resource132=IDD_CREATUREOVR (English (U.S.))
-Resource133=IDD_ITEMEQUIP (English (U.S.))
-Resource134=IDR_EFFECT (English (U.S.))
-Resource135=IDD_VVCEDIT (English (U.S.))
-Resource136=IDD_IAPDIALOG (English (U.S.))
-Resource137=IDD_PROJAREAGEMRB (English (U.S.))
-Resource138=IDD_CHITEM_DIALOG (English (U.S.))
-Resource139=IDD_GAMEGENERAL (English (U.S.))
-Resource140=IDD_ITEMICONS (English (U.S.))
-Resource141=IDR_TREEMENU (English (U.S.))
-Resource142=IDD_EXTRACT (English (U.S.))
-Resource143=IDD_SPELLDESC (English (U.S.))
-Resource144=IDD_COLORPICKER (English (U.S.))
-Resource145=IDD_IDSEDIT (English (U.S.))
-Resource146=IDD_WEDTILE (English (U.S.))
-Resource147=IDD_STOREEXTRA (English (U.S.))
-Resource148=IDR_WEDMENU (English (U.S.))
-Resource149=IDD_ABOUTBOX (English (U.S.))
-Resource150=IDD_CREATUREEDIT (English (U.S.))
-Resource151=IDD_GAMEEDIT (English (U.S.))
-Resource152=IDD_PROGRESS (English (U.S.))
-Resource153=IDD_CREATURESKILLS (English (U.S.))
-Resource154=IDD_CHUIEDIT (English (U.S.))
-Resource155=IDR_PROJECT (English (U.S.))
-Resource156=IDD_ITEMEFFECT (English (U.S.))
-Resource157=IDD_AREAVARIABLE (English (U.S.))
-Resource158=IDD_WEDEDIT (English (U.S.))
-Resource159=IDD_AREAMAP (English (U.S.))
-Resource160=IDD_AREADOOR (English (U.S.))
-Resource161=IDD_ITEMDESC (English (U.S.))
-Resource162=IDD_CHECK (English (U.S.))
-Resource163=IDD_STOREGENERAL (English (U.S.))
-Resource164=IDD_ITEMEXTRA (English (U.S.))
-Resource165=IDD_CREATURELEVELS (English (U.S.))
-Resource166=IDD_AREATRIGGERSTRINGS (English (U.S.))
-Resource167=IDD_PROJEDIT (English (U.S.))
-Resource168=IDR_2DA (English (U.S.))
-Resource169=IDD_SRCEDIT (English (U.S.))
-Resource170=IDD_SAVHANDLE (English (U.S.))
-Resource171=IDD_CFB (English (U.S.))
-Resource172=IDD_AREAAMBIENT (English (U.S.))
-Resource173=IDD_MAPEDIT (English (U.S.))
-Resource174=IDR_BAMMENU (English (U.S.))
-Resource175=IDR_VVC (English (U.S.))
-Resource176=IDD_VARIABLES (English (U.S.))
-Resource177=IDD_AREATRIGGER (English (U.S.))
-Resource178=IDD_ITEMEDIT (English (U.S.))
-Resource179=IDR_GAME (English (U.S.))
-Resource180=IDD_AREAINT (English (U.S.))
-Resource181=IDR_AREA (English (U.S.))
-Resource182=IDD_KEYEDIT (English (U.S.))
-Resource183=IDD_2DAEDIT (English (U.S.))
-Resource184=IDD_CREATUREITEMS (English (U.S.))
-Resource185=IDD_GAMESTATS (English (U.S.))
-Resource186=IDD_ITEMPICKER (English (U.S.))
-Resource187=IDR_CREATURE (English (U.S.))
-Resource188=IDD_CREATUREICONS (English (U.S.))
-Resource189=IDR_ITEM (English (U.S.))
-Resource190=IDD_MOSEDIT (English (U.S.))
-Resource191=IDD_SCHEDULE (English (U.S.))
-Resource192=IDD_MUSEDIT (English (U.S.))
-Resource193=IDD_STOREITEMS (English (U.S.))
-Resource194=IDD_EDIT (English (U.S.))
-Resource195=IDD_MASSCLEAR (English (U.S.))
-Resource196=IDD_AREAGENERAL (English (U.S.))
-Resource197=IDD_CREATUREIWD2 (English (U.S.))
-Resource198=IDD_PROJEXT (English (U.S.))
-Resource199=IDD_BAMEDIT (English (U.S.))
-Resource200=IDD_AREAANIM (English (U.S.))
-Resource201=IDD_CREATUREGENERAL (English (U.S.))
-Resource202=IDD_CREATURESTRINGS (English (U.S.))
-Resource203=IDD_SPELLTOOL (English (U.S.))
-Resource204=IDD_CREATUREEFF (English (U.S.))
-Resource205=IDD_SPELLEXTRA (English (U.S.))
-Resource206=IDR_SRC (English (U.S.))
-Resource207=IDR_SPELL (English (U.S.))
-Resource208=IDD_WEIDU (English (U.S.))
-Resource209=IDD_STOREDRINKS (English (U.S.))
-Resource210=IDD_AREACONTAINER (English (U.S.))
-Resource211=IDR_WORLDMAP (English (U.S.))
-Resource212=IDD_CREATUREIWD (English (U.S.))
-Resource213=IDD_CREATURERES (English (U.S.))
-Resource214=IDD_MAPLINK (English (U.S.))
-Resource215=IDD_AREASPAWN (English (U.S.))
-Resource216=IDD_ITEMUSE (English (U.S.))
-Resource217=IDD_STRREFDLG (English (U.S.))
-Resource218=IDR_STORE (English (U.S.))
-Resource219=IDD_SPELLEDIT (English (U.S.))
-Resource220=IDD_AREAENTRANCE (English (U.S.))
-Resource221=IDD_PALETTE (English (U.S.))
-Resource222=IDR_CHITIN (English (U.S.))
-Resource223=IDD_AREAEDIT (English (U.S.))
-Resource224=IDD_ADDLINK (English (U.S.))
-Resource225=IDD_SPELLEQUIP (English (U.S.))
-Resource226=IDD_TISDIALOG (English (U.S.))
-Resource227=IDR_TILE (English (U.S.))
-Resource228=IDD_CREATUREUNKNOWN (English (U.S.))
-Resource229=IDD_DIALOGEDIT (English (U.S.))
-Resource230=IDD_GAMEPCINFO (English (U.S.))
-Resource231=IDD_AREAACTOR (English (U.S.))
-Resource232=IDD_CREATUREPST (English (U.S.))
-Resource233=IDD_SPELLGENERAL (English (U.S.))
-Resource234=IDD_ANIMDIALOG
-Resource235=IDR_TLKMENU (English (U.S.))
-Resource236=IDD_PROJGEMRB (English (U.S.))
-Resource237=IDR_CHUI (English (U.S.))
-Resource238=IDD_EXTRACT2 (English (U.S.))
-Resource239=IDD_WEDPOLY (English (U.S.))
-Resource240=IDD_AREAPROJ (English (U.S.))
-Resource241=IDD_SHOWLOG (English (U.S.))
-Resource242=IDR_IDS (English (U.S.))
-Resource243=IDD_ITEMGENERAL (English (U.S.))
-Resource244=IDD_SPELLEFFECT (English (U.S.))
-Resource245=IDD_STOREEDIT (English (U.S.))
+Resource125=IDD_PROJEXT (English (U.S.))
+Resource126=IDD_STORERENTAL (English (U.S.))
+Resource127=IDD_CHUIEDIT (English (U.S.))
+Resource128=IDD_ITEMDESC (English (U.S.))
+Resource129=IDR_VVC (English (U.S.))
+Resource130=IDD_CREATUREICONS (English (U.S.))
+Resource131=IDD_STRREFDLG (English (U.S.))
+Resource132=IDR_EFFECT (English (U.S.))
+Resource133=IDR_SPELL (English (U.S.))
+Resource134=IDD_WEDPOLY (English (U.S.))
+Resource135=IDR_CREATURE (English (U.S.))
+Resource136=IDD_SCHEDULE (English (U.S.))
+Resource137=IDD_SPELLDESC (English (U.S.))
+Resource138=IDD_AREAPROJ (English (U.S.))
+Resource139=IDD_ITEMEXTRA (English (U.S.))
+Resource140=IDD_2DAEDIT (English (U.S.))
+Resource141=IDD_PANICBUTTON (English (U.S.))
+Resource142=IDR_AREA (English (U.S.))
+Resource143=IDD_ABOUTBOX (English (U.S.))
+Resource144=IDD_SHOWLOG (English (U.S.))
+Resource145=IDD_AREAEDIT (English (U.S.))
+Resource146=IDD_AREACONTAINER (English (U.S.))
+Resource147=IDR_TILE (English (U.S.))
+Resource148=IDD_GAMEPCINFO (English (U.S.))
+Resource149=IDD_CREATURELEVELS (English (U.S.))
+Resource150=IDD_VVCEDIT (English (U.S.))
+Resource151=IDD_SPELLEXTRA (English (U.S.))
+Resource152=IDD_PROJAREAGEMRB (English (U.S.))
+Resource153=IDD_STOREGENERAL (English (U.S.))
+Resource154=IDD_AREAVARIABLE (English (U.S.))
+Resource155=IDD_AREAMAP (English (U.S.))
+Resource156=IDR_STORE (English (U.S.))
+Resource157=IDD_IDSEDIT (English (U.S.))
+Resource158=IDD_STOREEDIT (English (U.S.))
+Resource159=IDD_BAMEDIT (English (U.S.))
+Resource160=IDD_SEARCHNODE (English (U.S.))
+Resource161=IDR_CHITIN (English (U.S.))
+Resource162=IDD_PROJGEMRB (English (U.S.))
+Resource163=IDR_TLKMENU (English (U.S.))
+Resource164=IDD_SPELLEDIT (English (U.S.))
+Resource165=IDD_COLORPICKER (English (U.S.))
+Resource166=IDD_PALETTE (English (U.S.))
+Resource167=IDD_ITEMEQUIP (English (U.S.))
+Resource168=IDD_STOREDRINKS (English (U.S.))
+Resource169=IDD_ITEMEDIT (English (U.S.))
+Resource170=IDD_CREATUREGENERAL (English (U.S.))
+Resource171=IDD_SCRIPTEDIT (English (U.S.))
+Resource172=IDD_AREATRIGGERSTRINGS (English (U.S.))
+Resource173=IDD_PROJEDIT (English (U.S.))
+Resource174=IDD_SAVHANDLE (English (U.S.))
+Resource175=IDD_SRCEDIT (English (U.S.))
+Resource176=IDR_PROJECT (English (U.S.))
+Resource177=IDD_ITEMPICKER (English (U.S.))
+Resource178=IDR_BAMMENU (English (U.S.))
+Resource179=IDD_WEDTILE (English (U.S.))
+Resource180=IDD_CREATUREITEMS (English (U.S.))
+Resource181=IDD_MASSCLEAR (English (U.S.))
+Resource182=IDD_AREAINT (English (U.S.))
+Resource183=IDD_MUSEDIT (English (U.S.))
+Resource184=IDR_MUSIC (English (U.S.))
+Resource185=IDD_EXTRACT (English (U.S.))
+Resource186=IDD_IAPDIALOG (English (U.S.))
+Resource187=IDR_CHUI (English (U.S.))
+Resource188=IDD_CREATURESTRINGS (English (U.S.))
+Resource189=IDD_AREAGENERAL (English (U.S.))
+Resource190=IDD_EDIT (English (U.S.))
+Resource191=IDD_ADDLINK (English (U.S.))
+Resource192=IDD_CREATURESKILLS (English (U.S.))
+Resource193=IDR_SCRIPT (English (U.S.))
+Resource194=IDD_AREAACTOR (English (U.S.))
+Resource195=IDD_AREASONGS (English (U.S.))
+Resource196=IDD_FINDITEM (English (U.S.))
+Resource197=IDD_EXTRACT2 (English (U.S.))
+Resource198=IDD_SPELLEQUIP (English (U.S.))
+Resource199=IDD_TISDIALOG (English (U.S.))
+Resource200=IDD_AREAENTRANCE (English (U.S.))
+Resource201=IDD_CFB (English (U.S.))
+Resource202=IDD_EFFEDIT (English (U.S.))
+Resource203=IDD_COMPAT (English (U.S.))
+Resource204=IDD_CREATURERES (English (U.S.))
+Resource205=IDD_IMAGEVIEW (English (U.S.))
+Resource206=IDD_GAMEGENERAL (English (U.S.))
+Resource207=IDD_CREATUREEFF (English (U.S.))
+Resource208=IDD_CREATUREIWD2 (English (U.S.))
+Resource209=IDD_ITEMICONS (English (U.S.))
+Resource210=IDD_STOREEXTRA (English (U.S.))
+Resource211=IDD_KEYEDIT (English (U.S.))
+Resource212=IDR_ITEM (English (U.S.))
+Resource213=IDD_STOREITEMS (English (U.S.))
+Resource214=IDD_SPELLEFFECT (English (U.S.))
+Resource215=IDR_MENUBAR (English (U.S.))
+Resource216=IDD_ANIMDIALOG
+Resource217=IDD_CREATUREEDIT (English (U.S.))
+Resource218=IDD_WEDEDIT (English (U.S.))
+Resource219=IDD_CHECK (English (U.S.))
+Resource220=IDD_ITEMEFFECT (English (U.S.))
+Resource221=IDR_SRC (English (U.S.))
+Resource222=IDD_CREATUREIWD (English (U.S.))
+Resource223=IDD_DIALOGEDIT (English (U.S.))
+Resource224=IDD_MAPEDIT (English (U.S.))
+Resource225=IDD_WEIDU (English (U.S.))
+Resource226=IDD_GAMESTATS (English (U.S.))
+Resource227=IDD_CREATUREPST (English (U.S.))
+Resource228=IDD_GAMEEDIT (English (U.S.))
+Resource229=IDD_SPELLGENERAL (English (U.S.))
+Resource230=IDD_MOSEDIT (English (U.S.))
+Resource231=IDD_ITEMGENERAL (English (U.S.))
+Resource232=IDD_ITEMUSE (English (U.S.))
+Resource233=IDR_WEDMENU (English (U.S.))
+Resource234=IDD_AREADOOR (English (U.S.))
+Resource235=IDD_SPELLTOOL (English (U.S.))
+Resource236=IDR_WORLDMAP (English (U.S.))
+Resource237=IDD_AREAAMBIENT (English (U.S.))
+Resource238=IDD_PROGRESS (English (U.S.))
+Resource239=IDD_CREATUREUNKNOWN (English (U.S.))
+Resource240=IDD_AREAANIM (English (U.S.))
+Resource241=IDD_AREASPAWN (English (U.S.))
+Resource242=IDD_POLYGON (English (U.S.))
+Resource243=IDR_TREEMENU (English (U.S.))
+Resource244=IDD_CHITEM_DIALOG (English (U.S.))
+Resource245=IDR_GAME (English (U.S.))
Class99=CAreaTriggerString
Class100=CPCInfo
-Resource246=IDR_MUSIC (English (U.S.))
+Resource246=IDD_TEXTVIEW (English (U.S.))
Class101=CCreatureOverlay
-Resource247=IDD_SCRIPTEDIT (English (U.S.))
+Resource247=IDD_AREATRIGGER (English (U.S.))
Class102=IWD2Creature
-Resource248=IDD_FINDITEM (English (U.S.))
+Resource248=IDD_MAPLINK (English (U.S.))
Class103=CAnimDialog
-Resource249=IDD_STORERENTAL (English (U.S.))
+Resource249=IDR_2DA (English (U.S.))
Class104=CCreatureLevels
-Resource250=IDD_TEXTVIEW (English (U.S.))
+Resource250=IDD_VARIABLES (English (U.S.))
Class105=CAreaProj
-Resource251=IDD_COMPAT (English (U.S.))
+Resource251=IDR_IDS (English (U.S.))
Class106=CProjGemRB
-Resource252=IDD_IMAGEVIEW (English (U.S.))
+Resource252=IDD_CREATUREOVR (English (U.S.))
Class107=CProjAreaGemRB
Resource253=IDR_SHORTCUT (English (U.S.))
@@ -2982,7 +2982,7 @@
HeaderFile=CreatureProperties.h
ImplementationFile=CreatureProperties.cpp
BaseClass=CPropertyPage
-LastObject=IDC_SLOTPICKER
+LastObject=CCreatureStrings
Filter=D
VirtualFilter=dWC
@@ -5548,7 +5548,7 @@
ImplementationFile=GameGeneral.cpp
BaseClass=CDialog
Filter=W
-LastObject=IDC_AREA
+LastObject=IDC_UNKNOWN64
VirtualFilter=dWC
[DLG:IDD_GAMEPCINFO]
@@ -7697,23 +7697,24 @@
[DLG:IDD_CREATURESTRINGS (English (U.S.))]
Type=1
Class=CCreatureStrings
-ControlCount=16
+ControlCount=17
Control1=IDC_BUDDY,edit,1082196096
-Control2=IDC_SLOTPICKER,combobox,1344339970
-Control3=IDC_SLOTSPIN,msctls_updown32,1342177330
-Control4=IDC_REF,edit,1350631552
-Control5=IDC_TAGGED,button,1342242851
-Control6=IDC_SOUNDREF,edit,1350631560
-Control7=IDC_PLAY,button,1342242816
-Control8=IDC_TEXT,edit,1352732676
-Control9=IDC_STATIC,static,1342308352
-Control10=IDC_STATIC,static,1342308352
-Control11=IDC_STATIC,static,1342308352
-Control12=IDC_STATIC,static,1342308352
-Control13=IDC_COPY,button,1342242816
-Control14=IDC_PASTE,button,1342242816
-Control15=IDC_EXPORT,button,1342242816
-Control16=IDC_IMPORT,button,1342242816
+Control2=IDC_CLEAR,button,1342242816
+Control3=IDC_COPY,button,1342242816
+Control4=IDC_PASTE,button,1342242816
+Control5=IDC_EXPORT,button,1342242816
+Control6=IDC_IMPORT,button,1342242816
+Control7=IDC_SLOTPICKER,combobox,1344339970
+Control8=IDC_SLOTSPIN,msctls_updown32,1342177330
+Control9=IDC_REF,edit,1350631552
+Control10=IDC_TAGGED,button,1342242851
+Control11=IDC_SOUNDREF,edit,1350631560
+Control12=IDC_PLAY,button,1342242816
+Control13=IDC_TEXT,edit,1352732676
+Control14=IDC_STATIC,static,1342308352
+Control15=IDC_STATIC,static,1342308352
+Control16=IDC_STATIC,static,1342308352
+Control17=IDC_STATIC,static,1342308352
[DLG:IDD_CREATUREUNKNOWN (English (U.S.))]
Type=1
@@ -9441,10 +9442,10 @@
[DLG:IDD_GAMEGENERAL (English (U.S.))]
Type=1
Class=CGameGeneral
-ControlCount=38
+ControlCount=40
Control1=IDC_STARTAREA,edit,1350631560
-Control2=IDC_GAMETIME,edit,1350631552
-Control3=IDC_GOLD,edit,1350631552
+Control2=IDC_GAMETIME,edit,1350639744
+Control3=IDC_GOLD,edit,1350639744
Control4=IDCANCEL,button,1342242816
Control5=IDC_STATIC,static,1342308352
Control6=IDC_STATIC,static,1342308352
@@ -9461,7 +9462,7 @@
Control17=IDC_STATIC,static,1342308352
Control18=IDC_UNKNOWN1C,edit,1350631552
Control19=IDC_STATIC,static,1342308352
-Control20=IDC_UNKNOWN48,edit,1350631552
+Control20=IDC_UNKNOWN48,edit,1350639744
Control21=IDC_STATIC,static,1342308352
Control22=IDC_BROWSE,button,1342242816
Control23=IDC_SCREEN,edit,1350631552
@@ -9478,8 +9479,10 @@
Control34=IDC_BROWSE2,button,1342242816
Control35=IDC_AREA,edit,1350631560
Control36=IDC_STATIC,static,1342308352
-Control37=IDC_REALTIME,edit,1350631552
+Control37=IDC_REALTIME,edit,1350639744
Control38=IDC_STATIC,static,1342308352
+Control39=IDC_UNKNOWN64,edit,1350639744
+Control40=IDC_STATIC,static,1342308352
[DLG:IDD_GAMEPCINFO (English (U.S.))]
Type=1
Modified: chitem/trunk/chitem.rc
===================================================================
--- chitem/trunk/chitem.rc 2009-08-23 18:15:35 UTC (rev 7034)
+++ chitem/trunk/chitem.rc 2009-08-23 18:16:40 UTC (rev 7035)
@@ -1396,7 +1396,7 @@
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTROLPARENT
CAPTION "Edit Palette"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
CONTROL "",IDC_PALETTE,"Static",SS_BITMAP | SS_NOTIFY |
SS_SUNKEN | WS_BORDER,23,24,17,15,0,HIDC_PALETTE
@@ -2117,7 +2117,7 @@
EXSTYLE WS_EX_CONTROLPARENT
CAPTION "Edit Projectile:"
MENU IDR_PROJECT
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "Load Projectile",IDC_LOAD,7,245,52,14
PUSHBUTTON "Load external projectile",IDC_LOADEX,69,245,78,14
@@ -2727,7 +2727,12 @@
CAPTION "Soundset"
FONT 8, "MS Sans Serif"
BEGIN
- EDITTEXT IDC_BUDDY,57,6,40,14,ES_AUTOHSCROLL | NOT WS_VISIBLE
+ EDITTEXT IDC_BUDDY,50,6,40,14,ES_AUTOHSCROLL | NOT WS_VISIBLE
+ PUSHBUTTON "Clear slots",IDC_CLEAR,98,6,50,14
+ PUSHBUTTON "Copy slots",IDC_COPY,156,6,50,14
+ PUSHBUTTON "Paste slots",IDC_PASTE,214,6,50,14
+ PUSHBUTTON "Export soundset",IDC_EXPORT,272,6,56,14
+ PUSHBUTTON "Import soundset",IDC_IMPORT,336,6,55,14
COMBOBOX IDC_SLOTPICKER,7,22,375,170,CBS_DROPDOWN | WS_VSCROLL |
WS_TABSTOP
CONTROL "Spin1",IDC_SLOTSPIN,"msctls_updown32",UDS_SETBUDDYINT |
@@ -2743,10 +2748,6 @@
LTEXT "Sound ref.:",IDC_STATIC,245,45,36,8
LTEXT "Choose slot",IDC_STATIC,7,8,38,8
LTEXT "String reference",IDC_STATIC,68,45,51,8
- PUSHBUTTON "Copy slots",IDC_COPY,141,6,50,14
- PUSHBUTTON "Paste slots",IDC_PASTE,204,6,50,14
- PUSHBUTTON "Export soundset",IDC_EXPORT,267,6,56,14
- PUSHBUTTON "Import soundset",IDC_IMPORT,336,6,55,14
END
IDD_CREATUREUNKNOWN DIALOG DISCARDABLE 0, 0, 400, 199
@@ -3433,7 +3434,7 @@
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTROLPARENT
CAPTION "Area extension header"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
EDITTEXT IDC_DURATION,142,72,55,14,ES_AUTOHSCROLL
PUSHBUTTON "Back",IDOK,352,170,50,14
@@ -4735,10 +4736,12 @@
328,178,33,10
CONTROL "Top",IDC_FLAG6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
296,192,29,10
- CONTROL "7",IDC_FLAG7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,221,
- 161,20,10
+ CONTROL "7",IDC_FLAG7,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,296,161,51,10
CONTROL "Bottom",IDC_FLAG8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
328,192,38,10
+ CONTROL "Lowercase",IDC_FLAG9,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,296,161,51,10
LTEXT "Text justification",IDC_BUTTONFLAG,240,122,52,8
LTEXT "Steps",IDC_STEPS,193,150,19,8
END
@@ -5053,8 +5056,8 @@
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
EDITTEXT IDC_STARTAREA,7,19,48,14,ES_UPPERCASE | ES_AUTOHSCROLL
- EDITTEXT IDC_GAMETIME,115,19,48,14,ES_AUTOHSCROLL
- EDITTEXT IDC_GOLD,185,19,48,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_GAMETIME,115,19,48,14,ES_AUTOHSCROLL | ES_NUMBER
+ EDITTEXT IDC_GOLD,185,19,48,14,ES_AUTOHSCROLL | ES_NUMBER
PUSHBUTTON "&Back",IDCANCEL,195,161,46,14
LTEXT "Start area",IDC_STATIC,7,4,32,8
LTEXT "Gametime",IDC_STATIC,115,4,32,8
@@ -5079,8 +5082,8 @@
LTEXT "Weather",IDC_STATIC,7,67,28,8
EDITTEXT IDC_UNKNOWN1C,61,82,32,14,ES_AUTOHSCROLL
LTEXT "0x1C",IDC_STATIC,61,67,17,8
- EDITTEXT IDC_UNKNOWN48,185,82,48,14,ES_AUTOHSCROLL
- LTEXT "0x48",IDC_STATIC,185,67,16,8
+ EDITTEXT IDC_UNKNOWN48,185,48,48,14,ES_AUTOHSCROLL | ES_NUMBER
+ LTEXT "0x48",IDC_STATIC,185,37,16,8
PUSHBUTTON "Browse",IDC_BROWSE,61,19,50,14
EDITTEXT IDC_SCREEN,115,82,48,14,ES_AUTOHSCROLL
LTEXT "Controls on screen",IDC_STATIC,115,67,60,8
@@ -5097,8 +5100,10 @@
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
+ EDITTEXT IDC_REALTIME,115,48,48,14,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "Realtime",IDC_STATIC,115,37,28,8
+ EDITTEXT IDC_UNKNOWN64,185,82,48,14,ES_AUTOHSCROLL | ES_NUMBER
+ LTEXT "0x64",IDC_STATIC,185,67,16,8
END
IDD_GAMEPCINFO DIALOG DISCARDABLE 0, 0, 313, 259
Modified: chitem/trunk/game.cpp
===================================================================
--- chitem/trunk/game.cpp 2009-08-23 18:15:35 UTC (rev 7034)
+++ chitem/trunk/game.cpp 2009-08-23 18:16:40 UTC (rev 7035)
@@ -33,6 +33,7 @@
pcextensions=NULL;
deathvariables=NULL;
slocs=NULL;
+ pplocs=NULL;
//memset(qslots,0,sizeof(qslots));
npccount=0;
@@ -46,7 +47,7 @@
journalcount=0;
deathvariablecount=0;
sloccount=0;
-
+ ppcount=0;
revision=20; //bg2 revision is 2.0
}
@@ -63,6 +64,7 @@
KillMazeData();
KillJournals();
KillSavedLocs();
+ KillPPLocs();
KillDeathVariables();
}
@@ -261,6 +263,8 @@
if(revision==22) fullsize+=4;
header.slocoffset=fullsize;
fullsize+=header.sloccount*sizeof(gam_sloc);
+ header.ppoffset=fullsize;
+ fullsize+=header.ppcount*sizeof(gam_sloc);
}
if(calculate)
@@ -390,6 +394,11 @@
{
return -2;
}
+ esize=ppcount*sizeof(gam_sloc);
+ if(write(fhandle,pplocs,esize)!=esize)
+ {
+ return -2;
+ }
return 0;
}
@@ -764,8 +773,35 @@
return -2;
}
fullsize+=esize;
- } else sloccount = 0;
+
+ flg=adjust_actpoint(header.ppoffset);
+ if(flg<0)
+ {
+ return flg;
+ }
+ if(flg) ret|=flg;
+
+ if(ppcount!=header.ppcount)
+ {
+ KillPPLocs();
+ pplocs = new gam_sloc[header.ppcount];
+ if(!slocs) return -3;
+ ppcount=header.ppcount;
+ }
+ esize =sizeof(gam_sloc)*header.ppcount;
+ if(read(fhandle,pplocs, esize)!=esize)
+ {
+ return -2;
+ }
+ fullsize+=esize;
+ }
+ else
+ {
+ sloccount = 0;
+ ppcount = 0;
+ }
+
if(revision==22) //this is a hack for iwd2
{
fullsize+=4;
Modified: chitem/trunk/game.h
===================================================================
--- chitem/trunk/game.h 2009-08-23 18:15:35 UTC (rev 7034)
+++ chitem/trunk/game.h 2009-08-23 18:16:40 UTC (rev 7035)
@@ -30,7 +30,7 @@
int journalcount;
int pcstructcount, npcstructcount;
int pcextensioncount, npcextensioncount;
- int sloccount;
+ int sloccount, ppcount;
gam_variable *variables, *deathvariables;
gam_npc *pcs, *npcs;
@@ -38,6 +38,7 @@
gam_mazedata *mazedata;
gam_journal *journals;
gam_sloc *slocs;
+ gam_sloc *pplocs;
char **npcstructs;
char **pcstructs;
gam_npc_extension *pcextensions, *npcextensions;
@@ -172,6 +173,15 @@
sloccount=0;
}
}
+ inline void KillPPLocs()
+ {
+ if(pplocs)
+ {
+ delete[] pplocs;
+ pplocs=NULL;
+ ppcount=0;
+ }
+ }
private:
int ReadCreData(int offset, int size, char *&pointer,int &fullsize);
int ReadExtension(char *pointer, int &fullsize, int mysize);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|