Item Select / Template Changes

NovFR · Apr 11, 2021 · f15823d · f15823d
1 parent 1ec89d4
commit f15823d
Show file tree

Hide file tree

Showing 17 changed files with 733 additions and 164 deletions.
diff --git a/Binaries/GlEd.exe b/Binaries/GlEd.exe
diff --git a/Binaries/Locales/en-US.db b/Binaries/Locales/en-US.db
diff --git a/Binaries/Locales/fr-FR.db b/Binaries/Locales/fr-FR.db
diff --git a/Source/GlEd.depend b/Source/GlEd.depend
@@ -1,5 +1,5 @@
 # depslib dependency file v1.0
-1618064879 source:f:\programmation\sources\jeux\divinity original sin ii\resources\application.rc
+1618157228 source:f:\programmation\sources\jeux\divinity original sin ii\resources\application.rc
 	"_Global.h"
 	"_Version.h"
 
@@ -16,9 +16,9 @@
 	<stdio.h>
 	<DbgHelp.h>
 
-1617590887 f:\programmation\sources\jeux\divinity original sin ii\includes\_version.h
+1618102541 f:\programmation\sources\jeux\divinity original sin ii\includes\_version.h
 
-1617932581 source:f:\programmation\sources\jeux\divinity original sin ii\sources\application.c
+1618158933 source:f:\programmation\sources\jeux\divinity original sin ii\sources\application.c
 	"Application.h"
 	"Game.h"
 	"Menus.h"
@@ -36,7 +36,7 @@
 1593072788 f:\programmation\sources\jeux\divinity original sin ii\sources\libs\sqlite3\includes\sqlite3.h
 	<stdarg.h>
 
-1618065681 f:\programmation\sources\jeux\divinity original sin ii\includes\locale.h
+1618158931 f:\programmation\sources\jeux\divinity original sin ii\includes\locale.h
 	"Lists.h"
 
 1616266490 f:\programmation\sources\jeux\divinity original sin ii\includes\lists.h
@@ -55,7 +55,7 @@
 1617979431 f:\programmation\sources\jeux\divinity original sin ii\includes\xmltree.h
 	"Dialogs.h"
 
-1618066080 f:\programmation\sources\jeux\divinity original sin ii\includes\game.h
+1618156222 f:\programmation\sources\jeux\divinity original sin ii\includes\game.h
 	"XML.h"
 	"Menus.h"
 
@@ -137,7 +137,7 @@
 	"Menus.h"
 	"Requests.h"
 
-1618065994 f:\programmation\sources\jeux\divinity original sin ii\includes\gameedit.h
+1618160705 f:\programmation\sources\jeux\divinity original sin ii\includes\gameedit.h
 	"Game.h"
 
 1618062223 f:\programmation\sources\jeux\divinity original sin ii\includes\dialogs.h
@@ -193,15 +193,15 @@
 	"Texts.h"
 	"Locale.h"
 
-1618065729 source:f:\programmation\sources\jeux\divinity original sin ii\sources\game\game_display.c
+1618156240 source:f:\programmation\sources\jeux\divinity original sin ii\sources\game\game_display.c
 	"Application.h"
 	"Locale.h"
 	"Texts.h"
 	"Game.h"
 	"Utils.h"
 	"Dialogs.h"
 
-1618096221 source:f:\programmation\sources\jeux\divinity original sin ii\sources\game\game_divine.c
+1618148712 source:f:\programmation\sources\jeux\divinity original sin ii\sources\game\game_divine.c
 	"Application.h"
 	"Locale.h"
 	"Texts.h"
@@ -220,7 +220,7 @@
 1616266466 f:\programmation\sources\jeux\divinity original sin ii\includes\lastfiles.h
 	"Menus.h"
 
-1618065335 source:f:\programmation\sources\jeux\divinity original sin ii\sources\game\game_edit.c
+1618148276 source:f:\programmation\sources\jeux\divinity original sin ii\sources\game\game_edit.c
 	"Application.h"
 	"GameEdit.h"
 	"Locale.h"
