Mercurial > might-and-magic-trilogy
comparison AudioPlayer.cpp @ 83:2d5d13376e91
Merge
author | Nomad |
---|---|
date | Mon, 29 Oct 2012 00:49:33 +0200 |
parents | a84fb3752681 |
children | 8c6308bb19b3 |
comparison
equal
deleted
inserted
replaced
82:f9a33f75bae3 | 83:2d5d13376e91 |
---|---|
466 { | 466 { |
467 *strchr(&Buf, 10) = 0; | 467 *strchr(&Buf, 10) = 0; |
468 memcpy(&v19, texture_frame_table_txt_parser(&Buf, &v18), sizeof(v19)); | 468 memcpy(&v19, texture_frame_table_txt_parser(&Buf, &v18), sizeof(v19)); |
469 if ( v19.field_0 && *v19.pProperties[0] != 47 ) | 469 if ( v19.field_0 && *v19.pProperties[0] != 47 ) |
470 { | 470 { |
471 sprintfex(v2->pSounds[v2->uNumSounds].pSoundName, "%s", v19.pProperties[0]); | 471 sprintf(v2->pSounds[v2->uNumSounds].pSoundName, "%s", v19.pProperties[0]); |
472 v9 = atoi(v19.pProperties[1]); | 472 v9 = atoi(v19.pProperties[1]); |
473 v10 = v19.pProperties[2]; | 473 v10 = v19.pProperties[2]; |
474 v2->pSounds[v2->uNumSounds].uSoundID = v9; | 474 v2->pSounds[v2->uNumSounds].uSoundID = v9; |
475 if ( _strcmpi(v10, "system") ) | 475 if ( _strcmpi(v10, "system") ) |
476 { | 476 { |