mirror of
https://github.com/1dot13/source.git
synced 2026-09-16 14:47:17 +02:00
New feature: the trade menu is now resolution dependent, as a result more items can be traded at the same time. Trader budget is now also displayed.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8389 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
+507
-1596
File diff suppressed because it is too large
Load Diff
@@ -3,25 +3,6 @@
|
|||||||
|
|
||||||
#include "Store Inventory.h"
|
#include "Store Inventory.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#define SKI_NUM_TRADING_INV_SLOTS 12
|
|
||||||
#define SKI_NUM_TRADING_INV_ROWS 2
|
|
||||||
#define SKI_NUM_TRADING_INV_COLS 6
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//Enums used for when the user clicks on an item and the item goes to..
|
//Enums used for when the user clicks on an item and the item goes to..
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
@@ -83,9 +64,6 @@ public:
|
|||||||
|
|
||||||
#define SIZEOF_INVENTORY_IN_SLOT_POD offsetof (INVENTORY_IN_SLOT, endOfPod)
|
#define SIZEOF_INVENTORY_IN_SLOT_POD offsetof (INVENTORY_IN_SLOT, endOfPod)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
extern INVENTORY_IN_SLOT PlayersOfferArea[ SKI_NUM_TRADING_INV_SLOTS ];
|
|
||||||
extern INT32 giShopKeepDialogueEventinProgress;
|
extern INT32 giShopKeepDialogueEventinProgress;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1907,6 +1907,7 @@ enum
|
|||||||
SKI_TEXT_NO_MORE_ROOM_IN_PLAYER_OFFER_AREA,
|
SKI_TEXT_NO_MORE_ROOM_IN_PLAYER_OFFER_AREA,
|
||||||
SKI_TEXT_MINUTES,
|
SKI_TEXT_MINUTES,
|
||||||
SKI_TEXT_DROP_ITEM_TO_GROUND,
|
SKI_TEXT_DROP_ITEM_TO_GROUND,
|
||||||
|
SKI_TEXT_BUDGET,
|
||||||
TEXT_NUM_SKI_TEXT
|
TEXT_NUM_SKI_TEXT
|
||||||
};
|
};
|
||||||
extern STR16 SKI_Text[];
|
extern STR16 SKI_Text[];
|
||||||
|
|||||||
@@ -6003,6 +6003,7 @@ STR16 SKI_Text[ ] =
|
|||||||
L"你没有空余的位置来放东西了。", //"There is not enough room in your offer area.",//Message box that tells the user there is no more room to put there stuff
|
L"你没有空余的位置来放东西了。", //"There is not enough room in your offer area.",//Message box that tells the user there is no more room to put there stuff
|
||||||
L"%d分钟", //"%d MINUTES", // The text underneath the inventory slot when an item is given to the dealer to be repaired
|
L"%d分钟", //"%d MINUTES", // The text underneath the inventory slot when an item is given to the dealer to be repaired
|
||||||
L"把物品放在地上。", //"Drop Item To Ground.",
|
L"把物品放在地上。", //"Drop Item To Ground.",
|
||||||
|
L"BUDGET", // TODO.Translate
|
||||||
};
|
};
|
||||||
|
|
||||||
//ShopKeeper Interface
|
//ShopKeeper Interface
|
||||||
|
|||||||
@@ -6012,6 +6012,7 @@ STR16 SKI_Text[ ] =
|
|||||||
L"Er is geen ruimte meer.", //Message box that tells the user there is no more room to put there stuff
|
L"Er is geen ruimte meer.", //Message box that tells the user there is no more room to put there stuff
|
||||||
L"%d MINUTEN", // The text underneath the inventory slot when an item is given to the dealer to be repaired
|
L"%d MINUTEN", // The text underneath the inventory slot when an item is given to the dealer to be repaired
|
||||||
L"Drop Item op Grond.",
|
L"Drop Item op Grond.",
|
||||||
|
L"BUDGET", // TODO.Translate
|
||||||
};
|
};
|
||||||
|
|
||||||
//ShopKeeper Interface
|
//ShopKeeper Interface
|
||||||
|
|||||||
@@ -6005,6 +6005,7 @@ STR16 SKI_Text[ ] =
|
|||||||
L"There is not enough room in your offer area.", //Message box that tells the user there is no more room to put there stuff
|
L"There is not enough room in your offer area.", //Message box that tells the user there is no more room to put there stuff
|
||||||
L"%d MINUTES", // The text underneath the inventory slot when an item is given to the dealer to be repaired
|
L"%d MINUTES", // The text underneath the inventory slot when an item is given to the dealer to be repaired
|
||||||
L"Drop Item To Ground.",
|
L"Drop Item To Ground.",
|
||||||
|
L"BUDGET",
|
||||||
};
|
};
|
||||||
|
|
||||||
//ShopKeeper Interface
|
//ShopKeeper Interface
|
||||||
|
|||||||
@@ -6017,6 +6017,7 @@ STR16 SKI_Text[ ] =
|
|||||||
L"Plus d'emplacements libres.", //Message box that tells the user there is non more room to put there stuff
|
L"Plus d'emplacements libres.", //Message box that tells the user there is non more room to put there stuff
|
||||||
L"%d MINUTES", // The text underneath the inventory slot when an item is given to the dealer to be repaired
|
L"%d MINUTES", // The text underneath the inventory slot when an item is given to the dealer to be repaired
|
||||||
L"Objet lâché à terre.",
|
L"Objet lâché à terre.",
|
||||||
|
L"BUDGET", // TODO.Translate
|
||||||
};
|
};
|
||||||
|
|
||||||
//ShopKeeper Interface
|
//ShopKeeper Interface
|
||||||
|
|||||||
@@ -5863,6 +5863,7 @@ STR16 SKI_Text[] =
|
|||||||
L"Es ist kein Platz mehr, um Sachen anzubieten.", //Message box that tells the user there is no more room to put there stuff
|
L"Es ist kein Platz mehr, um Sachen anzubieten.", //Message box that tells the user there is no more room to put there stuff
|
||||||
L"%d MINUTEN", // The text underneath the inventory slot when an item is given to the dealer to be repaired
|
L"%d MINUTEN", // The text underneath the inventory slot when an item is given to the dealer to be repaired
|
||||||
L"Gegenstand fallenlassen.",
|
L"Gegenstand fallenlassen.",
|
||||||
|
L"BUDGET",
|
||||||
};
|
};
|
||||||
|
|
||||||
//ShopKeeper Interface
|
//ShopKeeper Interface
|
||||||
|
|||||||
@@ -5998,6 +5998,7 @@ STR16 SKI_Text[ ] =
|
|||||||
L"Non c'è abbastanza spazio nel vostro margine di ordine.", //Message box that tells the user there is no more room to put there stuff
|
L"Non c'è abbastanza spazio nel vostro margine di ordine.", //Message box that tells the user there is no more room to put there stuff
|
||||||
L"%d MINUTI", // The text underneath the inventory slot when an item is given to the dealer to be repaired
|
L"%d MINUTI", // The text underneath the inventory slot when an item is given to the dealer to be repaired
|
||||||
L"Lascia oggetto a terra.",
|
L"Lascia oggetto a terra.",
|
||||||
|
L"BUDGET", // TODO.Translate
|
||||||
};
|
};
|
||||||
|
|
||||||
//ShopKeeper Interface
|
//ShopKeeper Interface
|
||||||
|
|||||||
@@ -6013,6 +6013,7 @@ STR16 SKI_Text[ ] =
|
|||||||
L"Brak miejsca by zaoferować więcej rzeczy.", //Message box that tells the user there is no more room to put there stuff
|
L"Brak miejsca by zaoferować więcej rzeczy.", //Message box that tells the user there is no more room to put there stuff
|
||||||
L"%d MINUT(Y)", // The text underneath the inventory slot when an item is given to the dealer to be repaired
|
L"%d MINUT(Y)", // The text underneath the inventory slot when an item is given to the dealer to be repaired
|
||||||
L"Upuść przedmiot na ziemię.",
|
L"Upuść przedmiot na ziemię.",
|
||||||
|
L"BUDGET", // TODO.Translate
|
||||||
};
|
};
|
||||||
|
|
||||||
//ShopKeeper Interface
|
//ShopKeeper Interface
|
||||||
|
|||||||
@@ -6004,6 +6004,7 @@ STR16 SKI_Text[ ] =
|
|||||||
L"Вам уже некуда класть вещи.", //Message box that tells the user there is no more room to put there stuff
|
L"Вам уже некуда класть вещи.", //Message box that tells the user there is no more room to put there stuff
|
||||||
L"%d МИНУТ", // The text underneath the inventory slot when an item is given to the dealer to be repaired
|
L"%d МИНУТ", // The text underneath the inventory slot when an item is given to the dealer to be repaired
|
||||||
L"Выбросить предмет на землю.",
|
L"Выбросить предмет на землю.",
|
||||||
|
L"BUDGET", // TODO.Translate
|
||||||
};
|
};
|
||||||
|
|
||||||
//ShopKeeper Interface
|
//ShopKeeper Interface
|
||||||
|
|||||||
Reference in New Issue
Block a user