TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move */2d/gpixel.c -> common/2d/gpixel.c

Browse source
This commit is contained in:
Kp 2013-03-03 01:03:33 +00:00
parent 2d84c85915
commit 4adefcdfa1
3 changed files with 1 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
SConstruct
View file

@ -200,6 +200,7 @@ class DXXArchive(DXXCommon):
srcdir = 'common'
target = 'dxx-common'
common_sources = [os.path.join('common', f) for f in [
'2d/gpixel.c',
'2d/line.c',
'2d/pixel.c',
'2d/poly.c',
@ -367,7 +368,6 @@ class D1XProgram(DXXProgram):
'2d/circle.c',
'2d/disc.c',
'2d/font.c',
'2d/gpixel.c',
'2d/palette.c',
'2d/pcx.c',
'3d/clipper.c',
@ -606,7 +606,6 @@ class D2XProgram(DXXProgram):
'2d/circle.c',
'2d/disc.c',
'2d/font.c',
'2d/gpixel.c',
'2d/palette.c',
'2d/pcx.c',
'3d/clipper.c',

0
d1x-rebirth/2d/gpixel.c → common/2d/gpixel.c
View file

41
d2x-rebirth/2d/gpixel.c
View file

@ -1,41 +0,0 @@
/*
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A
ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS
IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS
SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE
FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE
CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS
AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
*/
#include "u_mem.h"
#include "gr.h"
#include "grdef.h"
#ifdef OGL
#include "ogl_init.h"
#endif
unsigned char gr_ugpixel( grs_bitmap * bitmap, int x, int y )
{
switch (bitmap->bm_type)
{
case BM_LINEAR:
return bitmap->bm_data[ bitmap->bm_rowsize*y + x ];
#ifdef OGL
case BM_OGL:
return ogl_ugpixel(bitmap, x, y);
#endif
}
return 0;
}
unsigned char gr_gpixel( grs_bitmap * bitmap, int x, int y )
{
if ((x<0) || (y<0) || (x>=bitmap->bm_w) || (y>=bitmap->bm_h)) return 0;
return gr_ugpixel(bitmap, x, y);
}