Roll back lzdoom patches, as they don't compile. Fix fs-resize.
This commit is contained in:
parent
ae03186062
commit
f8415fbce0
3 changed files with 1 additions and 123 deletions
|
@ -1,61 +0,0 @@
|
|||
diff --git a/src/menu/menu.cpp b/src/menu/menu.cpp
|
||||
index 2af6616fa0..cf6ff999d1 100644
|
||||
--- a/src/menu/menu.cpp
|
||||
+++ b/src/menu/menu.cpp
|
||||
@@ -666,17 +666,17 @@ bool M_Responder (event_t *ev)
|
||||
ch = ev->data1;
|
||||
switch (ch)
|
||||
{
|
||||
- case KEY_JOY2:
|
||||
+ case KEY_JOY1: //B button on rg552/rg503
|
||||
case KEY_PAD_A:
|
||||
mkey = MKEY_Back;
|
||||
break;
|
||||
|
||||
- case KEY_JOY1:
|
||||
+ case KEY_JOY2: //A button on rg552/rg503
|
||||
case KEY_PAD_B:
|
||||
mkey = MKEY_Enter;
|
||||
break;
|
||||
|
||||
- case KEY_JOY4:
|
||||
+ case KEY_JOY3: //X button on rg552/rg503
|
||||
case KEY_PAD_X:
|
||||
mkey = MKEY_Clear;
|
||||
break;
|
||||
@@ -695,7 +695,7 @@ bool M_Responder (event_t *ev)
|
||||
case KEY_PAD_LTHUMB_UP:
|
||||
case KEY_JOYAXIS2MINUS:
|
||||
case KEY_JOYPOV1_UP:
|
||||
- case KEY_JOY9:
|
||||
+ case KEY_JOY14: //Dpad up on rg552/rg503
|
||||
mkey = MKEY_Up;
|
||||
break;
|
||||
|
||||
@@ -703,7 +703,7 @@ bool M_Responder (event_t *ev)
|
||||
case KEY_PAD_LTHUMB_DOWN:
|
||||
case KEY_JOYAXIS2PLUS:
|
||||
case KEY_JOYPOV1_DOWN:
|
||||
- case KEY_JOY10:
|
||||
+ case KEY_JOY15: //Dpad down on rg552/rg503
|
||||
mkey = MKEY_Down;
|
||||
break;
|
||||
|
||||
@@ -711,7 +711,7 @@ bool M_Responder (event_t *ev)
|
||||
case KEY_PAD_LTHUMB_LEFT:
|
||||
case KEY_JOYAXIS1MINUS:
|
||||
case KEY_JOYPOV1_LEFT:
|
||||
- case KEY_JOY11:
|
||||
+ case KEY_JOY16: //Dpad left on rg552/rg503
|
||||
mkey = MKEY_Left;
|
||||
break;
|
||||
|
||||
@@ -719,7 +719,7 @@ bool M_Responder (event_t *ev)
|
||||
case KEY_PAD_LTHUMB_RIGHT:
|
||||
case KEY_JOYAXIS1PLUS:
|
||||
case KEY_JOYPOV1_RIGHT:
|
||||
- case KEY_JOY12:
|
||||
+ case KEY_JOY17: //Dpad right on rg552/rg503
|
||||
mkey = MKEY_Right;
|
||||
break;
|
||||
}
|
|
@ -1,61 +0,0 @@
|
|||
diff --git a/src/menu/menu.cpp b/src/menu/menu.cpp
|
||||
index 2af6616fa0..cf6ff999d1 100644
|
||||
--- a/src/menu/menu.cpp
|
||||
+++ b/src/menu/menu.cpp
|
||||
@@ -666,17 +666,17 @@ bool M_Responder (event_t *ev)
|
||||
ch = ev->data1;
|
||||
switch (ch)
|
||||
{
|
||||
- case KEY_JOY2:
|
||||
+ case KEY_JOY1: //B button on rg552/rg503
|
||||
case KEY_PAD_A:
|
||||
mkey = MKEY_Back;
|
||||
break;
|
||||
|
||||
- case KEY_JOY1:
|
||||
+ case KEY_JOY2: //A button on rg552/rg503
|
||||
case KEY_PAD_B:
|
||||
mkey = MKEY_Enter;
|
||||
break;
|
||||
|
||||
- case KEY_JOY4:
|
||||
+ case KEY_JOY3: //X button on rg552/rg503
|
||||
case KEY_PAD_X:
|
||||
mkey = MKEY_Clear;
|
||||
break;
|
||||
@@ -695,7 +695,7 @@ bool M_Responder (event_t *ev)
|
||||
case KEY_PAD_LTHUMB_UP:
|
||||
case KEY_JOYAXIS2MINUS:
|
||||
case KEY_JOYPOV1_UP:
|
||||
- case KEY_JOY9:
|
||||
+ case KEY_JOY14: //Dpad up on rg552/rg503
|
||||
mkey = MKEY_Up;
|
||||
break;
|
||||
|
||||
@@ -703,7 +703,7 @@ bool M_Responder (event_t *ev)
|
||||
case KEY_PAD_LTHUMB_DOWN:
|
||||
case KEY_JOYAXIS2PLUS:
|
||||
case KEY_JOYPOV1_DOWN:
|
||||
- case KEY_JOY10:
|
||||
+ case KEY_JOY15: //Dpad down on rg552/rg503
|
||||
mkey = MKEY_Down;
|
||||
break;
|
||||
|
||||
@@ -711,7 +711,7 @@ bool M_Responder (event_t *ev)
|
||||
case KEY_PAD_LTHUMB_LEFT:
|
||||
case KEY_JOYAXIS1MINUS:
|
||||
case KEY_JOYPOV1_LEFT:
|
||||
- case KEY_JOY11:
|
||||
+ case KEY_JOY16: //Dpad left on rg552/rg503
|
||||
mkey = MKEY_Left;
|
||||
break;
|
||||
|
||||
@@ -719,7 +719,7 @@ bool M_Responder (event_t *ev)
|
||||
case KEY_PAD_LTHUMB_RIGHT:
|
||||
case KEY_JOYAXIS1PLUS:
|
||||
case KEY_JOYPOV1_RIGHT:
|
||||
- case KEY_JOY12:
|
||||
+ case KEY_JOY17: //Dpad right on rg552/rg503
|
||||
mkey = MKEY_Right;
|
||||
break;
|
||||
}
|
|
@ -28,7 +28,7 @@ if [ -e /storage/.please_resize_me ] ; then
|
|||
PARTNUM=$(echo ${PART} | sed "s#^.*[0-9]p##g")
|
||||
else
|
||||
DISK=$(echo ${PART} | sed s/[0-9]//g)
|
||||
PARTNUM=$(echo ${PART} | sed "s#^sd[a-z]##g")
|
||||
PARTNUM=$(echo ${PART} | sed "s#^.*sd[a-z]##g")
|
||||
fi
|
||||
rm -f /storage/.please_resize_me
|
||||
sync
|
||||
|
|
Loading…
Reference in a new issue