CodeMirror/CnC_Remastered_Collection
1
0
Fork 0
mirror of https://github.com/electronicarts/CnC_Remastered_Collection synced 2024-05-21 20:52:43 +12:00
Code Issues Releases Wiki Activity

Merge 8d6422e1b2 into 7d496e8a63

Browse source
This commit is contained in:
Andreas Bergmeier 2020-09-24 13:03:44 -07:00 committed by GitHub
parent 7d496e8a63 8d6422e1b2
commit 7fc7a6a949
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
REDALERT/CONQUER.CPP
View file

@ -5576,7 +5576,7 @@ void Shake_The_Screen(int shakes, HousesType house)
*=============================================================================================*/ *=============================================================================================*/
void List_Copy(short const * source, int len, short * dest) void List_Copy(short const * source, int len, short * dest)
{ {
if (dest == NULL || dest == NULL) { if (source == NULL || dest == NULL) {
return; return;
} }

2
TIBERIANDAWN/SOUNDDLG.CPP
View file

@ -245,7 +245,7 @@ void SoundControlsClass::Process(void)
int length = Theme.Track_Length(index); int length = Theme.Track_Length(index);
char const * fullname = Theme.Full_Name(index); char const * fullname = Theme.Full_Name(index);
void * ptr = new char [sizeof(100)]; void * ptr = new char [100];
if (ptr) { if (ptr) {
sprintf((char *)ptr, "%cTrack %d\t%d:%02d\t%s", index, listbox.Count()+1, length / 60, length % 60, fullname); sprintf((char *)ptr, "%cTrack %d\t%d:%02d\t%s", index, listbox.Count()+1, length / 60, length % 60, fullname);
listbox.Add_Item((char const *)ptr); listbox.Add_Item((char const *)ptr);