sphere-axis-commits Mailing List for Axis for Sphere (Page 4)
Brought to you by:
pesterle
Menu
▾
▴
sphere-axis-commits — Sends log information when files are committed to CVS
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(71) |
Jun
(4) |
Jul
(26) |
Aug
(23) |
Sep
(6) |
Oct
(2) |
Nov
(74) |
Dec
(89) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(88) |
Feb
(51) |
Mar
(26) |
Apr
(8) |
May
(55) |
Jun
(67) |
Jul
(37) |
Aug
(46) |
Sep
(12) |
Oct
(6) |
Nov
|
Dec
|
| 2004 |
Jan
|
Feb
|
Mar
(13) |
Apr
(8) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Philip E. <pes...@us...> - 2003-08-06 19:37:11
|
Update of /cvsroot/sphere-axis/axissvr
In directory sc8-pr-cvs1:/tmp/cvs-serv4479
Modified Files:
ServerConfiguration.cpp ServerObj.cpp
Log Message:
Code changes to make linux version actually do something.
Index: ServerConfiguration.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/ServerConfiguration.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ServerConfiguration.cpp 5 Aug 2003 04:55:12 -0000 1.5
--- ServerConfiguration.cpp 6 Aug 2003 19:37:08 -0000 1.6
***************
*** 473,476 ****
--- 473,478 ----
_string CServerConfiguration::xmlToString(xmlChar * s)
{
+ #ifdef _WIN32
+ // Why do we convert from multibyte to wide and back?
int iLen = xmlStrlen(s);
_string sOut;
***************
*** 478,486 ****
WCHAR * pwString = new WCHAR [iLen + 1];
memset(pwString, 0x00, (iLen + 1) * 2);
- #ifdef _WIN32
MultiByteToWideChar(CP_UTF8, 0, (const char*) s, iLen, pwString, iLen);
! #else
! mbstowcs(pwString, (const char *) s, iLen);
! #endif
TCHAR * szOut = new TCHAR [iLen + 1];
memset(szOut, 0x00, sizeof(TCHAR) * (iLen + 1));
--- 480,486 ----
WCHAR * pwString = new WCHAR [iLen + 1];
memset(pwString, 0x00, (iLen + 1) * 2);
MultiByteToWideChar(CP_UTF8, 0, (const char*) s, iLen, pwString, iLen);
! //mbstowcs(pwString, (const char *) s, iLen);
!
TCHAR * szOut = new TCHAR [iLen + 1];
memset(szOut, 0x00, sizeof(TCHAR) * (iLen + 1));
***************
*** 488,498 ****
_stprintf(szOut, "%s", pwString);
#else
! _stprintf(szOut, "%S", pwString);
#endif
sOut.assign(szOut);
delete [] szOut;
delete [] pwString;
xmlFree(s);
return sOut;
}
--- 488,504 ----
_stprintf(szOut, "%s", pwString);
#else
! _stprintf(szOut, "%ls", pwString);
#endif
sOut.assign(szOut);
delete [] szOut;
delete [] pwString;
+ #else // Linux
+ _string sOut;
+ if ( xmlStrlen(s) )
+ sOut.assign((const char*) s);
+ #endif
xmlFree(s);
return sOut;
+
}
Index: ServerObj.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/ServerObj.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** ServerObj.cpp 5 Aug 2003 22:25:01 -0000 1.8
--- ServerObj.cpp 6 Aug 2003 19:37:08 -0000 1.9
***************
*** 125,129 ****
int main(int argc, TCHAR *argv[])
{
!
}
#endif
--- 125,136 ----
int main(int argc, TCHAR *argv[])
{
! CAxisServer server;
! server.Create();
! BOOL bContinue = TRUE;
! while ( server.Tick() )
! {
! // Is there anything we need to do between ticks?
! }
! return 0;
}
#endif
***************
*** 342,346 ****
// Periodically, reload the spawnpoint information.
time_t timeNow = time(NULL);
! if ( timeNow - m_lastSpawnLoadTime >m_config.SpawnRefreshtime() )
{
m_lastSpawnLoadTime = timeNow;
--- 349,353 ----
// Periodically, reload the spawnpoint information.
time_t timeNow = time(NULL);
! if ( timeNow - m_lastSpawnLoadTime > m_config.SpawnRefreshtime() )
{
m_lastSpawnLoadTime = timeNow;
|
|
From: Philip E. <pes...@us...> - 2003-08-05 22:25:03
|
Update of /cvsroot/sphere-axis/axissvr
In directory sc8-pr-cvs1:/tmp/cvs-serv9480
Modified Files:
ServerObj.cpp
Log Message:
Fixed syntax error in pipe() call.
Index: ServerObj.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/ServerObj.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** ServerObj.cpp 5 Aug 2003 21:09:22 -0000 1.7
--- ServerObj.cpp 5 Aug 2003 22:25:01 -0000 1.8
***************
*** 943,947 ****
#else
int fdPipe[2];
! if ( pipe(&fdPipe) )
{
SysMessage(_T("Unable to create pipe! The error was %ld - %s\n"), errno, strerror(errno));
--- 943,947 ----
#else
int fdPipe[2];
! if ( pipe(fdPipe) )
{
SysMessage(_T("Unable to create pipe! The error was %ld - %s\n"), errno, strerror(errno));
|
|
From: Philip E. <pes...@us...> - 2003-08-05 21:09:25
|
Update of /cvsroot/sphere-axis/axissvr
In directory sc8-pr-cvs1:/tmp/cvs-serv29936
Modified Files:
ServerObj.cpp
Log Message:
Added code to create named pipe in linux.
Index: ServerObj.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/ServerObj.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ServerObj.cpp 4 Aug 2003 23:20:54 -0000 1.6
--- ServerObj.cpp 5 Aug 2003 21:09:22 -0000 1.7
***************
*** 942,946 ****
return TRUE;
#else
! // Need to add code to create pipes in linux
return TRUE;
#endif
--- 942,951 ----
return TRUE;
#else
! int fdPipe[2];
! if ( pipe(&fdPipe) )
! {
! SysMessage(_T("Unable to create pipe! The error was %ld - %s\n"), errno, strerror(errno));
! return FALSE;
! }
return TRUE;
#endif
|
|
From: Philip E. <pes...@us...> - 2003-08-05 20:43:08
|
Update of /cvsroot/sphere-axis/Axis/S_Sphere52
In directory sc8-pr-cvs1:/tmp/cvs-serv24790/S_Sphere52
Modified Files:
Item.cpp Item.h itemeditdlg.cpp ScriptsMain.cpp ScriptsMain.h
WorldItem.cpp
Log Message:
Base items loaded as part of the CWorldItem::LoadBase() method are now cached.
Index: Item.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Item.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Item.cpp 23 Jul 2003 19:10:57 -0000 1.4
--- Item.cpp 5 Aug 2003 20:43:05 -0000 1.5
***************
*** 85,89 ****
this->m_iCharges = 0;
this->m_iSpeed = 0;
! this->m_wAttr = 0;
this->m_csDupeItem = _T("");
this->m_dwMore1 = 0;
--- 85,89 ----
this->m_iCharges = 0;
this->m_iSpeed = 0;
! this->m_dwAttr = 0;
this->m_csDupeItem = _T("");
this->m_dwMore1 = 0;
***************
*** 153,157 ****
this->m_iSpeed = pCopy->m_iSpeed;
this->m_iTimer = pCopy->m_iTimer;
! this->m_wAttr = pCopy->m_wAttr;
this->m_csDupeItem = pCopy->m_csDupeItem;
this->m_csDispID = pCopy->m_csDispID;
--- 153,157 ----
this->m_iSpeed = pCopy->m_iSpeed;
this->m_iTimer = pCopy->m_iTimer;
! this->m_dwAttr = pCopy->m_dwAttr;
this->m_csDupeItem = pCopy->m_csDupeItem;
this->m_csDispID = pCopy->m_csDispID;
***************
*** 492,497 ****
case 19:
bTagsHandled[19] = true;
! if (this->m_wAttr != 0)
! csNewVal.Format(_T("ATTR=%04x\n"), this->m_wAttr);
break;
case 20:
--- 492,497 ----
case 19:
bTagsHandled[19] = true;
! if (this->m_dwAttr != 0)
! csNewVal.Format(_T("ATTR=%08x\n"), this->m_dwAttr);
break;
case 20:
***************
*** 676,680 ****
break;
case 19: // ATTR
! this->m_wAttr = (WORD) ahextoi(csValue); break;
case 20: // SPEED
this->m_iSpeed = _tstoi(csValue); break;
--- 676,680 ----
break;
case 19: // ATTR
! this->m_dwAttr = ahextoi(csValue); break;
case 20: // SPEED
this->m_iSpeed = _tstoi(csValue); break;
Index: Item.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Item.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Item.h 23 Jul 2003 19:10:57 -0000 1.3
--- Item.h 5 Aug 2003 20:43:05 -0000 1.4
***************
*** 42,46 ****
void Copy(CItem *pCopy);
void Dupe(CItem *);
! WORD m_wAttr;
CIntRange m_irSellValue;
CIntRange m_irBuyValue;
--- 42,46 ----
void Copy(CItem *pCopy);
void Dupe(CItem *);
! DWORD m_dwAttr;
CIntRange m_irSellValue;
CIntRange m_irBuyValue;
Index: itemeditdlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/itemeditdlg.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** itemeditdlg.cpp 24 Jul 2003 20:12:44 -0000 1.7
--- itemeditdlg.cpp 5 Aug 2003 20:43:05 -0000 1.8
***************
*** 541,545 ****
EnableControls(true);
m_ccbDupeitem.SetCurSel(-1);
! if (pItem->m_wAttr & 0x20)
{
m_cbMagical.SetCheck(1);
--- 541,545 ----
EnableControls(true);
m_ccbDupeitem.SetCurSel(-1);
! if (pItem->m_dwAttr & 0x20)
{
m_cbMagical.SetCheck(1);
***************
*** 1095,1099 ****
m_pItem->m_irSellValue.min = tmp;
}
! m_pItem->m_wAttr = ( this->m_cbMagical.GetCheck() == 1 ) ? 0x0020 : 0x0000;
}
else
--- 1095,1099 ----
m_pItem->m_irSellValue.min = tmp;
}
! m_pItem->m_dwAttr = ( this->m_cbMagical.GetCheck() == 1 ) ? 0x0020 : 0x0000;
}
else
***************
*** 1138,1142 ****
m_pItem->m_irSellValue.max = 0;
m_pItem->m_irSellValue.min = 0;
! m_pItem->m_wAttr = 0;
m_pItem->m_csDispID = _T("");
}
--- 1138,1142 ----
m_pItem->m_irSellValue.max = 0;
m_pItem->m_irSellValue.min = 0;
! m_pItem->m_dwAttr = 0;
m_pItem->m_csDispID = _T("");
}
Index: ScriptsMain.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptsMain.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** ScriptsMain.cpp 4 Aug 2003 14:17:41 -0000 1.30
--- ScriptsMain.cpp 5 Aug 2003 20:43:05 -0000 1.31
***************
*** 165,168 ****
--- 165,169 ----
m_pRCDlg = NULL;
m_bDeleteRC = false;
+ m_aItemCache.MaxEntries(4096);
}
***************
*** 3571,3573 ****
--- 3572,3614 ----
else
return m_vMulFiles[index];
+ }
+
+ CItem * CScriptsMain::LoadItemFromCache(CString sID)
+ {
+ int idx = m_aItemCache.Find(sID);
+ if ( idx != -1 )
+ {
+ CItem * pItem = m_aItemCache.GetAt(idx);
+ m_aItemCache.Promote(pItem);
+ return pItem;
+ }
+
+ // Find the base script
+ idx =m_aItems.Find(sID);
+ if ( idx == -1 )
+ {
+ DWORD dwDef = DefLookup(sID);
+ if ( dwDef != 0 )
+ {
+ CString csDef;
+ csDef.Format(_T("0%x"), dwDef);
+ idx = Main->m_pScripts->m_aItems.Find(csDef);
+ }
+ if ( idx == -1 )
+ {
+ LOG(locale->String(IDS_SCRIPTS_NOBASEITEM), sID);
+ return NULL;
+ }
+ }
+ CDisplayedScriptBase * pObject = (CDisplayedScriptBase *) Main->m_pScripts->m_aItems.GetAt(idx);
+ if ( !pObject )
+ return false;
+
+ // Load the item and add it to the cache
+ CItem *pItem = new CItem;
+ pItem->CopyBase(pObject);
+ pItem->Load(_T("[%s]"));
+
+ m_aItemCache.Cache(pItem);
+ return pItem;
}
Index: ScriptsMain.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptsMain.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** ScriptsMain.h 27 Jul 2003 20:44:55 -0000 1.20
--- ScriptsMain.h 5 Aug 2003 20:43:05 -0000 1.21
***************
*** 32,35 ****
--- 32,37 ----
#include "MapScriptEditDlg.h"
#include "RemoteConsoleDlg.h"
+ #include "ScriptCache.h"
+ #include "Item.h"
#include <vector>
***************
*** 359,362 ****
--- 361,366 ----
void DeleteRC() { m_bDeleteRC = true; }
+ CItem * LoadItemFromCache(CString sID);
+
protected:
bool m_bDefsLoaded;
***************
*** 455,457 ****
--- 459,462 ----
vector<CString> m_vMulFiles;
CRemoteConsoleDlg * m_pRCDlg;
+ CScriptCache<class CItem*> m_aItemCache;
};
Index: WorldItem.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/WorldItem.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** WorldItem.cpp 4 Aug 2003 14:17:41 -0000 1.4
--- WorldItem.cpp 5 Aug 2003 20:43:05 -0000 1.5
***************
*** 203,234 ****
CString sBase;
sBase.Format(_T("%04x"), ahextoi(m_csBaseID));
! int idx = Main->m_pScripts->m_aItems.Find(sBase);
! if ( idx == -1 )
! {
! DWORD dwDef = DefLookup(m_csBaseID);
! if ( dwDef != 0 )
! {
! CString csDef;
! csDef.Format(_T("0%x"), dwDef);
! idx = Main->m_pScripts->m_aItems.Find(csDef);
! }
! if ( idx == -1 )
! {
! LOG(locale->String(IDS_SCRIPTS_NOBASEITEM), m_csBaseID);
! return false;
! }
! }
! CDisplayedScriptBase * pObject = (CDisplayedScriptBase *) Main->m_pScripts->m_aItems.GetAt(idx);
! if ( !pObject )
return false;
! CItem base;
! base.CopyBase(pObject);
! base.Load(_T("[%s]"));
!
! this->m_dwItemType = base.m_dwType;
! this->m_dwMore1 = base.m_dwMore1;
! this->m_dwMore2 = base.m_dwMore2;
! this->m_dwAttr = (DWORD) base.m_wAttr;
! // this->m_csName = base.m_csItemName; -- Don't do this...we should use the tiledata for the name unless the name is set in the worldfile
return true;
--- 203,214 ----
CString sBase;
sBase.Format(_T("%04x"), ahextoi(m_csBaseID));
! // Load the base item from cache
! CItem * pBase = Main->m_pScripts->LoadItemFromCache(sBase);
! if ( !pBase )
return false;
! this->m_dwItemType = pBase->m_dwType;
! this->m_dwMore1 = pBase->m_dwMore1;
! this->m_dwMore2 = pBase->m_dwMore2;
! this->m_dwAttr = pBase->m_dwAttr;
return true;
|
|
From: Philip E. <pes...@us...> - 2003-08-05 20:43:08
|
Update of /cvsroot/sphere-axis/Axis/S_ScriptsBase
In directory sc8-pr-cvs1:/tmp/cvs-serv24790/S_ScriptsBase
Modified Files:
S_ScriptsBase.vcproj ScriptArray.h
Added Files:
ScriptCache.cpp ScriptCache.h
Log Message:
Base items loaded as part of the CWorldItem::LoadBase() method are now cached.
--- NEW FILE: ScriptCache.cpp ---
#include "StdAfx.h"
#include "scriptcache.h"
--- NEW FILE: ScriptCache.h ---
#pragma once
#include "scriptarray.h"
template <class ScriptPtrType> class __declspec(dllexport) CScriptCache :
public CScriptArray<ScriptPtrType>
{
public:
CScriptCache(void)
{
}
~CScriptCache(void)
{
}
int MaxEntries() { return m_iMaxEntries; }
void MaxEntries(int i) { m_iMaxEntries = i; }
int Entries() { return m_vCacheLinks.size(); }
void Promote(ScriptPtrType pObj)
{
for ( vector<void*>::iterator i = m_vCacheLinks.begin(); i < m_vCacheLinks.end(); i++ )
{
if ( *i == ((void*) pObj) )
{
m_vCacheLinks.erase(i);
m_vCacheLinks.push_back((void*)pObj);
break;
}
}
// Didn't find it! Add it to the cache
Cache(pObj);
}
void Cache(ScriptPtrType pObj)
{
// Add to the cache array
Add(pObj);
// Add to the list of cached objects
void * ptr = (void*) pObj;
m_vCacheLinks.push_back(ptr);
// Remove the oldest cached object if we have exceeded our limit
while ( m_vCacheLinks.size() > (size_t) m_iMaxEntries )
{
vector<void*>::iterator i = m_vCacheLinks.begin();
ScriptPtrType pObj = (ScriptPtrType) *i;
Remove(pObj);
m_vCacheLinks.erase(i);
}
return;
}
protected:
vector<void*> m_vCacheLinks;
int m_iMaxEntries;
};
Index: S_ScriptsBase.vcproj
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/S_ScriptsBase.vcproj,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** S_ScriptsBase.vcproj 9 Jul 2003 19:57:26 -0000 1.12
--- S_ScriptsBase.vcproj 5 Aug 2003 20:43:05 -0000 1.13
***************
*** 151,154 ****
--- 151,157 ----
</File>
<File
+ RelativePath="ScriptCache.cpp">
+ </File>
+ <File
RelativePath="StringBlock.cpp">
</File>
***************
*** 234,237 ****
--- 237,243 ----
<File
RelativePath="ScriptBase.h">
+ </File>
+ <File
+ RelativePath="ScriptCache.h">
</File>
<File
Index: ScriptArray.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/ScriptArray.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** ScriptArray.h 24 Jul 2003 20:12:44 -0000 1.7
--- ScriptArray.h 5 Aug 2003 20:43:05 -0000 1.8
***************
*** 113,117 ****
void Remove(ScriptPtrType pScript)
{
! vector<ScriptPtrType>::iterator p = m_members.find(m_members.begin(), m_members.end(), pScript);
if ( p != m_members.end() )
{
--- 113,117 ----
void Remove(ScriptPtrType pScript)
{
! vector<ScriptPtrType>::iterator p = find(m_members.begin(), m_members.end(), pScript);
if ( p != m_members.end() )
{
|
|
From: Philip E. <pes...@us...> - 2003-08-05 04:55:15
|
Update of /cvsroot/sphere-axis/axissvr In directory sc8-pr-cvs1:/tmp/cvs-serv25659 Modified Files: ServerConfiguration.cpp Log Message: Added linux equivalent of MultiByteToWideChar function call. Index: ServerConfiguration.cpp =================================================================== RCS file: /cvsroot/sphere-axis/axissvr/ServerConfiguration.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** ServerConfiguration.cpp 4 Aug 2003 23:20:54 -0000 1.4 --- ServerConfiguration.cpp 5 Aug 2003 04:55:12 -0000 1.5 *************** *** 481,485 **** MultiByteToWideChar(CP_UTF8, 0, (const char*) s, iLen, pwString, iLen); #else ! // Need to build a portable version of this function #endif TCHAR * szOut = new TCHAR [iLen + 1]; --- 481,485 ---- MultiByteToWideChar(CP_UTF8, 0, (const char*) s, iLen, pwString, iLen); #else ! mbstowcs(pwString, (const char *) s, iLen); #endif TCHAR * szOut = new TCHAR [iLen + 1]; |
|
From: Philip E. <pes...@us...> - 2003-08-05 04:27:07
|
Update of /cvsroot/sphere-axis/axissvr In directory sc8-pr-cvs1:/tmp/cvs-serv22733 Modified Files: AxisServer.h ServerObj.h Log Message: Tweaks to get the updated code to compile in Windows again. Index: AxisServer.h =================================================================== RCS file: /cvsroot/sphere-axis/axissvr/AxisServer.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** AxisServer.h 16 Jun 2003 03:58:35 -0000 1.3 --- AxisServer.h 5 Aug 2003 04:27:04 -0000 1.4 *************** *** 41,44 **** --- 41,45 ---- #include "ClientObj.h" + ///////////////////////////////////////////////////////////////////////////// // CAxisServerApp: Index: ServerObj.h =================================================================== RCS file: /cvsroot/sphere-axis/axissvr/ServerObj.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** ServerObj.h 4 Aug 2003 23:20:54 -0000 1.6 --- ServerObj.h 5 Aug 2003 04:27:04 -0000 1.7 *************** *** 29,32 **** --- 29,36 ---- #include <vector> + #ifdef _WIN32 + #include "MainFrm.h" + #endif + using namespace std; |
|
From: Philip E. <pes...@us...> - 2003-08-05 04:07:52
|
Update of /cvsroot/sphere-axis/axissvr
In directory sc8-pr-cvs1:/tmp/cvs-serv20624
Modified Files:
Makefile.in acinclude.m4 aclocal.m4 configure configure.in
Added Files:
depcomp
Log Message:
Additional tweaks to make the configure script work.
--- NEW FILE: depcomp ---
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
# Copyright 1999, 2000 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# Originally written by Alexandre Oliva <ol...@dc...>.
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
fi
# `libtool' can also be set to `yes' or `no'.
if test -z "$depfile"; then
base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
dir=`echo "$object" | sed 's,/.*$,/,'`
if test "$dir" = "$object"; then
dir=
fi
# FIXME: should be _deps on DOS.
depfile="$dir.deps/$base"
fi
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
# Some modes work just like other modes, but use different flags. We
# parameterize here, but still list the modes in the big case below,
# to make depend.m4 easier to write. Note that we *cannot* use a case
# here, because this file can only contain one case statement.
if test "$depmode" = hp; then
# HP compiler uses -M and no extra arg.
gccflag=-M
depmode=gcc
fi
if test "$depmode" = dashXmstdout; then
# This is just like dashmstdout with a different argument.
dashmflag=-xM
depmode=dashmstdout
fi
case "$depmode" in
gcc3)
## gcc 3 implements dependency tracking that does exactly what
## we want. Yay! Note: for some reason libtool 1.4 doesn't like
## it if -MD -MP comes after the -MF stuff. Hmm.
"$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
exit $stat
fi
mv "$tmpdepfile" "$depfile"
;;
gcc)
## There are various ways to get dependency output from gcc. Here's
## why we pick this rather obscure method:
## - Don't want to use -MD because we'd like the dependencies to end
## up in a subdir. Having to rename by hand is ugly.
## (We might end up doing this anyway to support other compilers.)
## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
## -MM, not -M (despite what the docs say).
## - Using -M directly means running the compiler twice (even worse
## than renaming).
if test -z "$gccflag"; then
gccflag=-MD,
fi
"$@" -Wp,"$gccflag$tmpdepfile"
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
exit $stat
fi
rm -f "$depfile"
echo "$object : \\" > "$depfile"
alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
## The second -e expression handles DOS-style file names with drive letters.
sed -e 's/^[^:]*: / /' \
-e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
## This next piece of magic avoids the `deleted header file' problem.
## The problem is that when a header file which appears in a .P file
## is deleted, the dependency causes make to die (because there is
## typically no way to rebuild the header). We avoid this by adding
## dummy dependencies for each header file. Too bad gcc doesn't do
## this for us directly.
tr ' ' '
' < "$tmpdepfile" |
## Some versions of gcc put a space before the `:'. On the theory
## that the space means something, we add a space to the output as
## well.
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
hp)
# This case exists only to let depend.m4 do its work. It works by
# looking at the text of this script. This case will never be run,
# since it is checked for above.
exit 1
;;
sgi)
if test "$libtool" = yes; then
"$@" "-Wp,-MDupdate,$tmpdepfile"
else
"$@" -MDupdate "$tmpdepfile"
fi
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
exit $stat
fi
rm -f "$depfile"
if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
echo "$object : \\" > "$depfile"
# Clip off the initial element (the dependent). Don't try to be
# clever and replace this with sed code, as IRIX sed won't handle
# lines with more than a fixed number of characters (4096 in
# IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
# the IRIX cc adds comments like `#:fec' to the end of the
# dependency line.
tr ' ' '
' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
tr '
' ' ' >> $depfile
echo >> $depfile
# The second pass generates a dummy entry for each header file.
tr ' ' '
' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
>> $depfile
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
# "include basename.Plo" scheme.
echo "#dummy" > "$depfile"
fi
rm -f "$tmpdepfile"
;;
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
# in a .u file. This file always lives in the current directory.
# Also, the AIX compiler puts `$object:' at the start of each line;
# $object doesn't have directory information.
stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
tmpdepfile="$stripped.u"
outname="$stripped.o"
if test "$libtool" = yes; then
"$@" -Wc,-M
else
"$@" -M
fi
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
exit $stat
fi
if test -f "$tmpdepfile"; then
# Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
# "include basename.Plo" scheme.
echo "#dummy" > "$depfile"
fi
rm -f "$tmpdepfile"
;;
tru64)
# The Tru64 compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
# At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
# dependencies in `foo.d' instead, so we check for that too.
# Subdirectories are respected.
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
test "x$dir" = "x$object" && dir=
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
tmpdepfile1="$dir.libs/$base.lo.d"
tmpdepfile2="$dir.libs/$base.d"
"$@" -Wc,-MD
else
tmpdepfile1="$dir$base.o.d"
tmpdepfile2="$dir$base.d"
"$@" -MD
fi
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile1" "$tmpdepfile2"
exit $stat
fi
if test -f "$tmpdepfile1"; then
tmpdepfile="$tmpdepfile1"
else
tmpdepfile="$tmpdepfile2"
fi
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
# That's a space and a tab in the [].
sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
echo "#dummy" > "$depfile"
fi
rm -f "$tmpdepfile"
;;
#nosideeffect)
# This comment above is used by automake to tell side-effect
# dependency tracking mechanisms from slower ones.
dashmstdout)
# Important note: in order to support this mode, a compiler *must*
# always write the proprocessed file to stdout, regardless of -o.
"$@" || exit $?
# Remove the call to Libtool.
if test "$libtool" = yes; then
while test $1 != '--mode=compile'; do
shift
done
shift
fi
# Remove `-o $object'. We will use -o /dev/null later,
# however we can't do the remplacement now because
# `-o $object' might simply not be used
IFS=" "
for arg
do
case $arg in
-o)
shift
;;
$object)
shift
;;
*)
set fnord "$@" "$arg"
shift # fnord
shift # $arg
;;
esac
done
test -z "$dashmflag" && dashmflag=-M
"$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
tr ' ' '
' < "$tmpdepfile" | \
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
dashXmstdout)
# This case only exists to satisfy depend.m4. It is never actually
# run, as this mode is specially recognized in the preamble.
exit 1
;;
makedepend)
"$@" || exit $?
# X makedepend
shift
cleared=no
for arg in "$@"; do
case $cleared in
no)
set ""; shift
cleared=yes ;;
esac
case "$arg" in
-D*|-I*)
set fnord "$@" "$arg"; shift ;;
-*)
;;
*)
set fnord "$@" "$arg"; shift ;;
esac
done
obj_suffix="`echo $object | sed 's/^.*\././'`"
touch "$tmpdepfile"
${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
sed '1,2d' "$tmpdepfile" | tr ' ' '
' | \
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile" "$tmpdepfile".bak
;;
cpp)
# Important note: in order to support this mode, a compiler *must*
# always write the proprocessed file to stdout.
"$@" || exit $?
# Remove the call to Libtool.
if test "$libtool" = yes; then
while test $1 != '--mode=compile'; do
shift
done
shift
fi
# Remove `-o $object'.
IFS=" "
for arg
do
case $arg in
-o)
shift
;;
$object)
shift
;;
*)
set fnord "$@" "$arg"
shift # fnord
shift # $arg
;;
esac
done
"$@" -E |
sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
sed '$ s: \\$::' > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
cat < "$tmpdepfile" >> "$depfile"
sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
msvisualcpp)
# Important note: in order to support this mode, a compiler *must*
# always write the proprocessed file to stdout, regardless of -o,
# because we must use -o when running libtool.
"$@" || exit $?
IFS=" "
for arg
do
case "$arg" in
"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
set fnord "$@"
shift
shift
;;
*)
set fnord "$@" "$arg"
shift
shift
;;
esac
done
"$@" -E |
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
echo " " >> "$depfile"
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
rm -f "$tmpdepfile"
;;
none)
exec "$@"
;;
*)
echo "Unknown depmode $depmode" 1>&2
exit 1
;;
esac
exit 0
Index: Makefile.in
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.in 4 Aug 2003 23:20:54 -0000 1.2
--- Makefile.in 5 Aug 2003 04:07:49 -0000 1.3
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.6.3 from Makefile.am.
! # @configure_input@
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
! # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 11,15 ****
# PARTICULAR PURPOSE.
!
SHELL = @SHELL@
--- 13,17 ----
# PARTICULAR PURPOSE.
! @SET_MAKE@
SHELL = @SHELL@
***************
*** 32,42 ****
includedir = @includedir@
oldincludedir = /usr/include
-
- DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-
top_builddir = .
--- 34,40 ----
***************
*** 46,55 ****
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@
-
NORMAL_INSTALL = :
PRE_INSTALL = :
--- 44,57 ----
AUTOHEADER = @AUTOHEADER@
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
***************
*** 58,137 ****
PRE_UNINSTALL = :
POST_UNINSTALL = :
CC = @CC@
CPP = @CPP@
CXX = @CXX@
! MAKEINFO = @MAKEINFO@
PACKAGE = @PACKAGE@
VERSION = @VERSION@
!
bin_PROGRAMS = axissvr
axissvr_SOURCES = ClientObj.cpp DBConfig.cpp ServerConfiguration.cpp ServerObj.cpp gwhogsvr.cpp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_CLEAN_FILES =
! PROGRAMS = $(bin_PROGRAMS)
!
! DEFS = @DEFS@ -I. -I$(srcdir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
! axissvr_OBJECTS = ClientObj.o DBConfig.o ServerConfiguration.o \
! ServerObj.o gwhogsvr.o
! axissvr_LDADD = $(LDADD)
! axissvr_DEPENDENCIES =
! axissvr_LDFLAGS =
! CXXFLAGS = @CXXFLAGS@
! CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
! CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
! DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
! Makefile.in NEWS acinclude.m4 aclocal.m4 configure configure.in \
! install-sh missing mkinstalldirs
!
!
! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
!
! TAR = gtar
! GZIP_ENV = --best
! DEP_FILES = .deps/ClientObj.P .deps/DBConfig.P \
! .deps/ServerConfiguration.P .deps/ServerObj.P .deps/gwhogsvr.P
SOURCES = $(axissvr_SOURCES)
- OBJECTS = $(axissvr_OBJECTS)
! all: all-redirect
.SUFFIXES:
! .SUFFIXES: .S .c .cpp .o .s
! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
!
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
! cd $(top_builddir) \
! && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
! $(ACLOCAL_M4): configure.in acinclude.m4
! cd $(srcdir) && $(ACLOCAL)
! config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
! $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
! mostlyclean-binPROGRAMS:
!
! clean-binPROGRAMS:
! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
!
! distclean-binPROGRAMS:
!
! maintainer-clean-binPROGRAMS:
!
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
! if test -f $$p; then \
! echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
! $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
else :; fi; \
done
--- 60,150 ----
PRE_UNINSTALL = :
POST_UNINSTALL = :
+
+ EXEEXT = @EXEEXT@
+ OBJEXT = @OBJEXT@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ AMTAR = @AMTAR@
+ AWK = @AWK@
CC = @CC@
CPP = @CPP@
CXX = @CXX@
! DEPDIR = @DEPDIR@
! INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
PACKAGE = @PACKAGE@
+ STRIP = @STRIP@
VERSION = @VERSION@
! am__include = @am__include@
! am__quote = @am__quote@
! install_sh = @install_sh@
bin_PROGRAMS = axissvr
axissvr_SOURCES = ClientObj.cpp DBConfig.cpp ServerConfiguration.cpp ServerObj.cpp gwhogsvr.cpp
+ subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_CLEAN_FILES =
! bin_PROGRAMS = axissvr$(EXEEXT)
! PROGRAMS = $(bin_PROGRAMS)
!
! am_axissvr_OBJECTS = ClientObj.$(OBJEXT) DBConfig.$(OBJEXT) \
! ServerConfiguration.$(OBJEXT) ServerObj.$(OBJEXT) \
! gwhogsvr.$(OBJEXT)
! axissvr_OBJECTS = $(am_axissvr_OBJECTS)
! axissvr_LDADD = $(LDADD)
! axissvr_DEPENDENCIES =
! axissvr_LDFLAGS =
! DEFS = @DEFS@
! DEFAULT_INCLUDES = -I. -I$(srcdir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
! depcomp = $(SHELL) $(top_srcdir)/depcomp
! am__depfiles_maybe = depfiles
! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ClientObj.Po ./$(DEPDIR)/DBConfig.Po \
! @AMDEP_TRUE@ ./$(DEPDIR)/ServerConfiguration.Po \
! @AMDEP_TRUE@ ./$(DEPDIR)/ServerObj.Po ./$(DEPDIR)/gwhogsvr.Po
! CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
! $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
! CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
! -o $@
! CXXFLAGS = @CXXFLAGS@
! DIST_SOURCES = $(axissvr_SOURCES)
! DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
! Makefile.in NEWS acinclude.m4 aclocal.m4 configure configure.in \
! depcomp install-sh missing mkinstalldirs
SOURCES = $(axissvr_SOURCES)
! all: all-am
!
.SUFFIXES:
! .SUFFIXES: .cpp .o .obj
! am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
! configure.lineno
! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && \
! $(AUTOMAKE) --gnu Makefile
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
! cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
! $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
! $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
! $(ACLOCAL_M4): configure.in acinclude.m4
! cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
! binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
! p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
! if test -f $$p \
! ; then \
! f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
! echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
! $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
else :; fi; \
done
***************
*** 139,199 ****
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
! list='$(bin_PROGRAMS)'; for p in $$list; do \
! rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
done
! .s.o:
! $(COMPILE) -c $<
!
! .S.o:
! $(COMPILE) -c $<
mostlyclean-compile:
! -rm -f *.o core *.core
!
! clean-compile:
distclean-compile:
-rm -f *.tab.c
! maintainer-clean-compile:
- axissvr: $(axissvr_OBJECTS) $(axissvr_DEPENDENCIES)
- @rm -f axissvr
- $(CXXLINK) $(axissvr_LDFLAGS) $(axissvr_OBJECTS) $(axissvr_LDADD) $(LIBS)
.cpp.o:
! $(CXXCOMPILE) -c $<
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP)
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! here=`pwd` && cd $(srcdir) \
! && mkid -f$$here/ID $$unique $(LISP)
! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
! mostlyclean-tags:
! clean-tags:
! distclean-tags:
! -rm -f TAGS ID
! maintainer-clean-tags:
! distdir = $(PACKAGE)-$(VERSION)
! top_distdir = $(distdir)
# This target untars the dist file and tries a VPATH configuration. Then
--- 152,282 ----
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
! @list='$(bin_PROGRAMS)'; for p in $$list; do \
! f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
! echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
! rm -f $(DESTDIR)$(bindir)/$$f; \
done
! clean-binPROGRAMS:
! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
! axissvr$(EXEEXT): $(axissvr_OBJECTS) $(axissvr_DEPENDENCIES)
! @rm -f axissvr$(EXEEXT)
! @echo " Linking axissvr$(EXEEXT)"
! @$(CXXLINK) $(axissvr_LDFLAGS) $(axissvr_OBJECTS) $(axissvr_LDADD) $(LIBS)
mostlyclean-compile:
! -rm -f *.$(OBJEXT) core *.core
distclean-compile:
-rm -f *.tab.c
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClientObj.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DBConfig.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ServerConfiguration.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ServerObj.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwhogsvr.Po@am__quote@
!
! distclean-depend:
! -rm -rf ./$(DEPDIR)
.cpp.o:
! @echo " Compiling $<"
! @AMDEP_TRUE@ @source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
!
! .cpp.obj:
! @echo " Compiling $<"
! @AMDEP_TRUE@ @source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(CXXCOMPILE) -c -o $@ `cygpath -w $<`
! CXXDEPMODE = @CXXDEPMODE@
! uninstall-info-am:
!
! ETAGS = etags
! ETAGSFLAGS =
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! mkid -fID $$unique
! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)$$tags$$unique" \
! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! $$tags $$unique
!
! GTAGS:
! here=`$(am__cd) $(top_builddir) && pwd` \
! && cd $(top_srcdir) \
! && gtags -i $(GTAGS_ARGS) $$here
! distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
! top_distdir = .
! distdir = $(PACKAGE)-$(VERSION)
! am__remove_distdir = \
! { test ! -d $(distdir) \
! || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
! && rm -fr $(distdir); }; }
! GZIP_ENV = --best
! distcleancheck_listfiles = find . -type f -print
! distdir: $(DISTFILES)
! $(am__remove_distdir)
! mkdir $(distdir)
! @list='$(DISTFILES)'; for file in $$list; do \
! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! dir="/$$dir"; \
! $(mkinstalldirs) "$(distdir)$$dir"; \
! else \
! dir=''; \
! fi; \
! if test -d $$d/$$file; then \
! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! fi; \
! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
! else \
! test -f $(distdir)/$$file \
! || cp -p $$d/$$file $(distdir)/$$file \
! || exit 1; \
! fi; \
! done
! -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
! || chmod -R a+r $(distdir)
! dist-gzip: distdir
! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! $(am__remove_distdir)
!
! dist dist-all: distdir
! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! $(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
***************
*** 201,211 ****
# tarfile.
distcheck: dist
! -rm -rf $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
mkdir $(distdir)/=build
mkdir $(distdir)/=inst
! dc_install_base=`cd $(distdir)/=inst && pwd`; \
! cd $(distdir)/=build \
&& ../configure --srcdir=.. --prefix=$$dc_install_base \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
--- 284,297 ----
# tarfile.
distcheck: dist
! $(am__remove_distdir)
! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
! chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/=build
mkdir $(distdir)/=inst
! chmod a-w $(distdir)
! dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
! && cd $(distdir)/=build \
&& ../configure --srcdir=.. --prefix=$$dc_install_base \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
***************
*** 213,328 ****
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
! && $(MAKE) $(AM_MAKEFLAGS) dist
! -rm -rf $(distdir)
! @banner="$(distdir).tar.gz is ready for distribution"; \
! dashes=`echo "$$banner" | sed s/./=/g`; \
! echo "$$dashes"; \
! echo "$$banner"; \
! echo "$$dashes"
! dist: distdir
! -chmod -R a+r $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
! -rm -rf $(distdir)
! dist-all: distdir
! -chmod -R a+r $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
! -rm -rf $(distdir)
! distdir: $(DISTFILES)
! -rm -rf $(distdir)
! mkdir $(distdir)
! -chmod 777 $(distdir)
! here=`cd $(top_builddir) && pwd`; \
! top_distdir=`cd $(distdir) && pwd`; \
! distdir=`cd $(distdir) && pwd`; \
! cd $(top_srcdir) \
! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
! @for file in $(DISTFILES); do \
! d=$(srcdir); \
! if test -d $$d/$$file; then \
! cp -pr $$d/$$file $(distdir)/$$file; \
! else \
! test -f $(distdir)/$$file \
! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! || cp -p $$d/$$file $(distdir)/$$file || :; \
! fi; \
! done
!
! DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
!
! -include $(DEP_FILES)
!
! mostlyclean-depend:
!
! clean-depend:
!
! distclean-depend:
! -rm -rf .deps
!
! maintainer-clean-depend:
!
! %.o: %.c
! @echo '$(COMPILE) -c $<'; \
! $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
! @-cp .deps/$(*F).pp .deps/$(*F).P; \
! tr ' ' '\012' < .deps/$(*F).pp \
! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
! >> .deps/$(*F).P; \
! rm .deps/$(*F).pp
!
! %.lo: %.c
! @echo '$(LTCOMPILE) -c $<'; \
! $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
! @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
! < .deps/$(*F).pp > .deps/$(*F).P; \
! tr ' ' '\012' < .deps/$(*F).pp \
! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
! >> .deps/$(*F).P; \
! rm -f .deps/$(*F).pp
!
! %.o: %.cpp
! @echo '$(CXXCOMPILE) -c $<'; \
! $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
! @-cp .deps/$(*F).pp .deps/$(*F).P; \
! tr ' ' '\012' < .deps/$(*F).pp \
! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
! >> .deps/$(*F).P; \
! rm .deps/$(*F).pp
!
! %.lo: %.cpp
! @echo '$(LTCXXCOMPILE) -c $<'; \
! $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
! @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
! < .deps/$(*F).pp > .deps/$(*F).P; \
! tr ' ' '\012' < .deps/$(*F).pp \
! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
! >> .deps/$(*F).P; \
! rm -f .deps/$(*F).pp
! info-am:
! info: info-am
! dvi-am:
! dvi: dvi-am
check-am: all-am
check: check-am
! installcheck-am:
! installcheck: installcheck-am
! install-exec-am: install-binPROGRAMS
! install-exec: install-exec-am
! install-data-am:
! install-data: install-data-am
- install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
! uninstall-am: uninstall-binPROGRAMS
uninstall: uninstall-am
- all-am: Makefile $(PROGRAMS)
- all-redirect: all-am
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
- $(mkinstalldirs) $(DESTDIR)$(bindir)
mostlyclean-generic:
--- 299,343 ----
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
! && $(MAKE) $(AM_MAKEFLAGS) uninstall \
! && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
! || { echo "ERROR: files left after uninstall:" ; \
! find $$dc_install_base -type f -print ; \
! exit 1; } >&2 ) \
! && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
! && rm -f $(distdir).tar.gz \
! && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
! $(am__remove_distdir)
! @echo "$(distdir).tar.gz is ready for distribution" | \
! sed 'h;s/./=/g;p;x;p;x'
! distcleancheck: distclean
! if test '$(srcdir)' = . ; then \
! echo "ERROR: distcleancheck can only run from a VPATH build" ; \
! exit 1 ; \
! fi
! test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
! || { echo "ERROR: files left after distclean:" ; \
! $(distcleancheck_listfiles) ; \
! exit 1; } >&2
check-am: all-am
check: check-am
! all-am: Makefile $(PROGRAMS)
! installdirs:
! $(mkinstalldirs) $(DESTDIR)$(bindir)
install: install-am
! install-exec: install-exec-am
! install-data: install-data-am
uninstall: uninstall-am
+ install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
***************
*** 331,375 ****
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \
! mostlyclean-tags mostlyclean-depend mostlyclean-generic
! mostlyclean: mostlyclean-am
! clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \
! clean-generic mostlyclean-am
! clean: clean-am
! distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \
! distclean-depend distclean-generic clean-am
! distclean: distclean-am
! -rm -f config.status
! maintainer-clean-am: maintainer-clean-binPROGRAMS \
! maintainer-clean-compile maintainer-clean-tags \
! maintainer-clean-depend maintainer-clean-generic \
! distclean-am
! @echo "This command is intended for maintainers to use;"
! @echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-am
! -rm -f config.status
! .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
! maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
! mostlyclean-compile distclean-compile clean-compile \
! maintainer-clean-compile tags mostlyclean-tags distclean-tags \
! clean-tags maintainer-clean-tags distdir mostlyclean-depend \
! distclean-depend clean-depend maintainer-clean-depend info-am info \
! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
! install-exec install-data-am install-data install-am install \
! uninstall-am uninstall all-redirect all-am all installdirs \
! mostlyclean-generic distclean-generic clean-generic \
! maintainer-clean-generic clean mostlyclean distclean maintainer-clean
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 346,402 ----
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
! @echo "This command is intended for maintainers to use"
! @echo "it deletes files that may require special tools to rebuild."
! clean: clean-am
! clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
! distclean: distclean-am
! -rm -f $(am__CONFIG_DISTCLEAN_FILES)
! distclean-am: clean-am distclean-compile distclean-depend \
! distclean-generic distclean-tags
! dvi: dvi-am
! dvi-am:
! info: info-am
! info-am:
!
! install-data-am:
!
! install-exec-am: install-binPROGRAMS
!
! install-info: install-info-am
!
! install-man:
!
! installcheck-am:
maintainer-clean: maintainer-clean-am
! -rm -f $(am__CONFIG_DISTCLEAN_FILES)
! -rm -rf autom4te.cache
! maintainer-clean-am: distclean-am maintainer-clean-generic
!
! mostlyclean: mostlyclean-am
!
! mostlyclean-am: mostlyclean-compile mostlyclean-generic
! uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+ .PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic dist dist-all dist-gzip distcheck distclean \
+ distclean-compile distclean-depend distclean-generic \
+ distclean-tags distcleancheck distdir dvi dvi-am info info-am \
+ install install-am install-binPROGRAMS install-data \
+ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic tags uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/acinclude.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** acinclude.m4 9 May 2002 22:19:43 -0000 1.1
--- acinclude.m4 5 Aug 2003 04:07:49 -0000 1.2
***************
*** 1,82 ****
! dnl aclocal.m4 generated automatically by aclocal 1.4
!
! dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
!
! dnl This program is distributed in the hope that it will be useful,
! dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! dnl PARTICULAR PURPOSE.
!
! dnl aclocal.m4 generated automatically by aclocal 1.4
!
! dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
!
! dnl This program is distributed in the hope that it will be useful,
! dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! dnl PARTICULAR PURPOSE.
!
! dnl aclocal.m4 generated automatically by aclocal 1.4-p5
!
! dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
!
! dnl This program is distributed in the hope that it will be useful,
! dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! dnl PARTICULAR PURPOSE.
!
! dnl aclocal.m4 generated automatically by aclocal 1.4-p5
!
! dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
!
! dnl This program is distributed in the hope that it will be useful,
! dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! dnl PARTICULAR PURPOSE.
!
! # Do all the work for Automake. This macro actually does too much --
! # some checks are only needed if your package does certain things.
! # But this isn't really a big deal.
!
! # serial 1
!
! dnl Usage:
! dnl AM_INIT_AUTOMAKE(package,version, [no-define])
AC_DEFUN([AM_INIT_AUTOMAKE],
! [AC_REQUIRE([AC_PROG_INSTALL])
! PACKAGE=[$1]
! AC_SUBST(PACKAGE)
! VERSION=[$2]
! AC_SUBST(VERSION)
! dnl test to see if srcdir already configured
! if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
fi
! ifelse([$3],,
! AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
! AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
! AC_REQUIRE([AM_SANITY_CHECK])
! AC_REQUIRE([AC_ARG_PROGRAM])
! dnl FIXME This is truly gross.
! missing_dir=`cd $ac_aux_dir && pwd`
! AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
! AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
! AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
! AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
! AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
! AC_REQUIRE([AC_PROG_MAKE_SET])])
#
--- 1,187 ----
! # aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
+ # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+ # Free Software Foundation, Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+
+ # Do all the work for Automake. -*- Autoconf -*-
+
+ # This macro actually does too much some checks are only needed if
+ # your package does certain things. But this isn't really a big deal.
+
+ # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+ # Free Software Foundation, Inc.
+
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2, or (at your option)
+ # any later version.
+
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ # 02111-1307, USA.
+
+ # serial 8
+
+ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+ # will think it sees a *use*, and therefore will trigger all it's
+ # C support machinery. Also note that it means that autoscan, seeing
+ # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+ AC_PREREQ([2.52])
+
+ # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
+ # the ones we care about.
+ m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+
+ # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+ # AM_INIT_AUTOMAKE([OPTIONS])
+ # -----------------------------------------------
+ # The call with PACKAGE and VERSION arguments is the old style
+ # call (pre autoconf-2.50), which is being phased out. PACKAGE
+ # and VERSION should now be passed to AC_INIT and removed from
+ # the call to AM_INIT_AUTOMAKE.
+ # We support both call styles for the transition. After
+ # the next Automake release, Autoconf can make the AC_INIT
+ # arguments mandatory, and then we can depend on a new Autoconf
+ # release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
! [AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
! AC_REQUIRE([AC_PROG_INSTALL])dnl
! # test to see if srcdir already configured
! if test "`cd $srcdir && pwd`" != "`pwd`" &&
! test -f $srcdir/config.status; then
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
fi
!
! # Define the identity of the package.
! dnl Distinguish between old-style and new-style calls.
! m4_ifval([$2],
! [m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
! AC_SUBST([PACKAGE], [$1])dnl
! AC_SUBST([VERSION], [$2])],
! [_AM_SET_OPTIONS([$1])dnl
! AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
! AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
!
! _AM_IF_OPTION([no-define],,
! [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
! AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
!
! # Some tools Automake needs.
! AC_REQUIRE([AM_SANITY_CHECK])dnl
! AC_REQUIRE([AC_ARG_PROGRAM])dnl
! AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
! AM_MISSING_PROG(AUTOCONF, autoconf)
! AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
! AM_MISSING_PROG(AUTOHEADER, autoheader)
! AM_MISSING_PROG(MAKEINFO, makeinfo)
! AM_MISSING_PROG(AMTAR, tar)
! AM_PROG_INSTALL_SH
! AM_PROG_INSTALL_STRIP
! # We need awk for the "check" target. The system "awk" is bad on
! # some platforms.
! AC_REQUIRE([AC_PROG_AWK])dnl
! AC_REQUIRE([AC_PROG_MAKE_SET])dnl
!
! _AM_IF_OPTION([no-dependencies],,
! [AC_PROVIDE_IFELSE([AC_PROG_][CC],
! [_AM_DEPENDENCIES(CC)],
! [define([AC_PROG_][CC],
! defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
! AC_PROVIDE_IFELSE([AC_PROG_][CXX],
! [_AM_DEPENDENCIES(CXX)],
! [define([AC_PROG_][CXX],
! defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
! ])
! ])
!
! # Copyright 2002 Free Software Foundation, Inc.
!
! # This program is free software; you can redistribute it and/or modify
! # it under the terms of the GNU General Public License as published by
! # the Free Software Foundation; either version 2, or (at your option)
! # any later version.
!
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY; without even the implied warranty of
! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! # GNU General Public License for more details.
!
! # You should have received a copy of the GNU General Public License
! # along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
!
! # AM_AUTOMAKE_VERSION(VERSION)
! # ----------------------------
! # Automake X.Y traces this macro to ensure aclocal.m4 has been
! # generated from the m4 files accompanying Automake X.Y.
! AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])
!
! # AM_SET_CURRENT_AUTOMAKE_VERSION
! # -------------------------------
! # Call AM_AUTOMAKE_VERSION so it can be traced.
! # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
! AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
! [AM_AUTOMAKE_VERSION([1.6.3])])
!
! # Helper functions for option handling. -*- Autoconf -*-
!
! # Copyright 2001, 2002 Free Software Foundation, Inc.
!
! # This program is free software; you can redistribute it and/or modify
! # it under the terms of the GNU General Public License as published by
! # the Free Software Foundation; either version 2, or (at your option)
! # any later version.
!
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY; without even the implied warranty of
! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! # GNU General Public License for more details.
!
! # You should have received a copy of the GNU General Public License
! # along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
! # 02111-1307, USA.
!
! # serial 2
!
! # _AM_MANGLE_OPTION(NAME)
! # -----------------------
! AC_DEFUN([_AM_MANGLE_OPTION],
! [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
!
! # _AM_SET_OPTION(NAME)
! # ------------------------------
! # Set option NAME. Presently that only means defining a flag for this option.
! AC_DEFUN([_AM_SET_OPTION],
! [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
!
! # _AM_SET_OPTIONS(OPTIONS)
! # ----------------------------------
! # OPTIONS is a space-separated list of Automake options.
! AC_DEFUN([_AM_SET_OPTIONS],
! [AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
!
! # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
! # -------------------------------------------
! # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
! AC_DEFUN([_AM_IF_OPTION],
! [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
#
***************
*** 84,92 ****
#
AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
# Just in case
sleep 1
! echo timestamp > conftestfile
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
--- 189,218 ----
#
+ # Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2, or (at your option)
+ # any later version.
+
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ # 02111-1307, USA.
+
+ # serial 3
+
+ # AM_SANITY_CHECK
+ # ---------------
AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
# Just in case
sleep 1
! echo timestamp > conftest.file
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
***************
*** 95,105 ****
# directory).
if (
! set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
! if test "[$]*" = "X"; then
# -L didn't work.
! set X `ls -t $srcdir/configure conftestfile`
fi
! if test "[$]*" != "X $srcdir/configure conftestfile" \
! && test "[$]*" != "X conftestfile $srcdir/configure"; then
# If neither matched, then we have a broken ls. This can happen
--- 221,232 ----
# directory).
if (
! set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
! if test "$[*]" = "X"; then
# -L didn't work.
! set X `ls -t $srcdir/configure conftest.file`
fi
! rm -f conftest.file
! if test "$[*]" != "X $srcdir/configure conftest.file" \
! && test "$[*]" != "X conftest.file $srcdir/configure"; then
# If neither matched, then we have a broken ls. This can happen
***************
*** 111,115 ****
fi
! test "[$]2" = conftestfile
)
then
--- 238,242 ----
fi
! test "$[2]" = conftest.file
)
then
***************
*** 120,143 ****
Check your system clock])
fi
- rm -f conftest*
AC_MSG_RESULT(yes)])
! dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
! dnl The program must properly implement --version.
AC_DEFUN([AM_MISSING_PROG],
! [AC_MSG_CHECKING(for working $2)
! # Run test in a subshell; some versions of sh will print an error if
! # an executable is not found, even if stderr is redirected.
! # Redirect stdin to placate older versions of autoconf. Sigh.
! if ($2 --version) < /dev/null > /dev/null 2>&1; then
! $1=$2
! AC_MSG_RESULT(found)
else
! $1="$3/missing $2"
! AC_MSG_RESULT(missing)
fi
! AC_SUBST($1)])
--- 247,758 ----
Check your system clock])
fi
AC_MSG_RESULT(yes)])
! # -*- Autoconf -*-
!
!
! # Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
!
! # This program is free software; you can redistribute it and/or modify
! # it under the terms of the GNU General Public License as published by
! # the Free Software Foundation; either version 2, or (at your option)
! # any later version.
!
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY; without even the implied warranty of
! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! # GNU General Public License for more details.
!
! # You should have received a copy of the GNU General Public License
! # along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
! # 02111-1307, USA.
!
! # serial 3
!
! # AM_MISSING_PROG(NAME, PROGRAM)
! # ------------------------------
AC_DEFUN([AM_MISSING_PROG],
! [AC_REQUIRE([AM_MISSING_HAS_RUN])
! $1=${$1-"${am_missing_run}$2"}
! AC_SUBST($1)])
!
!
! # AM_MISSING_HAS_RUN
! # ------------------
! # Define MISSING if not defined so far and test if it supports --run.
! # If it does, set am_missing_run to use it, otherwise, to nothing.
! AC_DEFUN([AM_MISSING_HAS_RUN],
! [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
! test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
! # Use eval to expand $SHELL
! if eval "$MISSING --run true"; then
! am_missing_run="$MISSING --run "
else
! am_missing_run=
! AC_MSG_WARN([`missing' script is too old or missing])
fi
! ])
!
! # AM_AUX_DIR_EXPAND
!
! # Copyright 2001 Free Software Foundation, Inc.
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2, or (at your option)
+ # any later version.
+
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ # 02111-1307, USA.
+
+ # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+ # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+ # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+ #
+ # Of course, Automake must honor this variable whenever it calls a
+ # tool from the auxiliary directory. The problem is that $srcdir (and
+ # therefore $ac_aux_dir as well) can be either absolute or relative,
+ # depending on how configure is run. This is pretty annoying, since
+ # it makes $ac_aux_dir quite unusable in subdirectories: in the top
+ # source directory, any form will work fine, but in subdirectories a
+ # relative path needs to be adjusted first.
+ #
+ # $ac_aux_dir/missing
+ # fails when called from a subdirectory if $ac_aux_dir is relative
+ # $top_srcdir/$ac_aux_dir/missing
+ # fails if $ac_aux_dir is absolute,
+ # fails when called from a subdirectory in a VPATH build with
+ # a relative $ac_aux_dir
+ #
+ # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+ # are both prefixed by $srcdir. In an in-source build this is usually
+ # harmless because $srcdir is `.', but things will broke when you
+ # start a VPATH build or use an absolute $srcdir.
+ #
+ # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+ # iff we strip the leading $srcdir from $ac_aux_dir. That would be:
+ # am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+ # and then we would define $MISSING as
+ # MISSING="\${SHELL} $am_aux_dir/missing"
+ # This will work as long as MISSING is not called from configure, because
+ # unfortunately $(top_srcdir) has no meaning in configure.
+ # However there are other variables, like CC, which are often used in
+ # configure, and could therefore not use this "fixed" $ac_aux_dir.
+ #
+ # Another solution, used here, is to always expand $ac_aux_dir to an
+ # absolute PATH. The drawback is that using absolute paths prevent a
+ # configured tree to be moved without reconfiguration.
+
+ # Rely on autoconf to set up CDPATH properly.
+ AC_PREREQ([2.50])
+
+ AC_DEFUN([AM_AUX_DIR_EXPAND], [
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+ ])
+
+ # AM_PROG_INSTALL_SH
+ # ------------------
+ # Define $install_sh.
+
+ # Copyright 2001 Free Software Foundation, Inc.
+
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2, or (at your option)
+ # any later version.
+
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ # 02111-1307, USA.
+
+ AC_DEFUN([AM_PROG_INSTALL_SH],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+ install_sh=${install_sh-"$am_aux_dir/install-sh"}
+ AC_SUBST(install_sh)])
+
+ # AM_PROG_INSTALL_STRIP
+
+ # Copyright 2001 Free Software Foundation, Inc.
+
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2, or (at your option)
+ # any later version.
+
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ # 02111-1307, USA.
+
+ # One issue with vendor `install' (even GNU) is that you can't
+ # specify the program used to strip binaries. This is especially
+ # annoying in cross-compiling environments, where the build's strip
+ # is unlikely to handle the host's binaries.
+ # Fortunately install-sh will honor a STRIPPROG variable, so we
+ # always use install-sh in `make install-strip', and initialize
+ # STRIPPROG with the value of the STRIP variable (set by the user).
+ AC_DEFUN([AM_PROG_INSTALL_STRIP],
+ [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+ # Installed binaries are usually stripped using `strip' when the user
+ # run `make install-strip'. However `strip' might not be the right
+ # tool to use in cross-compilation environments, therefore Automake
+ # will honor the `STRIP' environment variable to overrule this program.
+ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+ if test "$cross_compiling" != no; then
+ AC_CHECK_TOOL([STRIP], [strip], :)
+ fi
+ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+ AC_SUBST([INSTALL_STRIP_PROGRAM])])
+ # serial 4 -*- Autoconf -*-
+ # Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2, or (at your option)
+ # any later version.
+
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ # 02111-1307, USA.
+
+
+ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+ # will think it sees a *use*, and therefore will trigger all it's
+ # C support machinery. Also note that it means that autoscan, seeing
+ # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+
+ # _AM_DEPENDENCIES(NAME)
+ # ----------------------
+ # See how the compiler implements dependency checking.
+ # NAME is "CC", "CXX", "GCJ", or "OBJC".
+ # We try a few techniques and use that to set a single cache variable.
+ #
+ # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+ # modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+ # dependency, and given that the user is not expected to run this macro,
+ # just rely on AC_PROG_CC.
+ AC_DEFUN([_AM_DEPENDENCIES],
+ [AC_REQUIRE([AM_SET_DEPDIR])dnl
+ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+ AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+ AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
+
+ AC_CACHE_CHECK([dependency style of $depcc],
+ [am_cv_$1_dependencies_compiler_type],
+ [if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # ins...
[truncated message content] |
|
From: Philip E. <pes...@us...> - 2003-08-04 23:20:57
|
Update of /cvsroot/sphere-axis/axissvr
In directory sc8-pr-cvs1:/tmp/cvs-serv12156
Modified Files:
ClientObj.cpp ClientObj.h DBConfig.cpp DBConfig.h Makefile.am
Makefile.in ServerConfiguration.cpp ServerConfiguration.h
ServerObj.cpp ServerObj.h StdAfx.h configure configure.in
gwhogsvr.cpp gwhogsvr.h ntservice.h
Log Message:
Changes to AxisServer code for linux compile. Still needs some tweaking to get a usable linux
version, however.
Index: ClientObj.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/ClientObj.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** ClientObj.cpp 19 Jun 2003 21:37:52 -0000 1.8
--- ClientObj.cpp 4 Aug 2003 23:20:54 -0000 1.9
***************
*** 65,69 ****
if ( dwBytesSent + MAX_BUFFER > m_pServer->m_sSpawns.length() * sizeof(TCHAR) )
bytesToCopy = m_pServer->m_sSpawns.length() * sizeof(TCHAR) - dwBytesSent;
! memcpy(szBuf, (void *) m_pServer->m_sSpawns.at(dwBytesSent / sizeof(TCHAR)), bytesToCopy);
dwBytesSent += bytesToCopy;
Send((BYTE*)szBuf, bytesToCopy);
--- 65,70 ----
if ( dwBytesSent + MAX_BUFFER > m_pServer->m_sSpawns.length() * sizeof(TCHAR) )
bytesToCopy = m_pServer->m_sSpawns.length() * sizeof(TCHAR) - dwBytesSent;
! const char * pCopy = m_pServer->m_sSpawns.c_str() + (dwBytesSent / sizeof(TCHAR));
! memcpy(szBuf, (void *) pCopy, bytesToCopy);
dwBytesSent += bytesToCopy;
Send((BYTE*)szBuf, bytesToCopy);
***************
*** 83,87 ****
if ( _tcsstr(pszFileName, _T(":")) == NULL )
#else
! if ( *pszFileName != _T("/") )
#endif
_stprintf(szFullPath, _T("%s%s"), m_pServer->BasePath(), pszFileName);
--- 84,88 ----
if ( _tcsstr(pszFileName, _T(":")) == NULL )
#else
! if ( _tcscmp(pszFileName, _T("/")) != 0 )
#endif
_stprintf(szFullPath, _T("%s%s"), m_pServer->BasePath(), pszFileName);
***************
*** 186,190 ****
if ( _tcsstr(pszFileName, _T(":")) == NULL )
#else
! if ( *pszFileName != _T("/") )
#endif
_stprintf(szFullPath, _T("%s%s"), m_pServer->BasePath(), pszFileName);
--- 187,191 ----
if ( _tcsstr(pszFileName, _T(":")) == NULL )
#else
! if ( _tcscmp(pszFileName, _T("/")) != 0 )
#endif
_stprintf(szFullPath, _T("%s%s"), m_pServer->BasePath(), pszFileName);
***************
*** 574,578 ****
memset(&szLine[0], 0, sizeof(szLine));
ULONG iBlock = i;
! for ( int j = 0; j < 16; j++ )
{
TCHAR s[4];
--- 575,580 ----
memset(&szLine[0], 0, sizeof(szLine));
ULONG iBlock = i;
! int j = 0;
! for ( j = 0; j < 16; j++ )
{
TCHAR s[4];
***************
*** 775,780 ****
#else
// LINUX
- unsigned int iSize = MAX_BUFFER;
- unsigned int iLen = 0;
DIR * dirp;
struct dirent *direntp;
--- 777,780 ----
***************
*** 792,796 ****
// Handle the error
_tprintf(_T("Unable to open directdory %s\n"), szPath);
! Send(szEOF, strlen(szEOF));
return;
}
--- 792,796 ----
// Handle the error
_tprintf(_T("Unable to open directdory %s\n"), szPath);
! Send((BYTE*)szEOF, strlen(szEOF));
return;
}
***************
*** 814,833 ****
{
// it's a directory
! TCHAR szPaths[MAX_PATH];
! _stprintf(szPaths, pClient->m_pServer->m_szAllowedPaths);
! TCHAR * pszTok = _tcstok(szPaths, _T(":"));
! while ( pszTok != NULL )
! {
! if ( _tcscmp(pszTok, szEntry) == 0 )
! {
! bAllowed = TRUE;
! break;
! }
! pszTok = _tcstok(NULL, _T(":"));
! }
}
if ( S_ISREG(filestat.st_mode) || S_ISLNK(filestat.st_mode) )
{
- // it's a regular file.
TCHAR * pszExtension = NULL;
for ( int i = (int) _tcsclen(direntp->d_name); i > 0; i-- )
--- 814,821 ----
{
// it's a directory
! bAllowed = m_pServer->m_config.PathIsAllowed(direntp->d_name);
}
if ( S_ISREG(filestat.st_mode) || S_ISLNK(filestat.st_mode) )
{
TCHAR * pszExtension = NULL;
for ( int i = (int) _tcsclen(direntp->d_name); i > 0; i-- )
***************
*** 840,857 ****
}
if ( pszExtension != NULL )
! {
! TCHAR szExtensions[MAX_PATH];
! _stprintf(szExtensions, pClient->m_pServer->m_szAllowedExtensions);
! TCHAR * pszTok = _tcstok(szExtensions, _T(":"));
! while ( pszTok != NULL )
! {
! if ( _tcscmp(pszTok, pszExtension) == 0 )
! {
! bAllowed = TRUE;
! break;
! }
! pszTok = _tcstok(NULL, _T(":"));
! }
! }
}
if ( bAllowed )
--- 828,832 ----
}
if ( pszExtension != NULL )
! bAllowed = m_pServer->m_config.ExtensionIsAllowed(pszExtension);
}
if ( bAllowed )
***************
*** 871,875 ****
if ( iLen + _tcsclen(direntp->d_name) + sizeof(int) + 1 >= sizeof(szBuffer) )
{
! Send(szBuffer, iLen);
memset(szBuffer, 0x00, sizeof(szBuffer));
iLen = 0;
--- 846,850 ----
if ( iLen + _tcsclen(direntp->d_name) + sizeof(int) + 1 >= sizeof(szBuffer) )
{
! Send((BYTE*)szBuffer, iLen);
memset(szBuffer, 0x00, sizeof(szBuffer));
iLen = 0;
***************
*** 879,885 ****
}
}
! Send(szBuffer, iLen);
closedir(dirp);
! Send(szEOF, _tcsclen(szEOF));
#endif
}
--- 854,860 ----
}
}
! Send((BYTE*)szBuffer, iLen);
closedir(dirp);
! Send((BYTE*)szEOF, _tcsclen(szEOF));
#endif
}
***************
*** 899,907 ****
--- 874,890 ----
}
+ #ifdef _WIN32
void CAxisClient::EntryProc(LPVOID pData)
+ #else
+ void * CAxisClient::EntryProc(LPVOID pData)
+ #endif
{
CAxisClient * pClient = (CAxisClient *) pData;
pClient->Work();
+ #ifdef _WIN32
return;
+ #else
+ return NULL;
+ #endif
}
***************
*** 937,941 ****
#else
close(m_sock);
! return NULL;
#endif
}
--- 920,924 ----
#else
close(m_sock);
! return;
#endif
}
***************
*** 970,974 ****
close(m_sock);
m_bIsFinished = TRUE;
! return NULL;
#endif
}
--- 953,957 ----
close(m_sock);
m_bIsFinished = TRUE;
! return;
#endif
}
***************
*** 1397,1405 ****
bind(m_sock, (LPSOCKADDR) &sin, sizeof(sin));
connect(m_sock, (LPSOCKADDR) &sin, sizeof(sin));
- #ifdef _WIN32
struct linger opt;
- #else
- struct LINGER opt;
- #endif
opt.l_onoff = 1;
opt.l_linger = 60;
--- 1380,1384 ----
***************
*** 1510,1512 ****
else
return m_pServer->Login(pszID, pszPassword, pszIP, pHost);
! }
\ No newline at end of file
--- 1489,1491 ----
else
return m_pServer->Login(pszID, pszPassword, pszIP, pHost);
! }
Index: ClientObj.h
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/ClientObj.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ClientObj.h 16 Jun 2003 22:05:59 -0000 1.4
--- ClientObj.h 4 Aug 2003 23:20:54 -0000 1.5
***************
*** 34,38 ****
--- 34,42 ----
SOCKET Socket() { return m_sock; }
void Socket(SOCKET s) { m_sock = s; }
+ #ifdef _WIN32
static void _cdecl EntryProc(LPVOID pData);
+ #else
+ static void * EntryProc(LPVOID pData);
+ #endif
BOOL IsFinished() { return m_bIsFinished; }
void Server(CAxisServer *pServer) { m_pServer = pServer; }
***************
*** 59,63 ****
CAxisServer * m_pServer;
TCHAR m_szIPAddr[256];
! HOSTENT m_host;
int m_iDBUserID;
--- 63,67 ----
CAxisServer * m_pServer;
TCHAR m_szIPAddr[256];
! HOSTENT m_host;
int m_iDBUserID;
***************
*** 84,86 ****
};
! #endif
\ No newline at end of file
--- 88,91 ----
};
! #endif
!
Index: DBConfig.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/DBConfig.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** DBConfig.cpp 23 Jun 2003 14:46:41 -0000 1.6
--- DBConfig.cpp 4 Aug 2003 23:20:54 -0000 1.7
***************
*** 22,27 ****
*/
! #include "stdafx.h"
! #include "dbconfig.h"
#include "ServerObj.h"
--- 22,27 ----
*/
! #include "StdAfx.h"
! #include "DBConfig.h"
#include "ServerObj.h"
***************
*** 539,541 ****
}
return bPermissions;
! }
\ No newline at end of file
--- 539,541 ----
}
return bPermissions;
! }
Index: DBConfig.h
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/DBConfig.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** DBConfig.h 17 Jun 2003 22:33:08 -0000 1.5
--- DBConfig.h 4 Aug 2003 23:20:54 -0000 1.6
***************
*** 22,26 ****
*/
! #pragma once
#include <sql.h>
--- 22,27 ----
*/
! #ifndef __DBCONFIG_H__
! #define __DBCONFIG_H__
#include <sql.h>
***************
*** 68,69 ****
--- 69,72 ----
class CAxisServer * m_pServer;
};
+
+ #endif // __DBCONFIG_H__
Index: Makefile.am
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.am 9 May 2002 22:19:43 -0000 1.1
--- Makefile.am 4 Aug 2003 23:20:54 -0000 1.2
***************
*** 1,2 ****
bin_PROGRAMS = axissvr
! axissvr_SOURCES = gwhogsvr.cpp
--- 1,2 ----
bin_PROGRAMS = axissvr
! axissvr_SOURCES = ClientObj.cpp DBConfig.cpp ServerConfiguration.cpp ServerObj.cpp gwhogsvr.cpp
Index: Makefile.in
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.in 9 May 2002 22:19:43 -0000 1.1
--- Makefile.in 4 Aug 2003 23:20:54 -0000 1.2
***************
*** 66,70 ****
bin_PROGRAMS = axissvr
! axissvr_SOURCES = gwhogsvr.cpp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- 66,70 ----
bin_PROGRAMS = axissvr
! axissvr_SOURCES = ClientObj.cpp DBConfig.cpp ServerConfiguration.cpp ServerObj.cpp gwhogsvr.cpp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
***************
*** 77,81 ****
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
! axissvr_OBJECTS = gwhogsvr.o
axissvr_LDADD = $(LDADD)
axissvr_DEPENDENCIES =
--- 77,82 ----
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
! axissvr_OBJECTS = ClientObj.o DBConfig.o ServerConfiguration.o \
! ServerObj.o gwhogsvr.o
axissvr_LDADD = $(LDADD)
axissvr_DEPENDENCIES =
***************
*** 92,98 ****
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
! TAR = tar
GZIP_ENV = --best
! DEP_FILES = .deps/gwhogsvr.P
SOURCES = $(axissvr_SOURCES)
OBJECTS = $(axissvr_OBJECTS)
--- 93,100 ----
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
! TAR = gtar
GZIP_ENV = --best
! DEP_FILES = .deps/ClientObj.P .deps/DBConfig.P \
! .deps/ServerConfiguration.P .deps/ServerObj.P .deps/gwhogsvr.P
SOURCES = $(axissvr_SOURCES)
OBJECTS = $(axissvr_OBJECTS)
Index: ServerConfiguration.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/ServerConfiguration.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ServerConfiguration.cpp 19 Jun 2003 21:37:52 -0000 1.3
--- ServerConfiguration.cpp 4 Aug 2003 23:20:54 -0000 1.4
***************
*** 3,8 ****
//////////////////////////////////////////////////////////////////////
! #include "stdafx.h"
! #include "axisserver.h"
#include "ServerConfiguration.h"
--- 3,8 ----
//////////////////////////////////////////////////////////////////////
! #include "StdAfx.h"
! #include "gwhogsvr.h"
#include "ServerConfiguration.h"
***************
*** 88,98 ****
m_iErrorCount++;
xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
! CString s, message;
va_list args;
va_start(args, msg);
! s.FormatV(msg, args);
va_end(args);
! s.Replace(_T('\t'), _T(' '));
! if ( s.GetLength() > 0 )
m_sErrors += s;
return;
--- 88,100 ----
m_iErrorCount++;
xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
! TCHAR s[MAX_BUFFER];
va_list args;
va_start(args, msg);
! _vstprintf(s, msg, args);
va_end(args);
! for ( int i = 0; i < _tcslen(s); i++ )
! if ( s[i] == _T('\t') )
! s[i] = _T(' ');
! if ( _tcslen(s) > 0 )
m_sErrors += s;
return;
***************
*** 476,480 ****
--- 478,486 ----
WCHAR * pwString = new WCHAR [iLen + 1];
memset(pwString, 0x00, (iLen + 1) * 2);
+ #ifdef _WIN32
MultiByteToWideChar(CP_UTF8, 0, (const char*) s, iLen, pwString, iLen);
+ #else
+ // Need to build a portable version of this function
+ #endif
TCHAR * szOut = new TCHAR [iLen + 1];
memset(szOut, 0x00, sizeof(TCHAR) * (iLen + 1));
***************
*** 625,629 ****
// String Array
{
! CStringArray *p = (CStringArray*) pData;
// Parse through the _string for newlines
int c = 0;
--- 631,635 ----
// String Array
{
! vector<_string> *p = (vector<_string>*) pData;
// Parse through the _string for newlines
int c = 0;
***************
*** 635,639 ****
while ( i != s.end() )
{
! if ( i == _T("\t") )
i = s.erase(i);
else
--- 641,645 ----
while ( i != s.end() )
{
! if ( *i == _T('\t') )
i = s.erase(i);
else
***************
*** 684,686 ****
}
return TRUE;
! }
\ No newline at end of file
--- 690,692 ----
}
return TRUE;
! }
Index: ServerConfiguration.h
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/ServerConfiguration.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ServerConfiguration.h 19 Jun 2003 21:37:52 -0000 1.3
--- ServerConfiguration.h 4 Aug 2003 23:20:54 -0000 1.4
***************
*** 11,15 ****
#include <libxml/parser.h>
! #include <libxml/parserinternals.h>
#include <string>
--- 11,15 ----
#include <libxml/parser.h>
! #include <libxml/parserInternals.h>
#include <string>
Index: ServerObj.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/ServerObj.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ServerObj.cpp 17 Jun 2003 22:33:08 -0000 1.5
--- ServerObj.cpp 4 Aug 2003 23:20:54 -0000 1.6
***************
*** 26,30 ****
#include "ServerObj.h"
#include "ClientObj.h"
- #include "MainFrm.h"
#include "ntservice.h"
#include "gwhogsvr.h"
--- 26,29 ----
***************
*** 91,95 ****
--- 90,96 ----
CAxisServer::CAxisServer()
{
+ #ifdef _WIN32
m_pService = new CService(_T("axissvr"), _T("Axis Server"), _T(""));
+ #endif
m_sock = 0;
m_bInitialized = FALSE;
***************
*** 105,119 ****
if ( !m_bIsFinished )
Shutdown();
if ( m_pService )
delete m_pService;
if ( m_pDB )
delete m_pDB;
}
- #ifdef WIN32
int CAxisServer::Create()
- #else
- int main(int argc, TCHAR *argv[])
- #endif
{
m_lastSpawnLoadTime = 0;
--- 106,118 ----
if ( !m_bIsFinished )
Shutdown();
+ #ifdef _WIN32
if ( m_pService )
delete m_pService;
+ #endif
if ( m_pDB )
delete m_pDB;
}
int CAxisServer::Create()
{
m_lastSpawnLoadTime = 0;
***************
*** 123,127 ****
--- 122,137 ----
}
+ #ifndef WIN32
+ int main(int argc, TCHAR *argv[])
+ {
+
+ }
+ #endif
+
+ #ifdef _WIN32
void _cdecl CAxisServer::LoadSpawns(LPVOID pData)
+ #else
+ void * CAxisServer::LoadSpawns(LPVOID pData)
+ #endif
{
m_bSpawnsLoading = TRUE;
***************
*** 322,325 ****
--- 332,336 ----
}
+ #ifdef _WIN32
if ( m_pService->GetState() == SERVICE_STOP_PENDING )
{
***************
*** 327,330 ****
--- 338,342 ----
return TRUE;
}
+ #endif
// Periodically, reload the spawnpoint information.
***************
*** 476,479 ****
--- 488,492 ----
// Set the font
+ #ifdef _WIN32
if ( !m_config.FontName().empty() )
m_pWnd->SetConsoleFont(m_config.FontName().c_str(), m_config.FontSize(), m_config.FontFlags());
***************
*** 481,484 ****
--- 494,498 ----
// Set the geometry
SetGeometry();
+ #endif
m_bInitialized = TRUE;
***************
*** 843,847 ****
{
SysMessage(_T("ERROR: Trying to delete a client, but clients vector is empty. Axis Server may be unstable!\n"));
! return NULL;
}
--- 857,861 ----
{
SysMessage(_T("ERROR: Trying to delete a client, but clients vector is empty. Axis Server may be unstable!\n"));
! return m_vClients.begin();
}
***************
*** 859,870 ****
}
SysMessage(_T("ERROR: Unable to find client object to remove in the clients vector. Axis Server may be unstable!\n"));
! return NULL;
}
! CString CAxisServer::GetVersionString()
{
! CString csVersion;
! csVersion.Format(_T("%s"), SVR_VERSION);
! return csVersion;
}
--- 873,884 ----
}
SysMessage(_T("ERROR: Unable to find client object to remove in the clients vector. Axis Server may be unstable!\n"));
! return m_vClients.begin();
}
! _string CAxisServer::GetVersionString()
{
! _string sVersion;
! sVersion.assign(SVR_VERSION);
! return sVersion;
}
***************
*** 882,886 ****
}
#else
! signal(SIGPIPE, SIm_IGN);
if(pthread_mutex_init(&m_hStdioMutex, NULL))
{
--- 896,900 ----
}
#else
! signal(SIGPIPE, SIG_IGN);
if(pthread_mutex_init(&m_hStdioMutex, NULL))
{
***************
*** 895,898 ****
--- 909,913 ----
BOOL CAxisServer::CreateServerPipe()
{
+ #ifdef _WIN32
// Create Security Descriptor
SECURITY_DESCRIPTOR sd;
***************
*** 926,929 ****
--- 941,948 ----
}
return TRUE;
+ #else
+ // Need to add code to create pipes in linux
+ return TRUE;
+ #endif
}
***************
*** 949,953 ****
--- 968,974 ----
m_pDB->Init();
}
+ #ifdef _WIN32
m_pService->UseService(m_config.UseService());
+ #endif
}
***************
*** 969,975 ****
--- 990,1000 ----
{
fReadLine(pIni, &szLine[0], sizeof(szLine)); // This one is the server name
+ #ifdef _WIN32
m_pService->SetName(szLine);
// We need to reset the mutex now
CloseHandle(m_hStdioMutex);
+ #else
+ pthread_mutex_destroy(&m_hStdioMutex);
+ #endif
// Open the new mutex
InitMutex();
***************
*** 1008,1016 ****
int opt = 1;
setsockopt( m_sock, SOL_SOCKET, SO_REUSEADDR, (char*)&opt, sizeof(opt));
- #ifdef _WIN32
struct linger lingerOpt;
- #else
- struct LINGER lingerOpt;
- #endif
memset(&lingerOpt, 0x00, sizeof(lingerOpt));
lingerOpt.l_onoff = 1;
--- 1033,1037 ----
***************
*** 1052,1056 ****
--- 1073,1081 ----
m_bInitialized = FALSE;
// Close the socket that we are listening to
+ #ifdef _WIN32
closesocket(m_sock);
+ #else
+ close(m_sock);
+ #endif
// Bind to the new socket
if ( !InitSockets() )
***************
*** 1067,1070 ****
--- 1092,1096 ----
}
// Install or remove the service as necessary
+ #ifdef _WIN32
if ( m_config.UseService() != oldConfig.UseService() )
{
***************
*** 1087,1090 ****
--- 1113,1117 ----
// What do we need to do here?
}
+ #endif
// All other changes can be applied on the fly
***************
*** 1092,1095 ****
--- 1119,1123 ----
}
+ #ifdef _WIN32
void CAxisServer::SetGeometry()
{
***************
*** 1130,1133 ****
--- 1158,1162 ----
m_pWnd->MoveWindow(l, r, w, h);
}
+ #endif
TCHAR * CAxisServer::BasePath()
***************
*** 1136,1138 ****
_tgetcwd(szCwd, MAX_PATH);
return szCwd;
! }
\ No newline at end of file
--- 1165,1168 ----
_tgetcwd(szCwd, MAX_PATH);
return szCwd;
! }
!
Index: ServerObj.h
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/ServerObj.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ServerObj.h 19 Jun 2003 21:37:52 -0000 1.5
--- ServerObj.h 4 Aug 2003 23:20:54 -0000 1.6
***************
*** 36,40 ****
{
public:
! CString GetVersionString();
CAxisServer();
~CAxisServer();
--- 36,40 ----
{
public:
! _string GetVersionString();
CAxisServer();
~CAxisServer();
***************
*** 46,55 ****
void Shutdown();
int GetClientCount() { return m_vClients.size(); }
class CMainFrame * m_pWnd;
BOOL IsInitialized() { return m_bInitialized; }
static BOOL IsRunning() { return m_bIsRunning; }
BOOL IsFinished() { return m_bIsFinished; }
void ReloadConfig();
- void SetGeometry();
// We should make these protected!
--- 46,58 ----
void Shutdown();
int GetClientCount() { return m_vClients.size(); }
+ #ifdef _WIN32
class CMainFrame * m_pWnd;
+ void SetGeometry();
+ class CService * m_pService;
+ #endif
BOOL IsInitialized() { return m_bInitialized; }
static BOOL IsRunning() { return m_bIsRunning; }
BOOL IsFinished() { return m_bIsFinished; }
void ReloadConfig();
// We should make these protected!
***************
*** 60,65 ****
basic_string<char> m_sSpawns; // Since this could be sent to non-unicode clients, this needs to be non-unicode.
! static void _cdecl LoadSpawns(LPVOID pData);
! class CService * m_pService;
CServerConfiguration m_config;
BOOL Init();
--- 63,71 ----
basic_string<char> m_sSpawns; // Since this could be sent to non-unicode clients, this needs to be non-unicode.
! #ifdef _WIN32
! static void _cdecl LoadSpawns(void * pData);
! #else
! static void * LoadSpawns(void * pData);
! #endif
CServerConfiguration m_config;
BOOL Init();
***************
*** 96,98 ****
};
! #endif
\ No newline at end of file
--- 102,105 ----
};
! #endif
!
Index: StdAfx.h
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/StdAfx.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** StdAfx.h 16 Jun 2003 03:58:35 -0000 1.3
--- StdAfx.h 4 Aug 2003 23:20:54 -0000 1.4
***************
*** 30,33 ****
--- 30,35 ----
#define AFX_STDAFX_H__3E5D60A2_51CB_43B6_A042_DACA2D49D1CD__INCLUDED_
+ #ifdef _WIN32
+
#if _MSC_VER > 1000
#pragma once
***************
*** 57,60 ****
--- 59,123 ----
#define IDT_TIMER 6666
#define IDT_NIDTIP 6667
+
+ #else // LINUX
+ #include <unistd.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <errno.h>
+ #include <stdarg.h>
+ #include <sys/socket.h>
+ #include <sys/types.h>
+ #include <pthread.h>
+ #include <sys/time.h>
+ #include <netinet/in.h>
+ #include <ctype.h>
+ #include <sys/stat.h>
+ #include <dirent.h>
+ #include <signal.h>
+ #include <netdb.h>
+ #include <sql.h>
+ #include <sqlext.h>
+
+ #define _cdecl
+ #define HOSTENT struct hostent
+ #define SOCKET int
+ #define INVALID_SOCKET (SOCKET)(~0)
+ #define SOCKET_ERROR (-1)
+ #define LPVOID void *
+ #define SOCKADDR_IN sockaddr_in
+ #define LPSOCKADDR sockaddr *
+ #define TCHAR char
+ #define CHAR char
+ #define LPCTSTR const TCHAR *
+ #define LPCSTR const CHAR *
+ #define _T(x) x
+ #define _stprintf sprintf
+ #define _tfopen fopen
+ #define _trename rename
+ #define _tcsclen strlen
+ #define _tcscat strcat
+ #define _tcsstr strstr
+ #define _tcschr strchr
+ #define _ftprintf fprintf
+ #define _tunlink unlink
+ #define _tcslen strlen
+ #define _tcscpy strcpy
+ #define _tprintf printf
+ #define _tcscmp strcmp
+ #define _tcstok strtok
+ #define _vstprintf vsprintf
+ #define _vftprintf vfprintf
+ #define _vtprintf vprintf
+ #define _tgetcwd getcwd
+ #define _ttoi atoi
+ #define _tcstoul strtoul
+ #define _tcsicmp strcasecmp
+ #define BYTE unsigned char
+ #define MAX_BUFFER 8192
+ #define MAX_PATH 256
+ #define WCHAR wchar_t
+
+ #endif // _WIN32
#define SQLFAILED(x) ( x != SQL_SUCCESS && x != SQL_SUCCESS_WITH_INFO )
Index: configure
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** configure 9 May 2002 22:19:43 -0000 1.1
--- configure 4 Aug 2003 23:20:54 -0000 1.2
***************
*** 775,779 ****
! LIBS="-pthread $LIBS"
CXXFLAGS=""
--- 775,780 ----
! LDFLAGS="-L/usr/lib -L/usr/local/lib $LDFLAGS"
! LIBS="-pthread -lxml2 -lcryptopp -lodbc $LIBS"
CXXFLAGS=""
***************
*** 800,804 ****
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:803: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 801,805 ----
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:804: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 832,836 ****
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:835: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
--- 833,837 ----
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:836: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
***************
*** 843,852 ****
cat > conftest.$ac_ext << EOF
! #line 846 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
! if { (eval echo configure:851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
--- 844,853 ----
cat > conftest.$ac_ext << EOF
! #line 847 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
! if { (eval echo configure:852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
***************
*** 874,883 ****
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:877: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
! echo "configure:882: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 875,884 ----
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:878: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
! echo "configure:883: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 888,892 ****
#endif
EOF
! if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
--- 889,893 ----
#endif
EOF
! if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
***************
*** 907,911 ****
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
! echo "configure:910: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 908,912 ----
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
! echo "configure:911: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 938,945 ****
fi
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:944: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 939,997 ----
fi
+ for ac_declaration in \
+ ''\
+ '#include <stdlib.h>' \
+ 'extern "C" void std::exit (int) throw (); using std::exit;' \
+ 'extern "C" void std::exit (int); using std::exit;' \
+ 'extern "C" void exit (int) throw ();' \
+ 'extern "C" void exit (int);' \
+ 'void exit (int);'
+ do
+ cat > conftest.$ac_ext <<EOF
+ #line 952 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+ int main() {
+ exit (42);
+ ; return 0; }
+ EOF
+ if { (eval echo configure:960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ :
+ else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ continue
+ fi
+ rm -f conftest*
+ cat > conftest.$ac_ext <<EOF
+ #line 970 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int main() {
+ exit (42);
+ ; return 0; }
+ EOF
+ if { (eval echo configure:977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ break
+ else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest*
+ done
+ if test -n "$ac_declaration"; then
+ echo '#ifdef __cplusplus' >>confdefs.h
+ echo $ac_declaration >>confdefs.h
+ echo '#endif' >>confdefs.h
+ fi
+
+
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:996: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 971,975 ****
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:974: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 1023,1027 ----
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1026: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1022,1026 ****
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1025: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 1074,1078 ----
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1077: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1054,1058 ****
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:1057: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
--- 1106,1110 ----
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:1109: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
***************
*** 1065,1074 ****
cat > conftest.$ac_ext << EOF
! #line 1068 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
! if { (eval echo configure:1073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
--- 1117,1126 ----
cat > conftest.$ac_ext << EOF
! #line 1120 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
! if { (eval echo configure:1125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
***************
*** 1096,1105 ****
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:1099: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
! echo "configure:1104: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 1148,1157 ----
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:1151: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
! echo "configure:1156: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1110,1114 ****
#endif
EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
--- 1162,1166 ----
#endif
EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
***************
*** 1129,1133 ****
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:1132: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 1181,1185 ----
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:1184: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1161,1165 ****
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:1164: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
--- 1213,1217 ----
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:1216: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
***************
*** 1176,1180 ****
# not just through cpp.
cat > conftest.$ac_ext <<EOF
! #line 1179 "configure"
#include "confdefs.h"
#include <assert.h>
--- 1228,1232 ----
# not just through cpp.
cat > conftest.$ac_ext <<EOF
! #line 1231 "configure"
#include "confdefs.h"
#include <assert.h>
***************
*** 1182,1186 ****
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
--- 1234,1238 ----
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
***************
*** 1193,1197 ****
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
! #line 1196 "configure"
#include "confdefs.h"
#include <assert.h>
--- 1245,1249 ----
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
! #line 1248 "configure"
#include "confdefs.h"
#include <assert.h>
***************
*** 1199,1203 ****
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
--- 1251,1255 ----
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
***************
*** 1210,1214 ****
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
! #line 1213 "configure"
#include "confdefs.h"
#include <assert.h>
--- 1262,1266 ----
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
! #line 1265 "configure"
#include "confdefs.h"
#include <assert.h>
***************
*** 1216,1220 ****
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
--- 1268,1272 ----
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
***************
*** 1247,1256 ****
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
! echo "configure:1250: checking for $ac_hdr that defines DIR" >&5
if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1255 "configure"
#include "confdefs.h"
#include <sys/types.h>
--- 1299,1308 ----
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
! echo "configure:1302: checking for $ac_hdr that defines DIR" >&5
if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1307 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 1260,1264 ****
; return 0; }
EOF
! if { (eval echo configure:1263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
--- 1312,1316 ----
; return 0; }
EOF
! if { (eval echo configure:1315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
***************
*** 1285,1289 ****
if test $ac_header_dirent = dirent.h; then
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
! echo "configure:1288: checking for opendir in -ldir" >&5
ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 1337,1341 ----
if test $ac_header_dirent = dirent.h; then
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
! echo "configure:1340: checking for opendir in -ldir" >&5
ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 1293,1297 ****
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 1296 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
--- 1345,1349 ----
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 1348 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
***************
*** 1304,1308 ****
; return 0; }
EOF
! if { (eval echo configure:1307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
--- 1356,1360 ----
; return 0; }
EOF
! if { (eval echo configure:1359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 1326,1330 ****
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
! echo "configure:1329: checking for opendir in -lx" >&5
ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 1378,1382 ----
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
! echo "configure:1381: checking for opendir in -lx" >&5
ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 1334,1338 ****
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 1337 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
--- 1386,1390 ----
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 1389 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
***************
*** 1345,1349 ****
; return 0; }
EOF
! if { (eval echo configure:1348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
--- 1397,1401 ----
; return 0; }
EOF
! if { (eval echo configure:1400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 1368,1377 ****
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
! echo "configure:1371: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1376 "configure"
#include "confdefs.h"
#include <stdlib.h>
--- 1420,1429 ----
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
! echo "configure:1423: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1428 "configure"
#include "confdefs.h"
#include <stdlib.h>
***************
*** 1381,1385 ****
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
--- 1433,1437 ----
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
***************
*** 1398,1402 ****
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
! #line 1401 "configure"
#include "confdefs.h"
#include <string.h>
--- 1450,1454 ----
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
! #line 1453 "configure"
#include "confdefs.h"
#include <string.h>
***************
*** 1416,1420 ****
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
! #line 1419 "configure"
#include "confdefs.h"
#include <stdlib.h>
--- 1468,1472 ----
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
! #line 1471 "configure"
#include "confdefs.h"
#include <stdlib.h>
***************
*** 1437,1441 ****
else
cat > conftest.$ac_ext <<EOF
! #line 1440 "configure"
#include "confdefs.h"
#include <ctype.h>
--- 1489,1493 ----
else
cat > conftest.$ac_ext <<EOF
! #line 1492 "configure"
#include "confdefs.h"
#include <ctype.h>
***************
*** 1448,1452 ****
EOF
! if { (eval echo configure:1451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
--- 1500,1504 ----
EOF
! if { (eval echo configure:1503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
***************
*** 1475,1489 ****
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:1478: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1483 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
--- 1527,1541 ----
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:1530: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1535 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
***************
*** 1513,1522 ****
echo $ac_n "checking for working const""... $ac_c" 1>&6
! echo "configure:1516: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1521 "configure"
#include "confdefs.h"
--- 1565,1574 ----
echo $ac_n "checking for working const""... $ac_c" 1>&6
! echo "configure:1568: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1573 "configure"
#include "confdefs.h"
***************
*** 1567,1571 ****
; return 0; }
EOF
! if { (eval echo configure:1570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
--- 1619,1623 ----
; return 0; }
EOF
! if { (eval echo configure:1622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
***************
*** 1588,1597 ****
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
! echo "configure:1591: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1596 "configure"
#include "confdefs.h"
#include <sys/types.h>
--- 1640,1649 ----
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
! echo "configure:1643: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1648 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 1602,1606 ****
; return 0; }
EOF
! if { (eval echo configure:1605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
--- 1654,1658 ----
; return 0; }
EOF
! if { (eval echo configure:1657: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
***************
*** 1623,1632 ****
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
! echo "configure:1626: checking whether struct tm is in sys/time.h or time.h" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1631 "configure"
#include "confdefs.h"
#include <sys/types.h>
--- 1675,1684 ----
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
! echo "configure:1678: checking whether struct tm is in sys/time.h or time.h" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1683 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 1636,1640 ****
; return 0; }
EOF
! if { (eval echo configure:1639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
--- 1688,1692 ----
; return 0; }
EOF
! if { (eval echo configure:1691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
***************
*** 1658,1667 ****
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
! echo "configure:1661: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1666 "configure"
#include "confdefs.h"
#include <sys/types.h>
--- 1710,1719 ----
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
! echo "configure:1713: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1718 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 1680,1684 ****
; return 0; }
EOF
! if { (eval echo configure:1683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
--- 1732,1736 ----
; return 0; }
EOF
! if { (eval echo configure:1735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
***************
*** 1699,1708 ****
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
! echo "configure:1702: checking for vprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1707 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
--- 1751,1760 ----
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
! echo "configure:1754: checking for vprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1759 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
***************
*** 1727,1731 ****
; return 0; }
EOF
! if { (eval echo configure:1730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
--- 1779,1783 ----
; return 0; }
EOF
! if { (eval echo configure:1782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
***************
*** 1751,1760 ****
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
! echo "configure:1754: checking for _doprnt" >&5
if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1759 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
--- 1803,1812 ----
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
! echo "configure:1806: checking for _doprnt" >&5
if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1811 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
***************
*** 1779,1783 ****
; return 0; }
EOF
! if { (eval echo configure:1782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
--- 1831,1835 ----
; return 0; }
EOF
! if { (eval echo configure:1834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
***************
*** 1806,1815 ****
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:1809: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1814 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
--- 1858,1867 ----
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:1861: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1866 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
***************
*** 1834,1838 ****
; return 0; }
EOF
! if { (eval echo configure:1837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
--- 1886,1890 ----
; return 0; }
EOF
! if { (eval echo configure:1889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
Index: configure.in
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/configure.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** configure.in 9 May 2002 22:19:43 -0000 1.1
--- configure.in 4 Aug 2003 23:20:54 -0000 1.2
***************
*** 3,8 ****
AM_INIT_AUTOMAKE(axissvr, 0.13)
! dnl LDFLAGS="-L/usr/lib -L/usr/local/lib $LDFLAGS"
! LIBS="-pthread $LIBS"
CXXFLAGS=""
--- 3,8 ----
AM_INIT_AUTOMAKE(axissvr, 0.13)
! LDFLAGS="-L/usr/lib -L/usr/local/lib $LDFLAGS"
! LIBS="-pthread -lxml2 -lcryptopp -lodbc $LIBS"
CXXFLAGS=""
Index: gwhogsvr.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/gwhogsvr.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** gwhogsvr.cpp 16 Jun 2003 03:58:35 -0000 1.29
--- gwhogsvr.cpp 4 Aug 2003 23:20:54 -0000 1.30
***************
*** 27,32 ****
// gwhogsvr.cpp
! #include "stdafx.h"
! #include "MainFrm.h"
#include "gwhogsvr.h"
#include <string.h>
--- 27,31 ----
// gwhogsvr.cpp
! #include "StdAfx.h"
#include "gwhogsvr.h"
#include <string.h>
***************
*** 44,60 ****
#include "ServerObj.h"
#include "ClientObj.h"
-
-
- #ifndef WIN32
- #define LINGER linger
- #endif
-
-
-
-
- int service_main(int argc, TCHAR *argv[])
- {
- return 0;
- }
int fReadLine(FILE * pFile, TCHAR * pszBuf, int iSize)
--- 43,46 ----
Index: gwhogsvr.h
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/gwhogsvr.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** gwhogsvr.h 16 Jun 2003 03:58:35 -0000 1.9
--- gwhogsvr.h 4 Aug 2003 23:20:54 -0000 1.10
***************
*** 63,82 ****
#ifndef WIN32
- #define SOCKET int
- #define INVALID_SOCKET (SOCKET)(~0)
- #define SOCKET_ERROR (-1)
- #define LPVOID void *
- #define SOCKADDR_IN sockaddr_in
- #define LPSOCKADDR sockaddr *
#define TRUE 1
#define FALSE 0
- #define bool int
#define BOOL int
#define DWORD unsigned long
#define BYTE unsigned char
- #define MAX_PATH 256
#define false 0
#define true 1
- #define HOSTENT struct hostent
#endif
--- 63,73 ----
Index: ntservice.h
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/ntservice.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ntservice.h 16 Jun 2003 22:05:59 -0000 1.6
--- ntservice.h 4 Aug 2003 23:20:54 -0000 1.7
***************
*** 83,85 ****
#endif
! #endif
\ No newline at end of file
--- 83,86 ----
#endif
! #endif
!
|
|
From: Philip E. <pes...@us...> - 2003-08-04 14:17:45
|
Update of /cvsroot/sphere-axis/Axis/S_Sphere52
In directory sc8-pr-cvs1:/tmp/cvs-serv8635/S_Sphere52
Modified Files:
ScriptsMain.cpp WorldItem.cpp
Log Message:
no message
Index: ScriptsMain.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptsMain.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** ScriptsMain.cpp 27 Jul 2003 20:44:55 -0000 1.29
--- ScriptsMain.cpp 4 Aug 2003 14:17:41 -0000 1.30
***************
*** 2196,2206 ****
else
sBasePath = sBaseDirectory;
! // Strip out a trailing backslash, if it exists.
if ( sBasePath.Right(1) != _T('\\') )
sBasePath.Append(_T("\\"));
// Populate the filelist with all of the standard files
! for ( int i = File_World; i < File_QTY; i++ )
{
- CString sFile;
if ( sBasePath != _T("") )
sFile.Format(_T("%s%s"), sBasePath, m_pszFiles[i]);
--- 2196,2227 ----
else
sBasePath = sBaseDirectory;
! // Make sure the trailing backslashes exist
if ( sBasePath.Right(1) != _T('\\') )
sBasePath.Append(_T("\\"));
+ if ( m_config.m_sAcctBaseDir.GetLength() && m_config.m_sAcctBaseDir.Right(1) != _T('\\') )
+ m_config.m_sAcctBaseDir.Append(_T("\\"));
+ if ( m_config.m_sWorldBaseDir.GetLength() && m_config.m_sWorldBaseDir.Right(1) != _T('\\') )
+ m_config.m_sWorldBaseDir.Append(_T("\\"));
+
// Populate the filelist with all of the standard files
! CString sFile;
!
! if ( m_config.m_sWorldBaseDir != _T("") )
! sFile.Format(_T("%s%s"), m_config.m_sWorldBaseDir, m_pszFiles[File_World]);
! else
! sFile = m_pszFiles[File_World];
! m_vFiles[File_World] = sFile;
!
! if ( m_config.m_sAcctBaseDir != _T("") )
! sFile.Format(_T("%s%s"), m_config.m_sAcctBaseDir, m_pszFiles[File_Account]);
! else
! if ( m_config.m_sWorldBaseDir != _T("") )
! sFile.Format(_T("%s%s"), m_config.m_sWorldBaseDir, m_pszFiles[File_Account]);
! else
! sFile = m_pszFiles[File_Account];
! m_vFiles[File_Account] = sFile;
!
! for ( int i = File_Map ; i < File_QTY; i++ )
{
if ( sBasePath != _T("") )
sFile.Format(_T("%s%s"), sBasePath, m_pszFiles[i]);
***************
*** 3090,3094 ****
item.m_dwFileOffset = offset;
item.m_csBaseID = sID;
! item.Load(_T("WORLDITEM"));
if ( item.m_dwItemType == ITEM_SPAWN_CHAR || item.m_dwItemType == ITEM_SPAWN_ITEM )
{
--- 3111,3116 ----
item.m_dwFileOffset = offset;
item.m_csBaseID = sID;
! item.m_csValue = sID;
! item.Load(_T("[WORLDITEM %s]"));
if ( item.m_dwItemType == ITEM_SPAWN_CHAR || item.m_dwItemType == ITEM_SPAWN_ITEM )
{
Index: WorldItem.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/WorldItem.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** WorldItem.cpp 23 Jul 2003 19:10:57 -0000 1.3
--- WorldItem.cpp 4 Aug 2003 14:17:41 -0000 1.4
***************
*** 201,205 ****
bool CWorldItem::LoadBase()
{
! int idx = Main->m_pScripts->m_aItems.Find(this->m_csBaseID);
if ( idx == -1 )
{
--- 201,207 ----
bool CWorldItem::LoadBase()
{
! CString sBase;
! sBase.Format(_T("%04x"), ahextoi(m_csBaseID));
! int idx = Main->m_pScripts->m_aItems.Find(sBase);
if ( idx == -1 )
{
|
|
From: Philip E. <pes...@us...> - 2003-07-29 21:55:32
|
Update of /cvsroot/sphere-axis/Axis/S_Sphere52
In directory sc8-pr-cvs1:/tmp/cvs-serv11224/S_Sphere52
Modified Files:
ProfileEdit.cpp serverconfigdlg.cpp SkillTableEditDlg.cpp
SpawnGroupEditDlg.cpp SpellEditDlg.cpp
Log Message:
no message
Index: ProfileEdit.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ProfileEdit.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ProfileEdit.cpp 23 Jul 2003 19:10:57 -0000 1.6
--- ProfileEdit.cpp 29 Jul 2003 21:15:37 -0000 1.7
***************
*** 390,393 ****
--- 390,394 ----
UpdateData();
HTREEITEM hRoot = m_tcScripts.GetRootItem();
+ sa.RemoveAll();
GetSelections(hRoot, m_sBasePath, sa);
}
Index: serverconfigdlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/serverconfigdlg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** serverconfigdlg.cpp 9 Jul 2003 19:57:25 -0000 1.2
--- serverconfigdlg.cpp 29 Jul 2003 21:15:37 -0000 1.3
***************
*** 328,336 ****
// Read the gray.ini file
CStdioFile csfIniFile;
if (Main->GetProfileType() == PROFILE_REMOTE)
{
Main->m_pAxis->GetRemoteFile(_T("sphere.ini"), _T("sphere.ini"));
}
! if (csfIniFile.Open(Main->GetProfileType() == PROFILE_REMOTE ? RMT_INI_FILE : INI_FILE, CFile::modeRead | CFile::shareDenyNone))
{
CString csLine;
--- 328,340 ----
// Read the gray.ini file
CStdioFile csfIniFile;
+ CString sFile;
if (Main->GetProfileType() == PROFILE_REMOTE)
{
Main->m_pAxis->GetRemoteFile(_T("sphere.ini"), _T("sphere.ini"));
+ sFile.Format(_T("%s%s\\sphere.ini"), Main->m_pScripts->Profile()->BaseDirectory(), Main->m_pScripts->Profile()->ProfileName());
}
! else
! sFile.Format(_T("%ssphere.ini"), Main->m_pScripts->Profile()->BaseDirectory());
! if (csfIniFile.Open(sFile, CFile::modeRead | CFile::shareDenyNone))
{
CString csLine;
Index: SkillTableEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/SkillTableEditDlg.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** SkillTableEditDlg.cpp 11 Jul 2003 17:25:25 -0000 1.3
--- SkillTableEditDlg.cpp 29 Jul 2003 21:15:37 -0000 1.4
***************
*** 133,139 ****
{
CTSkillDef skill;
! skill.m_csFilename = pBase->m_csFilename;
! skill.m_csValue = pBase->m_csValue;
! skill.Load(_T("SKILL "));
int iIndex = this->m_ccbSkills.AddString(skill.m_csKey);
this->m_ccbSkills.SetItemData(iIndex, i);
--- 133,138 ----
{
CTSkillDef skill;
! skill.CopyBase(pBase);
! skill.Load(_T("[SKILL %s]"));
int iIndex = this->m_ccbSkills.AddString(skill.m_csKey);
this->m_ccbSkills.SetItemData(iIndex, i);
***************
*** 228,234 ****
m_pCurrentSkill = new CTSkillDef;
CScriptBase * pBase = (CScriptBase *) this->m_ccbSkills.GetItemDataPtr(iSel);
! m_pCurrentSkill->m_csFilename = pBase->m_csFilename;
! m_pCurrentSkill->m_csValue = pBase->m_csValue;
! m_pCurrentSkill->Load(_T("SKILL "));
CString csVal;
csVal.Format(_T("%ld"), this->m_pCurrentSkill->m_bStatBonus[STAT_DEX]);
--- 227,232 ----
m_pCurrentSkill = new CTSkillDef;
CScriptBase * pBase = (CScriptBase *) this->m_ccbSkills.GetItemDataPtr(iSel);
! m_pCurrentSkill->CopyBase(pBase);
! m_pCurrentSkill->Load(_T("[SKILL %s]"));
CString csVal;
csVal.Format(_T("%ld"), this->m_pCurrentSkill->m_bStatBonus[STAT_DEX]);
Index: SpawnGroupEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/SpawnGroupEditDlg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** SpawnGroupEditDlg.cpp 11 Jul 2003 17:25:25 -0000 1.2
--- SpawnGroupEditDlg.cpp 29 Jul 2003 21:15:37 -0000 1.3
***************
*** 208,217 ****
{
CString csCategory;
! m_ccbCategory.GetLBText(m_ccbCategory.GetCurSel(), csCategory);
if ( (csCategory != _T("")))
{
- int iSel = m_ccbCategory.GetCurSel();
- if (iSel == -1)
- return;
CCategory * pCategory = (CCategory *) m_ccbCategory.GetItemData(iSel);
if (pCategory == NULL)
--- 208,217 ----
{
CString csCategory;
! int iSel = m_ccbCategory.GetCurSel();
! if ( iSel == -1 )
! return;
! m_ccbCategory.GetLBText(iSel, csCategory);
if ( (csCategory != _T("")))
{
CCategory * pCategory = (CCategory *) m_ccbCategory.GetItemData(iSel);
if (pCategory == NULL)
Index: SpellEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/SpellEditDlg.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** SpellEditDlg.cpp 11 Jul 2003 17:25:25 -0000 1.3
--- SpellEditDlg.cpp 29 Jul 2003 21:15:37 -0000 1.4
***************
*** 234,240 ****
continue;
CTSpellDef spell;
! spell.m_csValue = pBase->m_csValue;
! spell.m_csFilename = pBase->m_csFilename;
! spell.Load(_T("spell "));
int index = this->m_ccbSpellList.AddString(spell.m_csName);
this->m_ccbSpellList.SetItemData(index, i);
--- 234,239 ----
continue;
CTSpellDef spell;
! spell.CopyBase(pBase);
! spell.Load(_T("[spell %s]"));
int index = this->m_ccbSpellList.AddString(spell.m_csName);
this->m_ccbSpellList.SetItemData(index, i);
***************
*** 349,355 ****
CScriptBase * pBase = (CScriptBase *) m_ccbSpellList.GetItemData(iIndex);
this->m_pSpell = new CTSpellDef;
! m_pSpell->m_csFilename = pBase->m_csFilename;
! m_pSpell->m_csValue = pBase->m_csValue;
! m_pSpell->Load(_T("spell "));
// Fill this stuff in
if (this->m_pSpell != NULL)
--- 348,353 ----
CScriptBase * pBase = (CScriptBase *) m_ccbSpellList.GetItemData(iIndex);
this->m_pSpell = new CTSpellDef;
! m_pSpell->CopyBase(pBase);
! m_pSpell->Load(_T("[spell %s]"));
// Fill this stuff in
if (this->m_pSpell != NULL)
|
|
From: Philip E. <pes...@us...> - 2003-07-27 20:44:58
|
Update of /cvsroot/sphere-axis/Axis/S_Sphere52
In directory sc8-pr-cvs1:/tmp/cvs-serv9503/S_Sphere52
Modified Files:
AccountDlg.cpp NameEditDlg.cpp PotionEdit.cpp Resource.h
S_Sphere52.rc S_Sphere52.vcproj Scripts.cpp ScriptsMain.cpp
ScriptsMain.h ScriptTables.cpp ScriptTables.h strings.h
TOreDef.cpp XMLConfig.cpp XMLConfig.h
Added Files:
RemoteConsoleDlg.cpp RemoteConsoleDlg.h
Log Message:
no message
--- NEW FILE: RemoteConsoleDlg.cpp ---
/*
$Id: RemoteConsoleDlg.cpp,v 1.1 2003/07/27 20:44:55 pesterle Exp $
**********************************************************************
* Copyright (C) Philip A. Esterle 1998-2003
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
**********************************************************************
*/
// RemoteConsoleDlg.cpp : implementation file
//
#include "stdafx.h"
#include "Scripts.h"
#include "RemoteConsoleDlg.h"
#include "RemoteConsole.h"
#include <afxdlgs.h>
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
static char THIS_FILE[] = __FILE__;
#endif
/////////////////////////////////////////////////////////////////////////////
// CRemoteConsoleDlg dialog
CRemoteConsoleDlg::CRemoteConsoleDlg(CWnd* pParent /*=NULL*/)
: CDialog(CRemoteConsoleDlg::IDD, pParent)
{
CWaitCursor hourglass;
this->m_bIsConnected = false;
m_bLogging = false;
m_csLogFile = _T("");
m_rConsole = NULL;
//{{AFX_DATA_INIT(CRemoteConsoleDlg)
//}}AFX_DATA_INIT
}
void CRemoteConsoleDlg::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CRemoteConsoleDlg)
DDX_Control(pDX, IDC_COMMAND_SEND, m_ccbCommand);
DDX_Control(pDX, IDC_CONSOLE_SEND, m_ccbBroadcast);
DDX_Control(pDX, IDC_ENABLE_LOGGING, m_cbLogging);
DDX_Control(pDX, IDC_SENDCOMMAND, m_cbCommand);
DDX_Control(pDX, IDC_SENDTEXT, m_cbBroadcast);
DDX_Control(pDX, IDC_RC_VERBOSE, m_cbVerbose);
DDX_Control(pDX, IDC_RC_SHUTDOWN, m_cbShutdown);
DDX_Control(pDX, IDC_RC_SECURE, m_cbSecure);
DDX_Control(pDX, IDC_RC_SAVE, m_cbSave);
DDX_Control(pDX, IDC_RC_PROFILE, m_cbProfile);
DDX_Control(pDX, IDC_RC_PAUSE, m_cbPause);
DDX_Control(pDX, IDC_RC_LOG, m_cbLog);
DDX_Control(pDX, IDC_RC_INFORMATION, m_cbInformation);
DDX_Control(pDX, IDC_RC_HEARALL, m_cbHearall);
DDX_Control(pDX, IDC_RC_GARBAGE, m_cbGarbage);
DDX_Control(pDX, IDC_RC_CLIENT, m_cbClient);
DDX_Control(pDX, IDC_RC_ACCOUNT, m_cbAccountUpdate);
DDX_Control(pDX, IDC_RE_CONSOLE, m_creConsole);
DDX_Control(pDX, IDC_RECONNECT, m_cbReconnect);
//}}AFX_DATA_MAP
}
BEGIN_MESSAGE_MAP(CRemoteConsoleDlg, CDialog)
//{{AFX_MSG_MAP(CRemoteConsoleDlg)
ON_BN_CLICKED(IDC_SENDTEXT, OnSendtext)
ON_BN_CLICKED(IDC_RECONNECT, OnReconnect)
ON_WM_TIMER()
ON_WM_SIZE()
ON_BN_CLICKED(IDC_RC_LOG, OnRcLog)
ON_BN_CLICKED(IDC_RC_ACCOUNT, OnRcAccount)
ON_BN_CLICKED(IDC_RC_CLIENT, OnRcClient)
ON_BN_CLICKED(IDC_RC_GARBAGE, OnRcGarbage)
ON_BN_CLICKED(IDC_RC_HEARALL, OnRcHearall)
ON_BN_CLICKED(IDC_RC_INFORMATION, OnRcInformation)
ON_BN_CLICKED(IDC_RC_PAUSE, OnRcPause)
ON_BN_CLICKED(IDC_RC_PROFILE, OnRcProfile)
ON_BN_CLICKED(IDC_RC_SAVE, OnRcSave)
ON_BN_CLICKED(IDC_RC_SECURE, OnRcSecure)
ON_BN_CLICKED(IDC_RC_SHUTDOWN, OnRcShutdown)
ON_BN_CLICKED(IDC_RC_VERBOSE, OnRcVerbose)
ON_BN_CLICKED(IDC_SENDCOMMAND, OnSendcommand)
ON_BN_CLICKED(IDC_ENABLE_LOGGING, OnEnableLogging)
ON_COMMAND(ID_RC_OPTIONS_CLEARWINDOWBUFFER, OnRcOptionsClearwindowbuffer)
//}}AFX_MSG_MAP
ON_MESSAGE(WM_RCONSOLEMESSAGE, OnRConsoleMessage)
ON_MESSAGE(WM_RCONSOLERECONNECT, OnRConsoleReconnect)
ON_WM_CLOSE()
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
// CRemoteConsoleDlg message handlers
void CRemoteConsoleDlg::OnSendtext()
{
CString csMessage;
this->m_ccbBroadcast.GetWindowText(csMessage);
if ( csMessage.GetLength() > 75 )
{
AfxMessageBox(locale->String(IDS_REMOTE_CMDTOOLONG), MB_OK);
return;
}
m_rConsole->Broadcast(csMessage);
// Add the _string to the listbox
if ( m_ccbBroadcast.FindString(-1, csMessage) == -1 )
m_ccbBroadcast.AddString(csMessage);
// Add the values in here to the registry
CStringArray sa;
for ( int i = 0; i < m_ccbBroadcast.GetCount(); i++ )
{
CString csValue;
m_ccbBroadcast.GetLBText(i, csValue);
sa.Add(csValue);
}
Main->m_config.SetRCBroadcasts(&sa);
}
CRemoteConsoleDlg::~CRemoteConsoleDlg()
{
if (m_rConsole != NULL)
{
m_rConsole->m_bContinue = false;
int i = 0;
while (m_rConsole->IsConnected() && i < 100)
{
Sleep(100);
i++;
}
delete m_rConsole;
}
}
void CRemoteConsoleDlg::OnReconnect()
{
if (m_bIsConnected)
{
CWaitCursor hourglass;
m_bIsConnected = false;
this->m_rConsole->m_bContinue = false;
int i = 0;
this->m_cbReconnect.SetWindowText(locale->String(IDS_REMOTE_RECONNECT));
}
else
{
if (m_rConsole != NULL)
{
m_bIsConnected = true;
this->m_cbReconnect.SetWindowText(locale->String(IDS_REMOTE_DISCONNECT));
delete m_rConsole;
m_rConsole = new CRemoteConsole(this->GetSafeHwnd());
SetTimer(this->m_nIDTimer, 1000, NULL);
}
}
}
void CRemoteConsoleDlg::OnTimer(UINT nIDEvent)
{
// Timer expired...Check to see if we are still connected
if (this->m_rConsole->IsConnected())
{
// Reset the timer?
}
else
{
this->m_cbReconnect.SetWindowText(locale->String(IDS_REMOTE_RECONNECT));
this->m_bIsConnected = false;
// Kill the timer
KillTimer(nIDEvent);
}
CString csTitle;
csTitle.Format(_T("Remote Console - %s (%s)"), Main->GetProfileString(), m_rConsole->IsConnected() ? locale->String(IDS_RC_CONNECTED) : locale->String(IDS_RC_DISCONNECTED));
this->SetWindowText(csTitle);
CDialog::OnTimer(nIDEvent);
}
BOOL CRemoteConsoleDlg::OnInitDialog()
{
CDialog::OnInitDialog();
Localize();
if (Main->m_pRConsole == NULL)
this->m_rConsole = new CRemoteConsole(this->GetSafeHwnd());
else
{
this->m_rConsole = Main->m_pRConsole;
this->m_rConsole->m_parentHWnd = this->GetSafeHwnd();
}
this->m_bIsConnected = this->m_rConsole->IsConnected();
if (this->m_bIsConnected)
this->m_cbReconnect.SetWindowText(locale->String(IDS_REMOTE_DISCONNECT));
this->m_ccbBroadcast.SetFocus();
this->m_nIDTimer = 4000;
this->m_creConsole.LimitText(0x7FFFFFFF);
// Get the current positions of all the windows
GetWindowRect(m_crOriginal);
m_cbAccountUpdate.GetWindowRect(m_crAccount);
m_cbClient.GetWindowRect(m_crClient);
m_cbGarbage.GetWindowRect(m_crGarbage);
m_cbHearall.GetWindowRect(m_crHearAll);
m_cbInformation.GetWindowRect(m_crInformation);
m_cbLog.GetWindowRect(m_crLog);
m_cbPause.GetWindowRect(m_crPause);
m_cbProfile.GetWindowRect(m_crProfile);
m_cbReconnect.GetWindowRect(m_crReConnect);
m_cbSave.GetWindowRect(m_crSave);
m_cbSecure.GetWindowRect(m_crSecure);
m_cbShutdown.GetWindowRect(m_crShutdown);
m_cbVerbose.GetWindowRect(m_crVerbose);
m_ccbBroadcast.GetWindowRect(m_crText);
m_creConsole.GetWindowRect(m_crConsole);
m_cbBroadcast.GetWindowRect(m_crBroadcast);
m_cbCommand.GetWindowRect(m_crCommand);
m_ccbCommand.GetWindowRect(m_crCommandText);
m_cbLogging.GetWindowRect(m_crLogging);
ScreenToClient(m_crOriginal);
ScreenToClient(m_crAccount);
ScreenToClient(m_crClient);
ScreenToClient(m_crGarbage);
ScreenToClient(m_crHearAll);
ScreenToClient(m_crInformation);
ScreenToClient(m_crLog);
ScreenToClient(m_crPause);
ScreenToClient(m_crProfile);
ScreenToClient(m_crReConnect);
ScreenToClient(m_crSave);
ScreenToClient(m_crSecure);
ScreenToClient(m_crShutdown);
ScreenToClient(m_crVerbose);
ScreenToClient(m_crText);
ScreenToClient(m_crConsole);
ScreenToClient(m_crBroadcast);
ScreenToClient(m_crCommand);
ScreenToClient(m_crCommandText);
ScreenToClient(m_crLogging);
iTop = m_crConsole.top - m_crOriginal.top;
iLeft = m_crConsole.left - m_crOriginal.left;
iRight = m_crConsole.right - m_crOriginal.right;
iBottom = m_crText.bottom - m_crOriginal.bottom;
CStringArray sa;
Main->m_config.GetRCBroadcasts(&sa);
m_ccbBroadcast.ResetContent();
for ( int i = 0; i < sa.GetSize(); i++ )
m_ccbBroadcast.AddString(sa.GetAt(i));
Main->m_config.GetRCCommands(&sa);
m_ccbCommand.ResetContent();
for ( i = 0; i < sa.GetSize(); i++ )
m_ccbCommand.AddString(sa.GetAt(i));
SetTimer(this->m_nIDTimer, 1000, NULL);
return FALSE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
}
LRESULT CRemoteConsoleDlg::OnRConsoleMessage(WPARAM wParam, LPARAM lParam)
{
// this is a message from m_rConsole
TCHAR * pText = (TCHAR *) wParam;
if (pText == 0x00)
return 0;
TCHAR crlf [] = {0x0d, 0x0a, 0x00};
TCHAR eol [] = {0x0a, 0x00};
TCHAR * pNewText = new TCHAR [_tcsclen(pText) + 1];
memset(&pNewText[0], 0x00, _tcsclen(pText) + 1);
int iPtr = 0;
int iScrollCnt = 0;
for ( int i = 0; i < (int) _tcsclen(pText); i++ )
{
if (*(pText + i) == 0x08 && iPtr > 0)
{
// backspace
iPtr--;
pNewText[iPtr] = 0x00;
}
else
{
if ( *(pText + i) != 0x08 )
{
if ( *(pText + i) == 0x0d )
iScrollCnt++;
pNewText[iPtr] = *(pText + i);
iPtr++;
}
}
}
pNewText[iPtr] = 0x00;
// Log it
try
{
if ( m_bLogging && m_csLogFile != _T("") )
{
CStdioFile file;
CString csText = pNewText;
csText.Replace(crlf, _T("\n"));
if ( file.Open(m_csLogFile, CFile::modeWrite | CFile::modeCreate | CFile::modeNoTruncate | CFile::typeText | CFile::shareDenyWrite) )
{
file.SeekToEnd();
file.WriteString(csText);
file.Close();
}
}
}
catch (CFileException * e)
{
e->Delete();
}
int lastLine = m_creConsole.GetLineCount();
int lastchar = m_creConsole.LineIndex(lastLine);
m_creConsole.SetSel(lastchar, lastchar);
m_creConsole.ReplaceSel(pNewText);
m_creConsole.LineScroll(iScrollCnt);
delete [] pNewText;
return 0;
}
BOOL CRemoteConsoleDlg::OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo)
{
if (nID == 2 )
{
//CMiscTab *pParent = ( CMiscTab * ) m_pParent;
//pParent->HitConsole();
//return true;
}
return CDialog::OnCmdMsg(nID, nCode, pExtra, pHandlerInfo);
}
BOOL CRemoteConsoleDlg::Create( UINT IDD, CWnd* pParentWnd)
{
this->m_pParent = pParentWnd;
return CDialog::Create(IDD, pParentWnd);
}
LRESULT CRemoteConsoleDlg::OnRConsoleReconnect(WPARAM wParam, LPARAM lParam)
{
this->m_cbReconnect.SetWindowText(locale->String(IDS_REMOTE_DISCONNECT));
this->m_bIsConnected = true;
SetTimer(this->m_nIDTimer, 1000, NULL);
this->m_rConsole = ( CRemoteConsole * ) wParam;
return 0;
}
void CRemoteConsoleDlg::OnSize(UINT nType, int cx, int cy)
{
// Make sure we aren't trying to be narrower or shorter than the original
if ( cx < m_crOriginal.Width() )
cx = m_crOriginal.Width();
if ( cy < m_crOriginal.Height() )
cy = m_crOriginal.Height();
int dx, dy;
dx = 0; dy = 0;
CRect crNew;
GetWindowRect(crNew);
ScreenToClient(crNew);
dx = crNew.Width() - m_crOriginal.Width();
dy = crNew.Height() - m_crOriginal.Height();
// Resize the console window
m_creConsole.MoveWindow(m_crConsole.left , m_crConsole.top, m_crConsole.Width() + dx, m_crConsole.Height() + dy);
// Move the other windows
m_cbAccountUpdate.MoveWindow(m_crAccount.left, m_crAccount.top + dy, m_crAccount.Width(), m_crAccount.Height());
m_cbClient.MoveWindow(m_crClient.left, m_crClient.top + dy, m_crClient.Width(), m_crClient.Height());
m_cbGarbage.MoveWindow(m_crGarbage.left, m_crGarbage.top + dy, m_crGarbage.Width(), m_crGarbage.Height());
m_cbHearall.MoveWindow(m_crHearAll.left, m_crHearAll.top + dy, m_crHearAll.Width(), m_crHearAll.Height());
m_cbInformation.MoveWindow(m_crInformation.left, m_crInformation.top + dy, m_crInformation.Width(), m_crInformation.Height());
m_cbLog.MoveWindow(m_crLog.left, m_crLog.top + dy, m_crLog.Width(), m_crLog.Height());
m_cbPause.MoveWindow(m_crPause.left, m_crPause.top + dy, m_crPause.Width(), m_crPause.Height());
m_cbProfile.MoveWindow(m_crProfile.left, m_crProfile.top + dy, m_crProfile.Width(), m_crProfile.Height());
m_cbReconnect.MoveWindow(m_crReConnect.left, m_crReConnect.top + dy, m_crReConnect.Width(), m_crReConnect.Height());
m_cbSave.MoveWindow(m_crSave.left, m_crSave.top + dy, m_crSave.Width(), m_crSave.Height());
m_cbSecure.MoveWindow(m_crSecure.left, m_crSecure.top + dy, m_crSecure.Width(), m_crSecure.Height());
m_cbShutdown.MoveWindow(m_crShutdown.left, m_crShutdown.top + dy, m_crShutdown.Width(), m_crShutdown.Height());
m_cbVerbose.MoveWindow(m_crVerbose.left, m_crVerbose.top + dy, m_crVerbose.Width(), m_crVerbose.Height());
m_ccbBroadcast.MoveWindow(m_crText.left, m_crText.top + dy, m_crText.Width(), m_crText.Height());
m_cbBroadcast.MoveWindow(m_crBroadcast.left, m_crBroadcast.top + dy, m_crBroadcast.Width(), m_crBroadcast.Height());
m_cbCommand.MoveWindow(m_crCommand.left, m_crCommand.top + dy, m_crCommand.Width(), m_crCommand.Height());
m_ccbCommand.MoveWindow(m_crCommandText.left, m_crCommandText.top + dy, m_crCommandText.Width(), m_crCommandText.Height());
m_cbLogging.MoveWindow(m_crLogging.left, m_crLogging.top + dy, m_crLogging.Width(), m_crLogging.Height());
CDialog::OnSize(nType, cx, cy);
this->Invalidate();
}
void CRemoteConsoleDlg::OnRcLog()
{
m_rConsole->ToggleLog();
}
void CRemoteConsoleDlg::OnRcAccount()
{
m_rConsole->AccountUpdate();
}
void CRemoteConsoleDlg::OnRcClient()
{
m_rConsole->ClientList();
}
void CRemoteConsoleDlg::OnRcGarbage()
{
m_rConsole->GarbageCollect();
}
void CRemoteConsoleDlg::OnRcHearall()
{
m_rConsole->ToggleHearAll();
}
void CRemoteConsoleDlg::OnRcInformation()
{
m_rConsole->Information();
}
void CRemoteConsoleDlg::OnRcPause()
{
m_rConsole->Pause();
}
void CRemoteConsoleDlg::OnRcProfile()
{
m_rConsole->ProfileInfo();
}
void CRemoteConsoleDlg::OnRcSave()
{
m_rConsole->ForceSave();
}
void CRemoteConsoleDlg::OnRcSecure()
{
m_rConsole->ToggleSecure();
}
void CRemoteConsoleDlg::OnRcShutdown()
{
m_rConsole->Shutdown();
}
void CRemoteConsoleDlg::OnRcVerbose()
{
m_rConsole->ToggleVerbose();
}
void CRemoteConsoleDlg::OnSendcommand()
{
CString csMessage;
this->m_ccbCommand.GetWindowText(csMessage);
if ( csMessage.GetLength() > 75 )
{
AfxMessageBox(locale->String(IDS_REMOTE_CMDTOOLONG), MB_OK);
return;
}
m_rConsole->Command(csMessage);
this->m_ccbCommand.SetWindowText(_T(""));
// Add the _string to the listbox
if ( m_ccbCommand.FindString(-1, csMessage) == -1 )
m_ccbCommand.AddString(csMessage);
// Add the values in here to the registry
CStringArray sa;
for ( int i = 0; i < m_ccbCommand.GetCount(); i++ )
{
CString csValue;
m_ccbCommand.GetLBText(i, csValue);
sa.Add(csValue);
}
Main->m_config.SetRCCommands(&sa);
}
void CRemoteConsoleDlg::OnEnableLogging()
{
m_csLogFile = _T("");
m_bLogging = !m_bLogging;
if ( m_bLogging )
{
// Find out which file to log to
CFileDialog dlg(FALSE, _T(".log"), NULL, OFN_HIDEREADONLY, _T("Log Files (*.log)|*.log||") , NULL);
if ( dlg.DoModal() == IDOK )
m_csLogFile = dlg.GetFileName();
}
if ( m_csLogFile == _T("") )
{
m_bLogging = false;
m_cbLogging.SetCheck(0);
}
}
void CRemoteConsoleDlg::OnRcOptionsClearwindowbuffer()
{
this->m_creConsole.SetSel(0, -1);
this->m_creConsole.ReplaceSel(_T(""));
this->m_creConsole.EmptyUndoBuffer();
}
void CRemoteConsoleDlg::Localize(void)
{
locale->LocalizeWindow(IDD, 0, NULL, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_COMMAND_SEND, (CWnd*)&m_ccbCommand, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_CONSOLE_SEND, (CWnd*)&m_ccbBroadcast, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_ENABLE_LOGGING, (CWnd*)&m_cbLogging, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_SENDCOMMAND, (CWnd*)&m_cbCommand, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_SENDTEXT, (CWnd*)&m_cbBroadcast, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_RC_VERBOSE, (CWnd*)&m_cbVerbose, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_RC_SHUTDOWN, (CWnd*)&m_cbShutdown, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_RC_SECURE, (CWnd*)&m_cbSecure, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_RC_SAVE, (CWnd*)&m_cbSave, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_RC_PROFILE, (CWnd*)&m_cbProfile, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_RC_PAUSE, (CWnd*)&m_cbPause, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_RC_LOG, (CWnd*)&m_cbLog, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_RC_INFORMATION, (CWnd*)&m_cbInformation, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_RC_HEARALL, (CWnd*)&m_cbHearall, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_RC_GARBAGE, (CWnd*)&m_cbGarbage, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_RC_CLIENT, (CWnd*)&m_cbClient, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_RC_ACCOUNT, (CWnd*)&m_cbAccountUpdate, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_RE_CONSOLE, (CWnd*)&m_creConsole, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_RECONNECT, (CWnd*)&m_cbReconnect, (CWnd*)this);
}
void CRemoteConsoleDlg::OnClose()
{
Main->m_pScripts->DeleteRC();
CDialog::OnClose();
}
--- NEW FILE: RemoteConsoleDlg.h ---
/*
$Id: RemoteConsoleDlg.h,v 1.1 2003/07/27 20:44:55 pesterle Exp $
**********************************************************************
* Copyright (C) Philip A. Esterle 1998-2003
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
**********************************************************************
*/
#if !defined(AFX_REMOTECONSOLEDLG_H__5D6AFB61_2981_11D3_8723_00805FD91B8C__INCLUDED_)
#define AFX_REMOTECONSOLEDLG_H__5D6AFB61_2981_11D3_8723_00805FD91B8C__INCLUDED_
#include "RemoteConsole.h" // Added by ClassView
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
// RemoteConsoleDlg.h : header file
//
/////////////////////////////////////////////////////////////////////////////
// CRemoteConsoleDlg dialog
class CRemoteConsoleDlg : public CDialog
{
// Construction
public:
CString m_csCommand;
bool m_bIsConnected;
int m_nIDTimer;
CStringArray m_saMessages;
virtual ~CRemoteConsoleDlg();
CRemoteConsole * m_rConsole;
CRemoteConsoleDlg(CWnd* pParent = NULL); // standard constructor
// Dialog Data
//{{AFX_DATA(CRemoteConsoleDlg)
enum { IDD = IDD_REMOTECONSOLEDLG };
CComboBox m_ccbCommand;
CComboBox m_ccbBroadcast;
CButton m_cbLogging;
CButton m_cbCommand;
CButton m_cbBroadcast;
CButton m_cbVerbose;
CButton m_cbShutdown;
CButton m_cbSecure;
CButton m_cbSave;
CButton m_cbProfile;
CButton m_cbPause;
CButton m_cbLog;
CButton m_cbInformation;
CButton m_cbHearall;
CButton m_cbGarbage;
CButton m_cbClient;
CButton m_cbAccountUpdate;
CRichEditCtrl m_creConsole;
CButton m_cbReconnect;
//}}AFX_DATA
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CRemoteConsoleDlg)
public:
virtual BOOL OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo);
virtual BOOL Create( UINT IDD, CWnd* pParentWnd);
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
LRESULT OnRConsoleMessage(WPARAM wParam, LPARAM lParam);
LRESULT OnRConsoleReconnect(WPARAM wParam, LPARAM lParam);
// Implementation
protected:
CString m_csLogFile;
bool m_bLogging;
CWnd * m_pParent;
CRect m_crConsole, m_crLog, m_crVerbose, m_crHearAll, m_crPause, m_crSecure, m_crGarbage;
CRect m_crInformation, m_crClient, m_crSave, m_crShutdown, m_crProfile, m_crAccount, m_crBroadcast;
CRect m_crText, m_crReConnect, m_crCommand, m_crCommandText, m_crLogging, m_crOriginal;
int iTop, iLeft, iBottom, iRight;
// Generated message map functions
//{{AFX_MSG(CRemoteConsoleDlg)
afx_msg void OnSendtext();
afx_msg void OnReconnect();
afx_msg void OnTimer(UINT nIDEvent);
afx_msg void OnSize(UINT nType, int cx, int cy);
afx_msg void OnRcLog();
afx_msg void OnRcAccount();
afx_msg void OnRcClient();
afx_msg void OnRcGarbage();
afx_msg void OnRcHearall();
afx_msg void OnRcInformation();
afx_msg void OnRcPause();
afx_msg void OnRcProfile();
afx_msg void OnRcSave();
afx_msg void OnRcSecure();
afx_msg void OnRcShutdown();
afx_msg void OnRcVerbose();
virtual BOOL OnInitDialog();
afx_msg void OnSendcommand();
afx_msg void OnEnableLogging();
afx_msg void OnRcOptionsClearwindowbuffer();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
public:
void Localize(void);
afx_msg void OnClose();
};
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
#endif // !defined(AFX_REMOTECONSOLEDLG_H__5D6AFB61_2981_11D3_8723_00805FD91B8C__INCLUDED_)
Index: AccountDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/AccountDlg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** AccountDlg.cpp 9 Jul 2003 19:57:25 -0000 1.2
--- AccountDlg.cpp 27 Jul 2003 20:44:55 -0000 1.3
***************
*** 94,98 ****
_T("developer"),
_T("admin"),
! _T("owner"),
};
--- 94,98 ----
_T("developer"),
_T("admin"),
! // _T("owner"),
};
***************
*** 189,193 ****
this->m_ccbLevel.AddString(_T("Developer"));
this->m_ccbLevel.AddString(_T("Admin"));
! this->m_ccbLevel.AddString(_T("Owner"));
this->m_ccbLevel.SetItemData(0, 0);
this->m_ccbLevel.SetItemData(1, 1);
--- 189,193 ----
this->m_ccbLevel.AddString(_T("Developer"));
this->m_ccbLevel.AddString(_T("Admin"));
! // this->m_ccbLevel.AddString(_T("Owner"));
this->m_ccbLevel.SetItemData(0, 0);
this->m_ccbLevel.SetItemData(1, 1);
***************
*** 364,368 ****
else
{
! if ( csfIniFile.Open(_T("sphere.ini"), CFile::modeRead | CFile::shareDenyNone) )
{
CString csLine;
--- 364,369 ----
else
{
! csFile.Format(_T("%s\\%s"), Main->m_pScripts->Profile()->BaseDirectory(), _T("sphere.ini"));
! if ( csfIniFile.Open(csFile, CFile::modeRead | CFile::shareDenyNone) )
{
CString csLine;
***************
*** 619,623 ****
else
{
! if ( csfIniFile.Open(_T("sphere.ini"), CFile::modeRead | CFile::shareDenyNone) )
{
CString csLine;
--- 620,625 ----
else
{
! csFile.Format(_T("%s\\%s"), Main->m_pScripts->Profile()->BaseDirectory(), _T("sphere.ini"));
! if ( csfIniFile.Open(csFile, CFile::modeRead | CFile::shareDenyNone) )
{
CString csLine;
Index: NameEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/NameEditDlg.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** NameEditDlg.cpp 11 Jul 2003 17:25:25 -0000 1.3
--- NameEditDlg.cpp 27 Jul 2003 20:44:55 -0000 1.4
***************
*** 240,244 ****
block.m_bIgnoreComments = true;
block.m_bStringsOnly = true;
! block.Load(_T(""));
for ( int i = 0; i < block.GetSize(); i++ )
{
--- 240,244 ----
block.m_bIgnoreComments = true;
block.m_bStringsOnly = true;
! block.Load(_T("[%s]"));
for ( int i = 0; i < block.GetSize(); i++ )
{
Index: PotionEdit.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/PotionEdit.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** PotionEdit.cpp 11 Jul 2003 17:25:25 -0000 1.3
--- PotionEdit.cpp 27 Jul 2003 20:44:55 -0000 1.4
***************
*** 94,100 ****
{
CTPotionDef * pPotion = (CTPotionDef *) Main->m_pScripts->m_tables.m_potions.GetAt(i);
if ( pPotion )
{
! int iEntry = this->m_ccbEntry.AddString(pPotion->m_csName);
this->m_ccbEntry.SetItemDataPtr(iEntry, (void *) pPotion);
}
--- 94,101 ----
{
CTPotionDef * pPotion = (CTPotionDef *) Main->m_pScripts->m_tables.m_potions.GetAt(i);
+ pPotion->Load(_T("[Potion %s]"));
if ( pPotion )
{
! int iEntry = this->m_ccbEntry.AddString(pPotion->m_csValue);
this->m_ccbEntry.SetItemDataPtr(iEntry, (void *) pPotion);
}
Index: Resource.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Resource.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** Resource.h 25 Jul 2003 05:27:32 -0000 1.14
--- Resource.h 27 Jul 2003 20:44:55 -0000 1.15
***************
*** 25,28 ****
--- 25,29 ----
#define IDD_STATRATEEDIT_DLG 171
#define IDD_SPELLEDITDLG 172
+ #define IDD_REMOTECONSOLEDLG 174
#define IDD_WOPEDITDLG 175
#define IDD_ORE_EDIT_DLG 177
***************
*** 41,44 ****
--- 42,46 ----
#define IDD_PROFILE_EDIT 202
#define IDC_PROFILE_LIST 203
+ #define IDR_REMOTECONSOLE_MENU 203
#define IDC_PROFILE_PARMS 204
#define IDI_DOC 204
***************
*** 98,101 ****
--- 100,104 ----
#define IDC_NEWTRIGGER 1001
#define IDC_SGADD 1001
+ #define IDC_SENDTEXT 1001
#define IDC_NPCATTRREMOVE 1002
#define IDC_OREREMOVE 1002
***************
*** 107,110 ****
--- 110,114 ----
#define IDC_NEWREGIONTRIG 1002
#define IDC_SGREMOVE 1002
+ #define IDC_SENDCOMMAND 1002
#define IDC_IEPALETTE 1003
#define IDC_NEWNPC 1003
***************
*** 114,117 ****
--- 118,122 ----
#define IDC_REMOVESKILL 1003
#define IDC_SGADDCATEGORY 1003
+ #define IDC_RECONNECT 1003
#define IDC_ITEM_NEW 1004
#define IDC_EDITNPC 1004
***************
*** 119,122 ****
--- 124,128 ----
#define IDC_TMPL_APPLY 1004
#define IDC_NEWSUBMENU 1004
+ #define IDC_RC_LOG 1004
#define IDC_ITEM_EDIT 1005
#define IDC_APPLYNPCEDITS 1005
***************
*** 125,128 ****
--- 131,135 ----
#define IDC_EDITENTRY 1005
#define IDC_NEWSPAWNGROUP 1005
+ #define IDC_RC_VERBOSE 1005
#define IDC_ITEM_APPLY 1006
#define IDC_CANCELNPCEDITS 1006
***************
*** 130,148 ****
--- 137,165 ----
#define IDC_ADDRESOURCE 1006
#define IDC_INSRTCOND 1006
+ #define IDC_RC_HEARALL 1006
#define IDC_ITEM_CANCEL 1007
#define IDC_NPCADDCATEGORY 1007
#define IDC_ADDSKILL 1007
#define IDC_INSRTATTR 1007
+ #define IDC_RC_PAUSE 1007
#define IDC_NPCPALETTE 1008
#define IDC_MOVEUP 1008
#define IDC_PDONE 1008
#define IDC_INSRTREF 1008
+ #define IDC_RC_SECURE 1008
#define IDC_NPCADDSUBSECTION 1009
#define IDC_MOVEDOWN 1009
#define IDC_PCANCEL 1009
#define IDC_INSRTVERB 1009
+ #define IDC_RC_GARBAGE 1009
#define IDC_INSRTEVAL 1010
+ #define IDC_RC_INFORMATION 1010
+ #define IDC_RC_CLIENT 1011
#define IDC_INSRTEVNT 1012
+ #define IDC_RC_SAVE 1012
#define IDC_INSRTOP 1013
+ #define IDC_RC_SHUTDOWN 1013
+ #define IDC_RC_PROFILE 1014
+ #define IDC_RC_ACCOUNT 1015
#define IDC_NPCATTRLIST 1031
#define IDC_ORELIST 1031
***************
*** 170,173 ****
--- 187,191 ----
#define IDC_VENDITEM_CHANCE 1033
#define IDC_REPLICATE 1033
+ #define IDC_ENABLE_LOGGING 1033
#define IDC_REPAIRABLE 1034
#define IDC_DRAWRECTS 1034
***************
*** 199,203 ****
#define IDC_FOODTYPE_NAME 1059
#define IDC_SGENTRY 1059
- #define IDC_ACCT 1059
#define IDC_NPCDEFNAME 1060
#define IDC_ORECOLOUR 1060
--- 217,220 ----
***************
*** 221,224 ****
--- 238,242 ----
#define IDC_SGWEIGHT 1060
#define IDC_PWD 1060
+ #define IDC_CONSOLE_SEND 1060
#define IDC_COLORCOMBO 1061
#define IDC_SKILLS 1061
***************
*** 242,245 ****
--- 260,264 ----
#define IDC_FOODTYPE_BITES 1061
#define IDC_SGDESCRIPTION 1061
+ #define IDC_COMMAND_SEND 1061
#define IDC_ITEMTYPE 1062
#define IDC_NPCDESIRES 1062
***************
*** 450,453 ****
--- 469,473 ----
#define IDC_ITEMENTRY 1351
#define IDC_ITEMDISPLAY 1352
+ #define IDC_RE_CONSOLE 1364
#define IDC_STATIC_LABEL1 1372
#define IDC_STATIC_LABEL2 1373
***************
*** 693,696 ****
--- 713,718 ----
#define IDC_STE_STATIC24 1790
#define IDC_STE_STATIC25 1791
+ #define ID_RC_OPTIONS_CHANGEPROFILE 32809
+ #define ID_RC_OPTIONS_CLEARWINDOWBUFFER 32810
// Next default values for new objects
Index: S_Sphere52.rc
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/S_Sphere52.rc,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** S_Sphere52.rc 25 Jul 2003 05:27:32 -0000 1.16
--- S_Sphere52.rc 27 Jul 2003 20:44:55 -0000 1.17
***************
*** 1212,1215 ****
--- 1212,1252 ----
END
+ IDD_REMOTECONSOLEDLG DIALOG 0, 0, 354, 294
+ STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_CAPTION | WS_SYSMENU |
+ WS_THICKFRAME
+ CAPTION "Remote Console"
+ MENU IDR_REMOTECONSOLE_MENU
+ FONT 8, "MS Sans Serif"
+ BEGIN
+ DEFPUSHBUTTON "Broadcast",IDC_SENDTEXT,7,259,84,13
+ PUSHBUTTON "ReConnect",IDC_RECONNECT,299,259,47,13
+ DEFPUSHBUTTON "Close",IDOK,297,7,50,14,NOT WS_VISIBLE
+ PUSHBUTTON "Cancel",IDCANCEL,182,7,50,14,NOT WS_VISIBLE
+ CONTROL "",IDC_RE_CONSOLE,"RICHEDIT",TCS_HOTTRACK | TCS_VERTICAL |
+ TCS_RAGGEDRIGHT | TCS_OWNERDRAWFIXED | TCS_MULTISELECT |
+ WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,7,7,340,
+ 212
+ PUSHBUTTON "Toggle Log File",IDC_RC_LOG,7,220,84,13
+ PUSHBUTTON "Toggle Verbose Mode",IDC_RC_VERBOSE,7,233,84,13
+ PUSHBUTTON "Toggle Hear All",IDC_RC_HEARALL,7,246,84,13
+ PUSHBUTTON "Pause / Resync",IDC_RC_PAUSE,92,220,84,13
+ PUSHBUTTON "Toggle Secure Mode",IDC_RC_SECURE,92,233,84,13
+ PUSHBUTTON "Garbage Collection",IDC_RC_GARBAGE,92,246,84,13
+ PUSHBUTTON "Information",IDC_RC_INFORMATION,177,220,84,13
+ PUSHBUTTON "Client List",IDC_RC_CLIENT,177,233,84,13
+ PUSHBUTTON "Force Save",IDC_RC_SAVE,177,246,84,13
+ PUSHBUTTON "Shutdown Now",IDC_RC_SHUTDOWN,262,220,84,13
+ PUSHBUTTON "Profile Info",IDC_RC_PROFILE,262,233,84,13
+ PUSHBUTTON "Account Update",IDC_RC_ACCOUNT,262,246,84,13
+ DEFPUSHBUTTON "Command",IDC_SENDCOMMAND,7,272,84,13
+ CONTROL "Enable Local Logging",IDC_ENABLE_LOGGING,"Button",
+ BS_AUTOCHECKBOX | BS_LEFT | BS_VCENTER | WS_TABSTOP,263,
+ 272,84,13
+ COMBOBOX IDC_CONSOLE_SEND,92,259,169,60,CBS_DROPDOWN |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_COMMAND_SEND,92,272,169,51,CBS_DROPDOWN |
+ CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+ END
+
/////////////////////////////////////////////////////////////////////////////
***************
*** 1475,1478 ****
--- 1512,1523 ----
BOTTOMMARGIN, 54
END
+
+ IDD_REMOTECONSOLEDLG, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 347
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 287
+ END
END
#endif // APSTUDIO_INVOKED
***************
*** 1529,1532 ****
--- 1574,1592 ----
0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0
+ END
+
+
+ /////////////////////////////////////////////////////////////////////////////
+ //
+ // Menu
+ //
+
+ IDR_REMOTECONSOLE_MENU MENU
+ BEGIN
+ POPUP "&Options"
+ BEGIN
+ MENUITEM "Clear Window Buffer", ID_RC_OPTIONS_CLEARWINDOWBUFFER
+
+ END
END
Index: S_Sphere52.vcproj
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/S_Sphere52.vcproj,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** S_Sphere52.vcproj 25 Jul 2003 05:27:32 -0000 1.16
--- S_Sphere52.vcproj 27 Jul 2003 20:44:55 -0000 1.17
***************
*** 218,221 ****
--- 218,224 ----
</File>
<File
+ RelativePath="RemoteConsoleDlg.cpp">
+ </File>
+ <File
RelativePath="RemoteConsoleLoginDlg.cpp">
</File>
***************
*** 469,472 ****
--- 472,478 ----
<File
RelativePath="RemoteConsole.h">
+ </File>
+ <File
+ RelativePath="RemoteConsoleDlg.h">
</File>
<File
Index: Scripts.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Scripts.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Scripts.cpp 23 Jul 2003 19:10:57 -0000 1.9
--- Scripts.cpp 27 Jul 2003 20:44:55 -0000 1.10
***************
*** 44,47 ****
--- 44,48 ----
m_pAxis = new CAxisLibWrapper;
m_pAxis->LocaleFile(m_config.LocaleFile());
+ m_pRConsole = NULL;
}
***************
*** 54,57 ****
--- 55,60 ----
m_instances.pop_back();
m_instance--;
+ if ( m_pRConsole != NULL )
+ delete m_pRConsole;
}
Index: ScriptsMain.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptsMain.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** ScriptsMain.cpp 23 Jul 2003 19:10:57 -0000 1.28
--- ScriptsMain.cpp 27 Jul 2003 20:44:55 -0000 1.29
***************
*** 162,165 ****
--- 162,168 ----
m_bBrainsFound = false;
m_bMidisFound = false;
+
+ m_pRCDlg = NULL;
+ m_bDeleteRC = false;
}
***************
*** 172,175 ****
--- 175,180 ----
m_vBrains.erase(m_vBrains.begin(), m_vBrains.end());
m_vMidis.erase(m_vMidis.begin(), m_vMidis.end());
+ if ( m_pRCDlg != NULL )
+ delete m_pRCDlg;
}
***************
*** 1708,1717 ****
{
// Read all of the moongates from the table
! bool bContinue = true;
while ( bContinue )
{
DWORD dwPos = (DWORD) csfInput.GetPosition();
CString csLine;
! bContinue = csfInput.ReadString(csLine) ? true : false;
if ( csLine[0] == _T('[') )
{
--- 1713,1722 ----
{
// Read all of the moongates from the table
! BOOL bContinue = TRUE;
while ( bContinue )
{
DWORD dwPos = (DWORD) csfInput.GetPosition();
CString csLine;
! bContinue = csfInput.ReadString(csLine);
if ( csLine[0] == _T('[') )
{
***************
*** 1745,1748 ****
--- 1750,1755 ----
break;
case RES_NOTOTITLES: // (SI) Define the noto titles used.
+ this->m_tables.m_notoTitles.m_bIgnoreBlanks = true;
+ this->m_tables.m_notoTitles.m_bIgnoreComments = true;
this->m_tables.m_notoTitles.Read(csfInput);
this->m_tables.m_notoTitles.m_dwFileOffset = dwOffset;
***************
*** 1755,1761 ****
break;
case RES_ORE: // An ore table
! this->m_tables.m_ores.Read(csfInput);
! this->m_tables.m_ores.m_dwFileOffset = dwOffset;
! this->m_tables.m_ores.m_csFilename = csFile;
break;
case RES_PLEVEL: // Define the list of commands that a PLEVEL can access. (or not access)
--- 1762,1787 ----
break;
case RES_ORE: // An ore table
! {
! this->m_tables.m_ores.m_dwFileOffset = dwOffset;
! this->m_tables.m_ores.m_csFilename = csFile;
! BOOL bContinue = TRUE;
! while ( bContinue )
! {
! DWORD dwPosition = (DWORD)csfInput.GetPosition();
! bContinue = csfInput.ReadString(csLine);
! if ( csLine.Find(_T("[")) != -1 )
! {
! csfInput.Seek( (LONG) (dwPosition - csfInput.GetPosition()), CFile::current );
! break;
! }
! csLine = csLine.SpanExcluding(_T("//"));
! csLine.TrimLeft(); csLine.TrimRight();
! if ( csLine == _T("") )
! continue;
! CTOreDef * pOre = new (CTOreDef);
! pOre->Load(csLine);
! this->m_tables.m_ores.Add(pOre);
! }
! }
break;
case RES_PLEVEL: // Define the list of commands that a PLEVEL can access. (or not access)
***************
*** 1785,1792 ****
pPotion->m_csValue = csIndex;
pPotion->m_bType = TYPE_POTION;
! int iOld = m_tables.m_potions.Find(csIndex);
! if ( iOld != -1 )
! m_tables.m_potions.RemoveAt(iOld);
! m_tables.m_potions.Insert(pPotion);
}
break;
--- 1811,1815 ----
pPotion->m_csValue = csIndex;
pPotion->m_bType = TYPE_POTION;
! m_tables.m_potions.Add(pPotion);
}
break;
***************
*** 3492,3495 ****
--- 3515,3530 ----
void CScriptsMain::InvokeRemoteConsole()
{
+ if ( m_bDeleteRC )
+ {
+ delete m_pRCDlg;
+ m_pRCDlg = NULL;
+ m_bDeleteRC = false;
+ }
+ if ( m_pRCDlg == NULL )
+ {
+ m_pRCDlg = new CRemoteConsoleDlg;
+ m_pRCDlg->Create(IDD_REMOTECONSOLEDLG, NULL);
+ }
+ m_pRCDlg->ShowWindow(SW_SHOWNORMAL);
}
Index: ScriptsMain.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptsMain.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** ScriptsMain.h 23 Jul 2003 19:10:57 -0000 1.19
--- ScriptsMain.h 27 Jul 2003 20:44:55 -0000 1.20
***************
*** 31,34 ****
--- 31,35 ----
#include "FileReadProgress.h"
#include "MapScriptEditDlg.h"
+ #include "RemoteConsoleDlg.h"
#include <vector>
***************
*** 356,359 ****
--- 357,362 ----
void SetMulFile(ULONG index, CString sFile);
+ void DeleteRC() { m_bDeleteRC = true; }
+
protected:
bool m_bDefsLoaded;
***************
*** 372,375 ****
--- 375,379 ----
bool m_bDeleteDialog;
+ bool m_bDeleteRC;
CScriptProfile * m_pProfile;
***************
*** 450,452 ****
--- 454,457 ----
CString m_sMulPath;
vector<CString> m_vMulFiles;
+ CRemoteConsoleDlg * m_pRCDlg;
};
Index: ScriptTables.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptTables.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ScriptTables.cpp 23 Jul 2003 19:10:57 -0000 1.6
--- ScriptTables.cpp 27 Jul 2003 20:44:55 -0000 1.7
***************
*** 280,283 ****
--- 280,285 ----
break;
case 14: // Nototitles
+ this->m_notoTitles.m_bIgnoreBlanks = true;
+ this->m_notoTitles.m_bIgnoreComments = true;
this->m_notoTitles.Read(csfTables);
break;
Index: ScriptTables.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptTables.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ScriptTables.h 23 Jul 2003 19:10:57 -0000 1.4
--- ScriptTables.h 27 Jul 2003 20:44:55 -0000 1.5
***************
*** 45,49 ****
CScriptArray<CScriptBase*> m_starts;
CStringBlock m_runes;
! CScriptArray<CScriptBase*> m_ores;
CTObArray<CScriptBase*> m_skillClasses;
CTObArray<CScriptBase*> m_skills;
--- 45,49 ----
CScriptArray<CScriptBase*> m_starts;
CStringBlock m_runes;
! CTObArray<CScriptBase*> m_ores;
CTObArray<CScriptBase*> m_skillClasses;
CTObArray<CScriptBase*> m_skills;
Index: strings.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/strings.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** strings.h 25 Jul 2003 05:27:32 -0000 1.10
--- strings.h 27 Jul 2003 20:44:55 -0000 1.11
***************
*** 217,219 ****
#define IDS_REMOTE_SESELECT 178
#define IDS_REMOTE_TIMEOUT 179
!
--- 217,222 ----
#define IDS_REMOTE_SESELECT 178
#define IDS_REMOTE_TIMEOUT 179
! #define IDS_REMOTE_RECONNECT 418
! #define IDS_REMOTE_DISCONNECT 419
! #define IDS_RC_CONNECTED 420
! #define IDS_RC_DISCONNECTED 421
Index: TOreDef.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/TOreDef.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** TOreDef.cpp 23 Jul 2003 19:10:57 -0000 1.3
--- TOreDef.cpp 27 Jul 2003 20:44:55 -0000 1.4
***************
*** 53,56 ****
--- 53,57 ----
case 0:
this->m_csName = csTemp;
+ this->m_csValue = csTemp; // The value is the key in the script array, so we need this to exist.
break;
case 1:
Index: XMLConfig.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/XMLConfig.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** XMLConfig.cpp 23 Jul 2003 19:10:57 -0000 1.7
--- XMLConfig.cpp 27 Jul 2003 20:44:55 -0000 1.8
***************
*** 168,171 ****
--- 168,173 ----
ReadValue(pRoot, _T("LocaleFile"), (void*)&sLocaleFile, XML_String);
LocaleFile(sLocaleFile); // Pass it through here to handle cases where it's an empty string.
+ ReadValue(pRoot, _T("RCBroadcasts"), (void*)&m_saRCBroadcasts, XML_StringArray);
+ ReadValue(pRoot, _T("RCCommands"), (void*)&m_saRCCommands, XML_StringArray);
xmlNodePtr pNode = FindNode(m_pXMLDoc, _T("ScriptProfile"), pRoot);
while ( pNode != NULL )
***************
*** 200,203 ****
--- 202,207 ----
AddValue(pDoc, pRoot, _T("LocaleFile"), (void*) &m_sLocaleFile, XML_String, 1);
+ AddValue(pDoc, pRoot, _T("RCBroadcasts"), (void*) &m_saRCBroadcasts, XML_StringArray, 1);
+ AddValue(pDoc, pRoot, _T("RCCommands"), (void*) &m_saRCCommands, XML_StringArray, 1);
for ( int i = 0; i < m_pProfiles.GetCount(); i++ )
***************
*** 533,535 ****
}
m_pProfiles.RemoveAll();
! }
\ No newline at end of file
--- 537,561 ----
}
m_pProfiles.RemoveAll();
! }
!
! void CXMLConfig::SetRCBroadcasts(CStringArray *sa)
! {
! m_saRCBroadcasts.Copy(*sa);
! SaveConfig();
! }
!
! void CXMLConfig::SetRCCommands(CStringArray *sa)
! {
! m_saRCCommands.Copy(*sa);
! SaveConfig();
! }
!
! void CXMLConfig::GetRCBroadcasts(CStringArray *sa)
! {
! sa->Copy(m_saRCBroadcasts);
! }
!
! void CXMLConfig::GetRCCommands(CStringArray *sa)
! {
! sa->Copy(m_saRCCommands);
! }
Index: XMLConfig.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/XMLConfig.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** XMLConfig.h 23 Jul 2003 19:10:57 -0000 1.7
--- XMLConfig.h 27 Jul 2003 20:44:55 -0000 1.8
***************
*** 54,57 ****
--- 54,61 ----
void AddProfile(CScriptProfile * pNewProfile);
void DeleteProfile(CScriptProfile * pProfile);
+ void SetRCBroadcasts(CStringArray *sa);
+ void SetRCCommands(CStringArray *sa);
+ void GetRCBroadcasts(CStringArray *sa);
+ void GetRCCommands(CStringArray *sa);
protected:
***************
*** 60,63 ****
--- 64,69 ----
xmlDocPtr m_pXMLDoc;
CString m_sLocaleFile;
+ CStringArray m_saRCBroadcasts;
+ CStringArray m_saRCCommands;
bool LoadFromRegistry();
***************
*** 80,82 ****
--- 86,89 ----
void GetRegistryMultiSz(HKEY hKey, CString sTag, CStringArray& sa);
void CleanupProfiles();
+
};
|
|
From: Philip E. <pes...@us...> - 2003-07-27 20:44:58
|
Update of /cvsroot/sphere-axis/Axis
In directory sc8-pr-cvs1:/tmp/cvs-serv9503
Modified Files:
common.cpp Drewsky.h Drewsky.vcproj MISCTAB.H
RemoteConsoleDlg.cpp ScriptEditDlg.cpp settingstab.cpp
settingstab.h Stdafx.cpp STDAFX.H
Log Message:
no message
Index: common.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/common.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** common.cpp 11 Jun 2003 23:43:38 -0000 1.24
--- common.cpp 27 Jul 2003 20:44:55 -0000 1.25
***************
*** 2834,2865 ****
else
{
! CRemoteConsole * pConsole = Main->m_pRConsole;
! bool bDeleteConsole = false;
! if (pConsole == NULL)
! {
! pConsole = new (CRemoteConsole);
! bDeleteConsole = true;
! }
! pConsole->Pause();
! int i = 0;
! while (pConsole->m_bCommandPending)
! {
! i++;
! Sleep(50);
! if (i > 100)
! break;
! }
! bStatus = ReplaceFiles( csNewFile, csOldFile );
! pConsole->Resync();
! i = 0;
! while (pConsole->m_bCommandPending)
! {
! i++;
! Sleep(50);
! if (i > 100)
! break;
! }
! if (bDeleteConsole)
! delete pConsole;
}
#endif
--- 2834,2865 ----
else
{
! //CRemoteConsole * pConsole = Main->m_pRConsole;
! //bool bDeleteConsole = false;
! //if (pConsole == NULL)
! //{
! // pConsole = new (CRemoteConsole);
! // bDeleteConsole = true;
! //}
! //pConsole->Pause();
! //int i = 0;
! //while (pConsole->m_bCommandPending)
! //{
! // i++;
! // Sleep(50);
! // if (i > 100)
! // break;
! //}
! //bStatus = ReplaceFiles( csNewFile, csOldFile );
! //pConsole->Resync();
! //i = 0;
! //while (pConsole->m_bCommandPending)
! //{
! // i++;
! // Sleep(50);
! // if (i > 100)
! // break;
! //}
! //if (bDeleteConsole)
! // delete pConsole;
}
#endif
Index: Drewsky.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/Drewsky.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** Drewsky.h 12 Jun 2003 03:15:31 -0000 1.20
--- Drewsky.h 27 Jul 2003 20:44:55 -0000 1.21
***************
*** 111,115 ****
CString m_csSpherePort;
CString m_csAxissvrPort;
- CRemoteConsole * m_pRConsole;
int m_iReceiveTimeout;
CPtrArray m_aHueGroups;
--- 111,114 ----
Index: Drewsky.vcproj
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/Drewsky.vcproj,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Drewsky.vcproj 12 Jun 2003 04:56:59 -0000 1.6
--- Drewsky.vcproj 27 Jul 2003 20:44:55 -0000 1.7
***************
*** 366,378 ****
</File>
<File
- RelativePath=".\RemoteConsole.cpp">
- </File>
- <File
- RelativePath=".\RemoteConsoleDlg.cpp">
- </File>
- <File
- RelativePath=".\RemoteConsoleLoginDlg.cpp">
- </File>
- <File
RelativePath=".\RemoteFileDlg.cpp">
</File>
--- 366,369 ----
***************
*** 387,393 ****
</File>
<File
- RelativePath=".\ScriptEditDlg.cpp">
- </File>
- <File
RelativePath="ScriptsWrapper.cpp">
</File>
--- 378,381 ----
***************
*** 619,631 ****
</File>
<File
- RelativePath=".\RemoteConsole.h">
- </File>
- <File
- RelativePath=".\RemoteConsoleDlg.h">
- </File>
- <File
- RelativePath=".\RemoteConsoleLoginDlg.h">
- </File>
- <File
RelativePath=".\RemoteFileDlg.h">
</File>
--- 607,610 ----
***************
*** 641,647 ****
<File
RelativePath=".\RoofingDlg.h">
- </File>
- <File
- RelativePath=".\ScriptEditDlg.h">
</File>
<File
--- 620,623 ----
Index: MISCTAB.H
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/MISCTAB.H,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** MISCTAB.H 23 May 2003 05:30:37 -0000 1.13
--- MISCTAB.H 27 Jul 2003 20:44:55 -0000 1.14
***************
*** 35,39 ****
#define AFX_MISCTAB_H__DFB29CF9_D431_11D2_A613_004F4905E937__INCLUDED_
- #include "RemoteConsoleDlg.h" // Added by ClassView
#if _MSC_VER >= 1000
#pragma once
--- 35,38 ----
***************
*** 55,59 ****
bool m_bRemoteConsoleCreated;
bool m_bRemoteConsoleVisible;
- CRemoteConsoleDlg m_rcDlg;
void LoadScripts();
CMiscTab();
--- 54,57 ----
Index: RemoteConsoleDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/RemoteConsoleDlg.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** RemoteConsoleDlg.cpp 12 Jun 2003 03:15:33 -0000 1.15
--- RemoteConsoleDlg.cpp 27 Jul 2003 20:44:55 -0000 1.16
***************
*** 1,2 ****
--- 1,3 ----
+ #include "s_sphere52\remoteconsoledlg.h"
/*
$Id$
***************
*** 107,110 ****
--- 108,113 ----
ON_MESSAGE(WM_RCONSOLEMESSAGE, OnRConsoleMessage)
ON_MESSAGE(WM_RCONSOLERECONNECT, OnRConsoleReconnect)
+ ON_WM_CLOSE()
+ ON_WM_DESTROY()
END_MESSAGE_MAP()
***************
*** 570,572 ****
--- 573,582 ----
locale->LocalizeWindow(IDD, IDC_RE_CONSOLE, (CWnd*)&m_creConsole, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_RECONNECT, (CWnd*)&m_cbReconnect, (CWnd*)this);
+ }
+
+ void CRemoteConsoleDlg::OnDestroy()
+ {
+ CDialog::OnDestroy();
+
+ // TODO: Add your message handler code here
}
Index: ScriptEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/ScriptEditDlg.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** ScriptEditDlg.cpp 11 Jun 2003 23:43:38 -0000 1.8
--- ScriptEditDlg.cpp 27 Jul 2003 20:44:55 -0000 1.9
***************
*** 28,32 ****
#include "drewsky.h"
#include "ScriptEditDlg.h"
- #include "RemoteConsole.h"
#include "RemoteFileDlg.h"
--- 28,31 ----
Index: settingstab.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/settingstab.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** settingstab.cpp 13 Jun 2003 14:52:42 -0000 1.30
--- settingstab.cpp 27 Jul 2003 20:44:55 -0000 1.31
***************
*** 32,36 ****
#include "DrewskyPS.h"
#include "RemoteProfileDlg.h"
- #include "ScriptEditDlg.h"
#include "ItemScriptEditDlg.h"
#include "AccountDlg.h"
--- 32,35 ----
***************
*** 65,69 ****
//}}AFX_DATA_INIT
m_pDlgStaticTool = NULL;
- m_pRawEditDlg = NULL;
m_bTranslucentWindows = FALSE;
m_iAlphaBlend = 0;
--- 64,67 ----
***************
*** 77,86 ****
delete m_pDlgStaticTool;
}
- if ( m_pRawEditDlg )
- {
- m_pRawEditDlg->DestroyWindow();
- delete m_pRawEditDlg;
- }
-
}
--- 75,78 ----
***************
*** 435,456 ****
void CSettingsTab::OnRawedit()
{
- if ( m_pRawEditDlg != NULL )
- {
- if ( m_pRawEditDlg->m_bIsActive )
- {
- m_pRawEditDlg->ShowWindow(SW_RESTORE);
- return;
- }
- else
- {
- delete m_pRawEditDlg;
- m_pRawEditDlg = NULL;
- }
- }
-
- m_pRawEditDlg = new CScriptEditDlg;
- m_pRawEditDlg->Create(IDD_SCRIPTEDITDLG, this);
- Main->SetLayeredWindow(m_pRawEditDlg->GetSafeHwnd());
- m_pRawEditDlg->ShowWindow(SW_SHOW);
}
--- 427,430 ----
Index: settingstab.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/settingstab.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** settingstab.h 13 Jun 2003 14:52:42 -0000 1.17
--- settingstab.h 27 Jul 2003 20:44:55 -0000 1.18
***************
*** 52,56 ****
BOOL m_bDeleteStaticTool;
class CStaticToolDlg * m_pDlgStaticTool;
- class CScriptEditDlg * m_pRawEditDlg;
// Dialog Data
--- 52,55 ----
Index: Stdafx.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/Stdafx.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** Stdafx.cpp 11 Jun 2003 23:43:39 -0000 1.12
--- Stdafx.cpp 27 Jul 2003 20:44:55 -0000 1.13
***************
*** 28,32 ****
#include "stdafx.h"
#include "drewsky.h"
- #include "RemoteConsole.h"
#include "FileReadProgress.h"
#include "AxisLog.h"
--- 28,31 ----
Index: STDAFX.H
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/STDAFX.H,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** STDAFX.H 11 Jun 2003 23:43:39 -0000 1.15
--- STDAFX.H 27 Jul 2003 20:44:55 -0000 1.16
***************
*** 50,54 ****
#include <afxtempl.h>
#include "common.h"
- #include "RemoteConsole.h"
#include "AxisLog.h"
#include "Utilities/SendToUO.h"
--- 50,53 ----
|
|
From: Philip E. <pes...@us...> - 2003-07-25 05:27:35
|
Update of /cvsroot/sphere-axis/Axis
In directory sc8-pr-cvs1:/tmp/cvs-serv14784
Modified Files:
EditorTab.cpp itemgentab.cpp itemtweaktab.cpp
RemoteConsoleLoginDlg.cpp SPAWNTAB.CPP traveltab.cpp
Log Message:
no message
Index: EditorTab.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/EditorTab.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** EditorTab.cpp 10 Jul 2003 21:49:53 -0000 1.9
--- EditorTab.cpp 25 Jul 2003 05:27:32 -0000 1.10
***************
*** 161,164 ****
--- 161,167 ----
AssignButtons();
+ if ( Main->m_pScripts == NULL )
+ return TRUE;
+
int count = Main->m_pScripts->GetEditorCount();
if ( count )
Index: itemgentab.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/itemgentab.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** itemgentab.cpp 24 Jul 2003 06:00:05 -0000 1.25
--- itemgentab.cpp 25 Jul 2003 05:27:32 -0000 1.26
***************
*** 280,283 ****
--- 280,285 ----
{
NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR;
+ if ( Main->m_pScripts == NULL )
+ return;
this->m_clcItems.SetHotItem(-1);
***************
*** 360,364 ****
{
NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;
! // TODO: Add your control notification handler code here
this->m_clcItems.SortItems(CompareFunc, pNMListView->iSubItem);
if (pNMListView->iSubItem == 0)
--- 362,367 ----
{
NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;
! if ( Main->m_pScripts == NULL )
! return;
this->m_clcItems.SortItems(CompareFunc, pNMListView->iSubItem);
if (pNMListView->iSubItem == 0)
***************
*** 397,401 ****
void CItemGenTab::OnClickItems(NMHDR* pNMHDR, LRESULT* pResult)
{
- // TODO: Add your control notification handler code here
*pResult = 0;
}
--- 400,403 ----
***************
*** 404,408 ****
{
NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;
! // TODO: Add your control notification handler code here
if (pNMListView->uNewState & LVNI_SELECTED)
--- 406,411 ----
{
NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;
! if ( Main->m_pScripts == NULL )
! return;
if (pNMListView->uNewState & LVNI_SELECTED)
***************
*** 440,443 ****
--- 443,448 ----
{
m_ctcCategories.DeleteAllItems();
+ if ( Main->m_pScripts == NULL )
+ return;
FillCategoryNode(m_pCategories, NULL);
}
***************
*** 475,478 ****
--- 480,485 ----
HTREEITEM hParent = m_ctcCategories.GetFirstVisibleItem();
HTREEITEM hChild;
+ if ( Main->m_pScripts == NULL )
+ return;
while (hParent != NULL)
***************
*** 502,506 ****
void CItemGenTab::OnDblclkItems(NMHDR* pNMHDR, LRESULT* pResult)
{
- // TODO: Add your control notification handler code here
int iSelIndex = this->m_clcItems.GetNextItem(-1, LVNI_SELECTED);
if (iSelIndex == -1)
--- 509,512 ----
***************
*** 548,551 ****
--- 554,559 ----
void CItemGenTab::Find(CString csString, int iCrit, bool bSelect, bool bPrevious)
{
+ if ( Main->m_pScripts == NULL )
+ return;
if ( csString != _T("") )
{
***************
*** 610,614 ****
bool CItemGenTab::CompareItem(int index)
{
! if ( index == -1 )
return false;
if ( m_iSearchCrit == 0 )
--- 618,622 ----
bool CItemGenTab::CompareItem(int index)
{
! if ( Main->m_pScripts == NULL || index == -1 )
return false;
if ( m_iSearchCrit == 0 )
***************
*** 809,812 ****
--- 817,822 ----
if ( m_pCategories )
delete m_pCategories;
+ if ( Main->m_pScripts == NULL )
+ return;
CFileReadProgress progress;
Index: itemtweaktab.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/itemtweaktab.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** itemtweaktab.cpp 12 Jun 2003 03:15:32 -0000 1.11
--- itemtweaktab.cpp 25 Jul 2003 05:27:32 -0000 1.12
***************
*** 663,666 ****
--- 663,668 ----
void CItemTweakTab::SetAttributeCaptions()
{
+ if ( Main->m_pScripts == NULL )
+ return;
m_cbIdentified.SetWindowText(Main->m_pScripts->GetItemAttributeDescription(0));
m_cbDecay.SetWindowText(Main->m_pScripts->GetItemAttributeDescription(1));
Index: RemoteConsoleLoginDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/RemoteConsoleLoginDlg.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** RemoteConsoleLoginDlg.cpp 23 May 2003 05:30:37 -0000 1.6
--- RemoteConsoleLoginDlg.cpp 25 Jul 2003 05:27:32 -0000 1.7
***************
*** 1,2 ****
--- 1,3 ----
+ #include "s_sphere52\remoteconsolelogindlg.h"
/*
$Id$
***************
*** 75,78 ****
--- 76,80 ----
ON_CBN_EDITCHANGE(IDC_ACCTNAME, OnEditchangeAcctname)
//}}AFX_MSG_MAP
+ ON_STN_CLICKED(IDC_RCL_STATIC5, OnStnClickedRclStatic5)
END_MESSAGE_MAP()
***************
*** 208,210 ****
--- 210,217 ----
locale->LocalizeWindow(IDD, IDC_RCL_STATIC4, (CWnd*)&m_sStatic4, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_RCL_STATIC5, (CWnd*)&m_sStatic5, (CWnd*)this);
+ }
+
+ void CRemoteConsoleLoginDlg::OnStnClickedRclStatic5()
+ {
+ // TODO: Add your control notification handler code here
}
Index: SPAWNTAB.CPP
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/SPAWNTAB.CPP,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** SPAWNTAB.CPP 24 Jul 2003 20:12:44 -0000 1.24
--- SPAWNTAB.CPP 25 Jul 2003 05:27:32 -0000 1.25
***************
*** 155,158 ****
--- 155,160 ----
{
int iSelIndex = this->m_clcCreatures.GetNextItem(-1, LVNI_SELECTED);
+ if ( iSelIndex == -1 )
+ return;
int index = m_clcCreatures.GetItemData(iSelIndex);
if ( Main->m_pScripts->CharacterSpawnOnly(index) )
***************
*** 228,231 ****
--- 230,236 ----
{
NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR;
+ if ( Main->m_pScripts == NULL )
+ return;
+
this->m_clcCreatures.SetHotItem(-1);
***************
*** 308,312 ****
{
NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;
! // TODO: Add your control notification handler code here
this->m_clcCreatures.SortItems(CompareFunc, pNMListView->iSubItem);
if (pNMListView->iSubItem == 0)
--- 313,318 ----
{
NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;
! if ( Main->m_pScripts == NULL )
! return;
this->m_clcCreatures.SortItems(CompareFunc, pNMListView->iSubItem);
if (pNMListView->iSubItem == 0)
***************
*** 345,349 ****
void CSpawnTab::OnClickCreaturelist(NMHDR* pNMHDR, LRESULT* pResult)
{
! // TODO: Add your control notification handler code here
int iSelIndex = this->m_clcCreatures.GetNextItem(-1, LVNI_SELECTED);
if (iSelIndex == -1)
--- 351,356 ----
void CSpawnTab::OnClickCreaturelist(NMHDR* pNMHDR, LRESULT* pResult)
{
! if ( Main->m_pScripts == NULL )
! return;
int iSelIndex = this->m_clcCreatures.GetNextItem(-1, LVNI_SELECTED);
if (iSelIndex == -1)
***************
*** 370,374 ****
{
NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;
- // TODO: Add your control notification handler code here
OnClickCreaturelist(pNMHDR, pResult);
--- 377,380 ----
***************
*** 380,384 ****
m_ctcNPC.DeleteAllItems();
! if ( Main->m_pScripts->IsValid() )
FillCategoryNode(m_pCategories, NULL);
}
--- 386,390 ----
m_ctcNPC.DeleteAllItems();
! if ( Main->m_pScripts && Main->m_pScripts->IsValid() )
FillCategoryNode(m_pCategories, NULL);
}
***************
*** 493,496 ****
--- 499,504 ----
void CSpawnTab::Find(CString csString, int iCrit, bool bPrevious)
{
+ if ( Main->m_pScripts == NULL )
+ return;
if ( csString != _T("") )
{
***************
*** 555,559 ****
bool CSpawnTab::CompareItem(int index)
{
! if ( index == -1 )
return false;
if ( m_iSearchCrit == 0 )
--- 563,567 ----
bool CSpawnTab::CompareItem(int index)
{
! if ( Main->m_pScripts == NULL || index == -1 )
return false;
if ( m_iSearchCrit == 0 )
***************
*** 702,705 ****
--- 710,716 ----
if ( m_pCategories )
delete m_pCategories;
+
+ if ( Main->m_pScripts == NULL )
+ return;
CFileReadProgress progress;
Index: traveltab.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/traveltab.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** traveltab.cpp 12 Jun 2003 03:15:34 -0000 1.42
--- traveltab.cpp 25 Jul 2003 05:27:32 -0000 1.43
***************
*** 191,194 ****
--- 191,196 ----
void CTravelTab::OnAddLoc()
{
+ if ( Main->m_pScripts == NULL )
+ return;
USHORT x, y;
CHAR z;
***************
*** 212,215 ****
--- 214,219 ----
void CTravelTab::OnRemoveLoc()
{
+ if ( Main->m_pScripts == NULL )
+ return;
int iItemSel = this->m_clcLocations.GetNextItem(-1, LVNI_SELECTED);
if (iItemSel == -1)
***************
*** 222,225 ****
--- 226,231 ----
NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR;
+ if ( Main->m_pScripts == NULL )
+ return;
this->m_clcLocations.SetHotItem(-1);
***************
*** 282,285 ****
--- 288,293 ----
{
NMHDR *pJunk = pNMHDR;
+ if ( Main->m_pScripts == NULL )
+ return;
int iSelIndex = this->m_clcLocations.GetNextItem(-1, LVNI_SELECTED);
if (iSelIndex == -1)
***************
*** 335,338 ****
--- 343,348 ----
{
NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;
+ if ( Main->m_pScripts == NULL )
+ return;
m_clcLocations.SortItems(CompareFunc, pNMListView->iSubItem);
if (pNMListView->iSubItem == 0)
***************
*** 448,452 ****
m_ctcCategoryTree.DeleteAllItems();
! if ( Main->m_pScripts->IsValid() )
FillCategoryNode(m_pCategories, NULL);
}
--- 458,462 ----
m_ctcCategoryTree.DeleteAllItems();
! if ( Main->m_pScripts && Main->m_pScripts->IsValid() )
FillCategoryNode(m_pCategories, NULL);
}
***************
*** 566,569 ****
--- 576,581 ----
void CTravelTab::GetSpawnpoints()
{
+ if ( Main->m_pScripts == NULL )
+ return;
if ( Main->m_pScripts->ReloadSpawnInfo() != 0 )
// There was an error reading spawns. Should we log this? The
***************
*** 590,593 ****
--- 602,607 ----
void CTravelTab::OnEditgraymap()
{
+ if ( Main->m_pScripts == NULL )
+ return;
Main->m_pScripts->InvokeRegionEditor((ULONG) -1);
}
***************
*** 663,666 ****
--- 677,682 ----
void CTravelTab::OnEditLoc()
{
+ if ( Main->m_pScripts == NULL )
+ return;
int iSel = m_clcLocations.GetNextItem(-1, LVNI_SELECTED);
if (iSel == -1)
***************
*** 922,925 ****
--- 938,943 ----
void CTravelTab::Find(CString csString, int iCrit, bool bSelect, bool bPrevious)
{
+ if ( Main->m_pScripts == NULL )
+ return;
if ( csString != _T("") )
{
***************
*** 985,988 ****
--- 1003,1008 ----
bool CTravelTab::CompareItem(int index)
{
+ if ( Main->m_pScripts == NULL )
+ return false;
if ( index == -1 )
return false;
***************
*** 1151,1154 ****
--- 1171,1177 ----
if ( m_pCategories )
delete m_pCategories;
+
+ if ( Main->m_pScripts == NULL )
+ return;
CFileReadProgress progress;
|
|
From: Philip E. <pes...@us...> - 2003-07-25 05:27:35
|
Update of /cvsroot/sphere-axis/Axis/S_Sphere52
In directory sc8-pr-cvs1:/tmp/cvs-serv14784/S_Sphere52
Modified Files:
Resource.h S_Sphere52.rc S_Sphere52.vcproj ScriptProfile.cpp
ScriptProfile.h Scripts.h strings.h
Added Files:
RemoteConsole.cpp RemoteConsole.h RemoteConsoleLoginDlg.cpp
RemoteConsoleLoginDlg.h
Log Message:
no message
--- NEW FILE: RemoteConsole.cpp ---
/*
$Id: RemoteConsole.cpp,v 1.1 2003/07/25 05:27:32 pesterle Exp $
**********************************************************************
* Copyright (C) Philip A. Esterle 1998-2003
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
**********************************************************************
*/
// RemoteConsole.cpp
#include "stdafx.h"
#include "S_Sphere52.h"
#include "Scripts.h"
#include "RemoteConsole.h"
#include "RemoteConsoleLoginDlg.h"
#include <afxsock.h>
CRemoteConsole::CRemoteConsole(HWND hWndParent)
{
Main->m_pRConsole = this;
this->m_parentHWnd = hWndParent;
m_bCommandPending = false;
m_bIsConnected = false;
m_bIsInitialized = false;
m_bIsAlive = false;
m_bContinue = true;
m_csCommand = _T("");
m_dwThreadID = 0;
m_csAccount = _T("");
m_csPassword = _T("");
CString csSavePath;
// Try to find out where to connect to
if (Main->GetProfileType() == PROFILE_REMOTE || Main->GetProfileType() == PROFILE_LOCAL)
{
m_csHostAddress = Main->m_pScripts->Profile()->ServerHost();
m_nHostPort = (UINT) Main->m_pScripts->Profile()->ServerPort();
}
else
{
CStdioFile csfIni;
if (csfIni.Open(INI_FILE, CFile::modeRead | CFile::shareDenyNone))
{
BOOL bStatus = true;
while (bStatus)
{
CString csLine;
bStatus = csfIni.ReadString(csLine);
if (!bStatus)
break;
if (csLine != _T(""))
{
if (csLine.Find(_T("[SERVERS]")) == 0)
{
m_csHostAddress = _T("127.0.0.1");
csfIni.ReadString(csLine);
csfIni.ReadString(csLine);
csfIni.ReadString(csLine);
m_nHostPort =_tstoi(csLine);
}
}
}
csfIni.Close();
}
else
{
AfxMessageBox(locale->String(IDS_REMOTE_NOINI), MB_OK | MB_ICONSTOP );
return;
}
}
// check the IP
if (this->m_csHostAddress == _T(""))
{
AfxMessageBox(locale->String(IDS_REMOTE_NOIP), MB_OK | MB_ICONEXCLAMATION);
return;
}
// Get the password
CRemoteConsoleLoginDlg dlg;
if ( dlg.DoModal() != IDOK )
return;
m_csPassword = dlg.m_csPassword;
if ( m_csPassword == _T("") )
return;
// Start the worker thread.
m_pThread = AfxBeginThread(&RCThread, this);
while (!m_bIsInitialized)
Sleep(50);
return;
}
CRemoteConsole::~CRemoteConsole()
{
m_bContinue = false;
int i = 0;
while ( m_bIsAlive && i < 100)
{
Sleep(100);
i++;
}
Main->m_pRConsole = NULL;
}
UINT RCThread(LPVOID lpData)
{
BYTE szBuffer[MAX_BUFFER];
CRemoteConsole * pConsole = (CRemoteConsole *) lpData;
if (pConsole == NULL)
{
AfxMessageBox(locale->String(IDS_REMOTE_CANTCREATEOBJECT), MB_OK | MB_ICONSTOP);
return 1;
}
pConsole->m_bIsAlive = true;
CSocket sock;
sock.m_hSocket = socket(AF_INET, SOCK_STREAM, 0);
if (sock.m_hSocket == INVALID_SOCKET)
{
DWORD dwErr = WSAGetLastError();
CString csMessage;
csMessage.Format(locale->String(IDS_REMOTE_CANTCREATESOCKET), strerror(dwErr));
AfxMessageBox(csMessage, MB_OK | MB_ICONEXCLAMATION);
closesocket(sock.m_hSocket);
sock.m_hSocket = INVALID_SOCKET;
pConsole->m_bCommandPending = false;
pConsole->m_bIsAlive = false;
return 5;
}
//sock.Create();
if (!sock.Connect(pConsole->m_csHostAddress, pConsole->m_nHostPort))
{
pConsole->m_bIsInitialized = true;
TCHAR szError[MAX_BUFFER];
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), 0, &szError[0], MAX_BUFFER, NULL);
CString csError;
csError.Format(_T("%s"), szError);
TCHAR crlf [3] = { 0x0d, 0x0a, 0x00 };
csError.Replace(crlf, _T(""));
CString csMessage;
csMessage.Format(locale->String(IDS_REMOTE_CANTCONNECTRC));
memset(&szBuffer[0], 0x00, MAX_BUFFER);
memcpy(&szBuffer[0], LPCTSTR(csMessage), csMessage.GetLength());
if ( pConsole->m_parentHWnd != NULL )
SendMessage(pConsole->m_parentHWnd, WM_RCONSOLEMESSAGE, (WPARAM) &szBuffer[0], 0);
closesocket(sock.m_hSocket);
sock.m_hSocket = INVALID_SOCKET;
pConsole->m_bCommandPending = false;
pConsole->m_bIsAlive = false;
return 2;
}
// Log on.
memset(&szBuffer[0], 0x00, sizeof(szBuffer));
szBuffer[0] = (char) 0x20;
// Put a little sleep in here
Sleep( 100 );
if (!sock.Send(szBuffer, 1))
{
AfxMessageBox(locale->String(IDS_REMOTE_CANTLOGIN), MB_OK | MB_ICONEXCLAMATION);
pConsole->m_bIsInitialized = true;
closesocket(sock.m_hSocket);
sock.m_hSocket = INVALID_SOCKET;
pConsole->m_bCommandPending = false;
pConsole->m_bIsAlive = false;
return 3;
}
// Receive the response
int i = 0;
while ( true )
{
memset(&szBuffer[0], 0x00, sizeof(szBuffer));
// Before we try to receive the data...make sure there is some so we don't get hung
FD_SET fd;
struct timeval timeout;
FD_ZERO(&fd);
FD_SET(sock.m_hSocket, &fd);
timeout.tv_sec = 0;
timeout.tv_usec = 1000;
int rc = select(0, &fd, 0, 0, &timeout);
if ( rc < 0 )
{
CString sMessage;
sMessage.Format(locale->String(IDS_REMOTE_SESELECT), strerror(WSAGetLastError()));
LOG(sMessage);
AfxMessageBox(sMessage, MB_OK | MB_ICONEXCLAMATION);
closesocket(sock.m_hSocket);
sock.m_hSocket = INVALID_SOCKET;
pConsole->m_bCommandPending = false;
pConsole->m_bIsAlive = false;
return 5;
}
if ( rc == 0 && i++ > Main->m_pScripts->Profile()->RemoteTimeout() )
{
LOG(locale->String(IDS_REMOTE_TIMEOUT));
AfxMessageBox(locale->String(IDS_REMOTE_TIMEOUT), MB_OK | MB_ICONEXCLAMATION);
closesocket(sock.m_hSocket);
sock.m_hSocket = INVALID_SOCKET;
pConsole->m_bCommandPending = false;
pConsole->m_bIsAlive = false;
return 6;
}
if ( rc > 0 )
break;
}
// Send the username?
if ( pConsole->m_csAccount != _T("") )
{
Sleep( 100 );
memset(&szBuffer[0], 0x00, sizeof(szBuffer));
memcpy(szBuffer, pConsole->m_csAccount, pConsole->m_csAccount.GetLength());
szBuffer[pConsole->m_csAccount.GetLength()] = 0x0A;
if ( !sock.Send(&szBuffer[0], pConsole->m_csAccount.GetLength() + 1))
{
AfxMessageBox(locale->String(IDS_REMOTE_CANTLOGIN), MB_OK | MB_ICONEXCLAMATION);
pConsole->m_bIsInitialized = true;
closesocket(sock.m_hSocket);
sock.m_hSocket = INVALID_SOCKET;
pConsole->m_bCommandPending = false;
pConsole->m_bIsAlive = false;
return 4;
}
}
// Send the password
Sleep( 100 );
memset(&szBuffer[0], 0x00, sizeof(szBuffer));
memcpy(szBuffer, pConsole->m_csPassword, pConsole->m_csPassword.GetLength());
szBuffer[pConsole->m_csPassword.GetLength()] = 0x0A;
if ( !sock.Send(&szBuffer[0], pConsole->m_csPassword.GetLength() + 1))
{
AfxMessageBox(locale->String(IDS_REMOTE_CANTLOGIN), MB_OK | MB_ICONEXCLAMATION);
pConsole->m_bIsInitialized = true;
closesocket(sock.m_hSocket);
sock.m_hSocket = INVALID_SOCKET;
pConsole->m_bCommandPending = false;
pConsole->m_bIsAlive = false;
return 4;
}
pConsole->m_bIsConnected = true;
pConsole->m_bIsInitialized = true;
i = 0;
// Here's the main loop
while (pConsole->m_bContinue)
{
FD_SET fd;
struct timeval timeout;
memset(&szBuffer[0], 0x00, sizeof(szBuffer));
// Before we try to receive the data...make sure there is some so we don't get hung
FD_ZERO(&fd);
FD_SET(sock.m_hSocket, &fd);
timeout.tv_sec = 0;
timeout.tv_usec = 1000;
int rc = select(0, &fd, 0, 0, &timeout);
if (rc > 0)
{
// There is some data waiting
int nBytes = sock.Receive(&szBuffer[0], sizeof(szBuffer));
if (nBytes == 0)
break;
// Pull out NULLS
TCHAR szNewBuffer[MAX_BUFFER];
memset( &szNewBuffer[0], 0x00, sizeof(szNewBuffer) );
int j = 0;
for (int i = 0; i < nBytes; i++)
if ( szBuffer[i] != 0x00 )
szNewBuffer[j++] = szBuffer[i];
if(pConsole->m_parentHWnd != NULL)
SendMessage(pConsole->m_parentHWnd, WM_RCONSOLEMESSAGE, (WPARAM) &szNewBuffer[0], 0);
}
if (rc < 0)
{
// Socket error
TCHAR szError[MAX_BUFFER];
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), 0, &szError[0], MAX_BUFFER, NULL);
CString csError;
csError.Format(_T("%s"), szError);
TCHAR crlf[3] = { 0x0d, 0x0a, 0x00};
csError.Replace(crlf, _T(""));
CString csMessage;
csMessage.Format(_T("Connection lost. Last Error was \"%s\"\n"), csError);
memset(&szBuffer[0], 0x00, MAX_BUFFER);
memcpy(&szBuffer[0], LPCTSTR(csMessage), csMessage.GetLength());
if(pConsole->m_parentHWnd != NULL)
SendMessage(pConsole->m_parentHWnd, WM_RCONSOLEMESSAGE, (WPARAM) &szBuffer[0], 0);
break;
}
if (pConsole->m_bCommandPending)
{
for ( int i = 0; i < pConsole->m_csCommand.GetLength(); i++ )
{
TCHAR xChar = pConsole->m_csCommand.GetAt(i);
sock.Send( &xChar, 1 );
}
pConsole->m_bCommandPending = false;
pConsole->m_csCommand = _T("");
}
}
if ( !pConsole->m_bContinue)
{
// We were told to stop
TCHAR szMessage[256];
_stprintf(szMessage, _T("Disconnecting from remote server..."));
memset(&szBuffer[0], 0x00, MAX_BUFFER);
memcpy(&szBuffer[0], &szMessage[0], _tcsclen(szMessage));
if ( pConsole->m_parentHWnd != NULL )
SendMessage(pConsole->m_parentHWnd, WM_RCONSOLEMESSAGE, (WPARAM) &szBuffer[0], 0);
}
// Disconnect the socket
closesocket(sock.m_hSocket);
sock.m_hSocket = INVALID_SOCKET;
pConsole->m_bCommandPending = false;
pConsole->m_bIsConnected = false;
pConsole->m_bIsAlive = false;
return 0;
}
void CRemoteConsole::ToggleLog()
{
this->m_csCommand.Format( _T("L%c"), 0x0d );
this->m_bCommandPending = true;
if (this->IsConnected())
{
int i = 0;
while(this->m_bCommandPending && i < 100)
{
Sleep(100);
i++;
}
}
}
void CRemoteConsole::ToggleHearAll()
{
this->m_csCommand.Format( _T("H%c"), 0x0d );
this->m_bCommandPending = true;
if (this->IsConnected())
{
int i = 0;
while(this->m_bCommandPending && i < 100)
{
Sleep(100);
i++;
}
}
}
void CRemoteConsole::ToggleSecure()
{
this->m_csCommand.Format( _T("S%c"), 0x0d );
this->m_bCommandPending = true;
if (this->IsConnected())
{
int i = 0;
while(this->m_bCommandPending && i < 100)
{
Sleep(100);
i++;
}
}
}
void CRemoteConsole::ToggleVerbose()
{
this->m_csCommand.Format( _T("V%c"), 0x0d );
this->m_bCommandPending = true;
if (this->IsConnected())
{
int i = 0;
while(this->m_bCommandPending && i < 100)
{
Sleep(100);
i++;
}
}
}
void CRemoteConsole::Broadcast(CString csMessage)
{
this->m_csCommand.Format(_T("B %s%c"), csMessage, 0x0d);
this->m_bCommandPending = true;
if (this->IsConnected())
{
int i = 0;
while(this->m_bCommandPending && i < 100)
{
Sleep(100);
i++;
}
}
}
void CRemoteConsole::ClientList()
{
this->m_csCommand.Format( _T("C%c"), 0x0d );
this->m_bCommandPending = true;
if (this->IsConnected())
{
int i = 0;
while(this->m_bCommandPending && i < 100)
{
Sleep(100);
i++;
}
}
}
void CRemoteConsole::ForceSave()
{
this->m_csCommand.Format( _T("#%c"), 0x0d );
this->m_bCommandPending = true;
if (this->IsConnected())
{
int i = 0;
while(this->m_bCommandPending && i < 100)
{
Sleep(100);
i++;
}
}
}
void CRemoteConsole::GarbageCollect()
{
this->m_csCommand.Format( _T("G%c"), 0x0d );
this->m_bCommandPending = true;
if (this->IsConnected())
{
int i = 0;
while(this->m_bCommandPending && i < 100)
{
Sleep(100);
i++;
}
}
}
void CRemoteConsole::Information()
{
this->m_csCommand.Format( _T("I%c"), 0x0d );
this->m_bCommandPending = true;
if (this->IsConnected())
{
int i = 0;
while(this->m_bCommandPending && i < 100)
{
Sleep(100);
i++;
}
}
}
void CRemoteConsole::Shutdown()
{
this->m_csCommand.Format( _T("X%c"), 0x0d );
this->m_bCommandPending = true;
if (this->IsConnected())
{
int i = 0;
while(this->m_bCommandPending && i < 100)
{
Sleep(100);
i++;
}
}
}
void CRemoteConsole::Pause()
{
this->m_csCommand.Format( _T("R%c"), 0x0d );
this->m_bCommandPending = true;
if ( this->m_bIsConnected )
{
int i = 0;
while(this->m_bCommandPending && i < 100)
{
Sleep(100);
i++;
}
}
else
{
CString csMessage;
csMessage.Format(_T("Axis is not connected to the Sphere Server.\nIf it is running, please pause/resync it manually.\n\nTo pause/resync the Sphere server, type 'R' at the console.\nIf it isn't running, ignore this message."));
AfxMessageBox( csMessage, MB_OK | MB_ICONEXCLAMATION );
m_bCommandPending = false;
}
}
void CRemoteConsole::ProfileInfo()
{
this->m_csCommand.Format( _T("P%c"), 0x0d );
this->m_bCommandPending = true;
if (this->IsConnected())
{
int i = 0;
while(this->m_bCommandPending && i < 100)
{
Sleep(100);
i++;
}
}
}
void CRemoteConsole::AccountUpdate()
{
this->m_csCommand.Format( _T("A%c"), 0x0d );
this->m_bCommandPending = true;
if (this->IsConnected())
{
int i = 0;
while(this->m_bCommandPending && i < 100)
{
Sleep(100);
i++;
}
}
}
void CRemoteConsole::Reconnect()
{
this->m_bContinue = true;
m_pThread = AfxBeginThread(&RCThread, this);
while (!m_bIsInitialized)
Sleep(50);
int i = 0;
while (!m_bIsConnected)
{
Sleep(50);
i++;
if ( i > 10 )
break;
}
if ( m_bIsConnected && m_parentHWnd != NULL)
SendMessage(m_parentHWnd, WM_RCONSOLERECONNECT, (WPARAM) this, 0);
}
void CRemoteConsole::Command(CString csMessage)
{
this->m_csCommand.Format(_T("%s%c"), csMessage, 0x0d);
this->m_bCommandPending = true;
if (this->IsConnected())
{
int i = 0;
while(this->m_bCommandPending && i < 100)
{
Sleep(100);
i++;
}
}
}
--- NEW FILE: RemoteConsole.h ---
/*
$Id: RemoteConsole.h,v 1.1 2003/07/25 05:27:32 pesterle Exp $
**********************************************************************
* Copyright (C) Philip A. Esterle 1998-2003
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
**********************************************************************
*/
// RemoteConsole.h
#ifndef __REMOTECONSOLE_H__
#define __REMOTECONSOLE_H__
#include "stdafx.h"
#define WM_RCONSOLEMESSAGE WM_USER + 100
#define WM_RCONSOLERECONNECT WM_USER + 101
class CRemoteConsole
{
public:
void Command(CString csMessage);
void Reconnect();
void ToggleHearAll();
void ToggleSecure();
void ClientList();
void Information();
void ForceSave();
void GarbageCollect();
void Shutdown();
void Broadcast(CString csMessage);
void ToggleVerbose();
void ToggleLog();
void ProfileInfo();
void AccountUpdate();
CRemoteConsole(HWND hWndParent = NULL);
virtual ~CRemoteConsole();
bool IsConnected() {return m_bIsConnected;};
void Pause();
void Resync() {this->Pause();};
CString m_csCommand;
bool m_bCommandPending;
bool m_bIsConnected;
bool m_bIsInitialized;
HWND m_parentHWnd;
bool m_bContinue;
DWORD m_dwThreadID;
HANDLE m_hThread;
CString m_csHostAddress;
UINT m_nHostPort;
CString m_csAccount;
CString m_csPassword;
bool m_bIsAlive;
protected:
bool m_bLogging;
CWinThread * m_pThread;
};
UINT RCThread(LPVOID lpParam);
#endif
--- NEW FILE: RemoteConsoleLoginDlg.cpp ---
/*
$Id: RemoteConsoleLoginDlg.cpp,v 1.1 2003/07/25 05:27:32 pesterle Exp $
**********************************************************************
* Copyright (C) Philip A. Esterle 1998-2003
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
**********************************************************************
*/
// RemoteConsoleLoginDlg.cpp : implementation file
//
#include "stdafx.h"
#include "S_Sphere52.h"
#include "Scripts.h"
#include "RemoteConsoleLoginDlg.h"
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
static char THIS_FILE[] = __FILE__;
#endif
/////////////////////////////////////////////////////////////////////////////
// CRemoteConsoleLoginDlg dialog
CRemoteConsoleLoginDlg::CRemoteConsoleLoginDlg(CWnd* pParent /*=NULL*/)
: CDialog(CRemoteConsoleLoginDlg::IDD, pParent)
{
//{{AFX_DATA_INIT(CRemoteConsoleLoginDlg)
m_csPassword = _T("");
//}}AFX_DATA_INIT
m_iSel = 0;
}
void CRemoteConsoleLoginDlg::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CRemoteConsoleLoginDlg)
DDX_Text(pDX, IDC_PWD, m_csPassword);
DDX_Control(pDX, IDC_PWD, m_ePassword);
DDX_Control(pDX, IDOK, m_bOK);
DDX_Control(pDX, IDCANCEL, m_bCancel);
DDX_Control(pDX, IDC_RCSTATIC, m_sStatic1);
DDX_Control(pDX, IDC_RCL_STATIC5, m_sStatic5);
//}}AFX_DATA_MAP
}
BEGIN_MESSAGE_MAP(CRemoteConsoleLoginDlg, CDialog)
//{{AFX_MSG_MAP(CRemoteConsoleLoginDlg)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
// CRemoteConsoleLoginDlg message handlers
BOOL CRemoteConsoleLoginDlg::OnInitDialog()
{
CDialog::OnInitDialog();
Localize();
UpdateData(FALSE);
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
}
void CRemoteConsoleLoginDlg::OnOK()
{
// Save the current stuff
UpdateData(TRUE);
Main->m_pScripts->Profile()->ConsolePassword(m_csPassword);
Main->m_config.SaveConfig();
CDialog::OnOK();
}
void CRemoteConsoleLoginDlg::Localize(void)
{
locale->LocalizeWindow(IDD, 0, NULL, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_PWD, (CWnd*)&m_ePassword, (CWnd*)this);
locale->LocalizeWindow(IDD, IDOK, (CWnd*)&m_bOK, (CWnd*)this);
locale->LocalizeWindow(IDD, IDCANCEL, (CWnd*)&m_bCancel, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_RCSTATIC, (CWnd*)&m_sStatic1, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_RCL_STATIC5, (CWnd*)&m_sStatic5, (CWnd*)this);
}
--- NEW FILE: RemoteConsoleLoginDlg.h ---
/*
$Id: RemoteConsoleLoginDlg.h,v 1.1 2003/07/25 05:27:32 pesterle Exp $
**********************************************************************
* Copyright (C) Philip A. Esterle 1998-2003
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
**********************************************************************
*/
#if !defined(AFX_REMOTECONSOLELOGINDLG_H__E1187437_4922_4615_9160_0B40CA3351BB__INCLUDED_)
#define AFX_REMOTECONSOLELOGINDLG_H__E1187437_4922_4615_9160_0B40CA3351BB__INCLUDED_
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
// RemoteConsoleLoginDlg.h : header file
//
/////////////////////////////////////////////////////////////////////////////
// CRemoteConsoleLoginDlg dialog
class CRemoteConsoleLoginDlg : public CDialog
{
// Construction
public:
CRemoteConsoleLoginDlg(CWnd* pParent = NULL); // standard constructor
// Dialog Data
//{{AFX_DATA(CRemoteConsoleLoginDlg)
enum { IDD = IDD_REMOTE_CONSOLE_LOGIN_DLG };
CString m_csPassword;
CEdit m_ePassword;
CButton m_bOK;
CButton m_bCancel;
CStatic m_sStatic1;
CStatic m_sStatic5;
//}}AFX_DATA
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CRemoteConsoleLoginDlg)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation
protected:
int m_iSel;
// Generated message map functions
//{{AFX_MSG(CRemoteConsoleLoginDlg)
virtual BOOL OnInitDialog();
virtual void OnOK();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
public:
void Localize(void);
};
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
#endif // !defined(AFX_REMOTECONSOLELOGINDLG_H__E1187437_4922_4615_9160_0B40CA3351BB__INCLUDED_)
Index: Resource.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Resource.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** Resource.h 24 Jul 2003 06:00:06 -0000 1.13
--- Resource.h 25 Jul 2003 05:27:32 -0000 1.14
***************
*** 76,79 ****
--- 76,80 ----
#define IDC_PROFILE_DISCARD 232
#define IDC_UOMAPCTRL1 232
+ #define IDD_REMOTE_CONSOLE_LOGIN_DLG 232
#define IDC_UOARTCTRL1 234
#define IDC_TREE1 235
***************
*** 85,88 ****
--- 86,90 ----
#define IDC_NPCLIST 237
#define IDI_DOWNARROW 238
+ #define IDC_RCSTATIC 238
#define IDC_TRIGEDIT 1001
#define IDC_NPCATTRADD 1001
***************
*** 197,200 ****
--- 199,203 ----
#define IDC_FOODTYPE_NAME 1059
#define IDC_SGENTRY 1059
+ #define IDC_ACCT 1059
#define IDC_NPCDEFNAME 1060
#define IDC_ORECOLOUR 1060
***************
*** 217,220 ****
--- 220,224 ----
#define IDC_FOODTYPE_AMOUNT 1060
#define IDC_SGWEIGHT 1060
+ #define IDC_PWD 1060
#define IDC_COLORCOMBO 1061
#define IDC_SKILLS 1061
***************
*** 664,667 ****
--- 668,672 ----
#define IDC_SME_STATIC6 1727
#define IDC_SME_STATIC7 1728
+ #define IDC_RCL_STATIC5 1751
#define IDC_RSD_STATIC1 1765
#define IDC_RSD_STATIC2 1766
***************
*** 695,699 ****
#define _APS_NEXT_RESOURCE_VALUE 206
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 238
#define _APS_NEXT_SYMED_VALUE 104
#endif
--- 700,704 ----
#define _APS_NEXT_RESOURCE_VALUE 206
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 239
#define _APS_NEXT_SYMED_VALUE 104
#endif
Index: S_Sphere52.rc
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/S_Sphere52.rc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** S_Sphere52.rc 24 Jul 2003 06:00:06 -0000 1.15
--- S_Sphere52.rc 25 Jul 2003 05:27:32 -0000 1.16
***************
*** 1199,1202 ****
--- 1199,1215 ----
END
+ IDD_REMOTE_CONSOLE_LOGIN_DLG DIALOGEX 0, 0, 348, 62
+ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+ CAPTION "Remote Console Login"
+ FONT 8, "MS Sans Serif", 0, 0, 0x0
+ BEGIN
+ EDITTEXT IDC_PWD,142,42,99,12,ES_PASSWORD | ES_AUTOHSCROLL
+ DEFPUSHBUTTON "OK",IDOK,291,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,291,24,50,14
+ LTEXT "Password",IDC_RCL_STATIC5,107,44,32,8
+ LTEXT "To log in to the remote console, you need to provide the password for the RemoteAdmin account. If this account doesn't exist, it will need to be created. Only one user can be connected to the remote console at a time.",
+ IDC_RCSTATIC,7,7,282,32
+ END
+
/////////////////////////////////////////////////////////////////////////////
***************
*** 1453,1456 ****
--- 1466,1477 ----
TOPMARGIN, 7
BOTTOMMARGIN, 288
+ END
+
+ IDD_REMOTE_CONSOLE_LOGIN_DLG, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 341
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 54
END
END
Index: S_Sphere52.vcproj
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/S_Sphere52.vcproj,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** S_Sphere52.vcproj 10 Jul 2003 21:49:36 -0000 1.15
--- S_Sphere52.vcproj 25 Jul 2003 05:27:32 -0000 1.16
***************
*** 215,218 ****
--- 215,224 ----
</File>
<File
+ RelativePath="RemoteConsole.cpp">
+ </File>
+ <File
+ RelativePath="RemoteConsoleLoginDlg.cpp">
+ </File>
+ <File
RelativePath="Room.cpp">
</File>
***************
*** 460,463 ****
--- 466,475 ----
<File
RelativePath="RegionSelectDlg.h">
+ </File>
+ <File
+ RelativePath="RemoteConsole.h">
+ </File>
+ <File
+ RelativePath="RemoteConsoleLoginDlg.h">
</File>
<File
Index: ScriptProfile.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptProfile.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ScriptProfile.cpp 23 Jul 2003 19:10:57 -0000 1.3
--- ScriptProfile.cpp 25 Jul 2003 05:27:32 -0000 1.4
***************
*** 54,57 ****
--- 54,60 ----
ReadValue(pNode, _T("ServerPort"), (void*)&m_iServerPort, XML_Int);
ReadValue(pNode, _T("Files"), (void*)&m_sFiles, XML_StringArray);
+ CString sPassword;
+ ReadValue(pNode, _T("ConsolePassword"), (void*)&sPassword, XML_String);
+ m_sConsolePassword = Decrypt64(sPassword);
}
***************
*** 74,77 ****
--- 77,81 ----
AddValue(pDoc, pNewNode, _T("ServerPort"), (void*)&m_iServerPort, XML_Int, 2);
AddValue(pDoc, pNewNode, _T("Files"), (void*)&m_sFiles, XML_StringArray, 2);
+ AddValue(pDoc, pNewNode, _T("ConsolePassword"), (void*)&Encrypt64(m_sConsolePassword), XML_String, 2);
return true;
***************
*** 92,94 ****
--- 96,190 ----
m_sServerHost = pSource->ServerHost();
m_iServerPort = pSource->ServerPort();
+ }
+
+ CString CScriptProfile::Encrypt64(CString sInput)
+ {
+ __int64 lKey = GetEncryptKey();
+ // Convert the string to a CHAR
+ CStringA sIn;
+ #ifdef _UNICODE
+ sIn.Format("%S", sInput);
+ #else
+ sIn.Format("%s", sInput);
+ #endif
+ // Encrypt the data using the key, recycling if necessary.
+ CStringA sEncrypt = sIn;
+ for ( int i = 0; i < sInput.GetLength(); i++ )
+ sEncrypt.SetAt(i, sIn.GetAt(i) ^ (( BYTE) (lKey >> (8 * (i % 8)) & 0xFF)) );
+ // Transpose the encrypted data into an ordinary text string that won't choke the XML engine
+ CString sTrans;
+ for ( i = 0; i < sEncrypt.GetLength(); i++ )
+ {
+ CStringA sByte;
+ sByte.Format(_T("%02x"), (BYTE) sEncrypt.GetAt(i));
+ sTrans += sByte;
+ }
+ return sTrans;
+ }
+
+ CString CScriptProfile::Decrypt64(CString sInput)
+ {
+ __int64 lKey = GetEncryptKey();
+ // Undo the transposition
+ CStringA sEncrypt;
+ for ( int i = 0; i < sInput.GetLength(); i++ )
+ {
+ CString sByte;
+ sByte = sInput.Mid(i * 2, 2);
+ sEncrypt += (char) _tcstoul((LPCTSTR)sByte, '\0', 16);
+ }
+ // Decrypte the data using the key
+ CStringA sDecrypt = sEncrypt; // We need to copy sEncrypt here to ensure that the string is the right size
+ for ( i = 0; i < (int)strlen(sEncrypt); i++ )
+ sDecrypt.SetAt(i, sEncrypt.GetAt(i) ^ (( BYTE) (lKey >> (8 * (i % 8)) & 0xFF)) );
+
+ CString sOutput;
+ #ifdef _UNICODE
+ sOutput.Format("%S", sDecrypt);
+ #else
+ sOutput.Format("%s", sDecrypt);
+ #endif
+ return sOutput;
+ }
+
+ __int64 CScriptProfile::GetEncryptKey()
+ {
+ __int64 lKey = 0;
+ // Look for our encryption key in the registry
+ HKEY hKey;
+ if ( RegOpenKeyEx(HKEY_CURRENT_USER, _T("Software\\McKerrow\\Axis"), 0, KEY_READ, &hKey) == ERROR_SUCCESS )
+ {
+ DWORD dwType, dwSize;
+ dwSize = sizeof(__int64);
+ LONG lStatus = RegQueryValueEx(hKey, _T("EncryptKey"), 0, &dwType, (BYTE *) &lKey, &dwSize);
+ if ( lStatus != ERROR_SUCCESS )
+ lKey = 0;
+ RegCloseKey(hKey);
+ }
+ // If it doesn't exist, create one
+ if ( lKey == 0 )
+ {
+ srand((UINT)time(NULL));
+ lKey = (__int64) (rand() + 1);
+ while ( lKey < 0x1000000000000000 )
+ lKey *= (__int64) rand();
+ // Make sure we don't have any bytes == 0
+ for ( int i = 0; i < 8; i++ )
+ {
+ if ( ( (BYTE) ( ( lKey >> i ) & 0xFF ) ) == 0x00 )
+ {
+ BYTE bNew = 0;
+ while ( bNew == 0 )
+ bNew = (BYTE) rand();
+ lKey |= ( ( (__int64) bNew) << i );
+ }
+ }
+ // Save it
+ DWORD dwDisp;
+ LONG lStatus = RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\McKerrow\\Axis"), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, &dwDisp);
+ if ( lStatus == ERROR_SUCCESS )
+ lStatus = RegSetValueEx(hKey, _T("EncryptKey"), 0, REG_BINARY, ((BYTE *) &lKey), sizeof(__int64) );
+ RegCloseKey(hKey);
+ }
+ return lKey;
}
Index: ScriptProfile.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptProfile.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ScriptProfile.h 23 Jul 2003 19:10:57 -0000 1.4
--- ScriptProfile.h 25 Jul 2003 05:27:32 -0000 1.5
***************
*** 56,59 ****
--- 56,60 ----
int ServerPort() { return m_iServerPort; }
CStringArray& Files() { return m_sFiles; }
+ CString ConsolePassword() { return m_sConsolePassword; }
void ProfileName(CString s) { m_sProfileName = s; }
***************
*** 69,72 ****
--- 70,74 ----
void ServerPort(int i) { m_iServerPort = i; }
void Files(CStringArray &sa) { m_sFiles.Copy(sa); }
+ void ConsolePassword(CString s) { m_sConsolePassword = s; }
bool WriteXML(xmlDocPtr pDoc, xmlNodePtr pNode);
***************
*** 87,90 ****
--- 89,96 ----
CString m_sServerHost;
int m_iServerPort;
+ CString m_sConsolePassword;
+ CString Encrypt64(CString sInput);
+ CString Decrypt64(CString sInput);
+ __int64 GetEncryptKey();
};
Index: Scripts.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Scripts.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Scripts.h 23 Jul 2003 19:10:57 -0000 1.9
--- Scripts.h 25 Jul 2003 05:27:32 -0000 1.10
***************
*** 55,58 ****
--- 55,59 ----
static vector<CScripts*> m_instances;
static int m_instance;
+ class CRemoteConsole * m_pRConsole;
CScripts();
Index: strings.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/strings.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** strings.h 23 Jul 2003 19:10:57 -0000 1.9
--- strings.h 25 Jul 2003 05:27:32 -0000 1.10
***************
*** 206,208 ****
#define IDS_ITEMGEN_DESCRIPTION 498
#define IDS_ITEMGEN_ID 511
! #define IDS_SGEDIT_CAPTION 428
\ No newline at end of file
--- 206,219 ----
#define IDS_ITEMGEN_DESCRIPTION 498
#define IDS_ITEMGEN_ID 511
! #define IDS_SGEDIT_CAPTION 428
! #define IDS_REMOTE_NOINI 318
! #define IDS_REMOTE_NOIP 319
! #define IDS_REMOTE_CANTCREATEOBJECT 320
! #define IDS_REMOTE_CANTCREATESOCKET 321
! #define IDS_REMOTE_CANTCONNECTRC 322
! #define IDS_REMOTE_CANTLOGIN 323
! #define IDS_REMOTE_CANTRESYNC 324
! #define IDS_REMOTE_CMDTOOLONG 325
! #define IDS_REMOTE_SESELECT 178
! #define IDS_REMOTE_TIMEOUT 179
!
|
|
From: Philip E. <pes...@us...> - 2003-07-24 20:12:47
|
Update of /cvsroot/sphere-axis/Axis
In directory sc8-pr-cvs1:/tmp/cvs-serv19550
Modified Files:
SPAWNTAB.CPP
Log Message:
no message
Index: SPAWNTAB.CPP
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/SPAWNTAB.CPP,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** SPAWNTAB.CPP 26 Jun 2003 22:28:02 -0000 1.23
--- SPAWNTAB.CPP 24 Jul 2003 20:12:44 -0000 1.24
***************
*** 362,369 ****
m_Display.SetArtColor((WORD) Main->m_pScripts->EvaluateDef(sColor));
! if ( sDispID != _T("") )
! m_Display.SetArtIndex((WORD) ahextoi(sDispID));
! else
! m_Display.SetArtIndex(-1);
*pResult = 0;
--- 362,366 ----
m_Display.SetArtColor((WORD) Main->m_pScripts->EvaluateDef(sColor));
! m_Display.SetArtIndex( (WORD) Main->m_pScripts->EvaluateDef(sDispID));
*pResult = 0;
|
|
From: Philip E. <pes...@us...> - 2003-07-24 20:12:47
|
Update of /cvsroot/sphere-axis/Axis/S_Sphere52
In directory sc8-pr-cvs1:/tmp/cvs-serv19550/S_Sphere52
Modified Files:
Def.cpp itemeditdlg.cpp itemeditdlg.h npceditdlg.cpp
npceditdlg.h
Log Message:
no message
Index: Def.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Def.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Def.cpp 23 Jul 2003 19:10:57 -0000 1.4
--- Def.cpp 24 Jul 2003 20:12:44 -0000 1.5
***************
*** 110,113 ****
--- 110,115 ----
DWORD DefLookup(const TCHAR *pszExp)
{
+ if ( IsHexValue(pszExp) )
+ return ahextoi(pszExp);
int iDef = Main->m_pScripts->m_aDefs.Find(pszExp);
if ( iDef != -1 )
***************
*** 116,119 ****
return pDef->Evaluate() ;
}
! return ahextoi(pszExp);
}
--- 118,121 ----
return pDef->Evaluate() ;
}
! return -1;
}
Index: itemeditdlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/itemeditdlg.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** itemeditdlg.cpp 24 Jul 2003 06:00:06 -0000 1.6
--- itemeditdlg.cpp 24 Jul 2003 20:12:44 -0000 1.7
***************
*** 159,162 ****
--- 159,163 ----
ON_NOTIFY(TVN_SELCHANGED, IDC_ITEMTREE, OnTvnSelchangedItemtree)
ON_NOTIFY(LVN_ITEMCHANGED, IDC_ITEMLIST, OnLvnItemchangedItemlist)
+ ON_NOTIFY(HDN_ITEMCLICK, 0, OnHdnItemclickItemlist)
END_MESSAGE_MAP()
***************
*** 1472,1475 ****
--- 1473,1514 ----
}
+ *pResult = 0;
+ }
+
+ void CItemEditDlg::OnHdnItemclickItemlist(NMHDR *pNMHDR, LRESULT *pResult)
+ {
+ NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;
+ // TODO: Add your control notification handler code here
+ this->m_lcItemList.SortItems(CompareFunc, pNMListView->iSubItem);
+ if (pNMListView->iSubItem == 0)
+ {
+ switch(iNameSort)
+ {
+ case -1:
+ iNameSort = 1;
+ break;
+ case 0:
+ iNameSort = 1;
+ break;
+ case 1:
+ iNameSort = -1;
+ break;
+ }
+ }
+ if (pNMListView->iSubItem == 1)
+ {
+ switch(iIDSort)
+ {
+ case -1:
+ iIDSort = 1;
+ break;
+ case 0:
+ iIDSort = 1;
+ break;
+ case 1:
+ iIDSort = -1;
+ break;
+ }
+ }
*pResult = 0;
}
Index: itemeditdlg.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/itemeditdlg.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** itemeditdlg.h 24 Jul 2003 06:00:06 -0000 1.5
--- itemeditdlg.h 24 Jul 2003 20:12:44 -0000 1.6
***************
*** 180,183 ****
--- 180,184 ----
afx_msg void OnTvnSelchangedItemtree(NMHDR *pNMHDR, LRESULT *pResult);
afx_msg void OnLvnItemchangedItemlist(NMHDR *pNMHDR, LRESULT *pResult);
+ afx_msg void OnHdnItemclickItemlist(NMHDR *pNMHDR, LRESULT *pResult);
};
Index: npceditdlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/npceditdlg.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** npceditdlg.cpp 24 Jul 2003 06:00:06 -0000 1.6
--- npceditdlg.cpp 24 Jul 2003 20:12:44 -0000 1.7
***************
*** 203,206 ****
--- 203,207 ----
ON_NOTIFY(TVN_SELCHANGED, IDC_NPCTREE, OnTvnSelchangedNpctree)
ON_NOTIFY(LVN_ITEMCHANGED, IDC_NPCLIST, OnLvnItemchangedNpclist)
+ ON_NOTIFY(HDN_ITEMCLICK, 0, OnHdnItemclickNpclist)
END_MESSAGE_MAP()
***************
*** 2152,2156 ****
sDispID = Main->m_pScripts->CharDispID(index);
{
! m_Display.SetArtIndex(ahextoi(sDispID) == 0 ? Main->m_pScripts->EvaluateDef(sDispID) : ahextoi(sDispID));
m_Display.SetArtColor((WORD)Main->m_pScripts->EvaluateDef(sColor));
}
--- 2153,2157 ----
sDispID = Main->m_pScripts->CharDispID(index);
{
! m_Display.SetArtIndex(Main->m_pScripts->EvaluateDef(sDispID));
m_Display.SetArtColor((WORD)Main->m_pScripts->EvaluateDef(sColor));
}
***************
*** 2159,2162 ****
--- 2160,2201 ----
}
+ *pResult = 0;
+ }
+
+ void CNPCEditDlg::OnHdnItemclickNpclist(NMHDR *pNMHDR, LRESULT *pResult)
+ {
+ NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;
+ // TODO: Add your control notification handler code here
+ this->m_lcNPCList.SortItems(NPCCompareFunc, pNMListView->iSubItem);
+ if (pNMListView->iSubItem == 0)
+ {
+ switch(iNPCNameSort)
+ {
+ case -1:
+ iNPCNameSort = 1;
+ break;
+ case 0:
+ iNPCNameSort = 1;
+ break;
+ case 1:
+ iNPCNameSort = -1;
+ break;
+ }
+ }
+ if (pNMListView->iSubItem == 1)
+ {
+ switch(iNPCIDSort)
+ {
+ case -1:
+ iNPCIDSort = 1;
+ break;
+ case 0:
+ iNPCIDSort = 1;
+ break;
+ case 1:
+ iNPCIDSort = -1;
+ break;
+ }
+ }
*pResult = 0;
}
Index: npceditdlg.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/npceditdlg.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** npceditdlg.h 24 Jul 2003 06:00:06 -0000 1.4
--- npceditdlg.h 24 Jul 2003 20:12:44 -0000 1.5
***************
*** 245,248 ****
--- 245,249 ----
afx_msg void OnTvnSelchangedNpctree(NMHDR *pNMHDR, LRESULT *pResult);
afx_msg void OnLvnItemchangedNpclist(NMHDR *pNMHDR, LRESULT *pResult);
+ afx_msg void OnHdnItemclickNpclist(NMHDR *pNMHDR, LRESULT *pResult);
};
|
|
From: Philip E. <pes...@us...> - 2003-07-24 20:12:46
|
Update of /cvsroot/sphere-axis/Axis/S_ScriptsBase
In directory sc8-pr-cvs1:/tmp/cvs-serv19550/S_ScriptsBase
Modified Files:
common.cpp common.h ScriptArray.h
Log Message:
no message
Index: common.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/common.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** common.cpp 23 Jul 2003 17:27:37 -0000 1.3
--- common.cpp 24 Jul 2003 20:12:44 -0000 1.4
***************
*** 62,63 ****
--- 62,72 ----
return( val );
}
+
+ bool IsHexValue( const TCHAR * pszStr ) // Check to see if this string is a hex value
+ {
+ CString s(pszStr);
+ if ( s.SpanIncluding(_T("0123456789abcdefABCDEF")) == s )
+ return true;
+ else
+ return false;
+ }
Index: common.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/common.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** common.h 23 Jul 2003 17:27:37 -0000 1.3
--- common.h 24 Jul 2003 20:12:44 -0000 1.4
***************
*** 58,59 ****
--- 58,60 ----
__declspec(dllexport) int FindTable( const TCHAR * pFind, const TCHAR * const * ppTable, int iCount, int iElemSize = sizeof(const TCHAR *));
__declspec(dllexport) DWORD ahextoi( const TCHAR * pszStr );
+ __declspec(dllexport) bool IsHexValue( const TCHAR * pszStr );
Index: ScriptArray.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/ScriptArray.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ScriptArray.h 23 Jul 2003 17:27:37 -0000 1.6
--- ScriptArray.h 24 Jul 2003 20:12:44 -0000 1.7
***************
*** 59,63 ****
iIndex = (iUpper + iLower ) / 2;
ScriptPtrType pTest = (ScriptPtrType) m_members[iIndex];
! if ( pTest > pScript )
{
iCompare = 0;
--- 59,63 ----
iIndex = (iUpper + iLower ) / 2;
ScriptPtrType pTest = (ScriptPtrType) m_members[iIndex];
! if ( *pTest > *pScript )
{
iCompare = 0;
|
|
From: Philip E. <pes...@us...> - 2003-07-24 06:00:09
|
Update of /cvsroot/sphere-axis/Axis/S_Sphere52
In directory sc8-pr-cvs1:/tmp/cvs-serv11511/S_Sphere52
Modified Files:
itemeditdlg.cpp itemeditdlg.h npceditdlg.cpp npceditdlg.h
Resource.h S_Sphere52.rc
Log Message:
no message
Index: itemeditdlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/itemeditdlg.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** itemeditdlg.cpp 21 Jul 2003 14:13:57 -0000 1.5
--- itemeditdlg.cpp 24 Jul 2003 06:00:06 -0000 1.6
***************
*** 158,161 ****
--- 158,162 ----
//}}AFX_MSG_MAP
ON_NOTIFY(TVN_SELCHANGED, IDC_ITEMTREE, OnTvnSelchangedItemtree)
+ ON_NOTIFY(LVN_ITEMCHANGED, IDC_ITEMLIST, OnLvnItemchangedItemlist)
END_MESSAGE_MAP()
***************
*** 233,237 ****
}
! m_Display.SetMulPath(Main->m_pScripts->MulPath());
for ( ULONG i = Map0; i < MulCount; i++ )
{
--- 234,239 ----
}
! if ( Main->m_pScripts->MulPath() != _T("") )
! m_Display.SetMulPath(Main->m_pScripts->MulPath());
for ( ULONG i = Map0; i < MulCount; i++ )
{
***************
*** 241,244 ****
--- 243,250 ----
}
+ m_Display.SetDrawFlags(1);
+ m_Display.SetArtType(0);
+ m_Display.SetArtIndex(0);
+
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
***************
*** 1436,1438 ****
}
return 0;
! }
\ No newline at end of file
--- 1442,1475 ----
}
return 0;
! }
!
! void CItemEditDlg::OnLvnItemchangedItemlist(NMHDR *pNMHDR, LRESULT *pResult)
! {
! LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
!
! if (pNMLV->uNewState & LVNI_SELECTED)
! {
! // this is the one that has been selected
! int iSelIndex = this->m_lcItemList.GetNextItem(-1, LVNI_SELECTED);
! if (iSelIndex == -1)
! {
! m_Display.SetArtIndex(-1);
! m_Display.SetArtColor(0);
! return;
! }
! this->m_lcItemList.SetHotItem(iSelIndex);
!
! int index = (int) m_lcItemList.GetItemData(iSelIndex);
! CString sColor, sDispID;
! sColor = Main->m_pScripts->ItemColor(index);
! sDispID = Main->m_pScripts->ItemDispID(index);
! {
! m_Display.SetArtIndex(ahextoi(sDispID));
! m_Display.SetArtColor((WORD)Main->m_pScripts->EvaluateDef(sColor));
! }
!
! return;
! }
!
! *pResult = 0;
! }
Index: itemeditdlg.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/itemeditdlg.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** itemeditdlg.h 21 Jul 2003 14:13:57 -0000 1.4
--- itemeditdlg.h 24 Jul 2003 06:00:06 -0000 1.5
***************
*** 179,182 ****
--- 179,183 ----
CListCtrl m_lcItemList;
afx_msg void OnTvnSelchangedItemtree(NMHDR *pNMHDR, LRESULT *pResult);
+ afx_msg void OnLvnItemchangedItemlist(NMHDR *pNMHDR, LRESULT *pResult);
};
Index: npceditdlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/npceditdlg.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** npceditdlg.cpp 17 Jul 2003 22:09:06 -0000 1.5
--- npceditdlg.cpp 24 Jul 2003 06:00:06 -0000 1.6
***************
*** 88,91 ****
--- 88,93 ----
// CNPCEditDlg dialog
+ int CNPCEditDlg::iNPCIDSort = 1;
+ int CNPCEditDlg::iNPCNameSort = 1;
CNPCEditDlg::CNPCEditDlg(CWnd* pParent /*=NULL*/)
***************
*** 119,129 ****
DDX_Control(pDX, IDC_NPCIMAGE, m_Display);
DDX_Control(pDX, IDC_NPCNOINDEX, m_cbNoIndex);
- DDX_Control(pDX, IDC_NPCDISABLEDISPLAY, m_cbDisableDisplay);
DDX_Control(pDX, IDOK, m_cbOK);
DDX_Control(pDX, IDCANCEL, m_cbCancel);
- DDX_Control(pDX, IDC_NPCADDSUBSECTION, m_cbAddSubsection);
DDX_Control(pDX, IDC_NPCADDCATEGORY, m_cbAddCategory);
DDX_Control(pDX, IDC_NPCEDITDESCRIPTION, m_ceDescription);
- DDX_Control(pDX, IDC_NPCSUBSECTION, m_ccbSubsection);
DDX_Control(pDX, IDC_NPCCATEGORY, m_ccbCategory);
DDX_Control(pDX, IDC_NPCATTRREMOVE, m_cbAttrRemove);
--- 121,128 ----
***************
*** 152,157 ****
DDX_Control(pDX, IDC_NPCNAMEINDEX, m_ccbNameIndex);
DDX_Control(pDX, IDC_NPCNAME, m_ceName);
- DDX_Control(pDX, IDC_NPCENTRY, m_ccbNPCEntry);
- DDX_Control(pDX, IDC_NE_STATIC1, m_sStatic1);
DDX_Control(pDX, IDC_NE_STATIC2, m_sStatic2);
DDX_Control(pDX, IDC_NE_STATIC3, m_sStatic3);
--- 151,154 ----
***************
*** 170,174 ****
DDX_Control(pDX, IDC_NE_STATIC16, m_sStatic16);
DDX_Control(pDX, IDC_NE_STATIC17, m_sStatic17);
- DDX_Control(pDX, IDC_NE_STATIC18, m_sStatic18);
DDX_Control(pDX, IDC_NE_STATIC19, m_sStatic19);
DDX_Control(pDX, IDC_NE_STATIC20, m_sStatic20);
--- 167,170 ----
***************
*** 176,179 ****
--- 172,177 ----
DDX_Control(pDX, IDC_NE_GMISC, m_sGroupMisc);
DDX_Control(pDX, IDC_NE_GCLASS, m_sGroupClass);
+ DDX_Control(pDX, IDC_NPCTREE, m_tcNPCTree);
+ DDX_Control(pDX, IDC_NPCLIST, m_lcNPCList);
//}}AFX_DATA_MAP
}
***************
*** 182,186 ****
BEGIN_MESSAGE_MAP(CNPCEditDlg, CDialog)
//{{AFX_MSG_MAP(CNPCEditDlg)
- ON_CBN_SELCHANGE(IDC_NPCENTRY, OnSelchangeNpcentry)
ON_BN_CLICKED(IDC_NPCPALETTE, OnNpcpalette)
ON_LBN_SELCHANGE(IDC_NPCATTRLIST, OnSelchangeNpcattrlist)
--- 180,183 ----
***************
*** 196,201 ****
ON_BN_CLICKED(IDC_EDITNPC, OnEditnpc)
ON_BN_CLICKED(IDC_NPCADDCATEGORY, OnNpcaddcategory)
- ON_BN_CLICKED(IDC_NPCADDSUBSECTION, OnNpcaddsubsection)
- ON_CBN_SELCHANGE(IDC_NPCCATEGORY, OnSelchangeNpccategory)
ON_NOTIFY(NM_DBLCLK, IDC_NPCATTRIBUTES, OnDblclkNpcattributes)
ON_NOTIFY(NM_DBLCLK, IDC_SKILLS, OnDblclkSkills)
--- 193,196 ----
***************
*** 203,210 ****
ON_CBN_SELCHANGE(IDC_NPCBASEID, OnSelchangeNpcbaseid)
ON_BN_CLICKED(IDC_NPCNOINDEX, OnNpcnoindex)
- ON_BN_CLICKED(IDC_NPCDISABLEDISPLAY, OnNpcdisabledisplay)
ON_CBN_EDITCHANGE(IDC_NPCOLOUR, OnEditchangeNpcolour)
ON_CBN_SELCHANGE(IDC_NPCOLOUR, OnSelchangeNpcolour)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
--- 198,206 ----
ON_CBN_SELCHANGE(IDC_NPCBASEID, OnSelchangeNpcbaseid)
ON_BN_CLICKED(IDC_NPCNOINDEX, OnNpcnoindex)
ON_CBN_EDITCHANGE(IDC_NPCOLOUR, OnEditchangeNpcolour)
ON_CBN_SELCHANGE(IDC_NPCOLOUR, OnSelchangeNpcolour)
//}}AFX_MSG_MAP
+ ON_NOTIFY(TVN_SELCHANGED, IDC_NPCTREE, OnTvnSelchangedNpctree)
+ ON_NOTIFY(LVN_ITEMCHANGED, IDC_NPCLIST, OnLvnItemchangedNpclist)
END_MESSAGE_MAP()
***************
*** 218,266 ****
Localize();
- HKEY hKey;
- LONG lStatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Menasoft\\GM Tools"), 0, KEY_READ, &hKey);
- if (lStatus == ERROR_SUCCESS)
- {
- DWORD dwValue;
- DWORD dwType;
- DWORD dwSize = sizeof(dwValue);
- lStatus = RegQueryValueEx(hKey, _T("DisableNPCDisplay"), 0, &dwType, (BYTE *)&dwValue, &dwSize);
- if (lStatus == ERROR_SUCCESS && dwValue)
- this->m_cbDisableDisplay.SetCheck(1);
- else
- this->m_cbDisableDisplay.SetCheck(0);
- }
- RegCloseKey(hKey);
-
m_iEdits = 0;
// Fill in the Combo Boxes with data from the Defs file
- int iSel = -1;
- for (int i = 0; i < (int) Main->m_pScripts->m_aNPCs.GetSize(); i++)
- {
- CCategorizedScriptBase * pBase = (CCategorizedScriptBase *) Main->m_pScripts->m_aNPCs.GetAt(i);
- if ( !pBase )
- continue;
- CString csEntry;
- csEntry.Format(_T("%s [%s]"), pBase->m_csDescription, pBase->m_csValue);
- int index = this->m_ccbNPCEntry.AddString(csEntry);
- this->m_ccbNPCEntry.SetItemDataPtr(index, (void *) pBase);
- if ( m_pNPC && m_pNPC->m_csValue == pBase->m_csValue )
- iSel = index;
- }
m_hPaletteIcon = AfxGetApp()->LoadIcon(IDI_PALETTE);
this->m_cbPalette.SetIcon(m_hPaletteIcon);
this->InitializeControls();
- if ( iSel != -1 )
- {
- this->m_ccbNPCEntry.SetCurSel(iSel);
- this->OnSelchangeNpcentry();
- this->OnEditnpc();
- }
- if ( this->m_bNewMode )
- this->OnNewnpc();
! m_Display.SetMulPath(Main->m_pScripts->MulPath());
for ( ULONG i = Map0; i < MulCount; i++ )
{
--- 214,232 ----
Localize();
m_iEdits = 0;
// Fill in the Combo Boxes with data from the Defs file
+ CategorizeItems();
+ CategorizeNPCs();
+ FillCategoryTree(&m_tcNPCTree, m_pNPCCategories);
+ m_lcNPCList.InsertColumn(0, locale->String(IDS_ITEMGEN_DESCRIPTION), LVCFMT_LEFT, 140, -1);
+ m_lcNPCList.InsertColumn(1, locale->String(IDS_ITEMGEN_ID), LVCFMT_LEFT, 97, -1);
m_hPaletteIcon = AfxGetApp()->LoadIcon(IDI_PALETTE);
this->m_cbPalette.SetIcon(m_hPaletteIcon);
this->InitializeControls();
! if ( Main->m_pScripts->MulPath() != _T("") )
! m_Display.SetMulPath(Main->m_pScripts->MulPath());
for ( ULONG i = Map0; i < MulCount; i++ )
{
***************
*** 270,273 ****
--- 236,243 ----
}
+ m_Display.SetArtType(1);
+ m_Display.SetArtColor(0);
+ m_Display.SetArtIndex(0);
+
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
***************
*** 289,316 ****
m_aTmpEvents.RemoveAll();
CleanupTemporaryObjects();
- ClearItemCategories();
- if ( m_pNPC )
- delete m_pNPC;
- }
-
- void CNPCEditDlg::OnSelchangeNpcentry()
- {
- CWaitCursor hourglass;
- int iSel = this->m_ccbNPCEntry.GetCurSel();
- if ( iSel == -1 )
- return;
if ( m_pNPC )
delete m_pNPC;
! CScriptBase * pBase = (CScriptBase *) m_ccbNPCEntry.GetItemDataPtr(iSel);
! if ( !pBase )
! return;
! m_pNPC = new CNPC;
! m_pNPC->m_csValue = pBase->m_csValue;
! m_pNPC->m_csFilename = pBase->m_csFilename;
! m_pNPC->Load(_T(""));
! CopyTemporaryValues();
! PopulateFields();
! if ( !m_cbDisableDisplay.GetCheck() )
! DrawNPC();
}
--- 259,268 ----
m_aTmpEvents.RemoveAll();
CleanupTemporaryObjects();
if ( m_pNPC )
delete m_pNPC;
! if ( m_pNPCCategories )
! delete m_pNPCCategories;
! if ( m_pItemCategories )
! delete m_pItemCategories;
}
***************
*** 323,327 ****
// csIndex.Format(_T("0%x"), dlg.GetColorIndex());
// this->m_ccbColour.SetWindowText(csIndex);
- // DrawNPC();
//}
}
--- 275,278 ----
***************
*** 382,386 ****
if ( !pNames )
continue;
! this->m_ccbNameIndex.AddString(pNames->m_csID);
}
// Fill in the resources
--- 333,337 ----
if ( !pNames )
continue;
! this->m_ccbNameIndex.AddString(pNames->m_csValue);
}
// Fill in the resources
***************
*** 449,453 ****
this->m_ccbColour.SetCurSel(-1);
this->m_ccbColour.SetWindowText(m_pNPC->m_csColor);
- DrawNPC();
}
this->m_ccbSound.SetWindowText(m_pNPC->m_csSound);
--- 400,403 ----
***************
*** 467,472 ****
}
this->m_ccbCategory.SelectString(-1, m_pNPC->m_csCategory);
- this->OnSelchangeNpccategory();
- this->m_ccbSubsection.SelectString(-1, m_pNPC->m_csSubsection);
this->m_ceDescription.SetWindowText(m_pNPC->m_csDescription);
if ( this->m_ccbIcon.SelectString(-1, m_pNPC->m_csIcon) == -1 )
--- 417,420 ----
***************
*** 701,705 ****
void CNPCEditDlg::FillResources()
{
! FillItemCategoryTree();
PopulateResources();
this->m_clcAttrSelection.InsertColumn(0, locale->String(IDS_GENERIC_RESOURCES), LVCFMT_LEFT, 190, 0);
--- 649,653 ----
void CNPCEditDlg::FillResources()
{
! FillCategoryTree(&m_ctcAttrCategories, m_pItemCategories);
PopulateResources();
this->m_clcAttrSelection.InsertColumn(0, locale->String(IDS_GENERIC_RESOURCES), LVCFMT_LEFT, 190, 0);
***************
*** 742,746 ****
void CNPCEditDlg::FillLoot()
{
! FillItemCategoryTree();
this->m_clcAttrSelection.InsertColumn(0, locale->String(IDS_GENERIC_LOOTITEMS), LVCFMT_LEFT, 130, 0);
this->m_clcAttrSelection.InsertColumn(1, _T("#"), LVCFMT_LEFT, 35, 1);
--- 690,694 ----
void CNPCEditDlg::FillLoot()
{
! FillCategoryTree(&m_ctcAttrCategories, m_pItemCategories);
this->m_clcAttrSelection.InsertColumn(0, locale->String(IDS_GENERIC_LOOTITEMS), LVCFMT_LEFT, 130, 0);
this->m_clcAttrSelection.InsertColumn(1, _T("#"), LVCFMT_LEFT, 35, 1);
***************
*** 753,757 ****
void CNPCEditDlg::FillBuyItems()
{
! FillItemCategoryTree();
PopulateVendorTemplates(true);
this->m_clcAttrSelection.InsertColumn(0, locale->String(IDS_GENERIC_BUYITEMS), LVCFMT_LEFT, 150, 0);
--- 701,705 ----
void CNPCEditDlg::FillBuyItems()
{
! FillCategoryTree(&m_ctcAttrCategories, m_pItemCategories);
PopulateVendorTemplates(true);
this->m_clcAttrSelection.InsertColumn(0, locale->String(IDS_GENERIC_BUYITEMS), LVCFMT_LEFT, 150, 0);
***************
*** 763,767 ****
void CNPCEditDlg::FillSellItems()
{
! FillItemCategoryTree();
PopulateVendorTemplates(false);
this->m_clcAttrSelection.InsertColumn(0, locale->String(IDS_GENERIC_SELLITEMS), LVCFMT_LEFT, 150, 0);
--- 711,715 ----
void CNPCEditDlg::FillSellItems()
{
! FillCategoryTree(&m_ctcAttrCategories, m_pItemCategories);
PopulateVendorTemplates(false);
this->m_clcAttrSelection.InsertColumn(0, locale->String(IDS_GENERIC_SELLITEMS), LVCFMT_LEFT, 150, 0);
***************
*** 1028,1041 ****
}
! void CNPCEditDlg::FillItemCategoryTree()
{
! m_ctcAttrCategories.DeleteAllItems();
! FillItemCategoryNode(m_pItemCategories, NULL);
}
! void CNPCEditDlg::FillItemCategoryNode(CCategoryTree * pCategory, HTREEITEM hParent)
{
HTREEITEM hItem;
! if ( pCategory != m_pItemCategories )
{
// Insert this guy first
--- 976,991 ----
}
! void CNPCEditDlg::FillCategoryTree(CTreeCtrl * pCtrl, CCategoryTree * pCategory)
{
! pCtrl->DeleteAllItems();
! FillCategoryNode(pCtrl, pCategory, NULL);
}
! void CNPCEditDlg::FillCategoryNode(CTreeCtrl * pCtrl, CCategoryTree * pCategory, HTREEITEM hParent)
{
+ if ( pCategory == NULL )
+ return;
HTREEITEM hItem;
! if ( pCategory != m_pNPCCategories && pCategory != m_pItemCategories )
{
// Insert this guy first
***************
*** 1046,1051 ****
InsertItem.hParent = hParent;
InsertItem.hInsertAfter = TVI_SORT;
! hItem = m_ctcAttrCategories.InsertItem(&InsertItem);
! m_ctcAttrCategories.SetItemData(hItem, (DWORD_PTR) pCategory);
}
else
--- 996,1001 ----
InsertItem.hParent = hParent;
InsertItem.hInsertAfter = TVI_SORT;
! hItem = pCtrl->InsertItem(&InsertItem);
! pCtrl->SetItemData(hItem, (DWORD_PTR) pCategory);
}
else
***************
*** 1056,1060 ****
CCategoryTree * pTree = pCategory->GetChild(i);
if ( pTree )
! FillItemCategoryNode(pTree, hItem);
}
}
--- 1006,1010 ----
CCategoryTree * pTree = pCategory->GetChild(i);
if ( pTree )
! FillCategoryNode(pCtrl, pTree, hItem);
}
}
***************
*** 1579,1589 ****
this->m_ctcAttrCategories.EnableWindow(bEnable);
this->m_cbAddCategory.EnableWindow(bEnable);
- this->m_cbAddSubsection.EnableWindow(bEnable);
this->m_ccbCategory.EnableWindow(bEnable);
- this->m_ccbSubsection.EnableWindow(bEnable);
this->m_ceDescription.EnableWindow(bEnable);
this->m_cbOK.EnableWindow(!bEnable);
this->m_cbCancel.EnableWindow(!bEnable);
- this->m_ccbNPCEntry.EnableWindow(!bEnable);
this->m_cbNoIndex.EnableWindow(bEnable);
--- 1529,1536 ----
***************
*** 1603,1609 ****
CString csCaption;
csCaption.Format(_T("%s [%s]"), m_pNPC->m_csDescription, m_pNPC->m_csValue);
- int index = this->m_ccbNPCEntry.AddString(csCaption);
- this->m_ccbNPCEntry.SetItemDataPtr(index, (void *) m_pNPC);
- this->m_ccbNPCEntry.SelectString(-1, csCaption);
Main->m_pScripts->m_aNPCs.Insert(m_pNPC);
}
--- 1550,1553 ----
***************
*** 1656,1708 ****
m_ccbCategory.SetItemData(iIndex, (DWORD_PTR) pCategory);
m_ccbCategory.SetCurSel(iIndex);
- this->OnSelchangeNpccategory();
}
return;
}
- void CNPCEditDlg::OnNpcaddsubsection()
- {
- // Subsections don't exist anymore.
- }
-
- void CNPCEditDlg::OnSelchangeNpccategory()
- {
- CString csCategory;
- int iSel = this->m_ccbCategory.GetCurSel();
- if (iSel == -1)
- {
- m_ccbSubsection.ResetContent();
- m_ccbSubsection.SetCurSel(-1);
- return;
- }
- m_ccbCategory.GetLBText(iSel, csCategory);
- if ( (csCategory != _T("")))
- {
- m_ccbSubsection.ResetContent();
- int iSel = m_ccbCategory.GetCurSel();
- if (iSel == -1)
- return;
- CCategory * pCategory = (CCategory *) m_ccbCategory.GetItemData(iSel);
- if (pCategory == NULL)
- return;
- if (!pCategory->m_SubsectionList.IsEmpty())
- {
- POSITION pos = pCategory->m_SubsectionList.GetHeadPosition();
- while (pos != NULL)
- {
- CSubsection * pSubsection = (CSubsection *) pCategory->m_SubsectionList.GetNext(pos);
- int iIndex = m_ccbSubsection.AddString(pSubsection->m_csName);
- m_ccbSubsection.SetItemData(iIndex, (DWORD_PTR) pSubsection);
- }
- }
- m_ccbSubsection.SetCurSel(0);
- }
- else
- {
- m_ccbSubsection.ResetContent();
- m_ccbSubsection.SetCurSel(-1);
- }
- }
-
void CNPCEditDlg::OnOK()
{
--- 1600,1607 ----
***************
*** 1853,1857 ****
this->m_ccbIcon.GetWindowText(m_pNPC->m_csIcon);
this->m_ccbSound.GetWindowText(m_pNPC->m_csSound);
- this->m_ccbSubsection.GetWindowText(m_pNPC->m_csSubsection);
// Get the skill values;
CString csValue;
--- 1752,1755 ----
***************
*** 1989,1994 ****
this->m_ccbIcon.SetWindowText(pNPC->m_csIcon);
this->m_ccbSound.SetWindowText(pNPC->m_csSound);
- if ( !m_cbDisableDisplay.GetCheck() )
- DrawNPC();
}
--- 1887,1890 ----
***************
*** 2015,2052 ****
int iState = this->m_cbNoIndex.GetCheck();
this->m_ccbCategory.EnableWindow( iState ? TRUE : FALSE );
- this->m_ccbSubsection.EnableWindow( iState ? TRUE : FALSE );
this->m_ceDescription.EnableWindow( iState ? TRUE : FALSE );
this->m_cbAddCategory.EnableWindow( iState ? TRUE : FALSE );
- this->m_cbAddSubsection.EnableWindow( iState ? TRUE : FALSE );
- }
-
- void CNPCEditDlg::OnNpcdisabledisplay()
- {
- int iState = this->m_cbDisableDisplay.GetCheck();
- // Save this value in the registry.
- HKEY hKey;
- LONG lStatus;
- DWORD dwDisp, dwVal;
- dwVal = m_cbDisableDisplay.GetCheck();
- lStatus = RegCreateKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Menasoft\\GM Tools"), 0, NULL, REG_OPTION_NON_VOLATILE,
- KEY_ALL_ACCESS, NULL, &hKey, &dwDisp);
- if (lStatus == ERROR_SUCCESS)
- lStatus = RegSetValueEx(hKey, _T("DisableNPCDisplay"), 0, REG_DWORD, ((BYTE *) &dwVal), sizeof(DWORD));
- RegCloseKey(hKey);
- this->DrawNPC();
- }
-
- void CNPCEditDlg::DrawNPC()
- {
}
void CNPCEditDlg::OnEditchangeNpcolour()
{
- DrawNPC();
}
void CNPCEditDlg::OnSelchangeNpcolour()
{
- DrawNPC();
}
--- 1911,1924 ----
***************
*** 2124,2134 ****
locale->LocalizeWindow(IDD, IDC_NPCIMAGE, (CWnd*)&m_Display, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_NPCNOINDEX, (CWnd*)&m_cbNoIndex, (CWnd*)this);
- locale->LocalizeWindow(IDD, IDC_NPCDISABLEDISPLAY, (CWnd*)&m_cbDisableDisplay, (CWnd*)this);
locale->LocalizeWindow(IDD, IDOK, (CWnd*)&m_cbOK, (CWnd*)this);
locale->LocalizeWindow(IDD, IDCANCEL, (CWnd*)&m_cbCancel, (CWnd*)this);
- locale->LocalizeWindow(IDD, IDC_NPCADDSUBSECTION, (CWnd*)&m_cbAddSubsection, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_NPCADDCATEGORY, (CWnd*)&m_cbAddCategory, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_NPCEDITDESCRIPTION, (CWnd*)&m_ceDescription, (CWnd*)this);
- locale->LocalizeWindow(IDD, IDC_NPCSUBSECTION, (CWnd*)&m_ccbSubsection, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_NPCCATEGORY, (CWnd*)&m_ccbCategory, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_NPCATTRREMOVE, (CWnd*)&m_cbAttrRemove, (CWnd*)this);
--- 1996,2003 ----
***************
*** 2157,2162 ****
locale->LocalizeWindow(IDD, IDC_NPCNAMEINDEX, (CWnd*)&m_ccbNameIndex, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_NPCNAME, (CWnd*)&m_ceName, (CWnd*)this);
- locale->LocalizeWindow(IDD, IDC_NPCENTRY, (CWnd*)&m_ccbNPCEntry, (CWnd*)this);
- locale->LocalizeWindow(IDD, IDC_NE_STATIC1, (CWnd*)&m_sStatic1, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_NE_STATIC2, (CWnd*)&m_sStatic2, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_NE_STATIC3, (CWnd*)&m_sStatic3, (CWnd*)this);
--- 2026,2029 ----
***************
*** 2175,2179 ****
locale->LocalizeWindow(IDD, IDC_NE_STATIC16, (CWnd*)&m_sStatic16, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_NE_STATIC17, (CWnd*)&m_sStatic17, (CWnd*)this);
- locale->LocalizeWindow(IDD, IDC_NE_STATIC18, (CWnd*)&m_sStatic18, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_NE_STATIC19, (CWnd*)&m_sStatic19, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_NE_STATIC20, (CWnd*)&m_sStatic20, (CWnd*)this);
--- 2042,2045 ----
***************
*** 2181,2183 ****
--- 2047,2162 ----
locale->LocalizeWindow(IDD, IDC_NE_GMISC, (CWnd*)&m_sGroupMisc, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_NE_GCLASS, (CWnd*)&m_sGroupClass, (CWnd*)this);
+ locale->LocalizeWindow(IDD, IDC_NPCTREE, (CWnd*)&m_tcNPCTree, (CWnd*)this);
+ locale->LocalizeWindow(IDD, IDC_NPCLIST, (CWnd*)&m_lcNPCList, (CWnd*)this);
+ }
+
+ void CNPCEditDlg::OnTvnSelchangedNpctree(NMHDR *pNMHDR, LRESULT *pResult)
+ {
+ NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR;
+
+ m_lcNPCList.SetHotItem(-1);
+
+ HTREEITEM hSelectedItem = NULL;
+ HTREEITEM hParentItem = NULL;
+ m_lcNPCList.DeleteAllItems();
+ m_Display.SetArtIndex(-1);
+ m_Display.SetArtColor(0);
+
+ // Do the bold/nobold thing
+ if (pNMTreeView != NULL)
+ {
+ HTREEITEM hOldItem = pNMTreeView->itemOld.hItem;
+ if (hOldItem != NULL)
+ m_tcNPCTree.SetItemState(hOldItem, 0, TVIS_BOLD);
+ }
+
+ hSelectedItem = m_tcNPCTree.GetSelectedItem();
+ m_tcNPCTree.SetItemState(hSelectedItem, TVIS_BOLD, TVIS_BOLD);
+
+ CCategoryTree * pCategory =(CCategoryTree *) m_tcNPCTree.GetItemData(hSelectedItem);
+
+ int iCount = 0;
+ for ( int i = 0; i < pCategory->EntryCount(); i++ )
+ {
+ int iIndex = pCategory->GetEntry(i);
+ if ( iIndex == -1 )
+ continue;
+ CString sDescription, sID;
+ sDescription = Main->m_pScripts->CharDescription(iIndex);
+ if ( sDescription == _T("") )
+ sDescription = _T("<unnamed>");
+ sID = Main->m_pScripts->CharID(iIndex);
+ m_lcNPCList.InsertItem(iCount, sDescription, 0);
+ m_lcNPCList.SetItemText(iCount, 1, sID);
+ m_lcNPCList.SetItemData(iCount, iIndex);
+ iCount++;
+ }
+
+ iNPCNameSort = 1;
+ iNPCIDSort = 1;
+ m_lcNPCList.SortItems(NPCCompareFunc, 1); // Sort by NPCID initially
+ iNPCNameSort = -1;
+ }
+
+ int CALLBACK CNPCEditDlg::NPCCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort)
+ {
+ CString sID1, sID2;
+ CString sDesc1, sDesc2;
+
+ sID1 = Main->m_pScripts->CharID((ULONG)lParam1);
+ sID2 = Main->m_pScripts->CharID((ULONG)lParam2);
+ sDesc1 = Main->m_pScripts->CharDescription((ULONG)lParam1);
+ sDesc2 = Main->m_pScripts->CharDescription((ULONG)lParam2);
+
+ if (lParamSort == 0)
+ {
+ if (iNPCNameSort == 0)
+ return (lParam1 < lParam2 ? 1 : -1);
+ if (iNPCNameSort == 1)
+ return (sDesc1 < sDesc2 ? -1 : 1);
+ if (iNPCNameSort == -1)
+ return (sDesc1 < sDesc2 ? 1 : -1);
+ }
+ else
+ {
+ if (iNPCIDSort == 0)
+ return (lParam1 < lParam2 ? 1 : -1);
+ if (iNPCIDSort == 1)
+ return (sID1 < sID2 ? -1 : 1);
+ if (iNPCIDSort == -1)
+ return (sID1 < sID2 ? 1 : -1);
+ }
+ return 0;
+ }
+
+
+ void CNPCEditDlg::OnLvnItemchangedNpclist(NMHDR *pNMHDR, LRESULT *pResult)
+ {
+ LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
+
+ if (pNMLV->uNewState & LVNI_SELECTED)
+ {
+ // this is the one that has been selected
+ int iSelIndex = this->m_lcNPCList.GetNextItem(-1, LVNI_SELECTED);
+ if (iSelIndex == -1)
+ {
+ m_Display.SetArtIndex(-1);
+ m_Display.SetArtColor(0);
+ return;
+ }
+ this->m_lcNPCList.SetHotItem(iSelIndex);
+
+ int index = (int) m_lcNPCList.GetItemData(iSelIndex);
+ CString sColor, sDispID;
+ sColor = Main->m_pScripts->CharColor(index);
+ sDispID = Main->m_pScripts->CharDispID(index);
+ {
+ m_Display.SetArtIndex(ahextoi(sDispID) == 0 ? Main->m_pScripts->EvaluateDef(sDispID) : ahextoi(sDispID));
+ m_Display.SetArtColor((WORD)Main->m_pScripts->EvaluateDef(sColor));
+ }
+
+ return;
+ }
+
+ *pResult = 0;
}
Index: npceditdlg.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/npceditdlg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** npceditdlg.h 17 Jul 2003 22:09:06 -0000 1.3
--- npceditdlg.h 24 Jul 2003 06:00:06 -0000 1.4
***************
*** 33,36 ****
--- 33,37 ----
#include "CategoryTree.h"
#include "uoart.h"
+ #include "afxcmn.h"
/////////////////////////////////////////////////////////////////////////////
***************
*** 53,63 ****
CUOArt m_Display;
CButton m_cbNoIndex;
- CButton m_cbDisableDisplay;
CButton m_cbOK;
CButton m_cbCancel;
- CButton m_cbAddSubsection;
CButton m_cbAddCategory;
CEdit m_ceDescription;
- CComboBox m_ccbSubsection;
CComboBox m_ccbCategory;
CButton m_cbAttrRemove;
--- 54,61 ----
***************
*** 86,90 ****
CComboBox m_ccbNameIndex;
CEdit m_ceName;
- CComboBox m_ccbNPCEntry;
CStatic m_sStatic1;
CStatic m_sStatic2;
--- 84,87 ----
***************
*** 110,113 ****
--- 107,112 ----
CStatic m_sGroupMisc;
CStatic m_sGroupClass;
+ CTreeCtrl m_tcNPCTree;
+ CListCtrl m_lcNPCList;
//}}AFX_DATA
***************
*** 122,126 ****
// Implementation
protected:
- void DrawNPC();
void EnableEditWindows(bool bEnable);
void PopulateVendorTemplates(bool bBuy);
--- 121,124 ----
***************
*** 205,210 ****
void ClearItemCategories();
void ClearNPCCategories();
! void FillItemCategoryTree();
! void FillItemCategoryNode(CCategoryTree * pCategory, HTREEITEM hParent);
bool m_bNewItem;
int m_iEdits;
--- 203,208 ----
void ClearItemCategories();
void ClearNPCCategories();
! void FillCategoryTree(CTreeCtrl *pCtrl, CCategoryTree * pCategory);
! void FillCategoryNode(CTreeCtrl *pCtrl, CCategoryTree * pCategory, HTREEITEM hParent);
bool m_bNewItem;
int m_iEdits;
***************
*** 213,217 ****
//{{AFX_MSG(CNPCEditDlg)
virtual BOOL OnInitDialog();
- afx_msg void OnSelchangeNpcentry();
afx_msg void OnNpcpalette();
afx_msg void OnSelchangeNpcattrlist();
--- 211,214 ----
***************
*** 227,232 ****
afx_msg void OnEditnpc();
afx_msg void OnNpcaddcategory();
- afx_msg void OnNpcaddsubsection();
- afx_msg void OnSelchangeNpccategory();
virtual void OnOK();
virtual void OnCancel();
--- 224,227 ----
***************
*** 236,247 ****
afx_msg void OnSelchangeNpcbaseid();
afx_msg void OnNpcnoindex();
- afx_msg void OnNpcdisabledisplay();
afx_msg void OnEditchangeNpcolour();
afx_msg void OnSelchangeNpcolour();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
private:
public:
void Localize(void);
};
--- 231,248 ----
afx_msg void OnSelchangeNpcbaseid();
afx_msg void OnNpcnoindex();
afx_msg void OnEditchangeNpcolour();
afx_msg void OnSelchangeNpcolour();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
+
+ static int iNPCIDSort;
+ static int iNPCNameSort;
+ static int CALLBACK NPCCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort);
+
private:
public:
void Localize(void);
+ afx_msg void OnTvnSelchangedNpctree(NMHDR *pNMHDR, LRESULT *pResult);
+ afx_msg void OnLvnItemchangedNpclist(NMHDR *pNMHDR, LRESULT *pResult);
};
Index: Resource.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Resource.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** Resource.h 23 Jul 2003 19:10:57 -0000 1.12
--- Resource.h 24 Jul 2003 06:00:06 -0000 1.13
***************
*** 1,25 ****
- /*
- $Id$
-
- **********************************************************************
- * Copyright (C) Philip A. Esterle 1998-2003
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- *
- **********************************************************************
-
- */
-
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
--- 1,2 ----
***************
*** 102,107 ****
--- 79,87 ----
#define IDC_TREE1 235
#define IDC_ITEMTREE 235
+ #define IDC_NPCTREE 235
#define IDC_ITEMLIST 236
#define IDI_UPARROW 237
+ #define IDC_LIST1 237
+ #define IDC_NPCLIST 237
#define IDI_DOWNARROW 238
#define IDC_TRIGEDIT 1001
***************
*** 715,719 ****
#define _APS_NEXT_RESOURCE_VALUE 206
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 237
#define _APS_NEXT_SYMED_VALUE 104
#endif
--- 695,699 ----
#define _APS_NEXT_RESOURCE_VALUE 206
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 238
#define _APS_NEXT_SYMED_VALUE 104
#endif
Index: S_Sphere52.rc
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/S_Sphere52.rc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** S_Sphere52.rc 21 Jul 2003 14:13:57 -0000 1.14
--- S_Sphere52.rc 24 Jul 2003 06:00:06 -0000 1.15
***************
*** 267,371 ****
CONTROL "",IDC_ITEMTREE,"SysTreeView32",TVS_HASBUTTONS |
TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS |
! WS_BORDER | WS_TABSTOP, 7,7,167,91
CONTROL "",IDC_ITEMLIST,"SysListView32",LVS_REPORT |
LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,176,7,162,91
END
! IDD_NPCEDIT_DLG DIALOGEX 0, 0, 494, 341
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "NPC Editor"
FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
! COMBOBOX IDC_NPCENTRY,47,7,154,157,CBS_DROPDOWNLIST | WS_VSCROLL |
! WS_TABSTOP
! PUSHBUTTON "New",IDC_NEWNPC,204,7,44,12
! PUSHBUTTON "Edit",IDC_EDITNPC,251,7,44,12
! PUSHBUTTON "Apply Edits",IDC_APPLYNPCEDITS,298,7,44,12,NOT
WS_VISIBLE
! PUSHBUTTON "Cancel Edits",IDC_CANCELNPCEDITS,345,7,44,12,NOT
WS_VISIBLE
! EDITTEXT IDC_NPCNAME,71,30,102,14,ES_AUTOHSCROLL | WS_DISABLED
! COMBOBOX IDC_NPCNAMEINDEX,71,46,102,52,CBS_DROPDOWNLIST |
CBS_SORT | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! COMBOBOX IDC_NPCSOUND,71,61,102,57,CBS_DROPDOWN | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! COMBOBOX IDC_NPCBASEID,71,75,102,60,CBS_DROPDOWNLIST | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! COMBOBOX IDC_NPCOLOUR,71,90,86,49,CBS_DROPDOWN | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! PUSHBUTTON "",IDC_NPCPALETTE,160,90,13,13,BS_ICON | BS_CENTER |
BS_VCENTER | WS_DISABLED
! COMBOBOX IDC_NPCICON,71,105,102,51,CBS_DROPDOWN | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! COMBOBOX IDC_NPCBRAIN,71,121,102,53,CBS_DROPDOWNLIST | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! EDITTEXT IDC_NPCDEFNAME,71,135,102,14,ES_AUTOHSCROLL |
WS_DISABLED
! EDITTEXT IDC_NPCDESIRES,71,150,102,14,ES_AUTOHSCROLL |
WS_DISABLED
! EDITTEXT IDC_NPCSPEECH,71,165,102,14,ES_AUTOHSCROLL | WS_DISABLED
! EDITTEXT IDC_NPCEVENTS,71,180,102,14,ES_AUTOHSCROLL | WS_DISABLED
CONTROL "List5",IDC_NPCATTRIBUTES,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_NOSORTHEADER | WS_DISABLED |
! WS_BORDER | WS_TABSTOP,178,32,114,58
CONTROL "List6",IDC_SKILLS,"SysListView32",LVS_REPORT |
LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_DISABLED |
! WS_BORDER | WS_TABSTOP,178,95,114,99
CONTROL "No Axis index",IDC_NPCNOINDEX,"Button",BS_AUTOCHECKBOX |
! BS_MULTILINE | WS_DISABLED | WS_TABSTOP,437,116,41,24
! COMBOBOX IDC_NPCCATEGORY,342,150,122,52,CBS_DROPDOWNLIST |
! CBS_SORT | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! PUSHBUTTON "Add",IDC_NPCADDCATEGORY,465,150,18,12,WS_DISABLED
! COMBOBOX IDC_NPCSUBSECTION,342,165,122,59,CBS_DROPDOWNLIST |
CBS_SORT | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! PUSHBUTTON "Add",IDC_NPCADDSUBSECTION,465,165,18,12,WS_DISABLED
! EDITTEXT IDC_NPCEDITDESCRIPTION,342,180,141,12,ES_AUTOHSCROLL |
WS_DISABLED
! LISTBOX IDC_NPCATTRLIST,12,217,64,112,LBS_NOINTEGRALHEIGHT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
CONTROL "Tree1",IDC_NPCATTRCATS,"SysTreeView32",TVS_HASBUTTONS |
TVS_HASLINES | TVS_LINESATROOT | WS_DISABLED | WS_BORDER |
! WS_TABSTOP,79,217,100,112
! LISTBOX IDC_NPCATTRCHOICES,181,217,106,112,LBS_SORT |
LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_DISABLED |
WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
CONTROL "List2",IDC_NPCATTRSELECTION,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_NOSORTHEADER | WS_DISABLED |
! WS_BORDER | WS_TABSTOP,290,217,191,97
! EDITTEXT IDC_NPCATTRAMOUNT,321,317,33,12,ES_AUTOHSCROLL |
WS_DISABLED
! PUSHBUTTON "Add",IDC_NPCATTRADD,407,317,35,12,WS_DISABLED
! PUSHBUTTON "Remove",IDC_NPCATTRREMOVE,444,317,35,12,WS_DISABLED
! CONTROL "Disable Display",IDC_NPCDISABLEDISPLAY,"Button",
! BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,437,42,37,20
DEFPUSHBUTTON "OK",IDOK,437,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,437,24,50,14
! GROUPBOX "Axis Classification",IDC_NE_GCLASS,299,139,188,60
! LTEXT "NPC Entry",IDC_NE_STATIC1,7,9,34,8
! GROUPBOX "Attributes",IDC_NE_GATTR,7,23,290,176
! LTEXT "Name",IDC_NE_STATIC2,14,33,20,8
! LTEXT "Name Index",IDC_NE_STATIC3,14,48,39,8
! LTEXT "Sound",IDC_NE_STATIC4,14,63,22,8
! LTEXT "Tracking Icon",IDC_NE_STATIC7,14,108,45,8
! LTEXT "Brain",IDC_NE_STATIC8,14,123,17,8
! LTEXT "DefName",IDC_NE_STATIC9,14,138,31,8
! LTEXT "Desires",IDC_NE_STATIC10,14,153,24,8
! LTEXT "Basic Speech",IDC_NE_STATIC11,14,168,45,8
! LTEXT "Basic Events",IDC_NE_STATIC12,14,183,42,8
! LTEXT "Creature Base",IDC_NE_STATIC5,14,78,46,8
! LTEXT "Colour",IDC_NE_STATIC6,14,93,21,8
! GROUPBOX "Miscellaneous Attributes",IDC_NE_GMISC,7,199,480,135
! LTEXT "Attributes",IDC_NE_STATIC13,14,208,30,8
! LTEXT "Categories",IDC_NE_STATIC14,79,208,34,8
! LTEXT "Choices\t\t(D-Click to Add)",IDC_NE_STATIC15,182,208,
103,8
LTEXT "Selections\t\t\t\t(D-Click to Edit)",IDC_NE_STATIC16,
! 290,208,189,8
! LTEXT "Amount",IDC_NE_STATIC20,292,319,25,8
! LTEXT "Category",IDC_NE_STATIC17,304,152,29,8
! LTEXT "Subsection",IDC_NE_STATIC18,304,167,36,8
! LTEXT "Description",IDC_NE_STATIC19,304,182,36,8
CONTROL "",IDC_NPCIMAGE,"{0904F7B3-2339-44C9-857C-6EB6CFEFA3B6}",
! WS_TABSTOP,300,27,135,110
END
--- 267,367 ----
CONTROL "",IDC_ITEMTREE,"SysTreeView32",TVS_HASBUTTONS |
TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS |
! WS_BORDER | WS_TABSTOP,7,7,167,91
CONTROL "",IDC_ITEMLIST,"SysListView32",LVS_REPORT |
LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,176,7,162,91
END
! IDD_NPCEDIT_DLG DIALOGEX 0, 0, 494, 418
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "NPC Editor"
FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
! PUSHBUTTON "New",IDC_NEWNPC,437,45,50,14
! PUSHBUTTON "Edit",IDC_EDITNPC,437,58,50,14
! PUSHBUTTON "Apply Edits",IDC_APPLYNPCEDITS,437,71,50,14,NOT
WS_VISIBLE
! PUSHBUTTON "Cancel Edits",IDC_CANCELNPCEDITS,437,85,50,14,NOT
WS_VISIBLE
! EDITTEXT IDC_NPCNAME,71,106,102,14,ES_AUTOHSCROLL | WS_DISABLED
! COMBOBOX IDC_NPCNAMEINDEX,71,122,102,52,CBS_DROPDOWNLIST |
CBS_SORT | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! COMBOBOX IDC_NPCSOUND,71,137,102,57,CBS_DROPDOWN | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! COMBOBOX IDC_NPCBASEID,71,151,102,60,CBS_DROPDOWNLIST | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! COMBOBOX IDC_NPCOLOUR,71,166,86,49,CBS_DROPDOWN | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! PUSHBUTTON "",IDC_NPCPALETTE,160,166,13,13,BS_ICON | BS_CENTER |
BS_VCENTER | WS_DISABLED
! COMBOBOX IDC_NPCICON,71,182,102,51,CBS_DROPDOWN | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! COMBOBOX IDC_NPCBRAIN,71,198,102,53,CBS_DROPDOWNLIST | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! EDITTEXT IDC_NPCDEFNAME,71,211,102,14,ES_AUTOHSCROLL |
WS_DISABLED
! EDITTEXT IDC_NPCDESIRES,71,226,102,14,ES_AUTOHSCROLL |
WS_DISABLED
! EDITTEXT IDC_NPCSPEECH,71,241,102,14,ES_AUTOHSCROLL | WS_DISABLED
! EDITTEXT IDC_NPCEVENTS,71,257,102,14,ES_AUTOHSCROLL | WS_DISABLED
CONTROL "List5",IDC_NPCATTRIBUTES,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_NOSORTHEADER | WS_DISABLED |
! WS_BORDER | WS_TABSTOP,178,108,114,58
CONTROL "List6",IDC_SKILLS,"SysListView32",LVS_REPORT |
LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_DISABLED |
! WS_BORDER | WS_TABSTOP,178,171,114,99
CONTROL "No Axis index",IDC_NPCNOINDEX,"Button",BS_AUTOCHECKBOX |
! BS_MULTILINE | WS_DISABLED | WS_TABSTOP,304,263,59,10
! COMBOBOX IDC_NPCCATEGORY,342,232,122,52,CBS_DROPDOWNLIST |
CBS_SORT | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! PUSHBUTTON "Add",IDC_NPCADDCATEGORY,465,232,18,12,WS_DISABLED
! EDITTEXT IDC_NPCEDITDESCRIPTION,342,246,141,12,ES_AUTOHSCROLL |
WS_DISABLED
! LISTBOX IDC_NPCATTRLIST,12,296,64,112,LBS_NOINTEGRALHEIGHT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
CONTROL "Tree1",IDC_NPCATTRCATS,"SysTreeView32",TVS_HASBUTTONS |
TVS_HASLINES | TVS_LINESATROOT | WS_DISABLED | WS_BORDER |
! WS_TABSTOP,79,296,100,112
! LISTBOX IDC_NPCATTRCHOICES,181,296,106,112,LBS_SORT |
LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_DISABLED |
WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
CONTROL "List2",IDC_NPCATTRSELECTION,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_NOSORTHEADER | WS_DISABLED |
! WS_BORDER | WS_TABSTOP,290,296,191,97
! EDITTEXT IDC_NPCATTRAMOUNT,321,396,33,12,ES_AUTOHSCROLL |
WS_DISABLED
! PUSHBUTTON "Add",IDC_NPCATTRADD,407,396,35,12,WS_DISABLED
! PUSHBUTTON "Remove",IDC_NPCATTRREMOVE,444,396,35,12,WS_DISABLED
DEFPUSHBUTTON "OK",IDOK,437,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,437,24,50,14
! GROUPBOX "Axis Classification",IDC_NE_GCLASS,299,220,188,54
! GROUPBOX "Attributes",IDC_NE_GATTR,7,99,290,176
! LTEXT "Name",IDC_NE_STATIC2,14,110,20,8
! LTEXT "Name Index",IDC_NE_STATIC3,14,124,39,8
! LTEXT "Sound",IDC_NE_STATIC4,14,139,22,8
! LTEXT "Tracking Icon",IDC_NE_STATIC7,14,185,45,8
! LTEXT "Brain",IDC_NE_STATIC8,14,199,17,8
! LTEXT "DefName",IDC_NE_STATIC9,14,214,31,8
! LTEXT "Desires",IDC_NE_STATIC10,14,230,24,8
! LTEXT "Basic Speech",IDC_NE_STATIC11,14,244,45,8
! LTEXT "Basic Events",IDC_NE_STATIC12,14,259,42,8
! LTEXT "Creature Base",IDC_NE_STATIC5,14,154,46,8
! LTEXT "Colour",IDC_NE_STATIC6,14,169,21,8
! GROUPBOX "Miscellaneous Attributes",IDC_NE_GMISC,7,276,480,135
! LTEXT "Attributes",IDC_NE_STATIC13,14,287,30,8
! LTEXT "Categories",IDC_NE_STATIC14,79,287,34,8
! LTEXT "Choices\t\t(D-Click to Add)",IDC_NE_STATIC15,182,287,
103,8
LTEXT "Selections\t\t\t\t(D-Click to Edit)",IDC_NE_STATIC16,
! 290,287,189,8
! LTEXT "Amount",IDC_NE_STATIC20,292,398,25,8
! LTEXT "Category",IDC_NE_STATIC17,304,234,29,8
! LTEXT "Description",IDC_NE_STATIC19,304,248,36,8
CONTROL "",IDC_NPCIMAGE,"{0904F7B3-2339-44C9-857C-6EB6CFEFA3B6}",
! WS_TABSTOP,300,102,187,110
! CONTROL "",IDC_NPCTREE,"SysTreeView32",TVS_HASBUTTONS |
! TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS |
! WS_BORDER | WS_TABSTOP,7,7,176,89
! CONTROL "",IDC_NPCLIST,"SysListView32",LVS_REPORT |
! LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,184,7,245,90
END
***************
*** 1240,1244 ****
RIGHTMARGIN, 487
TOPMARGIN, 7
! BOTTOMMARGIN, 334
END
--- 1236,1240 ----
RIGHTMARGIN, 487
TOPMARGIN, 7
! BOTTOMMARGIN, 411
END
***************
*** 1509,1513 ****
BEGIN
IDC_NPCIMAGE, 0x376, 28, 0
! 0x0000, 0x0000, 0x0000, 0x0001, 0x14fb, 0x0000, 0x1280, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0
--- 1505,1509 ----
BEGIN
IDC_NPCIMAGE, 0x376, 28, 0
! 0x0000, 0x0000, 0x0000, 0x0001, 0x1d0b, 0x0000, 0x1280, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0
|
|
From: Philip E. <pes...@us...> - 2003-07-24 06:00:08
|
Update of /cvsroot/sphere-axis/Axis
In directory sc8-pr-cvs1:/tmp/cvs-serv11511
Modified Files:
axis_enu.xml itemgentab.cpp
Log Message:
no message
Index: axis_enu.xml
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/axis_enu.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** axis_enu.xml 21 Jul 2003 14:13:56 -0000 1.6
--- axis_enu.xml 24 Jul 2003 06:00:04 -0000 1.7
***************
*** 505,565 ****
</Dialog>
<Dialog ID="151" Caption="NPC Editor">
! <Item ID="1335" type="COMBOBOX" geometry="47,7,154,157"></Item>
! <Item ID="1003" type="PUSHBUTTON" geometry="204,7,44,12">"New"</Item>
! <Item ID="1004" type="PUSHBUTTON" geometry="251,7,44,12">"Edit"</Item>
! <Item ID="1005" type="PUSHBUTTON" geometry="298,7,44,12">"Apply Edits"</Item>
! <Item ID="1006" type="PUSHBUTTON" geometry="345,7,44,12">"Cancel Edits"</Item>
! <Item ID="1059" type="EDITTEXT" geometry="71,30,102,14"></Item>
! <Item ID="1339" type="COMBOBOX" geometry="71,46,102,52"></Item>
! <Item ID="1340" type="COMBOBOX" geometry="71,61,102,57"></Item>
! <Item ID="1341" type="COMBOBOX" geometry="71,75,102,60"></Item>
! <Item ID="1342" type="COMBOBOX" geometry="71,90,86,49"></Item>
! <Item ID="1008" type="PUSHBUTTON" geometry="160,90,13,13">""</Item>
! <Item ID="1210" type="COMBOBOX" geometry="71,105,102,51"></Item>
! <Item ID="1345" type="COMBOBOX" geometry="71,121,102,53"></Item>
! <Item ID="1060" type="EDITTEXT" geometry="71,135,102,14"></Item>
! <Item ID="1062" type="EDITTEXT" geometry="71,150,102,14"></Item>
! <Item ID="1063" type="EDITTEXT" geometry="71,165,102,14"></Item>
! <Item ID="1064" type="EDITTEXT" geometry="71,180,102,14"></Item>
! <Item ID="1337" type="CONTROL" geometry="178,32,114,58">"List5"</Item>
! <Item ID="1061" type="CONTROL" geometry="178,95,114,99">"List6"</Item>
! <Item ID="1035" type="CONTROL" geometry="437,116,41,24">"No Axis index"</Item>
! <Item ID="1221" type="COMBOBOX" geometry="342,150,122,52"></Item>
! <Item ID="1007" type="PUSHBUTTON" geometry="465,150,18,12">"Add"</Item>
! <Item ID="1222" type="COMBOBOX" geometry="342,165,122,59"></Item>
! <Item ID="1009" type="PUSHBUTTON" geometry="465,165,18,12">"Add"</Item>
! <Item ID="1347" type="EDITTEXT" geometry="342,180,141,12"></Item>
! <Item ID="1343" type="CONTROL" geometry="79,217,100,112">"Tree1"</Item>
! <Item ID="1032" type="CONTROL" geometry="290,217,191,97">"List2"</Item>
! <Item ID="1334" type="EDITTEXT" geometry="321,317,33,12"></Item>
! <Item ID="1001" type="PUSHBUTTON" geometry="407,317,35,12">"Add"</Item>
! <Item ID="1002" type="PUSHBUTTON" geometry="444,317,35,12">"Remove"</Item>
! <Item ID="1349" type="CONTROL" geometry="437,42,37,20">"Disable Display"</Item>
<Item ID="1" type="DEFPUSHBUTTON" geometry="437,7,50,14">"OK"</Item>
<Item ID="2" type="PUSHBUTTON" geometry="437,24,50,14">"Cancel"</Item>
! <Item ID="1526" type="GROUPBOX" geometry="299,139,188,60">"Axis Classification"</Item>
! <Item ID="1523" type="LTEXT" geometry="7,9,34,8">"NPC Entry"</Item>
! <Item ID="1524" type="GROUPBOX" geometry="7,23,290,176">"Attributes"</Item>
! <Item ID="1527" type="LTEXT" geometry="14,33,20,8">"Name"</Item>
! <Item ID="1528" type="LTEXT" geometry="14,48,39,8">"Name Index"</Item>
! <Item ID="1529" type="LTEXT" geometry="14,63,22,8">"Sound"</Item>
! <Item ID="1532" type="LTEXT" geometry="14,108,45,8">"Tracking Icon"</Item>
! <Item ID="1533" type="LTEXT" geometry="14,123,17,8">"Brain"</Item>
! <Item ID="1534" type="LTEXT" geometry="14,138,31,8">"DefName"</Item>
! <Item ID="1535" type="LTEXT" geometry="14,153,24,8">"Desires"</Item>
! <Item ID="1536" type="LTEXT" geometry="14,168,45,8">"Basic Speech"</Item>
! <Item ID="1537" type="LTEXT" geometry="14,183,42,8">"Basic Events"</Item>
! <Item ID="1530" type="LTEXT" geometry="14,78,46,8">"Creature Base"</Item>
! <Item ID="1531" type="LTEXT" geometry="14,93,21,8">"Colour"</Item>
! <Item ID="1525" type="GROUPBOX" geometry="7,199,480,135">"Miscellaneous Attributes"</Item>
! <Item ID="1538" type="LTEXT" geometry="14,208,30,8">"Attributes"</Item>
! <Item ID="1539" type="LTEXT" geometry="79,208,34,8">"Categories"</Item>
! <Item ID="1540" type="LTEXT" geometry="182,208,103,8">"Choices\t\t(D-Click to Add)"</Item>
! <Item ID="1541" type="LTEXT" geometry="290,208,189,8">"Selections\t\t\t\t(D-Click to Edit)"</Item>
! <Item ID="1545" type="LTEXT" geometry="292,319,25,8">"Amount"</Item>
! <Item ID="1542" type="LTEXT" geometry="304,152,29,8">"Category"</Item>
! <Item ID="1543" type="LTEXT" geometry="304,167,36,8">"Subsection"</Item>
! <Item ID="1544" type="LTEXT" geometry="304,182,36,8">"Description"</Item>
! <Item ID="1348" type="CONTROL" geometry="300,27,124,110">""</Item>
</Dialog>
<Dialog ID="152" Caption="Edit Skill/Stat Values">
--- 505,561 ----
</Dialog>
<Dialog ID="151" Caption="NPC Editor">
! <Item ID="1003" type="PUSHBUTTON" geometry="437,45,50,14">"New"</Item>
! <Item ID="1004" type="PUSHBUTTON" geometry="437,58,50,14">"Edit"</Item>
! <Item ID="1005" type="PUSHBUTTON" geometry="437,71,50,14">"Apply Edits"</Item>
! <Item ID="1006" type="PUSHBUTTON" geometry="437,85,50,14">"Cancel Edits"</Item>
! <Item ID="1059" type="EDITTEXT" geometry="71,106,102,14"></Item>
! <Item ID="1339" type="COMBOBOX" geometry="71,122,102,52"></Item>
! <Item ID="1340" type="COMBOBOX" geometry="71,137,102,57"></Item>
! <Item ID="1341" type="COMBOBOX" geometry="71,151,102,60"></Item>
! <Item ID="1342" type="COMBOBOX" geometry="71,166,86,49"></Item>
! <Item ID="1008" type="PUSHBUTTON" geometry="160,166,13,13">""</Item>
! <Item ID="1210" type="COMBOBOX" geometry="71,182,102,51"></Item>
! <Item ID="1345" type="COMBOBOX" geometry="71,198,102,53"></Item>
! <Item ID="1060" type="EDITTEXT" geometry="71,211,102,14"></Item>
! <Item ID="1062" type="EDITTEXT" geometry="71,226,102,14"></Item>
! <Item ID="1063" type="EDITTEXT" geometry="71,241,102,14"></Item>
! <Item ID="1064" type="EDITTEXT" geometry="71,257,102,14"></Item>
! <Item ID="1337" type="CONTROL" geometry="178,108,114,58">"List5"</Item>
! <Item ID="1061" type="CONTROL" geometry="178,171,114,99">"List6"</Item>
! <Item ID="1035" type="CONTROL" geometry="304,263,59,10">"No Axis index"</Item>
! <Item ID="1221" type="COMBOBOX" geometry="342,232,122,52"></Item>
! <Item ID="1007" type="PUSHBUTTON" geometry="465,232,18,12">"Add"</Item>
! <Item ID="1347" type="EDITTEXT" geometry="342,246,141,12"></Item>
! <Item ID="1343" type="CONTROL" geometry="79,296,100,112">"Tree1"</Item>
! <Item ID="1032" type="CONTROL" geometry="290,296,191,97">"List2"</Item>
! <Item ID="1334" type="EDITTEXT" geometry="321,396,33,12"></Item>
! <Item ID="1001" type="PUSHBUTTON" geometry="407,396,35,12">"Add"</Item>
! <Item ID="1002" type="PUSHBUTTON" geometry="444,396,35,12">"Remove"</Item>
<Item ID="1" type="DEFPUSHBUTTON" geometry="437,7,50,14">"OK"</Item>
<Item ID="2" type="PUSHBUTTON" geometry="437,24,50,14">"Cancel"</Item>
! <Item ID="1526" type="GROUPBOX" geometry="299,220,188,54">"Axis Classification"</Item>
! <Item ID="1524" type="GROUPBOX" geometry="7,99,290,176">"Attributes"</Item>
! <Item ID="1527" type="LTEXT" geometry="14,110,20,8">"Name"</Item>
! <Item ID="1528" type="LTEXT" geometry="14,124,39,8">"Name Index"</Item>
! <Item ID="1529" type="LTEXT" geometry="14,139,22,8">"Sound"</Item>
! <Item ID="1532" type="LTEXT" geometry="14,185,45,8">"Tracking Icon"</Item>
! <Item ID="1533" type="LTEXT" geometry="14,199,17,8">"Brain"</Item>
! <Item ID="1534" type="LTEXT" geometry="14,214,31,8">"DefName"</Item>
! <Item ID="1535" type="LTEXT" geometry="14,230,24,8">"Desires"</Item>
! <Item ID="1536" type="LTEXT" geometry="14,244,45,8">"Basic Speech"</Item>
! <Item ID="1537" type="LTEXT" geometry="14,259,42,8">"Basic Events"</Item>
! <Item ID="1530" type="LTEXT" geometry="14,154,46,8">"Creature Base"</Item>
! <Item ID="1531" type="LTEXT" geometry="14,169,21,8">"Colour"</Item>
! <Item ID="1525" type="GROUPBOX" geometry="7,276,480,135">"Miscellaneous Attributes"</Item>
! <Item ID="1538" type="LTEXT" geometry="14,287,30,8">"Attributes"</Item>
! <Item ID="1539" type="LTEXT" geometry="79,287,34,8">"Categories"</Item>
! <Item ID="1540" type="LTEXT" geometry="182,287,103,8">"Choices\t\t(D-Click to Add)"</Item>
! <Item ID="1541" type="LTEXT" geometry="290,287,189,8">"Selections\t\t\t\t(D-Click to Edit)"</Item>
! <Item ID="1545" type="LTEXT" geometry="292,398,25,8">"Amount"</Item>
! <Item ID="1542" type="LTEXT" geometry="304,234,29,8">"Category"</Item>
! <Item ID="1544" type="LTEXT" geometry="304,248,36,8">"Description"</Item>
! <Item ID="1348" type="CONTROL" geometry="300,102,187,110">""</Item>
! <Item ID="235" type="CONTROL" geometry="7,7,176,89">""</Item>
! <Item ID="237" type="CONTROL" geometry="184,7,245,90">""</Item>
</Dialog>
<Dialog ID="152" Caption="Edit Skill/Stat Values">
Index: itemgentab.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/itemgentab.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** itemgentab.cpp 26 Jun 2003 22:28:01 -0000 1.24
--- itemgentab.cpp 24 Jul 2003 06:00:05 -0000 1.25
***************
*** 421,426 ****
int index = m_clcItems.GetItemData(iSelIndex);
CString sColor, sDispID;
! sColor = Main->m_pScripts->GetCharacterColor(index);
! sDispID = Main->m_pScripts->GetCharacterDispID(index);
{
if (Main->m_config.DrawItems())
--- 421,426 ----
int index = m_clcItems.GetItemData(iSelIndex);
CString sColor, sDispID;
! sColor = Main->m_pScripts->GetItemColor(index);
! sDispID = Main->m_pScripts->GetItemDispID(index);
{
if (Main->m_config.DrawItems())
|
Update of /cvsroot/sphere-axis/Axis/S_Sphere52
In directory sc8-pr-cvs1:/tmp/cvs-serv6350
Modified Files:
Account.cpp Account.h Area.cpp Area.h attributes.cpp
attributes.h compreg.h ConfigFile.cpp ConfigFile.h Def.cpp
Def.h dlldatax.h FileReadProgress.cpp FileReadProgress.h
Item.cpp Item.h Location.cpp Location.h NPC.cpp NPC.h
NPCLootItem.cpp NPCLootItem.h Potion.cpp Potion.h
ProfileEdit.cpp ProfileEdit.h Resource.h Room.cpp Room.h
S_Sphere52.cpp S_Sphere52.idl S_Sphere52App.h
ScriptProfile.cpp ScriptProfile.h Scripts.cpp Scripts.h
ScriptsMain.cpp ScriptsMain.h ScriptTables.cpp ScriptTables.h
ScriptUpdate.cpp ScriptUpdate.h ServerDef.cpp ServerDef.h
SkillDef.cpp SkillDef.h SkillMenuGroup.cpp SkillMenuGroup.h
SkillMenuItem.cpp SkillMenuItem.h SkillRootMenu.cpp
SkillRootMenu.h SpawnRec.cpp SpawnRec.h SpellDef.cpp
SpellDef.h stdafx.cpp stdafx.h strings.h Template.cpp
Template.h TObArray.h TOreDef.cpp TOreDef.h TPotionDef.cpp
TPotionDef.h Trigger.cpp Trigger.h TSkillClass.cpp
TSkillClass.h TSkillDef.cpp TSkillDef.h TSpawnDef.cpp
TSpawnDef.h TSpellDef.cpp TSpellDef.h TStartLocation.cpp
TStartLocation.h types.cpp types.h VendorItem.cpp VendorItem.h
WebpageDef.cpp WebpageDef.h WorldItem.cpp WorldItem.h
XMLConfig.cpp XMLConfig.h
Log Message:
no message
Index: Account.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Account.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Account.cpp 9 Jul 2003 19:57:25 -0000 1.1
--- Account.cpp 23 Jul 2003 19:10:57 -0000 1.2
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "account.h"
Index: Account.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Account.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Account.h 9 Jul 2003 19:57:25 -0000 1.1
--- Account.h 23 Jul 2003 19:10:57 -0000 1.2
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
#include "scriptbase.h"
Index: Area.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Area.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Area.cpp 10 Jul 2003 05:13:37 -0000 1.3
--- Area.cpp 23 Jul 2003 19:10:57 -0000 1.4
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "area.h"
Index: Area.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Area.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Area.h 10 Jul 2003 05:13:37 -0000 1.3
--- Area.h 23 Jul 2003 19:10:57 -0000 1.4
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
#include "stdafx.h"
Index: attributes.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/attributes.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** attributes.cpp 3 Jun 2003 21:28:49 -0000 1.1
--- attributes.cpp 23 Jul 2003 19:10:57 -0000 1.2
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
// attributes.cpp
Index: attributes.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/attributes.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** attributes.h 3 Jun 2003 21:28:49 -0000 1.1
--- attributes.h 23 Jul 2003 19:10:57 -0000 1.2
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
// attributes.h
//
Index: compreg.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/compreg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** compreg.h 23 May 2003 05:46:53 -0000 1.2
--- compreg.h 23 Jul 2003 19:10:57 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
// compreg.h : Declaration of the CCompReg
Index: ConfigFile.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ConfigFile.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ConfigFile.cpp 1 Jul 2003 14:17:40 -0000 1.4
--- ConfigFile.cpp 23 Jul 2003 19:10:57 -0000 1.5
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "ConfigFile.h"
Index: ConfigFile.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ConfigFile.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ConfigFile.h 23 May 2003 05:46:53 -0000 1.2
--- ConfigFile.h 23 Jul 2003 19:10:57 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
Index: Def.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Def.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Def.cpp 25 Jun 2003 22:55:58 -0000 1.3
--- Def.cpp 23 Jul 2003 19:10:57 -0000 1.4
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "def.h"
Index: Def.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Def.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Def.h 25 Jun 2003 22:55:58 -0000 1.3
--- Def.h 23 Jul 2003 19:10:57 -0000 1.4
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
#include "stdafx.h"
Index: dlldatax.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/dlldatax.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** dlldatax.h 23 May 2003 05:46:53 -0000 1.2
--- dlldatax.h 23 Jul 2003 19:10:57 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
Index: FileReadProgress.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/FileReadProgress.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** FileReadProgress.cpp 23 May 2003 05:46:53 -0000 1.2
--- FileReadProgress.cpp 23 Jul 2003 19:10:57 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
// FileReadProgress.cpp : implementation file
//
Index: FileReadProgress.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/FileReadProgress.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** FileReadProgress.h 23 May 2003 05:46:53 -0000 1.2
--- FileReadProgress.h 23 Jul 2003 19:10:57 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
#include "resource.h"
Index: Item.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Item.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Item.cpp 27 May 2003 04:26:31 -0000 1.3
--- Item.cpp 23 Jul 2003 19:10:57 -0000 1.4
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "Scripts.h"
Index: Item.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Item.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Item.h 23 May 2003 05:46:53 -0000 1.2
--- Item.h 23 Jul 2003 19:10:57 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
Index: Location.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Location.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Location.cpp 23 May 2003 05:46:53 -0000 1.2
--- Location.cpp 23 Jul 2003 19:10:57 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "location.h"
Index: Location.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Location.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Location.h 23 May 2003 05:46:53 -0000 1.2
--- Location.h 23 Jul 2003 19:10:57 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
Index: NPC.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/NPC.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** NPC.cpp 11 Jun 2003 22:18:10 -0000 1.5
--- NPC.cpp 23 Jul 2003 19:10:57 -0000 1.6
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "Scripts.h"
Index: NPC.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/NPC.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** NPC.h 9 Jul 2003 19:57:25 -0000 1.3
--- NPC.h 23 Jul 2003 19:10:57 -0000 1.4
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
#include "StdAfx.h"
Index: NPCLootItem.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/NPCLootItem.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** NPCLootItem.cpp 23 May 2003 05:46:54 -0000 1.2
--- NPCLootItem.cpp 23 Jul 2003 19:10:57 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "npclootitem.h"
Index: NPCLootItem.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/NPCLootItem.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** NPCLootItem.h 23 May 2003 05:46:54 -0000 1.2
--- NPCLootItem.h 23 Jul 2003 19:10:57 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
#include "stdafx.h"
Index: Potion.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Potion.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Potion.cpp 23 May 2003 05:46:54 -0000 1.2
--- Potion.cpp 23 Jul 2003 19:10:57 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "potion.h"
Index: Potion.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Potion.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Potion.h 23 May 2003 05:46:54 -0000 1.2
--- Potion.h 23 Jul 2003 19:10:57 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
#include "stdafx.h"
Index: ProfileEdit.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ProfileEdit.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ProfileEdit.cpp 18 Jun 2003 22:45:25 -0000 1.5
--- ProfileEdit.cpp 23 Jul 2003 19:10:57 -0000 1.6
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
// ProfileEdit.cpp : implementation file
//
Index: ProfileEdit.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ProfileEdit.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ProfileEdit.h 13 Jun 2003 19:58:09 -0000 1.3
--- ProfileEdit.h 23 Jul 2003 19:10:57 -0000 1.4
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
#include "afxwin.h"
Index: Resource.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Resource.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Resource.h 21 Jul 2003 14:13:57 -0000 1.11
--- Resource.h 23 Jul 2003 19:10:57 -0000 1.12
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
Index: Room.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Room.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Room.cpp 23 May 2003 05:46:54 -0000 1.2
--- Room.cpp 23 Jul 2003 19:10:57 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "room.h"
Index: Room.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Room.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Room.h 23 May 2003 05:46:54 -0000 1.2
--- Room.h 23 Jul 2003 19:10:57 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
Index: S_Sphere52.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/S_Sphere52.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** S_Sphere52.cpp 3 Jul 2003 17:14:54 -0000 1.3
--- S_Sphere52.cpp 23 Jul 2003 19:10:57 -0000 1.4
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
// S_Sphere52.cpp : Implementation of DLL Exports.
//
Index: S_Sphere52.idl
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/S_Sphere52.idl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** S_Sphere52.idl 15 Jul 2003 21:45:01 -0000 1.6
--- S_Sphere52.idl 23 Jul 2003 19:10:57 -0000 1.7
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
// S_Sphere52.idl : IDL source for S_Sphere52
//
Index: S_Sphere52App.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/S_Sphere52App.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** S_Sphere52App.h 23 May 2003 05:46:54 -0000 1.2
--- S_Sphere52App.h 23 Jul 2003 19:10:57 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
#include "stdafx.h"
Index: ScriptProfile.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptProfile.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ScriptProfile.cpp 23 May 2003 05:46:54 -0000 1.2
--- ScriptProfile.cpp 23 Jul 2003 19:10:57 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "scriptprofile.h"
Index: ScriptProfile.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptProfile.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ScriptProfile.h 12 Jun 2003 23:27:01 -0000 1.3
--- ScriptProfile.h 23 Jul 2003 19:10:57 -0000 1.4
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
Index: Scripts.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Scripts.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** Scripts.cpp 15 Jul 2003 21:45:01 -0000 1.8
--- Scripts.cpp 23 Jul 2003 19:10:57 -0000 1.9
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
// Scripts.cpp : Implementation of CScripts
Index: Scripts.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Scripts.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** Scripts.h 15 Jul 2003 21:45:01 -0000 1.8
--- Scripts.h 23 Jul 2003 19:10:57 -0000 1.9
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
// Scripts.h : Declaration of the CScripts
Index: ScriptsMain.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptsMain.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** ScriptsMain.cpp 21 Jul 2003 14:13:57 -0000 1.27
--- ScriptsMain.cpp 23 Jul 2003 19:10:57 -0000 1.28
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "Scripts.h"
Index: ScriptsMain.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptsMain.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** ScriptsMain.h 21 Jul 2003 14:13:57 -0000 1.18
--- ScriptsMain.h 23 Jul 2003 19:10:57 -0000 1.19
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
#include "ScriptTables.h"
Index: ScriptTables.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptTables.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ScriptTables.cpp 26 Jun 2003 22:28:04 -0000 1.5
--- ScriptTables.cpp 23 Jul 2003 19:10:57 -0000 1.6
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "Scripts.h"
Index: ScriptTables.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptTables.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ScriptTables.h 11 Jun 2003 22:18:11 -0000 1.3
--- ScriptTables.h 23 Jul 2003 19:10:57 -0000 1.4
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
#include "stdafx.h"
Index: ScriptUpdate.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptUpdate.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ScriptUpdate.cpp 23 May 2003 05:46:54 -0000 1.2
--- ScriptUpdate.cpp 23 Jul 2003 19:10:57 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "Scripts.h"
Index: ScriptUpdate.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptUpdate.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ScriptUpdate.h 23 May 2003 05:46:54 -0000 1.2
--- ScriptUpdate.h 23 Jul 2003 19:10:57 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
#include "stdafx.h"
Index: ServerDef.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ServerDef.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ServerDef.cpp 23 May 2003 05:46:54 -0000 1.2
--- ServerDef.cpp 23 Jul 2003 19:10:57 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "serverdef.h"
Index: ServerDef.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ServerDef.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ServerDef.h 23 May 2003 05:46:54 -0000 1.2
--- ServerDef.h 23 Jul 2003 19:10:57 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
Index: SkillDef.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/SkillDef.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** SkillDef.cpp 23 May 2003 05:46:54 -0000 1.2
--- SkillDef.cpp 23 Jul 2003 19:10:57 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "skilldef.h"
Index: SkillDef.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/SkillDef.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** SkillDef.h 23 May 2003 05:46:54 -0000 1.2
--- SkillDef.h 23 Jul 2003 19:10:57 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistr...
[truncated message content] |
Update of /cvsroot/sphere-axis/Axis/S_ScriptsBase
In directory sc8-pr-cvs1:/tmp/cvs-serv5381
Modified Files:
AdvanceDef.cpp AdvanceDef.h AxisLibWrapper.cpp
AxisLibWrapper.h CategorizedScriptBase.cpp
CategorizedScriptBase.h Category.cpp Category.h common.cpp
common.h DisplayedScriptBase.cpp DisplayedScriptBase.h
Expression.cpp Expression.h FileMap.cpp FileMap.h
FloatRange.cpp FloatRange.h IntRange.cpp IntRange.h
MD5Hash.cpp MD5Hash.h Resource.h S_ScriptsBase.cpp
S_ScriptsBase.h ScriptArray.h ScriptBase.h stdafx.cpp stdafx.h
StringBlock.cpp StringBlock.h StringVector.cpp StringVector.h
Subsection.cpp Subsection.h uomap.cpp uomap.h XMLBase.cpp
XMLBase.h
Log Message:
no message
Index: AdvanceDef.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/AdvanceDef.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** AdvanceDef.cpp 23 May 2003 05:46:26 -0000 1.2
--- AdvanceDef.cpp 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "advancedef.h"
Index: AdvanceDef.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/AdvanceDef.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** AdvanceDef.h 23 May 2003 05:46:26 -0000 1.2
--- AdvanceDef.h 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
Index: AxisLibWrapper.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/AxisLibWrapper.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** AxisLibWrapper.cpp 19 Jun 2003 18:03:20 -0000 1.6
--- AxisLibWrapper.cpp 23 Jul 2003 17:27:37 -0000 1.7
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "axislibwrapper.h"
Index: AxisLibWrapper.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/AxisLibWrapper.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** AxisLibWrapper.h 23 May 2003 05:46:26 -0000 1.2
--- AxisLibWrapper.h 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
Index: CategorizedScriptBase.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/CategorizedScriptBase.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** CategorizedScriptBase.cpp 25 Jun 2003 22:55:58 -0000 1.4
--- CategorizedScriptBase.cpp 23 Jul 2003 17:27:37 -0000 1.5
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "categorizedscriptbase.h"
Index: CategorizedScriptBase.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/CategorizedScriptBase.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** CategorizedScriptBase.h 23 May 2003 05:46:26 -0000 1.2
--- CategorizedScriptBase.h 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
#include "scriptbase.h"
Index: Category.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/Category.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Category.cpp 23 May 2003 05:46:26 -0000 1.2
--- Category.cpp 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "category.h"
Index: Category.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/Category.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Category.h 23 May 2003 05:46:26 -0000 1.2
--- Category.h 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
Index: common.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/common.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** common.cpp 23 May 2003 05:46:27 -0000 1.2
--- common.cpp 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "stdafx.h"
#include "common.h"
Index: common.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/common.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** common.h 23 May 2003 05:46:27 -0000 1.2
--- common.h 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
Index: DisplayedScriptBase.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/DisplayedScriptBase.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** DisplayedScriptBase.cpp 23 May 2003 05:46:26 -0000 1.2
--- DisplayedScriptBase.cpp 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "displayedscriptbase.h"
Index: DisplayedScriptBase.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/DisplayedScriptBase.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** DisplayedScriptBase.h 23 May 2003 05:46:26 -0000 1.2
--- DisplayedScriptBase.h 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
#include "categorizedscriptbase.h"
Index: Expression.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/Expression.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Expression.cpp 25 Jun 2003 22:55:58 -0000 1.3
--- Expression.cpp 23 Jul 2003 17:27:37 -0000 1.4
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "expression.h"
Index: Expression.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/Expression.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Expression.h 25 Jun 2003 22:55:58 -0000 1.3
--- Expression.h 23 Jul 2003 17:27:37 -0000 1.4
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
Index: FileMap.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/FileMap.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** FileMap.cpp 19 Jun 2003 21:38:29 -0000 1.2
--- FileMap.cpp 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "filemap.h"
Index: FileMap.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/FileMap.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** FileMap.h 26 Jun 2003 22:28:03 -0000 1.2
--- FileMap.h 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
#include "XMLBase.h"
Index: FloatRange.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/FloatRange.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** FloatRange.cpp 23 May 2003 05:46:26 -0000 1.2
--- FloatRange.cpp 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "floatrange.h"
Index: FloatRange.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/FloatRange.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** FloatRange.h 23 May 2003 05:46:26 -0000 1.2
--- FloatRange.h 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
Index: IntRange.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/IntRange.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** IntRange.cpp 23 May 2003 05:46:26 -0000 1.2
--- IntRange.cpp 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "intrange.h"
Index: IntRange.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/IntRange.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** IntRange.h 23 May 2003 05:46:26 -0000 1.2
--- IntRange.h 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
Index: MD5Hash.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/MD5Hash.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** MD5Hash.cpp 23 Jun 2003 19:02:14 -0000 1.3
--- MD5Hash.cpp 23 Jul 2003 17:27:37 -0000 1.4
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "md5hash.h"
Index: MD5Hash.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/MD5Hash.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** MD5Hash.h 19 Jun 2003 05:59:58 -0000 1.2
--- MD5Hash.h 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
Index: Resource.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/Resource.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Resource.h 23 May 2003 18:11:55 -0000 1.3
--- Resource.h 23 Jul 2003 17:27:37 -0000 1.4
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
Index: S_ScriptsBase.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/S_ScriptsBase.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** S_ScriptsBase.cpp 2 Jul 2003 04:13:07 -0000 1.4
--- S_ScriptsBase.cpp 23 Jul 2003 17:27:37 -0000 1.5
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
// S_ScriptsBase.cpp : Defines the initialization routines for the DLL.
//
Index: S_ScriptsBase.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/S_ScriptsBase.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** S_ScriptsBase.h 23 May 2003 18:11:55 -0000 1.3
--- S_ScriptsBase.h 23 Jul 2003 17:27:37 -0000 1.4
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
// S_ScriptsBase.h : main header file for the S_ScriptsBase DLL
//
Index: ScriptArray.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/ScriptArray.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ScriptArray.h 12 Jun 2003 04:56:59 -0000 1.5
--- ScriptArray.h 23 Jul 2003 17:27:37 -0000 1.6
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
#include "ScriptBase.h"
Index: ScriptBase.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/ScriptBase.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ScriptBase.h 10 Jun 2003 22:57:20 -0000 1.3
--- ScriptBase.h 23 Jul 2003 17:27:37 -0000 1.4
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
Index: stdafx.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/stdafx.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** stdafx.cpp 23 May 2003 05:46:27 -0000 1.2
--- stdafx.cpp 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
// stdafx.cpp : source file that includes just the standard includes
// S_ScriptsBase.pch will be the pre-compiled header
Index: stdafx.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/stdafx.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** stdafx.h 2 Jul 2003 04:13:07 -0000 1.4
--- stdafx.h 23 Jul 2003 17:27:37 -0000 1.5
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
// stdafx.h : include file for standard system include files,
// or project specific include files that are used frequently, but
Index: StringBlock.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/StringBlock.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** StringBlock.cpp 23 May 2003 05:46:26 -0000 1.2
--- StringBlock.cpp 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "stringblock.h"
Index: StringBlock.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/StringBlock.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** StringBlock.h 23 May 2003 05:46:26 -0000 1.2
--- StringBlock.h 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
#include "scriptbase.h"
Index: StringVector.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/StringVector.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** StringVector.cpp 10 Jun 2003 22:57:20 -0000 1.3
--- StringVector.cpp 23 Jul 2003 17:27:37 -0000 1.4
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "stringvector.h"
Index: StringVector.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/StringVector.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** StringVector.h 23 May 2003 05:46:27 -0000 1.2
--- StringVector.h 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
#include <vector>
Index: Subsection.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/Subsection.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Subsection.cpp 23 May 2003 05:46:27 -0000 1.2
--- Subsection.cpp 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "subsection.h"
Index: Subsection.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/Subsection.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Subsection.h 23 May 2003 05:46:27 -0000 1.2
--- Subsection.h 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
Index: uomap.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/uomap.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** uomap.cpp 2 Jul 2003 04:13:07 -0000 1.1
--- uomap.cpp 23 Jul 2003 17:27:37 -0000 1.2
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
// Machine generated IDispatch wrapper class(es) created by Microsoft Visual C++
Index: uomap.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/uomap.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** uomap.h 2 Jul 2003 04:13:07 -0000 1.1
--- uomap.h 23 Jul 2003 17:27:37 -0000 1.2
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
// Machine generated IDispatch wrapper class(es) created by Microsoft Visual C++
Index: XMLBase.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/XMLBase.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** XMLBase.cpp 13 Jun 2003 19:58:08 -0000 1.3
--- XMLBase.cpp 23 Jul 2003 17:27:37 -0000 1.4
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#include "StdAfx.h"
#include "xmlbase.h"
Index: XMLBase.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_ScriptsBase/XMLBase.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** XMLBase.h 23 May 2003 05:46:27 -0000 1.2
--- XMLBase.h 23 Jul 2003 17:27:37 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /*
+ $Id$
+
+ **********************************************************************
+ * Copyright (C) Philip A. Esterle 1998-2003
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ **********************************************************************
+
+ */
+
#pragma once
|
|
From: Philip E. <pes...@us...> - 2003-07-21 14:14:00
|
Update of /cvsroot/sphere-axis/Axis/S_Sphere52
In directory sc8-pr-cvs1:/tmp/cvs-serv20136/S_Sphere52
Modified Files:
itemeditdlg.cpp itemeditdlg.h Resource.h S_Sphere52.rc
ScriptsMain.cpp ScriptsMain.h SkillMenuEditDlg.cpp strings.h
WOPEditDlg.cpp
Log Message:
no message
Index: itemeditdlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/itemeditdlg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** itemeditdlg.cpp 17 Jul 2003 22:09:06 -0000 1.4
--- itemeditdlg.cpp 21 Jul 2003 14:13:57 -0000 1.5
***************
*** 42,45 ****
--- 42,47 ----
// CItemEditDlg dialog
+ int CItemEditDlg::iIDSort = 1;
+ int CItemEditDlg::iNameSort = 1;
CItemEditDlg::CItemEditDlg(CWnd* pParent /*=NULL*/)
***************
*** 65,69 ****
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CItemEditDlg)
- DDX_Control(pDX, IDC_ITEMENTRY, m_ccbEntry);
DDX_Control(pDX, IDOK, m_cbOK);
DDX_Control(pDX, IDCANCEL, m_cbCancel);
--- 67,70 ----
***************
*** 103,107 ****
DDX_Control(pDX, IDC_ARMOURMAX, m_ceArmourMax);
DDX_Control(pDX, IDC_ARMOURBONUS, m_ceArmourBonus);
- DDX_Control(pDX, IDC_EI_SENTRY, m_sEntry);
DDX_Control(pDX, IDC_EI_SBASE, m_sBase);
DDX_Control(pDX, IDC_EI_SDUPE, m_sDupe);
--- 104,107 ----
***************
*** 133,136 ****
--- 133,138 ----
//}}AFX_DATA_MAP
DDX_Control(pDX, IDC_ITEMDISPLAY, m_Display);
+ DDX_Control(pDX, IDC_ITEMTREE, m_tcItemTree);
+ DDX_Control(pDX, IDC_ITEMLIST, m_lcItemList);
}
***************
*** 147,151 ****
ON_BN_CLICKED(IDC_TRIGEDIT, OnTrigedit)
ON_BN_CLICKED(IDC_IEPALETTE, OnIepalette)
- ON_CBN_SELCHANGE(IDC_ITEMENTRY, OnSelchangeItementry)
ON_BN_CLICKED(IDC_ITEM_NEW, OnItemNew)
ON_BN_CLICKED(IDC_ITEM_EDIT, OnItemEdit)
--- 149,152 ----
***************
*** 156,159 ****
--- 157,161 ----
ON_CBN_SELCHANGE(IDC_COLORCOMBO, OnSelchangeColorcombo)
//}}AFX_MSG_MAP
+ ON_NOTIFY(TVN_SELCHANGED, IDC_ITEMTREE, OnTvnSelchangedItemtree)
END_MESSAGE_MAP()
***************
*** 204,209 ****
CString csString;
csString.Format(_T("%s [%s]"), pItem->m_csDescription, pItem->m_csValue);
- int index = this->m_ccbEntry.AddString(csString);
- this->m_ccbEntry.SetItemData(index, (DWORD_PTR) pItem);
}
--- 206,209 ----
***************
*** 219,222 ****
--- 219,224 ----
// Fill in the category box
FillCategoryTree();
+ m_lcItemList.InsertColumn(0, locale->String(IDS_ITEMGEN_DESCRIPTION), LVCFMT_LEFT, 140, -1);
+ m_lcItemList.InsertColumn(1, locale->String(IDS_ITEMGEN_ID), LVCFMT_LEFT, 97, -1);
m_hPaletteIcon = AfxGetApp()->LoadIcon(IDI_PALETTE);
***************
*** 224,237 ****
if ( m_pItem != NULL )
{
- for ( i = 0; i < this->m_ccbEntry.GetCount(); i++ )
- {
- CCategorizedScriptBase * pItem = (CCategorizedScriptBase *) this->m_ccbEntry.GetItemData(i);
- if ( pItem->m_csValue == m_pItem->m_csValue )
- {
- this->m_ccbEntry.SetCurSel(i);
- this->OnItemEdit();
- break;
- }
- }
}
if ( m_csDispID != _T("") )
--- 226,229 ----
***************
*** 264,268 ****
return;
}
-
}
--- 256,259 ----
***************
*** 342,345 ****
--- 333,338 ----
void CItemEditDlg::InitData(CItem *pItem)
{
+ if ( pItem == NULL )
+ return;
// Clear out the text in all of the windows
m_ceSellValue.SetWindowText(_T(""));
***************
*** 806,810 ****
this->m_ccbColor.EnableWindow(bEnable);
this->m_ccbDupeitem.EnableWindow(bEnable);
- this->m_ccbEntry.EnableWindow(!bEnable);
this->m_ccbItemType.EnableWindow(bEnable);
this->m_ccbSkill.EnableWindow(bEnable);
--- 799,802 ----
***************
*** 841,861 ****
}
- void CItemEditDlg::OnSelchangeItementry()
- {
- int iSel = this->m_ccbEntry.GetCurSel();
- if ( iSel == -1 )
- return;
- if ( m_pItem )
- delete m_pItem;
- m_pItem = new CItem;
- CCategorizedScriptBase * pBase = (CCategorizedScriptBase *) m_ccbEntry.GetItemData(iSel);
- m_pItem->m_csValue = pBase->m_csValue;
- m_pItem->m_csFilename = pBase->m_csFilename;
- m_pItem->Load(_T(""));
- if ( m_pItem == NULL )
- return;
- InitData(m_pItem);
- }
-
bool CItemEditDlg::ValidateData()
{
--- 833,836 ----
***************
*** 1171,1186 ****
if ( m_csDispID == _T("") )
{
- int iSel = this->m_ccbEntry.GetCurSel();
- if ( iSel != -1 )
- {
- CItem * pItem = (CItem *) m_ccbEntry.GetItemData(iSel);
- if ( pItem )
- {
- if ( pItem->m_csDispID != _T("") )
- m_csDispID = pItem->m_csDispID;
- else
- m_csDispID = pItem->m_csValue;
- }
- }
}
m_pItem->m_csDispID = m_csDispID;
--- 1146,1149 ----
***************
*** 1205,1211 ****
CString csCaption;
csCaption.Format(_T("%s [%s]"), m_pItem->m_csDescription, m_pItem->m_csValue);
- int index = this->m_ccbEntry.AddString(csCaption);
- this->m_ccbEntry.SetItemDataPtr(index, (void *) m_pItem);
- this->m_ccbEntry.SelectString(-1, csCaption);
Main->m_pScripts->m_aItems.Insert(m_pItem);
Main->m_pScripts->m_wNextItemID++;
--- 1168,1171 ----
***************
*** 1294,1327 ****
void CItemEditDlg::FillCategoryTree()
{
! //m_ctcCategories.DeleteAllItems();
! //FillCategoryNode(m_pCategories, NULL);
}
void CItemEditDlg::FillCategoryNode(CCategoryTree * pCategory, HTREEITEM hParent)
{
! //if ( pCategory == NULL )
! // return;
! //HTREEITEM hItem;
! //if ( pCategory != m_pCategories )
! //{
! // // Insert this guy first
! // TV_INSERTSTRUCT InsertItem;
! // InsertItem.item.mask = TVIF_TEXT;
! // InsertItem.item.pszText = (TCHAR*)LPCTSTR(pCategory->GetName());
! // InsertItem.item.cchTextMax = pCategory->GetName().GetLength();
! // InsertItem.hParent = hParent;
! // InsertItem.hInsertAfter = TVI_SORT;
! // hItem = m_ctcCategories.InsertItem(&InsertItem);
! // m_ctcCategories.SetItemData(hItem, (DWORD) pCategory);
! //}
! //else
! // hItem = hParent;
! //// Now insert all of its children
! //for ( int i = 0; i < pCategory->ChildCount(); i++ )
! //{
! // CCategoryTree * pTree = pCategory->GetChild(i);
! // if ( pTree )
! // FillCategoryNode(pTree, hItem);
! //}
}
--- 1254,1287 ----
void CItemEditDlg::FillCategoryTree()
{
! m_tcItemTree.DeleteAllItems();
! FillCategoryNode(m_pCategories, NULL);
}
void CItemEditDlg::FillCategoryNode(CCategoryTree * pCategory, HTREEITEM hParent)
{
! if ( pCategory == NULL )
! return;
! HTREEITEM hItem;
! if ( pCategory != m_pCategories )
! {
! // Insert this guy first
! TV_INSERTSTRUCT InsertItem;
! InsertItem.item.mask = TVIF_TEXT;
! InsertItem.item.pszText = (TCHAR*)LPCTSTR(pCategory->GetName());
! InsertItem.item.cchTextMax = pCategory->GetName().GetLength();
! InsertItem.hParent = hParent;
! InsertItem.hInsertAfter = TVI_SORT;
! hItem = m_tcItemTree.InsertItem(&InsertItem);
! m_tcItemTree.SetItemData(hItem, (DWORD_PTR) pCategory);
! }
! else
! hItem = hParent;
! // Now insert all of its children
! for ( int i = 0; i < pCategory->ChildCount(); i++ )
! {
! CCategoryTree * pTree = pCategory->GetChild(i);
! if ( pTree )
! FillCategoryNode(pTree, hItem);
! }
}
***************
*** 1330,1334 ****
locale->LocalizeWindow(IDD, 0, NULL, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_ITEMDISPLAY, (CWnd*)&m_Display, (CWnd*)this);
- locale->LocalizeWindow(IDD, IDC_ITEMENTRY, (CWnd*)&m_ccbEntry, (CWnd*)this);
locale->LocalizeWindow(IDD, IDOK, (CWnd*)&m_cbOK, (CWnd*)this);
locale->LocalizeWindow(IDD, IDCANCEL, (CWnd*)&m_cbCancel, (CWnd*)this);
--- 1290,1293 ----
***************
*** 1368,1372 ****
locale->LocalizeWindow(IDD, IDC_ARMOURMAX, (CWnd*)&m_ceArmourMax, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_ARMOURBONUS, (CWnd*)&m_ceArmourBonus, (CWnd*)this);
- locale->LocalizeWindow(IDD, IDC_EI_SENTRY, (CWnd*)&m_sEntry, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_EI_SBASE, (CWnd*)&m_sBase, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_EI_SDUPE, (CWnd*)&m_sDupe, (CWnd*)this);
--- 1327,1330 ----
***************
*** 1396,1398 ****
--- 1354,1438 ----
locale->LocalizeWindow(IDD, IDC_EI_STATIC4, (CWnd*)&m_sStatic4, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_EI_STATIC5, (CWnd*)&m_sStatic5, (CWnd*)this);
+ locale->LocalizeWindow(IDD, IDC_ITEMDISPLAY, (CWnd*)&m_Display, (CWnd*)this);
+ locale->LocalizeWindow(IDD, IDC_ITEMTREE, (CWnd*)&m_tcItemTree, (CWnd*)this);
+ locale->LocalizeWindow(IDD, IDC_ITEMLIST, (CWnd*)&m_lcItemList, (CWnd*)this);
}
+
+ void CItemEditDlg::OnTvnSelchangedItemtree(NMHDR *pNMHDR, LRESULT *pResult)
+ {
+ NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR;
+
+ m_lcItemList.SetHotItem(-1);
+
+ HTREEITEM hSelectedItem = NULL;
+ HTREEITEM hParentItem = NULL;
+ m_lcItemList.DeleteAllItems();
+ m_Display.SetArtIndex(-1);
+ m_Display.SetArtColor(0);
+
+ // Do the bold/nobold thing
+ if (pNMTreeView != NULL)
+ {
+ HTREEITEM hOldItem = pNMTreeView->itemOld.hItem;
+ if (hOldItem != NULL)
+ m_tcItemTree.SetItemState(hOldItem, 0, TVIS_BOLD);
+ }
+
+ hSelectedItem = m_tcItemTree.GetSelectedItem();
+ m_tcItemTree.SetItemState(hSelectedItem, TVIS_BOLD, TVIS_BOLD);
+
+ CCategoryTree * pCategory =(CCategoryTree *) m_tcItemTree.GetItemData(hSelectedItem);
+
+ int iCount = 0;
+ for ( int i = 0; i < pCategory->EntryCount(); i++ )
+ {
+ int iIndex = pCategory->GetEntry(i);
+ if ( iIndex == -1 )
+ continue;
+ CString sDescription, sID;
+ sDescription = Main->m_pScripts->ItemDescription(iIndex);
+ if ( sDescription == _T("") )
+ sDescription = _T("<unnamed>");
+ sID = Main->m_pScripts->ItemID(iIndex);
+ m_lcItemList.InsertItem(iCount, sDescription, 0);
+ m_lcItemList.SetItemText(iCount, 1, sID);
+ m_lcItemList.SetItemData(iCount, iIndex);
+ iCount++;
+ }
+
+ iNameSort = 1;
+ iIDSort = 1;
+ m_lcItemList.SortItems(CompareFunc, 1); // Sort by ItemID initially
+ iNameSort = -1;
+ }
+
+ int CALLBACK CItemEditDlg::CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort)
+ {
+ CString sID1, sID2;
+ CString sDesc1, sDesc2;
+
+ sID1 = Main->m_pScripts->ItemID((ULONG)lParam1);
+ sID2 = Main->m_pScripts->ItemID((ULONG)lParam2);
+ sDesc1 = Main->m_pScripts->ItemDescription((ULONG)lParam1);
+ sDesc2 = Main->m_pScripts->ItemDescription((ULONG)lParam2);
+
+ if (lParamSort == 0)
+ {
+ if (iNameSort == 0)
+ return (lParam1 < lParam2 ? 1 : -1);
+ if (iNameSort == 1)
+ return (sDesc1 < sDesc2 ? -1 : 1);
+ if (iNameSort == -1)
+ return (sDesc1 < sDesc2 ? 1 : -1);
+ }
+ else
+ {
+ if (iIDSort == 0)
+ return (lParam1 < lParam2 ? 1 : -1);
+ if (iIDSort == 1)
+ return (sID1 < sID2 ? -1 : 1);
+ if (iIDSort == -1)
+ return (sID1 < sID2 ? 1 : -1);
+ }
+ return 0;
+ }
\ No newline at end of file
Index: itemeditdlg.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/itemeditdlg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** itemeditdlg.h 10 Jul 2003 21:49:36 -0000 1.3
--- itemeditdlg.h 21 Jul 2003 14:13:57 -0000 1.4
***************
*** 34,37 ****
--- 34,38 ----
#include "CategoryTree.h"
#include "uoart.h"
+ #include "afxcmn.h"
/////////////////////////////////////////////////////////////////////////////
***************
*** 54,58 ****
//{{AFX_DATA(CItemEditDlg)
enum { IDD = IDD_ITEMEDIT };
- CComboBox m_ccbEntry;
CButton m_cbOK;
CButton m_cbCancel;
--- 55,58 ----
***************
*** 92,96 ****
CEdit m_ceArmourMax;
CEdit m_ceArmourBonus;
- CStatic m_sEntry;
CStatic m_sBase;
CStatic m_sDupe;
--- 92,95 ----
***************
*** 142,145 ****
--- 141,147 ----
void FillCategoryTree();
void FillCategoryNode(CCategoryTree * pCategory, HTREEITEM hParent);
+ static int iIDSort;
+ static int iNameSort;
+ static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort);
// Generated message map functions
***************
*** 156,160 ****
afx_msg void OnTrigedit();
afx_msg void OnIepalette();
- afx_msg void OnSelchangeItementry();
afx_msg void OnItemNew();
afx_msg void OnItemEdit();
--- 158,161 ----
***************
*** 175,178 ****
--- 176,182 ----
void Localize(void);
CUOArt m_Display;
+ CTreeCtrl m_tcItemTree;
+ CListCtrl m_lcItemList;
+ afx_msg void OnTvnSelchangedItemtree(NMHDR *pNMHDR, LRESULT *pResult);
};
Index: Resource.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Resource.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Resource.h 17 Jul 2003 22:09:06 -0000 1.10
--- Resource.h 21 Jul 2003 14:13:57 -0000 1.11
***************
*** 77,80 ****
--- 77,83 ----
#define IDC_UOMAPCTRL1 232
#define IDC_UOARTCTRL1 234
+ #define IDC_TREE1 235
+ #define IDC_ITEMTREE 235
+ #define IDC_ITEMLIST 236
#define IDI_UPARROW 237
#define IDI_DOWNARROW 238
***************
*** 689,693 ****
#define _APS_NEXT_RESOURCE_VALUE 206
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 235
#define _APS_NEXT_SYMED_VALUE 104
#endif
--- 692,696 ----
#define _APS_NEXT_RESOURCE_VALUE 206
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 237
#define _APS_NEXT_SYMED_VALUE 104
#endif
Index: S_Sphere52.rc
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/S_Sphere52.rc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** S_Sphere52.rc 17 Jul 2003 22:09:06 -0000 1.13
--- S_Sphere52.rc 21 Jul 2003 14:13:57 -0000 1.14
***************
*** 165,269 ****
END
! IDD_ITEMEDIT DIALOGEX 0, 0, 397, 343
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Edit Item"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
! EDITTEXT IDC_ITEMID,42,47,35,12,ES_AUTOHSCROLL | WS_DISABLED
! COMBOBOX IDC_DUPEITEM,120,47,69,81,CBS_DROPDOWN | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! EDITTEXT IDC_NAME,42,62,147,12,ES_AUTOHSCROLL | WS_DISABLED
! COMBOBOX IDC_ITEMTYPE,42,75,85,95,CBS_DROPDOWN | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! COMBOBOX IDC_COLORCOMBO,42,89,68,81,CBS_DROPDOWN | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! PUSHBUTTON "Palette",IDC_IEPALETTE,111,89,14,12,BS_ICON |
WS_DISABLED
CONTROL "Dyeable",IDC_DYEABLE,"Button",BS_AUTOCHECKBOX |
! BS_LEFTTEXT | WS_DISABLED | WS_TABSTOP,7,106,66,9
CONTROL "Repairable",IDC_REPAIRABLE,"Button",BS_AUTOCHECKBOX |
! BS_LEFTTEXT | WS_DISABLED | WS_TABSTOP,7,117,66,10
! COMBOBOX IDC_SKILL,57,142,67,52,CBS_DROPDOWNLIST | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! EDITTEXT IDC_DAMAGEMIN,57,156,20,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_DAMAGEMAX,91,156,20,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_ARMOURMIN,57,171,20,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_ARMOURMAX,91,171,20,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_REQSTR,57,185,20,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! COMBOBOX IDC_CATEGORY,56,216,102,40,CBS_DROPDOWNLIST | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! PUSHBUTTON "Add",IDC_ADDCATEGORY,163,216,22,13,WS_DISABLED
! EDITTEXT IDC_DESCRIPTION,56,231,102,12,ES_AUTOHSCROLL |
WS_DISABLED
CONTROL "Don't Index this Item",IDC_NOINDEX,"Button",
! BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,13,244,88,11
! EDITTEXT IDC_BUYVALUE,173,75,17,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_BUYVALUEMAX,205,75,17,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_SELLVALUE,173,89,17,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_SELLVALUEMAX,205,89,17,13,ES_AUTOHSCROLL | ES_NUMBER |
! WS_DISABLED
! EDITTEXT IDC_WEIGHT,173,103,50,13,ES_AUTOHSCROLL | WS_DISABLED
! EDITTEXT IDC_HPMIN,173,117,17,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_HPMAX,205,117,17,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
CONTROL "Magical",IDC_MAGICAL,"Button",BS_AUTOCHECKBOX |
! WS_DISABLED | WS_TABSTOP,133,135,41,10
! COMBOBOX IDC_SPELLID,157,155,74,53,CBS_DROPDOWNLIST | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! EDITTEXT IDC_CHARGES,198,171,33,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_ARMOURBONUS,198,187,33,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! PUSHBUTTON "Edit",IDC_TRIGEDIT,368,243,22,13,WS_DISABLED
! EDITTEXT IDC_TRIGGERS,7,261,383,75,ES_MULTILINE | ES_AUTOVSCROLL |
ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED | WS_VSCROLL
DEFPUSHBUTTON "OK",IDOK,340,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,340,21,50,14
! LTEXT "Name",IDC_EI_SNAME,7,64,20,8
! LTEXT "Based On",IDC_EI_SBASE,7,50,32,8
! LTEXT "Type",IDC_EI_STYPE,7,77,17,8
! LTEXT "Buy Value",IDC_EI_SBUY,131,77,33,8
! LTEXT "Sell Value",IDC_EI_SSELL,131,91,32,8
! LTEXT "Weight",IDC_EI_SWEIGHT,131,105,24,8
! LTEXT "Category",IDC_EI_SCAT,13,218,29,8
! LTEXT "Description",IDC_EI_SDESC,14,234,36,8
! GROUPBOX "Axis Classifications",IDC_EI_GCLASS,7,206,183,52
! GROUPBOX "Armour / Weapon Attributes",IDC_EI_GATTR,7,131,121,72
! LTEXT "Skill",IDC_EI_SSKILL,16,143,14,8
! LTEXT "Damage",IDC_EI_SDAMAGE,16,158,28,8
! LTEXT "Armour",IDC_EI_SAR,16,173,23,8
! LTEXT "Required Str",IDC_EI_SREQSTR,16,187,40,8
! LTEXT "HitPoints",IDC_EI_SHP,131,119,29,8
! LTEXT "Color",IDC_EI_SCOLOR,7,91,17,8
! GROUPBOX "Magical Attributes",IDC_EI_GMAGIC,130,146,107,57
! LTEXT "Spell",IDC_EI_SSPELL,136,157,16,8
! LTEXT "Charges",IDC_EI_SCHARGES,136,173,27,8
! LTEXT "Armour Bonus",IDC_EI_SARBONUS,136,189,45,8
! LTEXT "DupeItem",IDC_EI_SDUPE,83,49,32,8
! LTEXT "---",IDC_EI_STATIC1,194,77,8,8,0,WS_EX_TRANSPARENT
! LTEXT "Triggers",IDC_EI_STRIG,336,248,26,8
! LTEXT "---",IDC_EI_STATIC2,194,91,8,8,0,WS_EX_TRANSPARENT
! LTEXT "---",IDC_EI_STATIC4,81,158,8,8,0,WS_EX_TRANSPARENT
! LTEXT "---",IDC_EI_STATIC5,81,173,8,8,0,WS_EX_TRANSPARENT
! LTEXT "---",IDC_EI_STATIC3,194,120,8,8,0,WS_EX_TRANSPARENT
! COMBOBOX IDC_ITEMENTRY,42,7,152,103,CBS_DROPDOWNLIST | WS_VSCROLL |
! WS_TABSTOP
! LTEXT "Entry",IDC_EI_SENTRY,13,9,17,8
! PUSHBUTTON "New",IDC_ITEM_NEW,13,26,40,12
! PUSHBUTTON "Edit",IDC_ITEM_EDIT,57,26,40,12
! PUSHBUTTON "Apply",IDC_ITEM_APPLY,103,26,40,12,NOT WS_VISIBLE
! PUSHBUTTON "Cancel",IDC_ITEM_CANCEL,147,26,40,12,NOT WS_VISIBLE
CONTROL "",IDC_ITEMDISPLAY,
"{0904F7B3-2339-44C9-857C-6EB6CFEFA3B6}",WS_TABSTOP,238,
! 43,152,161
END
--- 165,273 ----
END
! IDD_ITEMEDIT DIALOGEX 0, 0, 397, 397
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Edit Item"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
! EDITTEXT IDC_ITEMID,42,102,35,12,ES_AUTOHSCROLL | WS_DISABLED
! COMBOBOX IDC_DUPEITEM,120,102,69,81,CBS_DROPDOWN | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! EDITTEXT IDC_NAME,42,117,147,12,ES_AUTOHSCROLL | WS_DISABLED
! COMBOBOX IDC_ITEMTYPE,42,130,85,95,CBS_DROPDOWN | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! COMBOBOX IDC_COLORCOMBO,42,144,68,81,CBS_DROPDOWN | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! PUSHBUTTON "Palette",IDC_IEPALETTE,111,144,14,12,BS_ICON |
WS_DISABLED
CONTROL "Dyeable",IDC_DYEABLE,"Button",BS_AUTOCHECKBOX |
! BS_LEFTTEXT | WS_DISABLED | WS_TABSTOP,7,161,66,9
CONTROL "Repairable",IDC_REPAIRABLE,"Button",BS_AUTOCHECKBOX |
! BS_LEFTTEXT | WS_DISABLED | WS_TABSTOP,7,172,66,10
! COMBOBOX IDC_SKILL,57,197,67,52,CBS_DROPDOWNLIST | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! EDITTEXT IDC_DAMAGEMIN,57,211,20,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_DAMAGEMAX,91,211,20,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_ARMOURMIN,57,226,20,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_ARMOURMAX,91,226,20,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_REQSTR,57,240,20,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! COMBOBOX IDC_CATEGORY,56,271,102,40,CBS_DROPDOWNLIST | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! PUSHBUTTON "Add",IDC_ADDCATEGORY,163,271,22,13,WS_DISABLED
! EDITTEXT IDC_DESCRIPTION,56,286,102,12,ES_AUTOHSCROLL |
WS_DISABLED
CONTROL "Don't Index this Item",IDC_NOINDEX,"Button",
! BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,13,299,88,11
! EDITTEXT IDC_BUYVALUE,173,130,17,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_BUYVALUEMAX,205,130,17,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_SELLVALUE,173,144,17,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_SELLVALUEMAX,205,144,17,13,ES_AUTOHSCROLL |
! ES_NUMBER | WS_DISABLED
! EDITTEXT IDC_WEIGHT,173,158,50,13,ES_AUTOHSCROLL | WS_DISABLED
! EDITTEXT IDC_HPMIN,173,172,17,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_HPMAX,205,172,17,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
CONTROL "Magical",IDC_MAGICAL,"Button",BS_AUTOCHECKBOX |
! WS_DISABLED | WS_TABSTOP,133,190,41,10
! COMBOBOX IDC_SPELLID,157,210,74,53,CBS_DROPDOWNLIST | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
! EDITTEXT IDC_CHARGES,198,226,33,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! EDITTEXT IDC_ARMOURBONUS,198,242,33,13,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
! PUSHBUTTON "Edit",IDC_TRIGEDIT,368,298,22,13,WS_DISABLED
! EDITTEXT IDC_TRIGGERS,7,315,383,75,ES_MULTILINE | ES_AUTOVSCROLL |
ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED | WS_VSCROLL
DEFPUSHBUTTON "OK",IDOK,340,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,340,21,50,14
! LTEXT "Name",IDC_EI_SNAME,7,119,20,8
! LTEXT "Based On",IDC_EI_SBASE,7,105,32,8
! LTEXT "Type",IDC_EI_STYPE,7,132,17,8
! LTEXT "Buy Value",IDC_EI_SBUY,131,132,33,8
! LTEXT "Sell Value",IDC_EI_SSELL,131,146,32,8
! LTEXT "Weight",IDC_EI_SWEIGHT,131,160,24,8
! LTEXT "Category",IDC_EI_SCAT,13,273,29,8
! LTEXT "Description",IDC_EI_SDESC,14,289,36,8
! GROUPBOX "Axis Classifications",IDC_EI_GCLASS,7,261,183,52
! GROUPBOX "Armour / Weapon Attributes",IDC_EI_GATTR,7,186,121,72
! LTEXT "Skill",IDC_EI_SSKILL,16,198,14,8
! LTEXT "Damage",IDC_EI_SDAMAGE,16,213,28,8
! LTEXT "Armour",IDC_EI_SAR,16,228,23,8
! LTEXT "Required Str",IDC_EI_SREQSTR,16,242,40,8
! LTEXT "HitPoints",IDC_EI_SHP,131,174,29,8
! LTEXT "Color",IDC_EI_SCOLOR,7,146,17,8
! GROUPBOX "Magical Attributes",IDC_EI_GMAGIC,130,201,107,57
! LTEXT "Spell",IDC_EI_SSPELL,136,212,16,8
! LTEXT "Charges",IDC_EI_SCHARGES,136,228,27,8
! LTEXT "Armour Bonus",IDC_EI_SARBONUS,136,244,45,8
! LTEXT "DupeItem",IDC_EI_SDUPE,83,104,32,8
! LTEXT "---",IDC_EI_STATIC1,194,132,8,8,0,WS_EX_TRANSPARENT
! LTEXT "Triggers",IDC_EI_STRIG,336,303,26,8
! LTEXT "---",IDC_EI_STATIC2,194,146,8,8,0,WS_EX_TRANSPARENT
! LTEXT "---",IDC_EI_STATIC4,81,213,8,8,0,WS_EX_TRANSPARENT
! LTEXT "---",IDC_EI_STATIC5,81,228,8,8,0,WS_EX_TRANSPARENT
! LTEXT "---",IDC_EI_STATIC3,194,175,8,8,0,WS_EX_TRANSPARENT
! PUSHBUTTON "New",IDC_ITEM_NEW,340,53,50,14
! PUSHBUTTON "Edit",IDC_ITEM_EDIT,340,65,50,14
! PUSHBUTTON "Save Changes",IDC_ITEM_APPLY,245,103,66,12,NOT
! WS_VISIBLE
! PUSHBUTTON "Discard Changes",IDC_ITEM_CANCEL,324,103,66,12,NOT
! WS_VISIBLE
CONTROL "",IDC_ITEMDISPLAY,
"{0904F7B3-2339-44C9-857C-6EB6CFEFA3B6}",WS_TABSTOP,238,
! 119,152,140
! CONTROL "",IDC_ITEMTREE,"SysTreeView32",TVS_HASBUTTONS |
! TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS |
! WS_BORDER | WS_TABSTOP, 7,7,167,91
! CONTROL "",IDC_ITEMLIST,"SysListView32",LVS_REPORT |
! LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,176,7,162,91
END
***************
*** 1228,1232 ****
RIGHTMARGIN, 390
TOPMARGIN, 7
! BOTTOMMARGIN, 336
END
--- 1232,1236 ----
RIGHTMARGIN, 390
TOPMARGIN, 7
! BOTTOMMARGIN, 390
END
***************
*** 1489,1493 ****
0x7753, 0x726f, 0x7364, 0x616d, 0x736e, 0x6968, 0x0070,
IDC_ITEMDISPLAY, 0x376, 28, 0
! 0x0000, 0x0000, 0x0000, 0x0001, 0x1791, 0x0000, 0x1b14, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0
--- 1493,1497 ----
0x7753, 0x726f, 0x7364, 0x616d, 0x736e, 0x6968, 0x0070,
IDC_ITEMDISPLAY, 0x376, 28, 0
! 0x0000, 0x0000, 0x0000, 0x0001, 0x1791, 0x0000, 0x1791, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0
Index: ScriptsMain.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptsMain.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** ScriptsMain.cpp 16 Jul 2003 22:01:59 -0000 1.26
--- ScriptsMain.cpp 21 Jul 2003 14:13:57 -0000 1.27
***************
*** 36,39 ****
--- 36,40 ----
#include "TemplateEditDlg.h"
#include "TriggerEditDlg.h"
+ #include "WOPEditDlg.h"
#include "itemeditdlg.h"
#include "npceditdlg.h"
***************
*** 105,109 ****
_T("Stat Gain Rates"),
_T("Templates"),
! _T("Triggers")
};
--- 106,111 ----
_T("Stat Gain Rates"),
_T("Templates"),
! _T("Triggers"),
! _T("Words of Power"),
};
***************
*** 3321,3324 ****
--- 3323,3329 ----
pDlg = new CTriggerEditDlg;
break;
+ case Editor_WOP:
+ pDlg = new CWOPEditDlg;
+ break;
default:
break;
***************
*** 3475,3480 ****
if ( index >= MulCount )
return;
! if ( index > m_vFiles.size() )
! m_vMulFiles.resize(index, _T("") );
m_vMulFiles[index] = sFile;
}
--- 3480,3485 ----
if ( index >= MulCount )
return;
! if ( index >= m_vFiles.size() )
! m_vMulFiles.resize(index + 1, _T("") );
m_vMulFiles[index] = sFile;
}
***************
*** 3482,3486 ****
CString CScriptsMain::MulFile(ULONG index)
{
! if ( index < 0 || index > m_vMulFiles.size() )
return _T("");
else
--- 3487,3491 ----
CString CScriptsMain::MulFile(ULONG index)
{
! if ( index < 0 || index >= m_vMulFiles.size() )
return _T("");
else
Index: ScriptsMain.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptsMain.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** ScriptsMain.h 16 Jul 2003 22:01:59 -0000 1.17
--- ScriptsMain.h 21 Jul 2003 14:13:57 -0000 1.18
***************
*** 406,409 ****
--- 406,410 ----
Editor_Template,
Editor_Trigger,
+ Editor_WOP,
Editor_QTY
};
Index: SkillMenuEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/SkillMenuEditDlg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** SkillMenuEditDlg.cpp 9 Jul 2003 19:57:25 -0000 1.2
--- SkillMenuEditDlg.cpp 21 Jul 2003 14:13:57 -0000 1.3
***************
*** 353,362 ****
m_ctcSkillTree.DeleteAllItems();
- for (int i = 0; i < (int) m_oRootMenus.GetSize(); i++)
- {
- CSkillMenuGroup * pGroup = (CSkillMenuGroup *) m_oRootMenus.GetAt(i);
- if ( pGroup )
- delete pGroup;
- }
m_oRootMenus.RemoveAll();
}
--- 353,356 ----
***************
*** 427,507 ****
{
// Read this info from the defs.
! CString csScriptPath = Main->m_pScripts->GetScriptPath();
! for ( int i = 0; i < 2; i++ )
! {
! CString csFile;
! switch (i)
! {
! case 0:
! if (csScriptPath == _T(""))
! csFile = DEFS_FILE;
! else
! csFile.Format(_T("%s%s"), csScriptPath, DEFS_FILE);
! break;
! case 1:
! if ( Main->GetProfileType() == PROFILE_REMOTE || csScriptPath == _T("") )
! csFile = Main->GetProfileType() == PROFILE_REMOTE ? RMT_DEFS_FILE : USER_DEFS_FILE;
! else
! csFile.Format(_T("%s%s"), csScriptPath, USER_DEFS_FILE);
! break;
! }
! CStdioFile csfDefs;
! if ( csfDefs.Open(csFile, CFile::modeRead | CFile::shareDenyNone) )
! {
! BOOL bStatus = TRUE;
! CString csLine, csUp;
! while ( bStatus )
! {
! if ( csLine == _T("") )
! bStatus = csfDefs.ReadString(csLine);
! if ( !bStatus )
! break;
! csUp = csLine;
! csUp.MakeUpper();
! if ( csUp.Find(_T("[ITEM")) != -1 )
! {
! while ( bStatus )
! {
! bStatus = csfDefs.ReadString(csLine);
! if (!bStatus)
! break;
! if ( csLine.Find(_T("[")) != -1 )
! break;
! if ( csLine.Find(_T("//")) != -1 )
! csLine = csLine.Left(csLine.Find(_T("//")));
! CString csName = csLine.SpanExcluding(_T(" \t"));
! CString csValue = _T("");
! if ( csName.GetLength() != csLine.GetLength() )
! csValue = csLine.Mid(csName.GetLength());
! csValue.TrimLeft();
! csValue.TrimRight();
! csValue = csValue.SpanExcluding(_T("{"));
! int iValue = 0;
! if (csValue == _T(""))
! continue;
! if (csValue.GetAt(0) == _T('0'))
! iValue = ahextoi(csValue);
! else
! iValue = _tstoi(csValue);
! if ( iValue > 0x8000 )
! continue;
! if ( m_ccbOptions.FindStringExact(-1, csName ) == -1 )
! this->m_ccbOptions.AddString(csName);
! if ( iValue < 0x4000 && m_ccbGraphics.FindStringExact(-1, csName) == -1 )
! this->m_ccbGraphics.AddString(csName);
! }
! }
! else
! csLine = _T("");
! }
! csfDefs.Close();
! }
! else
! {
! CString csMessage;
! csMessage.Format(locale->String(IDS_SCRIPTS_CANTOPEN), csFile);
! AfxMessageBox( csMessage, MB_OK | MB_ICONEXCLAMATION );
! }
! }
}
--- 421,501 ----
{
// Read this info from the defs.
! //CString csScriptPath = Main->m_pScripts->GetScriptPath();
! //for ( int i = 0; i < 2; i++ )
! //{
! // CString csFile;
! // switch (i)
! // {
! // case 0:
! // if (csScriptPath == _T(""))
! // csFile = DEFS_FILE;
! // else
! // csFile.Format(_T("%s%s"), csScriptPath, DEFS_FILE);
! // break;
! // case 1:
! // if ( Main->GetProfileType() == PROFILE_REMOTE || csScriptPath == _T("") )
! // csFile = Main->GetProfileType() == PROFILE_REMOTE ? RMT_DEFS_FILE : USER_DEFS_FILE;
! // else
! // csFile.Format(_T("%s%s"), csScriptPath, USER_DEFS_FILE);
! // break;
! // }
! // CStdioFile csfDefs;
! // if ( csfDefs.Open(csFile, CFile::modeRead | CFile::shareDenyNone) )
! // {
! // BOOL bStatus = TRUE;
! // CString csLine, csUp;
! // while ( bStatus )
! // {
! // if ( csLine == _T("") )
! // bStatus = csfDefs.ReadString(csLine);
! // if ( !bStatus )
! // break;
! // csUp = csLine;
! // csUp.MakeUpper();
! // if ( csUp.Find(_T("[ITEM")) != -1 )
! // {
! // while ( bStatus )
! // {
! // bStatus = csfDefs.ReadString(csLine);
! // if (!bStatus)
! // break;
! // if ( csLine.Find(_T("[")) != -1 )
! // break;
! // if ( csLine.Find(_T("//")) != -1 )
! // csLine = csLine.Left(csLine.Find(_T("//")));
! // CString csName = csLine.SpanExcluding(_T(" \t"));
! // CString csValue = _T("");
! // if ( csName.GetLength() != csLine.GetLength() )
! // csValue = csLine.Mid(csName.GetLength());
! // csValue.TrimLeft();
! // csValue.TrimRight();
! // csValue = csValue.SpanExcluding(_T("{"));
! // int iValue = 0;
! // if (csValue == _T(""))
! // continue;
! // if (csValue.GetAt(0) == _T('0'))
! // iValue = ahextoi(csValue);
! // else
! // iValue = _tstoi(csValue);
! // if ( iValue > 0x8000 )
! // continue;
! // if ( m_ccbOptions.FindStringExact(-1, csName ) == -1 )
! // this->m_ccbOptions.AddString(csName);
! // if ( iValue < 0x4000 && m_ccbGraphics.FindStringExact(-1, csName) == -1 )
! // this->m_ccbGraphics.AddString(csName);
! // }
! // }
! // else
! // csLine = _T("");
! // }
! // csfDefs.Close();
! // }
! // else
! // {
! // CString csMessage;
! // csMessage.Format(locale->String(IDS_SCRIPTS_CANTOPEN), csFile);
! // AfxMessageBox( csMessage, MB_OK | MB_ICONEXCLAMATION );
! // }
! //}
}
***************
*** 1027,1030 ****
--- 1021,1025 ----
void CSkillMenuEditDlg::LoadSkillMenu()
{
+ /* We really shouldn't be loading the skill menus here
CString csScriptPath = Main->m_pScripts->GetScriptPath();
CString csFile;
***************
*** 1259,1262 ****
--- 1254,1258 ----
}
return;
+ */
}
Index: strings.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/strings.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** strings.h 10 Jul 2003 21:49:37 -0000 1.7
--- strings.h 21 Jul 2003 14:13:57 -0000 1.8
***************
*** 181,184 ****
--- 181,185 ----
#define IDS_ACCTEDIT_CLOSEWARN 230
#define IDS_ACCTEDIT_CANTOPEN 231
+ #define IDS_ITEMGEN_DESCRIPTION 498
#define IDS_ITEMGEN_ID 511
#define IDS_SGEDIT_CAPTION 428
Index: WOPEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/WOPEditDlg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** WOPEditDlg.cpp 9 Jul 2003 19:57:25 -0000 1.2
--- WOPEditDlg.cpp 21 Jul 2003 14:13:57 -0000 1.3
***************
*** 175,180 ****
Localize();
- Main->m_pScripts->LoadTables();
-
for ( int i = 0; i < Main->m_pScripts->m_tables.m_runes.GetSize(); i++ )
{
--- 175,178 ----
|
|
From: Philip E. <pes...@us...> - 2003-07-21 14:13:59
|
Update of /cvsroot/sphere-axis/Axis In directory sc8-pr-cvs1:/tmp/cvs-serv20136 Modified Files: axis_enu.xml Log Message: no message Index: axis_enu.xml =================================================================== RCS file: /cvsroot/sphere-axis/Axis/axis_enu.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** axis_enu.xml 13 Jun 2003 19:58:08 -0000 1.5 --- axis_enu.xml 21 Jul 2003 14:13:56 -0000 1.6 *************** *** 436,509 **** </Dialog> <Dialog ID="149" Caption="Edit Item"> ! <Item ID="1151" type="EDITTEXT" geometry="42,47,35,12"></Item> ! <Item ID="1207" type="COMBOBOX" geometry="120,47,69,81"></Item> ! <Item ID="1158" type="EDITTEXT" geometry="42,62,147,12"></Item> ! <Item ID="1062" type="COMBOBOX" geometry="42,75,85,95"></Item> ! <Item ID="1061" type="COMBOBOX" geometry="42,89,68,81"></Item> ! <Item ID="1003" type="PUSHBUTTON" geometry="111,89,14,12">"Palette"</Item> ! <Item ID="1033" type="CONTROL" geometry="7,106,66,9">"Dyeable"</Item> ! <Item ID="1034" type="CONTROL" geometry="7,117,66,10">"Repairable"</Item> ! <Item ID="1189" type="COMBOBOX" geometry="57,142,67,52"></Item> ! <Item ID="1190" type="EDITTEXT" geometry="57,156,20,13"></Item> ! <Item ID="1191" type="EDITTEXT" geometry="91,156,20,13"></Item> ! <Item ID="1192" type="EDITTEXT" geometry="57,171,20,13"></Item> ! <Item ID="1193" type="EDITTEXT" geometry="91,171,20,13"></Item> ! <Item ID="1194" type="EDITTEXT" geometry="57,185,20,13"></Item> ! <Item ID="1171" type="COMBOBOX" geometry="56,216,102,40"></Item> ! <Item ID="1203" type="PUSHBUTTON" geometry="163,216,22,13">"Add"</Item> ! <Item ID="1172" type="COMBOBOX" geometry="56,229,102,33"></Item> ! <Item ID="1204" type="PUSHBUTTON" geometry="163,230,22,13">"Add"</Item> ! <Item ID="1173" type="EDITTEXT" geometry="56,242,102,12"></Item> ! <Item ID="1036" type="CONTROL" geometry="13,255,88,11">"Don't Index this Item"</Item> ! <Item ID="1063" type="EDITTEXT" geometry="173,75,17,13"></Item> ! <Item ID="1068" type="EDITTEXT" geometry="205,75,17,13"></Item> ! <Item ID="1064" type="EDITTEXT" geometry="173,89,17,13"></Item> ! <Item ID="1069" type="EDITTEXT" geometry="205,89,17,13"></Item> ! <Item ID="1065" type="EDITTEXT" geometry="173,103,50,13"></Item> ! <Item ID="1066" type="EDITTEXT" geometry="173,117,17,13"></Item> ! <Item ID="1067" type="EDITTEXT" geometry="205,117,17,13"></Item> ! <Item ID="1035" type="CONTROL" geometry="133,135,41,10">"Magical"</Item> ! <Item ID="1196" type="COMBOBOX" geometry="157,155,74,53"></Item> ! <Item ID="1197" type="EDITTEXT" geometry="198,171,33,13"></Item> ! <Item ID="1198" type="EDITTEXT" geometry="198,187,33,13"></Item> ! <Item ID="1001" type="PUSHBUTTON" geometry="368,254,22,13">"Edit"</Item> ! <Item ID="1059" type="EDITTEXT" geometry="7,269,383,67"></Item> <Item ID="1" type="DEFPUSHBUTTON" geometry="340,7,50,14">"OK"</Item> <Item ID="2" type="PUSHBUTTON" geometry="340,21,50,14">"Cancel"</Item> ! <Item ID="1501" type="LTEXT" geometry="7,64,20,8">"Name"</Item> ! <Item ID="1202" type="LTEXT" geometry="7,50,32,8">"Based On"</Item> ! <Item ID="1502" type="LTEXT" geometry="7,77,17,8">"Type"</Item> ! <Item ID="1504" type="LTEXT" geometry="131,77,33,8">"Buy Value"</Item> ! <Item ID="1505" type="LTEXT" geometry="131,91,32,8">"Sell Value"</Item> ! <Item ID="1506" type="LTEXT" geometry="131,105,24,8">"Weight"</Item> ! <Item ID="1518" type="LTEXT" geometry="13,218,29,8">"Category"</Item> ! <Item ID="1519" type="LTEXT" geometry="13,233,36,8">"Subsection"</Item> ! <Item ID="1520" type="LTEXT" geometry="14,245,36,8">"Description"</Item> ! <Item ID="1509" type="GROUPBOX" geometry="7,206,183,61">"Axis Classifications"</Item> ! <Item ID="1508" type="GROUPBOX" geometry="7,131,121,72">"Armour / Weapon Attributes"</Item> ! <Item ID="1511" type="LTEXT" geometry="16,143,14,8">"Skill"</Item> ! <Item ID="1512" type="LTEXT" geometry="16,158,28,8">"Damage"</Item> ! <Item ID="1513" type="LTEXT" geometry="16,173,23,8">"Armour"</Item> ! <Item ID="1514" type="LTEXT" geometry="16,187,40,8">"Required Str"</Item> ! <Item ID="1507" type="LTEXT" geometry="131,119,29,8">"HitPoints"</Item> ! <Item ID="1503" type="LTEXT" geometry="7,91,17,8">"Color"</Item> ! <Item ID="1510" type="GROUPBOX" geometry="130,146,107,57">"Magical Attributes"</Item> ! <Item ID="1515" type="LTEXT" geometry="136,157,16,8">"Spell"</Item> ! <Item ID="1516" type="LTEXT" geometry="136,173,27,8">"Charges"</Item> ! <Item ID="1517" type="LTEXT" geometry="136,189,45,8">"Armour Bonus"</Item> ! <Item ID="1500" type="LTEXT" geometry="83,49,32,8">"DupeItem"</Item> ! <Item ID="1784" type="LTEXT" geometry="194,77,8,8">"---"</Item> ! <Item ID="1521" type="LTEXT" geometry="336,259,26,8">"Triggers"</Item> ! <Item ID="1785" type="LTEXT" geometry="194,91,8,8">"---"</Item> ! <Item ID="1786" type="LTEXT" geometry="81,158,8,8">"---"</Item> ! <Item ID="1787" type="LTEXT" geometry="81,173,8,8">"---"</Item> ! <Item ID="1788" type="LTEXT" geometry="194,120,8,8">"---"</Item> ! <Item ID="1351" type="COMBOBOX" geometry="42,7,152,103"></Item> ! <Item ID="1499" type="LTEXT" geometry="13,9,17,8">"Entry"</Item> ! <Item ID="1004" type="PUSHBUTTON" geometry="13,26,40,12">"New"</Item> ! <Item ID="1005" type="PUSHBUTTON" geometry="57,26,40,12">"Edit"</Item> ! <Item ID="1006" type="PUSHBUTTON" geometry="103,26,40,12">"Apply"</Item> ! <Item ID="1007" type="PUSHBUTTON" geometry="147,26,40,12">"Cancel"</Item> ! <Item ID="1352" type="CONTROL" geometry="250,38,140,140">""</Item> </Dialog> <Dialog ID="151" Caption="NPC Editor"> --- 436,506 ---- </Dialog> <Dialog ID="149" Caption="Edit Item"> ! <Item ID="235" type="CONTROL" geometry="7,7,167,91">""</Item> ! <Item ID="236" type="CONTROL" geometry="176,7,162,91">""</Item> ! <Item ID="1151" type="EDITTEXT" geometry="42,102,35,12"></Item> ! <Item ID="1207" type="COMBOBOX" geometry="120,102,69,81"></Item> ! <Item ID="1158" type="EDITTEXT" geometry="42,117,147,12"></Item> ! <Item ID="1062" type="COMBOBOX" geometry="42,130,85,95"></Item> ! <Item ID="1061" type="COMBOBOX" geometry="42,144,68,81"></Item> ! <Item ID="1003" type="PUSHBUTTON" geometry="111,144,14,12">"Palette"</Item> ! <Item ID="1033" type="CONTROL" geometry="7,161,66,9">"Dyeable"</Item> ! <Item ID="1034" type="CONTROL" geometry="7,172,66,10">"Repairable"</Item> ! <Item ID="1189" type="COMBOBOX" geometry="57,197,67,52"></Item> ! <Item ID="1190" type="EDITTEXT" geometry="57,211,20,13"></Item> ! <Item ID="1191" type="EDITTEXT" geometry="91,211,20,13"></Item> ! <Item ID="1192" type="EDITTEXT" geometry="57,226,20,13"></Item> ! <Item ID="1193" type="EDITTEXT" geometry="91,226,20,13"></Item> ! <Item ID="1194" type="EDITTEXT" geometry="57,240,20,13"></Item> ! <Item ID="1171" type="COMBOBOX" geometry="56,271,102,40"></Item> ! <Item ID="1203" type="PUSHBUTTON" geometry="163,271,22,13">"Add"</Item> ! <Item ID="1173" type="EDITTEXT" geometry="56,286,102,12"></Item> ! <Item ID="1036" type="CONTROL" geometry="13,299,88,11">"Don't Index this Item"</Item> ! <Item ID="1063" type="EDITTEXT" geometry="173,130,17,13"></Item> ! <Item ID="1068" type="EDITTEXT" geometry="205,130,17,13"></Item> ! <Item ID="1064" type="EDITTEXT" geometry="173,144,17,13"></Item> ! <Item ID="1069" type="EDITTEXT" geometry="205,144,17,13"></Item> ! <Item ID="1065" type="EDITTEXT" geometry="173,158,50,13"></Item> ! <Item ID="1066" type="EDITTEXT" geometry="173,172,17,13"></Item> ! <Item ID="1067" type="EDITTEXT" geometry="205,172,17,13"></Item> ! <Item ID="1035" type="CONTROL" geometry="133,190,41,10">"Magical"</Item> ! <Item ID="1196" type="COMBOBOX" geometry="157,210,74,53"></Item> ! <Item ID="1197" type="EDITTEXT" geometry="198,226,33,13"></Item> ! <Item ID="1198" type="EDITTEXT" geometry="198,242,33,13"></Item> ! <Item ID="1001" type="PUSHBUTTON" geometry="368,298,22,13">"Edit"</Item> ! <Item ID="1059" type="EDITTEXT" geometry="7,315,383,75"></Item> <Item ID="1" type="DEFPUSHBUTTON" geometry="340,7,50,14">"OK"</Item> <Item ID="2" type="PUSHBUTTON" geometry="340,21,50,14">"Cancel"</Item> ! <Item ID="1501" type="LTEXT" geometry="7,119,20,8">"Name"</Item> ! <Item ID="1202" type="LTEXT" geometry="7,105,32,8">"Based On"</Item> ! <Item ID="1502" type="LTEXT" geometry="7,132,17,8">"Type"</Item> ! <Item ID="1504" type="LTEXT" geometry="131,132,33,8">"Buy Value"</Item> ! <Item ID="1505" type="LTEXT" geometry="131,146,32,8">"Sell Value"</Item> ! <Item ID="1506" type="LTEXT" geometry="131,160,24,8">"Weight"</Item> ! <Item ID="1518" type="LTEXT" geometry="13,273,29,8">"Category"</Item> ! <Item ID="1520" type="LTEXT" geometry="14,289,36,8">"Description"</Item> ! <Item ID="1509" type="GROUPBOX" geometry="7,261,183,52">"Axis Classifications"</Item> ! <Item ID="1508" type="GROUPBOX" geometry="7,186,121,72">"Armour / Weapon Attributes"</Item> ! <Item ID="1511" type="LTEXT" geometry="16,198,14,8">"Skill"</Item> ! <Item ID="1512" type="LTEXT" geometry="16,213,28,8">"Damage"</Item> ! <Item ID="1513" type="LTEXT" geometry="16,228,23,8">"Armour"</Item> ! <Item ID="1514" type="LTEXT" geometry="16,242,40,8">"Required Str"</Item> ! <Item ID="1507" type="LTEXT" geometry="131,174,29,8">"HitPoints"</Item> ! <Item ID="1503" type="LTEXT" geometry="7,146,17,8">"Color"</Item> ! <Item ID="1510" type="GROUPBOX" geometry="130,201,107,57">"Magical Attributes"</Item> ! <Item ID="1515" type="LTEXT" geometry="136,212,16,8">"Spell"</Item> ! <Item ID="1516" type="LTEXT" geometry="136,228,27,8">"Charges"</Item> ! <Item ID="1517" type="LTEXT" geometry="136,244,45,8">"Armour Bonus"</Item> ! <Item ID="1500" type="LTEXT" geometry="83,104,32,8">"DupeItem"</Item> ! <Item ID="1784" type="LTEXT" geometry="194,132,8,8">"---"</Item> ! <Item ID="1521" type="LTEXT" geometry="336,303,26,8">"Triggers"</Item> ! <Item ID="1785" type="LTEXT" geometry="194,146,8,8">"---"</Item> ! <Item ID="1787" type="LTEXT" geometry="81,213,8,8">"---"</Item> ! <Item ID="1788" type="LTEXT" geometry="81,228,8,8">"---"</Item> ! <Item ID="1786" type="LTEXT" geometry="194,175,8,8">"---"</Item> ! <Item ID="1004" type="PUSHBUTTON" geometry="340,53,50,14">"New"</Item> ! <Item ID="1005" type="PUSHBUTTON" geometry="340,65,50,14">"Edit"</Item> ! <Item ID="1006" type="PUSHBUTTON" geometry="245,103,66,12">"Save Changes"</Item> ! <Item ID="1007" type="PUSHBUTTON" geometry="324,103,66,12">"Discard Changes"</Item> ! <Item ID="1352" type="CONTROL" geometry="238,119,152,140">""</Item> </Dialog> <Dialog ID="151" Caption="NPC Editor"> |
|
From: Philip E. <pes...@us...> - 2003-07-17 22:09:09
|
Update of /cvsroot/sphere-axis/Axis/S_Sphere52
In directory sc8-pr-cvs1:/tmp/cvs-serv6936/S_Sphere52
Modified Files:
itemeditdlg.cpp npceditdlg.cpp npceditdlg.h Resource.h
S_Sphere52.rc
Log Message:
no message
Index: itemeditdlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/itemeditdlg.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** itemeditdlg.cpp 10 Jul 2003 21:49:36 -0000 1.3
--- itemeditdlg.cpp 17 Jul 2003 22:09:06 -0000 1.4
***************
*** 241,244 ****
--- 241,252 ----
}
+ m_Display.SetMulPath(Main->m_pScripts->MulPath());
+ for ( ULONG i = Map0; i < MulCount; i++ )
+ {
+ CString s = Main->m_pScripts->MulFile(i);
+ if ( s != _T("") )
+ m_Display.SetCustomMulFile((short) i, s);
+ }
+
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
Index: npceditdlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/npceditdlg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** npceditdlg.cpp 11 Jul 2003 17:25:25 -0000 1.4
--- npceditdlg.cpp 17 Jul 2003 22:09:06 -0000 1.5
***************
*** 117,121 ****
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CNPCEditDlg)
! DDX_Control(pDX, IDC_NPCIMAGE, m_csDisplay);
DDX_Control(pDX, IDC_NPCNOINDEX, m_cbNoIndex);
DDX_Control(pDX, IDC_NPCDISABLEDISPLAY, m_cbDisableDisplay);
--- 117,121 ----
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CNPCEditDlg)
! DDX_Control(pDX, IDC_NPCIMAGE, m_Display);
DDX_Control(pDX, IDC_NPCNOINDEX, m_cbNoIndex);
DDX_Control(pDX, IDC_NPCDISABLEDISPLAY, m_cbDisableDisplay);
***************
*** 261,264 ****
--- 261,273 ----
if ( this->m_bNewMode )
this->OnNewnpc();
+
+ m_Display.SetMulPath(Main->m_pScripts->MulPath());
+ for ( ULONG i = Map0; i < MulCount; i++ )
+ {
+ CString s = Main->m_pScripts->MulFile(i);
+ if ( s != _T("") )
+ m_Display.SetCustomMulFile((short) i, s);
+ }
+
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
***************
*** 2030,2034 ****
void CNPCEditDlg::DrawNPC()
{
- // We really should be using the UOArt control here
}
--- 2039,2042 ----
***************
*** 2114,2118 ****
{
locale->LocalizeWindow(IDD, 0, NULL, (CWnd*)this);
! locale->LocalizeWindow(IDD, IDC_NPCIMAGE, (CWnd*)&m_csDisplay, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_NPCNOINDEX, (CWnd*)&m_cbNoIndex, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_NPCDISABLEDISPLAY, (CWnd*)&m_cbDisableDisplay, (CWnd*)this);
--- 2122,2126 ----
{
locale->LocalizeWindow(IDD, 0, NULL, (CWnd*)this);
! locale->LocalizeWindow(IDD, IDC_NPCIMAGE, (CWnd*)&m_Display, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_NPCNOINDEX, (CWnd*)&m_cbNoIndex, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_NPCDISABLEDISPLAY, (CWnd*)&m_cbDisableDisplay, (CWnd*)this);
Index: npceditdlg.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/npceditdlg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** npceditdlg.h 9 Jul 2003 19:57:25 -0000 1.2
--- npceditdlg.h 17 Jul 2003 22:09:06 -0000 1.3
***************
*** 32,35 ****
--- 32,36 ----
#include "CategoryTree.h"
+ #include "uoart.h"
/////////////////////////////////////////////////////////////////////////////
***************
*** 50,54 ****
//{{AFX_DATA(CNPCEditDlg)
enum { IDD = IDD_NPCEDIT_DLG };
! CStatic m_csDisplay;
CButton m_cbNoIndex;
CButton m_cbDisableDisplay;
--- 51,55 ----
//{{AFX_DATA(CNPCEditDlg)
enum { IDD = IDD_NPCEDIT_DLG };
! CUOArt m_Display;
CButton m_cbNoIndex;
CButton m_cbDisableDisplay;
Index: Resource.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Resource.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Resource.h 10 Jul 2003 21:49:36 -0000 1.9
--- Resource.h 17 Jul 2003 22:09:06 -0000 1.10
***************
*** 76,79 ****
--- 76,80 ----
#define IDC_PROFILE_DISCARD 232
#define IDC_UOMAPCTRL1 232
+ #define IDC_UOARTCTRL1 234
#define IDI_UPARROW 237
#define IDI_DOWNARROW 238
***************
*** 686,692 ****
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE 205
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 234
#define _APS_NEXT_SYMED_VALUE 104
#endif
--- 687,693 ----
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE 206
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 235
#define _APS_NEXT_SYMED_VALUE 104
#endif
Index: S_Sphere52.rc
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/S_Sphere52.rc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** S_Sphere52.rc 11 Jul 2003 17:25:25 -0000 1.12
--- S_Sphere52.rc 17 Jul 2003 22:09:06 -0000 1.13
***************
*** 362,367 ****
LTEXT "Subsection",IDC_NE_STATIC18,304,167,36,8
LTEXT "Description",IDC_NE_STATIC19,304,182,36,8
! CONTROL "",IDC_NPCIMAGE,"Static",SS_BITMAP | SS_CENTERIMAGE,300,
! 27,124,110
END
--- 362,367 ----
LTEXT "Subsection",IDC_NE_STATIC18,304,167,36,8
LTEXT "Description",IDC_NE_STATIC19,304,182,36,8
! CONTROL "",IDC_NPCIMAGE,"{0904F7B3-2339-44C9-857C-6EB6CFEFA3B6}",
! WS_TABSTOP,300,27,135,110
END
***************
*** 1499,1502 ****
--- 1499,1510 ----
0x0000, 0x0000, 0x0000, 0x0001, 0x2aca, 0x0000, 0x2a60, 0x0000, 0x0000,
0x0000, 0x0001, 0x000c, 0x0008, 0x0000, "\000"
+ 0
+ END
+
+ IDD_NPCEDIT_DLG DLGINIT
+ BEGIN
+ IDC_NPCIMAGE, 0x376, 28, 0
+ 0x0000, 0x0000, 0x0000, 0x0001, 0x14fb, 0x0000, 0x1280, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0
END
|
