Menu
▾
▴
seq-cvs-commit — syncmail generated CVS commit notifications
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(18) |
Oct
(11) |
Nov
(9) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
(6) |
Mar
|
Apr
(10) |
May
(38) |
Jun
(15) |
Jul
(32) |
Aug
|
Sep
(17) |
Oct
(11) |
Nov
|
Dec
(14) |
| 2006 |
Jan
(2) |
Feb
(5) |
Mar
(3) |
Apr
(2) |
May
(3) |
Jun
(7) |
Jul
|
Aug
|
Sep
(3) |
Oct
(2) |
Nov
(6) |
Dec
(3) |
| 2007 |
Jan
|
Feb
(17) |
Mar
(5) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
(11) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
(6) |
Jul
|
Aug
|
Sep
(6) |
Oct
(4) |
Nov
(1) |
Dec
|
| 2009 |
Jan
(3) |
Feb
(2) |
Mar
(4) |
Apr
|
May
(4) |
Jun
(3) |
Jul
|
Aug
(5) |
Sep
(3) |
Oct
(2) |
Nov
|
Dec
(6) |
| 2010 |
Jan
|
Feb
(6) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(8) |
Aug
|
Sep
(2) |
Oct
(2) |
Nov
(4) |
Dec
(5) |
| 2013 |
Jan
(2) |
Feb
|
Mar
(2) |
Apr
(2) |
May
(1) |
Jun
(2) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(2) |
Nov
(2) |
Dec
(2) |
| 2014 |
Jan
(3) |
Feb
(2) |
Mar
(3) |
Apr
(4) |
May
(4) |
Jun
(3) |
Jul
(4) |
Aug
(5) |
Sep
|
Oct
(2) |
Nov
(5) |
Dec
(2) |
| 2015 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
(2) |
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
(10) |
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(4) |
Aug
(2) |
Sep
(2) |
Oct
(3) |
Nov
(4) |
Dec
(2) |
| 2017 |
Jan
(2) |
Feb
|
Mar
(2) |
Apr
(4) |
May
(2) |
Jun
(2) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2018 |
Jan
(4) |
Feb
(2) |
Mar
(2) |
Apr
(2) |
May
(2) |
Jun
(2) |
Jul
(8) |
Aug
(2) |
Sep
(2) |
Oct
(2) |
Nov
(4) |
Dec
(6) |
| 2019 |
Jan
(2) |
Feb
(2) |
Mar
(2) |
Apr
(4) |
May
(2) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(2) |
Oct
(13) |
Nov
(6) |
Dec
(4) |
| 2020 |
Jan
(7) |
Feb
(7) |
Mar
(7) |
Apr
(8) |
May
(5) |
Jun
(3) |
Jul
(10) |
Aug
(4) |
Sep
|
Oct
(37) |
Nov
(30) |
Dec
(8) |
| 2021 |
Jan
(14) |
Feb
(9) |
Mar
(7) |
Apr
(17) |
May
(3) |
Jun
(10) |
Jul
(7) |
Aug
(3) |
Sep
(3) |
Oct
(4) |
Nov
(15) |
Dec
(22) |
| 2022 |
Jan
(3) |
Feb
(3) |
Mar
(3) |
Apr
(3) |
May
(3) |
Jun
(3) |
Jul
(3) |
Aug
(5) |
Sep
(6) |
Oct
(4) |
Nov
(34) |
Dec
(17) |
| 2023 |
Jan
(3) |
Feb
(3) |
Mar
(29) |
Apr
(2) |
May
(18) |
Jun
(12) |
Jul
(12) |
Aug
(2) |
Sep
(7) |
Oct
(2) |
Nov
(2) |
Dec
(2) |
| 2024 |
Jan
(2) |
Feb
(10) |
Mar
(17) |
Apr
(6) |
May
(3) |
Jun
(9) |
Jul
(22) |
Aug
(48) |
Sep
(3) |
Oct
(2) |
Nov
(2) |
Dec
(8) |
| 2025 |
Jan
(3) |
Feb
(2) |
Mar
(9) |
Apr
(7) |
May
(3) |
Jun
(3) |
Jul
(2) |
Aug
(2) |
Sep
(11) |
Oct
(6) |
Nov
(9) |
Dec
(4) |
| 2026 |
Jan
(5) |
Feb
(6) |
Mar
(3) |
Apr
(7) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Erik B. <do...@us...> - 2004-11-07 22:41:40
|
Update of /cvsroot/seq/showeq In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11821 Modified Files: Tag: pre_v5_0_dev2 ChangeLog Log Message: Removed stuff from build that wasn't ready for mainline, incremented to 5.0.0.16 Index: ChangeLog =================================================================== RCS file: /cvsroot/seq/showeq/Attic/ChangeLog,v retrieving revision 1.1.2.2.2.7 retrieving revision 1.1.2.2.2.8 diff -u -d -r1.1.2.2.2.7 -r1.1.2.2.2.8 --- ChangeLog 6 Nov 2004 18:58:51 -0000 1.1.2.2.2.7 +++ ChangeLog 7 Nov 2004 22:41:29 -0000 1.1.2.2.2.8 @@ -1,4 +1,9 @@ Version: $Id$ $Name$ + +dohpaZ (11/7/04) +------------------------ ++ Updated version to 5.0.0.16 + dohpaZ (11/6/04) ------------------------ + Minor 64-bit compatibility cleanup. |
|
From: Erik B. <do...@us...> - 2004-11-07 22:41:40
|
Update of /cvsroot/seq/showeq/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11821/src Modified Files: Tag: pre_v5_0_dev2 Makefile.am Log Message: Removed stuff from build that wasn't ready for mainline, incremented to 5.0.0.16 Index: Makefile.am =================================================================== RCS file: /cvsroot/seq/showeq/src/Makefile.am,v retrieving revision 1.22.6.5.2.3 retrieving revision 1.22.6.5.2.4 diff -u -d -r1.22.6.5.2.3 -r1.22.6.5.2.4 --- Makefile.am 6 Nov 2004 18:58:51 -0000 1.22.6.5.2.3 +++ Makefile.am 7 Nov 2004 22:41:30 -0000 1.22.6.5.2.4 @@ -10,7 +10,7 @@ ITEMDB_SRCS = itemdb.cpp gdbmconv.cpp $(DB3_SRCS) nodist_ITEMDB_SRCS = -bin_PROGRAMS = showeq showeqitemdbtool patcher +bin_PROGRAMS = showeq showeqitemdbtool showeq_SOURCES = main.cpp spawn.cpp spawnshell.cpp spawnlist.cpp spellshell.cpp \ spelllist.cpp vpacket.cpp editor.cpp filter.cpp packetfragment.cpp packetstream.cpp \ @@ -90,16 +90,6 @@ showeq_LDADD = $(QT_LDFLAGS) $(QTLIB) $(DB3_LIBS) $(LIBPTHREAD) $(MEMORY_LIBS) \ $(PROFILE_LIBS) $(SHOWEQ_RPATH) $(USER_LDFLAGS) -patcher_SOURCES = testpatcher.cpp patchdialogreceiver.cpp patcher.cpp diagnosticmessageslight.cpp datalocationmgr.cpp - -nodist_patcher_SOURCES = patcher.moc patchdialogreceiver.moc - -patcher_LDADD = $(QT_LDFLAGS) -lqui $(QTLIB) $(LIBPTHREAD) $(MEMORY_LIBS) \ - $(PROFILE_LIBS) $(SHOWEQ_RPATH) $(USER_LDFLAGS) - -$(srcdir)/patcher.cpp: patcher.moc -$(srcdir)/patchdialogreceiver.cpp: patchdialogreceiver.moc - showeqitemdbtool_SOURCES = itemdbtool.cpp util.cpp diagnosticmessageslight.cpp datalocationmgr.cpp $(ITEMDB_SRCS) nodist_showeqitemdbtool_SOURCES = $(nodist_ITEMDB_SRCS) showeqitemdbtool_LDADD = $(QT_LDFLAGS) $(DB3_LIBS) $(QTLIB) $(LIBPTHREAD) $(SHOWEQ_RPATH) $(USER_LDFLAGS) @@ -142,7 +132,7 @@ EXTRA_DIST = h2info.pl -noinst_HEADERS = classes.h compass.h everquest.h interface.h main.h map.h filter.h vpacket.h editor.h packet.h packetcapture.h packetcommon.h packetformat.h packetstream.h packetfragment.h packetinfo.h races.h skills.h spells.h util.h experiencelog.h combatlog.h spawn.h spawnshell.h spawnlist.h spellshell.h spelllist.h languages.h weapons.h weapons1.h weapons27.h weapons28.h weapons2b.h decode.h itemdb.h gdbmconv.h cgiconv.h skilllist.h statlist.h db3conv.h dbcommon.h deity.h player.h crctab.h filtermgr.h point.h pointarray.h mapcore.h category.h compassframe.h group.h guild.h fixpt.h netdiag.h zones.h logger.h xmlconv.h xmlpreferences.h seqwindow.h seqlistview.h zonemgr.h spawnmonitor.h spawnpointlist.h typenames.h spawnlistcommon.h spawnlist2.h datetimemgr.h spawnlog.h packetlog.h datalocationmgr.h eqstr.h messages.h messagefilter.h messagewindow.h messageshell.h terminal.h filteredspawnlog.h messagefilterdialog.h diagnosticmessages.h mapicon.h mapicondialog.ui mapicondialog.ui.h filternotifications.h netstream.h guildshell.h guildlist.h bazaarlog.h message.h s_everquest.h staticspells.h patcher.h patchdialogreceiver.h +noinst_HEADERS = classes.h compass.h everquest.h interface.h main.h map.h filter.h vpacket.h editor.h packet.h packetcapture.h packetcommon.h packetformat.h packetstream.h packetfragment.h packetinfo.h races.h skills.h spells.h util.h experiencelog.h combatlog.h spawn.h spawnshell.h spawnlist.h spellshell.h spelllist.h languages.h weapons.h weapons1.h weapons27.h weapons28.h weapons2b.h decode.h itemdb.h gdbmconv.h cgiconv.h skilllist.h statlist.h db3conv.h dbcommon.h deity.h player.h crctab.h filtermgr.h point.h pointarray.h mapcore.h category.h compassframe.h group.h guild.h fixpt.h netdiag.h zones.h logger.h xmlconv.h xmlpreferences.h seqwindow.h seqlistview.h zonemgr.h spawnmonitor.h spawnpointlist.h typenames.h spawnlistcommon.h spawnlist2.h datetimemgr.h spawnlog.h packetlog.h datalocationmgr.h eqstr.h messages.h messagefilter.h messagewindow.h messageshell.h terminal.h filteredspawnlog.h messagefilterdialog.h diagnosticmessages.h mapicon.h mapicondialog.ui mapicondialog.ui.h filternotifications.h netstream.h guildshell.h guildlist.h bazaarlog.h message.h s_everquest.h staticspells.h CLEANFILES = $(nodist_showeq_SOURCES) |
|
From: Erik B. <do...@us...> - 2004-11-06 18:59:05
|
Update of /cvsroot/seq/showeq/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18666/src Modified Files: Tag: pre_v5_0_dev2 Makefile.am editor.cpp everquest.h interface.cpp interface.h itemdbtool.cpp packetlog.cpp packetstream.cpp player.cpp player.h xmlpreferences.cpp Log Message: x86_64 and gcc 3.4.2 changes Index: player.h =================================================================== RCS file: /cvsroot/seq/showeq/src/player.h,v retrieving revision 1.21.6.2 retrieving revision 1.21.6.2.2.1 diff -u -d -r1.21.6.2 -r1.21.6.2.2.1 --- player.h 16 Jan 2004 20:22:11 -0000 1.21.6.2 +++ player.h 6 Nov 2004 18:58:52 -0000 1.21.6.2.2.1 @@ -132,7 +132,7 @@ signals: void newPlayer(void); void buffLoad(const spellBuff*); - void newSpeed (int speed); + void newSpeed (double speed); void statChanged ( int statNum, int val, int max Index: packetstream.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/packetstream.cpp,v retrieving revision 1.1.6.4.2.1 retrieving revision 1.1.6.4.2.2 diff -u -d -r1.1.6.4.2.1 -r1.1.6.4.2.2 --- packetstream.cpp 2 Oct 2004 21:36:36 -0000 1.1.6.4.2.1 +++ packetstream.cpp 6 Nov 2004 18:58:52 -0000 1.1.6.4.2.2 @@ -695,7 +695,7 @@ if (!found && !opcodeEntry->isEmpty()) { QString tempStr; - tempStr.sprintf("%s (%#04x) (dataLen: %d) doesn't match:", + tempStr.sprintf("%s (%#04x) (dataLen: %u) doesn't match:", (const char*)opcodeEntry->name(), opcodeEntry->opcode(), len); Index: itemdbtool.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/itemdbtool.cpp,v retrieving revision 1.11.6.3 retrieving revision 1.11.6.3.2.1 diff -u -d -r1.11.6.3 -r1.11.6.3.2.1 --- itemdbtool.cpp 24 Sep 2004 04:25:53 -0000 1.11.6.3 +++ itemdbtool.cpp 6 Nov 2004 18:58:52 -0000 1.11.6.3.2.1 @@ -1683,7 +1683,7 @@ printf("001: "); uint8_t fieldCount = 1; uint8_t col = 5; - size_t fieldWidth; + int fieldWidth; const char* curPos = rawData; const char* endField; Index: Makefile.am =================================================================== RCS file: /cvsroot/seq/showeq/src/Makefile.am,v retrieving revision 1.22.6.5.2.2 retrieving revision 1.22.6.5.2.3 diff -u -d -r1.22.6.5.2.2 -r1.22.6.5.2.3 --- Makefile.am 2 Oct 2004 21:36:23 -0000 1.22.6.5.2.2 +++ Makefile.am 6 Nov 2004 18:58:51 -0000 1.22.6.5.2.3 @@ -10,7 +10,7 @@ ITEMDB_SRCS = itemdb.cpp gdbmconv.cpp $(DB3_SRCS) nodist_ITEMDB_SRCS = -bin_PROGRAMS = showeq showeqitemdbtool +bin_PROGRAMS = showeq showeqitemdbtool patcher showeq_SOURCES = main.cpp spawn.cpp spawnshell.cpp spawnlist.cpp spellshell.cpp \ spelllist.cpp vpacket.cpp editor.cpp filter.cpp packetfragment.cpp packetstream.cpp \ @@ -90,6 +90,15 @@ showeq_LDADD = $(QT_LDFLAGS) $(QTLIB) $(DB3_LIBS) $(LIBPTHREAD) $(MEMORY_LIBS) \ $(PROFILE_LIBS) $(SHOWEQ_RPATH) $(USER_LDFLAGS) +patcher_SOURCES = testpatcher.cpp patchdialogreceiver.cpp patcher.cpp diagnosticmessageslight.cpp datalocationmgr.cpp + +nodist_patcher_SOURCES = patcher.moc patchdialogreceiver.moc + +patcher_LDADD = $(QT_LDFLAGS) -lqui $(QTLIB) $(LIBPTHREAD) $(MEMORY_LIBS) \ + $(PROFILE_LIBS) $(SHOWEQ_RPATH) $(USER_LDFLAGS) + +$(srcdir)/patcher.cpp: patcher.moc +$(srcdir)/patchdialogreceiver.cpp: patchdialogreceiver.moc showeqitemdbtool_SOURCES = itemdbtool.cpp util.cpp diagnosticmessageslight.cpp datalocationmgr.cpp $(ITEMDB_SRCS) nodist_showeqitemdbtool_SOURCES = $(nodist_ITEMDB_SRCS) @@ -131,7 +140,9 @@ nodist_sortitem_SOURCES = sortitem_LDADD = $(QT_LDFLAGS) $(QTLIB) $(LIBPTHREAD) $(SHOWEQ_RPATH) $(USER_LDFLAGS) -EXTRA_DIST = classes.h compass.h everquest.h interface.h main.h map.h filter.h vpacket.h editor.h packet.h packetcapture.h packetcommon.h packetformat.h packetstream.h packetfragment.h packetinfo.h races.h skills.h spells.h util.h experiencelog.h combatlog.h spawn.h spawnshell.h spawnlist.h spellshell.h spelllist.h languages.h weapons.h weapons1.h weapons27.h weapons28.h weapons2b.h decode.h itemdb.h gdbmconv.h cgiconv.h skilllist.h statlist.h db3conv.h dbcommon.h deity.h player.h crctab.h filtermgr.h point.h pointarray.h mapcore.h category.h compassframe.h group.h guild.h fixpt.h netdiag.h zones.h logger.h xmlconv.h xmlpreferences.h seqwindow.h seqlistview.h zonemgr.h spawnmonitor.h spawnpointlist.h typenames.h spawnlistcommon.h spawnlist2.h datetimemgr.h spawnlog.h packetlog.h datalocationmgr.h eqstr.h messages.h messagefilter.h messagewindow.h messageshell.h terminal.h filteredspawnlog.h messagefilterdialog.h diagnosticmessages.h mapicon.h mapicondialog.ui mapicondialog.ui.h filternotifications.h netstream.h guildshell.h guildlist.h bazaarlog.h message.h s_everquest.h staticspells.h h2info.pl +EXTRA_DIST = h2info.pl + +noinst_HEADERS = classes.h compass.h everquest.h interface.h main.h map.h filter.h vpacket.h editor.h packet.h packetcapture.h packetcommon.h packetformat.h packetstream.h packetfragment.h packetinfo.h races.h skills.h spells.h util.h experiencelog.h combatlog.h spawn.h spawnshell.h spawnlist.h spellshell.h spelllist.h languages.h weapons.h weapons1.h weapons27.h weapons28.h weapons2b.h decode.h itemdb.h gdbmconv.h cgiconv.h skilllist.h statlist.h db3conv.h dbcommon.h deity.h player.h crctab.h filtermgr.h point.h pointarray.h mapcore.h category.h compassframe.h group.h guild.h fixpt.h netdiag.h zones.h logger.h xmlconv.h xmlpreferences.h seqwindow.h seqlistview.h zonemgr.h spawnmonitor.h spawnpointlist.h typenames.h spawnlistcommon.h spawnlist2.h datetimemgr.h spawnlog.h packetlog.h datalocationmgr.h eqstr.h messages.h messagefilter.h messagewindow.h messageshell.h terminal.h filteredspawnlog.h messagefilterdialog.h diagnosticmessages.h mapicon.h mapicondialog.ui mapicondialog.ui.h filternotifications.h netstream.h guildshell.h guildlist.h bazaarlog.h message.h s_everquest.h staticspells.h patcher.h patchdialogreceiver.h CLEANFILES = $(nodist_showeq_SOURCES) @@ -165,3 +176,4 @@ done endif + Index: xmlpreferences.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/xmlpreferences.cpp,v retrieving revision 1.3.16.2.2.2 retrieving revision 1.3.16.2.2.3 diff -u -d -r1.3.16.2.2.2 -r1.3.16.2.2.3 --- xmlpreferences.cpp 2 Oct 2004 21:36:36 -0000 1.3.16.2.2.2 +++ xmlpreferences.cpp 6 Nov 2004 18:58:52 -0000 1.3.16.2.2.3 @@ -765,7 +765,7 @@ default: qWarning("XMLPreferences::getPrefInt64(%s, %s, %lld): preference found,\n" "\tbut type %s is not convertable to type int64_t!", - (const char*)inName, (const char*)inSection, def, + (const char*)inName, (const char*)inSection, (long long)def, preference->typeName()); } @@ -811,9 +811,10 @@ break; } default: - qWarning("XMLPreferences::getPrefUInt64(%s, %s, %lld): preference found,\n" + qWarning("XMLPreferences::getPrefUInt64(%s, %s, %llu): preference found,\n" "\tbut type %s is not convertable to type uint64_t!", - (const char*)inName, (const char*)inSection, def, + (const char*)inName, (const char*)inSection, + (unsigned long long)def, preference->typeName()); } Index: interface.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/interface.cpp,v retrieving revision 1.67.6.9.2.2 retrieving revision 1.67.6.9.2.3 diff -u -d -r1.67.6.9.2.2 -r1.67.6.9.2.3 --- interface.cpp 2 Oct 2004 21:36:35 -0000 1.67.6.9.2.2 +++ interface.cpp 6 Nov 2004 18:58:52 -0000 1.67.6.9.2.3 @@ -126,6 +126,7 @@ m_unknownZoneLog(0), m_opcodeMonitorLog(0), m_selectedSpawn(0), + m_windowsMenus(11), m_compass(0), m_expWindow(0), m_combatWindow(0), @@ -135,6 +136,9 @@ { // disable the dock menu setDockMenuEnabled(false); + + // make sure the windows menus list autodeletes + m_windowsMenus.setAutoDelete(true); setCentralWidget(new QWidget(this, "filler")); @@ -2095,8 +2099,8 @@ this, SLOT(numPacket(int, int))); connect (m_packet, SIGNAL(resetPacket(int, int)), this, SLOT(resetPacket(int, int))); - connect (m_player, SIGNAL(newSpeed(int)), - this, SLOT(newSpeed(int))); + connect (m_player, SIGNAL(newSpeed(double)), + this, SLOT(newSpeed(double))); connect(m_player, SIGNAL(setExp(uint32_t, uint32_t, uint32_t, uint32_t, uint32_t)), this, SLOT(setExp(uint32_t, uint32_t, uint32_t, @@ -4384,7 +4388,7 @@ } void -EQInterface::newSpeed(int speed) +EQInterface::newSpeed(double speed) { // update twice per sec static int lastupdate = 0; @@ -4393,7 +4397,7 @@ lastupdate = mTime(); QString tempStr; - tempStr.sprintf("Run Speed: %d", speed); + tempStr.sprintf("Run Speed: %3.1f", speed); m_stsbarSpeed->setText(tempStr); } @@ -6049,12 +6053,28 @@ { QPopupMenu* menu = window->menu(); if (menu) - m_windowMenu->insertItem(window->caption(), menu, int(window)); + { + // insert the windows menu into the window menu + int id = m_windowMenu->insertItem(window->caption(), menu); + + // insert it into the window to window menu id dictionary + m_windowsMenus.insert((void*)window, new int(id)); + } } void EQInterface::removeWindowMenu(SEQWindow* window) { - m_windowMenu->removeItem(int(window)); + // find the windows menu id + int* id = m_windowsMenus.find((void*)window); + + // if the window had a menu, then remove it + if (id) + { + m_windowMenu->removeItem(*id); + + // remove the item from the list + m_windowsMenus.remove(window); + } } void EQInterface::setDockEnabled(QDockWindow* dw, bool enable) Index: player.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/player.cpp,v retrieving revision 1.42.6.6.2.1 retrieving revision 1.42.6.6.2.2 diff -u -d -r1.42.6.6.2.1 -r1.42.6.6.2.2 --- player.cpp 2 Oct 2004 21:36:36 -0000 1.42.6.6.2.1 +++ player.cpp 6 Nov 2004 18:58:52 -0000 1.42.6.6.2.2 @@ -851,9 +851,9 @@ updateLastChanged(); emit changeItem(this, tSpawnChangedPosition); - emit newSpeed((int)lrint(hypot( hypot( (pupdate->deltaX*8), - (pupdate->deltaY*8)), - (pupdate->deltaZ*8)))); + emit newSpeed(hypot( hypot( (pupdate->deltaX*8), + (pupdate->deltaY*8)), + (pupdate->deltaZ*8))); static uint8_t count = 0; Index: interface.h =================================================================== RCS file: /cvsroot/seq/showeq/src/interface.h,v retrieving revision 1.33.6.6 retrieving revision 1.33.6.6.2.1 diff -u -d -r1.33.6.6 -r1.33.6.6.2.1 --- interface.h 5 Sep 2004 19:11:12 -0000 1.33.6.6 +++ interface.h 6 Nov 2004 18:58:52 -0000 1.33.6.6.2.1 @@ -28,7 +28,7 @@ #include <qtabdialog.h> #include <qspinbox.h> #include <qintdict.h> - +#include <qptrdict.h> #include "everquest.h" #include "spawnlist.h" #include "spawnshell.h" @@ -106,6 +106,9 @@ //-------------------------------------------------- // EQInterface +/*! + \brief QMainWindow from Hell! Also known as ShowEQ's main window. +*/ class EQInterface:public QMainWindow { Q_OBJECT @@ -132,7 +135,7 @@ void newAltExp(uint32_t newExp, uint32_t totalExp, uint32_t totalTick, uint32_t maxExp, uint32_t tickExp, uint32_t aapoints); void levelChanged(uint8_t level); - void newSpeed(int); + void newSpeed(double); void numPacket(int, int); void resetPacket(int, int); void attack2Hand1(const uint8_t*); @@ -390,6 +393,7 @@ QPopupMenu* m_terminalShowUserFilterMenu; QPopupMenu* m_terminalHideUserFilterMenu; QPopupMenu* m_windowMenu; + QPtrDict<int> m_windowsMenus; CompassFrame* m_compass; MessageWindow* m_messageWindow[maxNumMessageWindows]; Index: packetlog.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/packetlog.cpp,v retrieving revision 1.1.6.4.2.1 retrieving revision 1.1.6.4.2.2 diff -u -d -r1.1.6.4.2.1 -r1.1.6.4.2.2 --- packetlog.cpp 2 Oct 2004 21:36:36 -0000 1.1.6.4.2.1 +++ packetlog.cpp 6 Nov 2004 18:58:52 -0000 1.1.6.4.2.2 @@ -266,7 +266,7 @@ else ::putchar('\n'); - ::printf("%s [Size: %d]%s\n", + ::printf("%s [Size: %u]%s\n", ((dir == DIR_Server) ? "[Server->Client]" : "[Client->Server]"), len, (const char*)opCodeToString(opcode)); Index: editor.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/editor.cpp,v retrieving revision 1.2.18.2 retrieving revision 1.2.18.3 diff -u -d -r1.2.18.2 -r1.2.18.3 --- editor.cpp 2 Oct 2004 21:36:35 -0000 1.2.18.2 +++ editor.cpp 6 Nov 2004 18:58:51 -0000 1.2.18.3 @@ -225,4 +225,4 @@ } #include "editor.moc" - \ No newline at end of file + Index: everquest.h =================================================================== RCS file: /cvsroot/seq/showeq/src/everquest.h,v retrieving revision 1.74.6.16 retrieving revision 1.74.6.16.2.1 diff -u -d -r1.74.6.16 -r1.74.6.16.2.1 --- everquest.h 24 Sep 2004 04:25:52 -0000 1.74.6.16 +++ everquest.h 6 Nov 2004 18:58:51 -0000 1.74.6.16.2.1 @@ -445,7 +445,7 @@ /*0244*/ uint8_t unknown244[14]; /*0258*/ int16_t deity; // Player's Deity -/*0262*/ uint8_t unknown260[115]; +/*0262*/ uint8_t unknown260[119]; }; /* 0375 */ /* @@ -473,7 +473,7 @@ /*0508*/ float underworld; // Underworld /*0512*/ float minclip; // Minimum view distance /*0516*/ float maxclip; // Maximum view distance -/*0520*/ uint8_t unknown0520[156]; // *** Placeholder +/*0520*/ uint8_t unknown0520[160]; // *** Placeholder /*0676*/ }; @@ -820,7 +820,7 @@ /*250*/ int8_t unknown249[4]; /*254*/ uint32_t petOwnerId; /*258*/ int16_t deity; -/*260*/ uint8_t unknown260[115]; +/*260*/ uint8_t unknown260[119]; /*375*/ }; |
|
From: Erik B. <do...@us...> - 2004-11-06 18:59:04
|
Update of /cvsroot/seq/showeq In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18666 Modified Files: Tag: pre_v5_0_dev2 ChangeLog configure.in showeq.kdevelop Log Message: x86_64 and gcc 3.4.2 changes Index: ChangeLog =================================================================== RCS file: /cvsroot/seq/showeq/Attic/ChangeLog,v retrieving revision 1.1.2.2.2.6 retrieving revision 1.1.2.2.2.7 diff -u -d -r1.1.2.2.2.6 -r1.1.2.2.2.7 --- ChangeLog 2 Oct 2004 21:36:21 -0000 1.1.2.2.2.6 +++ ChangeLog 6 Nov 2004 18:58:51 -0000 1.1.2.2.2.7 @@ -1,5 +1,14 @@ Version: $Id$ $Name$ - +dohpaZ (11/6/04) +------------------------ ++ Minor 64-bit compatibility cleanup. ++ Cleaned up some minor warnings under gcc 3.4.2. + +dophaZ (10/27/04) +------------------------ ++ Applied patch #1047554 "Oct13 struct patch" created by codepig666 and + submitted to the Patches tracker by tanner (Basic). + dohpaZ (10/2/04) ------------------------ + Migrate to new (autoconf >2.50) style AC_INIT & AM_INIT_AUTOMAKE Index: showeq.kdevelop =================================================================== RCS file: /cvsroot/seq/showeq/Attic/showeq.kdevelop,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -d -r1.1.2.4 -r1.1.2.5 --- showeq.kdevelop 2 Oct 2004 21:36:22 -0000 1.1.2.4 +++ showeq.kdevelop 6 Nov 2004 18:58:51 -0000 1.1.2.5 @@ -28,14 +28,14 @@ </general> <kdevautoproject> <general> - <activetarget>src/showeq</activetarget> + <activetarget>src/patcher</activetarget> <useconfiguration>debug</useconfiguration> </general> <run> <mainprogram>src/showeq</mainprogram> <directoryradio>executable</directoryradio> <customdirectory>/</customdirectory> - <programargs></programargs> + <programargs/> <terminal>false</terminal> <autocompile>true</autocompile> <envvars/> @@ -76,18 +76,18 @@ <abortonerror>true</abortonerror> <numberofjobs>1</numberofjobs> <dontact>false</dontact> - <makebin></makebin> + <makebin/> <prio>0</prio> </make> </kdevautoproject> <kdevdebugger> <general> <dbgshell>libtool</dbgshell> - <programargs></programargs> - <gdbpath></gdbpath> - <configGdbScript></configGdbScript> - <runShellScript></runShellScript> - <runGdbScript></runGdbScript> + <programargs/> + <gdbpath/> + <configGdbScript/> + <runShellScript/> + <runGdbScript/> <breakonloadinglibs>true</breakonloadinglibs> <separatetty>false</separatetty> <floatingtoolbar>false</floatingtoolbar> @@ -175,13 +175,16 @@ </kdevcppsupport> <kdevdocumentation> <projectdoc> - <docsystem></docsystem> - <docurl></docurl> - <usermanualurl></usermanualurl> + <docsystem/> + <docurl/> + <usermanualurl/> </projectdoc> </kdevdocumentation> <kdevfileview> - <groups/> + <groups> + <hidenonprojectfiles>false</hidenonprojectfiles> + <hidenonlocation>false</hidenonlocation> + </groups> <tree> <hidepatterns>*.o,*.lo,CVS</hidepatterns> <hidenonprojectfiles>false</hidenonprojectfiles> Index: configure.in =================================================================== RCS file: /cvsroot/seq/showeq/configure.in,v retrieving revision 1.49.4.16.2.2 retrieving revision 1.49.4.16.2.3 diff -u -d -r1.49.4.16.2.2 -r1.49.4.16.2.3 --- configure.in 2 Oct 2004 06:10:31 -0000 1.49.4.16.2.2 +++ configure.in 6 Nov 2004 18:58:51 -0000 1.49.4.16.2.3 @@ -2,7 +2,7 @@ dnl $Id$ $Name$ AC_PREREQ(2.53) -AC_INIT(showeq, 5.0.0.15) +AC_INIT(showeq, 5.0.0.16) AC_CONFIG_SRCDIR(src/main.cpp) AC_CANONICAL_SYSTEM |
Update of /cvsroot/seq/showeq/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31146/src Modified Files: Tag: pre_v5_0_dev2 Makefile.am bazaarlog.cpp bazaarlog.h category.cpp combatlog.cpp compass.cpp compassframe.cpp datetimemgr.cpp editor.cpp experiencelog.cpp filteredspawnlog.cpp filtermgr.cpp filternotifications.cpp group.cpp guild.cpp guildlist.cpp guildshell.cpp guildshell.h interface.cpp itemdb.cpp logger.cpp map.cpp mapicon.cpp messagefilter.cpp messagefilterdialog.cpp messages.cpp messageshell.cpp messagewindow.cpp netdiag.cpp packet.cpp packetinfo.cpp packetlog.cpp packetstream.cpp player.cpp seqlistview.cpp seqwindow.cpp skilllist.cpp spawnlist.cpp spawnlist2.cpp spawnlistcommon.cpp spawnlog.cpp spawnmonitor.cpp spawnpointlist.cpp spawnshell.cpp spelllist.cpp spellshell.cpp statlist.cpp terminal.cpp weapons.h xmlpreferences.cpp zonemgr.cpp Log Message: Improved MOC file handling and miscellaneous cleanup Index: spawnmonitor.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spawnmonitor.cpp,v retrieving revision 1.5.12.1 retrieving revision 1.5.12.1.2.1 diff -u -d -r1.5.12.1 -r1.5.12.1.2.1 --- spawnmonitor.cpp 7 Dec 2003 06:30:44 -0000 1.5.12.1 +++ spawnmonitor.cpp 2 Oct 2004 21:36:36 -0000 1.5.12.1.2.1 @@ -405,3 +405,5 @@ seqInfo("Loaded spawn points: %s", (const char*)fileName); m_modified = false; } + +#include "spawnmonitor.moc" Index: combatlog.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/combatlog.cpp,v retrieving revision 1.10.16.1 retrieving revision 1.10.16.1.2.1 diff -u -d -r1.10.16.1 -r1.10.16.1.2.1 --- combatlog.cpp 7 Dec 2003 06:30:43 -0000 1.10.16.1 +++ combatlog.cpp 2 Oct 2004 21:36:35 -0000 1.10.16.1.2.1 @@ -987,3 +987,4 @@ resetDPS(); } +#include "combatlog.moc" Index: messagefilterdialog.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/messagefilterdialog.cpp,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.2.2.1 diff -u -d -r1.1.4.2 -r1.1.4.2.2.1 --- messagefilterdialog.cpp 13 Dec 2003 00:49:42 -0000 1.1.4.2 +++ messagefilterdialog.cpp 2 Oct 2004 21:36:36 -0000 1.1.4.2.2.1 @@ -466,3 +466,5 @@ // only enable delete if editing an existing filter m_delete->setEnabled(m_currentFilter != 0); } + +#include "messagefilterdialog.moc" Index: messagewindow.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/messagewindow.cpp,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.2.2.1 diff -u -d -r1.1.4.2 -r1.1.4.2.2.1 --- messagewindow.cpp 13 Dec 2003 00:49:42 -0000 1.1.4.2 +++ messagewindow.cpp 2 Oct 2004 21:36:36 -0000 1.1.4.2.2.1 @@ -1175,3 +1175,4 @@ m_hideUserFilterMenu->insertItem(filter.name(), filterid); } +#include "messagewindow.moc" Index: messageshell.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/messageshell.cpp,v retrieving revision 1.1.4.4 retrieving revision 1.1.4.4.2.1 diff -u -d -r1.1.4.4 -r1.1.4.4.2.1 --- messageshell.cpp 18 Feb 2004 22:56:15 -0000 1.1.4.4 +++ messageshell.cpp 2 Oct 2004 21:36:36 -0000 1.1.4.4.2.1 @@ -949,3 +949,4 @@ .arg(spawnInfo)); } +#include "messageshell.moc" Index: seqwindow.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/seqwindow.cpp,v retrieving revision 1.1.16.1 retrieving revision 1.1.16.1.2.1 diff -u -d -r1.1.16.1 -r1.1.16.1.2.1 --- seqwindow.cpp 7 Dec 2003 06:30:44 -0000 1.1.16.1 +++ seqwindow.cpp 2 Oct 2004 21:36:36 -0000 1.1.16.1.2.1 @@ -151,3 +151,4 @@ QDockWindow::mousePressEvent(e); } +#include "seqwindow.moc" Index: terminal.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/terminal.cpp,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.2.2.1 diff -u -d -r1.1.4.2 -r1.1.4.2.2.1 --- terminal.cpp 13 Dec 2003 00:49:43 -0000 1.1.4.2 +++ terminal.cpp 2 Oct 2004 21:36:36 -0000 1.1.4.2.2.1 @@ -213,3 +213,4 @@ fputc('\n', stdout); } +#include "terminal.moc" Index: guildshell.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/guildshell.cpp,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.2.2.1 diff -u -d -r1.1.4.2 -r1.1.4.2.2.1 --- guildshell.cpp 24 Sep 2004 04:25:52 -0000 1.1.4.2 +++ guildshell.cpp 2 Oct 2004 21:36:35 -0000 1.1.4.2.2.1 @@ -241,6 +241,7 @@ } } +#include "guildshell.moc" Index: spawnlog.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spawnlog.cpp,v retrieving revision 1.2.4.2.2.1 retrieving revision 1.2.4.2.2.2 diff -u -d -r1.2.4.2.2.1 -r1.2.4.2.2.2 --- spawnlog.cpp 2 Oct 2004 07:02:34 -0000 1.2.4.2.2.1 +++ spawnlog.cpp 2 Oct 2004 21:36:36 -0000 1.2.4.2.2.2 @@ -143,4 +143,4 @@ zoneShortName = zonename; } - +#include "spawnlog.moc" Index: logger.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/logger.cpp,v retrieving revision 1.30 retrieving revision 1.30.8.1 diff -u -d -r1.30 -r1.30.8.1 --- logger.cpp 25 Oct 2003 00:20:59 -0000 1.30 +++ logger.cpp 2 Oct 2004 21:36:36 -0000 1.30.8.1 @@ -140,3 +140,4 @@ fprintf (m_fp, "%03d | %-48s | %s \n\n", c, hex, asc); } +#include "logger.moc" Index: group.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/group.cpp,v retrieving revision 1.6.16.2 retrieving revision 1.6.16.2.2.1 diff -u -d -r1.6.16.2 -r1.6.16.2.2.1 --- group.cpp 13 Dec 2003 00:49:42 -0000 1.6.16.2 +++ group.cpp 2 Oct 2004 21:36:35 -0000 1.6.16.2.2.1 @@ -368,3 +368,4 @@ return m_members[slot].m_spawn; } +#include "group.moc" Index: datetimemgr.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/datetimemgr.cpp,v retrieving revision 1.2.4.1.2.1 retrieving revision 1.2.4.1.2.2 diff -u -d -r1.2.4.1.2.1 -r1.2.4.1.2.2 --- datetimemgr.cpp 2 Oct 2004 07:02:33 -0000 1.2.4.1.2.1 +++ datetimemgr.cpp 2 Oct 2004 21:36:35 -0000 1.2.4.1.2.2 @@ -73,3 +73,5 @@ } } +#include "datetimemgr.moc" + Index: statlist.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/statlist.cpp,v retrieving revision 1.8.6.1 retrieving revision 1.8.6.1.2.1 diff -u -d -r1.8.6.1 -r1.8.6.1.2.1 --- statlist.cpp 7 Dec 2003 06:30:46 -0000 1.8.6.1 +++ statlist.cpp 2 Oct 2004 21:36:36 -0000 1.8.6.1.2.1 @@ -363,3 +363,5 @@ // make the listview save it's prefs m_statList->savePrefs(); } + +#include "statlist.moc" Index: map.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/map.cpp,v retrieving revision 1.40.6.3 retrieving revision 1.40.6.3.2.1 diff -u -d -r1.40.6.3 -r1.40.6.3.2.1 --- map.cpp 12 Feb 2004 00:39:28 -0000 1.40.6.3 +++ map.cpp 2 Oct 2004 21:36:36 -0000 1.40.6.3.2.1 @@ -4755,3 +4755,4 @@ } +#include "map.moc" Index: filteredspawnlog.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/filteredspawnlog.cpp,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.1.2.1 diff -u -d -r1.1.4.1 -r1.1.4.1.2.1 --- filteredspawnlog.cpp 7 Dec 2003 06:30:43 -0000 1.1.4.1 +++ filteredspawnlog.cpp 2 Oct 2004 21:36:35 -0000 1.1.4.1.2.1 @@ -89,3 +89,4 @@ flush(); } +#include "filteredspawnlog.moc" Index: compass.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/compass.cpp,v retrieving revision 1.2 retrieving revision 1.2.18.1 diff -u -d -r1.2 -r1.2.18.1 --- compass.cpp 30 Aug 2003 15:51:45 -0000 1.2 +++ compass.cpp 2 Oct 2004 21:36:35 -0000 1.2.18.1 @@ -167,3 +167,5 @@ paintCompass (&p); p.end(); } + +#include "compass.moc" Index: bazaarlog.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/bazaarlog.cpp,v retrieving revision 1.1.4.3 retrieving revision 1.1.4.3.2.1 diff -u -d -r1.1.4.3 -r1.1.4.3.2.1 --- bazaarlog.cpp 24 Sep 2004 04:25:52 -0000 1.1.4.3 +++ bazaarlog.cpp 2 Oct 2004 21:36:35 -0000 1.1.4.3.2.1 @@ -64,3 +64,6 @@ flush(); } + +#include "bazaarlog.moc" + Index: seqlistview.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/seqlistview.cpp,v retrieving revision 1.2 retrieving revision 1.2.18.1 diff -u -d -r1.2 -r1.2.18.1 --- seqlistview.cpp 24 May 2002 19:15:12 -0000 1.2 +++ seqlistview.cpp 2 Oct 2004 21:36:36 -0000 1.2.18.1 @@ -223,3 +223,5 @@ // trigger an update, otherwise things may look messy triggerUpdate(); } + +#include "seqlistview.moc" Index: guildlist.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/guildlist.cpp,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.2.2.1 diff -u -d -r1.1.4.2 -r1.1.4.2.2.1 --- guildlist.cpp 12 Feb 2004 00:39:28 -0000 1.1.4.2 +++ guildlist.cpp 2 Oct 2004 21:36:35 -0000 1.1.4.2.2.1 @@ -477,3 +477,4 @@ m_guildTotals->setText(text.arg(m_membersOn).arg(m_guildShell->members().count())); } +#include "guildlist.moc" Index: Makefile.am =================================================================== RCS file: /cvsroot/seq/showeq/src/Makefile.am,v retrieving revision 1.22.6.5.2.1 retrieving revision 1.22.6.5.2.2 diff -u -d -r1.22.6.5.2.1 -r1.22.6.5.2.2 --- Makefile.am 2 Oct 2004 03:09:41 -0000 1.22.6.5.2.1 +++ Makefile.am 2 Oct 2004 21:36:23 -0000 1.22.6.5.2.2 @@ -8,13 +8,84 @@ endif ITEMDB_SRCS = itemdb.cpp gdbmconv.cpp $(DB3_SRCS) -nodist_ITEMDB_SRCS = m_itemdb.cpp +nodist_ITEMDB_SRCS = bin_PROGRAMS = showeq showeqitemdbtool -showeq_SOURCES = main.cpp spawn.cpp spawnshell.cpp spawnlist.cpp spellshell.cpp spelllist.cpp vpacket.cpp editor.cpp filter.cpp packetfragment.cpp packetstream.cpp packetinfo.cpp packet.cpp packetcapture.cpp packetformat.cpp interface.cpp compass.cpp map.cpp util.cpp experiencelog.cpp combatlog.cpp player.cpp skilllist.cpp statlist.cpp filtermgr.cpp mapcore.cpp category.cpp compassframe.cpp group.cpp guild.cpp netdiag.cpp logger.cpp xmlconv.cpp xmlpreferences.cpp seqwindow.cpp seqlistview.cpp zonemgr.cpp spawnmonitor.cpp spawnpointlist.cpp spawnlistcommon.cpp spawnlist2.cpp spells.cpp datetimemgr.cpp spawnlog.cpp packetlog.cpp datalocationmgr.cpp eqstr.cpp messages.cpp message.cpp messagefilter.cpp messagewindow.cpp messageshell.cpp terminal.cpp filteredspawnlog.cpp messagefilterdialog.cpp diagnosticmessages.cpp mapicon.cpp filternotifications.cpp netstream.cpp guildshell.cpp guildlist.cpp bazaarlog.cpp $(ITEMDB_SRCS) +showeq_SOURCES = main.cpp spawn.cpp spawnshell.cpp spawnlist.cpp spellshell.cpp \ + spelllist.cpp vpacket.cpp editor.cpp filter.cpp packetfragment.cpp packetstream.cpp \ + packetinfo.cpp packet.cpp packetcapture.cpp packetformat.cpp interface.cpp compass.cpp \ + map.cpp util.cpp experiencelog.cpp combatlog.cpp player.cpp skilllist.cpp \ + statlist.cpp filtermgr.cpp mapcore.cpp category.cpp compassframe.cpp group.cpp \ + guild.cpp netdiag.cpp logger.cpp xmlconv.cpp xmlpreferences.cpp seqwindow.cpp \ + seqlistview.cpp zonemgr.cpp spawnmonitor.cpp spawnpointlist.cpp spawnlistcommon.cpp \ + spawnlist2.cpp spells.cpp datetimemgr.cpp spawnlog.cpp packetlog.cpp \ + datalocationmgr.cpp eqstr.cpp messages.cpp message.cpp messagefilter.cpp messagewindow.cpp \ + messageshell.cpp terminal.cpp filteredspawnlog.cpp messagefilterdialog.cpp \ + diagnosticmessages.cpp mapicon.cpp filternotifications.cpp netstream.cpp guildshell.cpp \ + guildlist.cpp bazaarlog.cpp $(ITEMDB_SRCS) -nodist_showeq_SOURCES = m_spawnshell.cpp m_spawnlist.cpp m_spellshell.cpp m_spelllist.cpp m_editor.cpp m_packetstream.cpp m_packetinfo.cpp m_packet.cpp m_interface.cpp m_compass.cpp m_map.cpp m_experiencelog.cpp m_combatlog.cpp m_player.cpp m_skilllist.cpp m_statlist.cpp m_filtermgr.cpp m_category.cpp m_compassframe.cpp m_group.cpp m_guild.cpp m_netdiag.cpp m_logger.cpp m_xmlpreferences.cpp m_seqwindow.cpp m_seqlistview.cpp m_zonemgr.cpp m_spawnmonitor.cpp m_spawnpointlist.cpp m_spawnlistcommon.cpp m_spawnlist2.cpp m_datetimemgr.cpp m_spawnlog.cpp m_packetlog.cpp m_messages.cpp m_messagefilter.cpp m_messagewindow.cpp m_messageshell.cpp m_terminal.cpp m_filteredspawnlog.cpp m_messagefilterdialog.cpp m_mapicon.cpp m_filternotifications.cpp m_guildshell.cpp m_guildlist.cpp m_bazaarlog.cpp ui_mapicondialog.h ui_mapicondialog.cpp m_ui_mapicondialog.cpp $(nodist_ITEMDB_SRCS) +showeq_moc_SRCS = bazaarlog.moc category.moc combatlog.moc compass.moc \ + compassframe.moc datetimemgr.moc editor.moc experiencelog.moc \ + filteredspawnlog.moc filtermgr.moc filternotifications.moc group.moc \ + guild.moc guildlist.moc guildshell.moc interface.moc itemdb.moc logger.moc \ + map.moc mapicon.moc messagefilter.moc messagefilterdialog.moc messages.moc \ + messageshell.moc messagewindow.moc netdiag.moc packet.moc packetinfo.moc \ + packetlog.moc packetstream.moc player.moc seqlistview.moc \ + seqwindow.moc skilllist.moc spawnlist.moc spawnlist2.moc spawnlistcommon.moc \ + spawnlog.moc spawnmonitor.moc spawnpointlist.moc spawnshell.moc spelllist.moc \ + spellshell.moc statlist.moc terminal.moc xmlpreferences.moc zonemgr.moc + +nodist_showeq_SOURCES = ui_mapicondialog.h ui_mapicondialog.cpp $(showeq_moc_SRCS) m_ui_mapicondialog.cpp $(nodist_ITEMDB_SRCS) + +$(srcdir)/bazaarlog.cpp: bazaarlog.moc +$(srcdir)/category.cpp: category.moc +$(srcdir)/combatlog.cpp: combatlog.moc +$(srcdir)/compass.cpp: compass.moc +$(srcdir)/compassframe.cpp: compassframe.moc +$(srcdir)/datetimemgr.cpp: datetimemgr.moc +$(srcdir)/editor.cpp: editor.moc +$(srcdir)/experiencelog.cpp: experiencelog.moc +$(srcdir)/filteredspawnlog.cpp: filteredspawnlog.moc +$(srcdir)/filtermgr.cpp: filtermgr.moc +$(srcdir)/filternotifications.cpp: filternotifications.moc +$(srcdir)/group.cpp: group.moc +$(srcdir)/guild.cpp: guild.moc +$(srcdir)/guildlist.cpp: guildlist.moc +$(srcdir)/guildshell.cpp: guildshell.moc +$(srcdir)/interface.cpp: interface.moc +$(srcdir)/itemdb.cpp: itemdb.moc +$(srcdir)/logger.cpp: logger.moc +$(srcdir)/map.cpp: map.moc +$(srcdir)/mapicon.cpp: mapicon.moc +$(srcdir)/messagefilter.cpp: messagefilter.moc +$(srcdir)/messagefilterdialog.cpp: messagefilterdialog.moc +$(srcdir)/messages.cpp: messages.moc +$(srcdir)/messageshell.cpp: messageshell.moc +$(srcdir)/messagewindow.cpp: messagewindow.moc +$(srcdir)/netdiag.cpp: netdiag.moc +$(srcdir)/packet.cpp: packet.moc +$(srcdir)/packetinfo.cpp: packetinfo.moc +$(srcdir)/packetlog.cpp: packetlog.moc +$(srcdir)/packetstream.cpp: packetstream.moc +$(srcdir)/player.cpp: player.moc +$(srcdir)/seqlistview.cpp: seqlistview.moc +$(srcdir)/seqwindow.cpp: seqwindow.moc +$(srcdir)/skilllist.cpp: skilllist.moc +$(srcdir)/spawnlist.cpp: spawnlist.moc +$(srcdir)/spawnlist2.cpp: spawnlist2.moc +$(srcdir)/spawnlistcommon.cpp: spawnlistcommon.moc +$(srcdir)/spawnlog.cpp: spawnlog.moc +$(srcdir)/spawnmonitor.cpp: spawnmonitor.moc +$(srcdir)/spawnpointlist.cpp: spawnpointlist.moc +$(srcdir)/spawnshell.cpp: spawnshell.moc +$(srcdir)/spelllist.cpp: spelllist.moc +$(srcdir)/spellshell.cpp: spellshell.moc +$(srcdir)/statlist.cpp: statlist.moc +$(srcdir)/terminal.cpp: terminal.moc +$(srcdir)/xmlpreferences.cpp: xmlpreferences.moc +$(srcdir)/zonemgr.cpp: zonemgr.moc +$(srcdir)/packetinfo.cpp: s_everquest.h showeq_LDADD = $(QT_LDFLAGS) $(QTLIB) $(DB3_LIBS) $(LIBPTHREAD) $(MEMORY_LIBS) \ $(PROFILE_LIBS) $(SHOWEQ_RPATH) $(USER_LDFLAGS) @@ -67,10 +138,12 @@ MAINTAINERCLEANFILES = Makefile.in s_everquest.h map.o: map.cpp map.h ui_mapicondialog.h -packetinfo.o: s_everquest.h + +.h.moc: + $(MOC) $< -o $@ m_%.cpp: %.h - $(MOC) -nw $< -o $@ + $(MOC) $< -o $@ s_%.h: %.h $(srcdir)/h2info.pl $< $@ @@ -91,3 +164,4 @@ else :; fi; \ done endif + Index: player.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/player.cpp,v retrieving revision 1.42.6.6 retrieving revision 1.42.6.6.2.1 diff -u -d -r1.42.6.6 -r1.42.6.6.2.1 --- player.cpp 24 Sep 2004 04:25:53 -0000 1.42.6.6 +++ player.cpp 2 Oct 2004 21:36:36 -0000 1.42.6.6.2.1 @@ -1441,3 +1441,5 @@ clear(); } } + +#include "player.moc" Index: experiencelog.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/experiencelog.cpp,v retrieving revision 1.10.16.2 retrieving revision 1.10.16.2.2.1 diff -u -d -r1.10.16.2 -r1.10.16.2.2.1 --- experiencelog.cpp 13 Dec 2003 00:49:42 -0000 1.10.16.2 +++ experiencelog.cpp 2 Oct 2004 21:36:35 -0000 1.10.16.2.2.1 @@ -697,3 +697,5 @@ seqInfo("xpgained: %ld group_ag: %d myLevel: %d gbonus: %d mob_level: %d penalty: %d ", xp_gained, group_ag, myLevel, gbonus, mob_level, penalty); seqInfo("ZEM - ZEM - ZEM ===== %d ", ZEM); } + +#include "experiencelog.moc" Index: packetinfo.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/packetinfo.cpp,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.2.2.1 diff -u -d -r1.1.4.2 -r1.1.4.2.2.1 --- packetinfo.cpp 16 Jan 2004 20:22:11 -0000 1.1.4.2 +++ packetinfo.cpp 2 Oct 2004 21:36:36 -0000 1.1.4.2.2.1 @@ -739,3 +739,4 @@ return true; } +#include "packetinfo.moc" Index: itemdb.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/itemdb.cpp,v retrieving revision 1.10.6.3 retrieving revision 1.10.6.3.2.1 diff -u -d -r1.10.6.3 -r1.10.6.3.2.1 --- itemdb.cpp 24 Sep 2004 04:25:53 -0000 1.10.6.3 +++ itemdb.cpp 2 Oct 2004 21:36:36 -0000 1.10.6.3.2.1 @@ -2528,3 +2528,4 @@ return (((EQItemDBEntryData_3*)m_itemEntryData)->m_itemType == ItemTypeContainer); } +#include "itemdb.moc" Index: netdiag.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/netdiag.cpp,v retrieving revision 1.10.6.1.2.1 retrieving revision 1.10.6.1.2.2 diff -u -d -r1.10.6.1.2.1 -r1.10.6.1.2.2 --- netdiag.cpp 2 Oct 2004 03:09:41 -0000 1.10.6.1.2.1 +++ netdiag.cpp 2 Oct 2004 21:36:36 -0000 1.10.6.1.2.2 @@ -321,3 +321,5 @@ return paddr; } + +#include "netdiag.moc" Index: weapons.h =================================================================== RCS file: /cvsroot/seq/showeq/src/weapons.h,v retrieving revision 1.5.8.1 retrieving revision 1.5.8.2 diff -u -d -r1.5.8.1 -r1.5.8.2 --- weapons.h 2 Oct 2004 03:09:41 -0000 1.5.8.1 +++ weapons.h 2 Oct 2004 21:36:36 -0000 1.5.8.2 @@ -5,7 +5,8 @@ * http://seq.sourceforge.net/ */ -#ifndef DOXYGEN_SHOULD_SKIP_THIS "Generic", // 0x00 +#ifndef DOXYGEN_SHOULD_SKIP_THIS + "Generic", // 0x00 "1HSword", // 0x01 "2HSword", // 0x02 "Axe", // 0x03 Index: filternotifications.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/filternotifications.cpp,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.1.2.1 diff -u -d -r1.1.4.1 -r1.1.4.1.2.1 --- filternotifications.cpp 7 Dec 2003 06:30:43 -0000 1.1.4.1 +++ filternotifications.cpp 2 Oct 2004 21:36:35 -0000 1.1.4.1.2.1 @@ -129,7 +129,7 @@ system ((const char*)command); } - +#include "filternotifications.moc" Index: filtermgr.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/filtermgr.cpp,v retrieving revision 1.5.6.2 retrieving revision 1.5.6.2.2.1 diff -u -d -r1.5.6.2 -r1.5.6.2.2.1 --- filtermgr.cpp 5 Sep 2004 19:11:12 -0000 1.5.6.2 +++ filtermgr.cpp 2 Oct 2004 21:36:35 -0000 1.5.6.2.2.1 @@ -325,3 +325,4 @@ emit runtimeFiltersChanged(type); } +#include "filtermgr.moc" Index: packetstream.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/packetstream.cpp,v retrieving revision 1.1.6.4 retrieving revision 1.1.6.4.2.1 diff -u -d -r1.1.6.4 -r1.1.6.4.2.1 --- packetstream.cpp 18 Sep 2004 20:51:32 -0000 1.1.6.4 +++ packetstream.cpp 2 Oct 2004 21:36:36 -0000 1.1.6.4.2.1 @@ -835,3 +835,5 @@ processCache(); } /* end ARQ processing */ } + +#include "packetstream.moc" Index: skilllist.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/skilllist.cpp,v retrieving revision 1.6.16.1 retrieving revision 1.6.16.1.2.1 diff -u -d -r1.6.16.1 -r1.6.16.1.2.1 --- skilllist.cpp 7 Dec 2003 06:30:44 -0000 1.6.16.1 +++ skilllist.cpp 2 Oct 2004 21:36:36 -0000 1.6.16.1.2.1 @@ -252,3 +252,5 @@ // make the listview save it's prefs m_skillList->savePrefs(); } + +#include "skilllist.moc" Index: compassframe.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/compassframe.cpp,v retrieving revision 1.7.16.1 retrieving revision 1.7.16.1.2.1 diff -u -d -r1.7.16.1 -r1.7.16.1.2.1 --- compassframe.cpp 7 Dec 2003 06:30:43 -0000 1.7.16.1 +++ compassframe.cpp 2 Oct 2004 21:36:35 -0000 1.7.16.1.2.1 @@ -98,3 +98,5 @@ m_y->setText(QString::number(y)); m_z->setText(QString::number(z)); } + +#include "compassframe.moc" Index: guild.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/guild.cpp,v retrieving revision 1.7.6.2 retrieving revision 1.7.6.2.2.1 diff -u -d -r1.7.6.2 -r1.7.6.2.2.1 --- guild.cpp 16 Jan 2004 20:22:09 -0000 1.7.6.2 +++ guild.cpp 2 Oct 2004 21:36:35 -0000 1.7.6.2.2.1 @@ -144,3 +144,5 @@ seqInfo("%d\t%s", i, (const char*)m_guildMap[i]); } } + +#include "guild.moc" Index: spelllist.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spelllist.cpp,v retrieving revision 1.9.10.2 retrieving revision 1.9.10.2.2.1 diff -u -d -r1.9.10.2 -r1.9.10.2.2.1 --- spelllist.cpp 13 Dec 2003 00:49:43 -0000 1.9.10.2 +++ spelllist.cpp 2 Oct 2004 21:36:36 -0000 1.9.10.2.2.1 @@ -393,3 +393,5 @@ // make the listview save it's prefs m_spellList->savePrefs(); } + +#include "spelllist.moc" Index: messagefilter.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/messagefilter.cpp,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.1.2.1 diff -u -d -r1.1.4.1 -r1.1.4.1.2.1 --- messagefilter.cpp 7 Dec 2003 06:30:43 -0000 1.1.4.1 +++ messagefilter.cpp 2 Oct 2004 21:36:36 -0000 1.1.4.1.2.1 @@ -189,3 +189,5 @@ // return the filter mask return mask; } + +#include "messagefilter.moc" Index: xmlpreferences.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/xmlpreferences.cpp,v retrieving revision 1.3.16.2.2.1 retrieving revision 1.3.16.2.2.2 diff -u -d -r1.3.16.2.2.1 -r1.3.16.2.2.2 --- xmlpreferences.cpp 2 Oct 2004 07:02:34 -0000 1.3.16.2.2.1 +++ xmlpreferences.cpp 2 Oct 2004 21:36:36 -0000 1.3.16.2.2.2 @@ -912,3 +912,4 @@ setPref(inName, inSection, inValue, pers); } +#include "xmlpreferences.moc" Index: spawnlist.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spawnlist.cpp,v retrieving revision 1.19.12.1 retrieving revision 1.19.12.1.2.1 diff -u -d -r1.19.12.1 -r1.19.12.1.2.1 --- spawnlist.cpp 7 Dec 2003 06:30:44 -0000 1.19.12.1 +++ spawnlist.cpp 2 Oct 2004 21:36:36 -0000 1.19.12.1.2.1 @@ -1174,3 +1174,5 @@ // make the listview save it's prefs m_spawnList->savePrefs(); } + +#include "spawnlist.moc" Index: spawnshell.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spawnshell.cpp,v retrieving revision 1.42.6.2 retrieving revision 1.42.6.2.2.1 diff -u -d -r1.42.6.2 -r1.42.6.2.2.1 --- spawnshell.cpp 16 Jan 2004 20:22:11 -0000 1.42.6.2 +++ spawnshell.cpp 2 Oct 2004 21:36:36 -0000 1.42.6.2.2.1 @@ -1058,3 +1058,5 @@ (const char*)fileName); } } + +#include "spawnshell.moc" Index: spawnlist2.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spawnlist2.cpp,v retrieving revision 1.7.12.2 retrieving revision 1.7.12.2.2.1 diff -u -d -r1.7.12.2 -r1.7.12.2.2.1 --- spawnlist2.cpp 16 Jan 2004 20:22:11 -0000 1.7.12.2 +++ spawnlist2.cpp 2 Oct 2004 21:36:36 -0000 1.7.12.2.2.1 @@ -944,3 +944,4 @@ #endif } +#include "spawnlist2.moc" Index: guildshell.h =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/guildshell.h,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.1.2.1 diff -u -d -r1.1.4.1 -r1.1.4.1.2.1 --- guildshell.h 16 Jan 2004 20:22:09 -0000 1.1.4.1 +++ guildshell.h 2 Oct 2004 21:36:35 -0000 1.1.4.1.2.1 @@ -8,6 +8,9 @@ * */ +#ifndef _GUILDSHELL_H_ +#define _GUILDSHELL_H_ + #include <stdint.h> #include <time.h> @@ -94,3 +97,4 @@ ZoneMgr* m_zoneMgr; }; +#endif // _GUILDSHELL_H_ Index: messages.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/messages.cpp,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.1.2.1 diff -u -d -r1.1.4.1 -r1.1.4.1.2.1 --- messages.cpp 7 Dec 2003 06:30:43 -0000 1.1.4.1 +++ messages.cpp 2 Oct 2004 21:36:36 -0000 1.1.4.1.2.1 @@ -82,4 +82,4 @@ (*it).setFilterFlags((*it).filterFlags() | mask); } - +#include "messages.moc" Index: spawnpointlist.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spawnpointlist.cpp,v retrieving revision 1.4.16.1 retrieving revision 1.4.16.1.2.1 diff -u -d -r1.4.16.1 -r1.4.16.1.2.1 --- spawnpointlist.cpp 7 Dec 2003 06:30:44 -0000 1.4.16.1 +++ spawnpointlist.cpp 2 Oct 2004 21:36:36 -0000 1.4.16.1.2.1 @@ -568,3 +568,5 @@ if (m_spawnPointList) m_spawnPointList->savePrefs(); } + +#include "spawnpointlist.moc" Index: packet.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/packet.cpp,v retrieving revision 1.62.6.3 retrieving revision 1.62.6.3.2.1 diff -u -d -r1.62.6.3 -r1.62.6.3.2.1 --- packet.cpp 18 Sep 2004 20:51:31 -0000 1.62.6.3 +++ packet.cpp 2 Oct 2004 21:36:36 -0000 1.62.6.3.2.1 @@ -1092,3 +1092,5 @@ { return m_streams[stream]->arqSeqExp(); } + +#include "packet.moc" Index: category.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/category.cpp,v retrieving revision 1.8.16.1 retrieving revision 1.8.16.1.2.1 diff -u -d -r1.8.16.1 -r1.8.16.1.2.1 --- category.cpp 7 Dec 2003 06:30:42 -0000 1.8.16.1 +++ category.cpp 2 Oct 2004 21:36:35 -0000 1.8.16.1.2.1 @@ -366,3 +366,5 @@ pSEQPrefs->setPrefColor(prefBaseName + "Color", section, black); } } + +#include "category.moc" Index: packetlog.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/packetlog.cpp,v retrieving revision 1.1.6.4 retrieving revision 1.1.6.4.2.1 diff -u -d -r1.1.6.4 -r1.1.6.4.2.1 --- packetlog.cpp 16 Jan 2004 20:22:11 -0000 1.1.6.4 +++ packetlog.cpp 2 Oct 2004 21:36:36 -0000 1.1.6.4.2.1 @@ -487,3 +487,4 @@ } } +#include "packetlog.moc" Index: editor.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/editor.cpp,v retrieving revision 1.2.18.1 retrieving revision 1.2.18.2 diff -u -d -r1.2.18.1 -r1.2.18.2 --- editor.cpp 2 Oct 2004 07:02:33 -0000 1.2.18.1 +++ editor.cpp 2 Oct 2004 21:36:35 -0000 1.2.18.2 @@ -223,3 +223,6 @@ break; } } + + #include "editor.moc" + \ No newline at end of file Index: mapicon.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/mapicon.cpp,v retrieving revision 1.1.4.4 retrieving revision 1.1.4.4.2.1 diff -u -d -r1.1.4.4 -r1.1.4.4.2.1 --- mapicon.cpp 12 Feb 2004 00:39:28 -0000 1.1.4.4 +++ mapicon.cpp 2 Oct 2004 21:36:36 -0000 1.1.4.4.2.1 @@ -1264,3 +1264,5 @@ return m_player->pickConColor(spawn->level()); } + +#include "mapicon.moc" Index: bazaarlog.h =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/bazaarlog.h,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.1.2.1 diff -u -d -r1.1.4.1 -r1.1.4.1.2.1 --- bazaarlog.h 18 Feb 2004 22:56:14 -0000 1.1.4.1 +++ bazaarlog.h 2 Oct 2004 21:36:35 -0000 1.1.4.1.2.1 @@ -7,12 +7,15 @@ * Copyright 2003-2004 by the respective ShowEQ Developers */ +#ifndef _BAZAARLOG_H_ +#define _BAZAARLOG_H_ + #include <qobject.h> #include "logger.h" class EQPacket; class SpawnShell; - + //---------------------------------------------------------------------- // BazaarLog is an SEQLogger subclass that handles bazaar packets class BazaarLog : public SEQLogger @@ -32,3 +35,4 @@ SpawnShell& m_shell; }; +#endif // _BAZAARLOG_H_ Index: spellshell.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spellshell.cpp,v retrieving revision 1.11.10.4 retrieving revision 1.11.10.4.2.1 diff -u -d -r1.11.10.4 -r1.11.10.4.2.1 --- spellshell.cpp 16 Jan 2004 20:22:11 -0000 1.11.10.4 +++ spellshell.cpp 2 Oct 2004 21:36:36 -0000 1.11.10.4.2.1 @@ -519,3 +519,4 @@ m_timer->stop(); } +#include "spellshell.moc" Index: spawnlistcommon.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spawnlistcommon.cpp,v retrieving revision 1.6.6.2 retrieving revision 1.6.6.2.2.1 diff -u -d -r1.6.6.2 -r1.6.6.2.2.1 --- spawnlistcommon.cpp 16 Jan 2004 20:22:11 -0000 1.6.6.2 +++ spawnlistcommon.cpp 2 Oct 2004 21:36:36 -0000 1.6.6.2.2.1 @@ -740,3 +740,5 @@ if (ok) m_spawnlistWindow->setCaption(caption); } + +#include "spawnlistcommon.moc" Index: interface.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/interface.cpp,v retrieving revision 1.67.6.9.2.1 retrieving revision 1.67.6.9.2.2 diff -u -d -r1.67.6.9.2.1 -r1.67.6.9.2.2 --- interface.cpp 2 Oct 2004 07:02:33 -0000 1.67.6.9.2.1 +++ interface.cpp 2 Oct 2004 21:36:35 -0000 1.67.6.9.2.2 @@ -6065,3 +6065,4 @@ QMainWindow::setDockEnabled(dw, DockRight, enable); } +#include "interface.moc" Index: zonemgr.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/zonemgr.cpp,v retrieving revision 1.8.6.4 retrieving revision 1.8.6.4.2.1 diff -u -d -r1.8.6.4 -r1.8.6.4.2.1 --- zonemgr.cpp 18 Feb 2004 22:56:15 -0000 1.8.6.4 +++ zonemgr.cpp 2 Oct 2004 21:36:36 -0000 1.8.6.4.2.1 @@ -277,3 +277,5 @@ sizeof(zonePointStruct) * m_zonePointCount); } +#include "zonemgr.moc" + |
|
From: Erik B. <do...@us...> - 2004-10-02 21:38:15
|
Update of /cvsroot/seq/showeq In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31146 Modified Files: Tag: pre_v5_0_dev2 ChangeLog Makefile.am showeq.kdevelop Log Message: Improved MOC file handling and miscellaneous cleanup Index: Makefile.am =================================================================== RCS file: /cvsroot/seq/showeq/Makefile.am,v retrieving revision 1.1.1.1.16.1.2.2 retrieving revision 1.1.1.1.16.1.2.3 diff -u -d -r1.1.1.1.16.1.2.2 -r1.1.1.1.16.1.2.3 --- Makefile.am 2 Oct 2004 03:58:42 -0000 1.1.1.1.16.1.2.2 +++ Makefile.am 2 Oct 2004 21:36:22 -0000 1.1.1.1.16.1.2.3 @@ -1,5 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 -AUTOMAKE_OPTIONS = dist-bzip2 +AUTOMAKE_OPTIONS = 1.7 dist-bzip2 SUBDIRS = src conf Index: showeq.kdevelop =================================================================== RCS file: /cvsroot/seq/showeq/Attic/showeq.kdevelop,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -d -r1.1.2.3 -r1.1.2.4 --- showeq.kdevelop 2 Oct 2004 03:09:41 -0000 1.1.2.3 +++ showeq.kdevelop 2 Oct 2004 21:36:22 -0000 1.1.2.4 @@ -35,7 +35,7 @@ <mainprogram>src/showeq</mainprogram> <directoryradio>executable</directoryradio> <customdirectory>/</customdirectory> - <programargs/> + <programargs></programargs> <terminal>false</terminal> <autocompile>true</autocompile> <envvars/> @@ -76,7 +76,7 @@ <abortonerror>true</abortonerror> <numberofjobs>1</numberofjobs> <dontact>false</dontact> - <makebin/> + <makebin></makebin> <prio>0</prio> </make> </kdevautoproject> @@ -181,10 +181,7 @@ </projectdoc> </kdevdocumentation> <kdevfileview> - <groups> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> - </groups> + <groups/> <tree> <hidepatterns>*.o,*.lo,CVS</hidepatterns> <hidenonprojectfiles>false</hidenonprojectfiles> Index: ChangeLog =================================================================== RCS file: /cvsroot/seq/showeq/Attic/ChangeLog,v retrieving revision 1.1.2.2.2.5 retrieving revision 1.1.2.2.2.6 diff -u -d -r1.1.2.2.2.5 -r1.1.2.2.2.6 --- ChangeLog 2 Oct 2004 07:02:33 -0000 1.1.2.2.2.5 +++ ChangeLog 2 Oct 2004 21:36:21 -0000 1.1.2.2.2.6 @@ -8,6 +8,8 @@ + Exclude MOC output files m_*.cpp from Doxygen processing. + Removed QT_VERSION checks that for versions of Qt that we no longer support (Qt 2.x, 3.0.x) to improve code readability/maintainability. ++ Improved MOC file handling. ++ Miscellaneous cleanup. dohpaZ (10/1/04) ------------------------ @@ -38,6 +40,7 @@ dophaZ (09/24/04) ------------------------ ++ Updated version to 5.0.0.15 + Migrated the dominant distribution method of ShowEQ to tarballs and packages. Support for direct building off of CVS by non-developers, although still supported, is deprecated and strongly discouraged. |
|
From: Erik B. <do...@us...> - 2004-10-02 07:02:47
|
Update of /cvsroot/seq/showeq/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv454/src Modified Files: Tag: pre_v5_0_dev2 datetimemgr.cpp editor.cpp filter.cpp interface.cpp spawnlog.cpp spells.cpp xmlconv.cpp xmlpreferences.cpp Log Message: Removed QT_VERSION checks for Qt versions that we no longer support Qt 2.x/3.0.x. Index: xmlpreferences.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/xmlpreferences.cpp,v retrieving revision 1.3.16.2 retrieving revision 1.3.16.2.2.1 diff -u -d -r1.3.16.2 -r1.3.16.2.2.1 --- xmlpreferences.cpp 13 Dec 2003 00:49:43 -0000 1.3.16.2 +++ xmlpreferences.cpp 2 Oct 2004 07:02:34 -0000 1.3.16.2.2.1 @@ -25,9 +25,7 @@ #include <qdir.h> #include <qfileinfo.h> #include <qregexp.h> -#if QT_VERSION > 300 #include <qkeysequence.h> -#endif #include <qtextstream.h> @@ -112,15 +110,6 @@ return; } -#if QT_VERSION < 300 - if (!doc.setContent(&f)) - { - qWarning("Unable to set preference document to contents of file: %s!", - (const char*)filename); - f.close(); - return; - } -#else QString errorMsg; int errorLine = 0; int errorColumn = 0; @@ -132,7 +121,6 @@ f.close(); return; } -#endif // do more processing here QDomElement docElem = doc.documentElement(); @@ -286,15 +274,6 @@ bool loaded = false; if (f.open(IO_ReadOnly)) { -#if QT_VERSION < 300 - if (doc.setContent(&f)) - loaded = true; - else - { - qWarning("Unable to set preference document to contents of file: %s!", - (const char*)filename); - } -#else QString errorMsg; int errorLine = 0; int errorColumn = 0; @@ -307,7 +286,6 @@ (const char*)errorMsg, errorLine, errorColumn); } -#endif // close the file f.close(); @@ -316,16 +294,11 @@ // if no file was loaded, use the template document if (!loaded) { -#if QT_VERSION < 300 - if (doc.setContent(m_templateDoc)) - loaded = true; -#else QString errorMsg; int errorLine = 0; int errorColumn = 0; if (doc.setContent(m_templateDoc, false, &errorMsg, &errorLine, &errorColumn)) loaded = true; -#endif } // if there was an existing file, rename it @@ -725,11 +698,9 @@ switch(preference->type()) { -#if QT_VERSION >= 300 case QVariant::KeySequence: key = preference->toInt(); break; -#endif case QVariant::String: // convert it to a key key = QAccel::stringToKey(preference->toString()); @@ -909,11 +880,7 @@ int inValue, Persistence pers) { -#if QT_VERSION < 300 - setPref(inName, inSection, QVariant(QAccel::keyToString(inValue)), pers); -#else setPref(inName, inSection, QVariant(QKeySequence(inValue)), pers); -#endif } void XMLPreferences::setPrefInt64(const QString& inName, Index: filter.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/filter.cpp,v retrieving revision 1.6.6.1 retrieving revision 1.6.6.1.2.1 diff -u -d -r1.6.6.1 -r1.6.6.1.2.1 --- filter.cpp 7 Dec 2003 06:30:43 -0000 1.6.6.1 +++ filter.cpp 2 Oct 2004 07:02:33 -0000 1.6.6.1.2.1 @@ -157,14 +157,9 @@ if (!m_regexp.isValid()) { -#if (QT_VERSION > 0x030100) seqWarn("Filter Error: '%s' - %s", (const char*)m_regexp.pattern(), (const char*)m_regexp.errorString()); -#else - seqWarn("Filter Error: '%s' - Is Invalid - Upgrade to Qt 3.1 or better for more info...", - (const char*)m_regexp.pattern()); -#endif } } @@ -176,14 +171,9 @@ { if (!m_regexp.isValid()) { -#if (QT_VERSION > 0x030100) seqWarn("Filter Error: '%s' - %s", (const char*)m_regexp.pattern(), (const char*)m_regexp.errorString()); -#else - seqWarn("Filter Error: '%s' - Is Invalid - Upgrade to Qt 3.1 or better for more info...", - (const char*)m_regexp.pattern()); -#endif } } Index: spells.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spells.cpp,v retrieving revision 1.4.4.2 retrieving revision 1.4.4.2.2.1 diff -u -d -r1.4.4.2 -r1.4.4.2.2.1 --- spells.cpp 13 Dec 2003 00:49:43 -0000 1.4.4.2 +++ spells.cpp 2 Oct 2004 07:02:34 -0000 1.4.4.2.2.1 @@ -261,19 +261,7 @@ if ((unicodeIndicator != 0xfffe) && (unicodeIndicator != 0xfeff)) text = textData; else - { -#if (QT_VERSION > 0x030100) text = QString::fromUcs2((uint16_t*)textData.data()); -#else - if (sizeof(QChar) == 2) - text.setUnicode(QChar*(textData.data()), textData.size() / 2); - else - { - seqWarn("Spells::loadSpells(): Upgrade your version of Qt to at least 3.1 to properly handle UTF-16 encoded files!"); - text = textData; - } -#endif - } // split the file into at the line termination QStringList lines = QStringList::split(lineTerm, Index: interface.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/interface.cpp,v retrieving revision 1.67.6.9 retrieving revision 1.67.6.9.2.1 diff -u -d -r1.67.6.9 -r1.67.6.9.2.1 --- interface.cpp 24 Sep 2004 04:25:52 -0000 1.67.6.9 +++ interface.cpp 2 Oct 2004 07:02:33 -0000 1.67.6.9.2.1 @@ -5279,21 +5279,13 @@ case 1: // platinum { QPalette p( QColor( 239, 239, 239 ) ); -#if QT_VERSION >= 0x030000 qApp->setStyle("platinum"); -#else - qApp->setStyle( (QStyle *) new QPlatinumStyle ); -#endif qApp->setPalette( p, TRUE ); } break; case 2: // windows { -#if QT_VERSION >= 0x030000 qApp->setStyle("windows"); -#else - qApp->setStyle( (QStyle *) new QWindowsStyle ); -#endif qApp->setFont( OrigFont, TRUE ); qApp->setPalette( OrigPalette, TRUE ); } @@ -5302,11 +5294,7 @@ case 4: // cde polished { QPalette p( QColor( 75, 123, 130 ) ); -#if QT_VERSION >= 0x030000 qApp->setStyle("cde"); -#else - qApp->setStyle( (QStyle *) new QCDEStyle( theme == 3 ? TRUE : FALSE ) ); -#endif p.setColor( QPalette::Active, QColorGroup::Base, QColor( 55, 77, 78 ) ); p.setColor( QPalette::Inactive, QColorGroup::Base, QColor( 55, 77, 78 ) ); p.setColor( QPalette::Disabled, QColorGroup::Base, QColor( 55, 77, 78 ) ); @@ -5332,11 +5320,7 @@ case 5: // motif { QPalette p( QColor( 192, 192, 192 ) ); -#if QT_VERSION >= 0x030000 qApp->setStyle("motif"); -#else - qApp->setStyle( (QStyle *) new QMotifStyle ); -#endif qApp->setPalette( p, TRUE ); qApp->setFont( OrigFont, TRUE ); } @@ -5344,11 +5328,7 @@ case 6: // SGI { //QPalette p( QColor( 192, 192, 192 ) ); -#if QT_VERSION >= 0x030000 qApp->setStyle("sgi"); -#else - qApp->setStyle( (QStyle *) new QSGIStyle( FALSE ) ); -#endif qApp->setPalette( OrigPalette, TRUE ); qApp->setFont( OrigFont, TRUE ); } @@ -5356,11 +5336,7 @@ default: // system default { QPalette p( QColor( 192, 192, 192 ) ); -#if QT_VERSION >= 0x030000 qApp->setStyle("motif"); -#else - qApp->setStyle( (QStyle *) new QMotifStyle ); -#endif qApp->setPalette( p, TRUE ); qApp->setFont( OrigFont, TRUE ); theme = 2; Index: editor.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/editor.cpp,v retrieving revision 1.2 retrieving revision 1.2.18.1 diff -u -d -r1.2 -r1.2.18.1 --- editor.cpp 24 May 2002 19:15:11 -0000 1.2 +++ editor.cpp 2 Oct 2004 07:02:33 -0000 1.2.18.1 @@ -82,8 +82,6 @@ EditorWindow::EditorWindow(const char *fileName) : QMainWindow( 0, "ShowEQ - Editor", WDestructiveClose ) { -#if (QT_VERSION > 209) - int id; QPixmap openIcon, saveIcon; @@ -121,7 +119,6 @@ resize( 600, 450 ); filename = (QString)fileName; load(fileName); -#endif } EditorWindow::~EditorWindow() @@ -130,19 +127,16 @@ void EditorWindow::load() { -#if (QT_VERSION > 209) QString fn = QFileDialog::getOpenFileName( QString::null, QString::null, this); if ( !fn.isEmpty() ) load( fn ); else statusBar()->message( "File Open Cancelled", 2000 ); -#endif } void EditorWindow::load( const char *fileName ) { -#if (QT_VERSION > 209) QFile f( fileName ); if ( !f.open( IO_ReadOnly ) ) return; @@ -164,12 +158,10 @@ QString s; s.sprintf( "Opened %s", fileName ); statusBar()->message( s, 2000 ); -#endif } void EditorWindow::save() { -#if (QT_VERSION > 209) if ( filename.isEmpty() ) { saveAs(); return; @@ -192,12 +184,10 @@ setCaption( filename ); statusBar()->message( QString( "Saved %1" ).arg( filename ), 2000 ); -#endif } void EditorWindow::saveAs() { -#if (QT_VERSION > 209) QString fn = QFileDialog::getSaveFileName( QString::null, QString::null, this ); if ( !fn.isEmpty() ) { @@ -206,12 +196,10 @@ } else { statusBar()->message( "Saving cancelled", 2000 ); } -#endif } void EditorWindow::closeEvent( QCloseEvent* ce ) { -#if (QT_VERSION > 209) if ( !e->edited() ) { ce->accept(); return; @@ -234,5 +222,4 @@ ce->accept(); break; } -#endif } Index: datetimemgr.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/datetimemgr.cpp,v retrieving revision 1.2.4.1 retrieving revision 1.2.4.1.2.1 diff -u -d -r1.2.4.1 -r1.2.4.1.2.1 --- datetimemgr.cpp 7 Dec 2003 06:30:43 -0000 1.2.4.1 +++ datetimemgr.cpp 2 Oct 2004 07:02:33 -0000 1.2.4.1.2.1 @@ -44,11 +44,7 @@ { const timeOfDayStruct* tday = (const timeOfDayStruct*)data; -#if (QT_VERSION > 0x030100) m_refDateTime = QDateTime::currentDateTime(Qt::UTC); -#else - m_refDateTime = QDateTime::currentDateTime(); -#endif m_eqDateTime.setDate(QDate(tday->year, tday->month, tday->day)); m_eqDateTime.setTime(QTime(tday->hour - 1, tday->minute, 0)); if (!m_timer) @@ -66,11 +62,7 @@ if (!m_eqDateTime.isValid()) return; -#if (QT_VERSION > 0x030100) const QDateTime& current = QDateTime::currentDateTime(Qt::UTC); -#else - const QDateTime& current = QDateTime::currentDateTime(); -#endif int secs = m_refDateTime.secsTo(current); if (secs) Index: spawnlog.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spawnlog.cpp,v retrieving revision 1.2.4.2 retrieving revision 1.2.4.2.2.1 diff -u -d -r1.2.4.2 -r1.2.4.2.2.1 --- spawnlog.cpp 16 Jan 2004 20:22:11 -0000 1.2.4.2 +++ spawnlog.cpp 2 Oct 2004 07:02:34 -0000 1.2.4.2.2.1 @@ -35,11 +35,7 @@ const char *killedBy, int kid, int guildid) { const QDateTime& eqDate = m_dateTimeMgr->updatedDateTime(); -#if (QT_VERSION > 0x030100) const QTime& time = QTime::currentTime(Qt::LocalTime); -#else - const QTime& time = QTime::currentTime(); -#endif logSpawnInfo(type, name, id, level, x, y, z, eqDate, time, @@ -88,11 +84,7 @@ int spawndatasize = len / sizeof(spawnStruct); const QDateTime& eqDate = m_dateTimeMgr->updatedDateTime(); -#if (QT_VERSION > 0x030100) const QTime& time = QTime::currentTime(Qt::LocalTime); -#else - const QTime& time = QTime::currentTime(); -#endif for (int i = 0; i < spawndatasize; i++) { Index: xmlconv.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/xmlconv.cpp,v retrieving revision 1.2.16.3 retrieving revision 1.2.16.3.2.1 diff -u -d -r1.2.16.3 -r1.2.16.3.2.1 --- xmlconv.cpp 24 Sep 2004 04:25:53 -0000 1.2.16.3 +++ xmlconv.cpp 2 Oct 2004 07:02:34 -0000 1.2.16.3.2.1 @@ -205,11 +205,7 @@ // fix the key code (deal with Qt brain death) key &= ~Qt::UNICODE_ACCEL; -#if QT_VERSION >= 300 v = QVariant(QKeySequence(key)); -#else - v = QVariant(key); -#endif ok = true; } } @@ -240,12 +236,10 @@ sp.setHorData((QSizePolicy::SizeType)e.attribute("hsizetype").toInt()); if (e.hasAttribute("vsizetype")) sp.setVerData((QSizePolicy::SizeType)e.attribute("vsizetype").toInt()); -#if (QT_VERSION >= 300) if (e.hasAttribute("horstretch")) sp.setHorStretch(e.attribute("horstretch").toInt()); if (e.hasAttribute("verstretch")) sp.setHorStretch(e.attribute("verstretch").toInt()); -#endif v = QVariant(sp); ok = true; } @@ -453,10 +447,8 @@ QSizePolicy sp(v.toSizePolicy()); e.setAttribute("hsizetype", sp.horData()); e.setAttribute("vsizetype", sp.verData()); -#if (QT_VERSION >= 300) e.setAttribute("horstretch", sp.horStretch()); e.setAttribute("verstretch", sp.verStretch()); -#endif } break; case QVariant::Cursor: @@ -515,12 +507,10 @@ } break; -#if QT_VERSION >= 300 case QVariant::KeySequence: e.setTagName("key"); e.setAttribute("sequence", (QString)v.toKeySequence()); break; -#endif case QVariant::ByteArray: // this is only for [u]int64_t { |
|
From: Erik B. <do...@us...> - 2004-10-02 07:02:45
|
Update of /cvsroot/seq/showeq In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv454 Modified Files: Tag: pre_v5_0_dev2 ChangeLog Log Message: Removed QT_VERSION checks for Qt versions that we no longer support Qt 2.x/3.0.x. Index: ChangeLog =================================================================== RCS file: /cvsroot/seq/showeq/Attic/ChangeLog,v retrieving revision 1.1.2.2.2.4 retrieving revision 1.1.2.2.2.5 diff -u -d -r1.1.2.2.2.4 -r1.1.2.2.2.5 --- ChangeLog 2 Oct 2004 06:10:30 -0000 1.1.2.2.2.4 +++ ChangeLog 2 Oct 2004 07:02:33 -0000 1.1.2.2.2.5 @@ -6,6 +6,8 @@ + Update INSTALL to reflect new minimum automake 1.7 requirement for Makefile.dist users. + Exclude MOC output files m_*.cpp from Doxygen processing. ++ Removed QT_VERSION checks that for versions of Qt that we no longer + support (Qt 2.x, 3.0.x) to improve code readability/maintainability. dohpaZ (10/1/04) ------------------------ |
|
From: Erik B. <do...@us...> - 2004-10-02 06:11:35
|
Update of /cvsroot/seq/showeq In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26016 Modified Files: Tag: pre_v5_0_dev2 ChangeLog Doxyfile INSTALL configure.in doxygen.cfg Log Message: autoconf/automake/doxygen tweaks. Index: Doxyfile =================================================================== RCS file: /cvsroot/seq/showeq/Attic/Doxyfile,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- Doxyfile 2 Oct 2004 03:09:41 -0000 1.1.2.2 +++ Doxyfile 2 Oct 2004 06:10:31 -0000 1.1.2.3 @@ -124,7 +124,7 @@ *.xpm \ *.dox RECURSIVE = YES -EXCLUDE = +EXCLUDE = m_*.cpp EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = EXAMPLE_PATH = Index: doxygen.cfg =================================================================== RCS file: /cvsroot/seq/showeq/Attic/doxygen.cfg,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- doxygen.cfg 2 Oct 2004 03:09:41 -0000 1.1.2.1 +++ doxygen.cfg 2 Oct 2004 06:10:31 -0000 1.1.2.2 @@ -85,7 +85,7 @@ *.h \ *.inc RECURSIVE = YES -EXCLUDE = +EXCLUDE = m_*.cpp EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = EXAMPLE_PATH = $(SRCDIR) Index: INSTALL =================================================================== RCS file: /cvsroot/seq/showeq/INSTALL,v retrieving revision 1.5.16.4 retrieving revision 1.5.16.4.2.1 diff -u -d -r1.5.16.4 -r1.5.16.4.2.1 --- INSTALL 24 Sep 2004 04:25:41 -0000 1.5.16.4 +++ INSTALL 2 Oct 2004 06:10:31 -0000 1.5.16.4.2.1 @@ -285,7 +285,7 @@ *** GNU tools *** libtool 1.3.4-3 Most recent... http://www.gnu.org/software/libtool/ autoconf 2.53 Most recent... http://www.gnu.org/software/autoconf/ - automake 1.5 Most recent... http://www.gnu.org/software/automake/ + automake 1.7 Most recent... http://www.gnu.org/software/automake/ perl 5.0 Most recent... http://www.perl.org/ --------------------------------------------------------------------------- Index: ChangeLog =================================================================== RCS file: /cvsroot/seq/showeq/Attic/ChangeLog,v retrieving revision 1.1.2.2.2.3 retrieving revision 1.1.2.2.2.4 diff -u -d -r1.1.2.2.2.3 -r1.1.2.2.2.4 --- ChangeLog 2 Oct 2004 03:09:40 -0000 1.1.2.2.2.3 +++ ChangeLog 2 Oct 2004 06:10:30 -0000 1.1.2.2.2.4 @@ -1,5 +1,12 @@ Version: $Id$ $Name$ +dohpaZ (10/2/04) +------------------------ ++ Migrate to new (autoconf >2.50) style AC_INIT & AM_INIT_AUTOMAKE ++ Update INSTALL to reflect new minimum automake 1.7 requirement for + Makefile.dist users. ++ Exclude MOC output files m_*.cpp from Doxygen processing. + dohpaZ (10/1/04) ------------------------ + Integrated patch #'s: 1037498, 1037496, 1037494, 1037493, 1037491 Index: configure.in =================================================================== RCS file: /cvsroot/seq/showeq/configure.in,v retrieving revision 1.49.4.16.2.1 retrieving revision 1.49.4.16.2.2 diff -u -d -r1.49.4.16.2.1 -r1.49.4.16.2.2 --- configure.in 2 Oct 2004 03:09:41 -0000 1.49.4.16.2.1 +++ configure.in 2 Oct 2004 06:10:31 -0000 1.49.4.16.2.2 @@ -2,9 +2,13 @@ dnl $Id$ $Name$ AC_PREREQ(2.53) -AC_INIT(src/main.cpp) +AC_INIT(showeq, 5.0.0.15) +AC_CONFIG_SRCDIR(src/main.cpp) AC_CANONICAL_SYSTEM + AM_CONFIG_HEADER(config.h) +AM_INIT_AUTOMAKE(1.7) +AM_MAINTAINER_MODE dnl doxygen macros DX_HTML_FEATURE(ON) @@ -17,9 +21,6 @@ DX_PS_FEATURE(OFF) DX_INIT_DOXYGEN(ShowEQ, doxygen.cfg, dox) -AM_INIT_AUTOMAKE(showeq, 5.0.0.15) -AM_MAINTAINER_MODE - dnl Use CCd/CXXd rather than CC/CXX otherwise it cache's the value dnl and prevents the alternate search from working. Would be better dnl if there was someway to invalidate the cache entry. ?? |
|
From: Erik B. <do...@us...> - 2004-10-02 03:59:10
|
Update of /cvsroot/seq/showeq In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9646 Modified Files: Tag: pre_v5_0_dev2 Makefile.am Log Message: minor tweaks Index: Makefile.am =================================================================== RCS file: /cvsroot/seq/showeq/Makefile.am,v retrieving revision 1.1.1.1.16.1.2.1 retrieving revision 1.1.1.1.16.1.2.2 diff -u -d -r1.1.1.1.16.1.2.1 -r1.1.1.1.16.1.2.2 --- Makefile.am 2 Oct 2004 03:09:41 -0000 1.1.1.1.16.1.2.1 +++ Makefile.am 2 Oct 2004 03:58:42 -0000 1.1.1.1.16.1.2.2 @@ -6,7 +6,7 @@ include doxygen.am EXTRA_DIST = BUGS ChangeLog FAQ INSTALL.newbies Makefile.dist README.libEQ \ -ROADMAP showeq.1 TODO $(DX_CONFIG) +ROADMAP showeq.1 TODO showeq.kdevelop Doxyfile $(DX_CONFIG) MAINTAINERCLEANFILES = aclocal.m4 config.guess config.sub configure \ Makefile.in ltconfig libqt2.dbg libqt3.dbg Makefile.dist.dbg \ |
|
From: Erik B. <do...@us...> - 2004-10-02 03:09:57
|
Update of /cvsroot/seq/showeq In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1676 Modified Files: Tag: pre_v5_0_dev2 AUTHORS ChangeLog Doxyfile Makefile.am Makefile.dist acinclude.m4 configure.in showeq.kdevelop Added Files: Tag: pre_v5_0_dev2 doxygen.am doxygen.cfg Log Message: Doxygen support and a couple bug fixes/robustness modifications. Index: Doxyfile =================================================================== RCS file: /cvsroot/seq/showeq/Attic/Doxyfile,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- Doxyfile 29 Sep 2004 20:16:44 -0000 1.1.2.1 +++ Doxyfile 2 Oct 2004 03:09:41 -0000 1.1.2.2 @@ -3,8 +3,8 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = showeq -PROJECT_NUMBER = $VERSION$ +PROJECT_NAME = ShowEQ +PROJECT_NUMBER = OUTPUT_DIRECTORY = dox CREATE_SUBDIRS = YES OUTPUT_LANGUAGE = English @@ -22,15 +22,15 @@ a \ an \ the -ALWAYS_DETAILED_SEC = NO +ALWAYS_DETAILED_SEC = YES INLINE_INHERITED_MEMB = YES FULL_PATH_NAMES = YES STRIP_FROM_PATH = /home/zaphod/dev/showeq/ STRIP_FROM_INC_PATH = SHORT_NAMES = NO -JAVADOC_AUTOBRIEF = NO +JAVADOC_AUTOBRIEF = YES MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO +DETAILS_AT_TOP = YES INHERIT_DOCS = YES DISTRIBUTE_GROUP_DOC = NO TAB_SIZE = 8 @@ -45,7 +45,7 @@ EXTRACT_PRIVATE = NO EXTRACT_STATIC = NO EXTRACT_LOCAL_CLASSES = YES -EXTRACT_LOCAL_METHODS = YES +EXTRACT_LOCAL_METHODS = NO HIDE_UNDOC_MEMBERS = NO HIDE_UNDOC_CLASSES = NO HIDE_FRIEND_COMPOUNDS = NO @@ -197,7 +197,7 @@ #--------------------------------------------------------------------------- GENERATE_MAN = NO MAN_OUTPUT = man -MAN_EXTENSION = .3 +MAN_EXTENSION = .1 MAN_LINKS = NO #--------------------------------------------------------------------------- # configuration options related to the XML output @@ -227,14 +227,14 @@ SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = -PREDEFINED = +PREDEFINED = DOXYGEN_SHOULD_SKIP_THIS EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- # Configuration::additions related to external references #--------------------------------------------------------------------------- TAGFILES = -GENERATE_TAGFILE = showeq.tag +GENERATE_TAGFILE = dox/showeq.tag ALLEXTERNALS = NO EXTERNAL_GROUPS = YES PERL_PATH = /usr/bin/perl @@ -247,13 +247,13 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES UML_LOOK = YES -TEMPLATE_RELATIONS = NO +TEMPLATE_RELATIONS = YES INCLUDE_GRAPH = YES INCLUDED_BY_GRAPH = YES CALL_GRAPH = NO GRAPHICAL_HIERARCHY = YES DOT_IMAGE_FORMAT = png -DOT_PATH = +DOT_PATH = /usr/bin DOTFILE_DIRS = MAX_DOT_GRAPH_WIDTH = 1024 MAX_DOT_GRAPH_HEIGHT = 1024 Index: acinclude.m4 =================================================================== RCS file: /cvsroot/seq/showeq/acinclude.m4,v retrieving revision 1.9.16.3 retrieving revision 1.9.16.3.2.1 diff -u -d -r1.9.16.3 -r1.9.16.3.2.1 --- acinclude.m4 24 Sep 2004 04:25:41 -0000 1.9.16.3 +++ acinclude.m4 2 Oct 2004 03:09:41 -0000 1.9.16.3.2.1 @@ -582,15 +582,18 @@ ac_qt_includes="" ac_qt_libraries="" ac_qt_bindir="" +ac_qt_docs="" qt_libraries="" qt_includes="" +qt_docs="" AC_ARG_WITH(qt-dir, [ --with-qt-dir=DIR where the root of Qt is installed ], [ ac_qt_includes="$withval"/include ac_qt_libraries="$withval"/lib ac_qt_bindir="$withval"/bin + ac_qt_docs="$withval"/doc/html ]) AC_ARG_WITH(qt-includes, @@ -599,6 +602,12 @@ ac_qt_includes="$withval" ]) +AC_ARG_WITH(qt-docs, + [ --with-qt-docs=DIR where the Qt docs are. ], + [ + ac_qt_docs="$withval" + ]) + ac_qt_libs_given=no AC_ARG_WITH(qt-libraries, @@ -622,41 +631,31 @@ $QTINC \ /usr/local/qt3/include \ /usr/local/qt/include \ - /usr/local/qt2/include \ - /usr/local/qt-2.3.2/include \ /usr/local/qt*/include \ - /opt/qt-gcc3-2.3.2/include \ + /usr/qt/3/include \ + /usr/qt/*/include \ /opt/qt-gcc3-*/include \ - /opt/qt-2.3.2/include \ /usr/include/qt3 \ /usr/include/qt \ - /usr/include/qt2 \ /usr/include/qt* \ /usr/include \ /usr/lib/qt3/include \ /usr/lib/qt/include \ - /usr/lib/qt2/include \ /usr/lib/qt*/include \ - /usr/lib/qtgcc3-2.3.2/include \ /usr/lib/qtgcc3-*/include \ /usr/lib/qt3/include \ /usr/lib/qt/include \ - /usr/lib/qt2/include \ /usr/lib/qt*/include \ - /usr/X11R6/include/X11/qt2 \ /usr/X11R6/include/X11/qt3 \ /usr/X11R6/include/X11/qt \ /usr/X11R6/include/X11/qt* \ - /usr/X11R6/include/X11/qt2/include \ /usr/X11R6/include/X11/qt3/include \ /usr/X11R6/include/X11/qt/include \ /usr/X11R6/include/X11/qt*/include \ - /usr/X11R6/include/qt2 \ /usr/X11R6/include/qt3 \ /usr/X11R6/include/qt \ /usr/X11R6/include/qt* \ - /usr/X11R6/include/qt2/include \ - /usr/X11R6/include/qt3/include \ + /usr/X11R6/include/qt3/include \ /usr/X11R6/include/qt/include \ /usr/X11R6/include/qt*/include \ /usr/src/qt-*/include \ @@ -738,36 +737,27 @@ $QTLIB \ /usr/local/qt3/lib \ /usr/local/qt/lib \ - /usr/local/qt2/lib \ - /usr/local/qt-2.3.2/lib \ /usr/local/qt*/lib \ - /opt/qt-gcc3-2.3.2/lib \ - /opt/qt-2.3.2/lib \ + /usr/qt/3/lib \ + /usr/qt/*/lib \ /usr/lib/qt3/lib \ /usr/lib/qt/lib \ /usr/lib/qt*/lib \ /usr/lib/qt3 \ - /usr/lib/qt2 \ /usr/lib/qt \ - /usr/lib/qt2/lib \ - /usr/lib/qtgcc3-2.3.2/lib \ /usr/lib/qt* \ /usr/lib \ /usr/X11R6/lib/X11/qt3 \ /usr/X11R6/lib/X11/qt \ - /usr/X11R6/lib/X11/qt2 \ /usr/X11R6/lib/X11/qt* \ /usr/X11R6/lib/X11/qt3/lib \ /usr/X11R6/lib/X11/qt/lib \ - /usr/X11R6/lib/X11/qt2/lib \ /usr/X11R6/lib/X11/qt*/lib \ /usr/X11R6/lib/qt3 \ /usr/X11R6/lib/qt \ - /usr/X11R6/lib/qt2 \ /usr/X11R6/lib/qt* \ /usr/X11R6/lib/qt3/lib \ /usr/X11R6/lib/qt/lib \ - /usr/X11R6/lib/qt2/lib \ /usr/X11R6/lib/qt*/lib \ /usr/src/qt-*/lib \ $x_libraries \ @@ -788,7 +778,6 @@ else echo "tried $dir" >&AC_FD_CC; fi - done ac_qt_libraries="$qt_libdir" @@ -845,6 +834,53 @@ LIBS="$ac_libs_safe" AC_LANG_RESTORE + +dnl ************************************ +dnl * Build yet another search path... * +dnl ************************************ + +qt_docdirs=" $QTDIR/doc/html \ + $qt_incdir../doc/html \ + /usr/local/qt3/doc/html \ + /usr/local/qt/doc/html \ + /usr/local/qt*/doc/html \ + /usr/qt/3/doc/html \ + /usr/qt/*/doc/html \ + /usr/lib/qt3/doc/html \ + /usr/lib/qt/doc/html \ + /usr/lib/qt*/doc/html \ + /usr/lib/doc/html \ + /usr/lib/qt/doc/html \ + /usr/lib/qt*/doc/html \ + /usr/X11R6/lib/X11/qt3/doc/html \ + /usr/X11R6/lib/X11/qt/doc/html \ + /usr/X11R6/lib/X11/qt*/doc/html \ + /usr/X11R6/lib/X11/qt3/doc/html \ + /usr/X11R6/lib/X11/qt/doc/html \ + /usr/X11R6/lib/X11/qt*/doc/html \ + /usr/X11R6/lib/qt3/doc/html \ + /usr/X11R6/lib/qt/doc/html \ + /usr/X11R6/lib/qt*/doc/html \ + /usr/X11R6/lib/qt3/doc/html \ + /usr/X11R6/lib/qt/doc/html \ + /usr/X11R6/lib/qt*/doc/html \ + /usr/src/qt-*/doc/html \ + $qt_docdirs" + +[[ "$ac_qt_docs" != "NO" ]] && \ +qt_docdirs="$ac_qt_docs $qt_docdirs" + +AC_FIND_FILE("qobject.html", $qt_docdirs, qt_docdir) + +ac_qt_docs="$qt_docdir" + +if [[ -n "$ac_qt_docs" -a "$ac_qt_docs" != "NO" ]]; then + echo -e ">>>> Documentation...:\t$ac_qt_docs/" +else + echo -e ">>>> Documentation...:\tUnable to locate?!?" + AC_MSG_WARN([Qt documenation not installed?!]); +fi; + if [[ -z "$ac_qt_includes" ]] || [[ -z "$ac_qt_libraries" ]]; then ac_cv_have_qt="have_qt=no"; ac_qt_notfound=""; @@ -900,6 +936,7 @@ qt_libraries=$ac_qt_libraries qt_includes=$ac_qt_includes + qt_docs=$ac_qt_docs else @@ -914,6 +951,7 @@ qt_libraries=$ac_qt_libraries qt_includes=$ac_qt_includes + qt_docs=$ac_qt_docs fi @@ -923,6 +961,7 @@ AC_SUBST(qt_libraries) AC_SUBST(qt_includes) +AC_SUBST(qt_docs) if [[ "$qt_includes" == "$x_includes" ]] || [[ -z "$qt_includes" ]]; then @@ -940,8 +979,11 @@ all_libraries="$all_libraries $QT_LDFLAGS" fi +QT_DOCS="$qt_docs" + AC_SUBST(QT_INCLUDES) AC_SUBST(QT_LDFLAGS) +AC_SUBST(QT_DOCS) LIB_QT='-lqt-mt $(LIBPNG) -lXext $(LIB_X11) $(X_PRE_LIBS)' AC_SUBST(LIB_QT) --- NEW FILE: doxygen.am --- # Copyright (C) 2004 Oren Ben-Kiki # This file is distributed under the same terms as the Automake macro files. # Generate automatic documentation using Doxygen. Goals and variables values # are controlled by the various DX_COND_??? conditionals set by autoconf. # # The provided goals are: # doxygen-doc: Generate all doxygen documentation. # doxygen-run: Run doxygen, which will generate some of the documentation # (HTML, CHM, CHI, MAN, RTF, XML) but will not do the post # processing required for the rest of it (PS, PDF, and some MAN). # doxygen-man: Rename some doxygen generated man pages. # doxygen-ps: Generate doxygen PostScript documentation. # doxygen-pdf: Generate doxygen PDF documentation. # # Note that by default these are not integrated into the automake goals. If # doxygen is used to generate man pages, you can achieve this integration by # setting man3_MANS to the list of man pages generated and then adding the # dependency: # # $(man3_MANS): doxygen-doc # # This will cause make to run doxygen and generate all the documentation. # # The following variable is intended for use in Makefile.am: # # DX_CLEANFILES = everything to clean. # # This is usually added to MOSTLYCLEANFILES. ## --------------------------------- ## ## Format-independent Doxygen rules. ## ## --------------------------------- ## if DX_COND_doc ## ------------------------------- ## ## Rules specific for HTML output. ## ## ------------------------------- ## if DX_COND_html DX_CLEAN_HTML = @DX_DOCDIR@/html endif DX_COND_html ## ------------------------------ ## ## Rules specific for CHM output. ## ## ------------------------------ ## if DX_COND_chm DX_CLEAN_CHM = @DX_DOCDIR@/chm if DX_COND_chi DX_CLEAN_CHI = @DX_DOCDIR@/@PACKAGE@.chi endif DX_COND_chi endif DX_COND_chm ## ------------------------------ ## ## Rules specific for MAN output. ## ## ------------------------------ ## if DX_COND_man DX_CLEAN_MAN = @DX_DOCDIR@/man endif DX_COND_man ## ------------------------------ ## ## Rules specific for RTF output. ## ## ------------------------------ ## if DX_COND_rtf DX_CLEAN_RTF = @DX_DOCDIR@/rtf endif DX_COND_rtf ## ------------------------------ ## ## Rules specific for XML output. ## ## ------------------------------ ## if DX_COND_xml DX_CLEAN_XML = @DX_DOCDIR@/xml endif DX_COND_xml ## ----------------------------- ## ## Rules specific for PS output. ## ## ----------------------------- ## if DX_COND_ps DX_CLEAN_PS = @DX_DOCDIR@/@PACKAGE@.ps DX_PS_GOAL = doxygen-ps doxygen-ps: @DX_DOCDIR@/@PACKAGE@.ps @DX_DOCDIR@/@PACKAGE@.ps: @DX_DOCDIR@/@PACKAGE@.tag cd @DX_DOCDIR@/latex; \ rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \ $(DX_LATEX) refman.tex; \ $(MAKEINDEX_PATH) refman.idx; \ $(DX_LATEX) refman.tex; \ countdown=5; \ while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \ refman.log > /dev/null 2>&1 \ && test $$countdown -gt 0; do \ $(DX_LATEX) refman.tex; \ countdown=`expr $$countdown - 1`; \ done; \ $(DX_DVIPS) -o ../@PACKAGE@.ps refman.dvi endif DX_COND_ps ## ------------------------------ ## ## Rules specific for PDF output. ## ## ------------------------------ ## if DX_COND_pdf DX_CLEAN_PDF = @DX_DOCDIR@/@PACKAGE@.pdf DX_PDF_GOAL = doxygen-pdf doxygen-pdf: @DX_DOCDIR@/@PACKAGE@.pdf @DX_DOCDIR@/@PACKAGE@.pdf: @DX_DOCDIR@/@PACKAGE@.tag cd @DX_DOCDIR@/latex; \ rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \ $(DX_PDFLATEX) refman.tex; \ $(DX_MAKEINDEX) refman.idx; \ $(DX_PDFLATEX) refman.tex; \ countdown=5; \ while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \ refman.log > /dev/null 2>&1 \ && test $$countdown -gt 0; do \ $(DX_PDFLATEX) refman.tex; \ countdown=`expr $$countdown - 1`; \ done; \ mv refman.pdf ../@PACKAGE@.pdf endif DX_COND_pdf ## ------------------------------------------------- ## ## Rules specific for LaTeX (shared for PS and PDF). ## ## ------------------------------------------------- ## if DX_COND_latex DX_CLEAN_LATEX = @DX_DOCDIR@/latex endif DX_COND_latex .PHONY: doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL) .INTERMEDIATE: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL) doxygen-run: @DX_DOCDIR@/@PACKAGE@.tag doxygen-doc: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL) @DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS) rm -rf @DX_DOCDIR@ $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG) DX_CLEANFILES = \ @DX_DOCDIR@/@PACKAGE@.tag \ -r \ $(DX_CLEAN_HTML) \ $(DX_CLEAN_CHM) \ $(DX_CLEAN_CHI) \ $(DX_CLEAN_MAN) \ $(DX_CLEAN_RTF) \ $(DX_CLEAN_XML) \ $(DX_CLEAN_PS) \ $(DX_CLEAN_PDF) \ $(DX_CLEAN_LATEX) endif DX_COND_doc Index: Makefile.dist =================================================================== RCS file: /cvsroot/seq/showeq/Makefile.dist,v retrieving revision 1.3.16.1 retrieving revision 1.3.16.1.2.1 diff -u -d -r1.3.16.1 -r1.3.16.1.2.1 --- Makefile.dist 24 Sep 2004 04:25:41 -0000 1.3.16.1 +++ Makefile.dist 2 Oct 2004 03:09:41 -0000 1.3.16.1.2.1 @@ -4,7 +4,7 @@ AUTOMAKE = automake AUTOCONF = autoconf LIBTOOLIZE_ARGS = --force --copy --automake -ACLOCAL_ARGS = +ACLOCAL_ARGS = -I m4 AUTOHEADER_ARGS = --force AUTOMAKE_ARGS = --add-missing --copy --include-deps AUTOCONF_ARGS = Index: showeq.kdevelop =================================================================== RCS file: /cvsroot/seq/showeq/Attic/showeq.kdevelop,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- showeq.kdevelop 29 Sep 2004 20:16:44 -0000 1.1.2.2 +++ showeq.kdevelop 2 Oct 2004 03:09:41 -0000 1.1.2.3 @@ -35,7 +35,7 @@ <mainprogram>src/showeq</mainprogram> <directoryradio>executable</directoryradio> <customdirectory>/</customdirectory> - <programargs></programargs> + <programargs/> <terminal>false</terminal> <autocompile>true</autocompile> <envvars/> Index: configure.in =================================================================== RCS file: /cvsroot/seq/showeq/configure.in,v retrieving revision 1.49.4.16 retrieving revision 1.49.4.16.2.1 diff -u -d -r1.49.4.16 -r1.49.4.16.2.1 --- configure.in 25 Sep 2004 20:37:27 -0000 1.49.4.16 +++ configure.in 2 Oct 2004 03:09:41 -0000 1.49.4.16.2.1 @@ -5,6 +5,18 @@ AC_INIT(src/main.cpp) AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(config.h) + +dnl doxygen macros +DX_HTML_FEATURE(ON) +DX_CHM_FEATURE(OFF) +DX_CHI_FEATURE(OFF) +DX_MAN_FEATURE(OFF) +DX_RTF_FEATURE(OFF) +DX_XML_FEATURE(OFF) +DX_PDF_FEATURE(OFF) +DX_PS_FEATURE(OFF) +DX_INIT_DOXYGEN(ShowEQ, doxygen.cfg, dox) + AM_INIT_AUTOMAKE(showeq, 5.0.0.15) AM_MAINTAINER_MODE Index: ChangeLog =================================================================== RCS file: /cvsroot/seq/showeq/Attic/ChangeLog,v retrieving revision 1.1.2.2.2.2 retrieving revision 1.1.2.2.2.3 diff -u -d -r1.1.2.2.2.2 -r1.1.2.2.2.3 --- ChangeLog 29 Sep 2004 20:18:36 -0000 1.1.2.2.2.2 +++ ChangeLog 2 Oct 2004 03:09:40 -0000 1.1.2.2.2.3 @@ -1,5 +1,17 @@ Version: $Id$ $Name$ +dohpaZ (10/1/04) +------------------------ ++ Integrated patch #'s: 1037498, 1037496, 1037494, 1037493, 1037491 + "Doxygen support for autoconf/automake" from tanner(Basic) ++ Added minor Doxygen related tweaks to source. ++ Added automatic Qt tag file generation for use with doxygen, along with + a doxygen-installdox rule to build the html dox and link them to + trolltech's website. ++ Minor bug fix related to a recently integrated patch. ++ Some more robustness modifications. ++ Fixed a minor warning. + dohpaZ (09/29/04) ------------------------ + More kdevelop project related tweaks. --- NEW FILE: doxygen.cfg --- # Doxyfile 1.3.7 #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = $(PROJECT)-$(VERSION) PROJECT_NUMBER = OUTPUT_DIRECTORY = $(DOCDIR) CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English USE_WINDOWS_ENCODING = NO BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES ABBREVIATE_BRIEF = "The $name class" \ "The $name widget" \ "The $name file" \ is \ provides \ specifies \ contains \ represents \ a \ an \ the ALWAYS_DETAILED_SEC = NO INLINE_INHERITED_MEMB = NO STRIP_FROM_INC_PATH = $(SRCDIR) FULL_PATH_NAMES = YES STRIP_FROM_PATH = $(SRCDIR) SHORT_NAMES = NO JAVADOC_AUTOBRIEF = YES MULTILINE_CPP_IS_BRIEF = NO DETAILS_AT_TOP = YES INHERIT_DOCS = YES DISTRIBUTE_GROUP_DOC = NO TAB_SIZE = 8 ALIASES = OPTIMIZE_OUTPUT_FOR_C = YES OPTIMIZE_OUTPUT_JAVA = NO SUBGROUPING = YES #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- EXTRACT_ALL = YES EXTRACT_PRIVATE = NO EXTRACT_STATIC = NO EXTRACT_LOCAL_CLASSES = YES EXTRACT_LOCAL_METHODS = NO HIDE_UNDOC_MEMBERS = NO HIDE_UNDOC_CLASSES = NO HIDE_FRIEND_COMPOUNDS = NO HIDE_IN_BODY_DOCS = NO INTERNAL_DOCS = NO CASE_SENSE_NAMES = YES HIDE_SCOPE_NAMES = NO SHOW_INCLUDE_FILES = YES INLINE_INFO = YES SORT_MEMBER_DOCS = YES SORT_BRIEF_DOCS = NO SORT_BY_SCOPE_NAME = NO GENERATE_TODOLIST = YES GENERATE_TESTLIST = YES GENERATE_BUGLIST = YES GENERATE_DEPRECATEDLIST= YES ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 30 SHOW_USED_FILES = YES #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- QUIET = YES WARNINGS = YES WARN_IF_UNDOCUMENTED = YES WARN_IF_DOC_ERROR = YES WARN_FORMAT = "$file:$line: $text" WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- INPUT = $(SRCDIR) FILE_PATTERNS = *.c \ *.cpp \ *.c++ \ *.inl \ *.h \ *.inc RECURSIVE = YES EXCLUDE = EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = EXAMPLE_PATH = $(SRCDIR) EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO IMAGE_PATH = INPUT_FILTER = FILTER_SOURCE_FILES = NO #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- SOURCE_BROWSER = YES INLINE_SOURCES = NO STRIP_CODE_COMMENTS = YES REFERENCED_BY_RELATION = YES REFERENCES_RELATION = YES VERBATIM_HEADERS = YES #--------------------------------------------------------------------------- # configuration options related to the alphabetical class index #--------------------------------------------------------------------------- ALPHABETICAL_INDEX = YES COLS_IN_ALPHA_INDEX = 5 IGNORE_PREFIX = #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- GENERATE_HTML = $(GENERATE_HTML) HTML_OUTPUT = html HTML_FILE_EXTENSION = .html HTML_HEADER = HTML_FOOTER = HTML_STYLESHEET = HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = $(GENERATE_CHM) CHM_FILE = ../$(PROJECT).chm HHC_LOCATION = $(HHC_PATH) GENERATE_CHI = $(GENERATE_CHI) BINARY_TOC = NO TOC_EXPAND = NO DISABLE_INDEX = NO ENUM_VALUES_PER_LINE = 4 GENERATE_TREEVIEW = YES TREEVIEW_WIDTH = 250 #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- GENERATE_LATEX = $(GENERATE_LATEX) LATEX_OUTPUT = latex LATEX_CMD_NAME = latex MAKEINDEX_CMD_NAME = makeindex COMPACT_LATEX = NO PAPER_TYPE = $(PAPER_SIZE) EXTRA_PACKAGES = LATEX_HEADER = PDF_HYPERLINKS = NO USE_PDFLATEX = NO LATEX_BATCHMODE = YES LATEX_HIDE_INDICES = NO #--------------------------------------------------------------------------- # configuration options related to the RTF output #--------------------------------------------------------------------------- GENERATE_RTF = $(GENERATE_RTF) RTF_OUTPUT = rtf COMPACT_RTF = NO RTF_HYPERLINKS = NO RTF_STYLESHEET_FILE = RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- GENERATE_MAN = $(GENERATE_MAN) MAN_OUTPUT = man MAN_EXTENSION = .1 MAN_LINKS = NO #--------------------------------------------------------------------------- # configuration options related to the XML output #--------------------------------------------------------------------------- GENERATE_XML = $(GENERATE_XML) XML_OUTPUT = xml XML_SCHEMA = XML_DTD = XML_PROGRAMLISTING = YES #--------------------------------------------------------------------------- # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- GENERATE_AUTOGEN_DEF = NO #--------------------------------------------------------------------------- # configuration options related to the Perl module output #--------------------------------------------------------------------------- GENERATE_PERLMOD = NO PERLMOD_LATEX = NO PERLMOD_PRETTY = YES PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- # Configuration options related to the preprocessor #--------------------------------------------------------------------------- ENABLE_PREPROCESSING = YES MACRO_EXPANSION = NO EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = PREDEFINED = DOXYGEN_SHOULD_SKIP_THIS EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- # Configuration::additions related to external references #--------------------------------------------------------------------------- TAGFILES = $(SRCDIR)/qt.tag GENERATE_TAGFILE = $(DOCDIR)/$(PROJECT).tag ALLEXTERNALS = NO EXTERNAL_GROUPS = YES PERL_PATH = $(PERL_PATH) #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- CLASS_DIAGRAMS = YES HIDE_UNDOC_RELATIONS = YES HAVE_DOT = $(HAVE_DOT) CLASS_GRAPH = YES COLLABORATION_GRAPH = YES UML_LOOK = YES TEMPLATE_RELATIONS = YES INCLUDE_GRAPH = YES INCLUDED_BY_GRAPH = YES CALL_GRAPH = NO GRAPHICAL_HIERARCHY = YES DOT_IMAGE_FORMAT = png DOT_PATH = $(DOT_PATH) DOTFILE_DIRS = MAX_DOT_GRAPH_WIDTH = 1024 MAX_DOT_GRAPH_HEIGHT = 1024 MAX_DOT_GRAPH_DEPTH = 1000 GENERATE_LEGEND = YES DOT_CLEANUP = YES #--------------------------------------------------------------------------- # Configuration::additions related to the search engine #--------------------------------------------------------------------------- SEARCHENGINE = YES Index: Makefile.am =================================================================== RCS file: /cvsroot/seq/showeq/Makefile.am,v retrieving revision 1.1.1.1.16.1 retrieving revision 1.1.1.1.16.1.2.1 diff -u -d -r1.1.1.1.16.1 -r1.1.1.1.16.1.2.1 --- Makefile.am 24 Sep 2004 04:25:41 -0000 1.1.1.1.16.1 +++ Makefile.am 2 Oct 2004 03:09:41 -0000 1.1.1.1.16.1.2.1 @@ -1,12 +1,29 @@ +ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = dist-bzip2 SUBDIRS = src conf -EXTRA_DIST = BUGS ChangeLog FAQ INSTALL.newbies Makefile.dist README.libEQ ROADMAP showeq.1 TODO +include doxygen.am -MAINTAINERCLEANFILES = aclocal.m4 config.guess config.sub configure Makefile.in \ -ltconfig libqt2.dbg libqt3.dbg Makefile.dist.dbg configure.dbg config.log \ -ltmain.sh stamp-h.in stamp-h +EXTRA_DIST = BUGS ChangeLog FAQ INSTALL.newbies Makefile.dist README.libEQ \ +ROADMAP showeq.1 TODO $(DX_CONFIG) + +MAINTAINERCLEANFILES = aclocal.m4 config.guess config.sub configure \ +Makefile.in ltconfig libqt2.dbg libqt3.dbg Makefile.dist.dbg \ +configure.dbg config.log ltmain.sh stamp-h.in stamp-h qt.tag + +@DX_DOCDIR@/@PACKAGE@.tag: qt.tag + +qt.tag: $(QT_DOCS)/index.html $(QT_DOCS)/qobject.html + doxytag -t qt.tag $(QT_DOCS) + +doxygen-installdox: doxygen-doc dox/html/installdox + if [ -x "@DX_DOCDIR@/html/installdox" ]; then \ + cd @DX_DOCDIR@/html; \ + ./installdox -l qt.tag@http://doc.trolltech.com/3.3/ -q; \ + fi + +MOSTLYCLEANFILES = $(DX_CLEANFILES) CLEANFILES = configure.dbg libqt2.dbg libqt3.dbg Index: AUTHORS =================================================================== RCS file: /cvsroot/seq/showeq/Attic/AUTHORS,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.1.2.1 diff -u -d -r1.1.2.1 -r1.1.2.1.2.1 --- AUTHORS 24 Sep 2004 04:25:41 -0000 1.1.2.1 +++ AUTHORS 2 Oct 2004 03:09:40 -0000 1.1.2.1.2.1 @@ -17,5 +17,6 @@ ROADMAP Zaphod TODO Zaphod BUGS Zaphod +m4/doxygen.m4 Oren Ben-Kiki <or...@be...> |
|
From: Erik B. <do...@us...> - 2004-10-02 03:09:57
|
Update of /cvsroot/seq/showeq/m4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1676/m4 Added Files: Tag: pre_v5_0_dev2 doxygen.m4 Log Message: Doxygen support and a couple bug fixes/robustness modifications. --- NEW FILE: doxygen.m4 --- # This file is part of Autoconf. -*- Autoconf -*- # Copyright (C) 2004 Oren Ben-Kiki # This file is distributed under the same terms as the Autoconf macro files. # Generate automatic documentation using Doxygen. Works in concert with the # aminclude.m4 file and a compatible doxygen configuration file. Defines the # following public macros: # # DX_???_FEATURE(ON|OFF) - control the default setting fo a Doxygen feature. # Supported features are 'DOXYGEN' itself, 'DOT' for generating graphics, # 'HTML' for plain HTML, 'CHM' for compressed HTML help (for MS users), 'CHI' # for generating a seperate .chi file by the .chm file, and 'MAN', 'RTF', # 'XML', 'PDF' and 'PS' for the appropriate output formats. The environment # variable DOXYGEN_PAPER_SIZE may be specified to override the default 'a4wide' # paper size. # # By default, HTML, PDF and PS documentation is generated as this seems to be # the most popular and portable combination. MAN pages created by Doxygen are # usually problematic, though by picking an appropriate subset and doing some # massaging they might be better than nothing. CHM and RTF are specific for MS # (note that you can't generate both HTML and CHM at the same time). The XML is # rather useless unless you apply specialized post-processing to it. # # The macro mainly controls the default state of the feature. The use can # override the default by specifying --enable or --disable. The macros ensure # that contradictory flags are not given (e.g., --enable-doxygen-html and # --enable-doxygen-chm, --enable-doxygen-anything with --disable-doxygen, etc.) # Finally, each feature will be automatically disabled (with a warning) if the # required programs are missing. # # Once all the feature defaults have been specified, call DX_INIT_DOXYGEN with # the following parameters: a one-word name for the project for use as a # filename base etc., an optional configuration file name (the default is # 'Doxyfile', the same as Doxygen's default), and an optional output directory # name (the default is 'doxygen-doc'). ## ----------## ## Defaults. ## ## ----------## DX_ENV="" AC_DEFUN([DX_FEATURE_doc], ON) AC_DEFUN([DX_FEATURE_dot], ON) AC_DEFUN([DX_FEATURE_man], OFF) AC_DEFUN([DX_FEATURE_html], ON) AC_DEFUN([DX_FEATURE_chm], OFF) AC_DEFUN([DX_FEATURE_chi], OFF) AC_DEFUN([DX_FEATURE_rtf], OFF) AC_DEFUN([DX_FEATURE_xml], OFF) AC_DEFUN([DX_FEATURE_pdf], ON) AC_DEFUN([DX_FEATURE_ps], ON) ## --------------- ## ## Private macros. ## ## --------------- ## # DX_ENV_APPEND(VARIABLE, VALUE) # ------------------------------ # Append VARIABLE="VALUE" to DX_ENV for invoking doxygen. AC_DEFUN([DX_ENV_APPEND], [AC_SUBST([DX_ENV], ["$DX_ENV $1='$2'"])]) # DX_DIRNAME_EXPR # --------------- # Expand into a shell expression prints the directory part of a path. AC_DEFUN([DX_DIRNAME_EXPR], [[expr ".$1" : '\(\.\)[^/]*$' \| "x$1" : 'x\(.*\)/[^/]*$']]) # DX_IF_FEATURE(FEATURE, IF-ON, IF-OFF) # ------------------------------------- # Expands according to the M4 (static) status of the feature. AC_DEFUN([DX_IF_FEATURE], [ifelse(DX_FEATURE_$1, ON, [$2], [$3])]) # DX_REQUIRE_PROG(VARIABLE, PROGRAM) # ---------------------------------- # Require the specified program to be found for the DX_CURRENT_FEATURE to work. AC_DEFUN([DX_REQUIRE_PROG], [ AC_PATH_TOOL([$1], [$2]) if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION]) AC_SUBST([DX_FLAG_[]DX_CURRENT_FEATURE], 0) fi ]) # DX_TEST_FEATURE(FEATURE) # ------------------------ # Expand to a shell expression testing whether the feature is active. AC_DEFUN([DX_TEST_FEATURE], [test "$DX_FLAG_$1" = 1]) # DX_CHECK_DEPEND(REQUIRED_FEATURE, REQUIRED_STATE) # ------------------------------------------------- # Verify that a required features has the right state before trying to turn on # the DX_CURRENT_FEATURE. AC_DEFUN([DX_CHECK_DEPEND], [ test "$DX_FLAG_$1" = "$2" \ || AC_MSG_ERROR([doxygen-DX_CURRENT_FEATURE ifelse([$2], 1, requires, contradicts) doxygen-DX_CURRENT_FEATURE]) ]) # DX_CLEAR_DEPEND(FEATURE, REQUIRED_FEATURE, REQUIRED_STATE) # ---------------------------------------------------------- # Turn off the DX_CURRENT_FEATURE if the required feature is off. AC_DEFUN([DX_CLEAR_DEPEND], [ test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_[]DX_CURRENT_FEATURE], 0) ]) # DX_FEATURE_ARG(FEATURE, DESCRIPTION, # CHECK_DEPEND, CLEAR_DEPEND, # REQUIRE, DO-IF-ON, DO-IF-OFF) # -------------------------------------------- # Parse the command-line option controlling a feature. CHECK_DEPEND is called # if the user explicitly turns the feature on (and invokes DX_CHECK_DEPEND), # otherwise CLEAR_DEPEND is called to turn off the default state if a required # feature is disabled (using DX_CLEAR_DEPEND). REQUIRE performs additional # requirement tests (DX_REQUIRE_PROG). Finally, an automake flag is set and # DO-IF-ON or DO-IF-OFF are called according to the final state of the feature. AC_DEFUN([DX_ARG_ABLE], [ AC_DEFUN([DX_CURRENT_FEATURE], [$1]) AC_DEFUN([DX_CURRENT_DESCRIPTION], [$2]) AC_ARG_ENABLE(doxygen-$1, [AS_HELP_STRING(DX_IF_FEATURE([$1], [--disable-doxygen-$1], [--enable-doxygen-$1]), DX_IF_FEATURE([$1], [don't $2], [$2]))], [ case "$enableval" in #( y|Y|yes|Yes|YES) AC_SUBST([DX_FLAG_$1], 1) $3 ;; #( n|N|no|No|NO) AC_SUBST([DX_FLAG_$1], 0) ;; #( *) AC_MSG_ERROR([invalid value '$enableval' given to doxygen-$1]) ;; esac ], [ AC_SUBST([DX_FLAG_$1], [DX_IF_FEATURE([$1], 1, 0)]) $4 ]) if DX_TEST_FEATURE([$1]); then $5 : fi if DX_TEST_FEATURE([$1]); then AM_CONDITIONAL(DX_COND_$1, :) $6 : else AM_CONDITIONAL(DX_COND_$1, false) $7 : fi ]) ## -------------- ## ## Public macros. ## ## -------------- ## # DX_XXX_FEATURE(DEFAULT_STATE) # ----------------------------- AC_DEFUN([DX_DOXYGEN_FEATURE], [AC_DEFUN([DX_FEATURE_doc], [$1])]) AC_DEFUN([DX_MAN_FEATURE], [AC_DEFUN([DX_FEATURE_man], [$1])]) AC_DEFUN([DX_HTML_FEATURE], [AC_DEFUN([DX_FEATURE_html], [$1])]) AC_DEFUN([DX_CHM_FEATURE], [AC_DEFUN([DX_FEATURE_chm], [$1])]) AC_DEFUN([DX_CHI_FEATURE], [AC_DEFUN([DX_FEATURE_chi], [$1])]) AC_DEFUN([DX_RTF_FEATURE], [AC_DEFUN([DX_FEATURE_rtf], [$1])]) AC_DEFUN([DX_XML_FEATURE], [AC_DEFUN([DX_FEATURE_xml], [$1])]) AC_DEFUN([DX_XML_FEATURE], [AC_DEFUN([DX_FEATURE_xml], [$1])]) AC_DEFUN([DX_PDF_FEATURE], [AC_DEFUN([DX_FEATURE_pdf], [$1])]) AC_DEFUN([DX_PS_FEATURE], [AC_DEFUN([DX_FEATURE_ps], [$1])]) # DX_INIT_DOXYGEN(PROJECT, [CONFIG-FILE], [OUTPUT-DOC-DIR]) # --------------------------------------------------------- # PROJECT also serves as the base name for the documentation files. # The default CONFIG-FILE is "Doxyfile" and OUTPUT-DOC-DIR is "doxygen-doc". AC_DEFUN([DX_INIT_DOXYGEN], [ # Files: AC_SUBST([DX_PROJECT], [$1]) AC_SUBST([DX_CONFIG], [ifelse([$2], [], Doxyfile, [$2])]) AC_SUBST([DX_DOCDIR], [ifelse([$3], [], doxygen-doc, [$3])]) # Environment variables used inside doxygen.cfg: DX_ENV_APPEND(SRCDIR, $srcdir) DX_ENV_APPEND(PROJECT, $DX_PROJECT) DX_ENV_APPEND(DOCDIR, $DX_DOCDIR) DX_ENV_APPEND(VERSION, $PACKAGE_VERSION) # Doxygen itself: DX_ARG_ABLE(doc, [generate any doxygen documentation], [], [], [DX_REQUIRE_PROG([DX_DOXYGEN], doxygen) DX_REQUIRE_PROG([DX_PERL], perl)], [DX_ENV_APPEND(PERL_PATH, $DX_PERL)]) # Dot for graphics: DX_ARG_ABLE(dot, [generate graphics for doxygen documentation], [DX_CHECK_DEPEND(doc, 1)], [DX_CLEAR_DEPEND(doc, 1)], [DX_REQUIRE_PROG([DX_DOT], dot)], [DX_ENV_APPEND(HAVE_DOT, YES) DX_ENV_APPEND(DOT_PATH, [`DX_DIRNAME_EXPR($DX_DOT)`])], [DX_ENV_APPEND(HAVE_DOT, NO)]) # Man pages generation: DX_ARG_ABLE(man, [generate doxygen manual pages], [DX_CHECK_DEPEND(doc, 1)], [DX_CLEAR_DEPEND(doc, 1)], [], [DX_ENV_APPEND(GENERATE_MAN, YES)], [DX_ENV_APPEND(GENERATE_MAN, NO)]) # RTF file generation: DX_ARG_ABLE(rtf, [generate doxygen RTF documentation], [DX_CHECK_DEPEND(doc, 1)], [DX_CLEAR_DEPEND(doc, 1)], [], [DX_ENV_APPEND(GENERATE_RTF, YES)], [DX_ENV_APPEND(GENERATE_RTF, NO)]) # XML file generation: DX_ARG_ABLE(xml, [generate doxygen XML documentation], [DX_CHECK_DEPEND(doc, 1)], [DX_CLEAR_DEPEND(doc, 1)], [], [DX_ENV_APPEND(GENERATE_XML, YES)], [DX_ENV_APPEND(GENERATE_XML, NO)]) # (Compressed) HTML help generation: DX_ARG_ABLE(chm, [generate doxygen compressed HTML help documentation], [DX_CHECK_DEPEND(doc, 1)], [DX_CLEAR_DEPEND(doc, 1)], [DX_REQUIRE_PROG([DX_HHC], hhc)], [DX_ENV_APPEND(HHC_PATH, $DX_HHC) DX_ENV_APPEND(GENERATE_HTML, YES) DX_ENV_APPEND(GENERATE_HTMLHELP, YES)], [DX_ENV_APPEND(GENERATE_HTMLHELP, NO)]) # Seperate CHI file generation. DX_ARG_ABLE(chi, [generate doxygen seperate compressed HTML help index file], [DX_CHECK_DEPEND(chm, 1)], [DX_CLEAR_DEPEND(chm, 1)], [], [DX_ENV_APPEND(GENERATE_CHI, YES)], [DX_ENV_APPEND(GENERATE_CHI, NO)]) # Plain HTML pages generation: DX_ARG_ABLE(html, [generate doxygen plain HTML documentation], [DX_CHECK_DEPEND(doc, 1) DX_CHECK_DEPEND(chm, 0)], [DX_CLEAR_DEPEND(doc, 1) DX_CLEAR_DEPEND(chm, 0)], [], [DX_ENV_APPEND(GENERATE_HTML, YES)], [DX_TEST_FEATURE(chm) || DX_ENV_APPEND(GENERATE_HTML, NO)]) # PostScript file generation: DX_ARG_ABLE(ps, [generate doxygen PostScript documentation], [DX_CHECK_DEPEND(doc, 1)], [DX_CLEAR_DEPEND(doc, 1)], [DX_REQUIRE_PROG([DX_LATEX], latex) DX_REQUIRE_PROG([DX_MAKEINDEX], makeindex) DX_REQUIRE_PROG([DX_DVIPS], dvips) DX_REQUIRE_PROG([DX_EGREP], egrep)]) # PDF file generation: DX_ARG_ABLE(pdf, [generate doxygen PDF documentation], [DX_CHECK_DEPEND(doc, 1)], [DX_CLEAR_DEPEND(doc, 1)], [DX_REQUIRE_PROG([DX_PDFLATEX], pdflatex) DX_REQUIRE_PROG([DX_MAKEINDEX], makeindex) DX_REQUIRE_PROG([DX_EGREP], egrep)]) # LaTeX generation for PS and/or PDF: if DX_TEST_FEATURE(ps) || DX_TEST_FEATURE(pdf); then AM_CONDITIONAL(DX_COND_latex, :) DX_ENV_APPEND(GENERATE_LATEX, YES) else AM_CONDITIONAL(DX_COND_latex, false) DX_ENV_APPEND(GENERATE_LATEX, NO) fi # Paper size for PS and/or PDF: AC_ARG_VAR(DOXYGEN_PAPER_SIZE, [a4wide (default), a4, letter, legal or executive]) case "$DOXYGEN_PAPER_SIZE" in #( "") AC_SUBST(DOXYGEN_PAPER_SIZE, "") ;; #( a4wide|a4|letter|legal|executive) DX_ENV_APPEND(PAPER_SIZE, $DOXYGEN_PAPER_SIZE) ;; #( *) AC_MSG_ERROR([unknown DOXYGEN_PAPER_SIZE='$DOXYGEN_PAPER_SIZE']) ;; esac #For debugging: #echo DX_FLAG_doc=$DX_FLAG_doc #echo DX_FLAG_dot=$DX_FLAG_dot #echo DX_FLAG_man=$DX_FLAG_man #echo DX_FLAG_html=$DX_FLAG_html #echo DX_FLAG_chm=$DX_FLAG_chm #echo DX_FLAG_chi=$DX_FLAG_chi #echo DX_FLAG_rtf=$DX_FLAG_rtf #echo DX_FLAG_xml=$DX_FLAG_xml #echo DX_FLAG_pdf=$DX_FLAG_pdf #echo DX_FLAG_ps=$DX_FLAG_ps #echo DX_ENV=$DX_ENV ]) |
|
From: Erik B. <do...@us...> - 2004-10-02 03:09:56
|
Update of /cvsroot/seq/showeq/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1676/src Modified Files: Tag: pre_v5_0_dev2 Makefile.am classes.h deity.h languages.h netdiag.cpp races.h skills.h spawn.h staticspells.h typenames.h weapons.h weapons1.h weapons27.h weapons28.h weapons2b.h Log Message: Doxygen support and a couple bug fixes/robustness modifications. Index: weapons.h =================================================================== RCS file: /cvsroot/seq/showeq/src/weapons.h,v retrieving revision 1.5 retrieving revision 1.5.8.1 diff -u -d -r1.5 -r1.5.8.1 --- weapons.h 25 Oct 2003 00:21:00 -0000 1.5 +++ weapons.h 2 Oct 2004 03:09:41 -0000 1.5.8.1 @@ -4,7 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ - "Generic", // 0x00 + +#ifndef DOXYGEN_SHOULD_SKIP_THIS "Generic", // 0x00 "1HSword", // 0x01 "2HSword", // 0x02 "Axe", // 0x03 @@ -260,4 +261,5 @@ NULL, // 0xfd - Unknown Weapon NULL, // 0xfe - Unknown Weapon NULL, // 0xff - Unknown Weapon +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ Index: staticspells.h =================================================================== RCS file: /cvsroot/seq/showeq/src/staticspells.h,v retrieving revision 1.1 retrieving revision 1.1.16.1 diff -u -d -r1.1 -r1.1.16.1 --- staticspells.h 29 Sep 2003 00:51:03 -0000 1.1 +++ staticspells.h 2 Oct 2004 03:09:41 -0000 1.1.16.1 @@ -5,6 +5,7 @@ * http://seq.sourceforge.net/ */ +#ifndef DOXYGEN_SHOULD_SKIP_THIS /* File autogenerated from spells_en.txt */ // Format: // /* Spell ID */ { Spell Name }, @@ -4431,3 +4432,5 @@ // Max SpellId: 0x1142 = 4418 // Number of Spells: 4293 // Empty Entries: 125 +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: Makefile.am =================================================================== RCS file: /cvsroot/seq/showeq/src/Makefile.am,v retrieving revision 1.22.6.5 retrieving revision 1.22.6.5.2.1 diff -u -d -r1.22.6.5 -r1.22.6.5.2.1 --- Makefile.am 24 Sep 2004 04:25:51 -0000 1.22.6.5 +++ Makefile.am 2 Oct 2004 03:09:41 -0000 1.22.6.5.2.1 @@ -73,7 +73,7 @@ $(MOC) -nw $< -o $@ s_%.h: %.h - ./h2info.pl $< $@ + $(srcdir)/h2info.pl $< $@ ui_%.h: %.ui $(UIC) -nounload $< > $@ Index: weapons28.h =================================================================== RCS file: /cvsroot/seq/showeq/src/weapons28.h,v retrieving revision 1.1 retrieving revision 1.1.18.1 diff -u -d -r1.1 -r1.1.18.1 --- weapons28.h 30 Dec 2001 07:18:55 -0000 1.1 +++ weapons28.h 2 Oct 2004 03:09:41 -0000 1.1.18.1 @@ -4,6 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS NULL, // 0x00 NULL, // 0x01 NULL, // 0x02 @@ -277,3 +279,5 @@ NULL, // 0xfd NULL, // 0xfe NULL, // 0xff +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: spawn.h =================================================================== RCS file: /cvsroot/seq/showeq/src/spawn.h,v retrieving revision 1.19.6.3 retrieving revision 1.19.6.3.2.1 diff -u -d -r1.19.6.3 -r1.19.6.3.2.1 --- spawn.h 24 Sep 2004 04:25:53 -0000 1.19.6.3 +++ spawn.h 2 Oct 2004 03:09:41 -0000 1.19.6.3.2.1 @@ -428,16 +428,16 @@ { // if this is an item of spawn type, return the pointer to Spawn, // return otherwise NULL - if (!item || (item->type() == tSpawn)) - return NULL; // otherwise NULL - else + if (item && ((item->type() == tSpawn) || (item->type() == tPlayer))) return (const Spawn*)item; + else + return NULL; // otherwise NULL } inline Spawn* spawnType(Item* item) { // if this is an item of spawn type, return the pointer to Spawn - if (item->type() == tSpawn) + if (item && ((item->type() == tSpawn) || (item->type() == tPlayer))) return (Spawn*)item; else return NULL; // otherwise NULL @@ -447,7 +447,7 @@ inline const Door* doorType(const Item* item) { // if this is an item of door type, return the pointer to Door - if (item->type() == tDoors) + if (item && (item->type() == tDoors)) return (const Door*)item; else return NULL; // otherwise NULL @@ -456,7 +456,7 @@ inline Door* doorType(Item* item) { // if this is an item of door type, return the pointer to Door - if (item->type() == tDoors) + if (item && (item->type() == tDoors)) return (Door*)item; else return NULL; // otherwise NULL @@ -466,7 +466,7 @@ inline const Drop* dropType(const Item* item) { // if this is an item of drop type, return the pointer to Drop - if (item->type() == tDrop) + if (item && (item->type() == tDrop)) return (const Drop*)item; else return NULL; // otherwise NULL @@ -475,7 +475,7 @@ inline Drop* dropType(Item* item) { // if this is an item of drop type, return the pointer to Drop - if (item->type() == tDrop) + if (item && (item->type() == tDrop)) return (Drop*)item; else return NULL; // otherwise NULL Index: weapons27.h =================================================================== RCS file: /cvsroot/seq/showeq/src/weapons27.h,v retrieving revision 1.4 retrieving revision 1.4.12.1 diff -u -d -r1.4 -r1.4.12.1 --- weapons27.h 7 Oct 2003 14:34:29 -0000 1.4 +++ weapons27.h 2 Oct 2004 03:09:41 -0000 1.4.12.1 @@ -4,6 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS NULL, // 0x00 NULL, // 0x01 NULL, // 0x02 @@ -277,3 +279,5 @@ NULL, // 0xfd NULL, // 0xfe NULL, // 0xff +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: skills.h =================================================================== RCS file: /cvsroot/seq/showeq/src/skills.h,v retrieving revision 1.1.1.1.16.1 retrieving revision 1.1.1.1.16.1.2.1 diff -u -d -r1.1.1.1.16.1 -r1.1.1.1.16.1.2.1 --- skills.h 18 Feb 2004 22:56:15 -0000 1.1.1.1.16.1 +++ skills.h 2 Oct 2004 03:09:41 -0000 1.1.1.1.16.1.2.1 @@ -4,6 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS "1H Blunt", // 0 "1H Slashing", // 1 "2H Blunt", // 2 @@ -79,3 +81,5 @@ "Berserking", // 72 "Taunt", // 73 "Frenzy", // 74 +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: typenames.h =================================================================== RCS file: /cvsroot/seq/showeq/src/typenames.h,v retrieving revision 1.4 retrieving revision 1.4.8.1 diff -u -d -r1.4 -r1.4.8.1 --- typenames.h 25 Oct 2003 00:21:00 -0000 1.4 +++ typenames.h 2 Oct 2004 03:09:41 -0000 1.4.8.1 @@ -4,6 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS NULL, // 0 "Humanoid", // 1 NULL, // 2 @@ -73,3 +75,5 @@ "Timer", // 66 "EventTrigger", // 67 NULL, // 68 +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: weapons2b.h =================================================================== RCS file: /cvsroot/seq/showeq/src/weapons2b.h,v retrieving revision 1.1 retrieving revision 1.1.18.1 diff -u -d -r1.1 -r1.1.18.1 --- weapons2b.h 30 Dec 2001 07:18:55 -0000 1.1 +++ weapons2b.h 2 Oct 2004 03:09:41 -0000 1.1.18.1 @@ -4,6 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS NULL, // 0x00 NULL, // 0x01 NULL, // 0x02 @@ -277,3 +279,5 @@ NULL, // 0xfd NULL, // 0xfe NULL, // 0xff +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: races.h =================================================================== RCS file: /cvsroot/seq/showeq/src/races.h,v retrieving revision 1.9.8.3 retrieving revision 1.9.8.3.2.1 diff -u -d -r1.9.8.3 -r1.9.8.3.2.1 --- races.h 18 Sep 2004 20:51:32 -0000 1.9.8.3 +++ races.h 2 Oct 2004 03:09:41 -0000 1.9.8.3.2.1 @@ -4,6 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS NULL, // 0 - Unknown Race "Human", // 1 "Barbarian", // 2 @@ -424,3 +426,5 @@ "Gelidran", // 417 "Discordling", // 418 "Girplan", // 419 +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: weapons1.h =================================================================== RCS file: /cvsroot/seq/showeq/src/weapons1.h,v retrieving revision 1.1 retrieving revision 1.1.12.1 diff -u -d -r1.1 -r1.1.12.1 --- weapons1.h 7 Oct 2003 14:34:29 -0000 1.1 +++ weapons1.h 2 Oct 2004 03:09:41 -0000 1.1.12.1 @@ -4,6 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS NULL, // 0x00 NULL, // 0x01 NULL, // 0x02 @@ -277,3 +279,5 @@ NULL, // 0xfd NULL, // 0xfe NULL, // 0xff +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: deity.h =================================================================== RCS file: /cvsroot/seq/showeq/src/deity.h,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.18.1 diff -u -d -r1.1.1.1 -r1.1.1.1.18.1 --- deity.h 19 Dec 2001 00:36:52 -0000 1.1.1.1 +++ deity.h 2 Oct 2004 03:09:41 -0000 1.1.1.1.18.1 @@ -5,6 +5,7 @@ * http://seq.sourceforge.net/ */ +#ifndef DOXYGEN_SHOULD_SKIP_THIS "Bertoxxulous", // DEITY_BERT = 201 "Brell Serilis", // DEITY_BRELL = 202 "Cazic Thule", // DEITY_CAZIC = 203 @@ -21,3 +22,5 @@ "The Tribunal", // DEITY_TRIBUNAL = 214 "Tunare", // DEITY_TUNARE = 215 "Veeshan", // DEITY_VEESHAN = 216 +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: classes.h =================================================================== RCS file: /cvsroot/seq/showeq/src/classes.h,v retrieving revision 1.2.8.2 retrieving revision 1.2.8.2.2.1 diff -u -d -r1.2.8.2 -r1.2.8.2.2.1 --- classes.h 12 Feb 2004 00:39:28 -0000 1.2.8.2 +++ classes.h 2 Oct 2004 03:09:41 -0000 1.2.8.2.2.1 @@ -4,6 +4,7 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ +#ifndef DOXYGEN_SHOULD_SKIP_THIS /* Maps class numbers to strings, included from util.cpp */ "0", // 0 is unknown @@ -69,3 +70,5 @@ "LDoN Recruiter", // 60 "LDoN Merchant", // 61 "LDoN Object", // 62 +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: netdiag.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/netdiag.cpp,v retrieving revision 1.10.6.1 retrieving revision 1.10.6.1.2.1 diff -u -d -r1.10.6.1 -r1.10.6.1.2.1 --- netdiag.cpp 7 Dec 2003 06:30:43 -0000 1.10.6.1 +++ netdiag.cpp 2 Oct 2004 03:09:41 -0000 1.10.6.1.2.1 @@ -195,7 +195,7 @@ m_seqExp[stream]->setText(disp); } -void NetDiag::clientChanged(uint32_t addr) +void NetDiag::clientChanged(in_addr_t addr) { QString disp, tmp; disp = print_addr(addr); @@ -219,7 +219,7 @@ m_clientLabel->setText(disp); } -void NetDiag::clientPortLatched(uint16_t clientPort) +void NetDiag::clientPortLatched(in_port_t clientPort) { QString disp, tmp; uint32_t addr = m_packet->clientAddr(); @@ -232,7 +232,7 @@ m_clientLabel->setText(disp); } -void NetDiag::serverPortLatched(uint16_t port) +void NetDiag::serverPortLatched(in_port_t port) { m_serverPortLabel->setText(QString::number(port)); } Index: languages.h =================================================================== RCS file: /cvsroot/seq/showeq/src/languages.h,v retrieving revision 1.4 retrieving revision 1.4.18.1 diff -u -d -r1.4 -r1.4.18.1 --- languages.h 11 May 2002 17:16:06 -0000 1.4 +++ languages.h 2 Oct 2004 03:09:41 -0000 1.4.18.1 @@ -5,6 +5,7 @@ * http://seq.sourceforge.net/ */ +#ifndef DOXYGEN_SHOULD_SKIP_THIS "Common Tongue", // 0 "Barbarian", // 1 "Erudian", // 2 @@ -30,3 +31,5 @@ "Elder Dragon", // 22 "Dark Speech", // 23 "Van Shir", // 24 +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + |
|
From: Erik B. <do...@us...> - 2004-10-01 07:32:05
|
Update of /cvsroot/seq/showeq/m4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2234/m4 Log Message: Directory /cvsroot/seq/showeq/m4 added to the repository --> Using per-directory sticky tag `pre_v5_0_dev2' |
|
From: Erik B. <do...@us...> - 2004-10-01 06:03:22
|
Update of /cvsroot/seq/showeq-maps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22047 Modified Files: AUTHORS ChangeLog Log Message: tanner's AUTHORS patch. Index: AUTHORS =================================================================== RCS file: /cvsroot/seq/showeq-maps/AUTHORS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- AUTHORS 21 Sep 2004 10:44:40 -0000 1.2 +++ AUTHORS 1 Oct 2004 06:03:09 -0000 1.3 @@ -1,100 +1,114 @@ -# -# Master author manifest for bash -# -# Any files appearing in the bash distribution not listed in this file -# are either of a mixed/unknown origin or I just haven't gotten to them yet. -# -# Filename authors (first is original author) -# -README Zaphod -COPYING Zaphod -ChangeLog Zaphod -INSTALL Zaphod -NEWS Zaphod -Makefile.am Zaphod -maps/ -airplane -akanon.map Anon SEQ User -arena.map Megaton -befallen.map Megaton -beholder -blackburrow -cabeast.map Steve -cabwest.map Steve -cauldron.map Kyle,Steve -cazicthule.map Kyle,?? -commons.map Megaton -crushbone Schultz -cshome.map Wildie -droga.map Steve -eastkarana.map ??,Megaton,?? -ecommons.map Megaton -erudnext.map Megaton -erudnint.map Megaton -erudsxing.map Andrew -everfrost.map John,??,Wakka23 -fearplane.map Wildie -feerrott.map Wildie -felwithea.map Megaton,John -felwitheb.map John,?? -fieldofbone.map ??,Steve -fironia.map ??,Megaton,Steve -freporte.map Megaton -freportn.map Megaton -freportw.map Megaton -frontiermtns.map ?? -gfaydark.map Megaton,Sparr -grobb.map John,?? -gukbottom.map Steve,Sparr,fastduke -guktop.map Steve,Sparr,fastduke -halas.map John -hateplane.map Wildie -highkeep Sparr -highpass.map Megaton,?? -innothule.map ?? -kaladima.map Steve -kaladimb.map Steve -kedge -kerraridge.map Sparr -kithicor.map Megaton -lakerathe.map Steve -lakeofillomen.map ??,Megaton -lavastorm.map Sparr -lfaydark.map ACiDFlux2000 -mistmoore.map ACiDFlux2000 -najena -misty.map GrinningPizza -nektulos.map Megaton -neriaka.map Megaton -neriakb.map Megaton,John -neriakc.map Megaton,John -northkarana.map Megaton -nro.map ACidFlux2000 -nurga -oasis.map Steve -oggok.map Kyle -oot.map Megaton -paineel -paw -permafrost Sparr -qcat.map Andrew -qey2hh1 Steve -qeynos.map Megaton -qeynos2.map Avatar -qeytoqrg.map Megaton -qrg.map Megaton -rathemtn.map John -rivervale.map Megaton -runneyeye -sky -skyfire -soldunga.map Steve,fastduke -soldungb.map Steve -soltemple -southkarana Danilo,Megaton,Sparr -sro.map ACiDFlux2000 -steamfont -timerous.map ??,Megaton,Steve -tox.map ?? -unrest.map Steve -warslikswood.map ??,Steve +--- /tmp/kde-tanner/cervisiaGVgUcbHEAD 2004-09-28 00:57:53.000000000 -0500 ++++ /home/tanner/projects/showeq-maps/AUTHORS 2004-09-28 00:56:30.000000000 -0500 +@@ -13,20 +13,24 @@ + NEWS Zaphod + Makefile.am Zaphod + maps/ +-airplane ++acrylia Ratt ++airplane Ratt + akanon.map Anon SEQ User + arena.map Megaton +-befallen.map Megaton +-beholder +-blackburrow ++befallen.map Megaton, Ratt ++beholder Ratt ++blackburrow Ratt ++burningwoods Ratt + cabeast.map Steve + cabwest.map Steve +-cauldron.map Kyle,Steve +-cazicthule.map Kyle,?? ++cauldron.map Kyle,Steve, Ratt ++cazicthule.map Kyle,Ratt ++charasis.map Ratt ++chardok.map Ratt + commons.map Megaton + crushbone Schultz + cshome.map Wildie +-droga.map Steve ++droga.map Steve, Ratt + eastkarana.map ??,Megaton,?? + ecommons.map Megaton + erudnext.map Megaton +@@ -44,25 +48,26 @@ + freportw.map Megaton + frontiermtns.map ?? + gfaydark.map Megaton,Sparr +-grobb.map John,?? ++grobb.map John,??, Ratt + gukbottom.map Steve,Sparr,fastduke + guktop.map Steve,Sparr,fastduke + halas.map John +-hateplane.map Wildie ++hateplane.map Wildie, Ratt + highkeep Sparr + highpass.map Megaton,?? +-innothule.map ?? ++hole Ratt ++innothule.map Ratt + kaladima.map Steve + kaladimb.map Steve +-kedge ++kedge Kal, Ratt + kerraridge.map Sparr + kithicor.map Megaton + lakerathe.map Steve + lakeofillomen.map ??,Megaton + lavastorm.map Sparr + lfaydark.map ACiDFlux2000 +-mistmoore.map ACiDFlux2000 +-najena ++mistmoore.map ACiDFlux2000, Ratt ++najena Ratt + misty.map GrinningPizza + nektulos.map Megaton + neriaka.map Megaton +@@ -70,13 +75,13 @@ + neriakc.map Megaton,John + northkarana.map Megaton + nro.map ACidFlux2000 +-nurga ++nurga Ratt + oasis.map Steve +-oggok.map Kyle ++oggok.map Kyle, Ratt + oot.map Megaton +-paineel +-paw +-permafrost Sparr ++paineel Ratt ++paw Ratt ++permafrost Sparr, Ratt + qcat.map Andrew + qey2hh1 Steve + qeynos.map Megaton +@@ -85,16 +90,20 @@ + qrg.map Megaton + rathemtn.map John + rivervale.map Megaton +-runneyeye ++runneyeye Ratt + sky +-skyfire +-soldunga.map Steve,fastduke +-soldungb.map Steve +-soltemple ++skyfire Ratt ++sleeper.map Ratt ++soldunga.map Steve,fastduke,Ratt ++soldungb.map Steve,Ratt ++soltemple Ratt + southkarana Danilo,Megaton,Sparr + sro.map ACiDFlux2000 ++ssratemple.map Ratt + steamfont ++thedeep.mapp Ratt + timerous.map ??,Megaton,Steve +-tox.map ?? +-unrest.map Steve ++tox.map Ratt ++trakanon Ratt ++unrest.map Steve, Ratt + warslikswood.map ??,Steve Index: ChangeLog =================================================================== RCS file: /cvsroot/seq/showeq-maps/ChangeLog,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- ChangeLog 21 Sep 2004 06:21:29 -0000 1.1.1.1 +++ ChangeLog 1 Oct 2004 06:03:11 -0000 1.2 @@ -1,6 +1,10 @@ Version: $Id$ $Name$ -dohpaZ (09/?/04) +dohpaZ (10/30/04) +------------------------ ++ Integrated patch #1035943, "showeq-maps: AUTHORS.diff" from tanner(Basic) + +dohpaZ (09/24/04) ------------------------ + Created this repository/packages to contain the maps that used to be contained in the 'maps' directory of the 'showeq' repository/package. |
|
From: slartibartfast <sla...@us...> - 2004-09-30 22:07:09
|
Update of /cvsroot/seq/myseq/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4408 Modified Files: ClientReleaseNotes.htm Log Message: Integrated 42! Changes into Version 1.16.3 rdy for release Index: ClientReleaseNotes.htm =================================================================== RCS file: /cvsroot/seq/myseq/client/ClientReleaseNotes.htm,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ClientReleaseNotes.htm 30 Sep 2004 20:59:53 -0000 1.3 +++ ClientReleaseNotes.htm 30 Sep 2004 22:07:00 -0000 1.4 @@ -20,12 +20,13 @@ add in the ability to keep the player or target centered<BR> "Follow None" = Do not scroll the map<BR> "Follow Player" = move map to keep player in view<BR> - "Follow target" = move map to keep target in viewtered on screen<BR> - <BR> + "Follow target" = move map to keep target in viewtered on + screen<BR> Keep Centered" = The follow target (either player or target) will remain in the same position on the screen, even if this causes most of the map to be off the - screen.</LI></OL> - <p> </p> + screen.</LI> + <LI> + Integrated 42!'s latest changes for doing a quick lookup for spawns by name.</LI></OL> <H2>Release Version 1.16.2</H2> <p>Dated 28 September 2004</p> <ol> @@ -35,20 +36,18 @@ <li> Fixed the MobInfo panel background color. (Thanks CybMax for spotting it). <li> - Added the ability to select which character to monitor when multiboxing.</li> - </ol> - <p>Note: The list does not refresh automatically - you must click on the refresh + Added the ability to select which character to monitor when multiboxing.<BR> + Note: The list does not refresh automatically - you must click on the refresh menu item. (this is an attempt to keep the overhead of this feature to a - minimum).</p> - <p>Also Note that a new server version is required for this to work...</p> - <ol> - <li value="4"> + minimum).<BR> +Also Note that a new server version is required for this to work...<BR> + + <li> Added 42!'s ability to select a point on the map for navigation purposes. Shift - Left-click on the map to toggle the selected point.</li> - </ol> - <p>(I changed 42's code a little to preserve the default behavior for selecting - spawns, also made the line dashed so that it is easy to distinguish from tyhe - selected spawn)</p> + Left-click on the map to toggle the selected point.<BR> + (I changed 42's code a little to preserve the default behavior for selecting + spawns, also made the line dashed so that it is easy to distinguish from the + selected spawn)</li> <p> </p> <H2>Release Version 1.16.1</H2> <P>Dated 18 September 2004</P> @@ -58,6 +57,9 @@ con level data from an ini file.</FONT><LI> <font face="verdana, arial, helvetica" size="2">Updated Con Level Information to include level 66-70 (using extrapolated data)</font><LI> - <font face="verdana, arial, helvetica" size="2">Added new race names for OOW</font></LI></OL> + <font face="verdana, arial, helvetica" size="2">Added new race names for OOW</font></LI> + + +</OL> </BODY> -</HTML> +</HTML> \ No newline at end of file |
|
From: slartibartfast <sla...@us...> - 2004-09-30 21:59:01
|
Update of /cvsroot/seq/myseq/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2021 Modified Files: MapCon.cs Structures.cs Log Message: Integrated 42! Changes into Version 1.16.3 rdy for release Index: Structures.cs =================================================================== RCS file: /cvsroot/seq/myseq/client/Structures.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Structures.cs 30 Sep 2004 20:59:53 -0000 1.4 +++ Structures.cs 30 Sep 2004 21:58:52 -0000 1.5 @@ -9,661 +9,638 @@ namespace Structures { - #region SPAWNINFO class - [StructLayout(LayoutKind.Sequential, Pack=1)] - public class SPAWNINFO - { - public SPAWNINFO() {} - - private string BytesToString(byte []b, int start, int maxlen) - { [...1226 lines suppressed...] - } - - public bool IsPet(string mobName) - { - return rePet.IsMatch(mobName); - } - } - #endregion + public bool IsFamiliar(string mobName) + { + return reFamiliar.IsMatch(mobName); + } + + public bool IsPet(string mobName) + { + return rePet.IsMatch(mobName); + } + } + #endregion } Index: MapCon.cs =================================================================== RCS file: /cvsroot/seq/myseq/client/MapCon.cs,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- MapCon.cs 30 Sep 2004 20:59:53 -0000 1.11 +++ MapCon.cs 30 Sep 2004 21:58:52 -0000 1.12 @@ -734,67 +734,67 @@ private void MapCon_MouseUp(object sender, System.Windows.Forms.MouseEventArgs e) { - float x = ScreenToMapCoordX((float)e.X); - float y = ScreenToMapCoordY((float)e.Y); - - if ((Control.ModifierKeys & Keys.Shift) == Keys.Shift) - { - // [42!] Mark an arbitrary spot on the map, or turn it off if a spot was marked already. - if (this.selectedX == -1) - { - this.selectedX = x; - this.selectedY = y; - } - else - { - this.selectedX = -1; - } - } - else - { - if (e.X == m_dragStartX && e.Y == m_dragStartY) - { - // Find the object the user clicked on so we can draw a line between it as the player - MapPane mp = (MapPane)Parent; - frmMain f1 = (frmMain)mp.Parent; + float x = ScreenToMapCoordX((float)e.X); + float y = ScreenToMapCoordY((float)e.Y); - float delta; // allow a small margin of error in coordinates - delta = 5 / m_ratio; // value of 5 screen units in terms of mapcoords - bool foundMob = false; - foreach(SPAWNINFO sp in mobs.Values) - { - if (!sp.hiddenOnMap) - { - if (sp.X < x+delta && sp.X > x-delta && sp.Y < y+delta && sp.Y > y-delta) - { - if (Settings.Instance.AutoSelectSpawnList) - { - sp.listitem.EnsureVisible(); - sp.listitem.Selected = true; - } - else - { - selectedID = (int)sp.SpawnID; - } - foundMob = true; - break; - } - } - } - if (!foundMob) - { - this.selectedID = -1; - } + if ((Control.ModifierKeys & Keys.Shift) == Keys.Shift) + { + // [42!] Mark an arbitrary spot on the map, or turn it off if a spot was marked already. + if (this.selectedX == -1) + { + this.selectedX = x; + this.selectedY = y; + } + else + { + this.selectedX = -1; + } + } + else + { + if (e.X == m_dragStartX && e.Y == m_dragStartY) + { + // Find the object the user clicked on so we can draw a line between it as the player + MapPane mp = (MapPane)Parent; + frmMain f1 = (frmMain)mp.Parent; - Invalidate(); - } - } - m_dragging = false; - m_dragStartX = m_dragStartY = 0; - rclick = false; - System.Windows.Forms.Cursor.Current = System.Windows.Forms.Cursors.Default; - } + float delta; // allow a small margin of error in coordinates + delta = 5 / m_ratio; // value of 5 screen units in terms of mapcoords + bool foundMob = false; + foreach(SPAWNINFO sp in mobs.Values) + { + if (!sp.hiddenOnMap) + { + if (sp.X < x+delta && sp.X > x-delta && sp.Y < y+delta && sp.Y > y-delta) + { + if (Settings.Instance.AutoSelectSpawnList) + { + sp.listitem.EnsureVisible(); + sp.listitem.Selected = true; + } + else + { + selectedID = (int)sp.SpawnID; + } + foundMob = true; + break; + } + } + } + if (!foundMob) + { + this.selectedID = -1; + } + Invalidate(); + } + } + m_dragging = false; + m_dragStartX = m_dragStartY = 0; + rclick = false; + System.Windows.Forms.Cursor.Current = System.Windows.Forms.Cursors.Default; + } + private void MapCon_MouseMove(object sender, System.Windows.Forms.MouseEventArgs e) { MapPane mp = (MapPane)Parent; @@ -1074,9 +1074,9 @@ { // if we have blank space to the left or right repostion the center point appropriately if (ScreenMinX<minx) - m_mapCenterX += (minx-ScreenMinY); + m_mapCenterX += (minx-ScreenMinX); else if (ScreenMaxX>maxx) - m_mapCenterX -= (ScreenMaxY-maxx); + m_mapCenterX -= (ScreenMaxX-maxx); } if (mapHeight <= ScreenMapHeight) @@ -1237,12 +1237,12 @@ mobInfo.AppendFormat("Y: {0:f3} X: {1:f3} Z: {2:f3}", si.Y, si.X, si.Z); if (SetColor) { - if (si.Level <= greenRange) lblMobInfo.BackColor = Color.PaleGreen; - else if (si.Level <= cyanRange) lblMobInfo.BackColor = System.Drawing.Color.FromArgb(192, 255, 255); - else if (si.Level < PlayerInfo.Level) lblMobInfo.BackColor = System.Drawing.Color.FromArgb(0, 192, 255); - else if (si.Level == PlayerInfo.Level) lblMobInfo.BackColor = Color.White; - else if (si.Level <= PlayerInfo.Level + 2) lblMobInfo.BackColor = System.Drawing.Color.FromArgb(255, 255, 128); - else lblMobInfo.BackColor = System.Drawing.Color.FromArgb(255, 128, 128); + if (si.Level <= greenRange) lblMobInfo.BackColor = Color.PaleGreen; + else if (si.Level <= cyanRange) lblMobInfo.BackColor = System.Drawing.Color.FromArgb(192, 255, 255); + else if (si.Level < PlayerInfo.Level) lblMobInfo.BackColor = System.Drawing.Color.FromArgb(0, 192, 255); + else if (si.Level == PlayerInfo.Level) lblMobInfo.BackColor = Color.White; + else if (si.Level <= PlayerInfo.Level + 2) lblMobInfo.BackColor = System.Drawing.Color.FromArgb(255, 255, 128); + else lblMobInfo.BackColor = System.Drawing.Color.FromArgb(255, 128, 128); Graphics g = lblMobInfo.CreateGraphics(); SizeF sf = g.MeasureString(mobInfo.ToString(), lblMobInfo.Font); @@ -1388,6 +1388,10 @@ if (sp.isHunt && flash) DrawEllipse(ltbluePen, x - AlertSizeOffset, y - AlertSizeOffset, AlertSize, AlertSize); + // Draw Ring around Lookup'ed Mobs + if (sp.isLookup && flash) + DrawEllipse(greenPen, x - AlertSizeOffset, y - AlertSizeOffset, AlertSize, AlertSize); + // Draw Ring around Rare Mobs if (sp.isRare && flash) DrawEllipse(whitePen, x - AlertSizeOffset, y - AlertSizeOffset, AlertSize, AlertSize); @@ -1421,9 +1425,9 @@ // [42!] Draw a line to an arbitrary spot. if (selectedX != -1) { - Pen myPen = new Pen(new SolidBrush(Color.White)); - myPen.DashStyle = DashStyle.Dash; - myPen.DashPattern = new float[] {8, 4}; + Pen myPen = new Pen(new SolidBrush(Color.White)); + myPen.DashStyle = DashStyle.Dash; + myPen.DashPattern = new float[] {8, 4}; DrawLine(myPen, playerx, playery, CalcScreenCoordX(selectedX), CalcScreenCoordY(selectedY)); } |
|
From: slartibartfast <sla...@us...> - 2004-09-30 21:58:38
|
Update of /cvsroot/seq/myseq/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1970 Modified Files: ListViewPanel.cs MapPane.cs MapPane.resx Log Message: Integrated 42! Changes into Version 1.16.3 rdy for release Index: MapPane.resx =================================================================== RCS file: /cvsroot/seq/myseq/client/MapPane.resx,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- MapPane.resx 30 Sep 2004 18:53:06 -0000 1.5 +++ MapPane.resx 30 Sep 2004 21:58:27 -0000 1.6 @@ -106,15 +106,15 @@ <data name="offsetx.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Public</value> </data> + <data name="offsety.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Public</value> + </data> <data name="offsety.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> <data name="offsety.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="offsety.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>Public</value> - </data> <data name="scale.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> @@ -205,8 +205,32 @@ <data name="lblZPos.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="$this.Name"> - <value>MapPane</value> + <data name="cmdLookup.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="cmdLookup.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="cmdLookup.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="txtLookup.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="txtLookup.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Public</value> + </data> + <data name="txtLookup.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="lblLookup.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="lblLookup.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="lblLookup.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> </data> <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> @@ -220,8 +244,8 @@ <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </data> - <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>80</value> + <data name="$this.Name"> + <value>MapPane</value> </data> <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>(Default)</value> @@ -232,6 +256,9 @@ <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> + <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>80</value> + </data> <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>8, 8</value> </data> Index: ListViewPanel.cs =================================================================== RCS file: /cvsroot/seq/myseq/client/ListViewPanel.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ListViewPanel.cs 30 Sep 2004 18:53:06 -0000 1.1 +++ ListViewPanel.cs 30 Sep 2004 21:58:27 -0000 1.2 @@ -10,216 +10,221 @@ namespace myseq { - public class ListViewPanel : System.Windows.Forms.UserControl { - public bool curDescend = false; + public class ListViewPanel : System.Windows.Forms.UserControl { + public bool curDescend = false; - public myseq.MapPane mapPane; + public myseq.MapPane mapPane; - private System.Windows.Forms.TextBox txtSpawnList; - private System.Windows.Forms.Button cmdReset; - public System.Windows.Forms.ListView listView; - - private System.ComponentModel.Container components = null; + private System.Windows.Forms.TextBox txtSpawnList; + private System.Windows.Forms.Button cmdReset; + public System.Windows.Forms.ListView listView; + + private System.ComponentModel.Container components = null; - public ListViewPanel() { - InitializeComponent(); - } + public ListViewPanel() { + InitializeComponent(); + } - protected override void Dispose(bool disposing) { - if (disposing && components != null) - components.Dispose(); + protected override void Dispose(bool disposing) { + if (disposing && components != null) + components.Dispose(); - base.Dispose( disposing ); - } + base.Dispose( disposing ); + } - #region Component Designer generated code - private void InitializeComponent() - { - this.txtSpawnList = new System.Windows.Forms.TextBox(); - this.cmdReset = new System.Windows.Forms.Button(); - this.listView = new System.Windows.Forms.ListView(); - this.SuspendLayout(); - // - // txtSpawnList - // - this.txtSpawnList.Location = new System.Drawing.Point(48, 0); - this.txtSpawnList.Name = "txtSpawnList"; - this.txtSpawnList.Size = new System.Drawing.Size(152, 20); - this.txtSpawnList.TabIndex = 1; - this.txtSpawnList.Text = ""; - this.txtSpawnList.TextChanged += new System.EventHandler(this.txtSpawnList_TextChanged); - // - // cmdReset - // - this.cmdReset.Location = new System.Drawing.Point(0, 0); - this.cmdReset.Name = "cmdReset"; - this.cmdReset.Size = new System.Drawing.Size(48, 20); - this.cmdReset.TabIndex = 0; - this.cmdReset.Text = "Reset"; - this.cmdReset.Click += new System.EventHandler(this.cmdReset_Click); - // - // listView - // - this.listView.AllowColumnReorder = true; - this.listView.FullRowSelect = true; - this.listView.GridLines = true; - this.listView.HideSelection = false; - this.listView.LabelWrap = false; - this.listView.Location = new System.Drawing.Point(0, 24); - this.listView.MultiSelect = false; - this.listView.Name = "listView"; - this.listView.Size = new System.Drawing.Size(200, 168); - this.listView.Sorting = System.Windows.Forms.SortOrder.Ascending; - this.listView.TabIndex = 2; - this.listView.View = System.Windows.Forms.View.Details; - this.listView.MouseEnter += new System.EventHandler(this.listView_MouseEnter); - this.listView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.listView_ColumnClick); - this.listView.SelectedIndexChanged += new System.EventHandler(this.listView_SelectedIndexChanged); - // - // ListViewPanel - // - this.Controls.Add(this.listView); - this.Controls.Add(this.cmdReset); - this.Controls.Add(this.txtSpawnList); - this.Name = "ListViewPanel"; - this.Size = new System.Drawing.Size(208, 200); - this.Resize += new System.EventHandler(this.ListViewPanel_Resize); - this.ResumeLayout(false); + #region Component Designer generated code + private void InitializeComponent() + { + this.txtSpawnList = new System.Windows.Forms.TextBox(); + this.cmdReset = new System.Windows.Forms.Button(); + this.listView = new System.Windows.Forms.ListView(); + this.SuspendLayout(); + // + // txtSpawnList + // + this.txtSpawnList.Location = new System.Drawing.Point(48, 0); + this.txtSpawnList.Name = "txtSpawnList"; + this.txtSpawnList.Size = new System.Drawing.Size(152, 20); + this.txtSpawnList.TabIndex = 1; + this.txtSpawnList.Text = ""; + this.txtSpawnList.TextChanged += new System.EventHandler(this.txtSpawnList_TextChanged); + // + // cmdReset + // + this.cmdReset.Location = new System.Drawing.Point(0, 0); + this.cmdReset.Name = "cmdReset"; + this.cmdReset.Size = new System.Drawing.Size(48, 20); + this.cmdReset.TabIndex = 0; + this.cmdReset.Text = "Reset"; + this.cmdReset.Click += new System.EventHandler(this.cmdReset_Click); + // + // listView + // + this.listView.AllowColumnReorder = true; + this.listView.FullRowSelect = true; + this.listView.GridLines = true; + this.listView.HideSelection = false; + this.listView.LabelWrap = false; + this.listView.Location = new System.Drawing.Point(0, 24); + this.listView.MultiSelect = false; + this.listView.Name = "listView"; + this.listView.Size = new System.Drawing.Size(200, 168); + this.listView.Sorting = System.Windows.Forms.SortOrder.Ascending; + this.listView.TabIndex = 2; + this.listView.View = System.Windows.Forms.View.Details; + this.listView.MouseEnter += new System.EventHandler(this.listView_MouseEnter); + this.listView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.listView_ColumnClick); + this.listView.SelectedIndexChanged += new System.EventHandler(this.listView_SelectedIndexChanged); + // + // ListViewPanel + // + this.Controls.Add(this.listView); + this.Controls.Add(this.cmdReset); + this.Controls.Add(this.txtSpawnList); + this.Name = "ListViewPanel"; + this.Size = new System.Drawing.Size(208, 200); + this.Resize += new System.EventHandler(this.ListViewPanel_Resize); + this.ResumeLayout(false); - } - #endregion + } + #endregion - private void ListViewPanel_Resize(object sender, EventArgs e) { - try { - txtSpawnList.Width = this.Width - txtSpawnList.Left; + private void ListViewPanel_Resize(object sender, EventArgs e) { + try { + txtSpawnList.Width = this.Width - txtSpawnList.Left; - listView.Width = this.Width; - listView.Height = this.Height - listView.Top; - } - catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.ListViewPanel_Resize: " + ex.Message);} - } + listView.Width = this.Width; + listView.Height = this.Height - listView.Top; + } + catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.ListViewPanel_Resize: " + ex.Message);} + } - private void cmdReset_Click(object sender, System.EventArgs e) { - try { - txtSpawnList.Text = ""; - txtSpawnList.Focus(); - } - catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.cmdReset_Click: " + ex.Message);} - } + private void cmdReset_Click(object sender, System.EventArgs e) { + try { + txtSpawnList.Text = ""; + txtSpawnList.Focus(); + } + catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.cmdReset_Click: " + ex.Message);} + } - private void txtSpawnList_TextChanged(object sender, EventArgs e) { - try { - foreach (ListViewItem lstItem in listView.Items) { - // Compile the regular expression. - Regex regEx = new Regex(".*" + txtSpawnList.Text + ".*", RegexOptions.IgnoreCase); - // Match the regular expression pattern against a text string. - if (regEx.Match(lstItem.Text).Success) { - lstItem.EnsureVisible(); - lstItem.Selected = true; - break; - } - } - } - catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.txtSpawnList_TextChanged: " + ex.Message);} - } + private void txtSpawnList_TextChanged(object sender, EventArgs e) { + SearchName(txtSpawnList.Text); + } + + public void SearchName(String name) + { + try { + Regex regEx = new Regex(".*" + txtSpawnList.Text + ".*", RegexOptions.IgnoreCase); + foreach (ListViewItem lstItem in listView.Items) { + // Compile the regular expression. + // Match the regular expression pattern against a text string. + if (regEx.Match(lstItem.Text).Success) { + lstItem.EnsureVisible(); + lstItem.Selected = true; + break; + } + } + } + catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.txtSpawnList_TextChanged: " + ex.Message);} + } - private void listView_MouseEnter(object sender, System.EventArgs e) { - try {listView.Focus();} - catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.listView_MouseEnter: " + ex.Message);} - } + private void listView_MouseEnter(object sender, System.EventArgs e) { + try {listView.Focus();} + catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.listView_MouseEnter: " + ex.Message);} + } - private void listView_ColumnClick(object sender, ColumnClickEventArgs e) { - try { - curDescend = !curDescend; - listView.ListViewItemSorter = new ListBoxComparer(listView.Items, curDescend, e.Column); - } - catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.listView_ColumnClick: " + ex.Message);} - } + private void listView_ColumnClick(object sender, ColumnClickEventArgs e) { + try { + curDescend = !curDescend; + listView.ListViewItemSorter = new ListBoxComparer(listView.Items, curDescend, e.Column); + } + catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.listView_ColumnClick: " + ex.Message);} + } - private void listView_SelectedIndexChanged(object sender, System.EventArgs e) { - ListView.SelectedIndexCollection sel = listView.SelectedIndices; + private void listView_SelectedIndexChanged(object sender, System.EventArgs e) { + ListView.SelectedIndexCollection sel = listView.SelectedIndices; - if (sel.Count > 0) { - try { - mapPane.mapCon.selectedID = int.Parse(listView.Items[sel[0]].SubItems[8].Text); - mapPane.mapCon.Invalidate(); - } - catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.listView_SelectedIndexChanged: " + ex.Message);} - - } - } + if (sel.Count > 0) { + try { + mapPane.mapCon.selectedID = int.Parse(listView.Items[sel[0]].SubItems[8].Text); + mapPane.mapCon.Invalidate(); + } + catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.listView_SelectedIndexChanged: " + ex.Message);} + + } + } - public void ColumnsAdd(string ColumnName, int ColumnWidth, HorizontalAlignment CoulumnAlign) { - try {listView.Columns.Add(ColumnName, ColumnWidth, CoulumnAlign);} - catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.ColumnsAdd: " + ex.Message);} - } - } + public void ColumnsAdd(string ColumnName, int ColumnWidth, HorizontalAlignment CoulumnAlign) { + try {listView.Columns.Add(ColumnName, ColumnWidth, CoulumnAlign);} + catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.ColumnsAdd: " + ex.Message);} + } + } - public class ListBoxComparer : IComparer - { - public int Compare(object a, object b) - { - ListViewItem sa = (ListViewItem)a; - ListViewItem sb = (ListViewItem)b; - int res = 0; + public class ListBoxComparer : IComparer + { + public int Compare(object a, object b) + { + ListViewItem sa = (ListViewItem)a; + ListViewItem sb = (ListViewItem)b; + int res = 0; - if (Column == 0) // Name - res = string.Compare(sa.Text,sb.Text); - else if (Column == 1) // Level - { - int ia = int.Parse(sa.SubItems[1].Text); - int ib = int.Parse(sb.SubItems[1].Text); - if (ia < ib) res = -1; - else if (ia > ib) res = 1; - else res = 0; - } - else if ((Column == 2) || // Class - (Column == 3) || // Race - (Column == 4) || // Last Name - (Column == 5) || // Type - (Column == 6)) // Invis - res = string.Compare(sa.SubItems[Column].Text, sb.SubItems[Column].Text); - else if ((Column == 7) || // Run Speed - (Column == 10) || // X - (Column == 11) || // Y - (Column == 12) || // Z - (Column == 13)) // Distance - { - float fa = float.Parse(sa.SubItems[Column].Text); - float fb = float.Parse(sb.SubItems[Column].Text); - if (fa < fb) res = -1; - else if (fa > fb) res = 1; - else res = 0; - } - else if (Column == 8) - { // SpawnID - uint ia = uint.Parse(sa.SubItems[8].Text); - uint ib = uint.Parse(sb.SubItems[8].Text); - if (ia < ib) res = -1; - else if (ia > ib) res = 1; - else res = 0; - } - else if (Column == 9) - { - DateTime dta = DateTime.Parse(sa.SubItems[9].Text); - DateTime dtb = DateTime.Parse(sb.SubItems[9].Text); - res = DateTime.Compare(dta, dtb); - } - - if (Descending) res = -res; - - return res; - } + if (Column == 0) // Name + res = string.Compare(sa.Text,sb.Text); + else if (Column == 1) // Level + { + int ia = int.Parse(sa.SubItems[1].Text); + int ib = int.Parse(sb.SubItems[1].Text); + if (ia < ib) res = -1; + else if (ia > ib) res = 1; + else res = 0; + } + else if ((Column == 2) || // Class + (Column == 3) || // Race + (Column == 4) || // Last Name + (Column == 5) || // Type + (Column == 6)) // Invis + res = string.Compare(sa.SubItems[Column].Text, sb.SubItems[Column].Text); + else if ((Column == 7) || // Run Speed + (Column == 10) || // X + (Column == 11) || // Y + (Column == 12) || // Z + (Column == 13)) // Distance + { + float fa = float.Parse(sa.SubItems[Column].Text); + float fb = float.Parse(sb.SubItems[Column].Text); + if (fa < fb) res = -1; + else if (fa > fb) res = 1; + else res = 0; + } + else if (Column == 8) + { // SpawnID + uint ia = uint.Parse(sa.SubItems[8].Text); + uint ib = uint.Parse(sb.SubItems[8].Text); + if (ia < ib) res = -1; + else if (ia > ib) res = 1; + else res = 0; + } + else if (Column == 9) + { + DateTime dta = DateTime.Parse(sa.SubItems[9].Text); + DateTime dtb = DateTime.Parse(sb.SubItems[9].Text); + res = DateTime.Compare(dta, dtb); + } + + if (Descending) res = -res; + + return res; + } - public ListBoxComparer(ListView.ListViewItemCollection spawns, bool descending, int column) - { - Spawns = spawns; - Descending = descending; - Column = column; - } + public ListBoxComparer(ListView.ListViewItemCollection spawns, bool descending, int column) + { + Spawns = spawns; + Descending = descending; + Column = column; + } - private ListView.ListViewItemCollection Spawns; - private bool Descending; - private int Column; - } + private ListView.ListViewItemCollection Spawns; + private bool Descending; + private int Column; + } } Index: MapPane.cs =================================================================== RCS file: /cvsroot/seq/myseq/client/MapPane.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- MapPane.cs 30 Sep 2004 18:53:06 -0000 1.7 +++ MapPane.cs 30 Sep 2004 21:58:27 -0000 1.8 @@ -4,62 +4,97 @@ using System.Collections; using System.Windows.Forms; using System.ComponentModel; +using System.Text.RegularExpressions; + namespace myseq { - public class MapPane : System.Windows.Forms.UserControl { - public myseq.MapCon mapCon; + public class MapPane : System.Windows.Forms.UserControl { + public myseq.MapCon mapCon; - public System.Windows.Forms.NumericUpDown offsetx; - public System.Windows.Forms.NumericUpDown offsety; - public System.Windows.Forms.NumericUpDown scale; - public System.Windows.Forms.NumericUpDown filterzneg; - public System.Windows.Forms.NumericUpDown filterzpos; - public System.Windows.Forms.Button cmdCommand; + public System.Windows.Forms.NumericUpDown offsetx; + public System.Windows.Forms.NumericUpDown offsety; + public System.Windows.Forms.NumericUpDown scale; + public System.Windows.Forms.NumericUpDown filterzneg; + public System.Windows.Forms.NumericUpDown filterzpos; + public System.Windows.Forms.Button cmdCommand; + + public System.Windows.Forms.TextBox txtLookup; + private System.Windows.Forms.Button cmdLookup; - private System.Windows.Forms.Label lblScale; - private System.Windows.Forms.Label lblOffsetY; - private System.Windows.Forms.Label lblOffsetX; - private System.Windows.Forms.Label lblZNeg; - private System.Windows.Forms.Label lblZPos; + private System.Windows.Forms.Label lblScale; + private System.Windows.Forms.Label lblOffsetY; + private System.Windows.Forms.Label lblOffsetX; + private System.Windows.Forms.Label lblZNeg; + private System.Windows.Forms.Label lblZPos; + private System.Windows.Forms.Label lblLookup; - private System.ComponentModel.Container components = null; + private System.ComponentModel.Container components = null; - public MapPane() { - InitializeComponent(); + public MapPane() { + InitializeComponent(); + + // Create the quick lookup text field and buttn + + offsetx.Minimum = -100000; + offsetx.Maximum = 100000; + offsety.Minimum = -100000; + offsety.Maximum = 100000; + + scale.Maximum = 10000; + scale.Value = 100; + scale.Minimum = 10; - offsetx.Minimum = -100000; - offsetx.Maximum = 100000; - offsety.Minimum = -100000; - offsety.Maximum = 100000; - - scale.Maximum = 10000; - scale.Value = 100; - scale.Minimum = 10; + scale.Increment = 10; + offsetx.Increment = 20; + offsety.Increment = 20; - scale.Increment = 10; - offsetx.Increment = 20; - offsety.Increment = 20; + filterzneg.Increment = 5; + filterzpos.Increment = 5; + filterzpos.Minimum = 0; + filterzneg.Minimum = 0; + filterzpos.Maximum = 3500; + filterzneg.Maximum = 3500; + filterzneg.Value = 75; + filterzpos.Value = 75; + } - filterzneg.Increment = 5; - filterzpos.Increment = 5; - filterzpos.Minimum = 0; - filterzneg.Minimum = 0; - filterzpos.Maximum = 3500; - filterzneg.Maximum = 3500; - filterzneg.Value = 75; - filterzpos.Value = 75; - } + protected override void Dispose(bool disposing) { + if (disposing) + if (components != null) + components.Dispose(); - protected override void Dispose(bool disposing) { - if (disposing) - if (components != null) - components.Dispose(); + base.Dispose(disposing); + } + + private void cmdLookup_Click(object sender, System.EventArgs e) { + txtLookup.Text = ""; + txtLookup.Focus(); + Lookup(""); + } - base.Dispose(disposing); - } + private void txtLookup_KeyPress(object sender, System.Windows.Forms.KeyPressEventArgs e) { + if (e.KeyChar == (char)Keys.Enter) { + Lookup(txtLookup.Text); + txtLookup.Focus(); + e.Handled = true; + } + } + + private void Lookup(String name) + { + Regex regEx = new Regex(".*" + name + ".*", RegexOptions.IgnoreCase); + + foreach(Structures.SPAWNINFO sp in mapCon.mobs.Values) { + if (name.Length>0) { sp.isLookup = regEx.Match(sp.Name).Success; } + else { sp.isLookup = false; } + } + + mapCon.Invalidate(); + } + - #region Component Designer generated code - private void InitializeComponent() { + #region Component Designer generated code + private void InitializeComponent() { this.offsetx = new System.Windows.Forms.NumericUpDown(); this.offsety = new System.Windows.Forms.NumericUpDown(); this.scale = new System.Windows.Forms.NumericUpDown(); @@ -72,6 +107,9 @@ this.lblZNeg = new System.Windows.Forms.Label(); this.filterzpos = new System.Windows.Forms.NumericUpDown(); this.lblZPos = new System.Windows.Forms.Label(); + this.cmdLookup = new System.Windows.Forms.Button(); + this.txtLookup = new System.Windows.Forms.TextBox(); + this.lblLookup = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.offsetx)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.offsety)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.scale)).BeginInit(); @@ -216,8 +254,37 @@ this.lblZPos.TabIndex = 10; this.lblZPos.Text = "Z Pos"; // + // cmdLookup + // + this.cmdLookup.Location = new System.Drawing.Point(720, 448); + this.cmdLookup.Name = "cmdLookup"; + this.cmdLookup.Size = new System.Drawing.Size(48, 20); + this.cmdLookup.TabIndex = 4; + this.cmdLookup.Text = "Reset"; + this.cmdLookup.Click += new System.EventHandler(this.cmdLookup_Click); + // + // txtLookup + // + this.txtLookup.Location = new System.Drawing.Point(656, 448); + this.txtLookup.Name = "txtLookup"; + this.txtLookup.Size = new System.Drawing.Size(56, 20); + this.txtLookup.TabIndex = 5; + this.txtLookup.Text = ""; + this.txtLookup.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtLookup_KeyPress); + // + // lblLookup + // + this.lblLookup.Location = new System.Drawing.Point(608, 448); + this.lblLookup.Name = "lblLookup"; + this.lblLookup.Size = new System.Drawing.Size(48, 23); + this.lblLookup.TabIndex = 12; + this.lblLookup.Text = "Lookup"; + // // MapPane // + this.Controls.Add(this.lblLookup); + this.Controls.Add(this.txtLookup); + this.Controls.Add(this.cmdLookup); this.Controls.Add(this.filterzpos); this.Controls.Add(this.lblZPos); this.Controls.Add(this.filterzneg); @@ -231,7 +298,7 @@ this.Controls.Add(this.mapCon); this.Controls.Add(this.cmdCommand); this.Name = "MapPane"; - this.Size = new System.Drawing.Size(728, 480); + this.Size = new System.Drawing.Size(776, 480); this.Resize += new System.EventHandler(this.MapPane_Resize); ((System.ComponentModel.ISupportInitialize)(this.offsetx)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.offsety)).EndInit(); @@ -241,75 +308,79 @@ this.ResumeLayout(false); } - #endregion + #endregion - private void MapPane_Resize(object sender, EventArgs e) { - Size s = mapCon.Size; - Size t = Size; + private void MapPane_Resize(object sender, EventArgs e) { + Size s = mapCon.Size; + Size t = Size; - s.Width = t.Width; - s.Height = t.Height - 30; // Allow for controls - mapCon.Size = s; + s.Width = t.Width; + s.Height = t.Height - 30; // Allow for controls + mapCon.Size = s; - int top = Size.Height - 25; // Top of controls + int top = Size.Height - 25; // Top of controls - cmdCommand.Top = top; + cmdCommand.Top = top; - offsetx.Top = top; - lblOffsetX.Top = top; + offsetx.Top = top; + lblOffsetX.Top = top; - offsety.Top = top; - lblOffsetY.Top = top; + offsety.Top = top; + lblOffsetY.Top = top; - scale.Top = top; - lblScale.Top = top; + scale.Top = top; + lblScale.Top = top; - filterzneg.Top = top; - lblZNeg.Top = top; + filterzneg.Top = top; + lblZNeg.Top = top; - filterzpos.Top = top; - lblZPos.Top = top; + filterzpos.Top = top; + lblZPos.Top = top; - mapCon.onResize(); - mapCon.Invalidate(); - } + lblLookup.Top = top; + txtLookup.Top = top; + cmdLookup.Top = top; - private void offsetx_ValueChanged(object sender, System.EventArgs e) { - mapCon.m_panOffsetX = -(int)offsetx.Value; - mapCon.m_readjustRequired = true; - mapCon.Invalidate(); - } + mapCon.onResize(); + mapCon.Invalidate(); + } - private void offsety_ValueChanged(object sender, System.EventArgs e) { - mapCon.m_panOffsetY = -(int)offsety.Value; - mapCon.m_readjustRequired = true; - mapCon.Invalidate(); - } + private void offsetx_ValueChanged(object sender, System.EventArgs e) { + mapCon.m_panOffsetX = -(int)offsetx.Value; + mapCon.m_readjustRequired = true; + mapCon.Invalidate(); + } - private void scale_ValueChanged(object sender, System.EventArgs e) { - mapCon.scale = (float)(scale.Value)/100.0f; - mapCon.m_readjustRequired = true; - mapCon.Invalidate(); - } + private void offsety_ValueChanged(object sender, System.EventArgs e) { + mapCon.m_panOffsetY = -(int)offsety.Value; + mapCon.m_readjustRequired = true; + mapCon.Invalidate(); + } - private void cmdCommand_Click(object sender, System.EventArgs e) { - frmMain f1 = (frmMain)Parent; + private void scale_ValueChanged(object sender, System.EventArgs e) { + mapCon.scale = (float)(scale.Value)/100.0f; + mapCon.m_readjustRequired = true; + mapCon.Invalidate(); + } - f1.cmdCommand_Click(sender, e); - } + private void cmdCommand_Click(object sender, System.EventArgs e) { + frmMain f1 = (frmMain)Parent; - private void filterzpos_ValueChanged(object sender, System.EventArgs e) { - mapCon.filterpos = (int)filterzpos.Value; - mapCon.Invalidate(); - } + f1.cmdCommand_Click(sender, e); + } - private void filterzneg_ValueChanged(object sender, System.EventArgs e) { - mapCon.filterneg = (int)filterzneg.Value; - mapCon.Invalidate(); - } + private void filterzpos_ValueChanged(object sender, System.EventArgs e) { + mapCon.filterpos = (int)filterzpos.Value; + mapCon.Invalidate(); + } - private void mapCon_MouseEnter(object sender, System.EventArgs e) { - mapCon.Focus(); - } - } + private void filterzneg_ValueChanged(object sender, System.EventArgs e) { + mapCon.filterneg = (int)filterzneg.Value; + mapCon.Invalidate(); + } + + private void mapCon_MouseEnter(object sender, System.EventArgs e) { + mapCon.Focus(); + } + } } |
|
From: slartibartfast <sla...@us...> - 2004-09-30 21:00:03
|
Update of /cvsroot/seq/myseq/client/cfg In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21575/cfg Modified Files: ConLevels.Ini Log Message: Changes for Version 1.16.3 Index: ConLevels.Ini =================================================================== RCS file: /cvsroot/seq/myseq/client/cfg/ConLevels.Ini,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ConLevels.Ini 30 Sep 2004 18:28:57 -0000 1.1 +++ ConLevels.Ini 30 Sep 2004 20:59:54 -0000 1.2 @@ -66,8 +66,8 @@ 63=42,47 64=43,48 65=44,49 -66=44,49 -67=45,50 -68=46,51 -69=47,52 -70=48,53 \ No newline at end of file +66=45,50 +67=46,51 +68=47,52 +69=48,53 +70=49,54 |
|
From: slartibartfast <sla...@us...> - 2004-09-30 21:00:03
|
Update of /cvsroot/seq/myseq/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21575 Modified Files: AssemblyInfo.cs ClientReleaseNotes.htm MapCon.cs Structures.cs frmMain.cs frmMain.resx myseq.csproj Log Message: Changes for Version 1.16.3 Index: frmMain.resx =================================================================== RCS file: /cvsroot/seq/myseq/client/frmMain.resx,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- frmMain.resx 30 Sep 2004 19:12:12 -0000 1.3 +++ frmMain.resx 30 Sep 2004 20:59:53 -0000 1.4 @@ -97,15 +97,6 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> - <data name="mapPane.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>False</value> - </data> - <data name="mapPane.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>Private</value> - </data> - <data name="mapPane.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>Public</value> - </data> <data name="openFileDialog.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> @@ -403,10 +394,34 @@ <data name="mnuSep6.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuCenterOnPlayer.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuFollowNone.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuCenterOnPlayer.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuFollowNone.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuFollowPlayer.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuFollowPlayer.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuFollowTarget.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuFollowTarget.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="menuItem6.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="menuItem6.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuKeepCentered.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuKeepCentered.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="mnuListSettings.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> @@ -721,12 +736,12 @@ <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </data> - <data name="$this.Name"> - <value>frmMain</value> - </data> <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>56</value> </data> + <data name="$this.Name"> + <value>frmMain</value> + </data> <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </data> Index: Structures.cs =================================================================== RCS file: /cvsroot/seq/myseq/client/Structures.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Structures.cs 30 Sep 2004 19:12:11 -0000 1.3 +++ Structures.cs 30 Sep 2004 20:59:53 -0000 1.4 @@ -11,20 +11,38 @@ { #region SPAWNINFO class [StructLayout(LayoutKind.Sequential, Pack=1)] - public class SPAWNINFO { + public class SPAWNINFO + { public SPAWNINFO() {} - private string BytesToString(byte []b, int start, int maxlen) { + private string BytesToString(byte []b, int start, int maxlen) + { int i=0; // look for a null for(;i<maxlen&&b[start+i]!='\0';i++); return Encoding.ASCII.GetString(b, start, i); } - public void frombytes(byte []b, int offset, RegexHelper reh) { + public void frombytes(byte []b, int offset, RegexHelper reh) + { + flags = (SPAWNINFO.PacketType) BitConverter.ToInt32(b, 84+offset); Name = BytesToString(b, 0+offset, 30); - Y = BitConverter.ToSingle(b, 30+offset); - X = BitConverter.ToSingle(b, 34+offset); + + if (this.flags == PacketType.Player || this.flags == PacketType.Spawn || this.flags == PacketType.Target) + { + // Bug in original CavemanBob server meant that X + Y co-ordinates were reversed + // The client now correctly stores the X coordinate in X + // When the server is updated tyo fix this bug then this + // code can be removed. + X = BitConverter.ToSingle(b, 30+offset); + Y = BitConverter.ToSingle(b, 34+offset); + } + else + { + Y = BitConverter.ToSingle(b, 30+offset); + X = BitConverter.ToSingle(b, 34+offset); + } + Z = BitConverter.ToSingle(b, 38+offset); Heading = BitConverter.ToSingle(b, 42+offset); SpeedRun = BitConverter.ToSingle(b, 46+offset); @@ -35,7 +53,6 @@ Level = b[60+offset]; Hide = b[61+offset]; Lastname = BytesToString(b,62+offset, 22); - flags = (SPAWNINFO.PacketType) BitConverter.ToInt32(b, 84+offset); highlight = false; // highlight flag m_isPlayer = false; @@ -55,7 +72,8 @@ hiddenOnList = false; //non-corpse, non-player spawn (aka NPC) - if (!Settings.Instance.ShowMapNPCs || !Settings.Instance.ShowListNPCs) { + if (!Settings.Instance.ShowMapNPCs || !Settings.Instance.ShowListNPCs) + { if (flags==PacketType.Spawn && Type!=2 && Type!=0) { if (!Settings.Instance.ShowMapNPCs) hiddenOnMap = true; @@ -87,7 +105,8 @@ if (!Settings.Instance.ShowListInvis) hiddenOnList = true; } // Check Mounts - if (!Settings.Instance.ShowMapMounts || !Settings.Instance.ShowListMounts) { + if (!Settings.Instance.ShowMapMounts || !Settings.Instance.ShowListMounts) + { if (reh.IsMount(Name)) { if (!Settings.Instance.ShowMapMounts) hiddenOnMap = true; @@ -140,7 +159,8 @@ } } - public enum PacketType { + public enum PacketType + { Spawn = 0, Target = 1, Zone = 4, @@ -166,7 +186,6 @@ public string Lastname = ""; public int gone = 0; public PacketType flags = 0; - //public ListViewItem lvi = null; public bool isHunt = false; public bool isCaution = false; public bool isRare = false; @@ -180,11 +199,13 @@ public string SpawnLoc = ""; public bool IsPlayer() {return m_isPlayer;} + } #endregion #region GroundItem class - public class GroundItem { + public class GroundItem + { public float X = 0.0f; public float Y = 0.0f; public float Z = 0.0f; @@ -196,11 +217,12 @@ #region SPAWNTIMER class //[StructLayout(LayoutKind.Sequential, Pack=1)] - public class SPAWNTIMER { + public class SPAWNTIMER + { public SPAWNTIMER() {} - public float Y = 0; public float X = 0; + public float Y = 0; public float Z = 0; public int SpawnCount = 0; public int SpawnTimer = 0; @@ -225,15 +247,18 @@ private static extern int GetPrivateProfileString(string section, string key,string def, StringBuilder retVal, int size,string filePath); - public IniFile(string INIPath){ + public IniFile(string INIPath) + { path = INIPath; } - public void WriteValue(string Section, string Key, string Value) { + public void WriteValue(string Section, string Key, string Value) + { WritePrivateProfileString(Section, Key, Value, this.path); } - public string ReadValue(string Section, string Key, string Default) { + public string ReadValue(string Section, string Key, string Default) + { StringBuilder buffer = new StringBuilder(255); GetPrivateProfileString(Section, Key, Default, buffer, 255, this.path); @@ -273,7 +298,6 @@ private bool depthFilter = false; private bool showMobTrails = false; private bool collectMobTrails = false; - private bool centerOnPlayer =false; private bool saveOnExit = true; private int maxLogLevel = 0; @@ -370,6 +394,10 @@ private bool showSpawnPoints = false; private bool autoSelectSpawnList = true; + private myseq.FollowOption followOption = myseq.FollowOption.Player; + private bool keepCentered = true; + + public bool KeepCentered{get{return keepCentered;} set{keepCentered = value;}} public bool AutoSelectSpawnList {get{return autoSelectSpawnList;} set{autoSelectSpawnList = value;}} public bool ShowSpawnPoints {get{return showSpawnPoints;} set{showSpawnPoints = value;}} public bool ShowMapPlayers { get { return showMapPlayers; } set { showMapPlayers = value; } } @@ -386,48 +414,61 @@ public bool ShowListMounts { get { return showListMounts; } set { showListMounts = value; } } public bool ShowListFamiliars { get { return showListFamiliars; } set { showListFamiliars = value; } } public bool ShowListPets { get { return showListPets; } set { showListPets = value; } } - public bool ShowAllPlayers { + public bool ShowAllPlayers + { get {return (showListPlayers && showMapPlayers);} set {showListPlayers = value; showMapPlayers = value;} } - public bool ShowAllNPCs { + public bool ShowAllNPCs + { get { return (showListNPCs && showMapNPCs); } - set { + set + { showListNPCs = value; showMapNPCs = value; } } - public bool ShowAllCorpses { + public bool ShowAllCorpses + { get { return (showListCorpses && showMapCorpses); } - set { + set + { showListCorpses = value; showMapCorpses = value; } } - public bool ShowAllInvis { + public bool ShowAllInvis + { get { return (showListInvis && showMapInvis); } - set { + set + { showListInvis = value; showMapInvis = value; } } - public bool ShowAllMounts { + public bool ShowAllMounts + { get { return (showListMounts && showMapMounts); } - set { + set + { showListMounts = value; showMapMounts = value; } } - public bool ShowAllFamiliars { + public bool ShowAllFamiliars + { get { return (showListFamiliars && showMapFamiliars); } - set { + set + { showListFamiliars = value; showMapFamiliars = value; } } - public bool ShowAllPets { + public bool ShowAllPets + { get { return (showListPets && showMapPets); } - set { + set + { showListPets = value; showMapPets = value; } @@ -444,7 +485,7 @@ public Color RangeCircleColor {get{return rangeCircleColor;} set{rangeCircleColor = value;}} public Color ListBackColor {get{return listBackColor;} set{listBackColor = value;}} public Color MQConsoleColor {get{return mqConsoleColor;} set{mqConsoleColor = value;}} - public bool CenterOnPlayer {get{return centerOnPlayer;} set{centerOnPlayer = value;}} + public myseq.FollowOption FollowOption {get {return followOption;} set{followOption = value;}} public bool ShowMobList {get{return showMobList;} set{showMobList = value;}} public bool NoneOnHunt {get{return noneOnHunt;} set{noneOnHunt = value;}} public bool NoneOnCaution {get{return noneOnCaution;} set{noneOnCaution = value;}} Index: AssemblyInfo.cs =================================================================== RCS file: /cvsroot/seq/myseq/client/AssemblyInfo.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- AssemblyInfo.cs 30 Sep 2004 19:12:12 -0000 1.5 +++ AssemblyInfo.cs 30 Sep 2004 20:59:53 -0000 1.6 @@ -26,7 +26,7 @@ // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.16.2.*")] +[assembly: AssemblyVersion("1.16.3.*")] // // In order to sign your assembly you must specify a key to use. Refer to the Index: ClientReleaseNotes.htm =================================================================== RCS file: /cvsroot/seq/myseq/client/ClientReleaseNotes.htm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ClientReleaseNotes.htm 30 Sep 2004 19:12:12 -0000 1.2 +++ ClientReleaseNotes.htm 30 Sep 2004 20:59:53 -0000 1.3 @@ -1,39 +1,63 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <!-- saved from url=(0069)http://www.geocities.com/slartibartfast1232000/ClientRleaseNotes.html --> -<HTML><HEAD><TITLE>MySeq Client Release Notes</TITLE> -<META http-equiv=Content-Type content="text/html; charset=windows-1252"> -<META content="Microsoft FrontPage 5.0" name=GENERATOR></HEAD> -<BODY text=#000000 vLink=#ff0000 aLink=#800080 link=#0000ff bgColor=#ffffff> -<H1 align=center><U>MYSEQ Client Release Notes</U></H1> -<P> -<H2>Changes for next version</H2> -<H2>Release Version 1.16.2</H2> -<p>Dated 28 September 2004</p> -<ol> - <li>Added all missing Con Level Information - please post feedback if any of - the con level data is incorrect. </li> - <li>Fixed the MobInfo panel background color. (Thanks CybMax for spotting it). - </li> - <li>Added the ability to select which character to monitor when multiboxing.</li> -</ol> -<p>Note: The list does not refresh automatically - you must click on the refresh -menu item. (this is an attempt to keep the overhead of this feature to a -minimum).</p> -<p>Also Note that a new server version is required for this to work...</p> -<ol> - <li value="4">Added 42!'s ability to select a point on the map for navigation - purposes. Shift Left-click on the map to toggle the selected point.</li> -</ol> -<p>(I changed 42's code a little to preserve the default behavior for selecting -spawns, also made the line dashed so that it is easy to distinguish from tyhe -selected spawn)</p> -<p> </p> -<H2>Release Version 1.16.1</H2> -<P>Dated 18 September 2004</P> -<OL> - <LI><FONT class=nf face="verdana, arial, helvetica" size=2>Updated program to - read con level data from an ini file.</FONT><LI> - <font face="verdana, arial, helvetica" size="2">Updated Con Level Information - to include level 66-70 (using extrapolated data)</font><LI> - <font face="verdana, arial, helvetica" size="2">Added new race names for OOW</font></OL> -</BODY></HTML> \ No newline at end of file +<HTML> + <HEAD> + <TITLE>MySeq Client Release Notes</TITLE> + <META http-equiv="Content-Type" content="text/html; charset=windows-1252"> + <META content="Microsoft FrontPage 5.0" name="GENERATOR"> + </HEAD> + <BODY text="#000000" vLink="#ff0000" aLink="#800080" link="#0000ff" bgColor="#ffffff"> + <H1 align="center"><U>MYSEQ Client Release Notes</U></H1> + <P> + <H2>Changes for next version</H2> + <OL> + <li> + Fixed up spawnInfo so that X contains the X co-ordinate for Player + Spawn + packets. (They are still reversed in the packet stream - I will probably + release a new server to correct this soon) + <LI> + Changed the way "Center on Player" works to restore the original behavior but + add in the ability to keep the player or target centered<BR> + "Follow None" = Do not scroll the map<BR> + "Follow Player" = move map to keep player in view<BR> + "Follow target" = move map to keep target in viewtered on screen<BR> + <BR> + Keep Centered" = The follow target (either player or target) will remain in the + same position on the screen, even if this causes most of the map to be off the + screen.</LI></OL> + <p> </p> + <H2>Release Version 1.16.2</H2> + <p>Dated 28 September 2004</p> + <ol> + <li> + Added all missing Con Level Information - please post feedback if any of the + con level data is incorrect. + <li> + Fixed the MobInfo panel background color. (Thanks CybMax for spotting it). + <li> + Added the ability to select which character to monitor when multiboxing.</li> + </ol> + <p>Note: The list does not refresh automatically - you must click on the refresh + menu item. (this is an attempt to keep the overhead of this feature to a + minimum).</p> + <p>Also Note that a new server version is required for this to work...</p> + <ol> + <li value="4"> + Added 42!'s ability to select a point on the map for navigation purposes. Shift + Left-click on the map to toggle the selected point.</li> + </ol> + <p>(I changed 42's code a little to preserve the default behavior for selecting + spawns, also made the line dashed so that it is easy to distinguish from tyhe + selected spawn)</p> + <p> </p> + <H2>Release Version 1.16.1</H2> + <P>Dated 18 September 2004</P> + <OL> + <LI> + <FONT class="nf" face="verdana, arial, helvetica" size="2">Updated program to read + con level data from an ini file.</FONT><LI> + <font face="verdana, arial, helvetica" size="2">Updated Con Level Information to + include level 66-70 (using extrapolated data)</font><LI> + <font face="verdana, arial, helvetica" size="2">Added new race names for OOW</font></LI></OL> + </BODY> +</HTML> Index: myseq.csproj =================================================================== RCS file: /cvsroot/seq/myseq/client/myseq.csproj,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- myseq.csproj 30 Sep 2004 19:12:11 -0000 1.6 +++ myseq.csproj 30 Sep 2004 20:59:53 -0000 1.7 @@ -138,6 +138,10 @@ BuildAction = "Compile" /> <File + RelPath = "ClientReleaseNotes.htm" + BuildAction = "Content" + /> + <File RelPath = "frmMain.cs" SubType = "Form" BuildAction = "Compile" @@ -203,10 +207,6 @@ BuildAction = "EmbeddedResource" /> <File - RelPath = "MySeq Client Release Notes.htm" - BuildAction = "Content" - /> - <File RelPath = "Structures.cs" SubType = "Code" BuildAction = "Compile" Index: MapCon.cs =================================================================== RCS file: /cvsroot/seq/myseq/client/MapCon.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- MapCon.cs 30 Sep 2004 19:12:11 -0000 1.10 +++ MapCon.cs 30 Sep 2004 20:59:53 -0000 1.11 @@ -16,6 +16,8 @@ namespace myseq { + public enum FollowOption{None, Player, Target}; + public class MapCon : System.Windows.Forms.UserControl { private System.ComponentModel.Container components = null; public System.Windows.Forms.Label lblMobInfo; @@ -49,23 +51,21 @@ // m_zoom - factor by which map has been zoomed. private float m_zoom = 0; - - // size of map once zoom has been taken into account. - private float m_zoomWidth = 0; - private float m_zoomHeight = 0; // m_panOffset define how far map has been dragged. public float m_panOffsetX = 0; public float m_panOffsetY = 0; - float m_screenOffsetX = 0; - float m_screenOffsetY = 0; // m_ratio - adjustment factor required to convert map->screen size. float m_ratio = 0; - // m_screenCenter - centre point of screen expressed in map units. - public float m_screenCenterX = 0; - public float m_screenCenterY = 0; + // m_mapCenter - centre point of screen in Map Units. + private float m_mapCenterX = 0; + private float m_mapCenterY = 0; + + // m_screenCenter - centre point of screen in Screen Units. + private float m_screenCenterX = 0; + private float m_screenCenterY = 0; public bool m_readjustRequired = false; @@ -765,7 +765,7 @@ { if (!sp.hiddenOnMap) { - if (sp.Y < x+delta && sp.Y > x-delta && sp.X < y+delta && sp.X > y-delta) + if (sp.X < x+delta && sp.X > x-delta && sp.Y < y+delta && sp.Y > y-delta) { if (Settings.Instance.AutoSelectSpawnList) { @@ -805,7 +805,7 @@ float mousey = ScreenToMapCoordY((float)e.Y); // Range - float sd = (float)Math.Sqrt(Math.Pow((mousey - playerinfo.X),2) + Math.Pow((mousex - playerinfo.Y),2)); + float sd = (float)Math.Sqrt(Math.Pow((mousey - playerinfo.Y),2) + Math.Pow((mousex - playerinfo.X),2)); f1.statusBar.Panels[0].Text = String.Format("Mouse Loc: {0:f3}, {1:f3}", mousex, mousey); f1.statusBar.Panels[1].Text = String.Format("Distance: {0:f1}", sd); @@ -849,7 +849,7 @@ delta = 5 / m_ratio; foreach (SPAWNINFO sp in mobs.Values) { if (!sp.hiddenOnMap) { - if (sp.Y < x+delta && sp.Y > x-delta && sp.X < y+delta && sp.X > y-delta) + if (sp.X < x+delta && sp.X > x-delta && sp.Y < y+delta && sp.Y > y-delta) { tt.SetToolTip(this, MobInfo(sp, false)); tt.AutomaticDelay = 0; @@ -883,7 +883,7 @@ if (!found) { foreach (SPAWNTIMER st in mobsTimer.Values) { if (st.SpawnCount > 1) { - if (st.Y < x+delta && st.Y > x-delta && st.X < y+delta && st.X > y-delta) { + if (st.X < x+delta && st.X > x-delta && st.Y < y+delta && st.Y > y-delta) { int countTime = 0; string countTimer = ""; if (st.NextSpawn.Length > 0) { @@ -903,7 +903,7 @@ spawnTimer.AppendFormat("Spawn Timer: {0} secs\n", st.SpawnTimer); spawnTimer.AppendFormat("Spawning In: {0}\n", countTimer); spawnTimer.AppendFormat("Spawn Count: {0}\n", st.SpawnCount); - spawnTimer.AppendFormat("X: {0:f3} Y: {1:f3} Z: {2:f3}", st.Y, st.X, st.Z); + spawnTimer.AppendFormat("Y: {0:f3} X: {1:f3} Z: {2:f3}", st.Y, st.X, st.Z); tt.SetToolTip(this, spawnTimer.ToString()); tt.AutomaticDelay = 0; @@ -992,140 +992,109 @@ m_panOffsetY = 0; ReAdjust(); } - + public void ReAdjust() { - // get the map length - //const QSize& mapSize = m_mapData->size(); float mapWidth = maxx - minx; float mapHeight = maxy - miny; - float border = 10; - float ScreenWidth; - float ScreenHeight; - - ScreenWidth = Width - (3*border); - ScreenHeight = Height - (3*border); - - float zoom = (float)scale; - if (m_zoom > 32) - m_zoom = 32; - - // calculate zoomed map size - m_zoomWidth = mapWidth / zoom; - m_zoomHeight = mapHeight / zoom; - - // if it's a bit small, zoom out - if ((m_zoomWidth <= 2) || (m_zoomHeight <= 2)) { - if (zoom > 1) { - zoom /= 2; - // recalculate zoomed map size - m_zoomWidth =(int)((float)mapWidth / zoom); - m_zoomHeight = (int)((float)mapHeight / zoom); - } - } - - // if (zoom == 1) - // { - // m_panOffsetX = 0; - // m_panOffsetY = 0; - // } - float xrat = (float)ScreenWidth / m_zoomWidth; - float yrat = (float)ScreenHeight / m_zoomHeight; + float border = 15; - // mapOffset used to centre the map when it is smaller than the screen. - float xoff = 0; - float yoff = 0; + float ScreenWidth = Width - (2*border); + float ScreenHeight = Height - (2*border); + m_screenCenterX = Width/2; + m_screenCenterY = Height/2; + + float zoom = (float)scale; + if (m_zoom > 32) + m_zoom = 32; - // Use the smaller scale ratio so that the map fits in the screen. - if (xrat < yrat) { - float newZoomHeight; - newZoomHeight = (ScreenHeight / xrat); - // if the map is smaller than the screen calc offset needed to centre map - //if (m_zoom <= 1) - // yoff = (newZoomHeight - m_zoomHeight) / 2; + float xratio = (float)ScreenWidth / mapWidth; + float yratio = (float)ScreenHeight / mapHeight; - m_zoomHeight = newZoomHeight; - m_ratio = xrat; + // Use the smaller scale ratio so that the map fits in the screen at a zoom of 1. + if (xratio < yratio) { + m_ratio = xratio * zoom; } else { - float newZoomWidth; - newZoomWidth = (ScreenWidth / yrat); - - // if the map is smaller than the screen calc offset needed to centre map - //if (m_zoom <= 1) - // xoff = (newZoomWidth - m_zoomWidth) /2; - m_zoomWidth = newZoomWidth; - m_ratio = yrat; + m_ratio = yratio * zoom; } - if (ScreenWidth>mapWidth * m_ratio * zoom) - xoff = border + (ScreenWidth - (mapWidth * m_ratio))/2; - else - xoff = border; - - if (ScreenHeight>mapHeight * m_ratio * zoom) - yoff = border + (ScreenHeight - (mapHeight * m_ratio))/2; - else - yoff = border; - - float ZMaxX, ZMinX, ZMaxY, ZMinY; - - // Center on the target based on target - if (Settings.Instance.CenterOnPlayer) { - ZMaxX = (playerinfo.Y) + (m_zoomWidth / 2); - ZMinX = (playerinfo.Y) - (m_zoomWidth / 2); - - ZMaxY = (playerinfo.X) + (m_zoomHeight / 2); - ZMinY = (playerinfo.X) - (m_zoomHeight / 2); - } else { - ZMaxX = -m_panOffsetX + (m_zoomWidth / 2); - ZMinX = -m_panOffsetX - (m_zoomWidth / 2); - - ZMaxY = m_panOffsetY + (m_zoomHeight / 2); - ZMinY = m_panOffsetY - (m_zoomHeight / 2); - } + // Calculate the Map Center + switch (Settings.Instance.FollowOption) + { + case FollowOption.None: + m_mapCenterX = minx + (mapWidth/2); + m_mapCenterY = miny + (mapHeight/2); + break; + case FollowOption.Player: + m_mapCenterX = playerinfo.X; + m_mapCenterY = playerinfo.Y; + break; + case FollowOption.Target: + SPAWNINFO siTarget; + if (mobs.ContainsKey((uint)selectedID)) + { + siTarget = (SPAWNINFO)mobs[(uint)selectedID]; + m_mapCenterX = playerinfo.X; + m_mapCenterY = playerinfo.Y; + break; + } + else + goto case FollowOption.Player; - // try not to have blank space on the sides - - // [42!] ... unless we're centered on the player (CoP, F5...). In this case, - // we're making sure that the Player is always in the same spot, exactly (i.e., unless - // the user moves the MySEQ window around, it will always be in exactly the same spot on the - // screen, in absolute screen coordinates). This is important if the user uses the map - // window "behind" the EQ window on a single monitor setup. - - if (Settings.Instance.CenterOnPlayer) - { - xoff = 0; - yoff = 0; - } - else - { - if (ZMinX < minx) { - ZMaxX -= (ZMinX - minx); - ZMinX -= (ZMinX - minx); - } + default: + goto case FollowOption.None; + } + - if (ZMaxX > maxx) { - ZMinX -= (ZMaxX - maxx); - ZMaxX -= (ZMaxX - maxx); - } + // When Following a player or spawn and KeepCentered is not selected + // adjust the map center so as to minimise the amount of blank space in the map window. - if (ZMinY < miny) { - ZMaxY -= (ZMinY - miny); - ZMinY -= (ZMinY -miny); - } + if (Settings.Instance.KeepCentered==false && Settings.Instance.FollowOption!=FollowOption.None) + { + // Calculate the MapCordinates of the Screen Edges + float ScreenMaxY, ScreenMinY, ScreenMinX, ScreenMaxX; + float ScreenMapWidth, ScreenMapHeight; - if (ZMaxY > maxy) { - ZMinY -= (ZMaxY - maxy); - ZMaxY -= (ZMaxY - maxy); - } - } + ScreenMaxY = ScreenToMapCoordY(border); + ScreenMinY = ScreenToMapCoordY(Height - (2*border)); + ScreenMapHeight = Math.Abs(ScreenMaxY - ScreenMinY); + + // X sense is wrong way round... + ScreenMinX = ScreenToMapCoordX(Width - (2*border)); + ScreenMaxX = ScreenToMapCoordX(border); + ScreenMapWidth = Math.Abs(ScreenMaxX - ScreenMinX); + - float midx = (ZMinX + ZMaxX)/2; - float midy = (ZMinY + ZMaxY)/2; + if (mapWidth <= ScreenMapWidth) + { + // If map fits in window set center to center of map + m_mapCenterX = minx + (mapWidth/2); + } + else + { + // if we have blank space to the left or right repostion the center point appropriately + if (ScreenMinX<minx) + m_mapCenterX += (minx-ScreenMinY); + else if (ScreenMaxX>maxx) + m_mapCenterX -= (ScreenMaxY-maxx); + } - m_screenOffsetX = xoff + ((float)ScreenWidth/2) + (midx * m_ratio); - m_screenOffsetY = yoff + ((float)ScreenHeight/2) + (midy * m_ratio); + if (mapHeight <= ScreenMapHeight) + { + // If map fits in window set center to center of map + m_mapCenterY = miny + (mapHeight/2); + } + else + { + // if we have blank space at the top or botton repostion the center point appropriately + if (ScreenMinY<miny) + m_mapCenterY += (miny-ScreenMinY); + else if (ScreenMaxY>maxy) + m_mapCenterY -= (ScreenMaxY-maxy); + } + } } + public void fillConColors() { try @@ -1182,19 +1151,30 @@ } private float CalcScreenCoordX(float mapCoordinateX) { - return m_panOffsetX + (m_screenOffsetX)-(mapCoordinateX * m_ratio); + + // Formula Should be + // Screen X =CenterScreenX + ((mapCoordinateX - MapCenterX) * m_ratio) + // However Eq's Map coordinates are in the oposite sense to the screen + // so we have to multiply the second portion by -1, which is the same + // as changing the plus to a minus... + + //m_ratio = (ScreenWidth/MapWidth) * zoom (Calculated ahead of time in ReAdjust) + return m_panOffsetX + m_screenCenterX - ((mapCoordinateX - m_mapCenterX) * m_ratio); } private float CalcScreenCoordY(float mapCoordinateY) { - return m_panOffsetY + (m_screenOffsetY)-(mapCoordinateY * m_ratio); + //return m_panOffsetY + (m_screenOffsetY)-(mapCoordinateY * m_ratio); + return m_panOffsetY + m_screenCenterY - ((mapCoordinateY - m_mapCenterY) * m_ratio); } private float ScreenToMapCoordX(float screenCoordX) { - return ((m_screenOffsetX + m_panOffsetX)- screenCoordX) / m_ratio; + //return ((m_screenOffsetX + m_panOffsetX)- screenCoordX) / m_ratio; + return m_mapCenterX + ((m_panOffsetX + m_screenCenterX - screenCoordX) / m_ratio); } private float ScreenToMapCoordY(float screenCoordY) { - return ((m_screenOffsetY + m_panOffsetY) - screenCoordY) / m_ratio; + //return ((m_screenOffsetY + m_panOffsetY) - screenCoordY) / m_ratio; + return m_mapCenterY + ((m_panOffsetY + m_screenCenterY - screenCoordY) / m_ratio); } private void DrawLine(Pen pen, float x1, float y1, float x2, float y2) { @@ -1247,14 +1227,14 @@ (si.Z - playerinfo.Z) * (si.Z - playerinfo.Z)); StringBuilder mobInfo = new StringBuilder(); - mobInfo.AppendFormat("Name: {0}\n", si.Name); - mobInfo.AppendFormat("Level: {0}\n", si.Level.ToString()); + mobInfo.AppendFormat("Name: {0} ({1})\n", si.Name,si.SpawnID); + mobInfo.AppendFormat("Level: {0}\n" , si.Level.ToString()); mobInfo.AppendFormat("Class: {0}\n", f1.classNumToString(si.Class)); mobInfo.AppendFormat("Race: {0}\n", f1.raceNumtoString(si.Race)); mobInfo.AppendFormat("Speed: {0:f3}\n", si.SpeedRun); mobInfo.AppendFormat("Visible: {0}\n", f1.hideNumToString(si.Hide)); mobInfo.AppendFormat("Distance: {0:f3}\n", sd); - mobInfo.AppendFormat("X: {0:f3} Y: {1:f3} Z: {2:f3}", si.Y, si.X, si.Z); + mobInfo.AppendFormat("Y: {0:f3} X: {1:f3} Z: {2:f3}", si.Y, si.X, si.Z); if (SetColor) { if (si.Level <= greenRange) lblMobInfo.BackColor = Color.PaleGreen; @@ -1308,8 +1288,8 @@ float pX = playerinfo.X; float pY = playerinfo.Y; float pZ = playerinfo.Z; - float playerx = CalcScreenCoordX(pY); - float playery = CalcScreenCoordY(pX); + float playerx = CalcScreenCoordX(pX); + float playery = CalcScreenCoordY(pY); float realhead = CalcRealHeading(playerinfo); uint playerSpawnID = playerinfo.SpawnID; @@ -1333,8 +1313,8 @@ // Draw Spawns foreach(SPAWNINFO sp in mobs.Values) { // Draw Caution Line to Mob - x = CalcScreenCoordX(sp.Y); - y = CalcScreenCoordY(sp.X); + x = CalcScreenCoordX(sp.X); + y = CalcScreenCoordY(sp.Y); if (sp.isCaution && flash) { float sd = (float)Math.Sqrt(Math.Pow((sp.X - pX),2) + Math.Pow((sp.Y - pY),2) + Math.Pow((sp.Z - pZ),2)); if (sd > RangeCircle && sd < RangeCircle + 100) @@ -1596,13 +1576,16 @@ // Draw Spawn Timers if (Settings.Instance.ShowSpawnPoints) { + int SpawnSize = Settings.Instance.SpawnDrawSize; + int SpawnSizeOffset = SpawnSize /2; + foreach (SPAWNTIMER st in mobsTimer.Values) { if (st.SpawnCount > 1) { Pen pen = ltgrayPen; - float stX = CalcScreenCoordX(st.Y); - float stY = CalcScreenCoordY(st.X); + float stX = CalcScreenCoordX(st.X); + float stY = CalcScreenCoordY(st.Y); int checkTimer = 0; bool canDraw = false; @@ -1631,8 +1614,8 @@ if (canDraw) { - DrawLine(pen, stX - 2, stY, stX + 2, stY); - DrawLine(pen, stX, stY - 2, stX, stY + 2); + DrawLine(pen, stX - SpawnSizeOffset, stY, stX + SpawnSize , stY); + DrawLine(pen, stX, stY - SpawnSizeOffset, stX, stY + SpawnSize); } } } @@ -1669,7 +1652,7 @@ // Draw Mob Trails if (Settings.Instance.ShowMobTrails) foreach (MobTrailPoint mtp in mobtrails) - FillEllipse(whiteBrush, CalcScreenCoordX(mtp.y)-2, CalcScreenCoordY(mtp.x)-2, 2,2); + FillEllipse(whiteBrush, CalcScreenCoordX(mtp.x)-2, CalcScreenCoordY(mtp.y)-2, 2,2); } catch (Exception ex) {LogLib.WriteLine("Error in DrawSpawnTrails(): " + ex.Message);} } Index: frmMain.cs =================================================================== RCS file: /cvsroot/seq/myseq/client/frmMain.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- frmMain.cs 30 Sep 2004 19:12:12 -0000 1.3 +++ frmMain.cs 30 Sep 2004 20:59:53 -0000 1.4 @@ -118,7 +118,6 @@ private System.Windows.Forms.MenuItem mnuGridColor; private System.Windows.Forms.MenuItem mnuBackgroungColor; private System.Windows.Forms.MenuItem mnuSep6; - private System.Windows.Forms.MenuItem mnuCenterOnPlayer; private System.Windows.Forms.MenuItem mnuAlert; private System.Windows.Forms.MenuItem mnuSep7; private System.Windows.Forms.MenuItem mnuAddEditAlerts; @@ -181,6 +180,11 @@ private System.Windows.Forms.MenuItem mnuChar4; private System.Windows.Forms.MenuItem mnuChar5; private System.Windows.Forms.MenuItem mnuChar6; + private System.Windows.Forms.MenuItem menuItem6; + private System.Windows.Forms.MenuItem mnuFollowNone; + private System.Windows.Forms.MenuItem mnuFollowTarget; + private System.Windows.Forms.MenuItem mnuFollowPlayer; + private System.Windows.Forms.MenuItem mnuKeepCentered; private System.Windows.Forms.MenuItem mnuIPAddress5; #endregion @@ -423,6 +427,23 @@ public frmMain() { InitializeComponent(); + // Add the StatusBar Panels + statusBar.Panels.Add(new StatusBarPanel()); // 0 - Mouse Location + statusBar.Panels.Add(new StatusBarPanel()); // 1 - Distance + statusBar.Panels.Add(new StatusBarPanel()); // 2 - Blank Space + statusBar.Panels.Add(new StatusBarPanel()); // 3 - Version Number + statusBar.Panels.Add(new StatusBarPanel()); // 4 - Server IP Address + statusBar.Panels.Add(new StatusBarPanel()); // 5 - Center on Player (CoP) + statusBar.Panels.Add(new StatusBarPanel()); // 6 - Zone Short Name + statusBar.Panels[0].Width = 175; + statusBar.Panels[1].Width = 100; + statusBar.Panels[2].AutoSize = StatusBarPanelAutoSize.Spring; + statusBar.Panels[3].Width = 60; + statusBar.Panels[4].Width = 90; + statusBar.Panels[5].Width = 30; + statusBar.Panels[3].Alignment = HorizontalAlignment.Center; + statusBar.Panels[4].Alignment = HorizontalAlignment.Center; + statusBar.Panels[5].Alignment = HorizontalAlignment.Center; LogLib.maxLogLevel = 1; @@ -528,24 +549,6 @@ try {mapCon.lblMobInfo.Font = new Font(Settings.Instance.TargetInfoFontName, Settings.Instance.TargetInfoFontSize, Settings.Instance.TargetInfoFontStyle); } catch (Exception ex) {LogLib.WriteLine("Error setting Target Info font: " + ex.Message);} - // Add the StatusBar Panels - statusBar.Panels.Add(new StatusBarPanel()); // 0 - Mouse Location - statusBar.Panels.Add(new StatusBarPanel()); // 1 - Distance - statusBar.Panels.Add(new StatusBarPanel()); // 2 - Blank Space - statusBar.Panels.Add(new StatusBarPanel()); // 3 - Version Number - statusBar.Panels.Add(new StatusBarPanel()); // 4 - Server IP Address - statusBar.Panels.Add(new StatusBarPanel()); // 5 - Center on Player (CoP) - statusBar.Panels.Add(new StatusBarPanel()); // 6 - Zone Short Name - statusBar.Panels[0].Width = 175; - statusBar.Panels[1].Width = 100; - statusBar.Panels[2].AutoSize = StatusBarPanelAutoSize.Spring; - statusBar.Panels[3].Width = 60; - statusBar.Panels[4].Width = 90; - statusBar.Panels[5].Width = 30; - statusBar.Panels[3].Alignment = HorizontalAlignment.Center; - statusBar.Panels[4].Alignment = HorizontalAlignment.Center; - statusBar.Panels[5].Alignment = HorizontalAlignment.Center; - statusBar.Panels[3].Text = Version; ClearMap(); @@ -600,7 +603,6 @@ { this.components = new System.ComponentModel.Container(); System.Resources.ResourceManager resources = new System.Resources.ResourceManager(typeof(frmMain)); - this.mapPane = new myseq.MapPane(); this.openFileDialog = new System.Windows.Forms.OpenFileDialog(); this.fontDialog1 = new System.Windows.Forms.FontDialog(); this.mnuContext = new System.Windows.Forms.ContextMenu(); @@ -647,7 +649,11 @@ this.mnuShowMobTrails = new System.Windows.Forms.MenuItem(); this.mnuShowSpawnPoints = new System.Windows.Forms.MenuItem(); this.mnuSep6 = new System.Windows.Forms.MenuItem(); - this.mnuCenterOnPlayer = new System.Windows.Forms.MenuItem(); + this.mnuFollowNone = new System.Windows.Forms.MenuItem(); + this.mnuFollowPlayer = new System.Windows.Forms.MenuItem(); + this.mnuFollowTarget = new System.Windows.Forms.MenuItem(); + this.menuItem6 = new System.Windows.Forms.MenuItem(); + this.mnuKeepCentered = new System.Windows.Forms.MenuItem(); this.mnuListSettings = new System.Windows.Forms.MenuItem(); this.mnuShowSpawnList = new System.Windows.Forms.MenuItem(); this.mnuSep10 = new System.Windows.Forms.MenuItem(); @@ -698,13 +704,6 @@ this.mnuHelpMain = new System.Windows.Forms.MenuItem(); this.mnuAbout = new System.Windows.Forms.MenuItem(); // - // mapPane - // - this.mapPane.Location = new System.Drawing.Point(0, 0); - this.mapPane.Name = "mapPane"; - this.mapPane.Size = new System.Drawing.Size(728, 480); - this.mapPane.TabIndex = 0; - // // mnuContext // this.mnuContext.Popup += new System.EventHandler(this.mnuContext_Popup); @@ -892,7 +891,9 @@ // // mnuChar1 // + this.mnuChar1.Checked = true; this.mnuChar1.Index = 0; + this.mnuChar1.RadioCheck = true; this.mnuChar1.Shortcut = System.Windows.Forms.Shortcut.CtrlShift1; this.mnuChar1.Text = "Char 1"; this.mnuChar1.Visible = false; @@ -901,6 +902,7 @@ // mnuChar2 // this.mnuChar2.Index = 1; + this.mnuChar2.RadioCheck = true; this.mnuChar2.Shortcut = System.Windows.Forms.Shortcut.CtrlShift2; this.mnuChar2.Text = "Char 2"; this.mnuChar2.Visible = false; @@ -909,6 +911,7 @@ // mnuChar3 // this.mnuChar3.Index = 2; + this.mnuChar3.RadioCheck = true; this.mnuChar3.Shortcut = System.Windows.Forms.Shortcut.CtrlShift3; this.mnuChar3.Text = "Char 3"; this.mnuChar3.Visible = false; @@ -917,6 +920,7 @@ // mnuChar4 // this.mnuChar4.Index = 3; + this.mnuChar4.RadioCheck = true; this.mnuChar4.Shortcut = System.Windows.Forms.Shortcut.CtrlShift4; this.mnuChar4.Text = "Char 4"; this.mnuChar4.Visible = false; @@ -925,6 +929,7 @@ // mnuChar5 // this.mnuChar5.Index = 4; + this.mnuChar5.RadioCheck = true; this.mnuChar5.Shortcut = System.Windows.Forms.Shortcut.CtrlShift5; this.mnuChar5.Text = "Char 5"; this.mnuChar5.Visible = false; @@ -933,6 +938,7 @@ // mnuChar6 // this.mnuChar6.Index = 5; + this.mnuChar6.RadioCheck = true; this.mnuChar6.Shortcut = System.Windows.Forms.Shortcut.CtrlShift6; this.mnuChar6.Text = "Char 6"; this.mnuChar6.Visible = false; @@ -960,7 +966,11 @@ this.mnuShowMobTrails, this.mnuShowSpawnPoints, this.mnuSep6, - this.mnuCenterOnPlayer}); + this.mnuFollowNone, + this.mnuFollowPlayer, + this.mnuFollowTarget, + this.menuItem6, + this.mnuKeepCentered}); this.mnuMapSettings.Text = "Map Settings"; // // mnuDepthFilter @@ -1039,12 +1049,38 @@ this.mnuSep6.Index = 6; this.mnuSep6.Text = "-"; // - // mnuCenterOnPlayer + // mnuFollowNone // - this.mnuCenterOnPlayer.Index = 7; - this.mnuCenterOnPlayer.Shortcut = System.Windows.Forms.Shortcut.F5; - this.mnuCenterOnPlayer.Text = "Center on Player"; - this.mnuCenterOnPlayer.Click += new System.EventHandler(this.mnuCenterOnPlayer_Click); + this.mnuFollowNone.Index = 7; + this.mnuFollowNone.RadioCheck = true; + this.mnuFollowNone.Text = "No Follow"; + this.mnuFollowNone.Click += new System.EventHandler(this.mnuFollowNone_Click); + // + // mnuFollowPlayer + // + this.mnuFollowPlayer.Checked = true; + this.mnuFollowPlayer.Index = 8; + this.mnuFollowPlayer.RadioCheck = true; + this.mnuFollowPlayer.Text = "Follow Player"; + this.mnuFollowPlayer.Click += new System.EventHandler(this.mnuFollowPlayer_Click); + // + // mnuFollowTarget + // + this.mnuFollowTarget.Index = 9; + this.mnuFollowTarget.RadioCheck = true; + this.mnuFollowTarget.Text = "Follow Target"; + this.mnuFollowTarget.Click += new System.EventHandler(this.mnuFollowTarget_Click); + // + // menuItem6 + // + this.menuItem6.Index = 10; + this.menuItem6.Text = "-"; + // + // mnuKeepCentered + // + this.mnuKeepCentered.Index = 11; + this.mnuKeepCentered.Text = "Keep Centered"; + this.mnuKeepCentered.Click += new System.EventHandler(this.mnuKeepCentered_Click); // // mnuListSettings // @@ -1477,7 +1513,8 @@ this.mnuShowSpawnList.Checked = Settings.Instance.ShowMobList; this.mnuShowGridLines.Checked = Settings.Instance.ShowGridLines; this.mnuShowListGridLines.Checked = Settings.Instance.ShowListGridLines; - this.mnuCenterOnPlayer.Checked = Settings.Instance.CenterOnPlayer; + SetFollowOption(Settings.Instance.FollowOption); + this.mnuKeepCentered.Checked = Settings.Instance.KeepCentered; this.mnuShowTargetInfo.Checked = Settings.Instance.ShowTargetInfo; this.mnuAutoSelectEQTarget.Checked = Settings.Instance.AutoSelectEQTarget; @@ -1767,10 +1804,10 @@ private void CheckMapMinMax(SPAWNINFO si) { - if (mapCon.minx>si.Y) mapCon.minx=si.Y; - if (mapCon.maxx<si.Y) mapCon.maxx=si.Y; - if (mapCon.miny>si.X) mapCon.miny=si.X; - if (mapCon.maxy<si.X) mapCon.maxy=si.X; + if (mapCon.minx>si.X) mapCon.minx=si.X; + if (mapCon.maxx<si.X) mapCon.maxx=si.X; + if (mapCon.miny>si.Y) mapCon.miny=si.Y; + if (mapCon.maxy<si.Y) mapCon.maxy=si.Y; } #region ProcessPacket @@ -2268,13 +2305,14 @@ } if ((mob.X != si.X) || (mob.Y != si.Y) || (mob.Z != si.Z)) - { + { + mob.X = si.X; - li.SubItems[10].Text = si.X.ToString(); - + li.SubItems[11].Text = si.X.ToString(); + mob.Y = si.Y; - li.SubItems[11].Text = si.Y.ToString(); - + li.SubItems[10].Text = si.Y.ToString(); + mob.Z = si.Z; li.SubItems[12].Text = si.Z.ToString(); @@ -2439,8 +2477,8 @@ item1.SubItems.Add(si.SpeedRun.ToString()); item1.SubItems.Add(si.SpawnID.ToString()); item1.SubItems.Add(dt.ToLongTimeString()); - item1.SubItems.Add(si.X.ToString("#.000")); item1.SubItems.Add(si.Y.ToString("#.000")); + item1.SubItems.Add(si.X.ToString("#.000")); item1.SubItems.Add(si.Z.ToString("#.000")); float sd = (float)Math.Sqrt((si.X - mapCon.playerinfo.X)* (si.X - mapCon.playerinfo.X) + @@ -2536,8 +2574,8 @@ string spawnTimer = ""; itmSpawnTimerList.SubItems.Add(spawnTimer); - itmSpawnTimerList.SubItems.Add(st.X.ToString()); itmSpawnTimerList.SubItems.Add(st.Y.ToString()); + itmSpawnTimerList.SubItems.Add(st.X.ToString()); itmSpawnTimerList.SubItems.Add(st.Z.ToString()); itmSpawnTimerList.SubItems.Add(st.SpawnCount.ToString()); itmSpawnTimerList.SubItems.Add(st.SpawnTime); @@ -2585,8 +2623,8 @@ string SpawnLoc = String.Format("{0:f3},{1:f3}", si.Y, si.X); SPAWNTIMER st = new SPAWNTIMER(); - st.Y = si.Y; st.X = si.X; + st.Y = si.Y; st.Z = si.Z; st.SpawnTime = dt.ToLongTimeString() + " " + dt.ToShortDateString(); st.KillTime = ""; @@ -3011,21 +3049,44 @@ } } - - private void mnuCenterOnPlayer_Click(object sender, System.EventArgs e) + private void SetFollowOption(FollowOption NewFollowOption) { - mnuCenterOnPlayer.Checked = !mnuCenterOnPlayer.Checked; + Settings.Instance.FollowOption = NewFollowOption; - Settings.Instance.CenterOnPlayer = mnuCenterOnPlayer.Checked; + mnuFollowNone.Checked = (NewFollowOption == FollowOption.None); + mnuFollowPlayer.Checked = (NewFollowOption == FollowOption.Player); + mnuFollowTarget.Checked = (NewFollowOption == FollowOption.Target); - if (mnuCenterOnPlayer.Checked) + switch (NewFollowOption) { - this.statusBar.Panels[5].Text = "CoP"; - mapPane.offsetx.Value = 0; - mapPane.offsety.Value = 0; + case FollowOption.None: + this.statusBar.Panels[5].Text = ""; + break; + case FollowOption.Player: + this.statusBar.Panels[5].Text = "CoP"; + mapPane.offsetx.Value = 0; + mapPane.offsety.Value = 0; + break; + case FollowOption.Target: + this.statusBar.Panels[5].Text = "CoT"; + mapPane.offsetx.Value = 0; + mapPane.offsety.Value = 0; + break; } - else - this.statusBar.Panels[5].Text = ""; + } + private void mnuFollowNone_Click(object sender, System.EventArgs e) + { + SetFollowOption(FollowOption.None); + } + + private void mnuFollowPlayer_Click(object sender, System.EventArgs e) + { + SetFollowOption(FollowOption.Player); + } + + private void mnuFollowTarget_Click(object sender, System.EventArgs e) + { + SetFollowOption(FollowOption.Target); } @@ -3362,6 +3423,7 @@ SendData(requestdata); } } + private void mnuChar1_Click(object sender, System.EventArgs e) { SwitchCharacter(1); @@ -3391,6 +3453,12 @@ { SwitchCharacter(6); } + + private void mnuKeepCentered_Click(object sender, System.EventArgs e) + { + Settings.Instance.KeepCentered = !Settings.Instance.KeepCentered; + mnuKeepCentered.Checked = Settings.Instance.KeepCentered; + } } |
|
From: slartibartfast <sla...@us...> - 2004-09-30 19:35:50
|
Update of /cvsroot/seq/myseq/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5622 Modified Files: CvsTest.txt Log Message: Familiarisation exercise with CVS... Index: CvsTest.txt =================================================================== RCS file: /cvsroot/seq/myseq/client/CvsTest.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- CvsTest.txt 30 Sep 2004 19:30:55 -0000 1.1 +++ CvsTest.txt 30 Sep 2004 19:35:41 -0000 1.2 @@ -8,8 +8,8 @@ ====== Update the same file in 2 Different places... -Line to Edit in Dir 1: Change me +Line to Edit in Dir 1: Change me - Changed in Dir 1 Line To Edit in Dir 2: Change me too -Line To Edit in Both Dirs \ No newline at end of file +Line To Edit in Both Dirs - Changed in Dir 1 \ No newline at end of file |
|
From: slartibartfast <sla...@us...> - 2004-09-30 19:31:06
|
Update of /cvsroot/seq/myseq/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4971 Added Files: CvsTest.txt Log Message: Familiarisation exercise with CVS... --- NEW FILE: CvsTest.txt --- CVS Test ======== File to play with so I can familiarise myself with CVS. Test 1 ====== Update the same file in 2 Different places... Line to Edit in Dir 1: Change me Line To Edit in Dir 2: Change me too Line To Edit in Both Dirs |
|
From: slartibartfast <sla...@us...> - 2004-09-30 19:12:23
|
Update of /cvsroot/seq/myseq/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1219 Modified Files: Structures.cs myseq.csproj MapCon.cs frmMain.resx frmMain.cs Compile.bat ClientReleaseNotes.htm Classes.cs AssemblyInfo.cs App.ico Added Files: diff_it.bat Log Message: Client Source Updated to 1.16.2 Index: frmMain.resx =================================================================== RCS file: /cvsroot/seq/myseq/client/frmMain.resx,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- frmMain.resx 30 Sep 2004 18:53:06 -0000 1.2 +++ frmMain.resx 30 Sep 2004 19:12:12 -0000 1.3 @@ -277,6 +277,60 @@ <data name="mnuIPAddress5.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> + <data name="menuItem1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="menuItem1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuChar1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuChar1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuChar2.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuChar2.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuChar3.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuChar3.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuChar4.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuChar4.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuChar5.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuChar5.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuChar6.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuChar6.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="menuItem7.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="menuItem7.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuCharRefresh.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuCharRefresh.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> <data name="mnuMapSettings.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> Index: App.ico =================================================================== RCS file: /cvsroot/seq/myseq/client/App.ico,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 Binary files /tmp/cvsouJEJJ and /tmp/cvsbMSZyp differ Index: Classes.cs =================================================================== RCS file: /cvsroot/seq/myseq/client/Classes.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Classes.cs 30 Sep 2004 18:53:07 -0000 1.1 +++ Classes.cs 30 Sep 2004 19:12:12 -0000 1.2 @@ -119,4 +119,32 @@ } } #endregion + + public class ProcessInfo + { + private uint mProcessID; + private string msCharName; + public ProcessInfo(uint ProcessID, string sCharName) + { + mProcessID = ProcessID; + msCharName = sCharName; + } + + public uint ProcessID + { + get + { + return mProcessID; + } + } + public string sCharName + { + get + { + return msCharName; + } + } + } + + } Index: Compile.bat =================================================================== RCS file: /cvsroot/seq/myseq/client/Compile.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Compile.bat 30 Sep 2004 18:53:07 -0000 1.1 +++ Compile.bat 30 Sep 2004 19:12:12 -0000 1.2 @@ -1,7 +1,11 @@ @echo off if "%1"=="" Goto Error +del %1.exe echo Compiling %1 -csc /nologo /out:%1.exe /target:winexe /r:Speechlib.dll,folderbrowser.dll,Magiclibrary.dll /win32icon:app.ico Aboutdlg.cs frmMain.cs frmOptions.cs ListViewPanel.cs Structures.cs UtilSocket.cs MapCon.cs MapPane.cs MacroQuestPanel.cs AssemblyInfo.cs +SET PATH=d:\programme\microsoft.net\sdk\v1.1\bin\;%PATH% +del *.resources +resgen /compile AboutDlg.resx frmMain.resx frmOptions.resx ListBoxPanel.resx ListViewPanel.resx MacroQuestPanel.resx MapCon.resx MapPane.resx +csc /nologo /out:%1.exe /target:winexe /r:Speechlib.dll,folderbrowser.dll,Magiclibrary.dll /win32icon:app.ico /recurse:*.cs /res:AboutDlg.resources,myseq.AboutDlg.resources /res:frmMain.resources,myseq.frmMain.resources /res:frmOptions.resources,myseq:frmOptions.resources /res:ListBoxPanel.resources,myseq:ListBoxPanel.resources /res:ListViewPanel.resources,myseq:ListViewPanel.resources /res:MacroQuestPanel.resources,myseq:MacroQuestPanel.resources /res:MapCon.resources,myseq:MapCon.resources /res:MapPane.resources,myseq:MapPane.resources echo Completed. echo Launching %1 %1 @@ -15,4 +19,4 @@ echo Example: %0 MySEQ echo. echo. -:Done \ No newline at end of file +:done \ No newline at end of file --- NEW FILE: diff_it.bat --- @echo off rem This assumes a specific directory layout: rem rem + ... rem | rem +-+ MySeq rem | rem +-- MySeq_Client_1_16_1 rem | rem +-- SomeDirWithCurrentChanges rem rem All differences between SomeDirWithCurrentChanges and MySeq_Client_1_16_1 are created; rem the latter should contain the official sources. Only SomeDirWithCurrentChanges (or whatever) rem can be edited, and diff_it.bat must be run from this directory. rem rem When new sources are released, MySeq_Client_1_16_1 has to be replaced with the new sources, rem of course. diff -x patch.txt -N -x "*.resources" -x "*.exe" -x maps -x "*.xml" -x timers -x filters -x cfg --ignore-file-name-case -w -B ..\MySeq_Client_1_16_1 . > ..\patch.txt diff -q -x patch.txt -N -x "*.resources" -x "*.exe" -x maps -x "*.xml" -x timers -x filters -x cfg --ignore-file-name-case -w -B ..\MySeq_Client_1_16_1 . type ..\patch.txt Index: AssemblyInfo.cs =================================================================== RCS file: /cvsroot/seq/myseq/client/AssemblyInfo.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- AssemblyInfo.cs 30 Sep 2004 18:53:07 -0000 1.4 +++ AssemblyInfo.cs 30 Sep 2004 19:12:12 -0000 1.5 @@ -26,7 +26,7 @@ // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.16.1.*")] +[assembly: AssemblyVersion("1.16.2.*")] // // In order to sign your assembly you must specify a key to use. Refer to the Index: ClientReleaseNotes.htm =================================================================== RCS file: /cvsroot/seq/myseq/client/ClientReleaseNotes.htm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ClientReleaseNotes.htm 30 Sep 2004 18:53:07 -0000 1.1 +++ ClientReleaseNotes.htm 30 Sep 2004 19:12:12 -0000 1.2 @@ -7,6 +7,27 @@ <H1 align=center><U>MYSEQ Client Release Notes</U></H1> <P> <H2>Changes for next version</H2> +<H2>Release Version 1.16.2</H2> +<p>Dated 28 September 2004</p> +<ol> + <li>Added all missing Con Level Information - please post feedback if any of + the con level data is incorrect. </li> + <li>Fixed the MobInfo panel background color. (Thanks CybMax for spotting it). + </li> + <li>Added the ability to select which character to monitor when multiboxing.</li> +</ol> +<p>Note: The list does not refresh automatically - you must click on the refresh +menu item. (this is an attempt to keep the overhead of this feature to a +minimum).</p> +<p>Also Note that a new server version is required for this to work...</p> +<ol> + <li value="4">Added 42!'s ability to select a point on the map for navigation + purposes. Shift Left-click on the map to toggle the selected point.</li> +</ol> +<p>(I changed 42's code a little to preserve the default behavior for selecting +spawns, also made the line dashed so that it is easy to distinguish from tyhe +selected spawn)</p> +<p> </p> <H2>Release Version 1.16.1</H2> <P>Dated 18 September 2004</P> <OL> Index: myseq.csproj =================================================================== RCS file: /cvsroot/seq/myseq/client/myseq.csproj,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- myseq.csproj 30 Sep 2004 18:53:06 -0000 1.5 +++ myseq.csproj 30 Sep 2004 19:12:11 -0000 1.6 @@ -32,7 +32,7 @@ DocumentationFile = "" DebugSymbols = "true" FileAlignment = "4096" - IncrementalBuild = "true" + IncrementalBuild = "false" NoStdLib = "false" NoWarn = "" Optimize = "false" Index: MapCon.cs =================================================================== RCS file: /cvsroot/seq/myseq/client/MapCon.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- MapCon.cs 30 Sep 2004 18:53:06 -0000 1.9 +++ MapCon.cs 30 Sep 2004 19:12:11 -0000 1.10 @@ -16,1729 +16,1782 @@ namespace myseq { - public class MapCon : System.Windows.Forms.UserControl { - private System.ComponentModel.Container components = null; - public System.Windows.Forms.Label lblMobInfo; + public class MapCon : System.Windows.Forms.UserControl { + private System.ComponentModel.Container components = null; + public System.Windows.Forms.Label lblMobInfo; - // Hand relocation variables [...3256 lines suppressed...] + } - public class MapText { - public string text = ""; - public SolidBrush color = null; - public int x = 0; - public int y = 0; - public int z = 0; - } - #endregion + public class MapText { + public string text = ""; + public SolidBrush color = null; + public int x = 0; + public int y = 0; + public int z = 0; + } + #endregion } Index: frmMain.cs =================================================================== RCS file: /cvsroot/seq/myseq/client/frmMain.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- frmMain.cs 30 Sep 2004 18:53:06 -0000 1.2 +++ frmMain.cs 30 Sep 2004 19:12:12 -0000 1.3 @@ -81,6 +81,9 @@ public RegexHelper reHelper = new RegexHelper(); + public System.Collections.ArrayList colProcesses = new ArrayList(); + public ProcessInfo CurrentProcess; + private bool mbGetProcessInfo = false; #region System Components private System.Windows.Forms.Timer timPackets; private System.ComponentModel.IContainer components; @@ -169,6 +172,15 @@ private System.Windows.Forms.MenuItem mnuIPAddress2; private System.Windows.Forms.MenuItem mnuIPAddress3; private System.Windows.Forms.MenuItem mnuIPAddress4; + private System.Windows.Forms.MenuItem menuItem1; + private System.Windows.Forms.MenuItem menuItem7; + private System.Windows.Forms.MenuItem mnuChar1; + private System.Windows.Forms.MenuItem mnuChar2; + private System.Windows.Forms.MenuItem mnuChar3; + private System.Windows.Forms.MenuItem mnuCharRefresh; + private System.Windows.Forms.MenuItem mnuChar4; + private System.Windows.Forms.MenuItem mnuChar5; + private System.Windows.Forms.MenuItem mnuChar6; private System.Windows.Forms.MenuItem mnuIPAddress5; #endregion @@ -614,6 +626,15 @@ this.mnuIPAddress3 = new System.Windows.Forms.MenuItem(); this.mnuIPAddress4 = new System.Windows.Forms.MenuItem(); this.mnuIPAddress5 = new System.Windows.Forms.MenuItem(); + this.menuItem1 = new System.Windows.Forms.MenuItem(); + this.mnuChar1 = new System.Windows.Forms.MenuItem(); + this.mnuChar2 = new System.Windows.Forms.MenuItem(); + this.mnuChar3 = new System.Windows.Forms.MenuItem(); + this.mnuChar4 = new System.Windows.Forms.MenuItem(); + this.mnuChar5 = new System.Windows.Forms.MenuItem(); + this.mnuChar6 = new System.Windows.Forms.MenuItem(); + this.menuItem7 = new System.Windows.Forms.MenuItem(); + this.mnuCharRefresh = new System.Windows.Forms.MenuItem(); this.mnuMapSettings = new System.Windows.Forms.MenuItem(); this.mnuDepthFilter = new System.Windows.Forms.MenuItem(); this.mnuSep5 = new System.Windows.Forms.MenuItem(); @@ -767,6 +788,7 @@ this.mnuRefreshSpawnList, this.mnuSep4, this.mnuServerSelection, + this.menuItem1, this.mnuMapSettings, this.mnuListSettings, this.mnuAlert, @@ -854,9 +876,82 @@ this.mnuIPAddress5.Text = ""; this.mnuIPAddress5.Click += new System.EventHandler(this.mnuIPAddress5_Click); // + // menuItem1 + // + this.menuItem1.Index = 5; + this.menuItem1.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { + this.mnuChar1, + this.mnuChar2, + this.mnuChar3, + this.mnuChar4, + this.mnuChar5, + this.mnuChar6, + this.menuItem7, + this.mnuCharRefresh}); + this.menuItem1.Text = "Character Selection"; + // + // mnuChar1 + // + this.mnuChar1.Index = 0; + this.mnuChar1.Shortcut = System.Windows.Forms.Shortcut.CtrlShift1; + this.mnuChar1.Text = "Char 1"; + this.mnuChar1.Visible = false; + this.mnuChar1.Click += new System.EventHandler(this.mnuChar1_Click); + // + // mnuChar2 + // + this.mnuChar2.Index = 1; + this.mnuChar2.Shortcut = System.Windows.Forms.Shortcut.CtrlShift2; + this.mnuChar2.Text = "Char 2"; + this.mnuChar2.Visible = false; + this.mnuChar2.Click += new System.EventHandler(this.mnuChar2_Click); + // + // mnuChar3 + // + this.mnuChar3.Index = 2; + this.mnuChar3.Shortcut = System.Windows.Forms.Shortcut.CtrlShift3; + this.mnuChar3.Text = "Char 3"; + this.mnuChar3.Visible = false; + this.mnuChar3.Click += new System.EventHandler(this.mnuChar3_Click); + // + // mnuChar4 + // + this.mnuChar4.Index = 3; + this.mnuChar4.Shortcut = System.Windows.Forms.Shortcut.CtrlShift4; + this.mnuChar4.Text = "Char 4"; + this.mnuChar4.Visible = false; + this.mnuChar4.Click += new System.EventHandler(this.mnuChar4_Click); + // + // mnuChar5 + // + this.mnuChar5.Index = 4; + this.mnuChar5.Shortcut = System.Windows.Forms.Shortcut.CtrlShift5; + this.mnuChar5.Text = "Char 5"; + this.mnuChar5.Visible = false; + this.mnuChar5.Click += new System.EventHandler(this.mnuChar5_Click); + // + // mnuChar6 + // + this.mnuChar6.Index = 5; + this.mnuChar6.Shortcut = System.Windows.Forms.Shortcut.CtrlShift6; + this.mnuChar6.Text = "Char 6"; + this.mnuChar6.Visible = false; + this.mnuChar6.Click += new System.EventHandler(this.mnuChar6_Click); + // + // menuItem7 + // + this.menuItem7.Index = 6; + this.menuItem7.Text = "-"; + // + // mnuCharRefresh + // + this.mnuCharRefresh.Index = 7; + this.mnuCharRefresh.Text = "Refresh List"; + this.mnuCharRefresh.Click += new System.EventHandler(this.mnuCharRefresh_Click); + // // mnuMapSettings // - this.mnuMapSettings.Index = 5; + this.mnuMapSettings.Index = 6; this.mnuMapSettings.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { this.mnuDepthFilter, this.mnuSep5, @@ -953,7 +1048,7 @@ // // mnuListSettings // - this.mnuListSettings.Index = 6; + this.mnuListSettings.Index = 7; this.mnuListSettings.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { this.mnuShowSpawnList, this.mnuSep10, @@ -980,7 +1075,7 @@ // // mnuAlert // - this.mnuAlert.Index = 7; + this.mnuAlert.Index = 8; this.mnuAlert.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { this.mnuReloadAlerts, this.mnuSep7, @@ -1015,18 +1110,18 @@ // // mnuCollectMobTrails // - this.mnuCollectMobTrails.Index = 8; + this.mnuCollectMobTrails.Index = 9; this.mnuCollectMobTrails.Text = "Collect Mob Trails"; this.mnuCollectMobTrails.Click += new System.EventHandler(this.mnuCollectMobTrails_Click); // // mnuSep11 // - this.mnuSep11.Index = 9; + this.mnuSep11.Index = 10; this.mnuSep11.Text = "-"; // // mnuChangeColor // - this.mnuChangeColor.Index = 10; + this.mnuChangeColor.Index = 11; this.mnuChangeColor.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { this.mnuGridColor, this.mnuListColor, @@ -1053,7 +1148,7 @@ // // mnuChangeFont // - this.mnuChangeFont.Index = 11; + this.mnuChangeFont.Index = 12; this.mnuChangeFont.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { this.mnuSpawnListFont, this.mnuTargetInfoFont}); @@ -1073,19 +1168,19 @@ // // mnuSep8 // - this.mnuSep8.Index = 12; + this.mnuSep8.Index = 13; this.mnuSep8.Text = "-"; // // mnuShowTargetInfo // - this.mnuShowTargetInfo.Index = 13; + this.mnuShowTargetInfo.Index = 14; this.mnuShowTargetInfo.Shortcut = System.Windows.Forms.Shortcut.F9; this.mnuShowTargetInfo.Text = "Show Target Info"; this.mnuShowTargetInfo.Click += new System.EventHandler(this.mnuShowTargetInfo_Click); // // mnuAutoSelectEQTarget // - this.mnuAutoSelectEQTarget.Index = 14; + this.mnuAutoSelectEQTarget.Index = 15; this.mnuAutoSelectEQTarget.Text = "Auto Select EQ Target"; this.mnuAutoSelectEQTarget.Click += new System.EventHandler(this.mnuAutoSelectEQTarget_Click); // @@ -1648,12 +1743,21 @@ private void timPackets_Tick(object sender, System.EventArgs e) { + byte[] requestdata; try { if (!RequestPending) { RequestPending = true; - byte[] requestdata = new byte[]{0x23}; + if (mbGetProcessInfo) + { + mbGetProcessInfo = false; + requestdata = new byte[]{0x6}; + } + else + { + requestdata = new byte[]{0x23}; + } SendData(requestdata); } } @@ -1733,6 +1837,7 @@ case SPAWNINFO.PacketType.GroundItem: ProcessGroundItems(si); break; case SPAWNINFO.PacketType.Target: ProcessTarget(si); break; case SPAWNINFO.PacketType.Spawn: ProcessSpawns(si); break; + case SPAWNINFO.PacketType.GetProcessInfo: ProcessProcessInfo(si); break; default: this.Text = "Unknown Packet Type: " + si.Type.ToString(); break; } } @@ -1774,6 +1879,103 @@ } #endregion + #region ProcessProcessInfo + private void ProcessProcessInfo(SPAWNINFO si) + { + ProcessInfo PI = new ProcessInfo(si.SpawnID, si.Name); + if (si.Level==0) + { + CurrentProcess = PI; + } + else + { + while (colProcesses.Count>0 && colProcesses.Count>=si.Level) + { + colProcesses.Remove(colProcesses[colProcesses.Count-1]); + } + colProcesses.Add(PI); + + switch (colProcesses.Count) + { + case 1: + { + mnuChar1.Text = si.Name; + mnuChar1.Visible = true; + mnuChar1.Checked = ((CurrentProcess!=null) && (CurrentProcess.ProcessID == PI.ProcessID)); + break; + } + case 2: + { + mnuChar2.Text = si.Name; + mnuChar2.Visible = true; + mnuChar2.Checked = ((CurrentProcess!=null) && (CurrentProcess.ProcessID == PI.ProcessID)); + break; + } + case 3: + { + mnuChar3.Text = si.Name; + mnuChar3.Visible = true; + mnuChar3.Checked = ((CurrentProcess!=null) && (CurrentProcess.ProcessID == PI.ProcessID)); + break; + } + case 4: + { + mnuChar4.Text = si.Name; + mnuChar4.Visible = true; + mnuChar4.Checked = ((CurrentProcess!=null) && (CurrentProcess.ProcessID == PI.ProcessID)); + break; + } + case 5: + { + mnuChar5.Text = si.Name; + mnuChar5.Visible = true; + mnuChar5.Checked = ((CurrentProcess!=null) && (CurrentProcess.ProcessID == PI.ProcessID)); + break; + } + case 6: + { + mnuChar6.Text = si.Name; + mnuChar6.Visible = true; + mnuChar6.Checked = ((CurrentProcess!=null) && (CurrentProcess.ProcessID == PI.ProcessID)); + break; + } + } + switch (colProcesses.Count) + { + case 1: + { + mnuChar2.Visible = false; + goto case 2; + } + case 2: + { + mnuChar3.Visible = false; + goto case 3; + } + case 3: + { + mnuChar4.Visible = false; + goto case 4; + } + case 4: + { + mnuChar5.Visible = false; + goto case 5; + } + case 5: + { + mnuChar6.Visible = false; + break; + } + default: + break; + } + + + } + } + #endregion + #region ProccessMap private void ProcessMap(SPAWNINFO si) { @@ -1995,6 +2197,7 @@ try { SPAWNTIMER stold = (SPAWNTIMER)mapCon.mobsTimer[mob.SpawnLoc]; + stold.KillTime = dt.ToLongTimeString() + " " + dt.ToShortDateString(); TimeSpan Diff = new TimeSpan(0, 0, 0, Convert.ToInt32(stold.SpawnTimer)); @@ -3123,6 +3326,73 @@ StartListening(); } + + private void mnuCharRefresh_Click(object sender, System.EventArgs e) + { + colProcesses.Clear(); + mnuChar1.Visible = false; + mnuChar2.Visible = false; + mnuChar3.Visible = false; + mnuChar4.Visible = false; + if (RequestPending) + { + mbGetProcessInfo = true; + } + else + { + RequestPending = true; + byte[] requestdata = new byte[]{0x6}; + SendData(requestdata); + } + + } + + private void SwitchCharacter(int CharacterIndex) + { + if (colProcesses.Count>=CharacterIndex) + { + ProcessInfo PI = (ProcessInfo) colProcesses[CharacterIndex-1]; + + byte[] requestdata = new byte[5]; + requestdata[0] = 0x7; + //PI.hProcess + //BitConverter.ToDouble + byte[] proc = BitConverter.GetBytes(PI.ProcessID); + Array.Copy(proc,0,requestdata,1,4); + SendData(requestdata); + } + } + private void mnuChar1_Click(object sender, System.EventArgs e) + { + SwitchCharacter(1); + } + + private void mnuChar2_Click(object sender, System.EventArgs e) + { + SwitchCharacter(2); + } + + private void mnuChar3_Click(object sender, System.EventArgs e) + { + SwitchCharacter(3); + } + + private void mnuChar4_Click(object sender, System.EventArgs e) + { + SwitchCharacter(4); + } + + private void mnuChar5_Click(object sender, System.EventArgs e) + { + SwitchCharacter(5); + } + + private void mnuChar6_Click(object sender, System.EventArgs e) + { + SwitchCharacter(6); + } + + } } Index: Structures.cs =================================================================== RCS file: /cvsroot/seq/myseq/client/Structures.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Structures.cs 30 Sep 2004 18:53:06 -0000 1.2 +++ Structures.cs 30 Sep 2004 19:12:11 -0000 1.3 @@ -145,6 +145,8 @@ Target = 1, Zone = 4, GroundItem = 5, + GetProcessInfo = 6, + SetProcess = 7, Player = 253 } |
|
From: slartibartfast <sla...@us...> - 2004-09-30 19:01:22
|
Update of /cvsroot/seq/myseq/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31546 Added Files: myseqserver.ini Log Message: Offset File for 14 September 2004 Patch --- NEW FILE: myseqserver.ini --- [Memory Offsets] SpawnHeaderAddr=0x83A4E0 ItemsAddr=0x83A4E4 CharInfo=0x83A520 TargetAddr=0x83A524 ZoneAddr=0x7D7FA0 [SpawnInfo Offsets] NameOffset=0xe0 LastnameOffset=1 YOffset=0x2C XOffset=0x28 ZOffset=0x30 SpeedOffset=0x40 HeadingOffset=0x44 NextOffset=0x1cc TypeOffset=0x1fc LevelOffset=0x204 HideOffset=0x208 ClassOffset=0x20a SpawnIDOffset=0x210 RaceOffset=0x218 type2=0x228 [GroundItem Offsets] PrevOffset=0x00 NextOffset=0x04 SpawnIDOffset=0x08 ZOffset=0x20 XOffset=0x24 YOffset=0x28 NameOffset=0x2C [CharInfo Offsets] SpawnInfo=3608 |
|
From: slartibartfast <sla...@us...> - 2004-09-30 19:00:02
|
Update of /cvsroot/seq/myseq/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31123 Modified Files: myseqserverc.vcproj myseqserverc.cpp Added Files: ServerReleaseNotes.html myseqserverc.sln Removed Files: ServerRleaseNotes.html myseqserverc.ini Log Message: Update Sever Source to version 1.12 Index: myseqserverc.cpp =================================================================== RCS file: /cvsroot/seq/myseq/server/myseqserverc.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- myseqserverc.cpp 8 Nov 2003 13:52:23 -0000 1.10 +++ myseqserverc.cpp 30 Sep 2004 18:59:53 -0000 1.11 @@ -25,27 +25,21 @@ HANDLE eqprocess; +DWORD eqProcessID; +DWORD LastProcessID; // Offsets in the process -void *EQADDR_GROUPCOUNT = (void*)0; -void *EQADDR_GROUP = (void*)0; -void *EQADDR_SPAWNLIST = (void*)0; -void *EQADDR_ITEMS = (void*)0; [...1333 lines suppressed...] + int updatetime = 250; + + if (argc == 2) { + port = atoi(argv[2]); + + if (port == 0) + port = 5555; + } + + if (loadSettings("./myseqserver.ini")) { + SetDebugPriv(); + svrloop(port); + + } WSACleanup(); return 0; } + Index: myseqserverc.vcproj =================================================================== RCS file: /cvsroot/seq/myseq/server/myseqserverc.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- myseqserverc.vcproj 8 Nov 2003 13:52:23 -0000 1.2 +++ myseqserverc.vcproj 30 Sep 2004 18:59:53 -0000 1.3 @@ -13,7 +13,7 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="Debug" + OutputDirectory="./" IntermediateDirectory="Debug" ConfigurationType="1" CharacterSet="2"> @@ -62,7 +62,7 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="Release" + OutputDirectory="./" IntermediateDirectory="Release" ConfigurationType="1" CharacterSet="2"> --- ServerRleaseNotes.html DELETED --- --- myseqserverc.ini DELETED --- --- NEW FILE: myseqserverc.sln --- Microsoft Visual Studio Solution File, Format Version 8.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myseqserverc", "myseqserverc.vcproj", "{44303375-5350-4055-BFB7-B094374C8099}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug Release = Release EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {44303375-5350-4055-BFB7-B094374C8099}.Debug.ActiveCfg = Debug|Win32 {44303375-5350-4055-BFB7-B094374C8099}.Debug.Build.0 = Debug|Win32 {44303375-5350-4055-BFB7-B094374C8099}.Release.ActiveCfg = Release|Win32 {44303375-5350-4055-BFB7-B094374C8099}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection GlobalSection(ExtensibilityAddIns) = postSolution EndGlobalSection EndGlobal --- NEW FILE: ServerReleaseNotes.html --- <html> <head> <title>MySeq Client Release Notes</title> </head> <body bgcolor="#ffffff" text="#000000" link="#0000ff" alink="#800080" vlink="#ff0000"> <h1 align="center"><U>MYSEQ Server Release Notes</U></h1> <H2>Release Version 1.12</H2> <p> Dated 28 September 2004<OL> <LI> Added the ability to select which EQ Process to monitor when multi-boxing.</LI></OL> <p>Note: MySeq Client V1.16.2 or better is required to perform this action.</p> <H2> </H2> <H2>Release Version 1.11</H2> <p> Dated 26 November 2003 <OL> <LI> Changed the version number becuase there had been multiple versions of Server 1.9b which made it difficult to troubleshoot issues.</LI></OL> <br> <br> <H2>Release Version 1.9b</H2> <p> Dated 13 October 2003 <OL> <LI> Fixed problem with player level when riding a horse - (Added another level of indirection. CharInfoPtr->CharInfo Struct. CharInfo.SpawnInfoPtr->SpawnInfo Struct.)</LI></OL> </body> </html> |
