Changeset 3152

Timestamp:

02/05/2010 05:31:18 AM (5 weeks ago)

Author:

AlexisB

Message:

ADDED: Some more quest stuff from Mangos. Quests should no longer crash the client!

Location:

trunk/src/arcemu-world

Files:

• Quest.cpp (modified) (2 diffs)
• QuestMgr.cpp (modified) (5 diffs)

trunk/src/arcemu-world/Quest.cpp

@@ -36 +36 @@
         *data << uint32(2);                                                      // Unknown, always seems to be 2
         *data << uint32(qst->max_level);                                // Quest level
+    *data << uint32( 0 );
 
         if(qst->quest_sort > 0)
@@ -49 +50 @@
         *data << uint32(0);                                                      // Unknown (always 0)
         *data << uint32(qst->next_quest_id);                    // Next Quest ID
+    *data << uint32( 0 );
         *data << uint32( sQuestMgr.GenerateRewardMoney( _player, qst ) );                        // Copper reward
         *data << uint32(qst->reward_money<0 ? -qst->reward_money : 0);             // Required Money

trunk/src/arcemu-world/QuestMgr.cpp

@@ -319 +319 @@
         //uint32 a = 0, b = 0, c = 1, d = 0, e = 1;
 
-        *data << ( qst->next_quest_id ? uint32(1) : uint32(0) );// next quest shit
+        *data << uint8( qst->next_quest_id ? uint8( 1 ) : uint8( 0 ) );// next quest shit
         *data << uint32(0);                                                                             // maybe required money
 
@@ -362 +362 @@
         *data << GenerateRewardMoney( plr, qst );
         *data << qst->bonushonor;
+    *data << float( 0 );
         *data << uint32(0);
         *data << qst->reward_spell;
@@ -367 +368 @@
         *data << qst->rewardtitleid;
         *data << qst->rewardtalents;
+    *data << uint32( 0 );
+    *data << uint32( 0 );
+
+    for( i = 0; i < 5; ++i )
+        *data << uint32( 0 );
+
+    for( i = 0; i < 5; ++i )
+        *data << uint32( 0 );
+
+    for( i = 0; i < 5; ++i )
+        *data << uint32( 0 );
 }
 
@@ -393 +405 @@
         }
 
-        *data << uint32(1);                                             // Activate accept
+        *data << uint8(1);                                              // Activate accept
         *data << qst->suggestedplayers;                 // "Suggested players"
         *data << uint8(0);                                              // Added in 3.0.2, name or text(?)
         *data << uint8(0); //VLack: some 3.1.x thing
-
+    *data << uint8( 0 );
 
         ItemPrototype *ip;
@@ -428 +440 @@
 
         *data << GenerateRewardMoney( plr, qst );       // Money reward
+    *data << uint32( 0 );
         *data << qst->bonushonor;                                       // Honor reward
+    *data << float( 0 );
         *data << qst->reward_spell;                                     // this is the spell (id) the quest finisher teaches you, or the icon of the spell if effect_on_player is not 0
         *data << qst->effect_on_player;                         // this is the spell (id) the quest finisher casts on you as a reward
         *data << qst->rewardtitleid;                            // Title reward (ID)
         *data << qst->rewardtalents;                            // Talent reward
+    *data << uint32( 0 );
+    *data << uint32( 0 );
+
+    for( i = 0; i < 5; ++i )
+        *data << uint32( 0 );
+
+    for( i = 0; i < 5; ++i )
+        *data << uint32( 0 );
+
+    for( i = 0; i < 5; ++i )
+        *data << uint32( 0 );
 
         *data << qst->detailemotecount;                         // Amount of emotes (4?)