• R/O
  • SSH
  • HTTPS

gd10: Commit


Commit MetaInfo

Revisão153 (tree)
Hora2019-08-21 03:13:25
Autorhgtterry

Mensagem de Log

Stock Sounds 200819

Mudança Sumário

Diff

--- Equity10/GD10_Objects_New.cpp (revision 152)
+++ Equity10/GD10_Objects_New.cpp (revision 153)
@@ -1658,7 +1658,7 @@
16581658 App->GDCL_Scene_Data->St_Sounds[SoundIndex]->SndFile = NULL;
16591659 strcpy(App->GDCL_Scene_Data->St_Sounds[SoundIndex]->SoundFile,"footstep.ogg");
16601660 strcpy(App->GDCL_Scene_Data->St_Sounds[SoundIndex]->SoundFileAndPath,"footstep.ogg");
1661- App->GDCL_Scene_Data->St_Sounds[SoundIndex]->Volume = 100;
1661+ App->GDCL_Scene_Data->St_Sounds[SoundIndex]->Volume = 1;
16621662 App->GDCL_Scene_Data->St_Sounds[SoundIndex]->Sound_ID = App->GDCL_Scene_Data->StockSounds_ID_Counter;
16631663
16641664 App->GDCL_FileView->Add_Stock_Sound(App->GDCL_Scene_Data->St_Sounds[SoundIndex]->Name, App->GDCL_Scene_Data->Stock_Sound_Count);
--- Equity10/GD_FileView.cpp (revision 152)
+++ Equity10/GD_FileView.cpp (revision 153)
@@ -1124,7 +1124,10 @@
11241124 tvinsert.item.lParam = Index;
11251125 HTREEITEM Temp = (HTREEITEM) SendDlgItemMessage( App->ListPanel,IDC_TREE2,TVM_INSERTITEM,0,(LPARAM)&tvinsert);
11261126
1127- //TreeView_Select(Temp2,Temp,TVGN_CARET);
1127+ if (App->GDCL_Load_Scene->File_Is_Loading == 0)
1128+ {
1129+ TreeView_Select(Temp2, Temp, TVGN_CARET);
1130+ }
11281131 }
11291132
11301133 // *************************************************************************
--- Equity10/GD_Stock.cpp (revision 152)
+++ Equity10/GD_Stock.cpp (revision 153)
@@ -38,20 +38,19 @@
3838 case WM_INITDIALOG:
3939 {
4040
41- /*SendDlgItemMessage(hDlg,IDC_STOBJECTNAME, WM_SETFONT, (WPARAM)App->Font_CB15, MAKELPARAM(TRUE, 0));
42-
43- App->GDCL_Object_Props->Edit_Type = Enums::Edit_Mesh_Object;*/
41+ SendDlgItemMessage(hDlg,IDC_STOBJECTNAME, WM_SETFONT, (WPARAM)App->Font_CB15, MAKELPARAM(TRUE, 0));
42+ return TRUE;
4443 }
4544
4645 case WM_CTLCOLORSTATIC:
4746 {
48- /*if(GetDlgItem(hDlg,IDC_STOBJECTNAME) == (HWND)lParam)
47+ if(GetDlgItem(hDlg, IDC_STOBJECTNAME) == (HWND)lParam)
4948 {
5049 SetBkColor((HDC) wParam, RGB(0, 255, 0));
5150 SetTextColor((HDC) wParam, RGB(0,0,0));
5251 SetBkMode((HDC) wParam, TRANSPARENT);
5352 return (UINT) App->AppBackground;
54- }*/
53+ }
5554
5655 return FALSE;
5756 }
@@ -71,14 +70,14 @@
7170 {
7271 LPNMHDR some_item = (LPNMHDR)lParam;
7372
74- /* if (some_item->idFrom == IDC_OBJECT_SEL && some_item->code == NM_CUSTOMDRAW)
73+ if (some_item->idFrom == IDC_TESTSTOCK && some_item->code == NM_CUSTOMDRAW)
7574 {
7675 LPNMCUSTOMDRAW item = (LPNMCUSTOMDRAW)some_item;
77- App->Custom_Button_Toggle(item,App->GDCL_Object_Props->Object_Selection);
76+ App->Custom_Button_Normal(item);
7877 return CDRF_DODEFAULT;
7978 }
8079
81- if (some_item->idFrom == IDC_PHYSICS_SEL && some_item->code == NM_CUSTOMDRAW)
80+ /*if (some_item->idFrom == IDC_PHYSICS_SEL && some_item->code == NM_CUSTOMDRAW)
8281 {
8382 LPNMCUSTOMDRAW item = (LPNMCUSTOMDRAW)some_item;
8483 App->Custom_Button_Toggle(item,App->GDCL_Object_Props->Physics_Selection);
@@ -126,7 +125,7 @@
126125
127126 if(App->GDCL_Stock->Selected_Stock_Type = Enums::Stock_Type_Sound)
128127 {
129-
128+ App->GDCL_Stock->Test_Sound();
130129 }
131130
132131 return 1;
@@ -146,7 +145,7 @@
146145 int NUM_COLS = 2;
147146 Properties_hLV = CreateWindowEx(0, WC_LISTVIEW, "",
148147 WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_VSCROLL | LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SHOWSELALWAYS, 7, 50,
149- 230, 340, App->GD_Stock_Hwnd, 0, App->hInst, NULL);
148+ 220, 400, App->GD_Stock_Hwnd, 0, App->hInst, NULL);
150149
151150 DWORD exStyles = LVS_EX_FULLROWSELECT | LVS_EX_GRIDLINES;
152151
@@ -900,3 +899,22 @@
900899 return -1;
901900 }
902901
902+// *************************************************************************
903+// * Test_Sound Terry Bernie *
904+// *************************************************************************
905+void GD_Stock::Test_Sound(void)
906+{
907+ int Index = App->GDCL_Stock->Selected_Stock_Index;
908+
909+ char buff[1024];
910+ strcpy(buff, App->GDCL_SoundMgr->Default_Folder);
911+ strcat(buff, "\\Media\\Sounds\\");
912+ strcat(buff, App->GDCL_Scene_Data->St_Sounds[Index]->SoundFile);
913+
914+ App->GDCL_Scene_Data->St_Sounds[Index]->SndFile = App->GDCL_SoundMgr->SoundEngine->play2D(buff, false, true, true);
915+ App->GDCL_Scene_Data->St_Sounds[Index]->SndFile->setVolume(App->GDCL_Scene_Data->St_Sounds[Index]->Volume);
916+ App->GDCL_Scene_Data->St_Sounds[Index]->SndFile->setIsPaused(false);
917+
918+
919+}
920+
--- Equity10/GD_Stock.h (revision 152)
+++ Equity10/GD_Stock.h (revision 153)
@@ -28,6 +28,8 @@
2828 int Edit_Message_Stock(LPARAM lParam);
2929 int Edit_Sound_Stock(LPARAM lParam);
3030
31+ void Test_Sound(void);
32+
3133 char btext[255];
3234 };
3335
--- Equity10/VersionNo2.h (revision 152)
+++ Equity10/VersionNo2.h (revision 153)
@@ -39,21 +39,21 @@
3939 #ifndef _VERSIONNO__H_
4040 #define _VERSIONNO__H_
4141
42-#define VERSION_FULL 1.23.231.2
42+#define VERSION_FULL 1.23.231.10
4343
4444 #define VERSION_BASEYEAR 2019
4545 #define VERSION_DATE "2019-08-20"
46-#define VERSION_TIME "18:38:27"
46+#define VERSION_TIME "19:12:44"
4747
4848 #define VERSION_MAJOR 1
4949 #define VERSION_MINOR 23
5050 #define VERSION_BUILDNO 231
51-#define VERSION_EXTEND 2
51+#define VERSION_EXTEND 10
5252
53-#define VERSION_FILE 1,23,231,2
54-#define VERSION_PRODUCT 1,23,231,9
55-#define VERSION_FILESTR "1,23,231,2\0"
56-#define VERSION_PRODUCTSTR "1,23,231,9\0"
53+#define VERSION_FILE 1,23,231,10
54+#define VERSION_PRODUCT 1,23,231,17
55+#define VERSION_FILESTR "1,23,231,10\0"
56+#define VERSION_PRODUCTSTR "1,23,231,17\0"
5757 #define VERSION_EVERSION "0.3.4.0\0"
5858
5959 #endif
\ No newline at end of file
Show on old repository browser