[Seq-cvs-commit] showeq/src everquest.h,1.74.6.21,1.74.6.22 map.cpp,1.40.6.4,1.40.6.5 spawnlistcommon.cpp,1.6.6.3,1.6.6.4 spawnshell.cpp,1.42.6.6,1.42.6.7

[Chad M. <cmm...@us...>]

Update of /cvsroot/seq/showeq/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12123/src

Modified Files:
      Tag: pre_5_0_beta
	everquest.h map.cpp spawnlistcommon.cpp spawnshell.cpp 
Log Message:

Guilds numbered above 512 weren't showing up in spawn list and on the map. Fixed
two hardcoded 512's to be MAX_GUILDS (also changed MAXGUILDS to be MAX_GUILDS to
be consistent with other MAX_ things).


Index: spawnlistcommon.cpp
===================================================================
RCS file: /cvsroot/seq/showeq/src/spawnlistcommon.cpp,v
retrieving revision 1.6.6.3
retrieving revision 1.6.6.4
diff -u -d -r1.6.6.3 -r1.6.6.4
--- spawnlistcommon.cpp	7 Nov 2004 23:10:25 -0000	1.6.6.3
+++ spawnlistcommon.cpp	10 May 2005 15:53:09 -0000	1.6.6.4
@@ -263,7 +263,7 @@
      {
        setText(tSpawnColDeity, spawn->deityName());
        setText(tSpawnColBodyType, spawn->typeString());
-       if (spawn->guildID() < 512)
+       if (spawn->guildID() < MAX_GUILDS)
        {  
           if(spawn->guildTag())
             setText(tSpawnColGuildID, spawn->guildTag());

Index: spawnshell.cpp
===================================================================
RCS file: /cvsroot/seq/showeq/src/spawnshell.cpp,v
retrieving revision 1.42.6.6
retrieving revision 1.42.6.7
diff -u -d -r1.42.6.6 -r1.42.6.7
--- spawnshell.cpp	18 Apr 2005 03:16:23 -0000	1.42.6.6
+++ spawnshell.cpp	10 May 2005 15:53:09 -0000	1.42.6.7
@@ -475,7 +475,7 @@
      updateRuntimeFilterFlags(spawn);
      item->updateLastChanged();
 
-     if (spawn->guildID() < MAXGUILDS)
+     if (spawn->guildID() < MAX_GUILDS)
         spawn->setGuildTag(m_guildMgr->guildIdToName(spawn->guildID()));
      else
         spawn->setGuildTag("");
@@ -494,7 +494,7 @@
      updateRuntimeFilterFlags(spawn);
      m_spawns.insert(s.spawnId, item);
 
-     if (spawn->guildID() < MAXGUILDS)
+     if (spawn->guildID() < MAX_GUILDS)
         spawn->setGuildTag(m_guildMgr->guildIdToName(spawn->guildID()));
      else
         spawn->setGuildTag("");

Index: map.cpp
===================================================================
RCS file: /cvsroot/seq/showeq/src/map.cpp,v
retrieving revision 1.40.6.4
retrieving revision 1.40.6.5
diff -u -d -r1.40.6.4 -r1.40.6.5
--- map.cpp	7 Nov 2004 23:10:20 -0000	1.40.6.4
+++ map.cpp	10 May 2005 15:53:06 -0000	1.40.6.5
@@ -3862,7 +3862,7 @@
     if (spawn)
     {
       QString guild;
-      if (spawn->guildID() < 512)
+      if (spawn->guildID() < MAX_GUILDS)
       {
 	if (!spawn->guildTag().isEmpty())
 	  guild.sprintf("<%s>", (const char*)spawn->guildTag());

Index: everquest.h
===================================================================
RCS file: /cvsroot/seq/showeq/src/everquest.h,v
retrieving revision 1.74.6.21
retrieving revision 1.74.6.22
diff -u -d -r1.74.6.21 -r1.74.6.22
--- everquest.h	18 Apr 2005 03:16:14 -0000	1.74.6.21
+++ everquest.h	10 May 2005 15:52:46 -0000	1.74.6.22
@@ -107,7 +107,7 @@
 #define MAX_SPELLBOOK_SLOTS             400
 #define MAX_GROUP_MEMBERS               6
 #define MAX_BUFFS                       25
-#define MAXGUILDS                       1500
+#define MAX_GUILDS                      1500
 #define MAX_AA                          120
 #define MAX_BANDOLIERS                  4
 #define MAX_POTIONS_IN_BELT             4
@@ -2155,7 +2155,7 @@
 struct worldGuildListStruct
 {
 /*000*/ guildListStruct dummy;
-/*064*/ guildListStruct guilds[MAXGUILDS];
+/*064*/ guildListStruct guilds[MAX_GUILDS];
 };
 
 struct worldMOTDStruct