seq-cvs-commit Mailing List for ShowEQ Open Source Project (Page 36)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 729
          http://seq.svn.sourceforge.net/seq/?rev=729&view=rev
Author:   ieatacid
Date:     2009-05-26 01:32:18 +0000 (Tue, 26 May 2009)

Log Message:
-----------
Fixed guild name bug

Modified Paths:
--------------
    showeq/trunk/ChangeLog
    showeq/trunk/configure.in
    showeq/trunk/src/guild.cpp
    showeq/trunk/src/guild.h

Modified: showeq/trunk/ChangeLog
===================================================================

--- showeq/trunk/ChangeLog	2009-05-20 22:06:24 UTC (rev 728)
+++ showeq/trunk/ChangeLog	2009-05-26 01:32:18 UTC (rev 729)
@@ -1,3 +1,7 @@
+ieatacid (5/25/09)
+-----------------
+- Fixed guild name bug
+
 ieatacid (5/20/09)
 -----------------
 - Updated version to 5.13.4

Modified: showeq/trunk/configure.in
===================================================================
--- showeq/trunk/configure.in	2009-05-20 22:06:24 UTC (rev 728)
+++ showeq/trunk/configure.in	2009-05-26 01:32:18 UTC (rev 729)
@@ -2,7 +2,7 @@
 dnl $Id$ $Name$
 
 AC_PREREQ(2.59)
-AC_INIT(showeq, 5.13.4.0)
+AC_INIT(showeq, 5.13.4.1)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CANONICAL_SYSTEM
 

Modified: showeq/trunk/src/guild.cpp
===================================================================
--- showeq/trunk/src/guild.cpp	2009-05-20 22:06:24 UTC (rev 728)
+++ showeq/trunk/src/guild.cpp	2009-05-26 01:32:18 UTC (rev 729)
@@ -69,6 +69,7 @@
   NetStream netStream(data,len);
   QString guildName;
   uint32_t size = 0; // to keep track of how much we're reading from the packet
+  uint32_t guildId = 0;
 
   /*
    0x48 in the packet starts the serialized list.  See guildListStruct
@@ -81,29 +82,33 @@
 
   while(!netStream.end())
   {
-     char szGuildName[64] = {0};
-
-     // skip guild ID
-     netStream.skipBytes(4);
+     guildId = netStream.readUInt32NC();
      guildName = netStream.readText();
      size += 4; // four bytes for the guild ID
 
      if(guildName.length())
      {
-        strcpy(szGuildName, guildName.latin1());
+        m_guildList[guildId] = guildName;
 
-//         seqDebug("GuildMgr::writeGuildList - add guild '%s'", szGuildName);
-        guildDataStream.writeRawBytes(szGuildName, sizeof(szGuildName));
-
         // add guild name length, plus one for the null character
         size += guildName.length() + 1;
      }
 
-     // there's an extra zero at the end of the packet
      if(size + 1 == len)
         break; // the end
   }
 
+  std::map<uint32_t, QString>::iterator it;
+
+  for(it = m_guildList.begin(); it != m_guildList.end(); it++)
+  {
+     char szGuildName[64] = {0};
+
+     strcpy(szGuildName, it->second.latin1());
+     //seqDebug("GuildMgr::writeGuildList - add guild '%s' (%d)", szGuildName, it->first);
+     guildDataStream.writeRawBytes(szGuildName, sizeof(szGuildName));
+  }
+
   guildsfile.close();
   seqInfo("GuildMgr: New guildsfile written");
 }
@@ -120,7 +125,7 @@
         char szGuildName[64] = {0};
 
         guildsfile.readBlock(szGuildName, sizeof(szGuildName));
-//         seqDebug("GuildMgr::readGuildList - read guild '%s'", szGuildName);
+        //seqDebug("GuildMgr::readGuildList - read guild '%s'", szGuildName);
         m_guildMap.push_back(QString::fromUtf8(szGuildName));
      }
 

Modified: showeq/trunk/src/guild.h
===================================================================
--- showeq/trunk/src/guild.h	2009-05-20 22:06:24 UTC (rev 728)
+++ showeq/trunk/src/guild.h	2009-05-26 01:32:18 UTC (rev 729)
@@ -43,6 +43,7 @@
 
  private:
   std::vector<QString> m_guildMap;
+  std::map<uint32_t, QString> m_guildList;
  
   void writeGuildList(const uint8_t*, size_t);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




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

seq-cvs-commit Mailing List for ShowEQ Open Source Project (Page 36)

seq-cvs-commit — syncmail generated CVS commit notifications