Menu
▾
▴
[Seq-cvs-commit] showeq/src weapons29.h,NONE,1.1.2.1 weapons2a.h,NONE,1.1.2.1 everquest.h,1.74.6.20,1.74.6.21 itemdb.cpp,1.10.6.4,1.10.6.5 itemdbtool.cpp,1.11.6.4,1.11.6.5 messageshell.cpp,1.1.4.8,1.1.4.9 packet.cpp,1.62.6.7,1.62.6.8 packetcapture.cpp,1.2.4.3,1.2.4.4 spawn.cpp,1.31.6.2,1.31.6.3 spawnshell.cpp,1.42.6.5,1.42.6.6 weapons1.h,1.1.10.1,1.1.10.2 weapons27.h,1.4.10.1,1.4.10.2 weapons28.h,1.1.16.1,1.1.16.2 weapons2b.h,1.1.16.1,1.1.16.2 zones.h,1.7.16.5,1.7.16.6
Update of /cvsroot/seq/showeq/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28899/src Modified Files: Tag: pre_5_0_beta everquest.h itemdb.cpp itemdbtool.cpp messageshell.cpp packet.cpp packetcapture.cpp spawn.cpp spawnshell.cpp weapons1.h weapons27.h weapons28.h weapons2b.h zones.h Added Files: Tag: pre_5_0_beta weapons29.h weapons2a.h Log Message: Incorporate 5.0.0.19-purple2 patch. Index: packet.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/packet.cpp,v retrieving revision 1.62.6.7 retrieving revision 1.62.6.8 diff -u -d -r1.62.6.7 -r1.62.6.8 --- packet.cpp 7 Apr 2005 03:19:37 -0000 1.62.6.7 +++ packet.cpp 18 Apr 2005 03:16:22 -0000 1.62.6.8 @@ -752,7 +752,7 @@ { // reseting the pcap filter to a non-exclusive form allows us to beat // the race condition between timer and processing the zoneServerInfo - if(m_playbackPackets == PLAYBACK_OFF) + if(m_playbackPackets == PLAYBACK_OFF || m_playbackPackets == PLAYBACK_FORMAT_TCPDUMP) { m_packetCapture->setFilter(m_device, m_ip, m_realtime, IP_ADDRESS_TYPE, 0, 0); @@ -775,7 +775,8 @@ m_serverPort = serverPort; m_clientPort = clientPort; - if (m_playbackPackets == PLAYBACK_OFF) + if (m_playbackPackets == PLAYBACK_OFF || + m_playbackPackets == PLAYBACK_FORMAT_TCPDUMP) { if (m_mac.length() == 17) { @@ -977,7 +978,8 @@ resetEQPacket(); seqInfo("Listening for IP client: %s", (const char*)m_ip); - if (m_playbackPackets == PLAYBACK_OFF) + if (m_playbackPackets == PLAYBACK_OFF || + m_playbackPackets == PLAYBACK_FORMAT_TCPDUMP) { m_packetCapture->setFilter(m_device, m_ip, m_realtime, @@ -1002,7 +1004,8 @@ seqInfo("Listening for MAC client: %s", (const char*)m_mac); - if (m_playbackPackets == PLAYBACK_OFF) + if (m_playbackPackets == PLAYBACK_OFF || + m_playbackPackets == PLAYBACK_FORMAT_TCPDUMP) { m_packetCapture->setFilter(m_device, m_ip, m_realtime, @@ -1026,7 +1029,8 @@ seqInfo("Listening for next client seen. (you must zone for this to work!)"); - if (m_playbackPackets == PLAYBACK_OFF) + if (m_playbackPackets == PLAYBACK_OFF || + m_playbackPackets == PLAYBACK_FORMAT_TCPDUMP) { m_packetCapture->setFilter(m_device, NULL, m_realtime, --- NEW FILE: weapons2a.h --- /* * weapons2a.h * * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ #ifndef DOXYGEN_SHOULD_SKIP_THIS NULL, // 0x00 NULL, // 0x01 NULL, // 0x02 NULL, // 0x03 NULL, // 0x04 NULL, // 0x05 NULL, // 0x06 NULL, // 0x07 NULL, // 0x08 NULL, // 0x09 NULL, // 0x0a NULL, // 0x0b NULL, // 0x0c NULL, // 0x0d NULL, // 0x0e NULL, // 0x0f NULL, // 0x10 NULL, // 0x11 NULL, // 0x12 NULL, // 0x13 NULL, // 0x14 NULL, // 0x15 NULL, // 0x16 NULL, // 0x17 NULL, // 0x18 NULL, // 0x19 NULL, // 0x1a NULL, // 0x1b NULL, // 0x1c NULL, // 0x1d NULL, // 0x1e NULL, // 0x1f NULL, // 0x20 NULL, // 0x21 NULL, // 0x22 NULL, // 0x23 NULL, // 0x24 NULL, // 0x25 NULL, // 0x26 NULL, // 0x27 NULL, // 0x28 NULL, // 0x29 NULL, // 0x2a NULL, // 0x2b NULL, // 0x2c NULL, // 0x2d NULL, // 0x2e NULL, // 0x2f "PotteryWheel", // 0x30 "Kiln", // 0x31 "Loom", // 0x32 "Oven", // 0x33 "Forge", // 0x34 "BrewBarrel", // 0x35 NULL, // 0x36 NULL, // 0x37 NULL, // 0x38 NULL, // 0x39 NULL, // 0x3a NULL, // 0x3b NULL, // 0x3c NULL, // 0x3d NULL, // 0x3e NULL, // 0x3f NULL, // 0x40 NULL, // 0x41 NULL, // 0x42 NULL, // 0x43 NULL, // 0x44 NULL, // 0x45 NULL, // 0x46 NULL, // 0x47 NULL, // 0x48 NULL, // 0x49 NULL, // 0x4a NULL, // 0x4b NULL, // 0x4c NULL, // 0x4d NULL, // 0x4e NULL, // 0x4f NULL, // 0x50 NULL, // 0x51 NULL, // 0x52 NULL, // 0x53 NULL, // 0x54 NULL, // 0x55 NULL, // 0x56 NULL, // 0x57 NULL, // 0x58 NULL, // 0x59 NULL, // 0x5a NULL, // 0x5b NULL, // 0x5c NULL, // 0x5d NULL, // 0x5e NULL, // 0x5f NULL, // 0x60 NULL, // 0x61 NULL, // 0x62 NULL, // 0x63 NULL, // 0x64 NULL, // 0x65 NULL, // 0x66 NULL, // 0x67 NULL, // 0x68 NULL, // 0x69 NULL, // 0x6a NULL, // 0x6b NULL, // 0x6c NULL, // 0x6d NULL, // 0x6e NULL, // 0x6f NULL, // 0x70 NULL, // 0x71 NULL, // 0x72 NULL, // 0x73 NULL, // 0x74 NULL, // 0x75 NULL, // 0x76 NULL, // 0x77 NULL, // 0x78 NULL, // 0x79 NULL, // 0x7a NULL, // 0x7b NULL, // 0x7c NULL, // 0x7d NULL, // 0x7e NULL, // 0x7f NULL, // 0x80 NULL, // 0x81 NULL, // 0x82 NULL, // 0x83 NULL, // 0x84 NULL, // 0x85 NULL, // 0x86 NULL, // 0x87 NULL, // 0x88 NULL, // 0x89 NULL, // 0x8a NULL, // 0x8b NULL, // 0x8c NULL, // 0x8d NULL, // 0x8e NULL, // 0x8f NULL, // 0x90 NULL, // 0x91 NULL, // 0x92 NULL, // 0x93 NULL, // 0x94 NULL, // 0x95 NULL, // 0x96 NULL, // 0x97 NULL, // 0x98 NULL, // 0x99 NULL, // 0x9a NULL, // 0x9b NULL, // 0x9c NULL, // 0x9d NULL, // 0x9e NULL, // 0x9f NULL, // 0xa0 NULL, // 0xa1 NULL, // 0xa2 NULL, // 0xa3 NULL, // 0xa4 NULL, // 0xa5 NULL, // 0xa6 NULL, // 0xa7 NULL, // 0xa8 NULL, // 0xa9 NULL, // 0xaa NULL, // 0xab NULL, // 0xac NULL, // 0xad NULL, // 0xae NULL, // 0xaf NULL, // 0xb0 NULL, // 0xb1 NULL, // 0xb2 NULL, // 0xb3 NULL, // 0xb4 NULL, // 0xb5 NULL, // 0xb6 NULL, // 0xb7 NULL, // 0xb8 NULL, // 0xb9 NULL, // 0xba NULL, // 0xbb NULL, // 0xbc NULL, // 0xbd NULL, // 0xbe NULL, // 0xbf NULL, // 0xc0 NULL, // 0xc1 NULL, // 0xc2 NULL, // 0xc3 NULL, // 0xc4 NULL, // 0xc5 NULL, // 0xc6 NULL, // 0xc7 NULL, // 0xc8 NULL, // 0xc9 NULL, // 0xca NULL, // 0xcb NULL, // 0xcc NULL, // 0xcd NULL, // 0xce NULL, // 0xcf NULL, // 0xd0 NULL, // 0xd1 NULL, // 0xd2 NULL, // 0xd3 NULL, // 0xd4 NULL, // 0xd5 NULL, // 0xd6 NULL, // 0xd7 NULL, // 0xd8 NULL, // 0xd9 NULL, // 0xda NULL, // 0xdb NULL, // 0xdc NULL, // 0xdd NULL, // 0xde NULL, // 0xdf NULL, // 0xe0 NULL, // 0xe1 NULL, // 0xe2 NULL, // 0xe3 NULL, // 0xe4 NULL, // 0xe5 NULL, // 0xe6 NULL, // 0xe7 NULL, // 0xe8 NULL, // 0xe9 NULL, // 0xea NULL, // 0xeb NULL, // 0xec NULL, // 0xed NULL, // 0xee NULL, // 0xef NULL, // 0xf0 NULL, // 0xf1 NULL, // 0xf2 NULL, // 0xf3 NULL, // 0xf4 NULL, // 0xf5 NULL, // 0xf6 NULL, // 0xf7 NULL, // 0xf8 NULL, // 0xf9 NULL, // 0xfa NULL, // 0xfb NULL, // 0xfc NULL, // 0xfd NULL, // 0xfe NULL, // 0xff #endif /* DOXYGEN_SHOULD_SKIP_THIS */ Index: packetcapture.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/packetcapture.cpp,v retrieving revision 1.2.4.3 retrieving revision 1.2.4.4 diff -u -d -r1.2.4.3 -r1.2.4.4 --- packetcapture.cpp 7 Apr 2005 03:19:37 -0000 1.2.4.3 +++ packetcapture.cpp 18 Apr 2005 03:16:23 -0000 1.2.4.4 @@ -383,6 +383,8 @@ exit (0); } + seqDebug("PCAP Filter Set: %s", filter_buf); + if (realtime) { memset (&sp, 0, sizeof (sp)); Index: weapons28.h =================================================================== RCS file: /cvsroot/seq/showeq/src/weapons28.h,v retrieving revision 1.1.16.1 retrieving revision 1.1.16.2 diff -u -d -r1.1.16.1 -r1.1.16.2 --- weapons28.h 7 Nov 2004 23:10:26 -0000 1.1.16.1 +++ weapons28.h 18 Apr 2005 03:16:23 -0000 1.1.16.2 @@ -167,22 +167,6 @@ NULL, // 0x9d NULL, // 0x9e NULL, // 0x9f - NULL, // 0x90 - NULL, // 0x91 - NULL, // 0x92 - NULL, // 0x93 - NULL, // 0x94 - NULL, // 0x95 - NULL, // 0x96 - NULL, // 0x97 - NULL, // 0x98 - NULL, // 0x99 - NULL, // 0x9a - NULL, // 0x9b - NULL, // 0x9c - NULL, // 0x9d - NULL, // 0x9e - NULL, // 0x9f NULL, // 0xa0 NULL, // 0xa1 NULL, // 0xa2 Index: spawn.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spawn.cpp,v retrieving revision 1.31.6.2 retrieving revision 1.31.6.3 diff -u -d -r1.31.6.2 -r1.31.6.3 --- spawn.cpp 16 Jan 2004 20:22:11 -0000 1.31.6.2 +++ spawn.cpp 18 Apr 2005 03:16:23 -0000 1.31.6.3 @@ -72,6 +72,18 @@ #include "weapons28.h" }; + // sparse array of item names (in 0x29 range), some are NULL + static const char* itemnames29[] = + { +#include "weapons29.h" + }; + + // sparse array of item names (in 0x2a range), some are NULL + static const char* itemnames2a[] = + { +#include "weapons2a.h" + }; + // sparse array of item names (in 0x2b range), some are NULL static const char* itemnames2b[] = { @@ -108,6 +120,18 @@ if (itemLo < (sizeof(itemnames28) / sizeof (char*))) itemStr = itemnames28[itemLo]; } + else if (itemHi == 0x29) + { + // retrieve pointer to item name + if (itemLo < (sizeof(itemnames29) / sizeof (char*))) + itemStr = itemnames29[itemLo]; + } + else if (itemHi == 0x2a) + { + // retrieve pointer to item name + if (itemLo < (sizeof(itemnames2a) / sizeof (char*))) + itemStr = itemnames2a[itemLo]; + } else if (itemHi == 0x2b) { // retrieve pointer to item name Index: weapons27.h =================================================================== RCS file: /cvsroot/seq/showeq/src/weapons27.h,v retrieving revision 1.4.10.1 retrieving revision 1.4.10.2 diff -u -d -r1.4.10.1 -r1.4.10.2 --- weapons27.h 7 Nov 2004 23:10:26 -0000 1.4.10.1 +++ weapons27.h 18 Apr 2005 03:16:23 -0000 1.4.10.2 @@ -167,22 +167,6 @@ NULL, // 0x9d NULL, // 0x9e NULL, // 0x9f - NULL, // 0x90 - NULL, // 0x91 - NULL, // 0x92 - NULL, // 0x93 - NULL, // 0x94 - NULL, // 0x95 - NULL, // 0x96 - NULL, // 0x97 - NULL, // 0x98 - NULL, // 0x99 - NULL, // 0x9a - NULL, // 0x9b - NULL, // 0x9c - NULL, // 0x9d - NULL, // 0x9e - NULL, // 0x9f NULL, // 0xa0 NULL, // 0xa1 NULL, // 0xa2 Index: messageshell.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/messageshell.cpp,v retrieving revision 1.1.4.8 retrieving revision 1.1.4.9 diff -u -d -r1.1.4.8 -r1.1.4.9 --- messageshell.cpp 7 Apr 2005 03:19:36 -0000 1.1.4.8 +++ messageshell.cpp 18 Apr 2005 03:16:22 -0000 1.1.4.9 @@ -689,8 +689,8 @@ const charProfileStruct* player = (const charProfileStruct*)data; QString message; - message.sprintf("Name: '%s' Last: '%s'", - player->name, player->lastName); + message.sprintf("Name: '%s' Last: '%s' Title: '%s' Suffix: '%s'", + player->name, player->lastName, player->title, player->suffix); m_messages->addMessage(MT_Player, message); message.sprintf("Level: %d", player->level); @@ -715,14 +715,25 @@ player->platinum_shared); m_messages->addMessage(MT_Player, message); + message.sprintf("DoN Crystals: Radiant=%d Ebon=%d", + player->currentRadCrystals, player->currentEbonCrystals); + m_messages->addMessage(MT_Player, message); + message = "Exp: " + Commanate(player->exp); m_messages->addMessage(MT_Player, message); message = "ExpAA: " + Commanate(player->expAA) + - "(aa spent: " + Commanate(player->aa_spent) + + " (aa spent: " + Commanate(player->aa_spent) + ", aa unspent: " + Commanate(player->aa_unspent) + ")"; m_messages->addMessage(MT_Player, message); + message.sprintf("GroupLeadAA: %.1f%% (unspent: %d)", + (player->expGroupLeadAA)/10.0, player->groupLeadAAUnspent); + m_messages->addMessage(MT_Player, message); + message.sprintf("RaidLeadAA: %.1f%% (unspent: %d)", + (player->expRaidLeadAA)/20.0, player->raidLeadAAUnspent); + m_messages->addMessage(MT_Player, message); + message.sprintf("Group: %s %s %s %s %s %s", player->groupMembers[0], player->groupMembers[1], player->groupMembers[2], --- NEW FILE: weapons29.h --- /* * weapons29.h * * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ #ifndef DOXYGEN_SHOULD_SKIP_THIS NULL, // 0x00 NULL, // 0x01 NULL, // 0x02 NULL, // 0x03 NULL, // 0x04 NULL, // 0x05 NULL, // 0x06 NULL, // 0x07 NULL, // 0x08 NULL, // 0x09 NULL, // 0x0a NULL, // 0x0b NULL, // 0x0c NULL, // 0x0d NULL, // 0x0e NULL, // 0x0f NULL, // 0x10 NULL, // 0x11 NULL, // 0x12 NULL, // 0x13 NULL, // 0x14 NULL, // 0x15 NULL, // 0x16 NULL, // 0x17 NULL, // 0x18 NULL, // 0x19 NULL, // 0x1a NULL, // 0x1b NULL, // 0x1c NULL, // 0x1d NULL, // 0x1e NULL, // 0x1f NULL, // 0x20 NULL, // 0x21 NULL, // 0x22 NULL, // 0x23 NULL, // 0x24 NULL, // 0x25 NULL, // 0x26 NULL, // 0x27 NULL, // 0x28 NULL, // 0x29 NULL, // 0x2a NULL, // 0x2b NULL, // 0x2c NULL, // 0x2d NULL, // 0x2e NULL, // 0x2f NULL, // 0x30 NULL, // 0x31 NULL, // 0x32 NULL, // 0x33 NULL, // 0x34 NULL, // 0x35 NULL, // 0x36 NULL, // 0x37 NULL, // 0x38 NULL, // 0x39 NULL, // 0x3a NULL, // 0x3b NULL, // 0x3c NULL, // 0x3d NULL, // 0x3e NULL, // 0x3f NULL, // 0x40 NULL, // 0x41 NULL, // 0x42 NULL, // 0x43 NULL, // 0x44 NULL, // 0x45 NULL, // 0x46 NULL, // 0x47 NULL, // 0x48 NULL, // 0x49 NULL, // 0x4a NULL, // 0x4b NULL, // 0x4c NULL, // 0x4d NULL, // 0x4e NULL, // 0x4f NULL, // 0x50 NULL, // 0x51 NULL, // 0x52 NULL, // 0x53 NULL, // 0x54 NULL, // 0x55 NULL, // 0x56 NULL, // 0x57 NULL, // 0x58 NULL, // 0x59 NULL, // 0x5a NULL, // 0x5b NULL, // 0x5c NULL, // 0x5d NULL, // 0x5e NULL, // 0x5f NULL, // 0x60 NULL, // 0x61 NULL, // 0x62 NULL, // 0x63 NULL, // 0x64 NULL, // 0x65 NULL, // 0x66 NULL, // 0x67 NULL, // 0x68 NULL, // 0x69 NULL, // 0x6a NULL, // 0x6b NULL, // 0x6c NULL, // 0x6d NULL, // 0x6e NULL, // 0x6f NULL, // 0x70 NULL, // 0x71 NULL, // 0x72 NULL, // 0x73 NULL, // 0x74 NULL, // 0x75 NULL, // 0x76 NULL, // 0x77 NULL, // 0x78 NULL, // 0x79 NULL, // 0x7a NULL, // 0x7b NULL, // 0x7c NULL, // 0x7d NULL, // 0x7e NULL, // 0x7f NULL, // 0x80 NULL, // 0x81 NULL, // 0x82 NULL, // 0x83 NULL, // 0x84 NULL, // 0x85 NULL, // 0x86 NULL, // 0x87 NULL, // 0x88 NULL, // 0x89 NULL, // 0x8a NULL, // 0x8b NULL, // 0x8c NULL, // 0x8d NULL, // 0x8e NULL, // 0x8f NULL, // 0x90 NULL, // 0x91 NULL, // 0x92 NULL, // 0x93 NULL, // 0x94 NULL, // 0x95 NULL, // 0x96 NULL, // 0x97 NULL, // 0x98 NULL, // 0x99 NULL, // 0x9a NULL, // 0x9b NULL, // 0x9c NULL, // 0x9d NULL, // 0x9e NULL, // 0x9f NULL, // 0xa0 NULL, // 0xa1 NULL, // 0xa2 NULL, // 0xa3 NULL, // 0xa4 NULL, // 0xa5 NULL, // 0xa6 NULL, // 0xa7 NULL, // 0xa8 NULL, // 0xa9 NULL, // 0xaa NULL, // 0xab NULL, // 0xac NULL, // 0xad NULL, // 0xae NULL, // 0xaf NULL, // 0xb0 NULL, // 0xb1 NULL, // 0xb2 NULL, // 0xb3 NULL, // 0xb4 NULL, // 0xb5 NULL, // 0xb6 NULL, // 0xb7 NULL, // 0xb8 NULL, // 0xb9 NULL, // 0xba NULL, // 0xbb NULL, // 0xbc NULL, // 0xbd NULL, // 0xbe NULL, // 0xbf NULL, // 0xc0 NULL, // 0xc1 NULL, // 0xc2 NULL, // 0xc3 NULL, // 0xc4 NULL, // 0xc5 NULL, // 0xc6 NULL, // 0xc7 NULL, // 0xc8 NULL, // 0xc9 NULL, // 0xca NULL, // 0xcb NULL, // 0xcc NULL, // 0xcd NULL, // 0xce NULL, // 0xcf NULL, // 0xd0 NULL, // 0xd1 NULL, // 0xd2 NULL, // 0xd3 NULL, // 0xd4 NULL, // 0xd5 NULL, // 0xd6 NULL, // 0xd7 NULL, // 0xd8 NULL, // 0xd9 "AugmentSealer", // 0xda NULL, // 0xdb NULL, // 0xdc NULL, // 0xdd NULL, // 0xde NULL, // 0xdf NULL, // 0xe0 NULL, // 0xe1 NULL, // 0xe2 NULL, // 0xe3 NULL, // 0xe4 NULL, // 0xe5 NULL, // 0xe6 NULL, // 0xe7 NULL, // 0xe8 NULL, // 0xe9 NULL, // 0xea NULL, // 0xeb NULL, // 0xec NULL, // 0xed NULL, // 0xee NULL, // 0xef NULL, // 0xf0 NULL, // 0xf1 NULL, // 0xf2 NULL, // 0xf3 NULL, // 0xf4 NULL, // 0xf5 NULL, // 0xf6 NULL, // 0xf7 NULL, // 0xf8 NULL, // 0xf9 NULL, // 0xfa NULL, // 0xfb NULL, // 0xfc NULL, // 0xfd NULL, // 0xfe NULL, // 0xff #endif /* DOXYGEN_SHOULD_SKIP_THIS */ Index: weapons2b.h =================================================================== RCS file: /cvsroot/seq/showeq/src/weapons2b.h,v retrieving revision 1.1.16.1 retrieving revision 1.1.16.2 diff -u -d -r1.1.16.1 -r1.1.16.2 --- weapons2b.h 7 Nov 2004 23:10:27 -0000 1.1.16.1 +++ weapons2b.h 18 Apr 2005 03:16:23 -0000 1.1.16.2 @@ -167,22 +167,6 @@ NULL, // 0x9d NULL, // 0x9e NULL, // 0x9f - NULL, // 0x90 - NULL, // 0x91 - NULL, // 0x92 - NULL, // 0x93 - NULL, // 0x94 - NULL, // 0x95 - NULL, // 0x96 - NULL, // 0x97 - NULL, // 0x98 - NULL, // 0x99 - NULL, // 0x9a - NULL, // 0x9b - NULL, // 0x9c - NULL, // 0x9d - NULL, // 0x9e - NULL, // 0x9f NULL, // 0xa0 NULL, // 0xa1 NULL, // 0xa2 Index: weapons1.h =================================================================== RCS file: /cvsroot/seq/showeq/src/weapons1.h,v retrieving revision 1.1.10.1 retrieving revision 1.1.10.2 diff -u -d -r1.1.10.1 -r1.1.10.2 --- weapons1.h 7 Nov 2004 23:10:26 -0000 1.1.10.1 +++ weapons1.h 18 Apr 2005 03:16:23 -0000 1.1.10.2 @@ -167,22 +167,6 @@ NULL, // 0x9d NULL, // 0x9e NULL, // 0x9f - NULL, // 0x90 - NULL, // 0x91 - NULL, // 0x92 - NULL, // 0x93 - NULL, // 0x94 - NULL, // 0x95 - NULL, // 0x96 - NULL, // 0x97 - NULL, // 0x98 - NULL, // 0x99 - NULL, // 0x9a - NULL, // 0x9b - NULL, // 0x9c - NULL, // 0x9d - NULL, // 0x9e - NULL, // 0x9f NULL, // 0xa0 NULL, // 0xa1 NULL, // 0xa2 Index: spawnshell.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spawnshell.cpp,v retrieving revision 1.42.6.5 retrieving revision 1.42.6.6 diff -u -d -r1.42.6.5 -r1.42.6.6 --- spawnshell.cpp 7 Apr 2005 03:19:37 -0000 1.42.6.5 +++ spawnshell.cpp 18 Apr 2005 03:16:23 -0000 1.42.6.6 @@ -653,6 +653,14 @@ if (renameMe != NULL) { renameMe->setName(rename->new_name); + + uint32_t changeType = tSpawnChangedName; + + if (updateFilterFlags(renameMe)) + changeType |= tSpawnChangedFilter; + if (updateRuntimeFilterFlags(renameMe)) + changeType |= tSpawnChangedRuntimeFilter; + renameMe->updateLastChanged(); emit changeItem(renameMe, tSpawnChangedName); } Index: zones.h =================================================================== RCS file: /cvsroot/seq/showeq/src/zones.h,v retrieving revision 1.7.16.5 retrieving revision 1.7.16.6 diff -u -d -r1.7.16.5 -r1.7.16.6 --- zones.h 7 Apr 2005 03:19:37 -0000 1.7.16.5 +++ zones.h 18 Apr 2005 03:16:23 -0000 1.7.16.6 @@ -195,8 +195,8 @@ { "load2", "Loading" }, // 185 { "hateplaneb", "The Plane of Hate" }, // 186 { "shadowrest", "Shadowrest" }, // 187 -{ NULL, NULL }, // 188 -{ NULL, NULL }, // 189 +{ "tutoriala", "The Mines of Gloomingdeep" }, // 188 +{ "tutorialb", "The Mines of Gloomingdeep" }, // 189 { NULL, NULL }, // 190 { NULL, NULL }, // 191 { NULL, NULL }, // 192 Index: everquest.h =================================================================== RCS file: /cvsroot/seq/showeq/src/everquest.h,v retrieving revision 1.74.6.20 retrieving revision 1.74.6.21 diff -u -d -r1.74.6.20 -r1.74.6.21 --- everquest.h 7 Apr 2005 03:19:34 -0000 1.74.6.20 +++ everquest.h 18 Apr 2005 03:16:14 -0000 1.74.6.21 @@ -102,6 +102,7 @@ //Maximum limits of certain types of data #define MAX_KNOWN_SKILLS 75 +#define MAX_SPELL_SLOTS 9 #define MAX_KNOWN_LANGS 25 #define MAX_SPELLBOOK_SLOTS 400 #define MAX_GROUP_MEMBERS 6 @@ -266,6 +267,46 @@ GUA_Started = 9, }; +/** + * Leadership AAs enum, used to index into leadershipAAs in charProfileStruct + */ +enum LeadershipAAIndex +{ + groupMarkNPC = 0, + groupNPCHealth, + groupDelegateMainAssist, + groupDelegateMarkNPC, + groupUnknown4, + groupUnknown5, + groupInspectBuffs, + groupUnknown7, + groupSpellAwareness, + groupOffenseEnhancement, + groupManaEnhancement, + groupHealthEnhancement, + groupHealthRegeneration, + groupFindPathToPC, + groupHealthOfTargetsTarget, + groupUnknown15, + raidMarkNPC, //0x10 + raidNPCHealth, + raidDelegateMainAssist, + raidDelegateMarkNPC, + raidUnknown4, + raidUnknown5, + raidUnknown6, + raidSpellAwareness, + raidOffenseEnhancement, + raidManaEnhancement, + raidHealthEnhancement, + raidHealthRegeneration, + raidFindPathToPC, + raidHealthOfTargetsTarget, + raidUnknown14, + raidUnknown15, + MAX_LEAD_AA //=32 +}; + /* ** Compiler override to ensure @@ -610,7 +651,10 @@ /*0242*/ uint8_t anon; // 2=roleplay, 1=anon, 0=not anon /*0243*/ uint8_t gm; // 0=no, 1=yes /*0244*/ int8_t guildstatus; // 0=member, 1=officer, 2=guildleader -/*0245*/ uint8_t unknown0245[55]; // *** Placeholder +/*0245*/ uint8_t unknown0245[7]; // *** Placeholder +/*0252*/ uint32_t intoxication; // Alcohol level (in ticks till sober?) +/*0256*/ uint32_t spellSlotRefresh[MAX_SPELL_SLOTS]; // Refresh time (millis) +/*0292*/ uint8_t unknown0292[8]; // *** Placeholder /*0300*/ uint8_t haircolor; // Player hair color /*0301*/ uint8_t beardcolor; // Player beard color /*0302*/ uint8_t eyecolor1; // Player left eye color @@ -623,7 +667,9 @@ /*0396*/ Color_Struct item_tint[9]; // RR GG BB 00 /*0432*/ AA_Array aa_array[MAX_AA]; // AAs /*1392*/ char servername[32]; // server the char was created on -/*1424*/ uint8_t unknown1452[68]; // *** Placeholder +/*1424*/ char title[32]; // Current character title +/*1456*/ char suffix[32]; // Current character suffix +/*1488*/ uint8_t unknown1452[4]; // *** Placeholder /*1492*/ uint32_t exp; // Current Experience /*1496*/ uint32_t unknown1496; // *** Placeholder /*1500*/ uint32_t points; // Unspent Practice points @@ -643,7 +689,7 @@ /*1617*/ uint8_t unknown1617[7]; // All 0x00 (language buffer?) /*1624*/ int32_t sSpellBook[400]; // List of the Spells in spellbook /*3224*/ uint8_t unknown3224[448]; // all 0xff after last spell -/*3672*/ int32_t sMemSpells[9]; // List of spells memorized +/*3672*/ int32_t sMemSpells[MAX_SPELL_SLOTS]; // List of spells memorized /*3708*/ uint8_t unknown3708[32]; // *** Placeholder /*3740*/ float x; // Players x position /*3744*/ float y; // Players y position @@ -665,11 +711,14 @@ /*3808*/ uint32_t platinum_shared; // Shared platinum pieces /*3812*/ uint8_t unknown3812[20]; // Unknown - all zero /*3832*/ uint32_t skills[75]; // List of skills (MAX_KNOWN_SKILLS) -/*4132*/ uint8_t unknown4132[348]; // *** Placeholder -/*4480*/ uint32_t expAA; // Current AA experience -/*4484*/ uint8_t unknown4484[4]; // *** Placeholder +/*4132*/ uint8_t unknown4132[312]; // *** Placeholder +/*4444*/ uint32_t autosplit; // 0 = off, 1 = on +/*4448*/ uint8_t unknown4448[8]; // *** Placeholder +/*4456*/ uint32_t zoneCounter; // No idea. Goes up by 2 each zone. +/*4460*/ uint8_t unknown4460[28]; // *** Placeholder /*4488*/ uint32_t expansions; // Bitmask for expansions -/*4492*/ uint8_t unknown4492[20]; // *** Placeholder +/*4492*/ uint32_t toxicity; // Potion Toxicity (15=too toxic, each potion adds 3) +/*4496*/ uint8_t unknown4496[16]; // *** Placeholder /*4512*/ uint32_t hunger; // Food (ticks till next eat) /*4516*/ uint32_t thirst; // Drink (ticks till next drink) /*4520*/ uint8_t unknown4520[20]; // *** Placeholder @@ -696,11 +745,16 @@ /*6200*/ uint32_t disciplines[MAX_DISCIPLINES]; // Known disciplines /*6400*/ uint8_t unknown6400[440]; // *** Placeholder /*6840*/ uint32_t endurance; // Current endurance -/*6844*/ uint8_t unknown6844[276]; // *** Placeholder +/*6844*/ uint32_t expGroupLeadAA; // Current group lead AA exp (0-1000) +/*6848*/ uint32_t expRaidLeadAA; // Current raid lead AA exp (0-2000) +/*6852*/ uint32_t groupLeadAAUnspent; // Unspent group lead AA points +/*6856*/ uint32_t raidLeadAAUnspent; // Unspent raid lead AA points +/*6860*/ uint32_t leadershipAAs[MAX_LEAD_AA]; // Leader AA ranks +/*6988*/ uint8_t unknown6988[132]; // *** Placeholder /*7120*/ uint32_t airRemaining; // Air supply (seconds) -/*7124*/ uint8_t unknown7124[4608]; // *** Placeholder +/*7124*/ uint8_t unknown7274[4608]; // *** Placeholder /*11732*/ uint32_t aa_spent; // Number of spent AA points -/*11736*/ uint32_t unknown11736; // *** Placeholder +/*11736*/ uint32_t expAA; // Exp earned in current AA point /*11740*/ uint32_t aa_unspent; // Unspent AA points /*11744*/ uint8_t unknown11744[36]; // *** Placeholder /*11780*/ BandolierStruct bandoliers[MAX_BANDOLIERS]; // bandolier contents @@ -1724,16 +1778,16 @@ /* ** NPC Hp Update -** Length: 6 Octets +** Length: 10 Octets ** Opcode NpcHpUpdateCode */ struct hpNpcUpdateStruct { -/*0000*/ uint16_t spawnId; -/*0002*/ int16_t maxHP; -/*0004*/ int16_t curHP; -/*0006*/ +/*0000*/ int32_t curHP; +/*0004*/ int32_t maxHP; +/*0008*/ uint16_t spawnId; +/*0010*/ }; /* |
