• R/O
  • SSH
  • HTTPS

gd10: Commit


Commit MetaInfo

Revisão154 (tree)
Hora2019-08-21 04:56:49
Autorhgtterry

Mensagem de Log

Stock Sounds 200819

Mudança Sumário

Diff

--- Equity10/GD10_Objects.cpp (revision 153)
+++ Equity10/GD10_Objects.cpp (revision 154)
@@ -100,6 +100,9 @@
100100
101101 Object_ID = 0; // THis Needs Checking
102102
103+ Sound_ID_v2 = 0;
104+ Play_v2 = 1;
105+
103106 return 1;
104107 }
105108
--- Equity10/GD10_Objects.h (revision 153)
+++ Equity10/GD10_Objects.h (revision 154)
@@ -140,6 +140,9 @@
140140 bool Triggered; // Imternal
141141 bool Re_Trigger;
142142
143+ // New Sound
144+ int Sound_ID_v2;
145+ bool Play_v2;
143146 };
144147
145148
\ No newline at end of file
--- Equity10/GD10_Properties.cpp (revision 153)
+++ Equity10/GD10_Properties.cpp (revision 154)
@@ -709,9 +709,23 @@
709709 char chr_Volume[100];
710710 sprintf(chr_Volume, "%.3f", App->GDCL_Scene_Data->CL_Object[index]->S_Sounds[0]->Volume * 100);
711711
712+ // new sound
713+ char chr_Play[100];
714+ if (App->GDCL_Scene_Data->CL_Object[index]->Play_v2 == 1)
715+ {
716+ strcpy(chr_Play, "True");
717+ }
718+ else
719+ {
720+ strcpy(chr_Play, "False");
721+ }
722+ char chr_Stock_Sound[100];
723+ int sndIndex = App->GDCL_Scene_Data->CL_Object[index]->Sound_ID_v2;
724+ strcpy(chr_Stock_Sound, App->GDCL_Scene_Data->St_Sounds[sndIndex]->Name);
725+
712726 int StockIndex = App->GDCL_Scene_Data->CL_Object[index]->Entity[0].Stock_mIndex;
713727
714- const int NUM_ITEMS = 7;
728+ const int NUM_ITEMS = 9;
715729 const int NUM_COLS = 2;
716730 string grid[NUM_COLS][NUM_ITEMS]; // string table
717731 LV_ITEM pitem;
@@ -724,9 +738,11 @@
724738 grid[0][3] = " ", grid[1][3] = " ";
725739 grid[0][4] = "Sound", grid[1][4] = App->GDCL_Scene_Data->CL_Object[index]->S_Sounds[0]->SoundFile;
726740 grid[0][5] = "Volume", grid[1][5] = chr_Volume;
741+ grid[0][6] = " ", grid[1][6] = " ";
742+ grid[0][7] = "Stock_Snd", grid[1][7] = chr_Stock_Sound;
743+ grid[0][8] = "Play", grid[1][8] = chr_Play;
727744
728- /*grid[0][2] = "Sound", grid[1][2] = App->GDCL_Scene_Data->CL_Object[index]->Entity[0].mTextItem;
729- grid[0][3] = "Sound_Stock", grid[1][3] = App->GDCL_Scene_Data->S_Sounds[StockIndex]->Name;*/
745+
730746
731747
732748 ListView_DeleteAllItems(Properties_hLV);
@@ -1746,14 +1762,35 @@
17461762 return 1;
17471763 }
17481764
1749- // Re Trigger
1750- result = strcmp(btext, "Re-Trigger");
1765+ // Sound
1766+ result = strcmp(btext, "Play");
17511767 if (result == 0)
17521768 {
1753- App->Say("Re-Trigger");
1769+
1770+ strcpy(App->GDCL_Dialogs->btext, "Play Sound In The Game");
1771+
1772+ App->GDCL_Dialogs->TrueFlase = App->GDCL_Scene_Data->CL_Object[Index]->Play_v2;
1773+
1774+ App->GDCL_Dialogs->Dialog_TrueFlase(App->MainHwnd);
1775+
1776+ if (App->GDCL_Dialogs->Canceled == 0)
1777+ {
1778+ if (App->GDCL_Dialogs->TrueFlase == 1)
1779+ {
1780+ App->GDCL_Scene_Data->CL_Object[Index]->Play_v2 = 1;
1781+ }
1782+ else
1783+ {
1784+ App->GDCL_Scene_Data->CL_Object[Index]->Play_v2 = 0;
1785+
1786+ }
1787+ }
1788+
1789+ Update_ListView_Sounds();
17541790 return 1;
17551791 }
17561792
1793+
17571794 return 1;
17581795 }
17591796
--- Equity10/GD_Collision.cpp (revision 153)
+++ Equity10/GD_Collision.cpp (revision 154)
@@ -38,16 +38,20 @@
3838 return 1;
3939 }
4040
41- if (App->GDCL_Scene_Data->CL_Object[Index]->HasSound == 1)
41+ if (App->GDCL_Scene_Data->CL_Object[Index]->HasSound == 1 && App->GDCL_Scene_Data->CL_Object[Index]->Play_v2 == 1)
4242 {
4343 char buff[1024];
4444 strcpy(buff, App->GDCL_SoundMgr->Default_Folder);
4545 strcat(buff, "\\Media\\Sounds\\");
46- strcat(buff, App->GDCL_Scene_Data->CL_Object[Index]->S_Sounds[0]->SoundFile);
4746
48- App->GDCL_Scene_Data->CL_Object[Index]->S_Sounds[0]->SndFile = App->GDCL_SoundMgr->SoundEngine->play2D(buff, false, true, true);
49- App->GDCL_Scene_Data->CL_Object[Index]->S_Sounds[0]->SndFile->setVolume(App->GDCL_Scene_Data->CL_Object[Index]->S_Sounds[0]->Volume);
50- App->GDCL_Scene_Data->CL_Object[Index]->S_Sounds[0]->SndFile->setIsPaused(false);
47+ int SndIndex = App->GDCL_Scene_Data->CL_Object[Index]->Sound_ID_v2;
48+
49+ strcat(buff, App->GDCL_Scene_Data->St_Sounds[SndIndex]->SoundFile);
50+
51+ App->GDCL_Scene_Data->St_Sounds[SndIndex]->SndFile = App->GDCL_SoundMgr->SoundEngine->play2D(buff, false, true, true);
52+ App->GDCL_Scene_Data->St_Sounds[SndIndex]->SndFile->setVolume(App->GDCL_Scene_Data->St_Sounds[SndIndex]->Volume);
53+ App->GDCL_Scene_Data->St_Sounds[SndIndex]->SndFile->setIsPaused(false);
54+
5155 App->GDCL_Scene_Data->CL_Object[Index]->Triggered = 1;
5256 }
5357
--- Equity10/VersionNo2.h (revision 153)
+++ Equity10/VersionNo2.h (revision 154)
@@ -39,21 +39,21 @@
3939 #ifndef _VERSIONNO__H_
4040 #define _VERSIONNO__H_
4141
42-#define VERSION_FULL 1.23.231.10
42+#define VERSION_FULL 1.23.231.19
4343
4444 #define VERSION_BASEYEAR 2019
4545 #define VERSION_DATE "2019-08-20"
46-#define VERSION_TIME "19:12:44"
46+#define VERSION_TIME "20:54:59"
4747
4848 #define VERSION_MAJOR 1
4949 #define VERSION_MINOR 23
5050 #define VERSION_BUILDNO 231
51-#define VERSION_EXTEND 10
51+#define VERSION_EXTEND 19
5252
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"
53+#define VERSION_FILE 1,23,231,19
54+#define VERSION_PRODUCT 1,23,231,26
55+#define VERSION_FILESTR "1,23,231,19\0"
56+#define VERSION_PRODUCTSTR "1,23,231,26\0"
5757 #define VERSION_EVERSION "0.3.4.0\0"
5858
5959 #endif
\ No newline at end of file
Show on old repository browser