adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix endian problem in xform_PLUT_step (bug #137)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@965 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2003-05-19 23:13:30 +00:00
parent 48988b741a
commit 2c35fa93d9
2 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+1
View File
@@ -1,4 +1,5 @@
Changes towards version 0.3: Changes towards version 0.3:
- Fix endian problem in colormap transform code (bug #137) -Mika
- Fix minor glitch in planet coarse scan (bug #238), from chmmravatar - Fix minor glitch in planet coarse scan (bug #238), from chmmravatar
- Wav loader is now endian safe (bug #165) -Mika - Wav loader is now endian safe (bug #165) -Mika
- Dialogue patch for Melnorme, fixing bug #335 - Dialogue patch for Melnorme, fixing bug #335
sc2/src/sc2code/comm.c
+4 -18
View File
@@ -25,6 +25,7 @@
#include "options.h" #include "options.h"
#include "comm.h" #include "comm.h"
#include "libs/sound/sound.h" #include "libs/sound/sound.h"
#include "endian.h"
void InitOscilloscope (int x, int y, int width, int height, FRAME_DESC *f); void InitOscilloscope (int x, int y, int width, int height, FRAME_DESC *f);
void SetSliderImage (void *f); void SetSliderImage (void *f);
@@ -571,19 +572,9 @@ xform_PLUT_step (SIZE TDelta)
DWORD v0, v1, val; DWORD v0, v1, val;
float f = (control->TOrig - control->TTotal) / (float)control->TOrig; float f = (control->TOrig - control->TTotal) / (float)control->TOrig;
COLORMAPPTR oldmap = (COLORMAPPTR) pOldCMap; COLORMAPPTR oldmap = (COLORMAPPTR) pOldCMap;
v0 = MAKE_DWORD
(
MAKE_WORD (oldmap[3], oldmap[2]),
MAKE_WORD (oldmap[1], oldmap[0])
);
v0 = UQM_SwapBE32 (*(DWORD *)oldmap);
v1 = MAKE_DWORD v1 = UQM_SwapBE32 (*(DWORD *)ColorMapPtr);
(
MAKE_WORD (ColorMapPtr[3], ColorMapPtr[2]),
MAKE_WORD (ColorMapPtr[1], ColorMapPtr[0])
);
ColorMapPtr += sizeof (DWORD); ColorMapPtr += sizeof (DWORD);
@@ -618,12 +609,7 @@ xform_PLUT_step (SIZE TDelta)
val = (val << 5) | (c0 & 0x1F); val = (val << 5) | (c0 & 0x1F);
*pOldCMap++; *pOldCMap++;
*pCurCMap++ = MAKE_DWORD *pCurCMap++ = UQM_SwapBE32 (val);
(
MAKE_WORD ((val >> 24 ) & 0xff, (val >> 16) & 0xff),
MAKE_WORD ((val >> 8 ) & 0xff, (val >> 0 ) & 0xff)
);
} }
ColorChange = TRUE; ColorChange = TRUE;
} }