@@ -240,7 +240,7 @@
 	"Utils.h"
 	"Requests.h"
 
-1618066080 source:f:\programmation\sources\jeux\divinity original sin ii\sources\game\game_manager.c
+1618156608 source:f:\programmation\sources\jeux\divinity original sin ii\sources\game\game_manager.c
 	"Application.h"
 	"Locale.h"
 	"Texts.h"
@@ -372,7 +372,7 @@
 	"Requests.h"
 	"Utils.h"
 
-1617967146 source:f:\programmation\sources\jeux\divinity original sin ii\sources\windows\windows_windows.c
+1618156222 source:f:\programmation\sources\jeux\divinity original sin ii\sources\windows\windows_windows.c
 	"Application.h"
 	"About.h"
 	"Texts.h"
@@ -533,10 +533,10 @@
 	"Game.h"
 	"Texts.h"
 
-1618065980 source:f:\programmation\sources\jeux\divinity original sin ii\sources\game\edit\game_edit_items.c
+1618160675 source:f:\programmation\sources\jeux\divinity original sin ii\sources\game\edit\game_edit_items.c
 	"Application.h"
 	"GameEdit.h"
-	"XML.h"
-	"Texts.h"
 	"Utils.h"
+	"Requests.h"
+	"Texts.h"
 
diff --git a/Source/GlEd.layout b/Source/GlEd.layout
diff --git a/Source/GlEd.workspace.layout b/Source/GlEd.workspace.layout
@@ -2,4 +2,5 @@
 <CodeBlocks_workspace_layout_file>
 	<FileVersion major="1" minor="0" />
 	<ActiveProject path="GlEd.cbp" />
+	<PreferredTarget name="Debug" />
 </CodeBlocks_workspace_layout_file>
