Skip to content
Permalink
Browse files

Fix no sound bug (#5968)

  • Loading branch information
Rui authored and nerzhul committed Jun 14, 2017
1 parent ddcd026 commit bbe3dd9a7a3fc0f17a6ab61c70d9ea95962915df
Showing with 14 additions and 8 deletions.
  1. +13 −7 src/itemdef.cpp
  2. +1 −1 src/sound_openal.cpp
@@ -124,8 +124,8 @@ void ItemDefinition::reset()

void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const
{

writeU8(os, 3); // version (proto > 20)
u8 version = (protocol_version >= 34) ? 4 : 3;
writeU8(os, version);
writeU8(os, type);
os << serializeString(name);
os << serializeString(description);
@@ -156,8 +156,11 @@ void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const
writeF1000(os, sound_place_failed.gain);
os << serializeString(palette_image);
writeU32(os, color.color);
writeF1000(os, sound_place.pitch);
writeF1000(os, sound_place_failed.pitch);

if (version >= 4) {
writeF1000(os, sound_place.pitch);
writeF1000(os, sound_place_failed.pitch);
}
}

void ItemDefinition::deSerialize(std::istream &is)
@@ -167,7 +170,7 @@ void ItemDefinition::deSerialize(std::istream &is)

// Deserialize
int version = readU8(is);
if(version < 1 || version > 3)
if (version < 1 || version > 4)
throw SerializationError("unsupported ItemDefinition version");
type = (enum ItemType)readU8(is);
name = deSerializeString(is);
@@ -216,8 +219,11 @@ void ItemDefinition::deSerialize(std::istream &is)
sound_place_failed.gain = readF1000(is);
palette_image = deSerializeString(is);
color.set(readU32(is));
sound_place.pitch = readF1000(is);
sound_place_failed.pitch = readF1000(is);

if (version >= 4) {
sound_place.pitch = readF1000(is);
sound_place_failed.pitch = readF1000(is);
}
} catch(SerializationError &e) {};
}

@@ -576,7 +576,7 @@ class OpenALSoundManager: public ISoundManager
}
int handle = -1;
if (fade > 0) {
handle = playSoundRaw(buf, loop, 0.0f, 0.0f);
handle = playSoundRaw(buf, loop, 0.0f, pitch);
fadeSound(handle, fade, volume);
} else {
handle = playSoundRaw(buf, loop, volume, pitch);

1 comment on commit bbe3dd9

@paramat

This comment has been minimized.

Copy link
Member

@paramat paramat commented on bbe3dd9 Jun 16, 2017

Seems to cause this bug #5991

Please sign in to comment.