OSDN -- Desenvolver e Download de Software Open Source
Estado tradução de Português translation status for pt
  • R/O
  • SSH
  • HTTPS

gd10: Commit


Commit MetaInfo

Revisão152 (tree)
Hora2019-08-21 02:41:01
Autorhgtterry

Mensagem de Log

Stock Sounds 200819

Mudança Sumário

Diff

--- Equity10/Eq_FileView.cpp (revision 151)
+++ Equity10/Eq_FileView.cpp (revision 152)
@@ -247,7 +247,21 @@
247247 Sitem.pszText = FolderName;
248248 SendDlgItemMessage( App->ListPanel,IDC_TREE1,TVM_SETITEM ,0,(LPARAM)(const LPTVITEM)&Sitem);
249249 }
250+// *************************************************************************
251+// * ChangeItem_Name_Stock Terry Bernie *
252+// *************************************************************************
253+void Eq_FileView::ChangeItem_Name_Stock(HTREEITEM Folder, char* FolderName)
254+{
255+ HWND Temp = GetDlgItem(App->ListPanel, IDC_TREE2);
256+ HTREEITEM i = TreeView_GetSelection(Temp);
250257
258+ TVITEM Sitem;
259+ Sitem.mask = TVIF_TEXT;
260+ Sitem.hItem = i;
261+ Sitem.pszText = FolderName;
262+ SendDlgItemMessage(App->ListPanel, IDC_TREE2, TVM_SETITEM, 0, (LPARAM)(const LPTVITEM)& Sitem);
263+}
264+
251265 // *************************************************************************
252266 // * AddTextureFile Terry Bernie *
253267 // *************************************************************************
--- Equity10/Eq_FileView.h (revision 151)
+++ Equity10/Eq_FileView.h (revision 152)
@@ -31,7 +31,9 @@
3131 void Init_FileView(void);
3232
3333 void ChangeModelName(void);
34+
3435 void ChangeItem_Name(HTREEITEM Folder,char *FolderName);
36+ void ChangeItem_Name_Stock(HTREEITEM Folder, char* FolderName);
3537
3638 void Add_TextureFile(char *SFileName,int Index);
3739 void Add_MotionFile(char *SFileName,int Index);
--- Equity10/GD_FileView.cpp (revision 151)
+++ Equity10/GD_FileView.cpp (revision 152)
@@ -944,6 +944,7 @@
944944 }
945945 if (!strcmp(FileView_File, "Sounds"))
946946 {
947+ ShowWindow(App->GD_Stock_Hwnd, 1);
947948 App->GDCL_Stock->Selected_Stock_Index = Index;
948949 App->GDCL_Stock->Selected_Stock_Type = Enums::Stock_Type_Sound;
949950 App->GDCL_Stock->Update_Sound_Properties();
--- Equity10/GD_Load_Scene .cpp (revision 151)
+++ Equity10/GD_Load_Scene .cpp (revision 152)
@@ -822,7 +822,7 @@
822822
823823 int Int_Tag = 0;
824824 Int_Tag = App->CL_Ini->GetInt("Counters", "Sounds_ID_Counter", 0, 10);
825- App->GDCL_Scene_Data->Locations_ID_Counter = Int_Tag;
825+ App->GDCL_Scene_Data->StockSounds_ID_Counter = Int_Tag;
826826
827827 return 1;
828828 }
--- Equity10/GD_Scene_Data.cpp (revision 151)
+++ Equity10/GD_Scene_Data.cpp (revision 152)
@@ -320,8 +320,10 @@
320320 App->GDCL_Scene_Data->Scene_Has_Area = 0;
321321 App->GDCL_Scene_Data->Object_ID_Counter = 0;
322322 App->GDCL_Scene_Data->Locations_ID_Counter = 2000;
323+ App->GDCL_Scene_Data->StockSounds_ID_Counter = 3000;
323324
324325 App->GDCL_Scene_Data->Player_Location_Count = 0;
326+ App->GDCL_Scene_Data->Stock_Sound_Count = 0;
325327 App->GDCL_Scene_Data->ObjectCount = 0;
326328
327329 SceneLoaded = 0;
--- Equity10/GD_Stock.cpp (revision 151)
+++ Equity10/GD_Stock.cpp (revision 152)
@@ -192,7 +192,7 @@
192192 if (Selected_Stock_Type == Enums::Stock_Type_Sound)
193193 {
194194
195- //Edit_Player_Physics_Onclick(lParam);
195+ Edit_Sound_Stock(lParam);
196196
197197 return;
198198 }
@@ -287,7 +287,7 @@
287287 strcpy(buf,App->GDCL_Scene_Data->CL_Object[Index]->Name);
288288
289289 char chr_Volume[100];
290- sprintf(chr_Volume,"%i",int(App->GDCL_Scene_Data->St_Sounds[Index]->Volume));
290+ sprintf(chr_Volume, "%.3f", App->GDCL_Scene_Data->St_Sounds[Index]->Volume * 100);
291291
292292 const int NUM_ITEMS = 3;
293293 const int NUM_COLS = 2;
@@ -472,41 +472,78 @@
472472 // *************************************************************************
473473 // * Edit_Sound_Stock Terry Bernie *
474474 // *************************************************************************
475-int GD_Stock::Edit_Sound_Stock()
475+int GD_Stock::Edit_Sound_Stock(LPARAM lParam)
476476 {
477- //int Selected_Row = 0;
477+
478+ int Index = App->GDCL_Stock->Selected_Stock_Index; // Get Selected Object Index
479+ int result = 1;
480+ int test;
478481
479- //char buff[255];
480- //char buff2[255];
482+ LPNMLISTVIEW poo = (LPNMLISTVIEW)lParam;
483+ test = poo->iItem;
484+ ListView_GetItemText(Properties_hLV, test, 0, btext, 20);
481485
482- //int Index2 = 0;
483- //int Index = SendMessage(App->GD_Stock_hgrid, ZGM_GETCURSORINDEX,0,0);
486+ // Name
487+ result = strcmp(btext, "Name");
488+ if (result == 0)
489+ {
490+ strcpy(App->GDCL_Dialogs->btext, "Change Object Name");
491+ strcpy(App->GDCL_Dialogs->Chr_Text, App->GDCL_Scene_Data->St_Sounds[Index]->Name);
484492
485- //SendMessage(App->GD_Stock_hgrid, ZGM_GETCELLTEXT,Index,(LPARAM)buff);
486- //SendMessage(App->GD_Stock_hgrid, ZGM_GETCELLTEXT,Index-1,(LPARAM)buff2);
493+ App->GDCL_Dialogs->Dialog_Text(Enums::Check_Names_Objects);
487494
488- //if (stricmp("Sound",buff2) == 0 || stricmp("Sound",buff)== 0)
489- //{
490- // App->Debug();
491- // /*strcpy(App->GDCL_Dialogs->btext,"Change Default Text");
492- // strcpy(App->GDCL_Dialogs->Chr_Text,App->GDCL_Scene_Data->S_Messages[Selected_Stock_Index]->Default_Text);
495+ if (App->GDCL_Dialogs->Canceled == 1)
496+ {
497+ return TRUE;
498+ }
493499
494- // App->GDCL_Dialogs->Dialog_Text(0);
500+ strcpy(App->GDCL_Scene_Data->St_Sounds[Index]->Name, App->GDCL_Dialogs->Chr_Text);
495501
496- // if (App->GDCL_Dialogs->Canceled == 1)
497- // {
498- // return TRUE;
499- // }
502+ App->CL_FileView->ChangeItem_Name_Stock(NULL, App->GDCL_Dialogs->Chr_Text);
500503
501- // strcpy(App->GDCL_Scene_Data->S_Messages[Selected_Stock_Index]->Default_Text,App->GDCL_Dialogs->Chr_Text);
502- // strcpy(App->GDCL_Dialogs->Chr_Text,App->GDCL_Dialogs->Chr_Text);
504+ Update_Sound_Properties();
505+ }
503506
504- // App->GDCL_Scene_Data->S_Messages[Selected_Stock_Index]->textArea1->setCaption(App->GDCL_Dialogs->Chr_Text);
507+ // Sound
508+ result = strcmp(btext, "Sound");
509+ if (result == 0)
510+ {
505511
506- // Update_Message_Properties();*/
507- // return 1;
508- //}
512+ strcpy(App->GDCL_SoundMgr->Current_Object_Sound, App->GDCL_Scene_Data->St_Sounds[Index]->SoundFile);
509513
514+ App->GDCL_SoundMgr->Dialog_SoundFile();
515+
516+ if (App->GDCL_SoundMgr->IsCancelled == 0)
517+ {
518+ strcpy(App->GDCL_Scene_Data->St_Sounds[Index]->SoundFile, App->GDCL_SoundMgr->mSoundFile);
519+ App->GDCL_Scene_Data->St_Sounds[Index]->Volume = App->GDCL_SoundMgr->SndVolume;
520+ }
521+
522+ Update_Sound_Properties();
523+
524+ return 1;
525+ }
526+
527+ // Volume
528+ result = strcmp(btext, "Volume");
529+ if (result == 0)
530+ {
531+
532+ strcpy(App->GDCL_SoundMgr->Current_Object_Sound, App->GDCL_Scene_Data->St_Sounds[Index]->SoundFile);
533+
534+ App->GDCL_SoundMgr->Dialog_SoundFile();
535+
536+ if (App->GDCL_SoundMgr->IsCancelled == 0)
537+ {
538+ strcpy(App->GDCL_Scene_Data->St_Sounds[Index]->SoundFile, App->GDCL_SoundMgr->mSoundFile);
539+ App->GDCL_Scene_Data->St_Sounds[Index]->Volume = App->GDCL_SoundMgr->SndVolume;
540+ }
541+
542+ Update_Sound_Properties();
543+
544+ return 1;
545+ }
546+
510547 return -1;
511548 }
512549
--- Equity10/GD_Stock.h (revision 151)
+++ Equity10/GD_Stock.h (revision 152)
@@ -26,7 +26,7 @@
2626
2727 void ListView_OnClickOptions(LPARAM lParam);
2828 int Edit_Message_Stock(LPARAM lParam);
29- int Edit_Sound_Stock();
29+ int Edit_Sound_Stock(LPARAM lParam);
3030
3131 char btext[255];
3232 };
--- Equity10/VersionNo2.h (revision 151)
+++ Equity10/VersionNo2.h (revision 152)
@@ -39,21 +39,21 @@
3939 #ifndef _VERSIONNO__H_
4040 #define _VERSIONNO__H_
4141
42-#define VERSION_FULL 1.22.231.89
42+#define VERSION_FULL 1.23.231.2
4343
4444 #define VERSION_BASEYEAR 2019
4545 #define VERSION_DATE "2019-08-20"
46-#define VERSION_TIME "17:40:05"
46+#define VERSION_TIME "18:38:27"
4747
4848 #define VERSION_MAJOR 1
49-#define VERSION_MINOR 22
49+#define VERSION_MINOR 23
5050 #define VERSION_BUILDNO 231
51-#define VERSION_EXTEND 89
51+#define VERSION_EXTEND 2
5252
53-#define VERSION_FILE 1,22,231,89
54-#define VERSION_PRODUCT 1,22,231,96
55-#define VERSION_FILESTR "1,22,231,89\0"
56-#define VERSION_PRODUCTSTR "1,22,231,96\0"
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"
5757 #define VERSION_EVERSION "0.3.4.0\0"
5858
5959 #endif
\ No newline at end of file
Show on old repository browser