diff --git a/Source/Includes/Game.h b/Source/Includes/Game.h
@@ -304,22 +304,25 @@ typedef struct GAMEDATAPARSER {
 // «»»» Gestion «««««««««««««««««««««««««««««««««««««««««««««««««««««««««»
 
 int			Game_CreateLayout(void);
+int			Game_CreateInventoryGroups(HWND);
 int			Game_CreateButton(HWND,int,int,int,int,WCHAR *,UINT,HWND *,UINT);
 void			Game_Resize(void);
 
 void			Game_InventoryMenu(HWND,UINT);
 int CALLBACK		Game_ItemsListSort(LPARAM,LPARAM,LPARAM);
 
 void			Game_Setup(DOS2CHARACTER *,BOOL,BOOL);
-int			Game_BuildPlayers(void);
-void			Game_ReleasePlayers(void);
+int			Game_BuildPlayers(NODE *,BOOL);
+void			Game_ReleasePlayers(NODE *,BOOL);
 DOS2INVENTORY*		Game_BuildInventory(DOS2ITEM *,XML_ATTR *,NODE *);
 UINT			Game_GetInventoryItemsCount(XML_NODE *,WCHAR *);
 void			Game_ReleaseInventory(DOS2INVENTORY *);
+void			Game_ReleaseItem(DOS2ITEM *);
 void			Game_ReleaseDisplayNames(void);
 void			Game_CharacterChanged(BOOL);
+void			Game_BuildItemsList(DOS2CHARACTER *,HWND);
 void			Game_UpdateButtons(void);
-void			Game_SaveTopIndex(void);
+void			Game_SaveTopIndex(DOS2CHARACTER *,HWND);
 
 void			Game_Lock(DWORD);
 UINT			Game_GetLevelFromExp(UINT);
@@ -352,7 +355,7 @@ int			Game_PaintStat(HDC,HWND,RECT *,UINT,WCHAR *,UINT);
 void			Game_PaintValue(HDC,LONG,HWND,WCHAR *,WCHAR *,UINT);
 
 void			Game_PaintButton(DRAWITEMSTRUCT *);
-void			Game_PaintBag(DRAWITEMSTRUCT *);
+void			Game_PaintBag(DOS2CHARACTER *,DRAWITEMSTRUCT *);
 void			Game_PaintIcon(HDC,WCHAR *,UINT,RECT *,int,BOOL,BOOL);
 
 // «»»» Fenêtre des attributs «««««««««««««««««««««««««««««««««««««««««««»

diff --git a/Source/Includes/GameEdit.h b/Source/Includes/GameEdit.h
@@ -159,6 +159,15 @@ enum {
 // ¤¤¤									  ¤¤¤ //
 // ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ //
 
+//--- Sélection d'un objet ---
+
+typedef struct GAMEITEMSELECT {
+	HWND			hwndParent;
+	NODE			players;
+	DOS2ITEM*		pItem;
+	DOS2CHARACTER*		pdcCurrent;
+} GAMEITEMSELECT;
+
 //--- Edition d'une valeur ---
 
 typedef struct GAMEEDITVALUE {
@@ -357,6 +366,7 @@ typedef struct GAMEEDITITEMCONTEXT {
 	NODE			nodeBoosters;
 	NODE			nodeBonuses;
 	GAMEEDITRUNE		runes[3];
+	GAMEITEMSELECT		select;
 } GAMEEDITITEMCONTEXT;
 
 typedef struct GAMEEDITBONUSCONTEXT {
@@ -592,6 +602,12 @@ GAMEDATASKILL*		Game_SkillsGetById(WCHAR *,NODE *);
 
 // «»»» Objets ««««««««««««««««««««««««««««««««««««««««««««««««««««««««««»
 
+DOS2ITEM*		Game_ItemSelect(HWND);
+INT_PTR CALLBACK	Game_ItemSelectProc(HWND,UINT,WPARAM,LPARAM);
+void			Game_ItemCharacterChanged(HWND,GAMEITEMSELECT *);
+void			Game_ItemChanged(HWND,GAMEITEMSELECT *);
+void			Game_ItemMenu(HWND,HWND,UINT,GAMEITEMSELECT *);
+
 int			Game_ItemTemplateCheck(DOS2ITEM *,WCHAR *,UINT);
 int			Game_ItemTemplateMsg(HWND,int);
 

diff --git a/Source/Includes/Locale.h b/Source/Includes/Locale.h
@@ -67,6 +67,7 @@ enum {
 		LOCALE(IDM_INVBACKPACKCLOSEALL), \
 		LOCALE(IDM_INVALL), \
 		LOCALE(IDM_INVSYNCHROALL), \
+		LOCALE(IDM_INVSELECT), \
 		LOCALE(IDM_CANCEL), \
 		LOCALE(IDM_LIST_SELECTED), \
 		LOCALE(IDM_LIST_EXPAND), \
@@ -224,6 +225,7 @@ enum {
 		LOCALE(TEXT_DIALOG_TITLE_SKILLS), \
 		LOCALE(TEXT_DIALOG_TITLE_TEMPLATE), \
 		LOCALE(TEXT_DIALOG_TITLE_OWNERSHIP), \
+		LOCALE(TEXT_DIALOG_TITLE_ITEMSELECT), \
 		LOCALE(TEXT_DIALOG_INFO_SETVALUE), \
 		LOCALE(TEXT_DIALOG_INFO_NAME), \
 		LOCALE(TEXT_DIALOG_INFO_AMOUNT), \
@@ -244,6 +246,7 @@ enum {
 		LOCALE(TEXT_DIALOG_OBJECT_ORIGINALTEMPLATE), \
 		LOCALE(TEXT_DIALOG_OBJECT_CURRENTTEMPLATE), \
 		LOCALE(TEXT_DIALOG_OBJECT_TEMPLATETYPE), \
+		LOCALE(TEXT_DIALOG_OBJECT_RESETTEMPLATE), \
 		LOCALE(TEXT_DIALOG_OBJECT_COPYTEMPLATE), \
 		LOCALE(TEXT_DIALOG_OBJECT_SELECTTEMPLATE), \
 		LOCALE(TEXT_DIALOG_OBJECT_OWNERSHIP), \

diff --git a/Source/Resources/Application.rc b/Source/Resources/Application.rc
@@ -630,6 +630,20 @@ FONT 8, L"MS Shell Dlg"
 	PUSHBUTTON	L"",	IDCANCEL, 324, 276,  64,  16
 }
 
+//--- Sélection d'objet ---
+
+1300 DIALOGEX 0, 0, 380, 392
+STYLE DS_MODALFRAME|WS_BORDER|WS_VISIBLE|WS_CAPTION|WS_SYSMENU|DS_SHELLFONT
+CLASS L"GlEdDialog32"
+FONT 8, L"MS Shell Dlg"
+{
+	COMBOBOX		200,        4,   4, 372, 200, WS_CHILD|WS_VISIBLE|WS_VSCROLL|WS_TABSTOP|CBS_DROPDOWNLIST|CBS_OWNERDRAWFIXED
+	CONTROL		L"",	300, L"SysListView32", WS_CHILD|WS_VISIBLE|WS_VSCROLL|WS_TABSTOP|LVS_REPORT|LVS_SINGLESEL|LVS_NOCOLUMNHEADER|LVS_SHOWSELALWAYS|LVS_OWNERDRAWFIXED, 4, 24, 372, 344, WS_EX_CLIENTEDGE
+
+	CONTROL 	L"",	301, L"STATIC", WS_CHILD|WS_VISIBLE|SS_OWNERDRAW,   4, 372, 234,  16, WS_EX_CLIENTEDGE
+	DEFPUSHBUTTON	L"",	IDOK,	  244, 372,  64,  16, WS_DISABLED
+	PUSHBUTTON	L"",	IDCANCEL, 312, 372,  64,  16
+}
 
 // «»»» Modification des objets «««««««««««««««««««««««««««««««««««««««««»
 
@@ -758,8 +772,9 @@ FONT 8, L"MS Shell Dlg"
 	EDITTEXT		302,	  178,  76,  30,  12, ES_NUMBER
 	CONTROL		L"",	303, L"STATIC", WS_CHILD|WS_VISIBLE|SS_OWNERDRAW,  12,  76, 160,  12
 
-	PUSHBUTTON	L"",	304,      178,  92, 200,  14
-	PUSHBUTTON	L"",	305,      178, 110, 200,  14
+	PUSHBUTTON	L"",	304,      178,  92, 200,  14, WS_DISABLED
+	PUSHBUTTON	L"",	305,      178, 108, 200,  14
+	PUSHBUTTON	L"",	306,      178, 124, 200,  14
 }
 
 //--- Page: Propriété ---

diff --git a/Source/Sources/Application.c b/Source/Sources/Application.c
@@ -175,6 +175,28 @@ CUSTOMMENUTEMPLATE	InvMenu[] = {
 
 			};
 
+CUSTOMMENUTEMPLATE	InvSelectMenu[] = {
+
+				{ MENU_POPUP, MENU_INVENTORY },
+					{ MENU_ITEM, IDM_INVSELECTED, MFS_GRAYED, 0, 0, MENU_FLAG_SEPARATOR },
+					{ MENU_BLANK },
+					{ MENU_ITEM, IDM_INVSELECT },
+					{ MENU_BLANK },
+					{ MENU_ITEM, IDM_INVNODES },
+					{ MENU_BLANK },
+					{ MENU_ITEM, IDM_INVBACKPACK, MFS_GRAYED, 0, 0, MENU_FLAG_SEPARATOR },
+					{ MENU_BLANK },
+					{ MENU_ITEM, IDM_INVBACKPACKOPEN },
+					{ MENU_ITEM, IDM_INVBACKPACKCLOSE },
+					{ MENU_ITEM, IDM_INVBACKPACKCLOSEALL },
+					{ MENU_BLANK },
+					{ MENU_SEPARATOR },
+					{ MENU_ITEM, IDM_CANCEL },
+					{ MENU_STOP },
+				{ MENU_STOP }
+
+			};
+
 CUSTOMMENUTEMPLATE	SkillsListMenu[] = {
 
 				{ MENU_POPUP, MENU_LIST },