[Sphere-axis-commits] CVS: UOArt UOArt.odl,1.3,1.4 UOArt.rc,1.4,1.5 UOArtCtl.cpp,1.9,1.10 UOArtCtl.h
Brought to you by:
pesterle
Menu
▾
▴
[Sphere-axis-commits] CVS: UOArt UOArt.odl,1.3,1.4 UOArt.rc,1.4,1.5 UOArtCtl.cpp,1.9,1.10 UOArtCtl.h,1.7,1.8 UOArt.opt,1.8,1.9
|
From: Philip E. <pes...@us...> - 2002-05-11 05:48:03
|
Update of /cvsroot/sphere-axis/UOArt
In directory usw-pr-cvs1:/tmp/cvs-serv31691
Modified Files:
UOArt.odl UOArt.rc UOArtCtl.cpp UOArtCtl.h UOArt.opt
Log Message:
Merged version_1_2_development branch into main trunk
Index: UOArt.odl
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArt.odl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** UOArt.odl 12 Jun 2001 23:39:00 -0000 1.3
--- UOArt.odl 11 May 2002 05:47:58 -0000 1.4
***************
*** 54,57 ****
--- 54,61 ----
[id(19)] void RemoveHideStatic(short ID, long Block, short x, short y, short z, short color);
[id(20)] void RedrawControl();
+ [id(21)] void SetMulPath(BSTR pszNewPath);
+ [id(22)] BSTR GetMulPath();
+ [id(23)] boolean SetCustomMulFile(short sFileIndex, BSTR pszNewFilePath);
+ [id(24)] BSTR GetCustomMulPath(short sFileIndex);
//}}AFX_ODL_METHOD
Index: UOArt.rc
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArt.rc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** UOArt.rc 1 May 2002 03:42:32 -0000 1.4
--- UOArt.rc 11 May 2002 05:47:58 -0000 1.5
***************
*** 46,50 ****
//Microsoft Developer Studio generated resource script.
! //
#include "resource.h"
--- 46,50 ----
//Microsoft Developer Studio generated resource script.
! // Last compiled 5/10/2002 at 23:15:3
#include "resource.h"
***************
*** 101,106 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,1,0,0
! PRODUCTVERSION 1,1,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 101,106 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,2,0,2
! PRODUCTVERSION 1,2,0,2
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 120,124 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "UOArt ActiveX Control Module\0"
! VALUE "FileVersion", "1, 2, 0, 0\0"
VALUE "InternalName", "UOArt\0"
VALUE "LegalCopyright", "Copyright (C) 2000, 2001\0"
--- 120,124 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "UOArt ActiveX Control Module\0"
! VALUE "FileVersion", "1, 2, 0, 2\0"
VALUE "InternalName", "UOArt\0"
VALUE "LegalCopyright", "Copyright (C) 2000, 2001\0"
***************
*** 128,132 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "UOArt ActiveX Control Module\0"
! VALUE "ProductVersion", "1, 2, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
--- 128,132 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "UOArt ActiveX Control Module\0"
! VALUE "ProductVersion", "1, 2, 0, 2\0"
VALUE "SpecialBuild", "\0"
END
Index: UOArtCtl.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArtCtl.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** UOArtCtl.cpp 1 May 2002 03:42:32 -0000 1.9
--- UOArtCtl.cpp 11 May 2002 05:47:58 -0000 1.10
***************
*** 42,129 ****
IMPLEMENT_DYNCREATE(CUOArtCtrl, COleControl)
- #pragma pack(push, muldata, 1)
! struct ArtIdx
{
! DWORD dwLookup;
! DWORD dwSize;
! DWORD dwUnknown;
! };
[...1519 lines suppressed...]
!
! BOOL CUOArtCtrl::SetCustomMulFile(short sFileIndex, LPCTSTR pszNewFilePath)
! {
! if ( sFileIndex < 0 || sFileIndex > m_saMulPaths.GetUpperBound() || ( sFileIndex >= 0x13 && sFileIndex <=0x1d) )
! return FALSE; // Invalid index!
! m_saMulPaths.SetAt(sFileIndex, pszNewFilePath);
! return TRUE;
! }
!
! BSTR CUOArtCtrl::GetCustomMulPath(short sFileIndex)
! {
! CString strResult;
! if ( sFileIndex < 0 || sFileIndex > m_saMulPaths.GetUpperBound() || ( sFileIndex >= 0x13 && sFileIndex <=0x1d) )
! {
! // Do nothing...we never set these
! }
! else
! strResult = m_saMulPaths.GetAt(sFileIndex);
! return strResult.AllocSysString();
! }
Index: UOArtCtl.h
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArtCtl.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** UOArtCtl.h 1 May 2002 03:42:32 -0000 1.7
--- UOArtCtl.h 11 May 2002 05:47:58 -0000 1.8
***************
*** 42,45 ****
--- 42,177 ----
+ #pragma pack(push, muldata, 1)
+
+ struct ArtIdx
+ {
+ DWORD dwLookup;
+ DWORD dwSize;
+ DWORD dwUnknown;
+ };
+
+ class CHueEntry
+ {
+ public:
+ WORD wColorTable[32];
+ WORD wTableStart;
+ WORD wTableEnd;
+ CHAR cName[20];
+ };
+
+ class CHueGroup
+ {
+ public:
+ DWORD dwHeader;
+ CHueEntry Hues[8];
+ };
+
+ class CMultiRec
+ {
+ public:
+ WORD wIndex;
+ short x;
+ short y;
+ short z;
+ DWORD dwFlags;
+ };
+
+ class CStaticRec
+ {
+ public:
+ WORD wIndex;
+ BYTE x;
+ BYTE y;
+ CHAR z;
+ WORD wColor;
+ };
+
+ class CCellData
+ {
+ public:
+ WORD wID;
+ CHAR z;
+ };
+
+ class CMapBlock
+ {
+ public:
+ DWORD dwHeader;
+ CCellData cell [64];
+ };
+
+ class CStaticObj : public CStaticRec
+ {
+ public:
+ DWORD dwBlock;
+ };
+
+ class CDynamicObj : public CStaticRec
+ {
+ public:
+ DWORD dwBlock;
+ WORD wFlags;
+ };
+
+ class CVerdataIdx
+ {
+ public:
+ DWORD dwID;
+ DWORD dwBlock;
+ DWORD dwOffset;
+ DWORD dwSize;
+ DWORD dwCRC;
+
+ CVerdataIdx();
+ };
+
+ #define VERFILE_MAP0 0x00
+ #define VERFILE_STAIDX0 0x01
+ #define VERFILE_STATICS0 0x02
+ #define VERFILE_ARTIDX 0x03
+ #define VERFILE_ART 0x04
+ #define VERFILE_ANIMIDX 0x05
+ #define VERFILE_ANIM 0x06
+ #define VERFILE_SOUNDIDX 0x07
+ #define VERFILE_SOUND 0x08
+ #define VERFILE_TEXIDX 0x09
+ #define VERFILE_TEXMAPS 0x0a
+ #define VERFILE_GUMPIDX 0x0b
+ #define VERFILE_GUMPART 0x0c
+ #define VERFILE_MULTIIDX 0x0d
+ #define VERFILE_MULTI 0x0e
+ #define VERFILE_SKILLSIDX 0x0f
+ #define VERFILE_SKILLS 0x10
+ #define VERFILE_LIGHTIDX 0x11 // ???
+ #define VERFILE_LIGHT 0x12 // ???
+ #define VERFILE_TILEDATA 0x1e
+ #define VERFILE_ANIMDATA 0x1f
+ #define VERFILE_HUES 0x20
+ // don't know about these...so we'll assign them numbers for now
+ #define VERFILE_ANIMINFO 0x21
+ #define VERFILE_FONTS 0x22
+ #define VERFILE_RADARCOL 0x23
+ #define VERFILE_VERDATA 0x24
+ #define VERFILE_MAP2 0x25
+ #define VERFILE_STAIDX2 0x26
+ #define VERFILE_STATICS2 0x27
+
+
+ class CItemCache
+ {
+ public:
+ CItemCache();
+ CItemCache(WORD wIndex, CString csClientPath, CVerdataIdx * pVerdata = NULL);
+ ~CItemCache();
+ BYTE * GetBuffer() { return &m_pBuffer[0]; }
+ WORD GetIndex() { return m_wIndex; }
+ protected:
+ WORD m_wIndex;
+ BYTE * m_pBuffer;
+ };
+
+ #pragma pack(pop, muldata)
+
+
class CUOArtCtrl : public COleControl
{
***************
*** 75,87 ****
--- 207,227 ----
// Implementation
protected:
+ CString m_csMulPath;
+ CStringArray m_saMulPaths;
+
CPtrArray m_paStatics;
CPtrArray m_paDynamics;
+ void InitializeMulPaths();
BYTE m_tiledata [0xFD000];
void LoadTiledata();
WORD m_wArtWidth[0x10000];
WORD m_wArtHeight[0x10000];
+ bool m_bArtDataLoaded;
void LoadArtData();
void DrawRoomview(CRect bounds, WORD wArtHeight);
BYTE * LoadCache(WORD wIndex);
+ void LoadVerdataIndex();
+ DWORD FindVerdata(DWORD dwID, DWORD dwBlock);
+ DWORD m_dwVerdataBlocks;
CPtrList m_cache;
#define F_ROOMVIEW 0x0001
***************
*** 107,110 ****
--- 247,251 ----
void RedrawArt(CDC* pdc, const CRect& rcBounds, const CRect& rcInvalid);
~CUOArtCtrl();
+ CVerdataIdx * m_pVerdataIdx;
DECLARE_OLECREATE_EX(CUOArtCtrl) // Class factory and guid
***************
*** 148,151 ****
--- 289,296 ----
afx_msg void RemoveHideStatic(short ID, long Block, short x, short y, short z, short color);
afx_msg void RedrawControl();
+ afx_msg void SetMulPath(LPCTSTR pszNewPath);
+ afx_msg BSTR GetMulPath();
+ afx_msg BOOL SetCustomMulFile(short sFileIndex, LPCTSTR pszNewFilePath);
+ afx_msg BSTR GetCustomMulPath(short sFileIndex);
//}}AFX_DISPATCH
DECLARE_DISPATCH_MAP()
***************
*** 180,183 ****
--- 325,332 ----
dispidRemoveHideStatic = 19L,
dispidRedrawControl = 20L,
+ dispidSetMulPath = 21L,
+ dispidGetMulPath = 22L,
+ dispidSetCustomMulFile = 23L,
+ dispidGetCustomMulPath = 24L,
//}}AFX_DISP_ID
};
Index: UOArt.opt
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArt.opt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
Binary files /tmp/cvsGKcrw6 and /tmp/cvsucOKw2 differ
|
