Commit 131adf2e authored by alistert's avatar alistert

Applied Zeartul's latest Dingoo patch.

parent 9d62e0a7
...@@ -37,19 +37,21 @@ Controls::Controls () { ...@@ -37,19 +37,21 @@ Controls::Controls () {
int count; int count;
keys[C_UP].key = SDLK_UP; keys[C_UP].key = SDLK_UP;
keys[C_DOWN].key = SDLK_DOWN; keys[C_DOWN].key = SDLK_DOWN;
keys[C_LEFT].key = SDLK_LEFT; keys[C_LEFT].key = SDLK_LEFT;
keys[C_RIGHT].key = SDLK_RIGHT; keys[C_RIGHT].key = SDLK_RIGHT;
#if defined(DINGOO) #if defined(DINGOO)
keys[C_JUMP].key = SDLK_LCTRL; keys[C_JUMP].key = SDLK_LCTRL;
keys[C_FIRE].key = SDLK_LALT; keys[C_FIRE].key = SDLK_LALT;
keys[C_CHANGE].key = SDLK_LSHIFT; keys[C_CHANGE].key = SDLK_LSHIFT;
keys[C_ENTER].key = SDLK_RETURN; keys[C_ENTER].key = SDLK_LCTRL;
keys[C_ESCAPE].key = SDLK_ESCAPE; keys[C_ESCAPE].key = SDLK_ESCAPE;
keys[C_STATS].key = SDLK_BACKSPACE; keys[C_STATS].key = SDLK_TAB;
keys[C_PAUSE].key = SDLK_TAB; keys[C_PAUSE].key = SDLK_RETURN;
#else keys[C_YES].key = SDLK_LCTRL;
keys[C_NO].key = SDLK_LALT;
#else
#ifdef WIN32 #ifdef WIN32
keys[C_JUMP].key = SDLK_RALT; keys[C_JUMP].key = SDLK_RALT;
keys[C_FIRE].key = SDLK_SPACE; keys[C_FIRE].key = SDLK_SPACE;
...@@ -64,10 +66,10 @@ Controls::Controls () { ...@@ -64,10 +66,10 @@ Controls::Controls () {
keys[C_PAUSE].key = SDLK_p; keys[C_PAUSE].key = SDLK_p;
keys[C_YES].key = SDLK_y; keys[C_YES].key = SDLK_y;
keys[C_NO].key = SDLK_n; keys[C_NO].key = SDLK_n;
#endif #endif
keys[C_SWIM].key = keys[C_JUMP].key; keys[C_SWIM].key = keys[C_JUMP].key;
#if defined(WIZ) || defined(GP2X) #if defined(WIZ) || defined(GP2X)
buttons[C_UP].button = GP2X_BUTTON_UP; buttons[C_UP].button = GP2X_BUTTON_UP;
buttons[C_DOWN].button = GP2X_BUTTON_DOWN; buttons[C_DOWN].button = GP2X_BUTTON_DOWN;
...@@ -96,7 +98,7 @@ Controls::Controls () { ...@@ -96,7 +98,7 @@ Controls::Controls () {
buttons[C_NO].button = -1; buttons[C_NO].button = -1;
#endif #endif
buttons[C_SWIM].button = buttons[C_JUMP].button; buttons[C_SWIM].button = buttons[C_JUMP].button;
axes[C_UP].axis = 1; axes[C_UP].axis = 1;
axes[C_UP].direction = false; axes[C_UP].direction = false;
...@@ -116,7 +118,7 @@ Controls::Controls () { ...@@ -116,7 +118,7 @@ Controls::Controls () {
axes[C_PAUSE].axis = -1; axes[C_PAUSE].axis = -1;
axes[C_YES].axis = -1; axes[C_YES].axis = -1;
axes[C_NO].axis = -1; axes[C_NO].axis = -1;
for (count = 0; count < CONTROLS; count++) { for (count = 0; count < CONTROLS; count++) {
...@@ -128,7 +130,7 @@ Controls::Controls () { ...@@ -128,7 +130,7 @@ Controls::Controls () {
controls[count].state = false; controls[count].state = false;
} }
return; return;
......
...@@ -32,7 +32,11 @@ ...@@ -32,7 +32,11 @@
// Constants // Constants
// Defaults // Defaults
#define NET_ADDRESS "192.168.0.1" #if defined(DINGOO)
#define NET_ADDRESS "10.1.0.1"
#else
#define NET_ADDRESS "192.168.0.1"
#endif
#define NET_PORT 10052 #define NET_PORT 10052
// Timeout interval // Timeout interval
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment