Merge pull request #382 from Nick007J/master

Cranes

src/audio/AudioManager.cpp

@@ -3515,9 +3515,9 @@ cAudioManager::ProcessCrane()
 	static const int intensity = 80;
 
 	if(crane) {
-		if(crane->m_bCraneActive == 1) {
-			if(crane->m_bCraneStatus) {
-				m_sQueueSample.m_vecPos = crane->m_pObject->GetPosition();
+		if(crane->m_nCraneStatus == CCrane::ACTIVATED) {
+			if(crane->m_nCraneState != CCrane::IDLE) {
+				m_sQueueSample.m_vecPos = crane->m_pCraneEntity->GetPosition();
 				distSquared = GetDistanceSquared(&this->m_sQueueSample.m_vecPos);
 				if(distSquared < SQR(intensity)) {
 					CalculateDistance(distCalculated, distSquared);

src/audio/AudioScriptObject.cpp

@@ -61,7 +61,7 @@ cAudioScriptObject::SaveAllAudioScriptObjects(uint8 *buf, uint32 *size)
 	INITSAVEBUF
 
 	int32 pool_size = CPools::GetAudioScriptObjectPool()->GetNoOfUsedSpaces();
-	*size = SAVE_HEADER_SIZE + pool_size * (sizeof(cAudioScriptObject) + sizeof(int32));
+	*size = SAVE_HEADER_SIZE + sizeof(int32) + pool_size * (sizeof(cAudioScriptObject) + sizeof(int32));
 	WriteSaveHeader(buf, 'A', 'U', 'D', '\0', *size - SAVE_HEADER_SIZE);
 	WriteSaveBuf(buf, pool_size);