More Dingoo changes.

Makefile.dingoo

+# OpenJazz makefile
+
+CC=mipsel-linux-gcc
+CXX=mipsel-linux-g++
+INCLUDE=/opt/mipsel-linux-uclibc/usr/include
+
+objects = src/bonus/bonus.o \
+	src/game/clientgame.o src/game/game.o src/game/gamemode.o \
+	src/game/servergame.o \
+	src/io/gfx/anim.o src/io/gfx/font.o src/io/gfx/paletteeffects.o \
+	src/io/gfx/sprite.o src/io/gfx/video.o \
+	src/io/gfx/scale2x/getopt.o src/io/gfx/scale2x/pixel.o \
+	src/io/gfx/scale2x/scale2x.o src/io/gfx/scale2x/scale3x.o \
+	src/io/gfx/scale2x/scalebit.o src/io/gfx/scale2x/simple2x.o \
+	src/io/controls.o src/io/file.o src/io/network.o src/io/sound.o \
+	src/jj2level/jj2event/jj2event.o src/jj2level/jj2event/jj2eventframe.o \
+	src/jj2level/jj2layer.o src/jj2level/jj2level.o \
+	src/jj2level/jj2levelframe.o src/jj2level/jj2levelload.o \
+	src/level/event/bridge.o src/level/event/guardians.o \
+	src/level/event/event.o src/level/event/eventframe.o \
+	src/level/bullet.o src/level/demolevel.o src/level/level.o \
+	src/level/levelframe.o src/level/levelload.o src/level/movable.o \
+	src/menu/gamemenu.o src/menu/mainmenu.o src/menu/menu.o \
+	src/menu/plasma.o src/menu/setupmenu.o \
+	src/planet/planet.o \
+	src/player/bird.o src/player/bonusplayer.o src/player/jj2levelplayer.o \
+	src/player/jj2levelplayerframe.o src/player/levelplayer.o \
+	src/player/levelplayerframe.o src/player/player.o \
+	src/scene/scene.o src/scene/sceneload.o \
+	src/baselevel.o src/main.o src/util.o
+
+
+OpenJazz: $(objects)
+	$(CXX) -Wall -I$(INCLUDE) -I$(INCLUDE)/libmodplug -I$(INCLUDE)/SDL $(objects) -o OpenJazz -lSDL -lstdc++ -lz -lpthread /opt/mipsel-linux-uclibc/usr/lib/libmodplug.a
+
+%.o: %.cpp
+	$(CXX) -Wall -DDINGOO -DUSE_SOCKETS -DUSE_MODPLUG -I$(INCLUDE) -I$(INCLUDE)/libmodplug -I$(INCLUDE)/SDL -Isrc -O2 -c $< -o $@
+
+clean:
+	rm -f OpenJazz $(objects)
\ No newline at end of file

src/io/controls.cpp

