Menu
▾
▴
[Seq-cvs-commit] showeq/src everquest.h,1.81,1.82 map.cpp,1.41,1.42 map.h,1.21,1.22 mapicon.cpp,1.2,1.3 mapicon.h,1.2,1.3
|
From: Chad M. <cmm...@us...> - 2005-09-17 01:48:06
|
Update of /cvsroot/seq/showeq/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16030/src Modified Files: everquest.h map.cpp map.h mapicon.cpp mapicon.h Log Message: Updated version to 5.1.0.0. Found GM in spawnStruct. Implemented map option for current Zek PvP rules. Index: mapicon.h =================================================================== RCS file: /cvsroot/seq/showeq/src/mapicon.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mapicon.h 13 Sep 2005 15:23:12 -0000 1.2 +++ mapicon.h 17 Sep 2005 01:47:55 -0000 1.3 @@ -81,6 +81,8 @@ tIconTypeSpawnPlayerCorpse, tIconTypeSpawnUnknown, tIconTypeSpawnConsidered, + tIconTypeSpawnPlayerPvPEnabled, + tIconTypeSpawnPetPvPEnabled, tIconTypeSpawnPlayerTeamBase, tIconTypeSpawnPlayerTeam1 = tIconTypeSpawnPlayerTeamBase, tIconTypeSpawnPlayerTeam2, Index: mapicon.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/mapicon.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mapicon.cpp 13 Sep 2005 15:23:12 -0000 1.2 +++ mapicon.cpp 17 Sep 2005 01:47:55 -0000 1.3 @@ -59,6 +59,8 @@ "SpawnPlayerCorpse", "SpawnUnknown", "SpawnConsidered", + "SpawnPlayerPvPEnabled", + "SpawnPetPvPEnabled", "SpawnPlayerTeam1", "SpawnPlayerTeam2", "SpawnPlayerTeam3", @@ -95,6 +97,8 @@ "Spawn Player Corpse", "Spawn Unknown", "Spawn Considered", + "Spawn PvP Enabled Player", + "Spawn PvP Enabled Pet", "Spawn Player Team 1", "Spawn Player Team 2", "Spawn Player Team 3", @@ -597,6 +601,18 @@ .setHighlight(QBrush(NoBrush), QPen(red, 1, SolidLine, cap, join), tIconStyleSquare, tIconSizeLarge, true, false, false, false); + m_mapIcons[tIconTypeSpawnPlayerPvPEnabled] + .setHighlight(QBrush(NoBrush), QPen(red, 1, SolidLine, cap, join), + tIconStyleCircle, tIconSizeXLarge, + true, false, false, true); + m_mapIcons[tIconTypeSpawnPlayerPvPEnabled] + .setImage(QBrush(SolidPattern), QPen(magenta, 1, SolidLine, cap, join), + tIconStyleUpTriangle, tIconSizeRegular, + true, false, true, false); + m_mapIcons[tIconTypeSpawnPetPvPEnabled] + .setHighlight(QBrush(NoBrush), QPen(red, 1, SolidLine, cap, join), + tIconStyleCircle, tIconSizeXLarge, + true, false, false, true); m_mapIcons[tIconTypeSpawnPlayerTeam1] .setImage(QBrush(SolidPattern), QPen(magenta, 1, SolidLine, cap, join), tIconStyleUpTriangle, tIconSizeRegular, Index: map.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/map.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- map.cpp 13 Sep 2005 15:23:12 -0000 1.41 +++ map.cpp 17 Sep 2005 01:47:55 -0000 1.42 @@ -170,8 +170,8 @@ // MapLabel MapLabel::MapLabel( Map* map ) : QLabel(map, "mapLabel", - WStyle_Customize + WStyle_NoBorderEx + WStyle_Tool + WType_TopLevel - + WStyle_Dialog + WX11BypassWM) + WStyle_Customize + WStyle_NoBorderEx + WStyle_Tool + WType_TopLevel + + WStyle_Dialog + WX11BypassWM) { m_Map = map; setMargin( 1 ); @@ -227,8 +227,8 @@ [...1928 lines suppressed...] { mapMenu->setItemChecked(m_id_frameRate, m_frameRateBox->isVisible()); mapMenu->setItemChecked(m_id_pan, m_panBox->isVisible()); mapMenu->setItemChecked(m_id_depthControlRoom, - m_depthControlBox->isVisible()); + m_depthControlBox->isVisible()); } } @@ -4641,8 +4746,8 @@ // get new status font newFont = QFontDialog::getFont(&ok, - font(), - this, name); + font(), + this, name); // if the user clicked ok and selected a valid font, set it if (ok) Index: map.h =================================================================== RCS file: /cvsroot/seq/showeq/src/map.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- map.h 13 Sep 2005 15:23:12 -0000 1.21 +++ map.h 17 Sep 2005 01:47:55 -0000 1.22 @@ -240,6 +240,7 @@ void toggle_highlightConsideredSpawns(int itemId); void toggle_spawnNames(int itemId); void toggle_mapImage(int itemId); + void toggle_pvp(int itemId); void toggle_deityPvP(int itemId); void toggle_racePvP(int itemId); void toggle_walkPath(int itemId); @@ -305,6 +306,7 @@ int m_id_npcWalkPaths; int m_id_mapImage; int m_id_deityPvP; + int m_id_pvp; int m_id_racePvP; int m_id_zoneSafePoint; #ifdef DEBUG @@ -408,6 +410,7 @@ bool highlightConsideredSpawns() const { return m_highlightConsideredSpawns; } bool showTooltips() const { return m_showTooltips; } bool walkPathShowSelect() const { return m_walkpathshowselect; } + bool pvp() const { return m_pvp; } bool deityPvP() const { return m_deityPvP; } bool racePvP() const { return m_racePvP; } bool showZoneSafePoint() const { return m_showZoneSafePoint; } @@ -504,6 +507,7 @@ void setHighlightConsideredSpawns(bool val); void setShowTooltips(bool val); void setWalkPathShowSelect(bool val); + void setPvP(bool val); void setDeityPvP(bool val); void setRacePvP(bool val); @@ -643,6 +647,7 @@ bool m_highlightConsideredSpawns; bool m_showTooltips; bool m_walkpathshowselect; + bool m_pvp; bool m_deityPvP; bool m_racePvP; bool m_showZoneSafePoint; Index: everquest.h =================================================================== RCS file: /cvsroot/seq/showeq/src/everquest.h,v retrieving revision 1.81 retrieving revision 1.82 diff -u -d -r1.81 -r1.82 --- everquest.h 14 Sep 2005 04:15:03 -0000 1.81 +++ everquest.h 17 Sep 2005 01:47:55 -0000 1.82 @@ -883,8 +883,7 @@ /*0007*/ uint8_t eyecolor1; // Player's left eye color /*0008*/ uint8_t is_pet; // 0=no, 1=yes /*0009*/ uint32_t petOwnerId; // If this is a pet, the spawn id of owner -/*0013*/ uint8_t gm; // 0=no, 1=gm %%% Wrong but compile... -/*0014*/ uint8_t unknown0013[22]; +/*0013*/ uint8_t unknown0013[23]; /*0036*/ uint8_t afk; // 0=no, 1=afk /*0037*/ uint8_t eyecolor2; // Left eye color /*0038*/ uint8_t NPC; // 0=player,1=npc,2=pc corpse,3=npc corpse,a @@ -917,7 +916,9 @@ /*0157*/ uint8_t hairstyle; // Hair style /*0158*/ uint8_t unknown0157[6]; /*0164*/ int8_t guildrank; // 0=normal, 1=officer, 2=leader -/*0165*/ uint8_t unknown0165[10]; +/*0165*/ uint8_t unknown0165[4]; +/*0169*/ uint8_t gm; // 0=no, 1=gm +/*0170*/ uint8_t unknown0170[5]; union { /*0175*/ int8_t equip_chest2; // Second place in packet for chest texture (usually 0xFF in live packets) |
