A couple of misc. Wii changes.

- Make MAXXDIM and MAXYDIM macros be 860 and 490, respectively.  tueidj says
  max. screen size is 848x480, but there are oob access bugs in the classic
  renderer when running with the maximum possible resolution
- don't allocate additional sector/wall storage for Mapster (saves ~16k)
- Add ud.config.UseJoystick = 1 in config.c, but make it conditional on Wii
- remove one comment I no longer believe true, add one TODO comment

git-svn-id: https://svn.eduke32.com/eduke32@2645 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-05-06 20:23:20 +00:00
parent 4d14fe184c
commit 2cef17641a
4 changed files with 15 additions and 8 deletions

View file

@ -31,21 +31,24 @@ extern "C" {
# define MAXXDIM 7680
# define MAXYDIM 3200
// additional space beyond wall, in walltypes:
# define M32_FIXME_WALLS 512
# define M32_FIXME_SECTORS 2
#else
# define MAXSECTORS MAXSECTORSV7
# define MAXWALLS MAXWALLSV7
# define MAXSPRITES MAXSPRITESV7
# define MAXXDIM 1600
# define MAXYDIM 1200
# define MAXXDIM 860
# define MAXYDIM 490
# define M32_FIXME_WALLS 0
# define M32_FIXME_SECTORS 0
#endif
#define MAXWALLSB ((MAXWALLS>>2)+(MAXWALLS>>3))
// additional space beyond wall, in walltypes:
#define M32_FIXME_WALLS 512
#define M32_FIXME_SECTORS 2
#define MAXTILES 30720
#define MAXVOXELS 4096
#define MAXSTATUS 1024

View file

@ -24,8 +24,6 @@ extern int32_t dmval;
#include <math.h>
static inline int32_t divscale(int32_t eax, int32_t ebx, int32_t ecx)
{
// XXX: potential loss of precision? double has only 52 bits in the
// significand, after all...
return ldexp(eax, ecx) / ebx;
}

View file

@ -9013,6 +9013,8 @@ int32_t loadboard(char *filename, char flags, int32_t *daposx, int32_t *daposy,
initspritelists();
// TODO: need checking for engine compiled with V7 limits, so we
// load V8+ maps ONLY if they don't exceed them.
#define MYMAXSECTORS (mapversion==7?MAXSECTORSV7:MAXSECTORSV8)
#define MYMAXWALLS (mapversion==7?MAXWALLSV7:MAXWALLSV8)
#define MYMAXSPRITES (mapversion==7?MAXSPRITESV7:MAXSPRITESV8)

View file

@ -251,7 +251,11 @@ void CONFIG_SetDefaults(void)
ud.weaponsway = 1;
ud.weaponswitch = 3; // new+empty
ud.angleinterpolation = 0;
#ifdef GEKKO
ud.config.UseJoystick = 1;
#else
ud.config.UseJoystick = 0;
#endif
ud.config.UseMouse = 1;
ud.config.VoiceToggle = 5; // bitfield, 1 = local, 2 = dummy, 4 = other players in DM
ud.display_bonus_screen = 1;