Menu
▾
▴
[Seq-cvs-commit] SF.net SVN: seq:[709] showeq/trunk
|
From: <iea...@us...> - 2008-09-16 18:09:59
|
Revision: 709
http://seq.svn.sourceforge.net/seq/?rev=709&view=rev
Author: ieatacid
Date: 2008-09-17 01:09:55 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
ieatacid (9/16/08)
----------------
- Updated version to 5.12.5.1
- Fixed problem with your player remaining a corpse after respawning in the same zone you died in
- Added zones from the upcoming Seeds of Destruction expansion to zones.h
- Fixed pcap_perror warnings in packetcapture.cpp
Modified Paths:
--------------
showeq/trunk/ChangeLog
showeq/trunk/conf/zoneopcodes.xml
showeq/trunk/configure.in
showeq/trunk/src/interface.cpp
showeq/trunk/src/packetcapture.cpp
showeq/trunk/src/player.cpp
showeq/trunk/src/player.h
showeq/trunk/src/spawnshell.cpp
showeq/trunk/src/spawnshell.h
showeq/trunk/src/zones.h
Modified: showeq/trunk/ChangeLog
===================================================================
--- showeq/trunk/ChangeLog 2008-09-09 01:25:14 UTC (rev 708)
+++ showeq/trunk/ChangeLog 2008-09-17 01:09:55 UTC (rev 709)
@@ -1,6 +1,12 @@
-Version: $Id$ $Name$
+ieatacid (9/16/08)
+----------------
+- Updated version to 5.12.5.1
+- Fixed problem with your player remaining a corpse after respawning in the same zone you died in
+- Added zones from the upcoming Seeds of Destruction expansion to zones.h
+- Fixed pcap_perror warnings in packetcapture.cpp
ieatacid (9/8/08)
+----------------
- Updated version to 5.12.5.0
- Updated/added opcodes where necessary
- Updated/added/removed code to handle how group member data is sent now
Modified: showeq/trunk/conf/zoneopcodes.xml
===================================================================
--- showeq/trunk/conf/zoneopcodes.xml 2008-09-09 01:25:14 UTC (rev 708)
+++ showeq/trunk/conf/zoneopcodes.xml 2008-09-17 01:09:55 UTC (rev 709)
@@ -83,7 +83,7 @@
</opcode>
<opcode id="72ad" name="OP_RespawnFromHover" updated="01/17/08">
<comment>Server telling client that it is coming back from hover death</comment>
- <payload dir="server" typename="uint8_t" sizechecktype="none"/>
+ <payload dir="both" typename="uint8_t" sizechecktype="none"/>
</opcode>
<opcode id="231F" name="OP_WearChange" updated="01/17/08">
<comment>old SpawnUpdateCode</comment>
Modified: showeq/trunk/configure.in
===================================================================
--- showeq/trunk/configure.in 2008-09-09 01:25:14 UTC (rev 708)
+++ showeq/trunk/configure.in 2008-09-17 01:09:55 UTC (rev 709)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 5.12.5.0)
+AC_INIT(showeq, 5.12.5.1)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CANONICAL_SYSTEM
Modified: showeq/trunk/src/interface.cpp
===================================================================
--- showeq/trunk/src/interface.cpp 2008-09-09 01:25:14 UTC (rev 708)
+++ showeq/trunk/src/interface.cpp 2008-09-17 01:09:55 UTC (rev 709)
@@ -1976,12 +1976,12 @@
m_packet->connect2("OP_Death", SP_Zone, DIR_Server,
"newCorpseStruct", SZC_Match,
m_spawnShell, SLOT(killSpawn(const uint8_t*)));
- m_packet->connect2("OP_RespawnFromHover", SP_Zone, DIR_Server,
+ m_packet->connect2("OP_RespawnFromHover", SP_Zone, DIR_Server|DIR_Client,
"uint8_t", SZC_None,
- m_spawnShell, SLOT(respawnFromHover(const uint8_t*)));
+ m_spawnShell, SLOT(respawnFromHover(const uint8_t*, size_t, uint8_t)));
m_packet->connect2("OP_Shroud", SP_Zone, DIR_Server,
- "spawnShroudSelf", SZC_None,
- m_spawnShell, SLOT(shroudSpawn(const uint8_t*, size_t, uint8_t)));
+ "spawnShroudSelf", SZC_None,
+ m_spawnShell, SLOT(shroudSpawn(const uint8_t*, size_t, uint8_t)));
m_packet->connect2("OP_RemoveSpawn", SP_Zone, DIR_Server|DIR_Client,
"removeSpawnStruct", SZC_None,
m_spawnShell, SLOT(removeSpawn(const uint8_t*, size_t, uint8_t)));
Modified: showeq/trunk/src/packetcapture.cpp
===================================================================
--- showeq/trunk/src/packetcapture.cpp 2008-09-09 01:25:14 UTC (rev 708)
+++ showeq/trunk/src/packetcapture.cpp 2008-09-17 01:09:55 UTC (rev 709)
@@ -173,13 +173,13 @@
if (pcap_compile(m_pcache_pcap, &bpp, filter_buf, 1, net) == -1)
{
- pcap_perror (m_pcache_pcap, "pcap_error:pcap_compile");
+ pcap_perror (m_pcache_pcap, (char*)"pcap_error:pcap_compile");
exit(0);
}
if (pcap_setfilter (m_pcache_pcap, &bpp) == -1)
{
- pcap_perror (m_pcache_pcap, "pcap_error:pcap_setfilter");
+ pcap_perror (m_pcache_pcap, (char*)"pcap_error:pcap_setfilter");
exit(0);
}
@@ -483,13 +483,13 @@
if (pcap_compile (m_pcache_pcap, &bpp, filter_buf, 1, net) == -1)
{
seqWarn("%s",filter_buf);
- pcap_perror(m_pcache_pcap, "pcap_error:pcap_compile_error");
+ pcap_perror(m_pcache_pcap, (char*)"pcap_error:pcap_compile_error");
exit(0);
}
if (pcap_setfilter (m_pcache_pcap, &bpp) == -1)
{
- pcap_perror(m_pcache_pcap, "pcap_error:pcap_setfilter_error");
+ pcap_perror(m_pcache_pcap, (char*)"pcap_error:pcap_setfilter_error");
exit (0);
}
Modified: showeq/trunk/src/player.cpp
===================================================================
--- showeq/trunk/src/player.cpp 2008-09-09 01:25:14 UTC (rev 708)
+++ showeq/trunk/src/player.cpp 2008-09-17 01:09:55 UTC (rev 709)
@@ -23,7 +23,7 @@
#include <qdatastream.h>
-#define DEBUG_PLAYER
+// #define DEBUG_PLAYER
//----------------------------------------------------------------------
// constants
@@ -348,6 +348,7 @@
setTypeflag(1);
Spawn::setName(player->name);
+ setRealName(player->name);
// if it's got a last name add it
setLastName(player->lastName);
Modified: showeq/trunk/src/player.h
===================================================================
--- showeq/trunk/src/player.h 2008-09-09 01:25:14 UTC (rev 708)
+++ showeq/trunk/src/player.h 2008-09-17 01:09:55 UTC (rev 709)
@@ -95,6 +95,8 @@
uint16_t defaultDeity() const { return m_defaultDeity; }
uint16_t defaultRace() const { return m_defaultRace; }
uint8_t defaultClass() const { return m_defaultClass; }
+ QString realName() const { return m_realName; }
+ void setRealName(const QString& name) { m_realName = name; }
virtual void killSpawn();
@@ -202,6 +204,7 @@
// We keep a second copy in case the player levels while playing.
QString m_defaultName;
QString m_defaultLastName;
+ QString m_realName;
uint16_t m_mana;
uint16_t m_defaultRace;
uint16_t m_defaultDeity;
Modified: showeq/trunk/src/spawnshell.cpp
===================================================================
--- showeq/trunk/src/spawnshell.cpp 2008-09-09 01:25:14 UTC (rev 708)
+++ showeq/trunk/src/spawnshell.cpp 2008-09-17 01:09:55 UTC (rev 709)
@@ -648,15 +648,15 @@
fillSpawnStruct(spawn,data,len,true);
-#ifdef SPAWNSHELL_DIAG
+ #ifdef SPAWNSHELL_DIAG
seqDebug("SpawnShell::zoneEntry(spawnStruct *(name='%s'))", spawn->name);
-#endif
+ #endif
Item *item;
- if(!strcmp(spawn->name,m_player->name()))
+ if(!strcmp(spawn->name,m_player->realName()))
{
- // Multiple zoneEntry packets are received for your spawn after you zone.
+ // Multiple zoneEntry packets are received for your spawn after you zone
m_player->update(spawn);
emit changeItem(m_player, tSpawnChangedALL);
}
@@ -1382,10 +1382,12 @@
}
}
-void SpawnShell::respawnFromHover(const uint8_t* data)
+void SpawnShell::respawnFromHover(const uint8_t* data, size_t len, uint8_t dir)
{
+ if(dir != DIR_Client)
+ return;
#ifdef SPAWNSHELL_DIAG
- seqDebug("SpawnShell::respawnFromHover()");
+ seqDebug("SpawnShell::respawnFromHover()");
#endif
// Our old player is a corpse, but we're rising from the dead. So
Modified: showeq/trunk/src/spawnshell.h
===================================================================
--- showeq/trunk/src/spawnshell.h 2008-09-09 01:25:14 UTC (rev 708)
+++ showeq/trunk/src/spawnshell.h 2008-09-17 01:09:55 UTC (rev 709)
@@ -125,7 +125,7 @@
void removeSpawn(const uint8_t* rmSpawn, size_t len, uint8_t dir);
void deleteSpawn(const uint8_t* delSpawn);
void killSpawn(const uint8_t* deadspawn);
- void respawnFromHover(const uint8_t* respawn);
+ void respawnFromHover(const uint8_t* respawn, size_t len, uint8_t dir);
void corpseLoc(const uint8_t* corpseLoc);
void playerChangedID(uint16_t playerID);
Modified: showeq/trunk/src/zones.h
===================================================================
--- showeq/trunk/src/zones.h 2008-09-09 01:25:14 UTC (rev 708)
+++ showeq/trunk/src/zones.h 2008-09-17 01:09:55 UTC (rev 709)
@@ -457,34 +457,34 @@
{ "guardian", "The Mechamatic Guardian" }, // 447
{ "steamfontmts", "Steamfont Mountains" }, // 448
{ "cryptofshade", "Crypt of Shade" }, // 449
-{ NULL, NULL }, // 450
-{ NULL, NULL }, // 451
-{ NULL, NULL }, // 452
-{ NULL, NULL }, // 453
-{ NULL, NULL }, // 454
-{ NULL, NULL }, // 455
-{ NULL, NULL }, // 456
-{ NULL, NULL }, // 457
-{ NULL, NULL }, // 458
-{ NULL, NULL }, // 459
-{ NULL, NULL }, // 460
-{ NULL, NULL }, // 461
-{ NULL, NULL }, // 462
-{ NULL, NULL }, // 463
-{ NULL, NULL }, // 464
-{ NULL, NULL }, // 465
-{ NULL, NULL }, // 466
-{ NULL, NULL }, // 467
-{ NULL, NULL }, // 468
-{ NULL, NULL }, // 469
-{ NULL, NULL }, // 470
-{ NULL, NULL }, // 471
-{ NULL, NULL }, // 472
-{ NULL, NULL }, // 473
-{ NULL, NULL }, // 474
-{ NULL, NULL }, // 475
-{ NULL, NULL }, // 476
-{ NULL, NULL }, // 477
+{ "Tinmizer's Wunderwerks", "dragonscalea" }, // 450
+{ "Deepscar's Den", "dragonscaleb" }, // 451
+{ "Field of Scale", "oldfieldofbone" }, // 452
+{ "Kaesora Library", "oldkaesoraa" }, // 453
+{ "Hatchery Wing", "oldkaesorab" }, // 454
+{ "Kurn's Tower", "oldkurn" }, // 455
+{ "Bloody Kithicor", "oldkithicor" }, // 456
+{ "Old Commonlands", "oldcommons" }, // 457
+{ "Highpass Hold", "oldhighpass" }, // 458
+{ "The Void", "thevoida" }, // 459
+{ "The Void", "thevoidb" }, // 460
+{ "The Void", "thevoidc" }, // 461
+{ "The Void", "thevoidd" }, // 462
+{ "The Void", "thevoide" }, // 463
+{ "The Void", "thevoidf" }, // 464
+{ "The Void", "thevoidg" }, // 465
+{ "Oceangreen Hills", "oceangreenhills" }, // 466
+{ "Oceangreen Village", "oceangreenvillage" }, // 467
+{ "Blackburrow", "oldblackburrow" }, // 468
+{ "Temple of Bertoxxulous", "bertoxtemple" }, // 469
+{ "Korafax, Home of the Riders", "discord" }, // 470
+{ "Citadel of the Worldslayer", "discordtower" }, // 471
+{ "Old Bloodfields", "oldbloodfield" }, // 472
+{ "The Precipice of War", "precipiceofwar" }, // 473
+{ "City of Dranik", "olddranik" }, // 474
+{ "Toskirakk", "toskirakk" }, // 475
+{ "Korascian Warrens", "korascian" }, // 476
+{ "Rathe Council Chambers", "rathechamber" }, // 477
{ NULL, NULL }, // 478
{ NULL, NULL }, // 479
{ NULL, NULL }, // 480
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
