Changeset 21 for trunk/src/hearthstone-world/NPCHandler.cpp
- Timestamp:
- 09/20/09 20:50:14 (3 years ago)
- Files:
-
- 1 modified
-
trunk/src/hearthstone-world/NPCHandler.cpp (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/hearthstone-world/NPCHandler.cpp
r19 r21 470 470 } 471 471 472 LocalizedQuest * lq = (language>0) ? sLocalizationMgr.GetLocalizedQuest((*it)->qst->id,language):NULL; 473 if(lq) 474 data << lq->Title; 475 else 476 data << (*it)->qst->title; 472 data << (*it)->qst->title; 477 473 } 478 474 } … … 598 594 599 595 pGossip = NpcTextStorage.LookupEntry(textID); 600 LocalizedNpcText * lnc = (language>0) ? sLocalizationMgr.GetLocalizedNpcText(textID,language) : NULL;601 596 602 597 data << textID; … … 607 602 { 608 603 data << pGossip->Texts[i].Prob; // prob 609 if(lnc) 610 { 611 data << lnc->Texts[i][0]; 612 data << lnc->Texts[i][1]; 613 } 614 else 615 { 616 data << pGossip->Texts[i].Text[0]; 617 data << pGossip->Texts[i].Text[1]; 618 } 604 data << pGossip->Texts[i].Text[0]; 605 data << pGossip->Texts[i].Text[1]; 619 606 620 607 data << pGossip->Texts[i].Lang;