Attachment #125102 for bug #185575




    slouken@devolution.com
*/

public import SDL_Keysym;
public import SDL_Version;
public import SDL_active;
public import SDL_audio;
public import SDL_byteorder;
public import SDL_cdrom;
public import SDL_copying;
public import SDL_endian;
public import SDL_error;
public import SDL_events;
public import SDL_getenv;
public import SDL_joystick;
public import SDL_keyboard;
public import SDL_mouse;
public import SDL_mutex;
public import SDL_quit;
public import SDL_rwops;
public import SDL_syswm;
public import SDL_thread;
public import SDL_timer;
public import SDL_types;
public import SDL_video;

extern(C):





DC=gdmd
#DC=gdc
ifeq ($(DC), gdmd)
DFLAGS=-O -d -release -Iimport -Isrc
#DFLAGS=-g -debug -Iimport -Isrc
DOUT=-of
else
DFLAGS=-O -frelease -Iimport -Isrc
#DFLAGS=-g -fdebug -Iimport -Isrc
DOUT=-o
endif

DSRC=$(shell find src/abagames -name "*.d")
SOURCES=$(DSRC) import/SDL_video.d import/SDL_mixer.d
OBJS=$(SOURCES:.d=.o)
EXE=gunroarhi

all: $(EXE)

$(EXE): $(OBJS)
	gcc -o $@ $(OBJS) -lgphobos -lpthread -lm -lSDL -lGL -lGLU -lSDL_mixer

$(OBJS): %.o: %.d
	$(DC) -c $(DOUT)$@ $(DFLAGS) $<


Lines 16-22 Link Here

