Merged New Inventory Project into main branch

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2008-03-08 15:15:25 +00:00
parent e16d166277
commit 43ca24dda8
649 changed files with 93359 additions and 82507 deletions
+88 -87
View File
@@ -20,7 +20,7 @@ BOOLEAN LoadItemInfo(UINT16 ubIndex, STR16 pNameString, STR16 pInfoString )
j++;
if ( j<(int)strlen(Item[ubIndex].szLongItemName ))
{
pNameString[i] = Item[ubIndex].szLongItemName [j];
pNameString[i] = Item[ubIndex].szLongItemName [j];
#ifdef GERMAN
// We have a german special character
@@ -30,39 +30,39 @@ BOOLEAN LoadItemInfo(UINT16 ubIndex, STR16 pNameString, STR16 pInfoString )
switch (Item[ubIndex].szLongItemName [j + 1])
{
// ü
case -68:
case -68:
pNameString[i] = 252;
// Skip next character, because "umlaute" have 2 chars
j++;
break;
// Ü
case -100:
case -100:
pNameString[i] = 220;
j++;
break;
// ä
case -92:
pNameString[i] = 228;
case -92:
pNameString[i] = 228;
j++;
break;
// Ä
case -124:
pNameString[i] = 196;
case -124:
pNameString[i] = 196;
j++;
break;
// ö
case -74:
pNameString[i] = 246;
case -74:
pNameString[i] = 246;
j++;
break;
// Ö
case -106:
pNameString[i] = 214;
case -106:
pNameString[i] = 214;
j++;
break;
// ß
case -97:
pNameString[i] = 223;
case -97:
pNameString[i] = 223;
j++;
break;
}
@@ -100,7 +100,7 @@ BOOLEAN LoadItemInfo(UINT16 ubIndex, STR16 pNameString, STR16 pInfoString )
{
// This character determines the special character
switch ( (unsigned char)Item[ubIndex].szLongItemName [j + 1] )
{
{
//capital letters
case 129: pNameString[ i ] = 197; j++; break; //U+0401 d0 81 CYRILLIC CAPITAL LETTER IO
@@ -134,7 +134,7 @@ BOOLEAN LoadItemInfo(UINT16 ubIndex, STR16 pNameString, STR16 pInfoString )
case 171: pNameString[ i ] = 219; j++; break;
case 172: pNameString[ i ] = 220; j++; break;
case 173: pNameString[ i ] = 221; j++; break;
case 174: pNameString[ i ] = 222; j++; break;
case 174: pNameString[ i ] = 222; j++; break;
case 175: pNameString[ i ] = 223; j++; break; //U+042F d0 af CYRILLIC CAPITAL LETTER YA
//small letters
@@ -152,7 +152,7 @@ BOOLEAN LoadItemInfo(UINT16 ubIndex, STR16 pNameString, STR16 pInfoString )
case 187: pNameString[ i ] = 235; j++; break;
case 188: pNameString[ i ] = 236; j++; break;
case 189: pNameString[ i ] = 237; j++; break;
case 190: pNameString[ i ] = 238; j++; break;
case 190: pNameString[ i ] = 238; j++; break;
case 191: pNameString[ i ] = 239; j++; break; //U+043F d0 bf CYRILLIC SMALL LETTER PE
}
}
@@ -161,7 +161,7 @@ BOOLEAN LoadItemInfo(UINT16 ubIndex, STR16 pNameString, STR16 pInfoString )
{
// This character determines the special character
switch ( (unsigned char)Item[ubIndex].szLongItemName [j + 1] )
{
{
case 128: pNameString[ i ] = 240; j++; break; //U+0440 p d1 80 CYRILLIC SMALL LETTER ER
case 129: pNameString[ i ] = 241; j++; break;
case 130: pNameString[ i ] = 242; j++; break;
@@ -205,7 +205,7 @@ BOOLEAN LoadItemInfo(UINT16 ubIndex, STR16 pNameString, STR16 pInfoString )
j++;
if ( j<(int)strlen(Item[ubIndex].szItemDesc ))
{
pInfoString[i] = Item[ubIndex].szItemDesc [j];
pInfoString[i] = Item[ubIndex].szItemDesc [j];
#ifdef GERMAN
// We have a german special character
@@ -215,39 +215,39 @@ BOOLEAN LoadItemInfo(UINT16 ubIndex, STR16 pNameString, STR16 pInfoString )
switch (Item[ubIndex].szItemDesc [j + 1])
{
// ü
case -68:
case -68:
pInfoString[i] = 252;
// Skip next character, because "umlaute" have 2 chars
j++;
break;
// Ü
case -100:
case -100:
pInfoString[i] = 220;
j++;
break;
// ä
case -92:
pInfoString[i] = 228;
case -92:
pInfoString[i] = 228;
j++;
break;
// Ä
case -124:
pInfoString[i] = 196;
case -124:
pInfoString[i] = 196;
j++;
break;
// ö
case -74:
pInfoString[i] = 246;
case -74:
pInfoString[i] = 246;
j++;
break;
// Ö
case -106:
pInfoString[i] = 214;
case -106:
pInfoString[i] = 214;
j++;
break;
// ß
case -97:
pInfoString[i] = 223;
case -97:
pInfoString[i] = 223;
j++;
break;
}
@@ -286,7 +286,7 @@ BOOLEAN LoadItemInfo(UINT16 ubIndex, STR16 pNameString, STR16 pInfoString )
{
// This character determines the special character
switch ( (unsigned char)Item[ubIndex].szItemDesc [j + 1] )
{
{
//capital letters
case 129: pInfoString[ i ] = 197; j++; break; //U+0401 d0 81 CYRILLIC CAPITAL LETTER IO
@@ -320,7 +320,7 @@ BOOLEAN LoadItemInfo(UINT16 ubIndex, STR16 pNameString, STR16 pInfoString )
case 171: pInfoString[ i ] = 219; j++; break;
case 172: pInfoString[ i ] = 220; j++; break;
case 173: pInfoString[ i ] = 221; j++; break;
case 174: pInfoString[ i ] = 222; j++; break;
case 174: pInfoString[ i ] = 222; j++; break;
case 175: pInfoString[ i ] = 223; j++; break; //U+042F d0 af CYRILLIC CAPITAL LETTER YA
//small letters
@@ -338,7 +338,7 @@ BOOLEAN LoadItemInfo(UINT16 ubIndex, STR16 pNameString, STR16 pInfoString )
case 187: pInfoString[ i ] = 235; j++; break;
case 188: pInfoString[ i ] = 236; j++; break;
case 189: pInfoString[ i ] = 237; j++; break;
case 190: pInfoString[ i ] = 238; j++; break;
case 190: pInfoString[ i ] = 238; j++; break;
case 191: pInfoString[ i ] = 239; j++; break; //U+043F d0 bf CYRILLIC SMALL LETTER PE
}
}
@@ -347,7 +347,7 @@ BOOLEAN LoadItemInfo(UINT16 ubIndex, STR16 pNameString, STR16 pInfoString )
{
// This character determines the special character
switch ( (unsigned char)Item[ubIndex].szItemDesc [j + 1] )
{
{
case 128: pInfoString[ i ] = 240; j++; break; //U+0440 p d1 80 CYRILLIC SMALL LETTER ER
case 129: pInfoString[ i ] = 241; j++; break;
case 130: pInfoString[ i ] = 242; j++; break;
@@ -368,12 +368,12 @@ BOOLEAN LoadItemInfo(UINT16 ubIndex, STR16 pNameString, STR16 pInfoString )
case 145: pInfoString[ i ] = 229; j++; break; //U+0451 d1 91 CYRILLIC SMALL LETTER IO
}
}
//if ( ((unsigned char)Item[ubIndex].szItemDesc [j] == 211) ) //d3
//{
// // This character determines the special character
// switch ( (unsigned char)Item[ubIndex].szItemDesc [j + 1] )
// {
// {
// case 162: pInfoString[ i ] = 20; j++; break;//U+04E2 d3a2 CYRILLIC CAPITAL LETTER I WITH MACRON
// case 163: pInfoString[ i ] = 20; j++; break;//U+04E3 d3a3 CYRILLIC SMALL LETTER I WITH MACRON
// }
@@ -406,7 +406,7 @@ BOOLEAN LoadBRName(UINT16 ubIndex, STR16 pNameString )
j++;
if ( j<(int)strlen(Item[ubIndex].szBRName))
{
pNameString[i] = Item[ubIndex].szBRName [j];
pNameString[i] = Item[ubIndex].szBRName [j];
#ifdef GERMAN
// We have a german special character
@@ -416,39 +416,39 @@ BOOLEAN LoadBRName(UINT16 ubIndex, STR16 pNameString )
switch (Item[ubIndex].szBRName [j + 1])
{
// ü
case -68:
case -68:
pNameString[i] = 252;
// Skip next character, because "umlaute" have 2 chars
j++;
break;
// Ü
case -100:
case -100:
pNameString[i] = 220;
j++;
break;
// ä
case -92:
pNameString[i] = 228;
case -92:
pNameString[i] = 228;
j++;
break;
// Ä
case -124:
pNameString[i] = 196;
case -124:
pNameString[i] = 196;
j++;
break;
// ö
case -74:
pNameString[i] = 246;
case -74:
pNameString[i] = 246;
j++;
break;
// Ö
case -106:
pNameString[i] = 214;
case -106:
pNameString[i] = 214;
j++;
break;
// ß
case -97:
pNameString[i] = 223;
case -97:
pNameString[i] = 223;
j++;
break;
}
@@ -486,7 +486,7 @@ BOOLEAN LoadBRName(UINT16 ubIndex, STR16 pNameString )
{
// This character determines the special character
switch ( (unsigned char)Item[ubIndex].szBRName [j + 1] )
{
{
//capital letters
case 129: pNameString[ i ] = 197; j++; break; //U+0401 d0 81 CYRILLIC CAPITAL LETTER IO
@@ -520,7 +520,7 @@ BOOLEAN LoadBRName(UINT16 ubIndex, STR16 pNameString )
case 171: pNameString[ i ] = 219; j++; break;
case 172: pNameString[ i ] = 220; j++; break;
case 173: pNameString[ i ] = 221; j++; break;
case 174: pNameString[ i ] = 222; j++; break;
case 174: pNameString[ i ] = 222; j++; break;
case 175: pNameString[ i ] = 223; j++; break; //U+042F d0 af CYRILLIC CAPITAL LETTER YA
//small letters
@@ -538,7 +538,7 @@ BOOLEAN LoadBRName(UINT16 ubIndex, STR16 pNameString )
case 187: pNameString[ i ] = 235; j++; break;
case 188: pNameString[ i ] = 236; j++; break;
case 189: pNameString[ i ] = 237; j++; break;
case 190: pNameString[ i ] = 238; j++; break;
case 190: pNameString[ i ] = 238; j++; break;
case 191: pNameString[ i ] = 239; j++; break; //U+043F d0 bf CYRILLIC SMALL LETTER PE
}
}
@@ -547,7 +547,7 @@ BOOLEAN LoadBRName(UINT16 ubIndex, STR16 pNameString )
{
// This character determines the special character
switch ( (unsigned char)Item[ubIndex].szBRName [j + 1] )
{
{
case 128: pNameString[ i ] = 240; j++; break; //U+0440 p d1 80 CYRILLIC SMALL LETTER ER
case 129: pNameString[ i ] = 241; j++; break;
case 130: pNameString[ i ] = 242; j++; break;
@@ -595,7 +595,7 @@ BOOLEAN LoadBRDesc(UINT16 ubIndex, STR16 pDescString )
j++;
if ( j<(int)strlen(Item[ubIndex].szBRDesc))
{
pDescString[i] = Item[ubIndex].szBRDesc [j];
pDescString[i] = Item[ubIndex].szBRDesc [j];
// WANNE: German specific characters
#ifdef GERMAN
@@ -606,39 +606,39 @@ BOOLEAN LoadBRDesc(UINT16 ubIndex, STR16 pDescString )
switch (Item[ubIndex].szBRDesc [j + 1])
{
// ü
case -68:
case -68:
pDescString[i] = 252;
// Skip next character, because "umlaute" have 2 chars
j++;
break;
// Ü
case -100:
case -100:
pDescString[i] = 220;
j++;
break;
// ä
case -92:
pDescString[i] = 228;
case -92:
pDescString[i] = 228;
j++;
break;
// Ä
case -124:
pDescString[i] = 196;
case -124:
pDescString[i] = 196;
j++;
break;
// ö
case -74:
pDescString[i] = 246;
case -74:
pDescString[i] = 246;
j++;
break;
// Ö
case -106:
pDescString[i] = 214;
case -106:
pDescString[i] = 214;
j++;
break;
// ß
case -97:
pDescString[i] = 223;
case -97:
pDescString[i] = 223;
j++;
break;
}
@@ -676,7 +676,7 @@ BOOLEAN LoadBRDesc(UINT16 ubIndex, STR16 pDescString )
{
// This character determines the special character
switch ( (unsigned char)Item[ubIndex].szBRDesc [j + 1] )
{
{
//capital letters
case 129: pDescString[ i ] = 197; j++; break; //U+0401 d0 81 CYRILLIC CAPITAL LETTER IO
@@ -710,7 +710,7 @@ BOOLEAN LoadBRDesc(UINT16 ubIndex, STR16 pDescString )
case 171: pDescString[ i ] = 219; j++; break;
case 172: pDescString[ i ] = 220; j++; break;
case 173: pDescString[ i ] = 221; j++; break;
case 174: pDescString[ i ] = 222; j++; break;
case 174: pDescString[ i ] = 222; j++; break;
case 175: pDescString[ i ] = 223; j++; break; //U+042F d0 af CYRILLIC CAPITAL LETTER YA
//small letters
@@ -728,7 +728,7 @@ BOOLEAN LoadBRDesc(UINT16 ubIndex, STR16 pDescString )
case 187: pDescString[ i ] = 235; j++; break;
case 188: pDescString[ i ] = 236; j++; break;
case 189: pDescString[ i ] = 237; j++; break;
case 190: pDescString[ i ] = 238; j++; break;
case 190: pDescString[ i ] = 238; j++; break;
case 191: pDescString[ i ] = 239; j++; break; //U+043F d0 bf CYRILLIC SMALL LETTER PE
}
}
@@ -737,7 +737,7 @@ BOOLEAN LoadBRDesc(UINT16 ubIndex, STR16 pDescString )
{
// This character determines the special character
switch ( (unsigned char)Item[ubIndex].szBRDesc [j + 1] )
{
{
case 128: pDescString[ i ] = 240; j++; break; //U+0440 p d1 80 CYRILLIC SMALL LETTER ER
case 129: pDescString[ i ] = 241; j++; break;
case 130: pDescString[ i ] = 242; j++; break;
@@ -784,7 +784,7 @@ BOOLEAN LoadShortNameItemInfo(UINT16 ubIndex, STR16 pNameString )
for (int i=0;i<80;i++)
{
j++;
if ( i<(int)wcslen(Item[ubIndex].szItemName))
{
pNameString[i] = Item[ubIndex].szItemName [j];
@@ -798,39 +798,39 @@ BOOLEAN LoadShortNameItemInfo(UINT16 ubIndex, STR16 pNameString )
switch (Item[ubIndex].szItemName [j + 1])
{
// ü
case -68:
case -68:
pNameString[i] = 252;
// Skip next character, because "umlaute" have 2 chars
j++;
break;
// Ü
case -100:
case -100:
pNameString[i] = 220;
j++;
break;
// ä
case -92:
pNameString[i] = 228;
case -92:
pNameString[i] = 228;
j++;
break;
// Ä
case -124:
pNameString[i] = 196;
case -124:
pNameString[i] = 196;
j++;
break;
// ö
case -74:
pNameString[i] = 246;
case -74:
pNameString[i] = 246;
j++;
break;
// Ö
case -106:
pNameString[i] = 214;
case -106:
pNameString[i] = 214;
j++;
break;
// ß
case -97:
pNameString[i] = 223;
case -97:
pNameString[i] = 223;
j++;
break;
}
@@ -870,7 +870,7 @@ BOOLEAN LoadShortNameItemInfo(UINT16 ubIndex, STR16 pNameString )
{
// This character determines the special character
switch ( (unsigned char)Item[ubIndex].szItemName [j + 1] )
{
{
//capital letters
case 129: pNameString[ i ] = 197; j++; break; //U+0401 d0 81 CYRILLIC CAPITAL LETTER IO
@@ -904,7 +904,7 @@ BOOLEAN LoadShortNameItemInfo(UINT16 ubIndex, STR16 pNameString )
case 171: pNameString[ i ] = 219; j++; break;
case 172: pNameString[ i ] = 220; j++; break;
case 173: pNameString[ i ] = 221; j++; break;
case 174: pNameString[ i ] = 222; j++; break;
case 174: pNameString[ i ] = 222; j++; break;
case 175: pNameString[ i ] = 223; j++; break; //U+042F d0 af CYRILLIC CAPITAL LETTER YA
//small letters
@@ -922,7 +922,7 @@ BOOLEAN LoadShortNameItemInfo(UINT16 ubIndex, STR16 pNameString )
case 187: pNameString[ i ] = 235; j++; break;
case 188: pNameString[ i ] = 236; j++; break;
case 189: pNameString[ i ] = 237; j++; break;
case 190: pNameString[ i ] = 238; j++; break;
case 190: pNameString[ i ] = 238; j++; break;
case 191: pNameString[ i ] = 239; j++; break; //U+043F d0 bf CYRILLIC SMALL LETTER PE
}
}
@@ -931,7 +931,7 @@ BOOLEAN LoadShortNameItemInfo(UINT16 ubIndex, STR16 pNameString )
{
// This character determines the special character
switch ( (unsigned char)Item[ubIndex].szItemName [j + 1] )
{
{
case 128: pNameString[ i ] = 240; j++; break; //U+0440 p d1 80 CYRILLIC SMALL LETTER ER
case 129: pNameString[ i ] = 241; j++; break;
case 130: pNameString[ i ] = 242; j++; break;
@@ -1021,3 +1021,4 @@ FLOAT GetWeightBasedOnMetricOption( UINT32 uiObjectWeight )
}