• R/O
  • SSH
  • HTTPS

gd10: Commit


Commit MetaInfo

Revisão140 (tree)
Hora2019-08-20 00:56:02
Autorhgtterry

Mensagem de Log

Stock Sounds 190819

Mudança Sumário

Diff

--- Equity10/GD10_Objects_New.cpp (revision 139)
+++ Equity10/GD10_Objects_New.cpp (revision 140)
@@ -1650,12 +1650,28 @@
16501650 strcat(AName, ConNum);
16511651
16521652 strcpy(App->GDCL_Scene_Data->S_Sounds[SoundIndex]->Name, AName);
1653+ App->GDCL_Scene_Data->S_Sounds[SoundIndex]->Deleted = 0;
1654+ App->GDCL_Scene_Data->S_Sounds[SoundIndex]->Is3D = 0;
1655+ App->GDCL_Scene_Data->S_Sounds[SoundIndex]->Loop = 0;
1656+ App->GDCL_Scene_Data->S_Sounds[SoundIndex]->Pan = 0;
1657+ App->GDCL_Scene_Data->S_Sounds[SoundIndex]->Play = 0;
1658+ App->GDCL_Scene_Data->S_Sounds[SoundIndex]->SndFile = NULL;
1659+ strcpy(App->GDCL_Scene_Data->S_Sounds[SoundIndex]->SoundFile,"footstep.ogg");
1660+ strcpy(App->GDCL_Scene_Data->S_Sounds[SoundIndex]->SoundFileAndPath,"footstep.ogg");
1661+ App->GDCL_Scene_Data->S_Sounds[SoundIndex]->Volume = 100;
1662+ App->GDCL_Scene_Data->S_Sounds[SoundIndex]->Sound_ID = App->GDCL_Scene_Data->StockSounds_ID_Counter;
16531663
16541664 App->GDCL_FileView->Add_Stock_Sound(App->GDCL_Scene_Data->S_Sounds[SoundIndex]->Name, App->GDCL_Scene_Data->Stock_Sound_Count);
16551665
1666+ App->GDCL_Scene_Data->StockSounds_ID_Counter++; // Only on new Objects
16561667 App->GDCL_Scene_Data->Stock_Sound_Count++;
16571668
1658- // Add New Panel Object 310719
1669+
1670+
1671+
1672+
1673+
1674+ // Add New Panel Object 310719 // Needs Moving
16591675 int Panel_Number = App->CL10_Panels_Com->Create_Panel();
16601676
16611677 char Name[256];
--- Equity10/GD_Scene_Data.cpp (revision 139)
+++ Equity10/GD_Scene_Data.cpp (revision 140)
@@ -43,6 +43,7 @@
4343
4444 Object_ID_Counter = 0; //Objects 0 to 2000
4545 Locations_ID_Counter = 2000; //Locations 2000 to 3000
46+ StockSounds_ID_Counter = 3000; // Stock sounds 3000 to 4000
4647
4748 return 1;
4849 }
--- Equity10/GD_Scene_Data.h (revision 139)
+++ Equity10/GD_Scene_Data.h (revision 140)
@@ -221,7 +221,8 @@
221221 // ------------------------ Stock Sound
222222 typedef struct Stock_Sound_type
223223 {
224- irrklang::ISound* SndFile;
224+ bool Deleted; // Internal
225+ int Sound_ID; // Unique Number
225226 char Name[255];
226227 char SoundFile[255];
227228 char SoundFileAndPath[255];
@@ -230,6 +231,7 @@
230231 bool Loop;
231232 bool Is3D;
232233 bool Play;
234+ irrklang::ISound* SndFile;
233235
234236 }Stock_Sound_type;
235237
@@ -291,7 +293,7 @@
291293 Camera_Type* S_Camera[5];
292294 Load_Options_Type* S_LoadOptions[1];
293295 Stock_Messages_type* S_Messages[20];
294- Stock_Sound_type* S_Sounds[20];
296+ Stock_Sound_type* S_Sounds[200];
295297 Player_Location_type* S_Player_Locations[20];
296298
297299 GD10_Objects* CL_Object[100];
@@ -308,6 +310,7 @@
308310 //---------------------Unique Counters
309311 int Object_ID_Counter; //Unique Counter
310312 int Locations_ID_Counter; //Unique Counter
313+ int StockSounds_ID_Counter;
311314
312315 char mFilename[1024];
313316 char Path_mFilename[1024];
--- Equity10/VersionNo2.h (revision 139)
+++ Equity10/VersionNo2.h (revision 140)
@@ -39,21 +39,21 @@
3939 #ifndef _VERSIONNO__H_
4040 #define _VERSIONNO__H_
4141
42-#define VERSION_FULL 1.22.230.40
42+#define VERSION_FULL 1.22.230.45
4343
4444 #define VERSION_BASEYEAR 2019
4545 #define VERSION_DATE "2019-08-19"
46-#define VERSION_TIME "07:29:48"
46+#define VERSION_TIME "16:54:07"
4747
4848 #define VERSION_MAJOR 1
4949 #define VERSION_MINOR 22
5050 #define VERSION_BUILDNO 230
51-#define VERSION_EXTEND 40
51+#define VERSION_EXTEND 45
5252
53-#define VERSION_FILE 1,22,230,40
54-#define VERSION_PRODUCT 1,22,230,47
55-#define VERSION_FILESTR "1,22,230,40\0"
56-#define VERSION_PRODUCTSTR "1,22,230,47\0"
53+#define VERSION_FILE 1,22,230,45
54+#define VERSION_PRODUCT 1,22,230,52
55+#define VERSION_FILESTR "1,22,230,45\0"
56+#define VERSION_PRODUCTSTR "1,22,230,52\0"
5757 #define VERSION_EVERSION "0.3.4.0\0"
5858
5959 #endif
\ No newline at end of file
Show on old repository browser