1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Bugfix: Fixed incorrect email message text for new custom user merc (uiIndex >= 178), when merc is availabe for business on AIM

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4581 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-07-21 13:47:46 +00:00
parent 75e797f9ae
commit 2170bd5b4e
9 changed files with 94 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/email.cpp
+31 -6
View File
@@ -4989,6 +4989,7 @@ void PreProcessEmail( EmailPtr pMail )
// WANNE: Get the text and replace name!
int iNew113MERCMerc = 0;
int iNew113AIMMerc = 0;
int iNew113CustomUserMerc = 0;
if (pMail->usLength == MERC_UP_LEVEL_GASTON || pMail->usLength == MERC_UP_LEVEL_STOGIE ||
pMail->usLength == MERC_UP_LEVEL_TEX || pMail->usLength == MERC_UP_LEVEL_BIGGENS)
@@ -5001,6 +5002,12 @@ void PreProcessEmail( EmailPtr pMail )
iNew113AIMMerc = pMail->usLength;
pMail->usLength = 2;
}
// User made merc
else if (pMail->usLength >= 178 && pMail->usLength <= 254)
{
iNew113CustomUserMerc = pMail->usLength;
pMail->usLength = 2;
}
// list doesn't exist, reload
if( !pTempRecord )
@@ -5010,6 +5017,8 @@ void PreProcessEmail( EmailPtr pMail )
// read one record from email file
LoadEncryptedDataFromFile( "BINARYDATA\\Email.edt", pString, MAIL_STRING_SIZE * ( iOffSet + iCounter ), MAIL_STRING_SIZE );
// ----------------
// New MERC Merc
// ----------------
@@ -5042,7 +5051,7 @@ void PreProcessEmail( EmailPtr pMail )
// ----------------
// New AIM Merc
// ----------------
// WANNE: We have a new 1.13 MERC merc (Text, Gaston, Stogie or Biggens)
// WANNE: We have a new 1.13 AIM Wildfire merc
if (iNew113AIMMerc != 0)
{
wcscpy(pString, L"\0");
@@ -5082,11 +5091,21 @@ void PreProcessEmail( EmailPtr pMail )
{
wcscpy( pString, New113AIMMercMailTexts[15] );
}
// Additional Generic Merc mail message
else
{
wcscpy( pString, New113AIMMercMailTexts[17] );
}
}
}
// --------------------------
// New Customer User Merc
// --------------------------
// WANNE: We have a new 1.13 AIM Wildfire merc
if (iNew113CustomUserMerc != 0)
{
wcscpy(pString, L"\0");
// Only output the mail text, not the subject, cause we already have the subject as text
if (iCounter == 1)
{
wcscpy( pString, New113AIMMercMailTexts[17] );
}
}
@@ -5109,6 +5128,12 @@ void PreProcessEmail( EmailPtr pMail )
pMail->usLength = iNew113AIMMerc;
}
// WANNE: Set the value back
if (iNew113CustomUserMerc != 0)
{
pMail->usLength = iNew113CustomUserMerc;
}
giPrevMessageId = giMessageId;
}
Utils/_DutchText.cpp
+17 -17
View File
@@ -5915,41 +5915,41 @@ STR16 New113MERCMercMailTexts[] =
// WANNE: This is email text (each 2 line), when we left a message on AIM and now the merc is back
STR16 New113AIMMercMailTexts[] =
{
// Monk
// Monk: Text from Line 58
L"FW from AIM Server: Message from Victor Kolesnikov",
L"You want to talk to me? I have time.",
L"Hello. Monk here. Message received. I'm back if you want to see me. ± ± Waiting for your call. ±",
// Brain
// Brain: Text from Line 60
L"FW from AIM Server: Message from Janno Allik",
L"I am back. Waiting for your call.",
L"Am now ready to consider tasks. There is a time and place for everything. ± ± Janno Allik ±",
// Scream
// Scream: Text from Line 62
L"FW from AIM Server: Message from Lennart Vilde",
L"Sorry, I was out of office, now I am back.",
L"Lennart Vilde now available! ±",
// Henning
// Henning: Text from Line 64
L"FW from AIM Server: Message from Henning von Branitz",
L"Back from business. You want my help?",
L"Have received your message, thanks. To discuss employment, contact me at the AIM Website. ± ± Till then! ± ± Henning von Branitz ±",
// Luc
// Luc: Text from Line 66
L"FW from AIM Server: Message from Luc Fabre",
L"Give me a call, if you are interested.",
L"Mesage received, merci! Am happy to consider your proposals. You know where to find me. ± ± Looking forward to hearing from you. ±",
// Laura
// Laura: Text from Line 68
L"FW from AIM Server: Message from Dr. Laura Colin",
L"I am now available.",
L"Greetings! Good of you to leave a message It sounds interesting. ± ± Visit AIM again I would be happy to hear more. ± ± Best regards! ± ± Dr. Laura Colin ±",
// Grace
// Grace: Text from Line 70
L"FW from AIM Server: Message from Graziella Girelli",
L"Got your message. If you still want me, you know what to do.",
L"You wanted to contact me, but were not successful.± ± A family gathering. I am sure you understand? I've now had enough of family and would be very happy if you would contact me again over the AIM Site. ± ± Ciao! ±",
// Rudolf
// Rudolf: Text from Line 72
L"FW from AIM Server: Message from Rudolf Steiger",
L"Rudolf here. Call me back.",
L"Do you know how many calls I get every day? Every tosser thinks he can call me. ± ± But I'm back, if you have something of interest for me. ±",
// WANNE: Generic mail, for additional merc made by modders, index >= 178
L"FW from AIM Server: Message about merc availability",
L"I got your message. Waiting for your call.±",
L"I got your message. Waiting for your call. ±",
};
// WANNE: These are the missing skills from the impass.edt file
Utils/_EnglishText.cpp
+3 -3
View File
@@ -5934,7 +5934,7 @@ STR16 New113AIMMercMailTexts[] =
// Luc: Text from Line 66
L"FW from AIM Server: Message from Luc Fabre",
L"Mesage received, merci! Am happy to consider your proposals. You know where to find me. ± ± Looking forward to hearing from you ±",
L"Mesage received, merci! Am happy to consider your proposals. You know where to find me. ± ± Looking forward to hearing from you. ±",
// Laura: Text from Line 68
L"FW from AIM Server: Message from Dr. Laura Colin",
@@ -5946,11 +5946,11 @@ STR16 New113AIMMercMailTexts[] =
// Rudolf: Text from Line 72
L"FW from AIM Server: Message from Rudolf Steiger",
L"Do you know how many calls I get every day? Every tosser thinks he can call me. ± ± But I'm back, if you have something of interest for me.±",
L"Do you know how many calls I get every day? Every tosser thinks he can call me. ± ± But I'm back, if you have something of interest for me. ±",
// WANNE: Generic mail, for additional merc made by modders, index >= 178
L"FW from AIM Server: Message about merc availability",
L"I got your message. Waiting for your call.±",
L"I got your message. Waiting for your call. ±",
};
// WANNE: These are the missing skills from the impass.edt file
Utils/_FrenchText.cpp
+2 -2
View File
@@ -5949,11 +5949,11 @@ STR16 New113AIMMercMailTexts[] =
// Rudolf
L"TR du serveur AIM: Message de Rudolf Steiger",
L"Vous savez combien j’ai d’appel par jour ? Tous les branleurs pensent pouvoir m’appeler. ± ± Mais je suis de retour, si vous avez quelque chose d’intéressant pour moi.±",
L"Vous savez combien j’ai d’appel par jour ? Tous les branleurs pensent pouvoir m’appeler. ± ± Mais je suis de retour, si vous avez quelque chose d’intéressant pour moi. ±",
// WANNE: Generic mail, for additional merc made by modders, index >= 178
L"FW from AIM Server: Message about merc availability",
L"I got your message. Waiting for your call.±",
L"I got your message. Waiting for your call. ±",
};
// WANNE: These are the missing skills from the impass.edt file
Utils/_GermanText.cpp
+2 -2
View File
@@ -5767,7 +5767,7 @@ STR16 New113AIMMercMailTexts[] =
// Luc
L"Weitergeleitet von AIM-Server: Nachricht von Luc Fabre",
L"Ich habe Ihre Nachricht erhalten, merci. Zur Zeit könnte ich gerne einen Auftrag annehmen. Sie wissen ja, wo Sie mich erreichen. ± ± Sicher hören wir bald von einander ±",
L"Ich habe Ihre Nachricht erhalten, merci. Zur Zeit könnte ich gerne einen Auftrag annehmen. Sie wissen ja, wo Sie mich erreichen. ± ± Sicher hören wir bald von einander. ±",
// Laura
L"Weitergeleitet von AIM-Server: Nachricht von Dr. Laura Colin",
@@ -5783,7 +5783,7 @@ STR16 New113AIMMercMailTexts[] =
// WANNE: Generic mail, for additional merc made by modders, index >= 178
L"Weitergeleitet von AIM-Server: Nachricht über Söldner Verfügbarkeit",
L"Ich habe Ihre Nachricht erhalten und warte auf Ihren Rückruf.±",
L"Ich habe Ihre Nachricht erhalten und warte auf Ihren Rückruf. ±",
};
// WANNE: These are the missing skills from the impass.edt file
Utils/_ItalianText.cpp
+17 -17
View File
@@ -5915,41 +5915,41 @@ STR16 New113MERCMercMailTexts[] =
// WANNE: This is email text (each 2 line), when we left a message on AIM and now the merc is back
STR16 New113AIMMercMailTexts[] =
{
// Monk
// Monk: Text from Line 58
L"FW from AIM Server: Message from Victor Kolesnikov",
L"You want to talk to me? I have time.",
L"Hello. Monk here. Message received. I'm back if you want to see me. ± ± Waiting for your call. ±",
// Brain
// Brain: Text from Line 60
L"FW from AIM Server: Message from Janno Allik",
L"I am back. Waiting for your call.",
L"Am now ready to consider tasks. There is a time and place for everything. ± ± Janno Allik ±",
// Scream
// Scream: Text from Line 62
L"FW from AIM Server: Message from Lennart Vilde",
L"Sorry, I was out of office, now I am back.",
L"Lennart Vilde now available! ±",
// Henning
// Henning: Text from Line 64
L"FW from AIM Server: Message from Henning von Branitz",
L"Back from business. You want my help?",
L"Have received your message, thanks. To discuss employment, contact me at the AIM Website. ± ± Till then! ± ± Henning von Branitz ±",
// Luc
// Luc: Text from Line 66
L"FW from AIM Server: Message from Luc Fabre",
L"Give me a call, if you are interested.",
L"Mesage received, merci! Am happy to consider your proposals. You know where to find me. ± ± Looking forward to hearing from you. ±",
// Laura
// Laura: Text from Line 68
L"FW from AIM Server: Message from Dr. Laura Colin",
L"I am now available.",
L"Greetings! Good of you to leave a message It sounds interesting. ± ± Visit AIM again I would be happy to hear more. ± ± Best regards! ± ± Dr. Laura Colin ±",
// Grace
// Grace: Text from Line 70
L"FW from AIM Server: Message from Graziella Girelli",
L"Got your message. If you still want me, you know what to do.",
L"You wanted to contact me, but were not successful.± ± A family gathering. I am sure you understand? I've now had enough of family and would be very happy if you would contact me again over the AIM Site. ± ± Ciao! ±",
// Rudolf
// Rudolf: Text from Line 72
L"FW from AIM Server: Message from Rudolf Steiger",
L"Rudolf here. Call me back.",
L"Do you know how many calls I get every day? Every tosser thinks he can call me. ± ± But I'm back, if you have something of interest for me. ±",
// WANNE: Generic mail, for additional merc made by modders, index >= 178
L"FW from AIM Server: Message about merc availability",
L"I got your message. Waiting for your call.±",
L"I got your message. Waiting for your call. ±",
};
// WANNE: These are the missing skills from the impass.edt file
Utils/_PolishText.cpp
+3 -2
View File
@@ -5946,11 +5946,12 @@ STR16 New113AIMMercMailTexts[] =
// Rudolf
L"PD z Serwera AIM: WiadomoϾ od - Rudolf Steiger",
L"Wiesz, ile telefonów odbieram każdego dnia? Co drugi baran myśli, że może do mnie wydzwaniać. ± ± W każdym razie już jestem, jeśli masz dla mnie coś ciekawego.±",
L"Wiesz, ile telefonów odbieram każdego dnia? Co drugi baran myśli, że może do mnie wydzwaniać. ± ± W każdym razie już jestem, jeśli masz dla mnie coś ciekawego. ±",
// TODO.Translate
// WANNE: Generic mail, for additional merc made by modders, index >= 178
L"FW from AIM Server: Message about merc availability",
L"I got your message. Waiting for your call.±",
L"I got your message. Waiting for your call. ±",
};
// WANNE: These are the missing skills from the impass.edt file
Utils/_RussianText.cpp
+2 -2
View File
@@ -5931,11 +5931,11 @@ STR16 New113AIMMercMailTexts[] =
// Rudolf
L"FW ñ ñåðâåðà A.I.M.: Ïèñüìî îò Ðóäîëüôà Øòàéãåðà",
L"Ты знаешь, сколько звонков я получаю каждый день? Любой придурок считает, что может позвонить мне. ± ± Но я вернулся, если тебе есть чем меня заинтересовать.±",
L"Ты знаешь, сколько звонков я получаю каждый день? Любой придурок считает, что может позвонить мне. ± ± Но я вернулся, если тебе есть чем меня заинтересовать. ±",
// WANNE: Generic mail, for additional merc made by modders, index >= 178
L"FW ñ ñåðâåðà A.I.M.: Íà¸ìíèê äîñòóïåí",
L"Я на месте. Жду звонка чтобы обсудить условия контракта.±",
L"Я на месте. Жду звонка чтобы обсудить условия контракта. ±",
};
// WANNE: These are the missing skills from the impass.edt file
Utils/_TaiwaneseText.cpp
+17 -17
View File
@@ -5922,41 +5922,41 @@ STR16 New113MERCMercMailTexts[] =
// WANNE: This is email text (each 2 line), when we left a message on AIM and now the merc is back
STR16 New113AIMMercMailTexts[] =
{
// Monk
// Monk: Text from Line 58
L"FW from AIM Server: Message from Victor Kolesnikov",
L"You want to talk to me? I have time.",
L"Hello. Monk here. Message received. I'm back if you want to see me. ± ± Waiting for your call. ±",
// Brain
// Brain: Text from Line 60
L"FW from AIM Server: Message from Janno Allik",
L"I am back. Waiting for your call.",
L"Am now ready to consider tasks. There is a time and place for everything. ± ± Janno Allik ±",
// Scream
// Scream: Text from Line 62
L"FW from AIM Server: Message from Lennart Vilde",
L"Sorry, I was out of office, now I am back.",
L"Lennart Vilde now available! ±",
// Henning
// Henning: Text from Line 64
L"FW from AIM Server: Message from Henning von Branitz",
L"Back from business. You want my help?",
L"Have received your message, thanks. To discuss employment, contact me at the AIM Website. ± ± Till then! ± ± Henning von Branitz ±",
// Luc
// Luc: Text from Line 66
L"FW from AIM Server: Message from Luc Fabre",
L"Give me a call, if you are interested.",
L"Mesage received, merci! Am happy to consider your proposals. You know where to find me. ± ± Looking forward to hearing from you. ±",
// Laura
// Laura: Text from Line 68
L"FW from AIM Server: Message from Dr. Laura Colin",
L"I am now available.",
L"Greetings! Good of you to leave a message It sounds interesting. ± ± Visit AIM again I would be happy to hear more. ± ± Best regards! ± ± Dr. Laura Colin ±",
// Grace
// Grace: Text from Line 70
L"FW from AIM Server: Message from Graziella Girelli",
L"Got your message. If you still want me, you know what to do.",
L"You wanted to contact me, but were not successful.± ± A family gathering. I am sure you understand? I've now had enough of family and would be very happy if you would contact me again over the AIM Site. ± ± Ciao! ±",
// Rudolf
// Rudolf: Text from Line 72
L"FW from AIM Server: Message from Rudolf Steiger",
L"Rudolf here. Call me back.",
L"Do you know how many calls I get every day? Every tosser thinks he can call me. ± ± But I'm back, if you have something of interest for me. ±",
// WANNE: Generic mail, for additional merc made by modders, index >= 178
L"FW from AIM Server: Message about merc availability",
L"I got your message. Waiting for your call.±",
L"I got your message. Waiting for your call. ±",
};
// WANNE: These are the missing skills from the impass.edt file