(-)gr_hi/src/abagames/gr/prefmanager.d (-1 / +1 lines)
16	private:	16	private:
17	static const int VERSION_NUM = 14;	17	static const int VERSION_NUM = 14;
18	static const int VERSION_NUM_13 = 13;	18	static const int VERSION_NUM_13 = 13;
19	static const char[] PREF_FILE = "gr.prf";	19	static const char[] PREF_FILE = "/var/games/gunroarhi/gunroarhi.prf";
20	PrefData _prefData;	20	PrefData _prefData;
21		21
22	public this() {	22	public this() {

Lines 34-40 Link Here

(-)gr_hi/src/abagames/util/sdl/luminous.d (-1 / +1 lines)
34	private void makeLuminousTexture() {	34	private void makeLuminousTexture() {
35	uint *data = td;	35	uint *data = td;
36	int i;	36	int i;
37	memset(data, 0, luminousTextureWidth * luminousTextureHeight * 4 * uint.sizeof);	37	// memset(data, 0, luminousTextureWidth * luminousTextureHeight * 4 * uint.sizeof);
38	glGenTextures(1, &luminousTexture);	38	glGenTextures(1, &luminousTexture);
39	glBindTexture(GL_TEXTURE_2D, luminousTexture);	39	glBindTexture(GL_TEXTURE_2D, luminousTexture);
40	glTexImage2D(GL_TEXTURE_2D, 0, 4, luminousTextureWidth, luminousTextureHeight, 0,	40	glTexImage2D(GL_TEXTURE_2D, 0, 4, luminousTextureWidth, luminousTextureHeight, 0,




private import abagames.util.sdl.input;
private import abagames.util.sdl.recordableinput;
private import abagames.util.sdl.screen;

uint SDL_BUTTON(uint X) { return SDL_PRESSED << (X-1); }
const uint SDL_BUTTON_LEFT		= 1;
const uint SDL_BUTTON_MIDDLE	= 2;
const uint SDL_BUTTON_RIGHT		= 3;
const uint SDL_BUTTON_WHEELUP	= 4;
const uint SDL_BUTTON_WHEELDOWN	= 5;
const uint SDL_BUTTON_LMASK		= SDL_PRESSED << (SDL_BUTTON_LEFT - 1);
const uint SDL_BUTTON_MMASK		= SDL_PRESSED << (SDL_BUTTON_MIDDLE - 1);
const uint SDL_BUTTON_RMASK		= SDL_PRESSED << (SDL_BUTTON_RIGHT - 1);


/**
 * Mouse input.

Lines 67-73 Link Here

(-)gr_hi/src/abagames/util/sdl/sound.d (-2 / +2 lines)
67	public class Music: Sound {	67	public class Music: Sound {
68	public:	68	public:
69	static int fadeOutSpeed = 1280;	69	static int fadeOutSpeed = 1280;
70	static char[] dir = "sounds/musics";	70	static char[] dir = "/usr/share/games/gunroarhi/sounds/musics";
71	private:	71	private:
72	Mix_Music* music;	72	Mix_Music* music;
73		73
Lines 131-137 Link Here
131		131
132	public class Chunk: Sound {	132	public class Chunk: Sound {
133	public:	133	public:
134	static char[] dir = "sounds/chunks";	134	static char[] dir = "/usr/share/games/gunroarhi/sounds/chunks";
135	private:	135	private:
136	Mix_Chunk* chunk;	136	Mix_Chunk* chunk;
137	int chunkChannel;	137	int chunkChannel;

Lines 16-22 Link Here

(-)gr_hi/src/abagames/util/sdl/texture.d (-1 / +1 lines)
16	*/	16	*/
17	public class Texture {	17	public class Texture {
18	public:	18	public:
19	static char[] imagesDir = "images/";	19	static char[] imagesDir = "/usr/share/games/gunroarhi/images/";
20	static SDL_Surface*[char[]] surface;	20	static SDL_Surface*[char[]] surface;
21	private:	21	private:
22	GLuint num, maskNum;	22	GLuint num, maskNum;

Return to bug 185575

Lines 20-37 Link Here

(-)gr_hi/import/SDL.d (-12 / +22 lines)
20	slouken@devolution.com	20	slouken@devolution.com
21	*/	21	*/
22		22
23	import SDL_types;	23	public import SDL_Keysym;
24	import SDL_getenv;	24	public import SDL_Version;
25	import SDL_error;	25	public import SDL_active;
26	import SDL_rwops;	26	public import SDL_audio;
27	import SDL_timer;	27	public import SDL_byteorder;
28	import SDL_audio;	28	public import SDL_cdrom;
29	import SDL_cdrom;	29	public import SDL_copying;
30	import SDL_joystick;	30	public import SDL_endian;
31	import SDL_events;	31	public import SDL_error;
32	import SDL_video;	32	public import SDL_events;
33	import SDL_byteorder;	33	public import SDL_getenv;
34	import SDL_Version;	34	public import SDL_joystick;
		35	public import SDL_keyboard;
		36	public import SDL_mouse;
		37	public import SDL_mutex;
		38	public import SDL_quit;
		39	public import SDL_rwops;
		40	public import SDL_syswm;
		41	public import SDL_thread;
		42	public import SDL_timer;
		43	public import SDL_types;
		44	public import SDL_video;
35		45
36	extern(C):	46	extern(C):
37		47

Line 0 Link Here

(-)gr_hi/Makefile (+25 lines)
	1	DC=gdmd
	2	#DC=gdc
	3	ifeq ($(DC), gdmd)
	4	DFLAGS=-O -d -release -Iimport -Isrc
	5	#DFLAGS=-g -debug -Iimport -Isrc
	6	DOUT=-of
	7	else
	8	DFLAGS=-O -frelease -Iimport -Isrc
	9	#DFLAGS=-g -fdebug -Iimport -Isrc
	10	DOUT=-o
	11	endif
	12
	13	DSRC=$(shell find src/abagames -name "*.d")
	14	SOURCES=$(DSRC) import/SDL_video.d import/SDL_mixer.d
	15	OBJS=$(SOURCES:.d=.o)
	16	EXE=gunroarhi
	17
	18	all: $(EXE)
	19
	20	$(EXE): $(OBJS)
	21	gcc -o $@ $(OBJS) -lgphobos -lpthread -lm -lSDL -lGL -lGLU -lSDL_mixer
	22
	23	$(OBJS): %.o: %.d
	24	$(DC) -c $(DOUT)$@ $(DFLAGS) $<
	25

Lines 11-16 Link Here

(-)gr_hi/src/abagames/util/sdl/mouse.d (+11 lines)
11	private import abagames.util.sdl.input;	11	private import abagames.util.sdl.input;
12	private import abagames.util.sdl.recordableinput;	12	private import abagames.util.sdl.recordableinput;
13	private import abagames.util.sdl.screen;	13	private import abagames.util.sdl.screen;
		14
		15	uint SDL_BUTTON(uint X) { return SDL_PRESSED << (X-1); }
		16	const uint SDL_BUTTON_LEFT = 1;
		17	const uint SDL_BUTTON_MIDDLE = 2;
		18	const uint SDL_BUTTON_RIGHT = 3;
		19	const uint SDL_BUTTON_WHEELUP = 4;
		20	const uint SDL_BUTTON_WHEELDOWN = 5;
		21	const uint SDL_BUTTON_LMASK = SDL_PRESSED << (SDL_BUTTON_LEFT - 1);
		22	const uint SDL_BUTTON_MMASK = SDL_PRESSED << (SDL_BUTTON_MIDDLE - 1);
		23	const uint SDL_BUTTON_RMASK = SDL_PRESSED << (SDL_BUTTON_RIGHT - 1);
		24
14		25
15	/**	26	/**
16	* Mouse input.	27	* Mouse input.