[Scummvm-cvs-logs] scummvm master -> 118da760683ff8d19943c68a24fa5e3c5b1c923a

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
118da76068 SWORD25: int -> int32 correctness


Commit: 118da760683ff8d19943c68a24fa5e3c5b1c923a
    https://github.com/scummvm/scummvm/commit/118da760683ff8d19943c68a24fa5e3c5b1c923a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-29T00:44:41-07:00

Commit Message:
SWORD25: int -> int32 correctness

Changed paths:
    engines/sword25/sfx/soundengine.cpp
    engines/sword25/sfx/soundengine.h



diff --git a/engines/sword25/sfx/soundengine.cpp b/engines/sword25/sfx/soundengine.cpp
index 61d53c8..d90849e 100644
--- a/engines/sword25/sfx/soundengine.cpp
+++ b/engines/sword25/sfx/soundengine.cpp
@@ -339,7 +339,7 @@ bool SoundEngine::persist(OutputPersistenceBlock &writer) {
 			_handles[i].type = kFreeHandle;
 
 		writer.writeString(_handles[i].fileName);
-		writer.write((int)_handles[i].sndType);
+		writer.write(_handles[i].sndType);
 		writer.write(_handles[i].volume);
 		writer.write(_handles[i].pan);
 		writer.write(_handles[i].loop);
@@ -363,13 +363,13 @@ bool SoundEngine::unpersist(InputPersistenceBlock &reader) {
 		reader.read(_handles[i].id);
 
 		Common::String fileName;
-		int sndType;
+		int32 sndType;
 		float volume;
 		float pan;
 		bool loop;
-		int loopStart;
-		int loopEnd;
-		uint layer;
+		int32 loopStart;
+		int32 loopEnd;
+		uint32 layer;
 
 		reader.readString(fileName);
 		reader.read(sndType);
diff --git a/engines/sword25/sfx/soundengine.h b/engines/sword25/sfx/soundengine.h
index 8132ec5..8974ee6 100644
--- a/engines/sword25/sfx/soundengine.h
+++ b/engines/sword25/sfx/soundengine.h
@@ -67,13 +67,13 @@ struct SndHandle {
 	uint32 id;
 
 	Common::String fileName;
-	int sndType;
+	int32 sndType;
 	float volume;
 	float pan;
 	bool loop;
-	int loopStart;
-	int loopEnd;
-	uint layer;
+	int32 loopStart;
+	int32 loopEnd;
+	uint32 layer;
 };