From 0b9ff226429b2d62124bd0475e43668f5a6bfb7c Mon Sep 17 00:00:00 2001 From: Wanne Date: Sat, 5 Jan 2013 16:37:13 +0000 Subject: [PATCH] - Deleted unused "SenderNameList.xml" references git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5769 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/Strategic Merc Handler.cpp | 2 -- Tactical/XML.h | 3 --- 2 files changed, 5 deletions(-) diff --git a/Strategic/Strategic Merc Handler.cpp b/Strategic/Strategic Merc Handler.cpp index 0cbb17a0..fcf30f93 100644 --- a/Strategic/Strategic Merc Handler.cpp +++ b/Strategic/Strategic Merc Handler.cpp @@ -504,7 +504,6 @@ void MercDailyUpdate() if (cnt < 178) { UINT16 iMsgLength = cnt; - //UINT8 sender = cnt - 119; // SenderNameList.xml // Fake Barry Unger mail, but with the msgLength of the WF merc ID -> Correct in PreProcessEmail() AddEmailWFMercAvailable( ( UINT8 )( iOffset + 0 * AIM_REPLY_LENGTH_BARRY ), iMsgLength, cnt, GetWorldTotalMin(), -1 , TYPE_EMAIL_EMAIL_EDT_NAME_MERC); @@ -514,7 +513,6 @@ void MercDailyUpdate() { // TODO.RW: Send generic mail UINT16 iMsgLength = cnt; - //UINT8 sender = cnt - 119; // SenderNameList.xml // Fake Barry Unger mail, but with the msgLength of the WF merc ID -> Correct in PreProcessEmail() AddEmailWFMercAvailable( ( UINT8 )( iOffset + 0 * AIM_REPLY_LENGTH_BARRY ), iMsgLength, cnt, GetWorldTotalMin(), -1 , TYPE_EMAIL_EMAIL_EDT_NAME_MERC); diff --git a/Tactical/XML.h b/Tactical/XML.h index 56f58dec..75056e77 100644 --- a/Tactical/XML.h +++ b/Tactical/XML.h @@ -236,9 +236,6 @@ typedef PARSE_STAGE; //CIV Names #define CIVGROUPNAMESFILENAME "CivGroupNames.xml" -//Sender Name List -#define SENDERNAMELISTFILENAME "SenderNameList.xml" - #define ACTIONITEMSFILENAME "MapAction\\Actionitems.xml" #define IMPPORTRAITS "IMPPortraits.xml"