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

Changed Uint32 to DWORD to avoid SDL namespace collisions

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@284 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2002-12-01 21:33:23 +00:00
parent 5f7b15c09d
commit fb3e12faf1
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/planets/pl_stuff.c
+1 -1
View File
@@ -807,7 +807,7 @@ DrawPlanet (int x, int y, int dy, unsigned int rgb)
else else
tint_ccb[i].ccb_YPos = my << 16; tint_ccb[i].ccb_YPos = my << 16;
tint_ccb[i].ccb_XPos = x << 16; tint_ccb[i].ccb_XPos = x << 16;
*((Uint32 *)tint_ccb[i].ccb_SourcePtr) = rgb | (rgb << 16) | 0x80008000; *((DWORD *)tint_ccb[i].ccb_SourcePtr) = rgb | (rgb << 16) | 0x80008000;
add_cel (&tint_ccb[i]); add_cel (&tint_ccb[i]);
} }
} }
sc2/src/sc2code/planets/planets.h
+1 -2
View File
@@ -20,7 +20,6 @@
#define _PLANETS_H #define _PLANETS_H
#define END_INTERPLANETARY START_INTERPLANETARY #define END_INTERPLANETARY START_INTERPLANETARY
typedef unsigned int Uint32;
enum enum
{ {
@@ -168,7 +167,7 @@ typedef struct solarsys_state
FRAME ScaleFrame[2]; FRAME ScaleFrame[2];
FRAME ShieldFrame; FRAME ShieldFrame;
BYTE *isPFADefined; BYTE *isPFADefined;
Uint32 **lpTopoMap; DWORD **lpTopoMap;
} SOLARSYS_STATE; } SOLARSYS_STATE;
typedef SOLARSYS_STATE *PSOLARSYS_STATE; typedef SOLARSYS_STATE *PSOLARSYS_STATE;
sc2/src/sc2code/planets/plangen.c
+13 -13
View File
@@ -34,13 +34,13 @@ void RepairBackRect (PRECT pRect);
int RotatePlanet (int x, int angle, int dx, int dy,int zoom); int RotatePlanet (int x, int angle, int dx, int dy,int zoom);
Uint32 frame_mapRGBA (FRAME FramePtr,UBYTE r, UBYTE g, UBYTE b, UBYTE a); DWORD frame_mapRGBA (FRAME FramePtr,UBYTE r, UBYTE g, UBYTE b, UBYTE a);
void process_rgb_bmp (FRAME FramePtr, Uint32 **rgba, int maxx, int maxy); void process_rgb_bmp (FRAME FramePtr, DWORD **rgba, int maxx, int maxy);
FRAME stretch_frame (FRAME FramePtr, int neww, int newh,int destroy); FRAME stretch_frame (FRAME FramePtr, int neww, int newh,int destroy);
Uint32 **getpixelarray(FRAME FramePtr,int width, int height); DWORD **getpixelarray(FRAME FramePtr,int width, int height);
#define NUM_BATCH_POINTS 64 #define NUM_BATCH_POINTS 64
#define USE_3D_PLANET 1 #define USE_3D_PLANET 1
@@ -63,7 +63,7 @@ Uint32 **getpixelarray(FRAME FramePtr,int width, int height);
#define M_DEG2RAD (M_TWOPI / 360.0) #define M_DEG2RAD (M_TWOPI / 360.0)
#endif #endif
Uint32 phong[DIAMETER][DIAMETER]; DWORD phong[DIAMETER][DIAMETER];
POINT map_rotate[DIAMETER][DIAMETER]; POINT map_rotate[DIAMETER][DIAMETER];
void void
@@ -215,7 +215,7 @@ RenderPhongMask (POINT loc)
for (pt.x = 0; pt.x <= TWORADIUS; ++pt.x) for (pt.x = 0; pt.x <= TWORADIUS; ++pt.x)
{ {
int x,y,rad; int x,y,rad;
Uint32 stepint; DWORD stepint;
double lrad2; double lrad2;
double intens; double intens;
x=pt.x-RADIUS; x=pt.x-RADIUS;
@@ -230,7 +230,7 @@ RenderPhongMask (POINT loc)
intens=1*cos((3.1416/2)*(double)lrad2/(double)lmag2); intens=1*cos((3.1416/2)*(double)lrad2/(double)lmag2);
if(intens<AMBIENT_LIGHT) {intens=AMBIENT_LIGHT;} if(intens<AMBIENT_LIGHT) {intens=AMBIENT_LIGHT;}
} }
stepint=step- (Uint32)(intens*step+0.5); stepint=step- (DWORD)(intens*step+0.5);
} else { } else {
stepint=step; stepint=step;
} }
@@ -295,7 +295,7 @@ SetPlanetTilt (int angle)
#define SHIELD_RADIUS_2 SHIELD_RADIUS*SHIELD_RADIUS #define SHIELD_RADIUS_2 SHIELD_RADIUS*SHIELD_RADIUS
void CreateShieldMask() void CreateShieldMask()
{ {
Uint32 rad2,red,red_nt,clear,**rgba,p; DWORD rad2,red,red_nt,clear,**rgba,p;
int x,y; int x,y;
FRAME ShieldFrame; FRAME ShieldFrame;
@@ -303,7 +303,7 @@ void CreateShieldMask()
ShieldFrame = CaptureDrawable ( ShieldFrame = CaptureDrawable (
CreateDrawable (WANT_PIXMAP, SHIELD_DIAM, SHIELD_DIAM, 1) CreateDrawable (WANT_PIXMAP, SHIELD_DIAM, SHIELD_DIAM, 1)
); );
rgba=(Uint32 **)malloc(sizeof(Uint32 *)*(SHIELD_DIAM)); rgba=(DWORD **)malloc(sizeof(DWORD *)*(SHIELD_DIAM));
// This is a 'transparent' red for the planet mask. // This is a 'transparent' red for the planet mask.
red=frame_mapRGBA (ShieldFrame,255,0,0,200); red=frame_mapRGBA (ShieldFrame,255,0,0,200);
// This is a non-transparent red for the halo // This is a non-transparent red for the halo
@@ -311,7 +311,7 @@ void CreateShieldMask()
// This is 100% transparent. // This is 100% transparent.
clear=frame_mapRGBA (ShieldFrame,0,0,0,0); clear=frame_mapRGBA (ShieldFrame,0,0,0,0);
for(y=-SHIELD_RADIUS;y<=SHIELD_RADIUS;y++) { for(y=-SHIELD_RADIUS;y<=SHIELD_RADIUS;y++) {
rgba[y+SHIELD_RADIUS]=(Uint32 *)calloc((SHIELD_DIAM),sizeof(Uint32)); rgba[y+SHIELD_RADIUS]=(DWORD *)calloc((SHIELD_DIAM),sizeof(DWORD));
for(x=-SHIELD_RADIUS;x<=SHIELD_RADIUS;x++) { for(x=-SHIELD_RADIUS;x<=SHIELD_RADIUS;x++) {
rad2=x*x+y*y; rad2=x*x+y*y;
if(rad2<=SHIELD_RADIUS_2) { if(rad2<=SHIELD_RADIUS_2) {
@@ -350,9 +350,9 @@ void
RenderLevelMasks (int offset) RenderLevelMasks (int offset)
{ {
POINT pt; POINT pt;
Uint32 **rgba; DWORD **rgba;
int x,y; int x,y;
Uint32 p,**pixels; DWORD p,**pixels;
FRAME MaskFrame; FRAME MaskFrame;
#if PROFILE #if PROFILE
@@ -362,13 +362,13 @@ RenderLevelMasks (int offset)
t1=clock(); t1=clock();
#endif #endif
rgba=malloc(sizeof(Uint32 *)*(DIAMETER)); rgba=malloc(sizeof(DWORD *)*(DIAMETER));
// Choose the correct Frame to wrte to // Choose the correct Frame to wrte to
MaskFrame = pSolarSysState->PlanetFrameArray[offset]; MaskFrame = pSolarSysState->PlanetFrameArray[offset];
pixels=pSolarSysState->lpTopoMap; pixels=pSolarSysState->lpTopoMap;
for (pt.y = 0, y=-RADIUS; pt.y <= TWORADIUS; ++pt.y,++y) for (pt.y = 0, y=-RADIUS; pt.y <= TWORADIUS; ++pt.y,++y)
{ {
rgba[pt.y]=malloc(sizeof(Uint32)*(DIAMETER)); rgba[pt.y]=malloc(sizeof(DWORD)*(DIAMETER));
for (pt.x = 0, x=-RADIUS; pt.x <= TWORADIUS; ++pt.x,++x) for (pt.x = 0, x=-RADIUS; pt.x <= TWORADIUS; ++pt.x,++x)
{ {
int c1,c2,c3; int c1,c2,c3;