No OneTemporary
Actions

Authored By

Unknown

Size

59 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/util/allegro/bitmap.h b/util/allegro/bitmap.h
	index daed6488..9ccd224e 100644
	--- a/util/allegro/bitmap.h
	+++ b/util/allegro/bitmap.h
	@@ -1,24 +1,29 @@
	-// #include <allegro.h>
	+#include <allegro.h>
	+#ifdef _WIN32
	+#include <winalleg.h>
	+#endif

	+/*
	#ifdef _WIN32
	#define BITMAP dummyBITMAP
	#include <windows.h>
	#undef BITMAP
	#endif
	+*/

	struct BITMAP;

	struct BitmapData{
	BitmapData():
	bitmap(0){}

	inline BITMAP * getBitmap() const {
	return bitmap;
	}

	inline void setBitmap(BITMAP * b) {
	bitmap = b;
	}

	BITMAP * bitmap;
	};
	diff --git a/util/allegro5/bitmap.cpp b/util/allegro5/bitmap.cpp
	new file mode 100644
	index 00000000..e69de29b
	diff --git a/util/allegro5/bitmap.h b/util/allegro5/bitmap.h
	new file mode 100644
	index 00000000..87a8237a
	--- /dev/null
	+++ b/util/allegro5/bitmap.h
	@@ -0,0 +1,4 @@
	+struct BitmapData{
	+ BitmapData(){
	+ }
	+};
	diff --git a/util/allegro5/sound.cpp b/util/allegro5/sound.cpp
	new file mode 100644
	index 00000000..70cf475a
	--- /dev/null
	+++ b/util/allegro5/sound.cpp
	@@ -0,0 +1 @@
	+#include "../sound.h"
	diff --git a/util/allegro5/sound.h b/util/allegro5/sound.h
	new file mode 100644
	index 00000000..5ff5c8e9
	--- /dev/null
	+++ b/util/allegro5/sound.h
	@@ -0,0 +1,4 @@
	+struct SoundData{
	+ SoundData(){
	+ }
	+};
	diff --git a/util/bitmap.cpp b/util/bitmap.cpp
	index c26e043c..dfc7c811 100644
	--- a/util/bitmap.cpp
	+++ b/util/bitmap.cpp
	@@ -1,337 +1,345 @@
	+/*
	#ifdef USE_ALLEGRO
	#include <allegro.h>
	#endif
	+*/

	+#include "funcs.h"
	#include "bitmap.h"
	+#include "trans-bitmap.h"
	+#include "lit_bitmap.h"
	#include <string>
	#include <math.h>

	/* implementation independant definitions can go here */

	Bitmap * Bitmap::temporary_bitmap = NULL;
	Bitmap * Bitmap::temporary_bitmap2 = NULL;

	std::vector<Bitmap*> Bitmap::needResize;
	int Bitmap::SCALE_X = 0;
	int Bitmap::SCALE_Y = 0;
	const int Bitmap::MODE_TRANS = 0;
	const int Bitmap::MODE_SOLID = 1;

	const int Bitmap::SPRITE_NO_FLIP = 0;
	const int Bitmap::SPRITE_V_FLIP = 1;
	const int Bitmap::SPRITE_H_FLIP = 2;

	const int Bitmap::SPRITE_NORMAL = 1;
	const int Bitmap::SPRITE_LIT = 2;
	const int Bitmap::SPRITE_TRANS = 3;

	#ifdef USE_ALLEGRO
	#include "allegro/bitmap.cpp"
	#endif
	#ifdef USE_SDL
	#include "sdl/bitmap.cpp"
	#endif
	+#ifdef USE_ALLEGRO5
	+#include "allegro5/bitmap.cpp"
	+#endif

	static inline int max(int a, int b){
	return a > b ? a : b;
	}

	Bitmap::~Bitmap(){
	if (mustResize){
	for (std::vector<Bitmap*>::iterator it = needResize.begin(); it != needResize.end(); it++){
	Bitmap * who = *it;
	if (who == this){
	needResize.erase(it);
	break;
	}
	}
	}

	releaseInternalBitmap();
	}

	static Bitmap makeTemporaryBitmap(Bitmap *& temporary, int w, int h){
	if (temporary == NULL){
	temporary = new Bitmap(w, h);
	} else if (temporary->getWidth() < w \|\| temporary->getHeight() < h){
	int mw = max(temporary->getWidth(), w);
	int mh = max(temporary->getHeight(), h);
	// printf("Create temporary bitmap %d %d\n", mw, mh);
	delete temporary;
	temporary = new Bitmap(mw, mh);
	}
	if (temporary == NULL){
	printf("bug temporary bitmap is null\n");
	}
	return Bitmap(*temporary, 0, 0, w, h);
	}

	Bitmap Bitmap::temporaryBitmap(int w, int h){
	return makeTemporaryBitmap(temporary_bitmap, w, h);
	}

	Bitmap Bitmap::temporaryBitmap2(int w, int h){
	return makeTemporaryBitmap(temporary_bitmap2, w, h);
	}

	void Bitmap::cleanupTemporaryBitmaps(){
	if (temporary_bitmap != NULL){
	delete temporary_bitmap;
	temporary_bitmap = NULL;
	}

	if (temporary_bitmap2 != NULL){
	delete temporary_bitmap2;
	temporary_bitmap2 = NULL;
	}
	}

	double Bitmap::getScale(){
	/* the game is pretty much hard coded to run at 320 scaled upto 640
	* and then scaled to whatever the user wants, but as long as
	* 320 and 640 remain this number will be 2.
	* maybe calculate this at some point
	*/
	return 2;
	/*
	if (Scaler != NULL && Buffer != NULL){
	double x1 = Scaler->getWidth();
	double x2 = Buffer->getWidth();
	return x2 / x1;
	}
	return 1;
	*/
	}

	/* taken from the color addon from allegro 4.9 */
	static void al_color_cmyk_to_rgb(float cyan, float magenta, float yellow, float key, float red, float green, float *blue){
	float max = 1 - key;
	red = max - cyan max;
	green = max - magenta max;
	blue = max - yellow max;
	}

	void Bitmap::cymkToRGB(int c, int y, int m, int k, int * r, int * g, int * b){
	float fc = (float)c / 255.0;
	float fy = (float)y / 255.0;
	float fm = (float)m / 255.0;
	float fk = (float)k / 255.0;

	float fr, fg, fb;
	al_color_cmyk_to_rgb(fc, fm, fy, fk, &fr, &fg, &fb);
	r = (int)(fr 255.0);
	g = (int)(fg 255.0);
	b = (int)(fb 255.0);
	}

	int Bitmap::getScreenWidth(){
	if (Screen != 0){
	return Screen->getWidth();
	}
	return 0;
	}

	int Bitmap::getScreenHeight(){
	if (Screen != 0){
	return Screen->getHeight();
	}
	return 0;
	}

	void Bitmap::updateOnResize(){
	if (!mustResize){
	mustResize = true;
	needResize.push_back(this);
	}
	}

	/* resize the internal bitmap. not guaranteed to destroy the internal bitmap */
	void Bitmap::resize( const int width, const int height ){

	/* if internal bitmap is already the proper size, do nothing */
	if ( getWidth() == width && getHeight() == height ){
	return;
	}

	Bitmap created(width, height);
	Stretch(created);
	*this = created;

	/*
	BITMAP * b = create_bitmap( width, height );
	::stretch_blit( getData().getBitmap(), b, 0, 0, getData().getBitmap()->w, getData().getBitmap()->h, 0, 0, b->w, b->h );

	releaseInternalBitmap();

	own = new int;
	getData().setBitmap( b );
	*own = 1;
	*/
	}


	/* decrement bitmap reference counter and free memory if counter hits 0 */
	void Bitmap::releaseInternalBitmap(){
	const int MAGIC_DEBUG = 0xa5a5a5;
	if (own != NULL){
	if (*own == MAGIC_DEBUG){
	printf("[bitmap] Trying to delete an already deleted reference counter %p\n", own);
	}

	(*own) -= 1;
	if ( *own == 0 ){
	*own = MAGIC_DEBUG;
	delete own;
	destroyPrivateData();
	own = NULL;
	}
	}
	}

	void Bitmap::BlitToScreen() const {
	// this->Blit( *Bitmap::Screen );
	this->BlitToScreen(0, 0);
	}

	void Bitmap::load( const std::string & str ){
	releaseInternalBitmap();
	internalLoadFile( str.c_str() );
	}

	void Bitmap::border( int min, int max, int color ) const {
	int w = getWidth();
	int h = getHeight();
	for (int i = min; i < max; i++){
	rectangle(i, i, w - 1 - i, h - 1 - i, color);
	}
	}

	void Bitmap::drawHFlip(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, const Bitmap & where) const {
	drawHFlip(x, y, startWidth, startHeight, width, height, NULL, where);
	}

	void Bitmap::drawHFlip(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, Filter * filter, const Bitmap & where) const {
	Bitmap sub(*this, getWidth() - width, getHeight() - height, getWidth() - startWidth, getHeight() - startHeight);
	sub.drawHFlip(x + startWidth, y + startHeight, filter, where);
	}

	void Bitmap::draw(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, const Bitmap & where) const {
	draw(x, y, startWidth, startHeight, width, height, NULL, where);
	/*
	Bitmap sub(*this, startWidth, startHeight, width, height);
	sub.draw(x + startWidth, y + startHeight, where);
	*/
	}

	void Bitmap::draw(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, Filter * filter, const Bitmap & where) const {
	Bitmap sub(*this, startWidth, startHeight, width, height);
	sub.draw(x + startWidth, y + startHeight, filter, where);
	}

	void Bitmap::horizontalLine( const int x1, const int y, const int x2, const int color ) const{
	this->hLine( x1, y, x2, color );
	}

	void Bitmap::equilateralTriangle(int x, int y, int angle, int size, int color) const {
	double radians = Util::radians(angle);
	int x1 = x + size / 2 * cos(radians + 2 * Util::pi / 3);
	int y1 = y + size / 2 * sin(radians + 2 * Util::pi / 3);
	int x2 = x + size / 2 * cos(radians - 2 * Util::pi / 3);
	int y2 = y + size / 2 * sin(radians - 2 * Util::pi / 3);
	int x3 = x + size / 2 * cos(radians);
	int y3 = y + size / 2 * sin(radians);
	triangle(x1, y1, x2, y2, x3, y3, color);
	}

	Bitmap Bitmap::greyScale(){
	Bitmap grey(getWidth(), getHeight());

	for (int x = 0; x < getWidth(); x++){
	for (int y = 0; y < getHeight(); y++){
	int pixel = getPixel(x, y);
	int val = (int)((0.299getRed(pixel) + 0.587getGreen(pixel) + 0.114*getBlue(pixel) + 0.5) + 16);
	if (val > 255){
	val = 255;
	}
	grey.putPixel(x, y, makeColor(val, val, val));
	}
	}

	return grey;
	}

	bool Bitmap::inRange(int x, int y) const {
	int x1, y1, x2, y2;
	getClipRect(x1, y1, x2, y2);
	return (x >= x1 && x <= x2 &&
	y >= y1 && y <= y2);
	}

	void Bitmap::drawMask( const int _x, const int _y, const Bitmap & where ){
	int mask = Bitmap::MaskColor();
	for ( int x = 0; x < getWidth(); x++ ){
	for ( int y = 0; y < getHeight(); y++ ){
	if ( getPixel( x,y ) == mask ){
	where.putPixel( x+_x, y+_y, mask );
	}
	}
	}
	}

	void Bitmap::set8BitMaskColor(int color){
	bit8MaskColor = color;
	}

	int Bitmap::get8BitMaskColor(){
	return bit8MaskColor;
	}

	void Bitmap::setFakeGraphicsMode(int width, int height){
	initializeExtraStuff();
	Screen = new Bitmap(width, height);
	}

	void Bitmap::Blit( const std::string & xpath ) const {
	Bitmap duh(xpath);
	duh.Blit(*this);
	}

	void Bitmap::BlitFromScreen(const int x, const int y) const {
	Screen->Blit(x, y, getWidth(), getHeight(), 0, 0, *this);
	}

	LitBitmap::LitBitmap(const Bitmap & b):
	Bitmap(b){
	int x1, y1, x2, y2;
	b.getClipRect(x1, y1, x2, y2);
	setClipRect(x1, y1, x2, y2);
	}

	LitBitmap::LitBitmap():
	Bitmap(){
	}

	LitBitmap::~LitBitmap(){
	}

	TranslucentBitmap Bitmap::translucent() const {
	return TranslucentBitmap(*this);
	}

	TranslucentBitmap::TranslucentBitmap(const Bitmap & b):
	Bitmap(b){
	int x1, y1, x2, y2;
	b.getClipRect(x1, y1, x2, y2);
	setClipRect(x1, y1, x2, y2);
	}

	TranslucentBitmap::TranslucentBitmap():
	Bitmap(){
	}

	TranslucentBitmap::~TranslucentBitmap(){
	}

	void TranslucentBitmap::fill(int color) const {
	Bitmap::applyTrans(color);
	}
	diff --git a/util/bitmap.h b/util/bitmap.h
	index ea0ca563..059a4a1d 100644
	--- a/util/bitmap.h
	+++ b/util/bitmap.h
	@@ -1,355 +1,358 @@
	#ifndef _paintown_bitmap_h_
	#define _paintown_bitmap_h_

	#ifdef USE_ALLEGRO
	#include "allegro/bitmap.h"
	#endif
	#ifdef USE_SDL
	#include "sdl/bitmap.h"
	#endif
	+#ifdef USE_ALLEGRO5
	+#include "allegro5/bitmap.h"
	+#endif

	#include <string>
	#include <vector>
	#include <iostream>

	class TranslucentBitmap;

	class Bitmap{
	private:
	static Bitmap * Screen;

	/* these constructors don't really matter, get rid of them at some point */
	Bitmap( const Bitmap & copy, int sx, int sy, double accuracy );
	Bitmap( const char * load_file, int sx, int sy, double accuracy );
	public:

	/* equivalent to a GPU shader */
	class Filter{
	public:
	virtual unsigned int filter(unsigned int pixel) const = 0;
	virtual ~Filter(){
	}
	};

	static int SCALE_X;
	static int SCALE_Y;

	/* default constructor makes 10x10 bitmap */
	Bitmap();
	Bitmap( int x, int y );
	Bitmap( const char * load_file );
	Bitmap(const char * data, int length);
	Bitmap( const std::string & load_file );
	Bitmap( const char * load_file, int sx, int sy );

	/* 4/24/2010: remove this at some point */
	#ifdef USE_ALLEGRO
	explicit Bitmap( BITMAP * who, bool deep_copy = false );
	#endif
	#ifdef USE_SDL
	explicit Bitmap(SDL_Surface * who, bool deep_copy = false );
	#endif
	Bitmap( const Bitmap & copy, bool deep_copy = false );
	Bitmap( const Bitmap & copy, int sx, int sy );
	Bitmap( const Bitmap & copy, int x, int y, int width, int height );
	virtual ~Bitmap();

	virtual TranslucentBitmap translucent() const;

	virtual void save( const std::string & str ) const;

	Bitmap & operator=( const Bitmap & );

	virtual void load( const std::string & str );

	int getWidth() const;
	int getHeight() const;

	/*
	inline const int getWidth() const{
	return getBitmap()->w;
	}

	inline const int getHeight() const{
	return getBitmap()->h;
	}
	*/

	/*
	inline const int getWidth() const{
	return my_bitmap->w;
	}

	inline const int getHeight() const{
	return my_bitmap->h;
	}
	*/

	static Bitmap memoryPCX(unsigned char * const data, const int length, const bool mask = true);

	void detach();

	/* replace all pixels that have value `original' with `replaced' */
	void replaceColor(int original, int replaced);
	void set8BitMaskColor(int color);
	int get8BitMaskColor();

	static void transBlender( int r, int g, int b, int a );
	static void multiplyBlender( int r, int g, int b, int a );
	static void dissolveBlender( int r, int g, int b, int a );
	static void addBlender( int r, int g, int b, int a );
	static void burnBlender( int r, int g, int b, int a );
	static void colorBlender( int r, int g, int b, int a );
	static void differenceBlender( int r, int g, int b, int a );
	static void dodgeBlender( int r, int g, int b, int a );
	static void hueBlender( int r, int g, int b, int a );
	static void luminanceBlender( int r, int g, int b, int a );
	static void invertBlender( int r, int g, int b, int a );
	static void screenBlender( int r, int g, int b, int a );
	static int setGraphicsMode( int mode, int width, int height );
	/* for testing */
	static void setFakeGraphicsMode(int width, int height);

	/* clean up any remaining state */
	static void shutdown();

	static void drawingMode( int type );

	void acquire();
	void release();

	void updateOnResize();

	void resize(const int width, const int height);

	void debugSelf() const;

	/* convert to a grey scale version */
	virtual Bitmap greyScale();

	virtual void triangle( int x1, int y1, int x2, int y2, int x3, int y3, int color ) const;

	/* draws an equilateral triangle centered at (x,y) pointing at `angle'
	* where each side has `size' pixels using the color.
	*/
	virtual void equilateralTriangle(int x, int y, int angle, int size, int color) const;
	virtual void ellipse( int x, int y, int rx, int ry, int color ) const;
	virtual void ellipseFill( int x, int y, int rx, int ry, int color ) const;

	virtual void light(int x, int y, int width, int height, int start_y, int focus_alpha, int edge_alpha, int focus_color, int edge_color) const;
	virtual void applyTrans(const int color) const;

	virtual void border( int min, int max, int color ) const;
	virtual void rectangle( int x1, int y1, int x2, int y2, int color ) const;
	virtual void rectangleFill( int x1, int y1, int x2, int y2, int color ) const;
	virtual void circleFill( int x, int y, int radius, int color ) const;
	virtual void circle( int x, int y, int radius, int color ) const;
	virtual void line( const int x1, const int y1, const int x2, const int y2, const int color ) const;

	virtual void floodfill( const int x, const int y, const int color ) const;
	virtual void horizontalLine( const int x1, const int y, const int x2, const int color ) const;
	virtual void hLine( const int x1, const int y, const int x2, const int color ) const;
	virtual void vLine( const int y1, const int x, const int y2, const int color ) const;
	virtual void polygon( const int * verts, const int nverts, const int color ) const;
	virtual void arc(const int x, const int y, const double ang1, const double ang2, const int radius, const int color ) const;

	virtual void draw(const int x, const int y, const Bitmap & where) const;
	virtual void draw(const int x, const int y, Filter * filter, const Bitmap & where) const;
	virtual void draw(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, const Bitmap & where) const;
	virtual void draw(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, Filter * filter, const Bitmap & where) const;
	virtual void drawCharacter( const int x, const int y, const int color, const int background, const Bitmap & where ) const;

	/* flip horizontally */
	virtual void drawHFlip(const int x, const int y, const Bitmap & where) const;
	virtual void drawHFlip(const int x, const int y, Filter * filter, const Bitmap & where) const;
	virtual void drawHFlip(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, const Bitmap & where) const;
	virtual void drawHFlip(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, Filter * filter, const Bitmap & where) const;
	/* flip vertically */
	virtual void drawVFlip( const int x, const int y, const Bitmap & where ) const;
	virtual void drawVFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const;

	/* flip horizontal and vertical */
	virtual void drawHVFlip( const int x, const int y, const Bitmap & where ) const;
	virtual void drawHVFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const;
	// virtual void drawTrans( const int x, const int y, const Bitmap & where ) const;
	// virtual void drawTrans( const int x, const int y, Filter * filter, const Bitmap & where ) const;
	// virtual void drawTransHFlip( const int x, const int y, const Bitmap & where ) const;
	// virtual void drawTransHFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const;
	// virtual void drawTransVFlip( const int x, const int y, const Bitmap & where ) const;
	// virtual void drawTransVFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const;
	// virtual void drawTransHVFlip( const int x, const int y, const Bitmap & where ) const;
	// virtual void drawTransHVFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const;
	virtual void drawMask( const int x, const int y, const Bitmap & where );
	virtual void drawStretched( const int x, const int y, const int new_width, const int new_height, const Bitmap & who ) const;
	virtual void drawRotate( const int x, const int y, const int angle, const Bitmap & where );
	virtual void drawPivot( const int centerX, const int centerY, const int x, const int y, const int angle, const Bitmap & where );
	virtual void drawPivot( const int centerX, const int centerY, const int x, const int y, const int angle, const double scale, const Bitmap & where );

	virtual void Stretch( const Bitmap & where ) const;
	virtual void Stretch( const Bitmap & where, const int sourceX, const int sourceY, const int sourceWidth, const int sourceHeight, const int destX, const int destY, const int destWidth, const int destHeight ) const;
	virtual void StretchBy2( const Bitmap & where );
	virtual void StretchBy4( const Bitmap & where );
	virtual void Blit( const std::string & xpath ) const;
	virtual void Blit( const Bitmap & where ) const;
	virtual void Blit( const int x, const int y, const Bitmap & where ) const;
	virtual void Blit( const int mx, const int my, const int wx, const int wy, const Bitmap & where ) const;
	virtual void Blit( const int mx, const int my, const int width, const int height, const int wx, const int wy, const Bitmap & where ) const;
	virtual void BlitMasked( const int mx, const int my, const int width, const int height, const int wx, const int wy, const Bitmap & where ) const;
	virtual void BlitToScreen() const;
	virtual void BlitAreaToScreen(const int upper_left_x, const int upper_left_y) const;
	virtual void BlitToScreen(const int upper_left_x, const int upper_left_y) const;
	virtual void BlitFromScreen(const int x, const int y) const;

	/* try to call Global::getScreenWidth/Height() instead of these directly */
	static int getScreenWidth();
	static int getScreenHeight();

	virtual void fill( int color ) const;

	inline void clear() const{
	this->fill( 0 );
	}

	inline void clearToMask() const{
	this->fill(MaskColor());
	}

	bool getError();

	inline const BitmapData & getData() const {
	return data;
	}

	inline BitmapData & getData(){
	return data;
	}

	virtual void readLine( std::vector< int > & vec, int y );
	int getPixel( const int x, const int y ) const;

	/* true if the point is within the bounds of the bitmap */
	bool inRange(int x, int y) const;

	/* uses _putpixel16 underneath which ignores translucent behavior */
	void putPixel( int x, int y, int col ) const;
	/* respects the current trans mode */
	virtual void putPixelNormal(int x, int y, int col) const;

	/*
	inline int getPixel( int x, int y ) const{
	if ( x >= 0 && x < my_bitmap->w && y >= 0 && y <= my_bitmap->h )
	return _getpixel16( my_bitmap, x, y );
	return -1;
	}

	inline void putPixel( int x, int y, int col ) const{
	if ( x >= 0 && x < my_bitmap->w && y >= 0 && y <= my_bitmap->h )
	_putpixel16( my_bitmap, x, y, col );
	}
	*/

	void setClipRect( int x1, int y1, int x2, int y2 ) const;
	void getClipRect( int & x1, int & y1, int & x2, int & y2 ) const;

	inline const std::string & getPath() const{
	return path;
	}

	/* produce a temporary bitmap that is not guaranteed to be preserved
	* after your function returns. do not hold references to this bitmap
	* and if you make a temporary bitmap, do not call functions that
	* might also make temporary bitmaps.
	*/
	static Bitmap temporaryBitmap(int w, int h);
	static Bitmap temporaryBitmap2(int w, int h);

	/* call this method to delete all temporary bitmaps.
	* don't call this unless you know what you are doing
	*/
	static void cleanupTemporaryBitmaps();

	static double getScale();
	static int setGfxModeText();
	static int setGfxModeFullscreen( int x, int y );
	static int setGfxModeWindowed( int x, int y );

	static int makeColor( int r, int g, int b );
	static int darken( int color, double factor );
	static void hsvToRGB( float h, float s, float v, int * r, int * g, int * b );

	/*
	* Convert color values between the HSV and RGB color spaces. The RGB values
	* range from 0 to 255, hue is from 0 to 360, and saturation and value are
	* from 0 to 1.
	*/
	static void rgbToHSV(int r, int g, int b, float * h, float * s, float * v);

	/* convert cymk to rgb. values should be in the range 0-255 */
	static void cymkToRGB(int c, int y, int m, int k, int * r, int * g, int * b);

	static int getRed( int x );
	static int getBlue( int x );
	static int getGreen( int x );

	/* Add two RGB16 colors together
	* r = c1.r + c2.r
	* g = c1.g + c2.g
	* b = c1.b + c2.b
	*/
	static int addColor( int color1, int color2 );

	/*
	inline static int makeColor( int r, int g, int b ){
	return makecol16( r, g, b );
	}
	*/

	// static const int MaskColor = MASK_COLOR_16;
	static int MaskColor();
	static const int MODE_TRANS;
	static const int MODE_SOLID;

	static const int SPRITE_NO_FLIP;
	static const int SPRITE_V_FLIP;
	static const int SPRITE_H_FLIP;

	static const int SPRITE_NORMAL;
	static const int SPRITE_LIT;
	static const int SPRITE_TRANS;

	protected:
	static void initializeExtraStuff();

	/* release a reference count, and possibly destroy data */
	void releaseInternalBitmap();

	/* really destroy private data */
	void destroyPrivateData();

	/*
	inline void setBitmap( BITMAP * bitmap ){
	if ( bitmap == NULL ){
	std::cout << "FATAL Setting null bitmap" << std::endl;
	}
	_my_bitmap = bitmap;
	}
	*/

	void internalLoadFile( const char * load_file );

	/* implementation specific data */
	BitmapData data;
	int * own;
	bool mustResize;
	// bool own;
	bool error;
	std::string path;
	static Bitmap * temporary_bitmap;
	static Bitmap * temporary_bitmap2;
	int bit8MaskColor;

	/* bitmaps that should always be resized to the dimensions of the screen */
	static std::vector<Bitmap*> needResize;
	};

	#endif
	diff --git a/util/init.cpp b/util/init.cpp
	index 6e25a60b..e2e85853 100644
	--- a/util/init.cpp
	+++ b/util/init.cpp
	@@ -1,441 +1,446 @@
	#ifdef USE_ALLEGRO
	#include <allegro.h>
	#ifdef ALLEGRO_WINDOWS
	#include <winalleg.h>
	#endif
	#endif

	#ifdef USE_SDL
	#include <SDL.h>
	#endif

	#ifndef WINDOWS
	#include <signal.h>
	#include <string.h>
	#endif

	#ifdef LINUX
	#include <execinfo.h>
	#endif

	/* don't be a boring tuna */
	// #warning you are ugly

	#include "globals.h"
	#include "init.h"
	#include "network/network.h"
	#include "thread.h"
	#include <time.h>

	#include <ostream>
	#include "dumb/include/dumb.h"
	#ifdef USE_ALLEGRO
	#include "dumb/include/aldumb.h"
	#include "loadpng/loadpng.h"
	#include "gif/algif.h"
	#endif
	#include "bitmap.h"
	#include "funcs.h"
	#include "file-system.h"
	#include "font.h"
	#include "sound.h"
	#include "configuration.h"
	#include "script/script.h"
	#include "music.h"
	#include "loading.h"
	#include "input/keyboard.h"

	#ifdef WII
	#include <fat.h>
	#endif

	using namespace std;

	volatile int Global::speed_counter = 0;

	/* enough seconds for 136 years */
	volatile unsigned int Global::second_counter = 0;

	/* the original engine was running at 90 ticks per second, but we dont
	* need to render that fast, so TICS_PER_SECOND is really fps and
	* LOGIC_MULTIPLIER will be used to adjust the speed counter to its
	* original value.
	*/
	const int Global::TICS_PER_SECOND = 40;
	const double Global::LOGIC_MULTIPLIER = (double) 90 / (double) Global::TICS_PER_SECOND;


	#ifdef USE_ALLEGRO
	const int Global::WINDOWED = GFX_AUTODETECT_WINDOWED;
	const int Global::FULLSCREEN = GFX_AUTODETECT_FULLSCREEN;
	#else
	/* FIXME: use enums here or something */
	const int Global::WINDOWED = 0;
	const int Global::FULLSCREEN = 1;
	#endif

	/* game counter, controls FPS */
	static void inc_speed_counter(){
	/* probably put input polling here, InputManager::poll() */
	Global::speed_counter += 1;
	}
	#ifdef USE_ALLEGRO
	END_OF_FUNCTION( inc_speed_counter )
	#endif

	/* if you need to count seconds for some reason.. */
	static void inc_second_counter() {
	Global::second_counter += 1;
	}
	#ifdef USE_ALLEGRO
	END_OF_FUNCTION( inc_second_counter )
	#endif

	#if !defined(WINDOWS) && !defined(WII) && !defined(MINPSPW) && !defined(PS3) && !defined(NDS)
	#ifdef LINUX
	static void print_stack_trace(){
	/* use addr2line on these addresses to get a filename and line number */
	void *trace[128];
	int frames = backtrace(trace, 128);
	printf("Stack trace\n");
	for (int i = 0; i < frames; i++){
	printf(" %p\n", trace[i]);
	}
	}
	#endif

	static void handleSigSegV(int i, siginfo_t * sig, void * data){
	const char * message = "Bug! Caught a memory violation. Shutting down..\n";
	int dont_care = write(1, message, 48);
	dont_care = dont_care;
	#ifdef LINUX
	print_stack_trace();
	#endif
	// Global::shutdown_message = "Bug! Caught a memory violation. Shutting down..";
	Bitmap::setGfxModeText();
	#ifdef USE_ALLEGRO
	allegro_exit();
	#endif
	#ifdef USE_SDL
	SDL_Quit();
	#endif
	/* write to a log file or something because sigsegv shouldn't
	* normally happen.
	*/
	exit(1);
	}
	#else
	#endif

	/* catch a socket being closed prematurely on unix */
	#if !defined(WINDOWS) && !defined(WII) && !defined(MINPSPW) && !defined(PS3) && !defined(NDS)
	static void handleSigPipe( int i, siginfo_t * sig, void * data ){
	}

	/*
	static void handleSigUsr1( int i, siginfo_t * sig, void * data ){
	pthread_exit( NULL );
	}
	*/
	#endif

	static void registerSignals(){
	#if !defined(WINDOWS) && !defined(WII) && !defined(MINPSPW) && !defined(PS3) && !defined(NDS)
	struct sigaction action;
	memset( &action, 0, sizeof(struct sigaction) );
	action.sa_sigaction = handleSigPipe;
	sigaction( SIGPIPE, &action, NULL );

	memset( &action, 0, sizeof(struct sigaction) );
	action.sa_sigaction = handleSigSegV;
	sigaction( SIGSEGV, &action, NULL );

	/*
	action.sa_sigaction = handleSigUsr1;
	sigaction( SIGUSR1, &action, NULL );
	*/
	#endif
	}

	/* should probably call the janitor here or something */
	static void close_paintown(){
	Music::pause();
	Bitmap::setGfxModeText();
	#ifdef USE_ALLEGRO
	allegro_exit();
	#endif
	exit(0);
	}

	namespace Global{
	extern int do_shutdown;
	}

	static void close_window(){
	/* when do_shutdown is 1 the game will attempt to throw ShutdownException
	* wherever it is. If the game is stuck or the code doesn't throw
	* ShutdownException then when the user tries to close the window
	* twice we just forcifully shutdown.
	*/
	Global::do_shutdown += 1;
	if (Global::do_shutdown == 2){
	close_paintown();
	}
	}
	#ifdef USE_ALLEGRO
	END_OF_FUNCTION(close_window)
	#endif

	+#ifdef USE_ALLEGRO5
	+static void initSystem(ostream & out){
	+}
	+#endif
	+
	#ifdef USE_ALLEGRO
	static void initSystem(ostream & out){
	out << "Allegro version: " << ALLEGRO_VERSION_STR << endl;
	out << "Allegro init: " <<allegro_init()<<endl;
	out << "Install timer: " <<install_timer()<<endl;

	/* png */
	loadpng_init();
	algif_init();

	out<<"Install keyboard: "<<install_keyboard()<<endl;
	/* do we need the mouse?? */
	// out<<"Install mouse: "<<install_mouse()<<endl;
	out<<"Install joystick: "<<install_joystick(JOY_TYPE_AUTODETECT)<<endl;
	/* 16 bit color depth */
	set_color_depth(16);

	LOCK_VARIABLE( speed_counter );
	LOCK_VARIABLE( second_counter );
	LOCK_FUNCTION( (void *)inc_speed_counter );
	LOCK_FUNCTION( (void *)inc_second_counter );
	/* set up the timers */
	out<<"Install game timer: "<< install_int_ex(inc_speed_counter, BPS_TO_TIMER(Global::TICS_PER_SECOND))<<endl;
	out<<"Install second timer: "<<install_int_ex(inc_second_counter, BPS_TO_TIMER(1))<<endl;

	/* keep running in the background */
	set_display_switch_mode(SWITCH_BACKGROUND);

	/* close window when the X is pressed */
	LOCK_FUNCTION(close_window);
	set_close_button_callback(close_window);
	}

	#endif
	#ifdef USE_SDL

	// static pthread_t events;

	struct TimerInfo{
	TimerInfo(void (*x)(), int y):
	tick(x), frequency(y){}

	void (*tick)();
	int frequency;
	};

	static void * do_timer(void * arg){
	TimerInfo info = (TimerInfo ) arg;
	uint32_t delay = (uint32_t)(1000.0 / (double) info.frequency);

	/* assuming SDL_GetTicks() starts at 0, this should last for about 50 days
	* before overflowing. overflow should work out fine. Assuming activate occurs
	* when the difference between now and ticks is at least 6, the following will happen.
	* ticks now now-ticks
	* 4294967294 4294967294 0
	* 4294967294 4294967295 1
	* 4294967294 0 2
	* 4294967294 1 3
	* 4294967294 2 4
	* 4294967294 3 5
	* 4294967294 4 6
	* Activate
	* 3 5 2
	* 3 6 3
	* 3 7 4
	* 3 8 5
	* 3 9 6
	* Activate
	*
	* Can 'now' ever be much larger than 'ticks' due to overflow?
	* It doesn't seem like it.
	*/
	uint32_t ticks = SDL_GetTicks();

	/* TODO: pass in some variable that tells this loop to quit */
	while (true){
	uint32_t now = SDL_GetTicks();
	while (now - ticks >= delay){
	// Global::debug(0) << "Tick!" << endl;
	info.tick();
	ticks += delay;
	}
	SDL_Delay(1);
	}

	delete (TimerInfo *) arg;

	return NULL;
	}

	static Util::Thread::Id start_timer(void (*func)(), int frequency){
	TimerInfo * speed = new TimerInfo(func, frequency);
	/*
	speed.tick = func;
	speed.frequency = frequency;
	*/
	Util::Thread::Id thread;
	Util::Thread::createThread(&thread, NULL, (Util::Thread::ThreadFunction) do_timer, (void*) speed);
	return thread;
	}

	#if 0
	static void * handleEvents(void * arg){
	bool done = false;
	while (!done){
	SDL_Event event;
	int ok = SDL_WaitEvent(&event);
	if (ok){
	switch (event.type){
	case SDL_QUIT : {
	done = true;
	close_window();
	break;
	}
	default : {
	// Global::debug(0) << "Ignoring SDL event " << event.type << endl;
	break;
	}
	}
	}
	}
	return NULL;
	}
	#endif

	/*
	static void doSDLQuit(){
	SDL_Event quit;
	quit.type = SDL_QUIT;
	SDL_PushEvent(&quit);
	Global::debug(0) << "Waiting for SDL event handler to finish" << endl;
	pthread_join(events, NULL);
	SDL_Quit();
	}
	*/

	static void initSystem(ostream & out){
	out << "SDL Init: ";
	int ok = SDL_Init(SDL_INIT_VIDEO \|
	SDL_INIT_AUDIO \|
	SDL_INIT_TIMER \|
	SDL_INIT_JOYSTICK \|
	SDL_INIT_NOPARACHUTE);
	if (ok == 0){
	out << "Ok" << endl;
	} else {
	out << "Failed (" << ok << ") - " << SDL_GetError() << endl;
	exit(ok);
	}

	/* Just do SDL thread init
	#ifdef MINPSPW
	pthread_init();
	#endif
	*/

	start_timer(inc_speed_counter, Global::TICS_PER_SECOND);
	start_timer(inc_second_counter, 1);

	try{
	SDL_Surface * icon = SDL_LoadBMP(Filesystem::find(Filesystem::RelativePath("menu/icon.bmp")).path().c_str());
	if (icon != NULL){
	SDL_WM_SetIcon(icon, NULL);
	}
	} catch (const Filesystem::NotFound & failed){
	Global::debug(0) << "Could not find window icon: " << failed.getTrace() << endl;
	}

	SDL_WM_SetCaption("Paintown", NULL);

	SDL_EnableUNICODE(1);
	SDL_JoystickEventState(1);

	atexit(SDL_Quit);
	// atexit(doSDLQuit);
	}
	#endif

	bool Global::init(int gfx){

	ostream & out = Global::debug( 0 );
	out << "-- BEGIN init --" << endl;
	out << "Data path is " << Util::getDataPath2().path() << endl;
	out << "Paintown version " << Global::getVersionString() << endl;
	out << "Build date " << __DATE__ << " " << __TIME__ << endl;

	#ifdef WII
	fatInitDefault();
	#endif

	/* do implementation specific setup */
	initSystem(out);

	dumb_register_stdfiles();

	Sound::initialize();

	Bitmap::SCALE_X = GFX_X;
	Bitmap::SCALE_Y = GFX_Y;

	Configuration::loadConfigurations();
	const int sx = Configuration::getScreenWidth();
	const int sy = Configuration::getScreenHeight();
	if (gfx == -1){
	gfx = Configuration::getFullscreen() ? Global::FULLSCREEN : Global::WINDOWED;
	} else {
	Configuration::setFullscreen(gfx == Global::FULLSCREEN);
	}

	/* set up the screen */
	int gfxCode = Bitmap::setGraphicsMode(gfx, sx, sy);
	if (gfxCode == 0){
	out << "Set graphics mode: Ok" << endl;
	} else {
	out << "Set graphics mode: Failed! (" << gfxCode << ")" << endl;
	return false;
	}

	/* music */
	atexit(&dumb_exit);

	Keyboard::disableKeyRepeat();

	out << "Initialize random number generator" << endl;
	/* initialize random number generator */
	srand(time(NULL));

	registerSignals();

	#ifdef HAVE_NETWORKING
	out << "Initialize network" << endl;
	Network::init();
	atexit(Network::closeAll);
	#endif

	/* this mutex is used to show the loading screen while the game loads */
	// Util::Thread::initializeLock(&Loader::loading_screen_mutex);

	out << "-- END init --" << endl;

	/*
	const Font & font = Font::getDefaultFont();
	// font.setSize(30, 30);
	Bitmap temp(font.textLength("Loading") + 1, font.getHeight("Loading") + 1);
	font.printf(0, 0, Bitmap::makeColor(255, 255, 255), temp, "Loading", 0);
	temp.BlitToScreen(sx / 2, sy / 2);
	*/
	Bitmap white(sx, sy);
	white.fill(Bitmap::makeColor(255, 255, 255));
	white.BlitToScreen();

	return true;
	}
	diff --git a/util/input/allegro5/keyboard.cpp b/util/input/allegro5/keyboard.cpp
	new file mode 100644
	index 00000000..723389e4
	--- /dev/null
	+++ b/util/input/allegro5/keyboard.cpp
	@@ -0,0 +1,134 @@
	+#include "../keyboard.h"
	+#include <allegro5/keycodes.h>
	+
	+const int Keyboard::Key_A = ALLEGRO_KEY_A;
	+const int Keyboard::Key_B = ALLEGRO_KEY_B;
	+const int Keyboard::Key_C = ALLEGRO_KEY_C;
	+const int Keyboard::Key_D = ALLEGRO_KEY_D;
	+const int Keyboard::Key_E = ALLEGRO_KEY_E;
	+const int Keyboard::Key_F = ALLEGRO_KEY_F;
	+const int Keyboard::Key_G = ALLEGRO_KEY_G;
	+const int Keyboard::Key_H = ALLEGRO_KEY_H;
	+const int Keyboard::Key_I = ALLEGRO_KEY_I;
	+const int Keyboard::Key_J = ALLEGRO_KEY_J;
	+const int Keyboard::Key_K = ALLEGRO_KEY_K;
	+const int Keyboard::Key_L = ALLEGRO_KEY_L;
	+const int Keyboard::Key_M = ALLEGRO_KEY_M;
	+const int Keyboard::Key_N = ALLEGRO_KEY_N;
	+const int Keyboard::Key_O = ALLEGRO_KEY_O;
	+const int Keyboard::Key_P = ALLEGRO_KEY_P;
	+const int Keyboard::Key_Q = ALLEGRO_KEY_Q;
	+const int Keyboard::Key_R = ALLEGRO_KEY_R;
	+const int Keyboard::Key_S = ALLEGRO_KEY_S;
	+const int Keyboard::Key_T = ALLEGRO_KEY_T;
	+const int Keyboard::Key_U = ALLEGRO_KEY_U;
	+const int Keyboard::Key_V = ALLEGRO_KEY_V;
	+const int Keyboard::Key_W = ALLEGRO_KEY_W;
	+const int Keyboard::Key_X = ALLEGRO_KEY_X;
	+const int Keyboard::Key_Y = ALLEGRO_KEY_Y;
	+const int Keyboard::Key_Z = ALLEGRO_KEY_Z;
	+const int Keyboard::Key_0 = ALLEGRO_KEY_0;
	+const int Keyboard::Key_1 = ALLEGRO_KEY_1;
	+const int Keyboard::Key_2 = ALLEGRO_KEY_2;
	+const int Keyboard::Key_3 = ALLEGRO_KEY_3;
	+const int Keyboard::Key_4 = ALLEGRO_KEY_4;
	+const int Keyboard::Key_5 = ALLEGRO_KEY_5;
	+const int Keyboard::Key_6 = ALLEGRO_KEY_6;
	+const int Keyboard::Key_7 = ALLEGRO_KEY_7;
	+const int Keyboard::Key_8 = ALLEGRO_KEY_8;
	+const int Keyboard::Key_9 = ALLEGRO_KEY_9;
	+const int Keyboard::Key_0_PAD = ALLEGRO_KEY_PAD_0;
	+const int Keyboard::Key_1_PAD = ALLEGRO_KEY_PAD_1;
	+const int Keyboard::Key_2_PAD = ALLEGRO_KEY_PAD_2;
	+const int Keyboard::Key_3_PAD = ALLEGRO_KEY_PAD_3;
	+const int Keyboard::Key_4_PAD = ALLEGRO_KEY_PAD_4;
	+const int Keyboard::Key_5_PAD = ALLEGRO_KEY_PAD_5;
	+const int Keyboard::Key_6_PAD = ALLEGRO_KEY_PAD_6;
	+const int Keyboard::Key_7_PAD = ALLEGRO_KEY_PAD_7;
	+const int Keyboard::Key_8_PAD = ALLEGRO_KEY_PAD_8;
	+const int Keyboard::Key_9_PAD = ALLEGRO_KEY_PAD_9;
	+const int Keyboard::Key_F1 = ALLEGRO_KEY_F1;
	+const int Keyboard::Key_F2 = ALLEGRO_KEY_F2;
	+const int Keyboard::Key_F3 = ALLEGRO_KEY_F3;
	+const int Keyboard::Key_F4 = ALLEGRO_KEY_F4;
	+const int Keyboard::Key_F5 = ALLEGRO_KEY_F5;
	+const int Keyboard::Key_F6 = ALLEGRO_KEY_F6;
	+const int Keyboard::Key_F7 = ALLEGRO_KEY_F7;
	+const int Keyboard::Key_F8 = ALLEGRO_KEY_F8;
	+const int Keyboard::Key_F9 = ALLEGRO_KEY_F9;
	+const int Keyboard::Key_F10 = ALLEGRO_KEY_F10;
	+const int Keyboard::Key_F11 = ALLEGRO_KEY_F11;
	+const int Keyboard::Key_F12 = ALLEGRO_KEY_F12;
	+const int Keyboard::Key_ESC = ALLEGRO_KEY_ESCAPE;
	+const int Keyboard::Key_TILDE = ALLEGRO_KEY_TILDE;
	+const int Keyboard::Key_MINUS = ALLEGRO_KEY_MINUS;
	+const int Keyboard::Key_EQUALS = ALLEGRO_KEY_EQUALS;
	+const int Keyboard::Key_BACKSPACE = ALLEGRO_KEY_BACKSPACE;
	+const int Keyboard::Key_TAB = ALLEGRO_KEY_TAB;
	+const int Keyboard::Key_OPENBRACE = ALLEGRO_KEY_OPENBRACE;
	+const int Keyboard::Key_CLOSEBRACE = ALLEGRO_KEY_CLOSEBRACE;
	+const int Keyboard::Key_ENTER = ALLEGRO_KEY_ENTER;
	+const int Keyboard::Key_COLON = ALLEGRO_KEY_SEMICOLON2;
	+const int Keyboard::Key_QUOTE = ALLEGRO_KEY_QUOTE;
	+const int Keyboard::Key_BACKSLASH = ALLEGRO_KEY_BACKSLASH;
	+const int Keyboard::Key_BACKSLASH2 = ALLEGRO_KEY_BACKSLASH2;
	+const int Keyboard::Key_COMMA = ALLEGRO_KEY_COMMA;
	+const int Keyboard::Key_STOP = ALLEGRO_KEY_FULLSTOP;
	+const int Keyboard::Key_SLASH = ALLEGRO_KEY_SLASH;
	+const int Keyboard::Key_SPACE = ALLEGRO_KEY_SPACE;
	+const int Keyboard::Key_INSERT = ALLEGRO_KEY_INSERT;
	+const int Keyboard::Key_DEL = ALLEGRO_KEY_DELETE;
	+const int Keyboard::Key_HOME = ALLEGRO_KEY_HOME;
	+const int Keyboard::Key_END = ALLEGRO_KEY_END;
	+const int Keyboard::Key_PGUP = ALLEGRO_KEY_PGUP;
	+const int Keyboard::Key_PGDN = ALLEGRO_KEY_PGDN;
	+const int Keyboard::Key_LEFT = ALLEGRO_KEY_LEFT;
	+const int Keyboard::Key_RIGHT = ALLEGRO_KEY_RIGHT;
	+const int Keyboard::Key_UP = ALLEGRO_KEY_UP;
	+const int Keyboard::Key_DOWN = ALLEGRO_KEY_DOWN;
	+const int Keyboard::Key_SLASH_PAD = ALLEGRO_KEY_PAD_SLASH;
	+const int Keyboard::Key_ASTERISK = ALLEGRO_KEY_PAD_ASTERISK;
	+const int Keyboard::Key_MINUS_PAD = ALLEGRO_KEY_PAD_MINUS;
	+const int Keyboard::Key_PLUS_PAD = ALLEGRO_KEY_PAD_PLUS;
	+const int Keyboard::Key_DEL_PAD = ALLEGRO_KEY_PAD_DELETE;
	+const int Keyboard::Key_ENTER_PAD = ALLEGRO_KEY_PAD_ENTER;
	+const int Keyboard::Key_PRTSCR = ALLEGRO_KEY_PRINTSCREEN;
	+const int Keyboard::Key_PAUSE = ALLEGRO_KEY_PAUSE;
	+const int Keyboard::Key_ABNT_C1 = ALLEGRO_KEY_ABNT_C1;
	+const int Keyboard::Key_YEN = ALLEGRO_KEY_YEN;
	+const int Keyboard::Key_KANA = ALLEGRO_KEY_KANA;
	+const int Keyboard::Key_CONVERT = ALLEGRO_KEY_CONVERT;
	+const int Keyboard::Key_NOCONVERT = ALLEGRO_KEY_NOCONVERT;
	+const int Keyboard::Key_AT = ALLEGRO_KEY_AT;
	+const int Keyboard::Key_CIRCUMFLEX = ALLEGRO_KEY_CIRCUMFLEX;
	+const int Keyboard::Key_COLON2 = ALLEGRO_KEY_COLON2;
	+const int Keyboard::Key_KANJI = ALLEGRO_KEY_KANJI;
	+const int Keyboard::Key_EQUALS_PAD = ALLEGRO_KEY_PAD_EQUALS;
	+const int Keyboard::Key_BACKQUOTE = ALLEGRO_KEY_BACKQUOTE;
	+const int Keyboard::Key_SEMICOLON = ALLEGRO_KEY_SEMICOLON;
	+const int Keyboard::Key_COMMAND = ALLEGRO_KEY_COMMAND;
	+
	+/*
	+const int Keyboard::Key_UNKNOWN1 = ALLEGRO_KEY_UNKNOWN1;
	+const int Keyboard::Key_UNKNOWN2 = ALLEGRO_KEY_UNKNOWN2;
	+const int Keyboard::Key_UNKNOWN3 = ALLEGRO_KEY_UNKNOWN3;
	+const int Keyboard::Key_UNKNOWN4 = ALLEGRO_KEY_UNKNOWN4;
	+const int Keyboard::Key_UNKNOWN5 = ALLEGRO_KEY_UNKNOWN5;
	+const int Keyboard::Key_UNKNOWN6 = ALLEGRO_KEY_UNKNOWN6;
	+const int Keyboard::Key_UNKNOWN7 = ALLEGRO_KEY_UNKNOWN7;
	+const int Keyboard::Key_UNKNOWN8 = ALLEGRO_KEY_UNKNOWN8;
	+*/
	+
	+const int Keyboard::Key_MODIFIERS = ALLEGRO_KEY_MODIFIERS;
	+const int Keyboard::Key_LSHIFT = ALLEGRO_KEY_LSHIFT;
	+const int Keyboard::Key_RSHIFT = ALLEGRO_KEY_RSHIFT;
	+const int Keyboard::Key_LCONTROL = ALLEGRO_KEY_LCTRL;
	+const int Keyboard::Key_RCONTROL = ALLEGRO_KEY_RCTRL;
	+const int Keyboard::Key_ALT = ALLEGRO_KEY_ALT;
	+const int Keyboard::Key_ALTGR = ALLEGRO_KEY_ALTGR;
	+const int Keyboard::Key_LWIN = ALLEGRO_KEY_LWIN;
	+const int Keyboard::Key_RWIN = ALLEGRO_KEY_RWIN;
	+const int Keyboard::Key_MENU = ALLEGRO_KEY_MENU;
	+const int Keyboard::Key_SCRLOCK = ALLEGRO_KEY_SCROLLLOCK;
	+const int Keyboard::Key_NUMLOCK = ALLEGRO_KEY_NUMLOCK;
	+const int Keyboard::Key_CAPSLOCK = ALLEGRO_KEY_CAPSLOCK;
	diff --git a/util/input/keyboard.cpp b/util/input/keyboard.cpp
	index 2da26fe4..a60f14cb 100644
	--- a/util/input/keyboard.cpp
	+++ b/util/input/keyboard.cpp
	@@ -1,400 +1,403 @@
	#ifdef USE_ALLEGRO
	#include "allegro/keyboard.cpp"
	#endif
	#ifdef USE_SDL
	#include "sdl/keyboard.cpp"
	#endif
	+#ifdef USE_ALLEGRO5
	+#include "allegro5/keyboard.cpp"
	+#endif

	bool Keyboard::isNumber( int key ){
	return key == Key_0 \|\|
	key == Key_1 \|\|
	key == Key_2 \|\|
	key == Key_3 \|\|
	key == Key_4 \|\|
	key == Key_5 \|\|
	key == Key_6 \|\|
	key == Key_7 \|\|
	key == Key_8 \|\|
	key == Key_9;
	}

	bool Keyboard::isChar( int key ){
	return key == Key_A \|\|
	key == Key_B \|\|
	key == Key_C \|\|
	key == Key_D \|\|
	key == Key_E \|\|
	key == Key_F \|\|
	key == Key_G \|\|
	key == Key_H \|\|
	key == Key_I \|\|
	key == Key_J \|\|
	key == Key_K \|\|
	key == Key_L \|\|
	key == Key_M \|\|
	key == Key_N \|\|
	key == Key_O \|\|
	key == Key_P \|\|
	key == Key_Q \|\|
	key == Key_R \|\|
	key == Key_S \|\|
	key == Key_T \|\|
	key == Key_U \|\|
	key == Key_V \|\|
	key == Key_W \|\|
	key == Key_X \|\|
	key == Key_Y \|\|
	key == Key_Z \|\|
	key == Key_MINUS;
	}

	bool Keyboard::isAlpha( int key ){
	return isNumber( key ) \|\| isChar( key );
	}


	const char * Keyboard::keyToName( int key ){
	switch ( key ){
	case Keyboard::Key_A : return "A";
	case Keyboard::Key_B : return "B";
	case Keyboard::Key_C : return "C";
	case Keyboard::Key_D : return "D";
	case Keyboard::Key_E : return "E";
	case Keyboard::Key_F : return "F";
	case Keyboard::Key_G : return "G";
	case Keyboard::Key_H : return "H";
	case Keyboard::Key_I : return "I";
	case Keyboard::Key_J : return "J";
	case Keyboard::Key_K : return "K";
	case Keyboard::Key_L : return "L";
	case Keyboard::Key_M : return "M";
	case Keyboard::Key_N : return "N";
	case Keyboard::Key_O : return "O";
	case Keyboard::Key_P : return "P";
	case Keyboard::Key_Q : return "Q";
	case Keyboard::Key_R : return "R";
	case Keyboard::Key_S : return "S";
	case Keyboard::Key_T : return "T";
	case Keyboard::Key_U : return "U";
	case Keyboard::Key_V : return "V";
	case Keyboard::Key_W : return "W";
	case Keyboard::Key_X : return "X";
	case Keyboard::Key_Y : return "Y";
	case Keyboard::Key_Z : return "Z";
	case Keyboard::Key_0 : return "0";
	case Keyboard::Key_1 : return "1";
	case Keyboard::Key_2 : return "2";
	case Keyboard::Key_3 : return "3";
	case Keyboard::Key_4 : return "4";
	case Keyboard::Key_5 : return "5";
	case Keyboard::Key_6 : return "6";
	case Keyboard::Key_7 : return "7";
	case Keyboard::Key_8 : return "8";
	case Keyboard::Key_9 : return "9";
	case Keyboard::Key_0_PAD : return "0_PAD";
	case Keyboard::Key_1_PAD : return "1_PAD";
	case Keyboard::Key_2_PAD : return "2_PAD";
	case Keyboard::Key_3_PAD : return "3_PAD";
	case Keyboard::Key_4_PAD : return "4_PAD";
	case Keyboard::Key_5_PAD : return "5_PAD";
	case Keyboard::Key_6_PAD : return "6_PAD";
	case Keyboard::Key_7_PAD : return "7_PAD";
	case Keyboard::Key_8_PAD : return "8_PAD";
	case Keyboard::Key_9_PAD : return "9_PAD";
	case Keyboard::Key_F1 : return "F1";
	case Keyboard::Key_F2 : return "F2";
	case Keyboard::Key_F3 : return "F3";
	case Keyboard::Key_F4 : return "F4";
	case Keyboard::Key_F5 : return "F5";
	case Keyboard::Key_F6 : return "F6";
	case Keyboard::Key_F7 : return "F7";
	case Keyboard::Key_F8 : return "F8";
	case Keyboard::Key_F9 : return "F9";
	case Keyboard::Key_F10 : return "F10";
	case Keyboard::Key_F11 : return "F11";
	case Keyboard::Key_F12 : return "F12";
	case Keyboard::Key_ESC : return "ESC";
	case Keyboard::Key_TILDE : return "~";
	case Keyboard::Key_MINUS : return "-";
	case Keyboard::Key_EQUALS : return "=";
	case Keyboard::Key_BACKSPACE : return "BACKSPACE";
	case Keyboard::Key_TAB : return "TAB";
	case Keyboard::Key_OPENBRACE : return "OPENBRACE";
	case Keyboard::Key_CLOSEBRACE : return "CLOSEBRACE";
	case Keyboard::Key_ENTER : return "ENTER";
	case Keyboard::Key_COLON : return "COLON";
	case Keyboard::Key_QUOTE : return "QUOTE";
	case Keyboard::Key_BACKSLASH : return "BACKSLASH";
	case Keyboard::Key_BACKSLASH2 : return "BACKSLASH2";
	case Keyboard::Key_COMMA : return "COMMA";
	case Keyboard::Key_STOP : return ".";
	case Keyboard::Key_SLASH : return "SLASH";
	case Keyboard::Key_SPACE : return "SPACE";
	case Keyboard::Key_INSERT : return "INSERT";
	case Keyboard::Key_DEL : return "DEL";
	case Keyboard::Key_HOME : return "HOME";
	case Keyboard::Key_END : return "END";
	case Keyboard::Key_PGUP : return "PGUP";
	case Keyboard::Key_PGDN : return "PGDN";
	case Keyboard::Key_LEFT : return "LEFT";
	case Keyboard::Key_RIGHT : return "RIGHT";
	case Keyboard::Key_UP : return "UP";
	case Keyboard::Key_DOWN : return "DOWN";
	case Keyboard::Key_SLASH_PAD : return "SLASH_PAD";
	case Keyboard::Key_ASTERISK : return "ASTERISK";
	case Keyboard::Key_MINUS_PAD : return "MINUS_PAD";
	case Keyboard::Key_PLUS_PAD : return "PLUS_PAD";
	case Keyboard::Key_DEL_PAD : return "DEL_PAD";
	case Keyboard::Key_ENTER_PAD : return "ENTER_PAD";
	case Keyboard::Key_PRTSCR : return "PRTSCR";
	case Keyboard::Key_PAUSE : return "PAUSE";
	case Keyboard::Key_ABNT_C1 : return "ABNT_C1";
	case Keyboard::Key_YEN : return "YEN";
	case Keyboard::Key_KANA : return "KANA";
	case Keyboard::Key_CONVERT : return "CONVERT";
	case Keyboard::Key_NOCONVERT : return "NOCONVERT";
	case Keyboard::Key_AT : return "AT";
	case Keyboard::Key_CIRCUMFLEX : return "CIRCUMFLEX";
	case Keyboard::Key_COLON2 : return "COLON2";
	case Keyboard::Key_KANJI : return "KANJI";
	case Keyboard::Key_EQUALS_PAD : return "EQUALS_PAD";
	case Keyboard::Key_BACKQUOTE : return "BACKQUOTE";
	case Keyboard::Key_SEMICOLON : return "SEMICOLON";
	case Keyboard::Key_COMMAND : return "COMMAND";
	/*
	case Keyboard::Key_UNKNOWN1 : return "UNKNOWN1";
	case Keyboard::Key_UNKNOWN2 : return "UNKNOWN2";
	case Keyboard::Key_UNKNOWN3 : return "UNKNOWN3";
	case Keyboard::Key_UNKNOWN4 : return "UNKNOWN4";
	case Keyboard::Key_UNKNOWN5 : return "UNKNOWN5";
	case Keyboard::Key_UNKNOWN6 : return "UNKNOWN6";
	case Keyboard::Key_UNKNOWN7 : return "UNKNOWN7";
	case Keyboard::Key_UNKNOWN8 : return "UNKNOWN8";
	*/
	// case Keyboard::Key_MODIFIERS : return "MODIFIERS";
	case Keyboard::Key_LSHIFT : return "LSHIFT";
	case Keyboard::Key_RSHIFT : return "RSHIFT";
	case Keyboard::Key_LCONTROL : return "LCONTROL";
	case Keyboard::Key_RCONTROL : return "RCONTROL";
	case Keyboard::Key_ALT : return "ALT";
	case Keyboard::Key_ALTGR : return "ALTGR";
	case Keyboard::Key_LWIN : return "LWIN";
	case Keyboard::Key_RWIN : return "RWIN";
	case Keyboard::Key_MENU : return "MENU";
	case Keyboard::Key_SCRLOCK : return "SCRLOCK";
	case Keyboard::Key_NUMLOCK : return "NUMLOCK";
	case Keyboard::Key_CAPSLOCK : return "CAPSLOCK";
	default : return "Unknown key";
	}
	}

	void Keyboard::setDelay( const int key, const int delay ){
	key_delay[ key ] = delay;
	}

	void Keyboard::setAllDelay( const int delay ){
	setDelay( Key_A, delay );
	setDelay( Key_B, delay );
	setDelay( Key_C, delay );
	setDelay( Key_D, delay );
	setDelay( Key_E, delay );
	setDelay( Key_F, delay );
	setDelay( Key_G, delay );
	setDelay( Key_H, delay );
	setDelay( Key_I, delay );
	setDelay( Key_J, delay );
	setDelay( Key_K, delay );
	setDelay( Key_L, delay );
	setDelay( Key_M, delay );
	setDelay( Key_N, delay );
	setDelay( Key_O, delay );
	setDelay( Key_P, delay );
	setDelay( Key_Q, delay );
	setDelay( Key_R, delay );
	setDelay( Key_S, delay );
	setDelay( Key_T, delay );
	setDelay( Key_U, delay );
	setDelay( Key_V, delay );
	setDelay( Key_W, delay );
	setDelay( Key_X, delay );
	setDelay( Key_Y, delay );
	setDelay( Key_Z, delay );
	setDelay( Key_0, delay );
	setDelay( Key_1, delay );
	setDelay( Key_2, delay );
	setDelay( Key_3, delay );
	setDelay( Key_4, delay );
	setDelay( Key_5, delay );
	setDelay( Key_6, delay );
	setDelay( Key_7, delay );
	setDelay( Key_8, delay );
	setDelay( Key_9, delay );
	setDelay( Key_0_PAD, delay );
	setDelay( Key_1_PAD, delay );
	setDelay( Key_2_PAD, delay );
	setDelay( Key_3_PAD, delay );
	setDelay( Key_4_PAD, delay );
	setDelay( Key_5_PAD, delay );
	setDelay( Key_6_PAD, delay );
	setDelay( Key_7_PAD, delay );
	setDelay( Key_8_PAD, delay );
	setDelay( Key_9_PAD, delay );
	setDelay( Key_F1, delay );
	setDelay( Key_F2, delay );
	setDelay( Key_F3, delay );
	setDelay( Key_F4, delay );
	setDelay( Key_F5, delay );
	setDelay( Key_F6, delay );
	setDelay( Key_F7, delay );
	setDelay( Key_F8, delay );
	setDelay( Key_F9, delay );
	setDelay( Key_F10, delay );
	setDelay( Key_F11, delay );
	setDelay( Key_F12, delay );
	setDelay( Key_ESC, delay );
	setDelay( Key_TILDE, delay );
	setDelay( Key_MINUS, delay );
	setDelay( Key_EQUALS, delay );
	setDelay( Key_BACKSPACE, delay );
	setDelay( Key_TAB, delay );
	setDelay( Key_OPENBRACE, delay );
	setDelay( Key_CLOSEBRACE, delay );
	setDelay( Key_ENTER, delay );
	setDelay( Key_COLON, delay );
	setDelay( Key_QUOTE, delay );
	setDelay( Key_BACKSLASH, delay );
	setDelay( Key_BACKSLASH2, delay );
	setDelay( Key_COMMA, delay );
	setDelay( Key_STOP, delay );
	setDelay( Key_SLASH, delay );
	setDelay( Key_SPACE, delay );
	setDelay( Key_INSERT, delay );
	setDelay( Key_DEL, delay );
	setDelay( Key_HOME, delay );
	setDelay( Key_END, delay );
	setDelay( Key_PGUP, delay );
	setDelay( Key_PGDN, delay );
	setDelay( Key_LEFT, delay );
	setDelay( Key_RIGHT, delay );
	setDelay( Key_UP, delay );
	setDelay( Key_DOWN, delay );
	setDelay( Key_SLASH_PAD, delay );
	setDelay( Key_ASTERISK, delay );
	setDelay( Key_MINUS_PAD, delay );
	setDelay( Key_PLUS_PAD, delay );
	setDelay( Key_DEL_PAD, delay );
	setDelay( Key_ENTER_PAD, delay );
	setDelay( Key_PRTSCR, delay );
	setDelay( Key_PAUSE, delay );
	setDelay( Key_ABNT_C1, delay );
	setDelay( Key_YEN, delay );
	setDelay( Key_KANA, delay );
	setDelay( Key_CONVERT, delay );
	setDelay( Key_NOCONVERT, delay );
	setDelay( Key_AT, delay );
	setDelay( Key_CIRCUMFLEX, delay );
	setDelay( Key_COLON2, delay );
	setDelay( Key_KANJI, delay );
	setDelay( Key_EQUALS_PAD, delay );
	setDelay( Key_BACKQUOTE, delay );
	setDelay( Key_SEMICOLON, delay );
	setDelay( Key_COMMAND, delay );
	/*
	setDelay( Key_UNKNOWN1, delay );
	setDelay( Key_UNKNOWN2, delay );
	setDelay( Key_UNKNOWN3, delay );
	setDelay( Key_UNKNOWN4, delay );
	setDelay( Key_UNKNOWN5, delay );
	setDelay( Key_UNKNOWN6, delay );
	setDelay( Key_UNKNOWN7, delay );
	setDelay( Key_UNKNOWN8, delay );
	*/
	setDelay( Key_MODIFIERS, delay );
	setDelay( Key_LSHIFT, delay );
	setDelay( Key_RSHIFT, delay );
	setDelay( Key_LCONTROL, delay );
	setDelay( Key_RCONTROL, delay );
	setDelay( Key_ALT, delay );
	setDelay( Key_ALTGR, delay );
	setDelay( Key_LWIN, delay );
	setDelay( Key_RWIN, delay );
	setDelay( Key_MENU, delay );
	setDelay( Key_SCRLOCK, delay );
	setDelay( Key_NUMLOCK, delay );
	setDelay( Key_CAPSLOCK, delay );
	}

	void Keyboard::press(KeyType key, unicode_t unicode){
	keyState[key].key = key;
	keyState[key].unicode = unicode;
	keyState[key].enabled = true;
	// if (enableBuffer){
	buffer.push_back(keyState[key]);
	// }
	/*
	KeyData data(key, unicode, true);
	for (std::vector<Observer>::iterator it = observers.begin(); it != observers.end(); it++){
	Observer observer = (*it);
	observer.callback(data, observer.extra);
	}
	*/
	}

	void Keyboard::release(KeyType key){
	keyState[key].enabled = false;
	buffer.push_back(keyState[key]);
	/*
	KeyData data(key, 0, false);
	for (std::vector<Observer>::iterator it = observers.begin(); it != observers.end(); it++){
	Observer observer = (*it);
	observer.callback(data, observer.extra);
	}
	*/
	}

	void Keyboard::readBufferedKeys(std::vector<int> & keys){
	for (std::vector<KeyData>::iterator it = buffer.begin(); it != buffer.end(); it++){
	const KeyData & data = *it;
	keys.push_back(data.key);
	}
	}

	std::vector<Keyboard::KeyData> Keyboard::readData(){
	std::vector<Keyboard::KeyData> out;
	for (std::map<KeyType, KeyData>::iterator it = keyState.begin(); it != keyState.end(); it++){
	KeyType key = it->first;
	const KeyData & data = it->second;
	if (data.enabled){
	out.push_back(data);
	}
	}
	return out;
	}

	std::vector<Keyboard::unicode_t> Keyboard::readText(){
	std::vector<Keyboard::unicode_t> out;
	for (std::map<KeyType, KeyData>::iterator it = keyState.begin(); it != keyState.end(); it++){
	KeyType key = it->first;
	const KeyData & data = it->second;
	if (data.enabled){
	out.push_back(data.unicode);
	}
	}
	return out;
	}

	/*
	void Keyboard::addObserver(ObserverCallback observer, void * data){
	observers.push_back(Observer(observer, data));
	}

	void Keyboard::removeObserver(ObserverCallback observer, void * data){
	for (std::vector<Observer>::iterator it = observers.begin(); it != observers.end(); it++){
	const Observer & what = *it;
	if (what.callback == observer && what.extra == data){
	observers.erase(it);
	break;
	}
	}
	}
	*/
	diff --git a/util/sound.cpp b/util/sound.cpp
	index ae2aa2fe..711247f8 100644
	--- a/util/sound.cpp
	+++ b/util/sound.cpp
	@@ -1,35 +1,38 @@
	#ifdef USE_ALLEGRO
	#include "allegro/sound.cpp"
	#endif
	#ifdef USE_SDL
	#include "sdl/sound.cpp"
	#endif
	+#ifdef USE_ALLEGRO5
	+#include "allegro5/sound.cpp"
	+#endif

	int Sound::FREQUENCY = 22050;

	Sound::Sound( const Sound & copy ):
	own( NULL ){
	own = copy.own;
	if ( own ){
	*own += 1;
	}
	data = copy.data;
	}

	Sound & Sound::operator=( const Sound & rhs ){
	if ( own ){
	destroy();
	}
	own = rhs.own;
	if ( own ){
	*own += 1;
	}

	data = rhs.data;

	return *this;
	}

	Sound::~Sound(){
	destroy();
	}
	diff --git a/util/sound.h b/util/sound.h
	index d51b4fef..bc8e851c 100644
	--- a/util/sound.h
	+++ b/util/sound.h
	@@ -1,55 +1,58 @@
	#ifndef _paintown_sound_h
	#define _paintown_sound_h

	#include <string>
	#include "load_exception.h"

	#ifdef USE_SDL
	#include "sdl/sound.h"
	#endif
	#ifdef USE_ALLEGRO
	#include "allegro/sound.h"
	#endif
	+#ifdef USE_ALLEGRO5
	+#include "allegro5/sound.h"
	+#endif

	struct SAMPLE;

	/* a sound! */
	class Sound{
	public:
	Sound();
	/* create from wav file (riff header + pcm) */
	Sound(const char * data, int length);
	/* load from path */
	Sound(const std::string & path) throw (LoadException);
	Sound(const Sound & copy);

	/* do any global initialization necessary */
	static void initialize();
	/* cleanup */
	static void uninitialize();

	Sound & operator=( const Sound & rhs );

	void play();
	void play(double volume, int pan);
	void playLoop();
	void stop();

	virtual ~Sound();

	/* global frequency to use */
	// static const int FREQUENCY = 22050;
	static int FREQUENCY;

	protected:

	void destroy();

	// SAMPLE * my_sound;
	SoundData data;

	/* reference counting */
	int * own;
	};

	#endif

File Metadata

Mime Type: text/x-diff
Expires: Thu, Jun 11, 11:33 AM (3 w, 4 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 68786
Default Alt Text: (59 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions