summaryrefslogtreecommitdiff
path: root/src/mmus2mid.c
diff options
context:
space:
mode:
authorSimon Howard2006-01-05 02:48:03 +0000
committerSimon Howard2006-01-05 02:48:03 +0000
commit3fcdb6dc1835c87655ae45a1d362dc8b09f6849c (patch)
tree3eeb27342ce69b2f55b6c6b1b7a0a19b17ec80fb /src/mmus2mid.c
parenta78ddf0ecadb3580f5f09b09a931abc5734b7f33 (diff)
downloadchocolate-doom-3fcdb6dc1835c87655ae45a1d362dc8b09f6849c.tar.gz
chocolate-doom-3fcdb6dc1835c87655ae45a1d362dc8b09f6849c.tar.bz2
chocolate-doom-3fcdb6dc1835c87655ae45a1d362dc8b09f6849c.zip
Fixes for big endian machines (thanks locust)
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 255
Diffstat (limited to 'src/mmus2mid.c')
-rw-r--r--src/mmus2mid.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/mmus2mid.c b/src/mmus2mid.c
index 59dadcad..5e6cb5e8 100644
--- a/src/mmus2mid.c
+++ b/src/mmus2mid.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: mmus2mid.c 76 2005-09-06 21:06:45Z fraggle $
+// $Id: mmus2mid.c 255 2006-01-05 02:48:03Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright (C) 1999 by
@@ -27,6 +27,9 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.3 2006/01/05 02:48:03 fraggle
+// Fixes for big endian machines (thanks locust)
+//
// Revision 1.2 2005/09/06 21:06:45 fraggle
// Newer versions of mmus2mid.c,h from prboom
//
@@ -340,11 +343,11 @@ int mmus2mid(const UBYTE *mus, MIDI *mididata, UWORD division, int nocomp)
// copy the MUS header from the MUS buffer to the MUSh header structure
memcpy(&MUSh,mus,sizeof(MUSheader));
- MUSh.ScoreLength = doom_wtohs(MUSh.ScoreLength);
- MUSh.ScoreStart = doom_wtohs(MUSh.ScoreStart);
- MUSh.channels = doom_wtohs(MUSh.channels);
- MUSh.SecChannels = doom_wtohs(MUSh.SecChannels);
- MUSh.InstrCnt = doom_wtohs(MUSh.InstrCnt);
+ MUSh.ScoreLength = SHORT(MUSh.ScoreLength);
+ MUSh.ScoreStart = SHORT(MUSh.ScoreStart);
+ MUSh.channels = SHORT(MUSh.channels);
+ MUSh.SecChannels = SHORT(MUSh.SecChannels);
+ MUSh.InstrCnt = SHORT(MUSh.InstrCnt);
// check some things and set length of MUS buffer from internal data