@@ -37,18 +37,26 @@ Controls::Controls () {
 
 	int count;
 
-	keys[C_UP].key     = SDLK_UP;
-	keys[C_DOWN].key   = SDLK_DOWN;
-	keys[C_LEFT].key   = SDLK_LEFT;
-	keys[C_RIGHT].key  = SDLK_RIGHT;
-#ifdef WIN32
+	keys[C_UP].key     = SDLK_UP;
+	keys[C_DOWN].key   = SDLK_DOWN;
+	keys[C_LEFT].key   = SDLK_LEFT;
+	keys[C_RIGHT].key  = SDLK_RIGHT;
+#if defined(DINGOO)
+	keys[C_JUMP].key   = SDLK_LCTRL;
+	keys[C_FIRE].key   = SDLK_LALT;
+	keys[C_CHANGE].key = SDLK_LSHIFT;
+	keys[C_ENTER].key  = SDLK_RETURN;
+	keys[C_ESCAPE].key = SDLK_ESCAPE;
+	keys[C_STATS].key  = SDLK_BACKSPACE;
+	keys[C_PAUSE].key  = SDLK_TAB;
+#else
+	#ifdef WIN32
 	keys[C_JUMP].key   = SDLK_RALT;
 	keys[C_FIRE].key   = SDLK_SPACE;
-#else
+	#else
 	keys[C_JUMP].key   = SDLK_SPACE;
 	keys[C_FIRE].key   = SDLK_LALT;
-#endif
-	keys[C_SWIM].key   = keys[C_JUMP].key;
+	#endif
 	keys[C_CHANGE].key = SDLK_RCTRL;
 	keys[C_ENTER].key  = SDLK_RETURN;
 	keys[C_ESCAPE].key = SDLK_ESCAPE;
@@ -56,30 +64,22 @@ Controls::Controls () {
 	keys[C_PAUSE].key  = SDLK_p;
 	keys[C_YES].key    = SDLK_y;
 	keys[C_NO].key     = SDLK_n;
+#endif
+	keys[C_SWIM].key   = keys[C_JUMP].key;
+
+
 #if defined(WIZ) || defined(GP2X)
-        buttons[C_UP].button            = GP2X_BUTTON_UP;
-        buttons[C_DOWN].button          = GP2X_BUTTON_DOWN;
-        buttons[C_LEFT].button          = GP2X_BUTTON_LEFT;
-        buttons[C_RIGHT].button         = GP2X_BUTTON_RIGHT;
-        buttons[C_JUMP].button          = GP2X_BUTTON_A;
-        buttons[C_FIRE].button          = GP2X_BUTTON_X;
-        buttons[C_CHANGE].button        = GP2X_BUTTON_Y;
-        buttons[C_ENTER].button         = GP2X_BUTTON_R;
-        buttons[C_ESCAPE].button        = GP2X_BUTTON_L;
-        buttons[C_STATS].button         = GP2X_BUTTON_SELECT;
-        buttons[C_PAUSE].button         = GP2X_BUTTON_START;
-#elif defined(DINGOO)
-        buttons[C_UP].button            = SDLK_UP;
-        buttons[C_DOWN].button          = SDLK_DOWN;
-        buttons[C_LEFT].button          = SDLK_LEFT;
-        buttons[C_RIGHT].button         = SDLK_RIGHT;
-        buttons[C_JUMP].button          = SDLK_LCTRL;
-        buttons[C_FIRE].button          = SDLK_LALT;
-        buttons[C_CHANGE].button        = SDLK_LSHIFT;
-        buttons[C_ENTER].button         = SDLK_RETURN;
-        buttons[C_ESCAPE].button        = SDLK_ESCAPE;
-        buttons[C_STATS].button         = SDLK_BACKSPACE;
-        buttons[C_PAUSE].button         = SDLK_TAB;
+	buttons[C_UP].button            = GP2X_BUTTON_UP;
+	buttons[C_DOWN].button          = GP2X_BUTTON_DOWN;
+	buttons[C_LEFT].button          = GP2X_BUTTON_LEFT;
+	buttons[C_RIGHT].button         = GP2X_BUTTON_RIGHT;
+	buttons[C_JUMP].button          = GP2X_BUTTON_A;
+	buttons[C_FIRE].button          = GP2X_BUTTON_X;
+	buttons[C_CHANGE].button        = GP2X_BUTTON_Y;
+	buttons[C_ENTER].button         = GP2X_BUTTON_R;
+	buttons[C_ESCAPE].button        = GP2X_BUTTON_L;
+	buttons[C_STATS].button         = GP2X_BUTTON_SELECT;
+	buttons[C_PAUSE].button         = GP2X_BUTTON_START;
 #else
 	buttons[C_UP].button = -1;
 	buttons[C_DOWN].button = -1;
@@ -96,6 +96,7 @@ Controls::Controls () {
 	buttons[C_NO].button = -1;
 #endif
 	buttons[C_SWIM].button = buttons[C_JUMP].button;
+
 
 	axes[C_UP].axis = 1;
 	axes[C_UP].direction = false;
@@ -115,6 +116,7 @@ Controls::Controls () {
 	axes[C_PAUSE].axis = -1;
 	axes[C_YES].axis = -1;
 	axes[C_NO].axis = -1;
+
 
 	for (count = 0; count < CONTROLS; count++) {
 
@@ -126,6 +128,7 @@ Controls::Controls () {
 		controls[count].state = false;
 
 	}
+
 
 	return;