stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-18 07:22:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Wiped out Wii (and Wii Linux)

Browse source
This commit is contained in:
Monster Iestyn 2017-09-29 21:03:28 +01:00
parent 41ae71db4a
commit 7481ffef2a
27 changed files with 12 additions and 693 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Makefile
View file

@ -91,10 +91,6 @@ D_FILES=$(D_DIR)/srb2.srb \
PKG_CONFIG?=pkg-config PKG_CONFIG?=pkg-config
ifdef WIILINUX
LINUX=1
endif
ifdef PANDORA ifdef PANDORA
LINUX=1 LINUX=1
endif endif
@ -139,27 +135,12 @@ PNG_CFLAGS?=
PNG_LDFLAGS?=-lpng PNG_LDFLAGS?=-lpng
endif endif
ifdef WIILINUX
NONX86=1
NOTERMIOS=1
NOHW=1
CFLAGS+=-DWMINPUT
NOTERMIOS=1
NOPOSTPROCESSING=1
endif
ifdef PANDORA ifdef PANDORA
NONX86=1 NONX86=1
NOHW=1 NOHW=1
NOHS=1 NOHS=1
endif endif
ifdef WII
NONX86=1
NOHW=1
NOPOSTPROCESSING=1
endif
ifdef DJGPPDOS ifdef DJGPPDOS
include djgppdos/Makefile.cfg include djgppdos/Makefile.cfg
endif endif
@ -520,10 +501,6 @@ ifdef DJGPPDOS
all: pre-build $(BIN)/$(EXENAME) all: pre-build $(BIN)/$(EXENAME)
endif endif
ifdef WII
all: pre-build $(BIN)/$(DOLNAME)
endif
ifdef PANDORA ifdef PANDORA
all: pre-build $(BIN)/$(PNDNAME) all: pre-build $(BIN)/$(PNDNAME)
endif endif

15
src/Makefile.cfg
View file

@ -211,7 +211,6 @@ endif
#indicate platform and what interface use with #indicate platform and what interface use with
ifndef WINCE ifndef WINCE
ifndef WII
ifndef LINUX ifndef LINUX
ifndef FREEBSD ifndef FREEBSD
ifndef CYGWIN32 ifndef CYGWIN32
@ -228,7 +227,6 @@ endif
endif endif
endif endif
endif endif
endif
#determine the interface directory (where you put all i_*.c) #determine the interface directory (where you put all i_*.c)
i_cdmus_o=$(OBJDIR)/i_cdmus.o i_cdmus_o=$(OBJDIR)/i_cdmus.o
@ -316,18 +314,6 @@ ifdef MINGW64
OBJDIR:=$(OBJDIR)/Mingw64 OBJDIR:=$(OBJDIR)/Mingw64
BIN:=$(BIN)/Mingw64 BIN:=$(BIN)/Mingw64
else else
ifdef WII
INTERFACE=sdl12
NONX86=1
STATIC=1
PREFIX?=powerpc-eabi
SDL=1
SDL12=1
SDLMAIN=1
OBJDIR:=$(OBJDIR)/Wii
BIN:=$(BIN)/Wii
NOUPX=1
else
ifdef MINGW ifdef MINGW
INTERFACE=win32 INTERFACE=win32
NASMFORMAT=win32 NASMFORMAT=win32
@ -358,7 +344,6 @@ endif
endif endif
endif endif
endif endif
endif
ifdef GP2X ifdef GP2X
ifdef SDL ifdef SDL

5
src/console.c
View file

