1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed most of my thousands "WANNE" comments which goes back 2 years when I changed to higher resolutions. These were only internal comments for me, so they didn't include any useful meaning for others.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1172 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2007-08-07 21:39:23 +00:00
parent 30bccc0d73
commit ce31084ae7
98 changed files with 82 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/PopUpBox.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Utils All.h"
#else
Utils/Text Utils.cpp
-1
View File
@@ -760,7 +760,6 @@ BOOLEAN LoadShortNameItemInfo(UINT16 ubIndex, STR16 pNameString )
{
int j = -1;
// WANNE:
for (int i=0;i<80;i++)
{
j++;
Utils/Text.h
+2 -5
View File
@@ -333,8 +333,8 @@ enum
STR_ACCURATE,
STR_INACCURATE,
STR_NO_SEMI_AUTO,
STR_NO_MORE_ITEMS_TO_STEAL, // WANNE
STR_NO_MORE_ITEM_IN_HAND, // WANNE
STR_NO_MORE_ITEMS_TO_STEAL,
STR_NO_MORE_ITEM_IN_HAND,
};
// WANNE: Tooltips
@@ -795,7 +795,6 @@ enum
};
extern STR16 BobbyROrderFormText[];
// WANNE
enum
{
// Guns
@@ -878,8 +877,6 @@ enum
};
extern STR16 BobbyRText[];
// WANNE
extern STR16 BobbyRFilter[];
Utils/Utilities.cpp
+2 -2
View File
@@ -23,8 +23,8 @@ extern BOOLEAN GetCDromDriveLetter( STR8 pString );
BOOLEAN PerformTimeLimitedCheck();
// WANNE:
/* Given a string, replaces all instances of "oldpiece" with "newpiece".
// WANNE: Given a string, replaces all instances of "oldpiece" with "newpiece"
/*
*
* Modified this routine to eliminate recursion and to avoid infinite
* expansion of string when newpiece contains oldpiece. --Byron
Utils/XML_Items.cpp
-7
View File
@@ -74,7 +74,6 @@ itemStartElementHandle(void *userData, const XML_Char *name, const XML_Char **at
{
pData->curElement = ELEMENT_LIST;
// WANNE
if ( !localizedTextOnly )
memset(pData->curArray,0,sizeof(INVTYPE)*pData->maxArraySize);
@@ -84,7 +83,6 @@ itemStartElementHandle(void *userData, const XML_Char *name, const XML_Char **at
{
pData->curElement = ELEMENT;
// WANNE
if ( !localizedTextOnly )
memset(&pData->curItem,0,sizeof(INVTYPE));
@@ -288,7 +286,6 @@ itemEndElementHandle(void *userData, const XML_Char *name)
// pData->curItem.szItemName[MAX_CHAR_DATA_LENGTH] = '\0';
//}
// WANNE
if(MAX_CHAR_DATA_LENGTH >= strlen(pData->szCharData))
strcpy(pData->curItem.szItemName,pData->szCharData);
else
@@ -309,7 +306,6 @@ itemEndElementHandle(void *userData, const XML_Char *name)
//DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"itemEndElementHandle: longitemname");
pData->curElement = ELEMENT;
// WANNE
if(MAX_CHAR_DATA_LENGTH >= strlen(pData->szCharData))
{
strcpy(pData->curItem.szLongItemName,pData->szCharData);
@@ -341,7 +337,6 @@ itemEndElementHandle(void *userData, const XML_Char *name)
//DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"itemEndElementHandle: itemdesc");
pData->curElement = ELEMENT;
// WANNE
if(MAX_CHAR_DATA_LENGTH >= strlen(pData->szCharData))
strcpy(pData->curItem.szItemDesc,pData->szCharData);
else
@@ -362,7 +357,6 @@ itemEndElementHandle(void *userData, const XML_Char *name)
//DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"itemEndElementHandle: brname");
pData->curElement = ELEMENT;
// WANNE
if(MAX_CHAR_DATA_LENGTH >= strlen(pData->szCharData))
strcpy(pData->curItem.szBRName,pData->szCharData);
else
@@ -383,7 +377,6 @@ itemEndElementHandle(void *userData, const XML_Char *name)
//DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"itemEndElementHandle: brdesc");
pData->curElement = ELEMENT;
// WANNE
if(MAX_CHAR_DATA_LENGTH >= strlen(pData->szCharData))
strcpy(pData->curItem.szBRDesc,pData->szCharData);
else
Utils/_DutchText.cpp
+2 -4
View File
@@ -296,8 +296,8 @@ CHAR16 Message[][STRING_LENGTH] =
L"Beurt bloodcats",
L"automatic",
L"no full auto",
L"The enemy has no more items to steal!", // WANNE
L"The enemy has no item in its hand!", //WANNE
L"The enemy has no more items to steal!",
L"The enemy has no item in its hand!",
};
@@ -2600,7 +2600,6 @@ STR16 MercAccountText[] =
L"Weet je zeker de betaling van %s te autoriseren?", //the %s is a string that contains the dollar amount ( ex. "$150" )
};
// WANNE 3
// Merc Account Page buttons
STR16 MercAccountPageText[] =
{
@@ -2818,7 +2817,6 @@ STR16 BobbyROrderFormText[] =
L"Zendingen",
};
// WANNE
STR16 BobbyRFilter[] =
{
// Guns
Utils/_EnglishText.cpp
+3 -7
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Utils All.h"
#else
@@ -311,8 +310,8 @@ CHAR16 Message[][STRING_LENGTH] =
L"accurate",
L"inaccurate",
L"no semi auto",
L"The enemy has no more items to steal!", // WANNE
L"The enemy has no item in its hand!", //WANNE
L"The enemy has no more items to steal!",
L"The enemy has no item in its hand!",
};
@@ -1965,7 +1964,7 @@ STR16 pMapErrorString[] =
L"needs an escort to move. Place her on a squad with one.", // for a female
L"Merc hasn't yet arrived in Arulco!",
L"Looks like there's some contract negotiations to settle first.",
L"Cannot give a movement order. Air raid is going on.", // WANNE 2
L"Cannot give a movement order. Air raid is going on.",
//11-15
L"Movement orders? There's a battle going on!",
L"You have been ambushed by bloodcats in sector %s!",
@@ -2603,7 +2602,6 @@ STR16 MercAccountText[] =
L"Are you sure you want to authorize the payment of %s?", //the %s is a string that contains the dollar amount ( ex. "$150" )
};
// WANNE:
// Merc Account Page buttons
STR16 MercAccountPageText[] =
{
@@ -2820,7 +2818,6 @@ STR16 BobbyROrderFormText[] =
L"Shipments",
};
// WANNE
STR16 BobbyRFilter[] =
{
// Guns
@@ -3423,7 +3420,6 @@ STR16 zMarksMapScreenText[] =
L"%s is full of militia.",
L"Merc has a finite contract.",
L"Merc's contract is not insured",
// WANNE 2
L"Map Overview", // 24
};
Utils/_FrenchText.cpp
+2 -4
View File
@@ -302,8 +302,8 @@ CHAR16 Message[][STRING_LENGTH] =
L"Tour des chats sauvages",
L"automatic",
L"no full auto",
L"The enemy has no more items to steal!", // WANNE
L"The enemy has no item in its hand!", //WANNE
L"The enemy has no more items to steal!",
L"The enemy has no item in its hand!",
};
@@ -2589,7 +2589,6 @@ STR16 MercAccountText[] =
L"Désirez-vous autoriser le versement de %s ?", //the %s is a string that contains the dollar amount ( ex. "$150" )
};
// WANNE:
// Merc Account Page buttons
STR16 MercAccountPageText[] =
{
@@ -2807,7 +2806,6 @@ STR16 BobbyROrderFormText[] =
L"Envois",
};
// WANNE
STR16 BobbyRFilter[] =
{
// Guns
Utils/_GermanText.cpp
+2 -6
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Utils All.h"
#else
@@ -305,7 +304,7 @@ CHAR16 Message[][STRING_LENGTH] =
L"ungenau",
L"kein Einzelschuss",
L"Der Feind besitzt keine Gegenstände mehr zum Stehlen!",
L"Der Feind hat keinen Gegenstand in seiner Hand!", //WANNE
L"Der Feind hat keinen Gegenstand in seiner Hand!",
};
CHAR16 pTownNames[MAX_TOWNS][MAX_TOWN_NAME_LENGHT] =
@@ -1888,7 +1887,7 @@ STR16 pMapErrorString[] =
L"braucht eine Eskorte. Plazieren Sie sie in einem Trupp mit Eskorte.", // for a female
L"Söldner ist noch nicht in Arulco!",
L"Erst mal Vertrag aushandeln!",
L"Marschbefehl ist nicht möglich. Luftangriffe finden statt.", // WANNE 2
L"Marschbefehl ist nicht möglich. Luftangriffe finden statt.",
//11-15
L"Marschbefehl? Hier tobt ein Kampf!",
L"Sie sind von Bloodcats umstellt in Sektor %s!",
@@ -2488,7 +2487,6 @@ STR16 MercAccountText[] =
L"Zahlung von %s wirklich genehmigen?", //the %s is a string that contains the dollar amount ( ex. "$150" )
};
// WANNE:
// Merc Account Page buttons
STR16 MercAccountPageText[] =
{
@@ -2678,7 +2676,6 @@ STR16 BobbyROrderFormText[] =
L"Lieferungen",
};
// WANNE
STR16 BobbyRFilter[] =
{
// Guns
@@ -3227,7 +3224,6 @@ STR16 zMarksMapScreenText[] =
L"%s ist voller Milizen.",
L"Söldner hat begrenzten Vertrag.",
L"Vertrag des Söldners ist nicht versichert",
// WANNE 2
L"Kartenübersicht", // 24
};
Utils/_ItalianText.cpp
+2 -5
View File
@@ -295,8 +295,8 @@ CHAR16 Message[][STRING_LENGTH] =
L"Turno dei Bloodcat",
L"automatic",
L"no full auto",
L"The enemy has no more items to steal!", // WANNE
L"The enemy has no item in its hand!", //WANNE
L"The enemy has no more items to steal!",
L"The enemy has no item in its hand!",
};
@@ -2583,7 +2583,6 @@ STR16 MercAccountText[] =
L"Conferma il pagamento di %s?", //the %s is a string that contains the dollar amount ( ex. "$150" )
};
// WANNE:
// Merc Account Page buttons
STR16 MercAccountPageText[] =
{
@@ -2801,8 +2800,6 @@ STR16 BobbyROrderFormText[] =
L"Spedizioni",
};
// WANNE
STR16 BobbyRFilter[] =
{
// Guns
Utils/_Ja25GermanText.h
+1 -1
View File
@@ -12,7 +12,7 @@ enum
TACT_MSG__FEE,
TACT_MSG__SOMEONE_ELSE_IN_SECTOR,
TCTL_MSG__GUN_RANGE_AND_CTH,
//TCTL_MSG__RANGE_TO_TARGET_AND_GUN_RANGE, // WANNE
//TCTL_MSG__RANGE_TO_TARGET_AND_GUN_RANGE, // WANNE: Not used
TCTL_MSG__DISPLAY_COVER,
TCTL_MSG__LOS,
TCTL_MSG__INVALID_DROPOFF_SECTOR,
Utils/_PolishText.cpp
+2 -4
View File
@@ -296,8 +296,8 @@ CHAR16 Message[][STRING_LENGTH] =
L"Tura dzikich kotów",
L"automatic",
L"no full auto",
L"The enemy has no more items to steal!", // WANNE
L"The enemy has no item in its hand!", //WANNE
L"The enemy has no more items to steal!",
L"The enemy has no item in its hand!",
};
@@ -2584,7 +2584,6 @@ STR16 MercAccountText[] =
L"Czy na pewno chcesz zatwierdziæ p³atnoœæ: %s?", //the %s is a string that contains the dollar amount ( ex. "$150" )
};
// WANNE:
// Merc Account Page buttons
STR16 MercAccountPageText[] =
{
@@ -2800,7 +2799,6 @@ STR16 BobbyROrderFormText[] =
L"Dostawy",
};
// WANNE
STR16 BobbyRFilter[] =
{
// Guns
Utils/_RussianText.cpp
+3 -6
View File
@@ -308,8 +308,8 @@ CHAR16 Message[][STRING_LENGTH] =
L"accurate",
L"inaccurate",
L"no semi auto",
L"The enemy has no more items to steal!", // WANNE
L"The enemy has no item in its hand!", //WANNE
L"The enemy has no more items to steal!",
L"The enemy has no item in its hand!",
};
@@ -1961,7 +1961,7 @@ STR16 pMapErrorString[] =
L"чтобы двигаться, нужен эскорт.Обеспечьте ее эскортом.", // for a female
L"Наемник еще не прибыл в Арулько!",
L"Кажется,сначала нужно уладить все проблемы с контрактом.",
L"Cannot give a movement order. Air raid is going on.", // WANNE 2
L"Cannot give a movement order. Air raid is going on.",
//11-15
L"Приказ двигаться? Тут же битва идет!",
L"Вы наткнулись на засаду Кошки-Убийцы в секторе %s!",
@@ -2597,7 +2597,6 @@ STR16 MercAccountText[] =
L"Вы уверены, что хотите подтвердить выплату %s?", //the %s is a string that contains the dollar amount ( ex. "$150" )
};
// WANNE:
// Merc Account Page buttons
STR16 MercAccountPageText[] =
{
@@ -2814,7 +2813,6 @@ STR16 BobbyROrderFormText[] =
};
// WANNE
STR16 BobbyRFilter[] =
{
// Guns
@@ -3417,7 +3415,6 @@ STR16 zMarksMapScreenText[] =
L"%s:много ополченцев.",
L"У наемн.конечн.контракт.",
L"Контракт наемн.не застрахован",
// WANNE 2
L"Map Overview", // 24
};
Utils/message.cpp
+1 -5
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Utils All.h"
#include "Game Clock.h"
@@ -38,7 +37,7 @@ typedef struct
} StringSaveStruct;
// WANNE These lines defines the message position in tactical screen.
// WANNE: These lines defines the message position in tactical screen.
#define MAX_LINE_COUNT 6
#define X_START 2
#define MAX_AGE 10000
@@ -1088,8 +1087,6 @@ void DisplayStringsInMapScreenMessageList( void )
INT16 sY;
UINT16 usSpacing;
// WANNE 2
//SetFontDestBuffer( FRAME_BUFFER, 17, 360 + 6, 407, 360 + 101, FALSE );
SetFontDestBuffer( FRAME_BUFFER, 17, (SCREEN_HEIGHT - 114), 407, (SCREEN_HEIGHT - 114) + 101, FALSE );
@@ -1100,7 +1097,6 @@ void DisplayStringsInMapScreenMessageList( void )
ubCurrentStringIndex = gubCurrentMapMessageString;
// WANNE 2
//sY = 377;
sY = (SCREEN_HEIGHT - 103);