@ -326,12 +326,7 @@ static void CON_SetupColormaps(void)
// Setup the console text buffer // Setup the console text buffer
// //
// for WII, libogc already has a CON_Init function, we must rename it here
#ifdef _WII
void CON_InitWii(void)
#else
void CON_Init(void) void CON_Init(void)
#endif
{ {
INT32 i; INT32 i;

4
src/console.h
View file

@ -13,11 +13,7 @@
#include "d_event.h" #include "d_event.h"
#include "command.h" #include "command.h"
#ifdef _WII
void CON_InitWii(void);
#else
void CON_Init(void); void CON_Init(void);
#endif
boolean CON_Responder(event_t *ev); boolean CON_Responder(event_t *ev);

5
src/d_main.c
View file

@ -1182,12 +1182,7 @@ void D_SRB2Main(void)
HU_Init(); HU_Init();
COM_Init(); COM_Init();
// libogc has a CON_Init function, we must rename SRB2's CON_Init in WII/libogc
#ifndef _WII
CON_Init(); CON_Init();
#else
CON_InitWii();
#endif
D_RegisterServerCommands(); D_RegisterServerCommands();
D_RegisterClientCommands(); // be sure that this is called before D_CheckNetGame D_RegisterClientCommands(); // be sure that this is called before D_CheckNetGame

7
src/d_netcmd.c
View file

@ -244,12 +244,7 @@ INT32 cv_debug;
consvar_t cv_usemouse = {"use_mouse", "On", CV_SAVE|CV_CALL,usemouse_cons_t, I_StartupMouse, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_usemouse = {"use_mouse", "On", CV_SAVE|CV_CALL,usemouse_cons_t, I_StartupMouse, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_usemouse2 = {"use_mouse2", "Off", CV_SAVE|CV_CALL,usemouse_cons_t, I_StartupMouse2, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_usemouse2 = {"use_mouse2", "Off", CV_SAVE|CV_CALL,usemouse_cons_t, I_StartupMouse2, 0, NULL, NULL, 0, 0, NULL};
#if defined (WMINPUT) || defined (_WII) //joystick 1 and 2 #if defined (GP2X) || defined (_NDS) //only one joystick
consvar_t cv_usejoystick = {"use_joystick", "1", CV_SAVE|CV_CALL, usejoystick_cons_t,
I_InitJoystick, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_usejoystick2 = {"use_joystick2", "2", CV_SAVE|CV_CALL, usejoystick_cons_t,
I_InitJoystick2, 0, NULL, NULL, 0, 0, NULL};
#elif defined (GP2X) || defined (_NDS) //only one joystick
consvar_t cv_usejoystick = {"use_joystick", "1", CV_SAVE|CV_CALL, usejoystick_cons_t, consvar_t cv_usejoystick = {"use_joystick", "1", CV_SAVE|CV_CALL, usejoystick_cons_t,
I_InitJoystick, 0, NULL, NULL, 0, 0, NULL}; I_InitJoystick, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_usejoystick2 = {"use_joystick2", "0", CV_SAVE|CV_CALL, usejoystick_cons_t, consvar_t cv_usejoystick2 = {"use_joystick2", "0", CV_SAVE|CV_CALL, usejoystick_cons_t,

2
src/doomdef.h
View file

@ -381,7 +381,7 @@ enum {
}; };
// Name of local directory for config files and savegames // Name of local directory for config files and savegames
#if !defined(_WIN32_WCE) && !defined(GP2X) && !defined(_WII) #if !defined(_WIN32_WCE) && !defined(GP2X)
#if (((defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON)) && !defined (__CYGWIN__)) && !defined (__APPLE__) #if (((defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON)) && !defined (__CYGWIN__)) && !defined (__APPLE__)
#define DEFAULTDIR ".srb2" #define DEFAULTDIR ".srb2"
#else #else

2
src/doomtype.h
View file

@ -139,7 +139,7 @@ typedef long ssize_t;
#endif #endif
#endif //macintosh #endif //macintosh
#if defined (PC_DOS) || defined (_WIN32) || defined (_WII) || defined (__HAIKU__) || defined(_NDS) #if defined (PC_DOS) || defined (_WIN32) || defined (__HAIKU__) || defined(_NDS)
#define HAVE_DOSSTR_FUNCS #define HAVE_DOSSTR_FUNCS
#endif #endif

55
src/g_game.c
View file

@ -302,35 +302,6 @@ void SendWeaponPref2(void);
static CV_PossibleValue_t crosshair_cons_t[] = {{0, "Off"}, {1, "Cross"}, {2, "Angle"}, {3, "Point"}, {0, NULL}}; static CV_PossibleValue_t crosshair_cons_t[] = {{0, "Off"}, {1, "Cross"}, {2, "Angle"}, {3, "Point"}, {0, NULL}};
static CV_PossibleValue_t joyaxis_cons_t[] = {{0, "None"}, static CV_PossibleValue_t joyaxis_cons_t[] = {{0, "None"},
#ifdef _WII
{1, "LStick.X"}, {2, "LStick.Y"}, {-1, "LStick.X-"}, {-2, "LStick.Y-"},
#if JOYAXISSET > 1
{3, "RStick.X"}, {4, "RStick.Y"}, {-3, "RStick.X-"}, {-4, "RStick.Y-"},
#endif
#if JOYAXISSET > 2
{5, "RTrigger"}, {6, "LTrigger"}, {-5, "RTrigger-"}, {-6, "LTrigger-"},
#endif
#if JOYAXISSET > 3
{7, "Pitch"}, {8, "Roll"}, {-7, "Pitch-"}, {-8, "Roll-"},
#endif
#if JOYAXISSET > 4
{7, "Yaw"}, {8, "Dummy"}, {-7, "Yaw-"}, {-8, "Dummy-"},
#endif
#if JOYAXISSET > 4
{9, "LAnalog"}, {10, "RAnalog"}, {-9, "LAnalog-"}, {-10, "RAnalog-"},
#endif
#elif defined (WMINPUT)
{1, "LStick.X"}, {2, "LStick.Y"}, {-1, "LStick.X-"}, {-2, "LStick.Y-"},
#if JOYAXISSET > 1
{3, "RStick.X"}, {4, "RStick.Y"}, {-3, "RStick.X-"}, {-4, "RStick.Y-"},
#endif
#if JOYAXISSET > 2
{5, "NStick.X"}, {6, "NStick.Y"}, {-5, "NStick.X-"}, {-6, "NStick.Y-"},
#endif
#if JOYAXISSET > 3
{7, "LAnalog"}, {8, "RAnalog"}, {-7, "LAnalog-"}, {-8, "RAnalog-"},
#endif
#else
{1, "X-Axis"}, {2, "Y-Axis"}, {-1, "X-Axis-"}, {-2, "Y-Axis-"}, {1, "X-Axis"}, {2, "Y-Axis"}, {-1, "X-Axis-"}, {-2, "Y-Axis-"},
#if JOYAXISSET > 1 #if JOYAXISSET > 1
{3, "Z-Axis"}, {4, "X-Rudder"}, {-3, "Z-Axis-"}, {-4, "X-Rudder-"}, {3, "Z-Axis"}, {4, "X-Rudder"}, {-3, "Z-Axis-"}, {-4, "X-Rudder-"},
@ -340,18 +311,11 @@ static CV_PossibleValue_t joyaxis_cons_t[] = {{0, "None"},
#endif #endif
#if JOYAXISSET > 3 #if JOYAXISSET > 3
{7, "U-Axis"}, {8, "V-Axis"}, {-7, "U-Axis-"}, {-8, "V-Axis-"}, {7, "U-Axis"}, {8, "V-Axis"}, {-7, "U-Axis-"}, {-8, "V-Axis-"},
#endif
#endif #endif
{0, NULL}}; {0, NULL}};
#ifdef _WII
#if JOYAXISSET > 5
"More Axis Sets"
#endif
#else
#if JOYAXISSET > 4 #if JOYAXISSET > 4
"More Axis Sets" "More Axis Sets"
#endif #endif
#endif
consvar_t cv_crosshair = {"crosshair", "Cross", CV_SAVE, crosshair_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_crosshair = {"crosshair", "Cross", CV_SAVE, crosshair_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_crosshair2 = {"crosshair2", "Cross", CV_SAVE, crosshair_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_crosshair2 = {"crosshair2", "Cross", CV_SAVE, crosshair_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
@ -386,38 +350,19 @@ typedef enum
AXISFIRENORMAL, AXISFIRENORMAL,
} axis_input_e; } axis_input_e;
#if defined (_WII) || defined (WMINPUT)
consvar_t cv_turnaxis = {"joyaxis_turn", "LStick.X", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_moveaxis = {"joyaxis_move", "LStick.Y", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_sideaxis = {"joyaxis_side", "RStick.X", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_lookaxis = {"joyaxis_look", "RStick.Y", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_fireaxis = {"joyaxis_fire", "LAnalog", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_firenaxis = {"joyaxis_firenormal", "RAnalog", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
#else
consvar_t cv_turnaxis = {"joyaxis_turn", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_turnaxis = {"joyaxis_turn", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_moveaxis = {"joyaxis_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_moveaxis = {"joyaxis_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_sideaxis = {"joyaxis_side", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_sideaxis = {"joyaxis_side", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_lookaxis = {"joyaxis_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_lookaxis = {"joyaxis_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_fireaxis = {"joyaxis_fire", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_fireaxis = {"joyaxis_fire", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_firenaxis = {"joyaxis_firenormal", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_firenaxis = {"joyaxis_firenormal", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
#endif
#if defined (_WII) || defined (WMINPUT)
consvar_t cv_turnaxis2 = {"joyaxis2_turn", "LStick.X", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_moveaxis2 = {"joyaxis2_move", "LStick.Y", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_sideaxis2 = {"joyaxis2_side", "RStick.X", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_lookaxis2 = {"joyaxis2_look", "RStick.Y", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_fireaxis2 = {"joyaxis2_fire", "LAnalog", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_firenaxis2 = {"joyaxis2_firenormal", "RAnalog", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
#else
consvar_t cv_turnaxis2 = {"joyaxis2_turn", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_turnaxis2 = {"joyaxis2_turn", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_moveaxis2 = {"joyaxis2_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_moveaxis2 = {"joyaxis2_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_sideaxis2 = {"joyaxis2_side", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_sideaxis2 = {"joyaxis2_side", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_lookaxis2 = {"joyaxis2_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_lookaxis2 = {"joyaxis2_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_fireaxis2 = {"joyaxis2_fire", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_fireaxis2 = {"joyaxis2_fire", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_firenaxis2 = {"joyaxis2_firenormal", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_firenaxis2 = {"joyaxis2_firenormal", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
#endif
#if MAXPLAYERS > 32 #if MAXPLAYERS > 32
#error "please update player_name table using the new value for MAXPLAYERS" #error "please update player_name table using the new value for MAXPLAYERS"

316
src/g_input.c
View file

@ -268,23 +268,19 @@ static keyname_t keynames[] =
{KEY_MOUSE1+0,"MOUSE1"}, {KEY_MOUSE1+0,"MOUSE1"},
{KEY_MOUSE1+1,"MOUSE2"}, {KEY_MOUSE1+1,"MOUSE2"},
{KEY_MOUSE1+2,"MOUSE3"}, {KEY_MOUSE1+2,"MOUSE3"},
#if !defined (_WII)
{KEY_MOUSE1+3,"MOUSE4"}, {KEY_MOUSE1+3,"MOUSE4"},
{KEY_MOUSE1+4,"MOUSE5"}, {KEY_MOUSE1+4,"MOUSE5"},
{KEY_MOUSE1+5,"MOUSE6"}, {KEY_MOUSE1+5,"MOUSE6"},
{KEY_MOUSE1+6,"MOUSE7"}, {KEY_MOUSE1+6,"MOUSE7"},
{KEY_MOUSE1+7,"MOUSE8"}, {KEY_MOUSE1+7,"MOUSE8"},
#endif
{KEY_2MOUSE1+0,"SEC_MOUSE2"}, // BP: sorry my mouse handler swap button 1 and 2 {KEY_2MOUSE1+0,"SEC_MOUSE2"}, // BP: sorry my mouse handler swap button 1 and 2
{KEY_2MOUSE1+1,"SEC_MOUSE1"}, {KEY_2MOUSE1+1,"SEC_MOUSE1"},
{KEY_2MOUSE1+2,"SEC_MOUSE3"}, {KEY_2MOUSE1+2,"SEC_MOUSE3"},
#if !defined (_WII)
{KEY_2MOUSE1+3,"SEC_MOUSE4"}, {KEY_2MOUSE1+3,"SEC_MOUSE4"},
{KEY_2MOUSE1+4,"SEC_MOUSE5"}, {KEY_2MOUSE1+4,"SEC_MOUSE5"},
{KEY_2MOUSE1+5,"SEC_MOUSE6"}, {KEY_2MOUSE1+5,"SEC_MOUSE6"},
{KEY_2MOUSE1+6,"SEC_MOUSE7"}, {KEY_2MOUSE1+6,"SEC_MOUSE7"},
{KEY_2MOUSE1+7,"SEC_MOUSE8"}, {KEY_2MOUSE1+7,"SEC_MOUSE8"},
#endif
{KEY_MOUSEWHEELUP, "Wheel 1 UP"}, {KEY_MOUSEWHEELUP, "Wheel 1 UP"},
{KEY_MOUSEWHEELDOWN, "Wheel 1 Down"}, {KEY_MOUSEWHEELDOWN, "Wheel 1 Down"},
{KEY_2MOUSEWHEELUP, "Wheel 2 UP"}, {KEY_2MOUSEWHEELUP, "Wheel 2 UP"},
@ -310,62 +306,6 @@ static keyname_t keynames[] =
{KEY_JOY1+6, "JOYSTART"}, {KEY_JOY1+6, "JOYSTART"},
{KEY_JOY1+7, "JOYSELECT"}, {KEY_JOY1+7, "JOYSELECT"},
#define NOMOREJOYBTN_1S #define NOMOREJOYBTN_1S
#elif defined (WMINPUT)
{KEY_JOY1+0, "JOYB"},
{KEY_JOY1+1, "JOYA"},
{KEY_JOY1+2, "JOYUP"},
{KEY_JOY1+3, "JOYDOWN"},
{KEY_JOY1+4, "JOYLEFT"},
{KEY_JOY1+5, "JOYRIGHT"},
{KEY_JOY1+6, "JOYAA"},
{KEY_JOY1+7, "JOYBB"},
{KEY_JOY1+8, "JOYCC"},
{KEY_JOY1+9, "JOYXX"},
{KEY_JOY1+10, "JOYYY"},
{KEY_JOY1+11, "JOYZZ"},
{KEY_JOY1+12, "JOYL"},
{KEY_JOY1+13, "JOYR"},
{KEY_JOY1+14, "JOYZL"},
{KEY_JOY1+15, "JOYZR"},
{KEY_JOY1+16, "JOYSELECT"},
{KEY_JOY1+17, "JOYSTART"},
{KEY_JOY1+18, "JOYHOME"},
{KEY_JOY1+19, "JOYMINUS"},
{KEY_JOY1+20, "JOYPLUS"},
{KEY_JOY1+21, "JOY_1"},
{KEY_JOY1+22, "JOY_2"},
{KEY_JOY1+23, "JOY24"},
{KEY_JOY1+24, "JOY25"},
{KEY_JOY1+25, "JOY26"},
{KEY_JOY1+26, "JOY27"},
{KEY_JOY1+27, "JOY28"},
{KEY_JOY1+28, "JOY29"},
{KEY_JOY1+29, "JOY30"},
{KEY_JOY1+30, "JOY31"},
{KEY_JOY1+31, "JOY32"},
#define NOMOREJOYBTN_1S
#elif defined (_WII)
{KEY_JOY1+0, "JOYA"},
{KEY_JOY1+1, "JOYB"},
{KEY_JOY1+2, "JOY1"},
{KEY_JOY1+3, "JOY2"},
{KEY_JOY1+4, "JOYMINUS"},
{KEY_JOY1+5, "JOYPLUS"},
{KEY_JOY1+6, "JOYHOME"},
{KEY_JOY1+7, "JOYZ"},
{KEY_JOY1+8, "JOYC"},
{KEY_JOY1+9, "JOYA_CC"},
{KEY_JOY1+10, "JOYB_CC"},
{KEY_JOY1+11, "JOYX"},
{KEY_JOY1+12, "JOYY"},
{KEY_JOY1+13, "JOYL"},
{KEY_JOY1+14, "JOYR"},
{KEY_JOY1+15, "JOYZL"},
{KEY_JOY1+16, "JOYZR"},
{KEY_JOY1+17, "JOYMINUS_CC"},
{KEY_JOY1+18, "JOYHPLUS_CC"},
{KEY_JOY1+19, "JOYMHOME_CC"},
#define NOMOREJOYBTN_1S
#else #else
{KEY_JOY1+0, "JOY1"}, {KEY_JOY1+0, "JOY1"},
{KEY_JOY1+1, "JOY2"}, {KEY_JOY1+1, "JOY2"},
@ -408,7 +348,6 @@ static keyname_t keynames[] =
{KEY_HAT1+1, "HATDOWN"}, {KEY_HAT1+1, "HATDOWN"},
{KEY_HAT1+2, "HATLEFT"}, {KEY_HAT1+2, "HATLEFT"},
{KEY_HAT1+3, "HATRIGHT"}, {KEY_HAT1+3, "HATRIGHT"},
#if !defined (_WII)
{KEY_HAT1+4, "HATUP2"}, {KEY_HAT1+4, "HATUP2"},
{KEY_HAT1+5, "HATDOWN2"}, {KEY_HAT1+5, "HATDOWN2"},
{KEY_HAT1+6, "HATLEFT2"}, {KEY_HAT1+6, "HATLEFT2"},
@ -421,28 +360,23 @@ static keyname_t keynames[] =
{KEY_HAT1+13, "HATDOWN4"}, {KEY_HAT1+13, "HATDOWN4"},
{KEY_HAT1+14, "HATLEFT4"}, {KEY_HAT1+14, "HATLEFT4"},
{KEY_HAT1+15, "HATRIGHT4"}, {KEY_HAT1+15, "HATRIGHT4"},
#endif
{KEY_DBLMOUSE1+0, "DBLMOUSE1"}, {KEY_DBLMOUSE1+0, "DBLMOUSE1"},
{KEY_DBLMOUSE1+1, "DBLMOUSE2"}, {KEY_DBLMOUSE1+1, "DBLMOUSE2"},
{KEY_DBLMOUSE1+2, "DBLMOUSE3"}, {KEY_DBLMOUSE1+2, "DBLMOUSE3"},
#if !defined (_WII)
{KEY_DBLMOUSE1+3, "DBLMOUSE4"}, {KEY_DBLMOUSE1+3, "DBLMOUSE4"},
{KEY_DBLMOUSE1+4, "DBLMOUSE5"}, {KEY_DBLMOUSE1+4, "DBLMOUSE5"},
{KEY_DBLMOUSE1+5, "DBLMOUSE6"}, {KEY_DBLMOUSE1+5, "DBLMOUSE6"},
{KEY_DBLMOUSE1+6, "DBLMOUSE7"}, {KEY_DBLMOUSE1+6, "DBLMOUSE7"},
{KEY_DBLMOUSE1+7, "DBLMOUSE8"}, {KEY_DBLMOUSE1+7, "DBLMOUSE8"},
#endif
{KEY_DBL2MOUSE1+0, "DBLSEC_MOUSE2"}, // BP: sorry my mouse handler swap button 1 and 2 {KEY_DBL2MOUSE1+0, "DBLSEC_MOUSE2"}, // BP: sorry my mouse handler swap button 1 and 2
{KEY_DBL2MOUSE1+1, "DBLSEC_MOUSE1"}, {KEY_DBL2MOUSE1+1, "DBLSEC_MOUSE1"},
{KEY_DBL2MOUSE1+2, "DBLSEC_MOUSE3"}, {KEY_DBL2MOUSE1+2, "DBLSEC_MOUSE3"},
#if !defined (_WII)
{KEY_DBL2MOUSE1+3, "DBLSEC_MOUSE4"}, {KEY_DBL2MOUSE1+3, "DBLSEC_MOUSE4"},
{KEY_DBL2MOUSE1+4, "DBLSEC_MOUSE5"}, {KEY_DBL2MOUSE1+4, "DBLSEC_MOUSE5"},
{KEY_DBL2MOUSE1+5, "DBLSEC_MOUSE6"}, {KEY_DBL2MOUSE1+5, "DBLSEC_MOUSE6"},
{KEY_DBL2MOUSE1+6, "DBLSEC_MOUSE7"}, {KEY_DBL2MOUSE1+6, "DBLSEC_MOUSE7"},
{KEY_DBL2MOUSE1+7, "DBLSEC_MOUSE8"}, {KEY_DBL2MOUSE1+7, "DBLSEC_MOUSE8"},
#endif
#if defined (GP2X) #if defined (GP2X)
{KEY_DBLJOY1+0, "DBLJOYA"}, {KEY_DBLJOY1+0, "DBLJOYA"},
@ -465,62 +399,6 @@ static keyname_t keynames[] =
{KEY_DBLJOY1+6, "DBLJOYSTART"}, {KEY_DBLJOY1+6, "DBLJOYSTART"},
{KEY_DBLJOY1+7, "DBLJOYSELECT"}, {KEY_DBLJOY1+7, "DBLJOYSELECT"},
#define NOMOREJOYBTN_1DBL #define NOMOREJOYBTN_1DBL
#elif defined (WMINPUT)
{KEY_DBLJOY1+0, "DBLJOYB"},
{KEY_DBLJOY1+1, "DBLJOYA"},
{KEY_DBLJOY1+2, "DBLJOYUP"},
{KEY_DBLJOY1+3, "DBLJOYDOWN"},
{KEY_DBLJOY1+4, "DBLJOYLEFT"},
{KEY_DBLJOY1+5, "DBLJOYRIGHT"},
{KEY_DBLJOY1+6, "DBLJOYAA"},
{KEY_DBLJOY1+7, "DBLJOYBB"},
{KEY_DBLJOY1+8, "DBLJOYCC"},
{KEY_DBLJOY1+9, "DBLJOYXX"},
{KEY_DBLJOY1+10, "DBLJOYYY"},
{KEY_DBLJOY1+11, "DBLJOYZZ"},
{KEY_DBLJOY1+12, "DBLJOYL"},
{KEY_DBLJOY1+13, "DBLJOYR"},
{KEY_DBLJOY1+14, "DBLJOYZL"},
{KEY_DBLJOY1+15, "DBLJOYZR"},
{KEY_DBLJOY1+16, "DBLJOYSELECT"},
{KEY_DBLJOY1+17, "DBLJOYSTART"},
{KEY_DBLJOY1+18, "DBLJOYHOME"},
{KEY_DBLJOY1+19, "DBLJOYMINUS"},
{KEY_DBLJOY1+20, "DBLJOYPLUS"},
{KEY_DBLJOY1+21, "DBLJOY_1"},
{KEY_DBLJOY1+22, "DBLJOY_2"},
{KEY_DBLJOY1+23, "DBLJOY24"},
{KEY_DBLJOY1+24, "DBLJOY25"},
{KEY_DBLJOY1+25, "DBLJOY26"},
{KEY_DBLJOY1+26, "DBLJOY27"},
{KEY_DBLJOY1+27, "DBLJOY28"},
{KEY_DBLJOY1+28, "DBLJOY29"},
{KEY_DBLJOY1+29, "DBLJOY30"},
{KEY_DBLJOY1+30, "DBLJOY31"},
{KEY_DBLJOY1+31, "DBLJOY32"},
#define NOMOREJOYBTN_1DBL
#elif defined (_WII)
{KEY_DBLJOY1+0, "DBLJOYA"},
{KEY_DBLJOY1+1, "DBLJOYB"},
{KEY_DBLJOY1+2, "DBLJOY1"},
{KEY_DBLJOY1+3, "DBLJOY2"},
{KEY_DBLJOY1+4, "DBLJOYMINUS"},
{KEY_DBLJOY1+5, "DBLJOYPLUS"},
{KEY_DBLJOY1+6, "DBLJOYHOME"},
{KEY_DBLJOY1+7, "DBLJOYZ"},
{KEY_DBLJOY1+8, "DBLJOYC"},
{KEY_DBLJOY1+9, "DBLJOYA_CC"},
{KEY_DBLJOY1+10, "DBLJOYB_CC"},
{KEY_DBLJOY1+11, "DBLJOYX"},
{KEY_DBLJOY1+12, "DBLJOYY"},
{KEY_DBLJOY1+13, "DBLJOYL"},
{KEY_DBLJOY1+14, "DBLJOYR"},
{KEY_DBLJOY1+15, "DBLJOYZL"},
{KEY_DBLJOY1+16, "DBLJOYZR"},
{KEY_DBLJOY1+17, "DBLJOYMINUS_CC"},
{KEY_DBLJOY1+18, "DBLJOYHPLUS_CC"},
{KEY_DBLJOY1+19, "DBLJOYMHOME_CC"},
#define NOMOREJOYBTN_1DBL
#else #else
{KEY_DBLJOY1+0, "DBLJOY1"}, {KEY_DBLJOY1+0, "DBLJOY1"},
{KEY_DBLJOY1+1, "DBLJOY2"}, {KEY_DBLJOY1+1, "DBLJOY2"},
@ -561,7 +439,6 @@ static keyname_t keynames[] =
{KEY_DBLHAT1+1, "DBLHATDOWN"}, {KEY_DBLHAT1+1, "DBLHATDOWN"},
{KEY_DBLHAT1+2, "DBLHATLEFT"}, {KEY_DBLHAT1+2, "DBLHATLEFT"},
{KEY_DBLHAT1+3, "DBLHATRIGHT"}, {KEY_DBLHAT1+3, "DBLHATRIGHT"},
#if !defined (_WII)
{KEY_DBLHAT1+4, "DBLHATUP2"}, {KEY_DBLHAT1+4, "DBLHATUP2"},
{KEY_DBLHAT1+5, "DBLHATDOWN2"}, {KEY_DBLHAT1+5, "DBLHATDOWN2"},
{KEY_DBLHAT1+6, "DBLHATLEFT2"}, {KEY_DBLHAT1+6, "DBLHATLEFT2"},
@ -574,65 +451,7 @@ static keyname_t keynames[] =
{KEY_DBLHAT1+13, "DBLHATDOWN4"}, {KEY_DBLHAT1+13, "DBLHATDOWN4"},
{KEY_DBLHAT1+14, "DBLHATLEFT4"}, {KEY_DBLHAT1+14, "DBLHATLEFT4"},
{KEY_DBLHAT1+15, "DBLHATRIGHT4"}, {KEY_DBLHAT1+15, "DBLHATRIGHT4"},
#endif
#if defined (WMINPUT)
{KEY_2JOY1+0, "SEC_JOYB"},
{KEY_2JOY1+1, "SEC_JOYA"},
{KEY_2JOY1+2, "SEC_JOYUP"},
{KEY_2JOY1+3, "SEC_JOYDOWN"},
{KEY_2JOY1+4, "SEC_JOYLEFT"},
{KEY_2JOY1+5, "SEC_JOYRIGHT"},
{KEY_2JOY1+6, "SEC_JOYAA"},
{KEY_2JOY1+7, "SEC_JOYBB"},
{KEY_2JOY1+8, "SEC_JOYCC"},
{KEY_2JOY1+9, "SEC_JOYXX"},
{KEY_2JOY1+10, "SEC_JOYYY"},
{KEY_2JOY1+11, "SEC_JOYZZ"},
{KEY_2JOY1+12, "SEC_JOYL"},
{KEY_2JOY1+13, "SEC_JOYR"},
{KEY_2JOY1+14, "SEC_JOYZL"},
{KEY_2JOY1+15, "SEC_JOYZR"},
{KEY_2JOY1+16, "SEC_JOYSELECT"},
{KEY_2JOY1+17, "SEC_JOYSTART"},
{KEY_2JOY1+18, "SEC_JOYHOME"},
{KEY_2JOY1+19, "SEC_JOYMINUS"},
{KEY_2JOY1+20, "SEC_JOYPLUS"},
{KEY_2JOY1+21, "SEC_JOY_1"},
{KEY_2JOY1+22, "SEC_JOY_2"},
{KEY_2JOY1+23, "SEC_JOY24"},
{KEY_2JOY1+24, "SEC_JOY25"},
{KEY_2JOY1+25, "SEC_JOY26"},
{KEY_2JOY1+26, "SEC_JOY27"},
{KEY_2JOY1+27, "SEC_JOY28"},
{KEY_2JOY1+28, "SEC_JOY29"},
{KEY_2JOY1+29, "SEC_JOY30"},
{KEY_2JOY1+30, "SEC_JOY31"},
{KEY_2JOY1+31, "SEC_JOY32"},
#define NOMOREJOYBTN_2S
#elif defined (_WII)
{KEY_2JOY1+0, "SEC_JOYA"},
{KEY_2JOY1+1, "SEC_JOYB"},
{KEY_2JOY1+2, "SEC_JOY1"},
{KEY_2JOY1+3, "SEC_JOY2"},
{KEY_2JOY1+4, "SEC_JOYMINUS"},
{KEY_2JOY1+5, "SEC_JOYPLUS"},
{KEY_2JOY1+6, "SEC_JOYHOME"},
{KEY_2JOY1+7, "SEC_JOYZ"},
{KEY_2JOY1+8, "SEC_JOYC"},
{KEY_2JOY1+9, "SEC_JOYA_CC"},
{KEY_2JOY1+10, "SEC_JOYB_CC"},
{KEY_2JOY1+11, "SEC_JOYX"},
{KEY_2JOY1+12, "SEC_JOYY"},
{KEY_2JOY1+13, "SEC_JOYL"},
{KEY_2JOY1+14, "SEC_JOYR"},
{KEY_2JOY1+15, "SEC_JOYZL"},
{KEY_2JOY1+16, "SEC_JOYZR"},
{KEY_2JOY1+17, "SEC_JOYMINUS_CC"},
{KEY_2JOY1+18, "SEC_JOYHPLUS_CC"},
{KEY_2JOY1+19, "SEC_JOYMHOME_CC"},
#define NOMOREJOYBTN_2S
#else
{KEY_2JOY1+0, "SEC_JOY1"}, {KEY_2JOY1+0, "SEC_JOY1"},
{KEY_2JOY1+1, "SEC_JOY2"}, {KEY_2JOY1+1, "SEC_JOY2"},
{KEY_2JOY1+2, "SEC_JOY3"}, {KEY_2JOY1+2, "SEC_JOY3"},
@ -641,7 +460,6 @@ static keyname_t keynames[] =
{KEY_2JOY1+5, "SEC_JOY6"}, {KEY_2JOY1+5, "SEC_JOY6"},
{KEY_2JOY1+6, "SEC_JOY7"}, {KEY_2JOY1+6, "SEC_JOY7"},
{KEY_2JOY1+7, "SEC_JOY8"}, {KEY_2JOY1+7, "SEC_JOY8"},
#endif
#if !defined (NOMOREJOYBTN_2S) #if !defined (NOMOREJOYBTN_2S)
// we use up to 32 buttons in DirectInput // we use up to 32 buttons in DirectInput
{KEY_2JOY1+8, "SEC_JOY9"}, {KEY_2JOY1+8, "SEC_JOY9"},
@ -674,7 +492,6 @@ static keyname_t keynames[] =
{KEY_2HAT1+1, "SEC_HATDOWN"}, {KEY_2HAT1+1, "SEC_HATDOWN"},
{KEY_2HAT1+2, "SEC_HATLEFT"}, {KEY_2HAT1+2, "SEC_HATLEFT"},
{KEY_2HAT1+3, "SEC_HATRIGHT"}, {KEY_2HAT1+3, "SEC_HATRIGHT"},
#if !defined (_WII)
{KEY_2HAT1+4, "SEC_HATUP2"}, {KEY_2HAT1+4, "SEC_HATUP2"},
{KEY_2HAT1+5, "SEC_HATDOWN2"}, {KEY_2HAT1+5, "SEC_HATDOWN2"},
{KEY_2HAT1+6, "SEC_HATLEFT2"}, {KEY_2HAT1+6, "SEC_HATLEFT2"},
@ -687,65 +504,7 @@ static keyname_t keynames[] =
{KEY_2HAT1+13, "SEC_HATDOWN4"}, {KEY_2HAT1+13, "SEC_HATDOWN4"},
{KEY_2HAT1+14, "SEC_HATLEFT4"}, {KEY_2HAT1+14, "SEC_HATLEFT4"},
{KEY_2HAT1+15, "SEC_HATRIGHT4"}, {KEY_2HAT1+15, "SEC_HATRIGHT4"},
#endif
#if defined (WMINPUT)
{KEY_DBL2JOY1+0, "DBLSEC_JOYB"},
{KEY_DBL2JOY1+1, "DBLSEC_JOYA"},
{KEY_DBL2JOY1+2, "DBLSEC_JOYUP"},
{KEY_DBL2JOY1+3, "DBLSEC_JOYDOWN"},
{KEY_DBL2JOY1+4, "DBLSEC_JOYLEFT"},
{KEY_DBL2JOY1+5, "DBLSEC_JOYRIGHT"},
{KEY_DBL2JOY1+6, "DBLSEC_JOYAA"},
{KEY_DBL2JOY1+7, "DBLSEC_JOYBB"},
{KEY_DBL2JOY1+8, "DBLSEC_JOYCC"},
{KEY_DBL2JOY1+9, "DBLSEC_JOYXX"},
{KEY_DBL2JOY1+10, "DBLSEC_JOYYY"},
{KEY_DBL2JOY1+11, "DBLSEC_JOYZZ"},
{KEY_DBL2JOY1+12, "DBLSEC_JOYL"},
{KEY_DBL2JOY1+13, "DBLSEC_JOYR"},
{KEY_DBL2JOY1+14, "DBLSEC_JOYZL"},
{KEY_DBL2JOY1+15, "DBLSEC_JOYZR"},
{KEY_DBL2JOY1+16, "DBLSEC_JOYSELECT"},
{KEY_DBL2JOY1+17, "DBLSEC_JOYSTART"},
{KEY_DBL2JOY1+18, "DBLSEC_JOYHOME"},
{KEY_DBL2JOY1+19, "DBLSEC_JOYMINUS"},
{KEY_DBL2JOY1+20, "DBLSEC_JOYPLUS"},
{KEY_DBL2JOY1+21, "DBLSEC_JOY_1"},
{KEY_DBL2JOY1+22, "DBLSEC_JOY_2"},
{KEY_DBL2JOY1+23, "DBLSEC_JOY24"},
{KEY_DBL2JOY1+24, "DBLSEC_JOY25"},
{KEY_DBL2JOY1+25, "DBLSEC_JOY26"},
{KEY_DBL2JOY1+26, "DBLSEC_JOY27"},
{KEY_DBL2JOY1+27, "DBLSEC_JOY28"},
{KEY_DBL2JOY1+28, "DBLSEC_JOY29"},
{KEY_DBL2JOY1+29, "DBLSEC_JOY30"},
{KEY_DBL2JOY1+30, "DBLSEC_JOY31"},
{KEY_DBL2JOY1+31, "DBLSEC_JOY32"},
#define NOMOREJOYBTN_2SDBL
#elif defined (_WII)
{KEY_DBL2JOY1+0, "DBLSEC_JOYA"},
{KEY_DBL2JOY1+1, "DBLSEC_JOYB"},
{KEY_DBL2JOY1+2, "DBLSEC_JOY1"},
{KEY_DBL2JOY1+3, "DBLSEC_JOY2"},
{KEY_DBL2JOY1+4, "DBLSEC_JOYMINUS"},
{KEY_DBL2JOY1+5, "DBLSEC_JOYPLUS"},
{KEY_DBL2JOY1+6, "DBLSEC_JOYHOME"},
{KEY_DBL2JOY1+7, "DBLSEC_JOYZ"},
{KEY_DBL2JOY1+8, "DBLSEC_JOYC"},
{KEY_DBL2JOY1+9, "DBLSEC_JOYA_CC"},
{KEY_DBL2JOY1+10, "DBLSEC_JOYB_CC"},
{KEY_DBL2JOY1+11, "DBLSEC_JOYX"},
{KEY_DBL2JOY1+12, "DBLSEC_JOYY"},
{KEY_DBL2JOY1+13, "DBLSEC_JOYL"},
{KEY_DBL2JOY1+14, "DBLSEC_JOYR"},
{KEY_DBL2JOY1+15, "DBLSEC_JOYZL"},
{KEY_DBL2JOY1+16, "DBLSEC_JOYZR"},
{KEY_DBL2JOY1+17, "DBLSEC_JOYMINUS_CC"},
{KEY_DBL2JOY1+18, "DBLSEC_JOYHPLUS_CC"},
{KEY_DBL2JOY1+19, "DBLSEC_JOYMHOME_CC"},
#define NOMOREJOYBTN_2DBL
#else
{KEY_DBL2JOY1+0, "DBLSEC_JOY1"}, {KEY_DBL2JOY1+0, "DBLSEC_JOY1"},
{KEY_DBL2JOY1+1, "DBLSEC_JOY2"}, {KEY_DBL2JOY1+1, "DBLSEC_JOY2"},
{KEY_DBL2JOY1+2, "DBLSEC_JOY3"}, {KEY_DBL2JOY1+2, "DBLSEC_JOY3"},
@ -754,7 +513,6 @@ static keyname_t keynames[] =
{KEY_DBL2JOY1+5, "DBLSEC_JOY6"}, {KEY_DBL2JOY1+5, "DBLSEC_JOY6"},
{KEY_DBL2JOY1+6, "DBLSEC_JOY7"}, {KEY_DBL2JOY1+6, "DBLSEC_JOY7"},
{KEY_DBL2JOY1+7, "DBLSEC_JOY8"}, {KEY_DBL2JOY1+7, "DBLSEC_JOY8"},
#endif
#if !defined (NOMOREJOYBTN_2DBL) #if !defined (NOMOREJOYBTN_2DBL)
{KEY_DBL2JOY1+8, "DBLSEC_JOY9"}, {KEY_DBL2JOY1+8, "DBLSEC_JOY9"},
{KEY_DBL2JOY1+9, "DBLSEC_JOY10"}, {KEY_DBL2JOY1+9, "DBLSEC_JOY10"},
@ -785,7 +543,6 @@ static keyname_t keynames[] =
{KEY_DBL2HAT1+1, "DBLSEC_HATDOWN"}, {KEY_DBL2HAT1+1, "DBLSEC_HATDOWN"},
{KEY_DBL2HAT1+2, "DBLSEC_HATLEFT"}, {KEY_DBL2HAT1+2, "DBLSEC_HATLEFT"},
{KEY_DBL2HAT1+3, "DBLSEC_HATRIGHT"}, {KEY_DBL2HAT1+3, "DBLSEC_HATRIGHT"},
#if !defined (_WII)
{KEY_DBL2HAT1+4, "DBLSEC_HATUP2"}, {KEY_DBL2HAT1+4, "DBLSEC_HATUP2"},
{KEY_DBL2HAT1+5, "DBLSEC_HATDOWN2"}, {KEY_DBL2HAT1+5, "DBLSEC_HATDOWN2"},
{KEY_DBL2HAT1+6, "DBLSEC_HATLEFT2"}, {KEY_DBL2HAT1+6, "DBLSEC_HATLEFT2"},
@ -798,7 +555,6 @@ static keyname_t keynames[] =
{KEY_DBL2HAT1+13, "DBLSEC_HATDOWN4"}, {KEY_DBL2HAT1+13, "DBLSEC_HATDOWN4"},
{KEY_DBL2HAT1+14, "DBLSEC_HATLEFT4"}, {KEY_DBL2HAT1+14, "DBLSEC_HATLEFT4"},
{KEY_DBL2HAT1+15, "DBLSEC_HATRIGHT4"}, {KEY_DBL2HAT1+15, "DBLSEC_HATRIGHT4"},
#endif
}; };
@ -965,78 +721,6 @@ void G_Controldefault(void)
gamecontrol[gc_jump ][0] = KEY_SPACE; gamecontrol[gc_jump ][0] = KEY_SPACE;
gamecontrol[gc_console ][0] = KEY_CONSOLE; gamecontrol[gc_console ][0] = KEY_CONSOLE;
gamecontrol[gc_pause ][0] = KEY_PAUSE; gamecontrol[gc_pause ][0] = KEY_PAUSE;
#ifdef WMINPUT
gamecontrol[gc_forward ][0] = KEY_JOY1+02; //UP
gamecontrol[gc_backward ][0] = KEY_JOY1+03; //DOWN
gamecontrol[gc_turnleft ][0] = KEY_JOY1+04; //LEFT
gamecontrol[gc_turnright ][0] = KEY_JOY1+05; //RIGHT
gamecontrol[gc_weaponnext ][0] = KEY_JOY1+10; //y
gamecontrol[gc_weaponprev ][0] = KEY_JOY1+9; //x
gamecontrol[gc_fire ][0] = KEY_JOY1+12; //L
gamecontrol[gc_firenormal ][0] = KEY_JOY1+13; //R
gamecontrol[gc_use ][0] = KEY_JOY1+00; //B
gamecontrol[gc_use ][1] = KEY_JOY1+07; //b
gamecontrol[gc_jump ][0] = KEY_JOY1+01; //A
gamecontrol[gc_jump ][1] = KEY_JOY1+06; //a
gamecontrol[gc_pause ][0] = KEY_JOY1+18; //Home
gamecontrolbis[gc_forward ][0] = KEY_2JOY1+02; //UP
gamecontrolbis[gc_backward ][0] = KEY_2JOY1+03; //DOWN
gamecontrolbis[gc_turnleft ][0] = KEY_2JOY1+04; //LEFT
gamecontrolbis[gc_turnright ][0] = KEY_2JOY1+05; //RIGHT
gamecontrolbis[gc_weaponnext ][0] = KEY_2JOY1+10; //y
gamecontrolbis[gc_weaponprev ][0] = KEY_2JOY1+9; //x
gamecontrolbis[gc_fire ][0] = KEY_2JOY1+12; //L
gamecontrolbis[gc_firenormal ][0] = KEY_2JOY1+13; //R
gamecontrolbis[gc_use ][0] = KEY_2JOY1+00; //B
gamecontrolbis[gc_use ][1] = KEY_2JOY1+07; //b
gamecontrolbis[gc_jump ][0] = KEY_2JOY1+01; //A
gamecontrolbis[gc_jump ][1] = KEY_2JOY1+06; //a
gamecontrolbis[gc_pause ][0] = KEY_2JOY1+18; //Home
#endif
#ifdef _WII
gamecontrol[gc_forward ][1] = KEY_HAT1+00; //UP
gamecontrol[gc_backward ][1] = KEY_HAT1+01; //DOWN
gamecontrol[gc_straferight][1] = KEY_JOY1+16; //ZR
gamecontrol[gc_strafeleft ][1] = KEY_JOY1+15; //ZL
gamecontrol[gc_turnleft ][1] = KEY_HAT1+02; //LEFT
gamecontrol[gc_turnright ][1] = KEY_HAT1+03; //RIGHT
gamecontrol[gc_weaponnext ][1] = KEY_JOY1+11; //x
gamecontrol[gc_fire ][0] = KEY_JOY1+12; //y
gamecontrol[gc_fire ][1] = KEY_JOY1+01; //B
gamecontrol[gc_firenormal ][0] = KEY_JOY1+13; //L
gamecontrol[gc_firenormal ][1] = KEY_JOY1+00; //A
gamecontrol[gc_tossflag ][1] = KEY_JOY1+17; //Plus CC
gamecontrol[gc_use ][0] = KEY_JOY1+9; //a
gamecontrol[gc_use ][1] = KEY_JOY1+02; //1
gamecontrol[gc_centerview ][1] = KEY_JOY1+14; //R
gamecontrol[gc_scores ][0] = KEY_JOY1+04; //Minus
gamecontrol[gc_scores ][1] = KEY_JOY1+18; //Minus
gamecontrol[gc_jump ][0] = KEY_JOY1+10; //b
gamecontrol[gc_jump ][1] = KEY_JOY1+3; //2
gamecontrol[gc_pause ][0] = KEY_JOY1+06; //Home
gamecontrol[gc_pause ][1] = KEY_JOY1+19; //Home
gamecontrolbis[gc_forward ][1] = KEY_2HAT1+00; //UP
gamecontrolbis[gc_backward ][1] = KEY_2HAT1+01; //DOWN
gamecontrolbis[gc_straferight][1] = KEY_2JOY1+16; //ZR
gamecontrolbis[gc_strafeleft ][1] = KEY_2JOY1+15; //ZL
gamecontrolbis[gc_turnleft ][1] = KEY_2HAT1+02; //LEFT
gamecontrolbis[gc_turnright ][1] = KEY_2HAT1+03; //RIGHT
gamecontrolbis[gc_weaponnext ][1] = KEY_2JOY1+11; //x
gamecontrolbis[gc_fire ][0] = KEY_2JOY1+12; //y
gamecontrolbis[gc_fire ][1] = KEY_2JOY1+01; //B
gamecontrolbis[gc_firenormal ][0] = KEY_2JOY1+13; //L
gamecontrolbis[gc_firenormal ][1] = KEY_2JOY1+00; //A
gamecontrolbis[gc_tossflag ][1] = KEY_2JOY1+17; //Plus CC
gamecontrolbis[gc_use ][0] = KEY_2JOY1+9; //a
gamecontrolbis[gc_use ][1] = KEY_2JOY1+02; //1
gamecontrolbis[gc_centerview ][1] = KEY_2JOY1+14; //R
gamecontrolbis[gc_scores ][0] = KEY_2JOY1+04; //Minus
gamecontrolbis[gc_scores ][1] = KEY_2JOY1+18; //Minus
gamecontrolbis[gc_jump ][0] = KEY_2JOY1+10; //b
gamecontrolbis[gc_jump ][1] = KEY_2JOY1+3; //2
gamecontrolbis[gc_pause ][0] = KEY_2JOY1+06; //Home
gamecontrolbis[gc_pause ][1] = KEY_2JOY1+19; //Home
#endif
} }
#endif #endif

8
src/g_input.h
View file

@ -22,18 +22,10 @@
// keys (mousebuttons and joybuttons becomes keys) // keys (mousebuttons and joybuttons becomes keys)
#define NUMKEYS 256 #define NUMKEYS 256
#if defined (_WII)
#define MOUSEBUTTONS 3
#define JOYBUTTONS 20 // 20 buttons
#define JOYHATS 1 // 1 hat
#define JOYAXISSET 5 // 5 Sets of 2 axises
#else
#define MOUSEBUTTONS 8 #define MOUSEBUTTONS 8
#define JOYBUTTONS 32 // 32 buttons #define JOYBUTTONS 32 // 32 buttons
#define JOYHATS 4 // 4 hats #define JOYHATS 4 // 4 hats
#define JOYAXISSET 4 // 4 Sets of 2 axises #define JOYAXISSET 4 // 4 Sets of 2 axises
#endif
// //
// mouse and joystick buttons are handled as 'virtual' keys // mouse and joystick buttons are handled as 'virtual' keys

2
src/i_addrinfo.c
View file

@ -20,7 +20,7 @@
#else #else
#include <winsock.h> #include <winsock.h>
#endif #endif
#elif !defined (__DJGPP__) && !defined(_WII) #elif !defined (__DJGPP__)
#include <sys/socket.h> #include <sys/socket.h>
#ifndef _NDS #ifndef _NDS
#include <arpa/inet.h> #include <arpa/inet.h>

5
src/m_argv.c
View file

@ -123,12 +123,7 @@ void M_PushSpecialParameters(void)
} }
/// \brief max args /// \brief max args
#ifdef _WII
#define MAXARGVS 1
#else
#define MAXARGVS 256 #define MAXARGVS 256
#endif
/** \brief the M_FindResponseFile function /** \brief the M_FindResponseFile function
Find a response file Find a response file

6
src/m_misc.c
View file

@ -58,7 +58,7 @@ typedef off_t off64_t;
#if defined (_WIN32) #if defined (_WIN32)
#define PRIdS "Iu" #define PRIdS "Iu"
#elif defined (DJGPP) || defined (_WII) || defined (_NDS) #elif defined (DJGPP) || defined (_NDS)
#define PRIdS "u" #define PRIdS "u"
#else #else
#define PRIdS "zu" #define PRIdS "zu"
@ -67,12 +67,10 @@ typedef off_t off64_t;
#ifdef HAVE_PNG #ifdef HAVE_PNG
#ifndef _MSC_VER #ifndef _MSC_VER
#ifndef _WII
#ifndef _LARGEFILE64_SOURCE #ifndef _LARGEFILE64_SOURCE
#define _LARGEFILE64_SOURCE #define _LARGEFILE64_SOURCE
#endif #endif
#endif #endif
#endif
#ifndef _LFS64_LARGEFILE #ifndef _LFS64_LARGEFILE
#define _LFS64_LARGEFILE #define _LFS64_LARGEFILE
@ -191,7 +189,7 @@ INT32 M_MapNumber(char first, char second)
// ========================================================================== // ==========================================================================
// some libcs has no access function, make our own // some libcs has no access function, make our own
#if defined (_WIN32_WCE) || defined (_WII) #if defined (_WIN32_WCE)
int access(const char *path, int amode) int access(const char *path, int amode)
{ {
int accesshandle = -1; int accesshandle = -1;

2
src/s_sound.c
View file

@ -66,8 +66,6 @@ consvar_t sndserver_arg = {"sndserver_arg", "-quiet", CV_SAVE, NULL, 0, NULL, NU
consvar_t cv_samplerate = {"samplerate", "11025", 0, CV_Unsigned, NULL, 11025, NULL, NULL, 0, 0, NULL}; //Alam: For easy hacking? consvar_t cv_samplerate = {"samplerate", "11025", 0, CV_Unsigned, NULL, 11025, NULL, NULL, 0, 0, NULL}; //Alam: For easy hacking?
#elif defined(_WINDOWS) #elif defined(_WINDOWS)
consvar_t cv_samplerate = {"samplerate", "44100", 0, CV_Unsigned, NULL, 44100, NULL, NULL, 0, 0, NULL}; //Alam: For easy hacking? consvar_t cv_samplerate = {"samplerate", "44100", 0, CV_Unsigned, NULL, 44100, NULL, NULL, 0, 0, NULL}; //Alam: For easy hacking?
#elif defined(_WII)
consvar_t cv_samplerate = {"samplerate", "32000", 0, CV_Unsigned, NULL, 32000, NULL, NULL, 0, 0, NULL}; //Alam: For easy hacking?
#else #else
consvar_t cv_samplerate = {"samplerate", "22050", 0, CV_Unsigned, NULL, 22050, NULL, NULL, 0, 0, NULL}; //Alam: For easy hacking? consvar_t cv_samplerate = {"samplerate", "22050", 0, CV_Unsigned, NULL, 22050, NULL, NULL, 0, 0, NULL}; //Alam: For easy hacking?
#endif #endif

10
src/screen.c
View file

@ -63,15 +63,9 @@ INT32 setmodeneeded; //video mode change needed if > 0 (the mode number to set +
static CV_PossibleValue_t scr_depth_cons_t[] = {{8, "8 bits"}, {16, "16 bits"}, {24, "24 bits"}, {32, "32 bits"}, {0, NULL}}; static CV_PossibleValue_t scr_depth_cons_t[] = {{8, "8 bits"}, {16, "16 bits"}, {24, "24 bits"}, {32, "32 bits"}, {0, NULL}};
//added : 03-02-98: default screen mode, as loaded/saved in config //added : 03-02-98: default screen mode, as loaded/saved in config
#ifdef WII
consvar_t cv_scr_width = {"scr_width", "640", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_scr_height = {"scr_height", "480", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_scr_depth = {"scr_depth", "16 bits", CV_SAVE, scr_depth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
#else
consvar_t cv_scr_width = {"scr_width", "1280", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_scr_width = {"scr_width", "1280", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_scr_height = {"scr_height", "800", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_scr_height = {"scr_height", "800", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_scr_depth = {"scr_depth", "16 bits", CV_SAVE, scr_depth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_scr_depth = {"scr_depth", "16 bits", CV_SAVE, scr_depth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
#endif
consvar_t cv_renderview = {"renderview", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_renderview = {"renderview", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
#ifdef DIRECTFULLSCREEN #ifdef DIRECTFULLSCREEN
@ -169,10 +163,10 @@ void SCR_SetMode(void)
}*/ }*/
else else
I_Error("unknown bytes per pixel mode %d\n", vid.bpp); I_Error("unknown bytes per pixel mode %d\n", vid.bpp);
/*#if !defined (WII) /*
if (SCR_IsAspectCorrect(vid.width, vid.height)) if (SCR_IsAspectCorrect(vid.width, vid.height))
CONS_Alert(CONS_WARNING, M_GetText("Resolution is not aspect-correct!\nUse a multiple of %dx%d\n"), BASEVIDWIDTH, BASEVIDHEIGHT); CONS_Alert(CONS_WARNING, M_GetText("Resolution is not aspect-correct!\nUse a multiple of %dx%d\n"), BASEVIDWIDTH, BASEVIDHEIGHT);
#endif*/ */
wallcolfunc = walldrawerfunc; wallcolfunc = walldrawerfunc;

3
src/screen.h
View file

@ -49,9 +49,6 @@
#elif defined (GP2X) #elif defined (GP2X)
#define MAXVIDWIDTH 320 //720 #define MAXVIDWIDTH 320 //720
#define MAXVIDHEIGHT 240 //576 #define MAXVIDHEIGHT 240 //576
#elif defined (WII) // Wii, VGA/640x480
#define MAXVIDWIDTH 640
#define MAXVIDHEIGHT 480
#else #else
#define MAXVIDWIDTH 1920 // don't set this too high because actually #define MAXVIDWIDTH 1920 // don't set this too high because actually
#define MAXVIDHEIGHT 1200 // lots of tables are allocated with the MAX size. #define MAXVIDHEIGHT 1200 // lots of tables are allocated with the MAX size.

6
src/sdl12/Makefile.cfg
View file

@ -133,15 +133,9 @@ endif
endif endif
endif endif
# FIXME: DevkitPPC and ready-compiled SDL Wii require these things to be in a silly order
ifdef WII
include sdl12/SRB2WII/Makefile.cfg
endif #ifdef WII
CFLAGS+=$(SDL_CFLAGS) CFLAGS+=$(SDL_CFLAGS)
LIBS:=$(SDL_LDFLAGS) $(LIBS) LIBS:=$(SDL_LDFLAGS) $(LIBS)
ifndef WII
ifdef STATIC ifdef STATIC
LIBS+=$(shell $(SDL_CONFIG) --static-libs) LIBS+=$(shell $(SDL_CONFIG) --static-libs)
endif endif
endif

124
src/sdl12/SRB2WII/Makefile.cfg
View file

@ -1,124 +0,0 @@
#
# Makefile.cfg for SRB2Wii native using libogc
#
# Check if DEVKITPPC is set in the environment. If so, continue with compilation.
.SUFFIXES:
ifeq ($(strip $(DEVKITPPC)),)
$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
endif
# Set compiler flags
SRB2NAME?=srb2wii
EXENAME?=$(SRB2NAME).elf
DBGNAME?=$(SRB2NAME).elf.debug
DOLNAME?=$(SRB2NAME).dol
ICONPNG?=sdl12/SRB2WII/icon.png
METAXML?=sdl12/SRB2WII/meta.xml
APPDIR=apps/$(SRB2NAME)
ZIPNAME=$(SRB2NAME).zip
ELF2DOL=$(DEVKITPPC)/bin/elf2dol
WIILOADEXE=$(DEVKITPPC)/bin/wiiload
ZIP=zip -r -9
WGET=wget -P srb2wii -c -nc
SED=sed
XARGS=xargs
SHXARGS:=$(XARGS)
SHSED:=$(SED)
FOR=for
ifndef ECHO
ELF2DOL:=@$(ELF2DOL)
WIILOADEXE:=@$(WIILOADEXE)
ZIP:=@$(ZIP)
SED:=@$(SED)
XARGS:=@$(XARGS)
FOR:=@$(FOR)
endif
# Disable same warning flags
WFLAGS+=-Wno-shadow -Wno-char-subscripts -Wno-old-style-definition -Wno-unsuffixed-float-constants
# newlib has no support for networking
NONET=1
# use pkgconfig for PKG
PNG_PKGCONFIG=libpng
# use absolute paths because changing PATH variable breaks distcc
PREFIX := $(DEVKITPPC)/bin/$(PREFIX)
# FIXME: DevkitPPC and ready-compiled SDL Wii require these things to be in a silly order
# libogc/DevkitPro required stuff
LIBOGC := $(DEVKITPRO)/libogc
LIBOGC_INC := $(LIBOGC)/include
LIBOGC_LIB := $(LIBOGC)/lib
PORTLIBS := $(DEVKITPRO)/portlibs/ppc
PORTLIBS_INC := $(PORTLIBS)/include
PORTLIBS_LIB := $(PORTLIBS)/lib
SDL_CPPFLAGS := -I$(LIBOGC_INC)/SDL
SDL_LIB := $(DEVKITPRO)/libogc/lib/wii
INCLUDE := -I$(LIBOGC_INC) $(SDL_CPPFLAGS) -I$(PORTLIBS_INC)
PKG_CONFIG_PATH := $(PORTLIBS)/lib/pkgconfig
PKG_BROKEN_SWTICH := --static --define-variable=DEVKITPRO=$(DEVKITPRO)
PNG_PKGCONFIG := $(PKG_CONFIG_PATH)/libpng.pc $(PKG_BROKEN_SWTICH)
ZLIB_PKGCONFIG := $(PKG_CONFIG_PATH)/zlib.pc $(PKG_BROKEN_SWTICH)
ZLIB_CFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --cflags)
ZLIB_LDFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --libs)
ifdef RDB
LIBS+=-ldb
OPTS+=-DREMOTE_DEBUGGING=$(RDB)
endif
LIBS+= -L$(SDL_LIB)
ifndef NOMIXER
LD=$(CXX)
LIBS+=-lSDL_mixer -lvorbisidec -lsmpeg
endif
LIBS+=-lSDL
LIBS+=$(ZLIB_LDFLAGS) -lfat -lwiiuse -lbte -logc -lm -lwiikeyboard -L$(LIBOGC_LIB)
MACHDEP = -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float
OPTS+=-DWII -D_WII -DUNIXCOMMON
CFLAGS+=-D__BIG_ENDIAN__ -g -O3 -fsigned-char $(MACHDEP) $(INCLUDE)
CXXFLAGS+=$(CFLAGS)
LDFLAGS+=-g $(MACHDEP) -Wl,-Map,$(notdir $@).map
SDL_CONFIG=/bin/true
SDL_CFLAGS=
SDL_LDFLAGS=
$(BIN)/$(DOLNAME): $(BIN)/$(EXENAME)
@echo Linking $(DOLNAME)...
$(ELF2DOL) $(BIN)/$(EXENAME) $(BIN)/$(DOLNAME)
@echo Creating /apps/$(SRB2NAME)...
$(MKDIR) $(APPDIR)
$(CP) $(BIN)/$(DOLNAME) $(APPDIR)/boot.dol
$(CP) $(ICONPNG) $(APPDIR)
$(CP) $(METAXML) $(APPDIR)
ifdef WITHDATA
$(MKDIR) srb2wii
$(FOR) datafile in $(shell echo $(D_FILES) | $(SHSED) -e 's/\.srb/\.wad/' -e 's/music.dta//' | $(SHXARGS) -n 1 basename); do \
$(WGET) http://alam.srb2.org/SRB2/2.0.6-Final/Resources/$$datafile; \
done
# downsampled music.dta specially for SRB2Wii
$(WGET) http://repos.srb2.org/srb2ports/music.dta
$(ZIP) $(BIN)/$(ZIPNAME) $(APPDIR) srb2wii
else
$(ZIP) $(BIN)/$(ZIPNAME) $(APPDIR)
endif
$(REMOVE) -r $(APPDIR)
run: $(BIN)/$(EXENAME)
$(WIILOADEXE) $(BIN)/$(DBGNAME)

BIN
src/sdl12/SRB2WII/icon.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 11 KiB

18
src/sdl12/SRB2WII/meta.xml
View file

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<app version="1">
<name>SRB2Wii</name>
<coder>Callum</coder>
<version>2.0.6</version>
<release_date>20101207</release_date>
<short_description>A 3D Sonic fangame</short_description>
<long_description>Sonic Robo Blast 2 is a 3D fangame by a small group called
Sonic Team Junior, using the Doom engine as a base.
The game has been worked on for almost 11 years so far, and
it is still being very much developed today, with a huge
fanbase developing custom content, including characters,
levels, and even large-scale modifications that play out
a brand new adventure.
Based on the Doom II engine, SRB2's system requirements
are very low, even the oldest computers can play it at a
decent speed.</long_description>
</app>

38
src/sdl12/i_main.c
View file

@ -26,19 +26,6 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#ifdef _WII
#include <limits.h>
#include <network.h>
#include <fat.h>
#ifdef REMOTE_DEBUGGING
#include <debug.h>
#endif
static char wiicwd[PATH_MAX] = "sd:/";
static char localip[16] = {0};
static char gateway[16] = {0};
static char netmask[16] = {0};
#endif
#ifdef HAVE_SDL #ifdef HAVE_SDL
#ifdef HAVE_TTF #ifdef HAVE_TTF
@ -131,36 +118,11 @@ int main(int argc, char **argv)
#endif #endif
#endif #endif
// init Wii-specific stuff
#ifdef _WII
// Start network
if_config(localip, netmask, gateway, TRUE);
#ifdef REMOTE_DEBUGGING
#if REMOTE_DEBUGGING == 0
DEBUG_Init(GDBSTUB_DEVICE_TCP, GDBSTUB_DEF_TCPPORT); // Port 2828
#elif REMOTE_DEBUGGING > 2
DEBUG_Init(GDBSTUB_DEVICE_TCP, REMOTE_DEBUGGING); // Custom Port
#elif REMOTE_DEBUGGING < 0
DEBUG_Init(GDBSTUB_DEVICE_USB, GDBSTUB_DEF_CHANNEL); // Slot 1
#else
DEBUG_Init(GDBSTUB_DEVICE_USB, REMOTE_DEBUGGING-1); // Custom Slot
#endif
#endif
// Start FAT filesystem
fatInitDefault();
if (getcwd(wiicwd, PATH_MAX))
I_PutEnv(va("HOME=%ssrb2wii", wiicwd));
#endif
logdir = D_Home(); logdir = D_Home();
#ifdef LOGMESSAGES #ifdef LOGMESSAGES
#if defined(_WIN32_WCE) || defined(GP2X) #if defined(_WIN32_WCE) || defined(GP2X)
logstream = fopen(va("%s.log",argv[0]), "a"); logstream = fopen(va("%s.log",argv[0]), "a");
#elif defined (_WII)
logstream = fopen(va("%s/srb2log.txt",logdir), "a");
#elif defined (DEFAULTDIR) #elif defined (DEFAULTDIR)
if (logdir) if (logdir)
logstream = fopen(va("%s/"DEFAULTDIR"/srb2log.txt",logdir), "a"); logstream = fopen(va("%s/"DEFAULTDIR"/srb2log.txt",logdir), "a");

14
src/sdl12/i_system.c
View file

@ -78,7 +78,7 @@ typedef BOOL (WINAPI *p_SetProcessAffinityMask) (HANDLE, DWORD_PTR);
#define HAVE_SDLCPUINFO #define HAVE_SDLCPUINFO
#endif #endif
#if defined (__unix__) || defined(__APPLE__) || (defined (UNIXCOMMON) && !defined (__HAIKU__) && !defined (_WII)) #if defined (__unix__) || defined(__APPLE__) || (defined (UNIXCOMMON) && !defined (__HAIKU__))
#if defined (__linux__) #if defined (__linux__)
#include <sys/vfs.h> #include <sys/vfs.h>
#else #else
@ -94,7 +94,7 @@ typedef BOOL (WINAPI *p_SetProcessAffinityMask) (HANDLE, DWORD_PTR);
#endif #endif
#endif #endif
#if defined (__linux__) || (defined (UNIXCOMMON) && !defined (__HAIKU__) && !defined (_WII)) #if defined (__linux__) || (defined (UNIXCOMMON) && !defined (__HAIKU__))
#ifndef NOTERMIOS #ifndef NOTERMIOS
#include <termios.h> #include <termios.h>
#include <sys/ioctl.h> // ioctl #include <sys/ioctl.h> // ioctl
@ -135,14 +135,6 @@ typedef BOOL (WINAPI *p_SetProcessAffinityMask) (HANDLE, DWORD_PTR);
#define DEFAULTWADLOCATION4 "/tmp/mnt/sd/SRB2" #define DEFAULTWADLOCATION4 "/tmp/mnt/sd/SRB2"
#define DEFAULTSEARCHPATH1 "/mnt/sd" #define DEFAULTSEARCHPATH1 "/mnt/sd"
#define DEFAULTSEARCHPATH2 "/tmp/mnt/sd" #define DEFAULTSEARCHPATH2 "/tmp/mnt/sd"
#elif defined (_WII)
#define NOCWD
#define NOHOME
#define NEED_SDL_GETENV
#define DEFAULTWADLOCATION1 "sd:/srb2wii"
#define DEFAULTWADLOCATION2 "usb:/srb2wii"
#define DEFAULTSEARCHPATH1 "sd:/srb2wii"
#define DEFAULTSEARCHPATH2 "usb:/srb2wii"
#elif defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) #elif defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
#define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2" #define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2"
#define DEFAULTWADLOCATION2 "/usr/local/games/SRB2" #define DEFAULTWADLOCATION2 "/usr/local/games/SRB2"
@ -2421,7 +2413,7 @@ void I_ShutdownSystem(void)
void I_GetDiskFreeSpace(INT64 *freespace) void I_GetDiskFreeSpace(INT64 *freespace)
{ {
#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) #if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
#if defined (SOLARIS) || defined (__HAIKU__) || defined (_WII) #if defined (SOLARIS) || defined (__HAIKU__)
*freespace = INT32_MAX; *freespace = INT32_MAX;
return; return;
#else // Both Linux and BSD have this, apparently. #else // Both Linux and BSD have this, apparently.

27
src/sdl12/i_video.c
View file

@ -93,12 +93,6 @@
#include "ogl_sdl.h" #include "ogl_sdl.h"
#endif #endif
#ifdef REMOTE_DEBUGGING
#ifdef _WII
#include <debug.h>
#endif
#endif
#ifdef HAVE_FILTER #ifdef HAVE_FILTER
#define FILTERS #define FILTERS
#include "filter/filters.h" #include "filter/filters.h"
@ -107,8 +101,6 @@
// maximum number of windowed modes (see windowedModes[][]) // maximum number of windowed modes (see windowedModes[][])
#if defined (_WIN32_WCE) || defined(GP2X) #if defined (_WIN32_WCE) || defined(GP2X)
#define MAXWINMODES (1) #define MAXWINMODES (1)
#elif defined (WII)
#define MAXWINMODES (8)
#else #else
#define MAXWINMODES (27) #define MAXWINMODES (27)
#endif #endif
@ -177,7 +169,6 @@ static SDL_bool exposevideo = SDL_FALSE;
static INT32 windowedModes[MAXWINMODES][2] = static INT32 windowedModes[MAXWINMODES][2] =
{ {
#if !(defined (_WIN32_WCE) || defined (GP2X)) #if !(defined (_WIN32_WCE) || defined (GP2X))
#ifndef WII
{1920,1200}, // 1.60,6.00 {1920,1200}, // 1.60,6.00
{1680,1050}, // 1.60,5.25 {1680,1050}, // 1.60,5.25
{1600,1200}, // 1.33,5.00 {1600,1200}, // 1.33,5.00
@ -197,7 +188,6 @@ static INT32 windowedModes[MAXWINMODES][2] =
{ 960, 600}, // 1.60,3.00 { 960, 600}, // 1.60,3.00
{ 800, 600}, // 1.33,2.50 { 800, 600}, // 1.33,2.50
{ 800, 500}, // 1.60,2.50 { 800, 500}, // 1.60,2.50
#endif
{ 640, 480}, // 1.33,2.00 { 640, 480}, // 1.33,2.00
{ 640, 400}, // 1.60,2.00 { 640, 400}, // 1.60,2.00
{ 576, 432}, // 1.33,1.80 { 576, 432}, // 1.33,1.80
@ -216,9 +206,6 @@ static void SDLSetMode(INT32 width, INT32 height, INT32 bpp, Uint32 flags)
if (bpp < 16) if (bpp < 16)
bpp = 16; // 256 mode poo bpp = 16; // 256 mode poo
#endif #endif
#ifdef _WII
bpp = 16; // 8-bit mode poo
#endif
#ifdef GP2X #ifdef GP2X
bpp = 16; bpp = 16;
#ifdef HAVE_GP2XSDL #ifdef HAVE_GP2XSDL
@ -230,10 +217,6 @@ static void SDLSetMode(INT32 width, INT32 height, INT32 bpp, Uint32 flags)
#endif #endif
if (SDLVD && strncasecmp(SDLVD,"glSDL",6) == 0) //for glSDL videodriver if (SDLVD && strncasecmp(SDLVD,"glSDL",6) == 0) //for glSDL videodriver
vidSurface = SDL_SetVideoMode(width, height,0,SDL_DOUBLEBUF); vidSurface = SDL_SetVideoMode(width, height,0,SDL_DOUBLEBUF);
#ifdef _WII // don't want it to use HWSURFACE, so make it first here
else if (SDL_VideoModeOK(width, height, bpp, flags|SDL_SWSURFACE|SDL_DOUBLEBUF) >= bpp) // SDL Wii uses double buffering
vidSurface = SDL_SetVideoMode(width, height, bpp, flags|SDL_SWSURFACE|SDL_DOUBLEBUF);
#endif
else if (cv_vidwait.value && videoblitok && SDL_VideoModeOK(width, height, bpp, flags|SDL_HWSURFACE|SDL_DOUBLEBUF) >= bpp) else if (cv_vidwait.value && videoblitok && SDL_VideoModeOK(width, height, bpp, flags|SDL_HWSURFACE|SDL_DOUBLEBUF) >= bpp)
vidSurface = SDL_SetVideoMode(width, height, bpp, flags|SDL_HWSURFACE|SDL_DOUBLEBUF); vidSurface = SDL_SetVideoMode(width, height, bpp, flags|SDL_HWSURFACE|SDL_DOUBLEBUF);
else if (videoblitok && SDL_VideoModeOK(width, height, bpp, flags|SDL_HWSURFACE) >= bpp) else if (videoblitok && SDL_VideoModeOK(width, height, bpp, flags|SDL_HWSURFACE) >= bpp)
@ -1837,11 +1820,6 @@ void I_StartupGraphics(void)
return; return;
} }
} }
#ifdef REMOTE_DEBUGGING
#ifdef _WII
_break(); // break for debugger
#endif
#endif
#endif #endif
{ {
char vd[100]; //stack space for video name char vd[100]; //stack space for video name
@ -1944,13 +1922,8 @@ void I_StartupGraphics(void)
#endif #endif
if (render_soft == rendermode) if (render_soft == rendermode)
{ {
#if defined(_WII)
vid.width = 640;
vid.height = 480;
#else
vid.width = BASEVIDWIDTH; vid.width = BASEVIDWIDTH;
vid.height = BASEVIDHEIGHT; vid.height = BASEVIDHEIGHT;
#endif
SDLSetMode(vid.width, vid.height, BitsPerPixel, surfaceFlagsW); SDLSetMode(vid.width, vid.height, BitsPerPixel, surfaceFlagsW);
if (!vidSurface) if (!vidSurface)
{ {

2
src/sdl12/mixer_sound.c
View file

@ -43,12 +43,10 @@
#define HAVE_ZLIB #define HAVE_ZLIB
#ifndef _MSC_VER #ifndef _MSC_VER
#ifndef _WII
#ifndef _LARGEFILE64_SOURCE #ifndef _LARGEFILE64_SOURCE
#define _LARGEFILE64_SOURCE #define _LARGEFILE64_SOURCE
#endif #endif
#endif #endif
#endif
#ifndef _LFS64_LARGEFILE #ifndef _LFS64_LARGEFILE
#define _LFS64_LARGEFILE #define _LFS64_LARGEFILE

4
src/sdl12/sdl_sound.c
View file

@ -1496,9 +1496,7 @@ void I_InitMusic(void)
I_OutputMsg("Compiled for SDL_mixer version: %d.%d.%d\n", I_OutputMsg("Compiled for SDL_mixer version: %d.%d.%d\n",
MIXcompiled.major, MIXcompiled.minor, MIXcompiled.patch); MIXcompiled.major, MIXcompiled.minor, MIXcompiled.patch);
#ifdef MIXER_POS #ifdef MIXER_POS
#ifndef _WII
if (MIXlinked->major == 1 && MIXlinked->minor == 2 && MIXlinked->patch < 7) if (MIXlinked->major == 1 && MIXlinked->minor == 2 && MIXlinked->patch < 7)
#endif
canlooping = SDL_FALSE; canlooping = SDL_FALSE;
#endif #endif
#ifdef USE_RWOPS #ifdef USE_RWOPS
@ -1507,7 +1505,7 @@ void I_InitMusic(void)
#endif #endif
I_OutputMsg("Linked with SDL_mixer version: %d.%d.%d\n", I_OutputMsg("Linked with SDL_mixer version: %d.%d.%d\n",
MIXlinked->major, MIXlinked->minor, MIXlinked->patch); MIXlinked->major, MIXlinked->minor, MIXlinked->patch);
#if !(defined(GP2X) || defined (WII)) #if !defined(GP2X)
if (audio.freq < 44100 && !M_CheckParm ("-freq")) //I want atleast 44Khz if (audio.freq < 44100 && !M_CheckParm ("-freq")) //I want atleast 44Khz
{ {
audio.samples = (Uint16)(audio.samples*(INT32)(44100/audio.freq)); audio.samples = (Uint16)(audio.samples*(INT32)(44100/audio.freq));

2
src/win32/win_snd.c
View file

@ -22,12 +22,10 @@
#define HAVE_ZLIB #define HAVE_ZLIB
#ifndef _MSC_VER #ifndef _MSC_VER
#ifndef _WII
#ifndef _LARGEFILE64_SOURCE #ifndef _LARGEFILE64_SOURCE
#define _LARGEFILE64_SOURCE #define _LARGEFILE64_SOURCE
#endif #endif
#endif #endif
#endif
#ifndef _LFS64_LARGEFILE #ifndef _LFS64_LARGEFILE
#define _LFS64_LARGEFILE #define _LFS64_LARGEFILE