2008-01-27 11:25:03 +00:00
|
|
|
/*
|
|
|
|
|
** m_options.cpp
|
|
|
|
|
** New options menu code
|
|
|
|
|
**
|
|
|
|
|
**---------------------------------------------------------------------------
|
|
|
|
|
** Copyright 1998-2006 Randy Heit
|
|
|
|
|
** All rights reserved.
|
|
|
|
|
**
|
|
|
|
|
** Redistribution and use in source and binary forms, with or without
|
|
|
|
|
** modification, are permitted provided that the following conditions
|
|
|
|
|
** are met:
|
|
|
|
|
**
|
|
|
|
|
** 1. Redistributions of source code must retain the above copyright
|
|
|
|
|
** notice, this list of conditions and the following disclaimer.
|
|
|
|
|
** 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
|
** notice, this list of conditions and the following disclaimer in the
|
|
|
|
|
** documentation and/or other materials provided with the distribution.
|
|
|
|
|
** 3. The name of the author may not be used to endorse or promote products
|
|
|
|
|
** derived from this software without specific prior written permission.
|
|
|
|
|
**
|
|
|
|
|
** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
|
|
|
** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
|
|
|
** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
|
|
|
** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
|
|
|
** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
|
|
|
** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
|
|
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
|
|
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
|
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
|
|
|
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
|
**---------------------------------------------------------------------------
|
|
|
|
|
**
|
|
|
|
|
** Sorry this got so convoluted. It was originally much cleaner until
|
|
|
|
|
** I started adding all sorts of gadgets to the menus. I might someday
|
|
|
|
|
** make a project of rewriting the entire menu system using Amiga-style
|
|
|
|
|
** taglists to describe each menu item. We'll see... (Probably not.)
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "m_alloc.h"
|
|
|
|
|
#include "templates.h"
|
|
|
|
|
|
|
|
|
|
#include "doomdef.h"
|
|
|
|
|
#include "gstrings.h"
|
|
|
|
|
|
|
|
|
|
#include "c_console.h"
|
|
|
|
|
#include "c_dispatch.h"
|
|
|
|
|
#include "c_bind.h"
|
|
|
|
|
|
|
|
|
|
#include "d_main.h"
|
|
|
|
|
#include "d_gui.h"
|
|
|
|
|
|
|
|
|
|
#include "i_system.h"
|
|
|
|
|
#include "i_video.h"
|
|
|
|
|
|
|
|
|
|
#include "i_music.h"
|
|
|
|
|
#include "i_input.h"
|
|
|
|
|
|
|
|
|
|
#include "v_video.h"
|
|
|
|
|
#include "v_text.h"
|
|
|
|
|
#include "w_wad.h"
|
|
|
|
|
#include "gi.h"
|
|
|
|
|
|
|
|
|
|
#include "r_local.h"
|
|
|
|
|
#include "gameconfigfile.h"
|
|
|
|
|
|
|
|
|
|
#include "hu_stuff.h"
|
|
|
|
|
|
|
|
|
|
#include "g_game.h"
|
|
|
|
|
|
|
|
|
|
#include "m_argv.h"
|
|
|
|
|
#include "m_swap.h"
|
|
|
|
|
|
|
|
|
|
#include "s_sound.h"
|
|
|
|
|
|
|
|
|
|
#include "doomstat.h"
|
|
|
|
|
|
|
|
|
|
#include "m_misc.h"
|
|
|
|
|
#include "hardware.h"
|
|
|
|
|
#include "sc_man.h"
|
|
|
|
|
|
|
|
|
|
// Data.
|
|
|
|
|
#include "m_menu.h"
|
|
|
|
|
|
|
|
|
|
void StartGLMenu (void);
|
|
|
|
|
EXTERN_CVAR(Int, vid_renderer)
|
|
|
|
|
EXTERN_CVAR(Bool, nomonsterinterpolation)
|
|
|
|
|
EXTERN_CVAR(Int, showendoom)
|
|
|
|
|
EXTERN_CVAR(Bool, hud_althud)
|
|
|
|
|
|
|
|
|
|
static value_t Renderers[] = {
|
|
|
|
|
{ 0.0, "Software" },
|
|
|
|
|
{ 1.0, "OpenGL" },
|
|
|
|
|
};
|
|
|
|
|
EXTERN_CVAR (Float, vid_brightness)
|
|
|
|
|
EXTERN_CVAR (Float, vid_contrast)
|
|
|
|
|
extern bool gl_disabled;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
|
// defaulted values
|
|
|
|
|
//
|
|
|
|
|
CVAR (Float, mouse_sensitivity, 1.f, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
|
|
|
|
|
|
|
|
|
|
// Show messages has default, 0 = off, 1 = on
|
|
|
|
|
CVAR (Bool, show_messages, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
|
|
|
|
|
CVAR (Bool, show_obituaries, true, CVAR_ARCHIVE)
|
2008-02-20 16:51:40 +00:00
|
|
|
EXTERN_CVAR (Bool, longsavemessages)
|
|
|
|
|
EXTERN_CVAR (Bool, screenshot_quiet)
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
|
extern int skullAnimCounter;
|
|
|
|
|
|
|
|
|
|
EXTERN_CVAR (Bool, cl_run)
|
|
|
|
|
EXTERN_CVAR (Int, crosshair)
|
|
|
|
|
EXTERN_CVAR (Bool, freelook)
|
|
|
|
|
EXTERN_CVAR (Int, sv_smartaim)
|
|
|
|
|
|
|
|
|
|
static void CalcIndent (menu_t *menu);
|
|
|
|
|
|
|
|
|
|
void M_ChangeMessages ();
|
|
|
|
|
void M_SizeDisplay (int diff);
|
|
|
|
|
|
|
|
|
|
int M_StringHeight (char *string);
|
|
|
|
|
|
|
|
|
|
EColorRange LabelColor;
|
|
|
|
|
EColorRange ValueColor;
|
|
|
|
|
EColorRange MoreColor;
|
|
|
|
|
|
|
|
|
|
static bool CanScrollUp;
|
|
|
|
|
static bool CanScrollDown;
|
|
|
|
|
static int VisBottom;
|
|
|
|
|
|
|
|
|
|
value_t YesNo[2] = {
|
|
|
|
|
{ 0.0, "No" },
|
|
|
|
|
{ 1.0, "Yes" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
value_t NoYes[2] = {
|
|
|
|
|
{ 0.0, "Yes" },
|
|
|
|
|
{ 1.0, "No" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
value_t OnOff[2] = {
|
|
|
|
|
{ 0.0, "Off" },
|
|
|
|
|
{ 1.0, "On" }
|
|
|
|
|
};
|
|
|
|
|
|
2008-02-20 16:51:40 +00:00
|
|
|
value_t OffOn[2] = {
|
|
|
|
|
{ 0.0, "On" },
|
|
|
|
|
{ 1.0, "Off" }
|
|
|
|
|
};
|
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
menu_t *CurrentMenu;
|
|
|
|
|
int CurrentItem;
|
|
|
|
|
static const char *OldMessage;
|
|
|
|
|
static itemtype OldType;
|
|
|
|
|
|
|
|
|
|
int flagsvar;
|
|
|
|
|
enum
|
|
|
|
|
{
|
|
|
|
|
SHOW_DMFlags = 1,
|
|
|
|
|
SHOW_DMFlags2 = 2,
|
|
|
|
|
SHOW_CompatFlags = 4
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*=======================================
|
|
|
|
|
*
|
|
|
|
|
* Confirm Menu - Used by safemore
|
|
|
|
|
*
|
|
|
|
|
*=======================================*/
|
|
|
|
|
static void ActivateConfirm (const char *text, void (*func)());
|
|
|
|
|
static void ConfirmIsAGo ();
|
|
|
|
|
|
|
|
|
|
static menuitem_t ConfirmItems[] = {
|
|
|
|
|
{ whitetext,NULL, {NULL}, {0}, {0}, {0}, {NULL} },
|
|
|
|
|
{ redtext, "Do you really want to do this?", {NULL}, {0}, {0}, {0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0}, {0}, {0}, {NULL} },
|
|
|
|
|
{ rightmore,"Yes", {NULL}, {0}, {0}, {0}, {(value_t*)ConfirmIsAGo} },
|
|
|
|
|
{ rightmore,"No", {NULL}, {0}, {0}, {0}, {(value_t*)M_PopMenuStack} },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static menu_t ConfirmMenu = {
|
|
|
|
|
"PLEASE CONFIRM",
|
|
|
|
|
3,
|
|
|
|
|
countof(ConfirmItems),
|
|
|
|
|
140,
|
|
|
|
|
ConfirmItems,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*=======================================
|
|
|
|
|
*
|
|
|
|
|
* Options Menu
|
|
|
|
|
*
|
|
|
|
|
*=======================================*/
|
|
|
|
|
|
|
|
|
|
static void CustomizeControls (void);
|
|
|
|
|
static void GameplayOptions (void);
|
|
|
|
|
static void CompatibilityOptions (void);
|
|
|
|
|
static void VideoOptions (void);
|
|
|
|
|
static void SoundOptions (void);
|
|
|
|
|
static void MouseOptions (void);
|
|
|
|
|
static void JoystickOptions (void);
|
|
|
|
|
static void GoToConsole (void);
|
|
|
|
|
void M_PlayerSetup (void);
|
|
|
|
|
void Reset2Defaults (void);
|
|
|
|
|
void Reset2Saved (void);
|
|
|
|
|
|
|
|
|
|
static void SetVidMode (void);
|
|
|
|
|
|
|
|
|
|
static menuitem_t OptionItems[] =
|
|
|
|
|
{
|
|
|
|
|
{ more, "Customize Controls", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)CustomizeControls} },
|
|
|
|
|
{ more, "Mouse options", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)MouseOptions} },
|
|
|
|
|
{ more, "Joystick options", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)JoystickOptions} },
|
|
|
|
|
{ discrete, "Always Run", {&cl_run}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ more, "Player Setup", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)M_PlayerSetup} },
|
|
|
|
|
{ more, "Gameplay Options", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)GameplayOptions} },
|
|
|
|
|
{ more, "Compatibility Options",{NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)CompatibilityOptions} },
|
|
|
|
|
{ more, "Sound Options", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)SoundOptions} },
|
|
|
|
|
{ more, "Display Options", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)VideoOptions} },
|
|
|
|
|
{ more, "Set video mode", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)SetVidMode} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ safemore, "Reset to defaults", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)Reset2Defaults} },
|
|
|
|
|
{ safemore, "Reset to last saved", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)Reset2Saved} },
|
|
|
|
|
{ more, "Go to console", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)GoToConsole} },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
menu_t OptionMenu =
|
|
|
|
|
{
|
|
|
|
|
"OPTIONS",
|
|
|
|
|
0,
|
|
|
|
|
countof(OptionItems),
|
|
|
|
|
0,
|
|
|
|
|
OptionItems,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*=======================================
|
|
|
|
|
*
|
|
|
|
|
* Mouse Menu
|
|
|
|
|
*
|
|
|
|
|
*=======================================*/
|
|
|
|
|
|
|
|
|
|
EXTERN_CVAR (Bool, use_mouse)
|
2008-06-02 17:20:22 +00:00
|
|
|
EXTERN_CVAR (Bool, smooth_mouse)
|
2008-01-27 11:25:03 +00:00
|
|
|
EXTERN_CVAR (Float, m_forward)
|
|
|
|
|
EXTERN_CVAR (Float, m_pitch)
|
|
|
|
|
EXTERN_CVAR (Float, m_side)
|
|
|
|
|
EXTERN_CVAR (Float, m_yaw)
|
|
|
|
|
EXTERN_CVAR (Bool, invertmouse)
|
|
|
|
|
EXTERN_CVAR (Bool, lookspring)
|
|
|
|
|
EXTERN_CVAR (Bool, lookstrafe)
|
|
|
|
|
EXTERN_CVAR (Bool, m_noprescale)
|
|
|
|
|
|
|
|
|
|
static menuitem_t MouseItems[] =
|
|
|
|
|
{
|
|
|
|
|
{ discrete, "Enable mouse", {&use_mouse}, {2.0}, {0.0}, {0.0}, {YesNo} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ slider, "Overall sensitivity", {&mouse_sensitivity}, {0.5}, {2.5}, {0.1}, {NULL} },
|
|
|
|
|
{ discrete, "Prescale mouse movement",{&m_noprescale}, {2.0}, {0.0}, {0.0}, {NoYes} },
|
2008-06-02 17:20:22 +00:00
|
|
|
{ discrete, "Smooth mouse movement",{&smooth_mouse}, {2.0}, {0.0}, {0.0}, {YesNo} },
|
2008-01-27 11:25:03 +00:00
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ slider, "Turning speed", {&m_yaw}, {0.5}, {2.5}, {0.1}, {NULL} },
|
|
|
|
|
{ slider, "Mouselook speed", {&m_pitch}, {0.5}, {2.5}, {0.1}, {NULL} },
|
|
|
|
|
{ slider, "Forward/Backward speed",{&m_forward}, {0.5}, {2.5}, {0.1}, {NULL} },
|
|
|
|
|
{ slider, "Strafing speed", {&m_side}, {0.5}, {2.5}, {0.1}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ discrete, "Always Mouselook", {&freelook}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
|
|
|
|
{ discrete, "Invert Mouse", {&invertmouse}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
|
|
|
|
{ discrete, "Lookspring", {&lookspring}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
|
|
|
|
{ discrete, "Lookstrafe", {&lookstrafe}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
menu_t MouseMenu =
|
|
|
|
|
{
|
|
|
|
|
"MOUSE OPTIONS",
|
|
|
|
|
0,
|
|
|
|
|
countof(MouseItems),
|
|
|
|
|
0,
|
|
|
|
|
MouseItems,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*=======================================
|
|
|
|
|
*
|
|
|
|
|
* Joystick Menu
|
|
|
|
|
*
|
|
|
|
|
*=======================================*/
|
|
|
|
|
|
|
|
|
|
EXTERN_CVAR (Bool, use_joystick)
|
|
|
|
|
EXTERN_CVAR (Float, joy_speedmultiplier)
|
|
|
|
|
EXTERN_CVAR (Int, joy_xaxis)
|
|
|
|
|
EXTERN_CVAR (Int, joy_yaxis)
|
|
|
|
|
EXTERN_CVAR (Int, joy_zaxis)
|
|
|
|
|
EXTERN_CVAR (Int, joy_xrot)
|
|
|
|
|
EXTERN_CVAR (Int, joy_yrot)
|
|
|
|
|
EXTERN_CVAR (Int, joy_zrot)
|
|
|
|
|
EXTERN_CVAR (Int, joy_slider)
|
|
|
|
|
EXTERN_CVAR (Int, joy_dial)
|
|
|
|
|
EXTERN_CVAR (Float, joy_xthreshold)
|
|
|
|
|
EXTERN_CVAR (Float, joy_ythreshold)
|
|
|
|
|
EXTERN_CVAR (Float, joy_zthreshold)
|
|
|
|
|
EXTERN_CVAR (Float, joy_xrotthreshold)
|
|
|
|
|
EXTERN_CVAR (Float, joy_yrotthreshold)
|
|
|
|
|
EXTERN_CVAR (Float, joy_zrotthreshold)
|
|
|
|
|
EXTERN_CVAR (Float, joy_sliderthreshold)
|
|
|
|
|
EXTERN_CVAR (Float, joy_dialthreshold)
|
|
|
|
|
EXTERN_CVAR (Float, joy_yawspeed)
|
|
|
|
|
EXTERN_CVAR (Float, joy_pitchspeed)
|
|
|
|
|
EXTERN_CVAR (Float, joy_forwardspeed)
|
|
|
|
|
EXTERN_CVAR (Float, joy_sidespeed)
|
|
|
|
|
EXTERN_CVAR (Float, joy_upspeed)
|
|
|
|
|
EXTERN_CVAR (GUID, joy_guid)
|
|
|
|
|
|
|
|
|
|
static value_t JoyAxisMapNames[6] =
|
|
|
|
|
{
|
|
|
|
|
{ 0.0, "None" },
|
|
|
|
|
{ 1.0, "Turning" },
|
|
|
|
|
{ 2.0, "Looking Up/Down" },
|
|
|
|
|
{ 3.0, "Moving Forward" },
|
|
|
|
|
{ 4.0, "Strafing" },
|
|
|
|
|
{ 5.0, "Moving Up/Down" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static value_t Inversion[2] =
|
|
|
|
|
{
|
|
|
|
|
{ 0.0, "Not Inverted" },
|
|
|
|
|
{ 1.0, "Inverted" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static menuitem_t JoystickItems[] =
|
|
|
|
|
{
|
|
|
|
|
{ discrete, "Enable joystick", {&use_joystick}, {2.0}, {0.0}, {0.0}, {YesNo} },
|
|
|
|
|
{ discrete_guid,"Active joystick", {&joy_guid}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ slider, "Overall sensitivity", {&joy_speedmultiplier}, {0.9}, {2.0}, {0.2}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ whitetext,"Axis Assignments", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
menu_t JoystickMenu =
|
|
|
|
|
{
|
|
|
|
|
"JOYSTICK OPTIONS",
|
|
|
|
|
0,
|
|
|
|
|
countof(JoystickItems),
|
|
|
|
|
0,
|
|
|
|
|
JoystickItems,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*=======================================
|
|
|
|
|
*
|
|
|
|
|
* Controls Menu
|
|
|
|
|
*
|
|
|
|
|
*=======================================*/
|
|
|
|
|
|
|
|
|
|
menuitem_t ControlsItems[] =
|
|
|
|
|
{
|
|
|
|
|
{ redtext,"ENTER to change, BACKSPACE to clear", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ whitetext,"Controls", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ control, "Fire", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"+attack"} },
|
|
|
|
|
{ control, "Secondary Fire", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"+altattack"} },
|
|
|
|
|
{ control, "Use / Open", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"+use"} },
|
|
|
|
|
{ control, "Move forward", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"+forward"} },
|
|
|
|
|
{ control, "Move backward", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"+back"} },
|
|
|
|
|
{ control, "Strafe left", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"+moveleft"} },
|
|
|
|
|
{ control, "Strafe right", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"+moveright"} },
|
|
|
|
|
{ control, "Turn left", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"+left"} },
|
|
|
|
|
{ control, "Turn right", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"+right"} },
|
|
|
|
|
{ control, "Jump", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"+jump"} },
|
|
|
|
|
{ control, "Crouch", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"+crouch"} },
|
|
|
|
|
{ control, "Crouch Toggle", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"crouch"} },
|
|
|
|
|
{ control, "Fly / Swim up", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"+moveup"} },
|
|
|
|
|
{ control, "Fly / Swim down", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"+movedown"} },
|
|
|
|
|
{ control, "Stop flying", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"land"} },
|
|
|
|
|
{ control, "Mouse look", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"+mlook"} },
|
|
|
|
|
{ control, "Keyboard look", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"+klook"} },
|
|
|
|
|
{ control, "Look up", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"+lookup"} },
|
|
|
|
|
{ control, "Look down", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"+lookdown"} },
|
|
|
|
|
{ control, "Center view", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"centerview"} },
|
|
|
|
|
{ control, "Run", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"+speed"} },
|
|
|
|
|
{ control, "Strafe", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"+strafe"} },
|
|
|
|
|
{ control, "Show Scoreboard", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"+showscores"} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ whitetext,"Chat", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ control, "Say", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"messagemode"} },
|
|
|
|
|
{ control, "Team say", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"messagemode2"} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ whitetext,"Weapons", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ control, "Next weapon", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"weapnext"} },
|
|
|
|
|
{ control, "Previous weapon", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"weapprev"} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ whitetext,"Inventory", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ control, "Activate item", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"invuse"} },
|
|
|
|
|
{ control, "Activate all items", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"invuseall"} },
|
|
|
|
|
{ control, "Next item", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"invnext"} },
|
|
|
|
|
{ control, "Previous item", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"invprev"} },
|
|
|
|
|
{ control, "Drop item", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"invdrop"} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ whitetext,"Other", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ control, "Toggle automap", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"togglemap"} },
|
|
|
|
|
{ control, "Chasecam", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"chase"} },
|
|
|
|
|
{ control, "Coop spy", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"spynext"} },
|
|
|
|
|
{ control, "Screenshot", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"screenshot"} },
|
|
|
|
|
{ control, "Open console", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"toggleconsole"} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ whitetext,"Strife Popup Screens", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ control, "Mission objectives", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"showpop 1"} },
|
|
|
|
|
{ control, "Keys list", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"showpop 2"} },
|
|
|
|
|
{ control, "Weapons/ammo/stats", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)"showpop 3"} },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static TArray<menuitem_t> CustomControlsItems (0);
|
|
|
|
|
|
|
|
|
|
menu_t ControlsMenu =
|
|
|
|
|
{
|
|
|
|
|
"CUSTOMIZE CONTROLS",
|
|
|
|
|
3,
|
|
|
|
|
countof(ControlsItems),
|
|
|
|
|
0,
|
|
|
|
|
ControlsItems,
|
|
|
|
|
2,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*=======================================
|
|
|
|
|
*
|
|
|
|
|
* Display Options Menu
|
|
|
|
|
*
|
|
|
|
|
*=======================================*/
|
|
|
|
|
static void StartMessagesMenu (void);
|
|
|
|
|
static void StartAutomapMenu (void);
|
|
|
|
|
static void StartScoreboardMenu (void);
|
|
|
|
|
static void InitCrosshairsList();
|
|
|
|
|
|
|
|
|
|
EXTERN_CVAR (Bool, st_scale)
|
|
|
|
|
EXTERN_CVAR (Int, r_detail)
|
|
|
|
|
EXTERN_CVAR (Bool, r_stretchsky)
|
|
|
|
|
EXTERN_CVAR (Int, r_columnmethod)
|
|
|
|
|
EXTERN_CVAR (Bool, r_drawfuzz)
|
|
|
|
|
EXTERN_CVAR (Int, cl_rockettrails)
|
|
|
|
|
EXTERN_CVAR (Int, cl_pufftype)
|
|
|
|
|
EXTERN_CVAR (Int, cl_bloodtype)
|
|
|
|
|
EXTERN_CVAR (Int, wipetype)
|
|
|
|
|
EXTERN_CVAR (Bool, vid_palettehack)
|
|
|
|
|
EXTERN_CVAR (Bool, vid_attachedsurfaces)
|
|
|
|
|
EXTERN_CVAR (Int, screenblocks)
|
|
|
|
|
|
|
|
|
|
static TArray<valuestring_t> Crosshairs;
|
|
|
|
|
|
|
|
|
|
static value_t DetailModes[] =
|
|
|
|
|
{
|
|
|
|
|
{ 0.0, "Normal" },
|
|
|
|
|
{ 1.0, "Double Horizontally" },
|
|
|
|
|
{ 2.0, "Double Vertically" },
|
|
|
|
|
{ 3.0, "Double Horiz and Vert" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static value_t ColumnMethods[] = {
|
|
|
|
|
{ 0.0, "Original" },
|
|
|
|
|
{ 1.0, "Optimized" }
|
|
|
|
|
};
|
|
|
|
|
|
- Fixed: The players were not added to FS's list of spawned things.
- Update to ZDoom r882
- Added the option to use $ as a prefix to a string table name everywhere in
MAPINFO where 'lookup' could be specified so that there is one consistent
way to do it.
- Externalized all default episode definitions. Added an 'optional' keyword
to handle M4 and 5 in Doom and Heretic.
- Added P_CheckMapData function and replaced all calls to P_OpenMapData that
only checked for a map's presence with it.
- Added Martin Howe's player statusbar face submission.
- Added an 'adddefaultmap' option for MAPINFO. This is the same as 'defaultmap'
but keeps all existing information in the default and just adds to it. This
is needed because Hexen and Strife set some information in their base
MAPINFO and using 'defaultmap' in a PWAD would override that.
- Fixed: Using MAPINFO's f1 option could cause memory leaks.
- Added option to load lumps by full name to several places:
* Finale texts loaded from a text lump
* Demos
* Local SNDINFOs
* Local SNDSEQs
* Image names in FONTDEFS
* intermission script names
- Changed the STCFN121 handling. The character is not an 'I' but a '|' so
instead of discarding it it should be inserted at position 124.
- Renamed indexfont.fon to indexfont so that I could remove a special case
from V_GetFont that was just added for this one font.
- Added a 'dumpspawnedthings' CVAR that enables a listing of all things in
the map and the actor type they spawned.
SBarInfo Update #16
- Added: fillzeros flag for drawnumber. When set the string will always have
a length of the specified size and zeros will fill in for the missing places.
If the number is negative the negative sign will take the place of the last
digit.
- Added: globalarray type to drawnumber which will display the value in a
global array with the index set to the player's number. Untested.
- Added: isselected command to SBarInfo.
- Fixed: Bi and Tri colored numbers didn't work.
- Fixed: Crash when using nullimage as the last image in drawswitchableimage.
- Applied Graf suggestion to include the y coord when calulating heights to fix
most of the gaps caused by round off errors. At least for now anyways and it
is only applied for drawimage.
- SBarInfo inventory bars have been converted to use screen->DrawTexture()
- Increased limit for demon/melee to 4.
- Fixed: P_CheckSwitchRange accessed invalid memory when testing a one-sided
line.
- Fixed: P_SpawnPuff assumed that all melee attacks have the same range
(MELEERANGE) and didn't set the puff to its melee state if the range
was different. Even worse, it checked a global variable for this so
the behavior was undefined when P_SpawnPuff was called from anywhere
else but P_LineAttack. To reduce the amount of parameters I combined
this information with the hitthing and temporary parameters into one
flags parameter. Also changed P_LineAttack so that it gets passed
an additional parameter that specifies whether the attack is a melee
attack or not and set this to true in all calls that are to be considered
melee attacks. I couldn't use the damage type because A_CustomPunch
and A_CustomMeleeAttack allow passing any damage type they want.
- Added a sprite option as an alternative of particles for FX_ROCKET
and FX_GRENADE.
- Fixed: The minimum parameter count for ACS_Execute and ACS_ExecuteAlways for
DECORATE was wrong (2 instead of 1.)
- Changed: Hexen set every cluster to be a hub if it hadn't been defined before
a level using this cluster. Now it will only do that if HexenHack is true,
i.e. when original Hexen format MAPINFOs are parsed. For ZDoom format
MAPINFOs it will now be the same as for the other games which means that
'hub' has to be declared explicitly.
- Added an Idle state that is entered in place of the spawn state if a monster
has to return to its inactive state if it can't find any more targets.
- Added MF5_NOINTERACTION flag which completely disables all physics related
code for any actor with this flag. Mostly useful for particle effects where
the actors just move a certain distance and then disappear.
- Removed the last remains of the antialias precalculation code from
am_map.cpp because it was no longer used.
- Fixed: Two-sided lines bordering a secret sector were not drawn in the
proper color
- Fixed: The automap didn't check ACS_LockedExecuteDoor for its lock color.
- Switched sounds local to the listener from head-relative 3D sounds to 2D
sounds so stereo sounds have full separation. I tried using set3DSpread,
but that still caused some blending of the channels.
- Changed FScanner so that opening a lump gives the complete wad+lump name
rather than a generic one, so identifying errors among files that all have
the same lump name no longer involves any degree of guesswork in
determining exactly which file the error occurred in.
- Added a check to S_ParseSndSeq() for SNDSEQ lumps with unterminated final
sequences.
- Fixed: Parts of s_sndseq.cpp that scan the Sequences array need NULL
pointer checks, in case an improper sequence was encountered during
parsing but not early enough to avoid creating a slot for it in the array.
- Added support for dumping from RAW/DRO/IMF files, so now anything that
can be played as OPL can also be dumped.
- Removed the opl_enable cvar, since OPL playback is now selectable as just
another MIDI device.
- Added support for DRO playback and dual-chip RAW playback.
- Removed MUS support from OPLMUSSong, since using the OPLMIDIDevice with
MUSSong2 works just as well. There are still lots of leftover bits in
the class that should probably be removed at some point, too.
- Added dual-chip dumping support for the RAW format.
- Added DosBox Raw OPL (.DRO) dumping support. For whatever reason,
in_adlib calculates the song length for this format wrong, even though
the exact length is stored right in the header. (But in_adlib seems buggy
in general; too bad it's the only Windows version of Adplug that seems to
exist.)
- Rewrote the OPL dumper to work with MIDI as well as MUS.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@86 b0f79afe-0144-0410-b225-9a4edf0717df
2008-04-05 13:28:48 +00:00
|
|
|
static value_t RocketTrailTypes[] = {
|
|
|
|
|
{ 0.0, "Off" },
|
|
|
|
|
{ 1.0, "Particles" },
|
|
|
|
|
{ 2.0, "Sprites" },
|
|
|
|
|
{ 3.0, "Sprites & Particles" }
|
|
|
|
|
};
|
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
static value_t BloodTypes[] = {
|
|
|
|
|
{ 0.0, "Sprites" },
|
|
|
|
|
{ 1.0, "Sprites & Particles" },
|
|
|
|
|
{ 2.0, "Particles" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static value_t PuffTypes[] = {
|
|
|
|
|
{ 0.0, "Sprites" },
|
|
|
|
|
{ 1.0, "Particles" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static value_t Wipes[] = {
|
|
|
|
|
{ 0.0, "None" },
|
|
|
|
|
{ 1.0, "Melt" },
|
|
|
|
|
{ 2.0, "Burn" },
|
|
|
|
|
{ 3.0, "Crossfade" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static value_t Endoom[] = {
|
|
|
|
|
{ 0.0, "Off" },
|
|
|
|
|
{ 1.0, "On" },
|
|
|
|
|
{ 2.0, "Only modified" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static menuitem_t VideoItems[] = {
|
|
|
|
|
{ more, "Message Options", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)StartMessagesMenu} },
|
|
|
|
|
{ more, "OpenGL Options", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)StartGLMenu} },
|
|
|
|
|
{ more, "Automap Options", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)StartAutomapMenu} },
|
|
|
|
|
{ more, "Scoreboard Options", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)StartScoreboardMenu} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ slider, "Screen size", {&screenblocks}, {3.0}, {12.0}, {1.0}, {NULL} },
|
|
|
|
|
{ slider, "Gamma correction", {&Gamma}, {0.1}, {3.0}, {0.1}, {NULL} },
|
|
|
|
|
{ slider, "Brightness", {&vid_brightness}, {-0.8}, {0.8}, {0.05}, {NULL} },
|
|
|
|
|
{ slider, "Contrast", {&vid_contrast}, {0.1}, {3.0}, {0.1}, {NULL} },
|
|
|
|
|
{ discretes,"Crosshair", {&crosshair}, {8.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ discrete, "Column render mode", {&r_columnmethod}, {2.0}, {0.0}, {0.0}, {ColumnMethods} },
|
|
|
|
|
{ discrete, "Detail mode", {&r_detail}, {4.0}, {0.0}, {0.0}, {DetailModes} },
|
|
|
|
|
{ discrete, "Stretch short skies", {&r_stretchsky}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
|
|
|
|
{ discrete, "Stretch status bar", {&st_scale}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
|
|
|
|
{ discrete, "Alternative HUD", {&hud_althud}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
|
|
|
|
{ discrete, "Screen wipe style", {&wipetype}, {4.0}, {0.0}, {0.0}, {Wipes} },
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
|
{ discrete, "Show ENDOOM screen", {&showendoom}, {3.0}, {0.0}, {0.0}, {Endoom} },
|
|
|
|
|
{ discrete, "DirectDraw palette hack", {&vid_palettehack}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
|
|
|
|
{ discrete, "Use attached surfaces", {&vid_attachedsurfaces},{2.0}, {0.0}, {0.0}, {OnOff} },
|
|
|
|
|
#endif
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ discrete, "Use fuzz effect", {&r_drawfuzz}, {2.0}, {0.0}, {0.0}, {YesNo} },
|
- Fixed: The players were not added to FS's list of spawned things.
- Update to ZDoom r882
- Added the option to use $ as a prefix to a string table name everywhere in
MAPINFO where 'lookup' could be specified so that there is one consistent
way to do it.
- Externalized all default episode definitions. Added an 'optional' keyword
to handle M4 and 5 in Doom and Heretic.
- Added P_CheckMapData function and replaced all calls to P_OpenMapData that
only checked for a map's presence with it.
- Added Martin Howe's player statusbar face submission.
- Added an 'adddefaultmap' option for MAPINFO. This is the same as 'defaultmap'
but keeps all existing information in the default and just adds to it. This
is needed because Hexen and Strife set some information in their base
MAPINFO and using 'defaultmap' in a PWAD would override that.
- Fixed: Using MAPINFO's f1 option could cause memory leaks.
- Added option to load lumps by full name to several places:
* Finale texts loaded from a text lump
* Demos
* Local SNDINFOs
* Local SNDSEQs
* Image names in FONTDEFS
* intermission script names
- Changed the STCFN121 handling. The character is not an 'I' but a '|' so
instead of discarding it it should be inserted at position 124.
- Renamed indexfont.fon to indexfont so that I could remove a special case
from V_GetFont that was just added for this one font.
- Added a 'dumpspawnedthings' CVAR that enables a listing of all things in
the map and the actor type they spawned.
SBarInfo Update #16
- Added: fillzeros flag for drawnumber. When set the string will always have
a length of the specified size and zeros will fill in for the missing places.
If the number is negative the negative sign will take the place of the last
digit.
- Added: globalarray type to drawnumber which will display the value in a
global array with the index set to the player's number. Untested.
- Added: isselected command to SBarInfo.
- Fixed: Bi and Tri colored numbers didn't work.
- Fixed: Crash when using nullimage as the last image in drawswitchableimage.
- Applied Graf suggestion to include the y coord when calulating heights to fix
most of the gaps caused by round off errors. At least for now anyways and it
is only applied for drawimage.
- SBarInfo inventory bars have been converted to use screen->DrawTexture()
- Increased limit for demon/melee to 4.
- Fixed: P_CheckSwitchRange accessed invalid memory when testing a one-sided
line.
- Fixed: P_SpawnPuff assumed that all melee attacks have the same range
(MELEERANGE) and didn't set the puff to its melee state if the range
was different. Even worse, it checked a global variable for this so
the behavior was undefined when P_SpawnPuff was called from anywhere
else but P_LineAttack. To reduce the amount of parameters I combined
this information with the hitthing and temporary parameters into one
flags parameter. Also changed P_LineAttack so that it gets passed
an additional parameter that specifies whether the attack is a melee
attack or not and set this to true in all calls that are to be considered
melee attacks. I couldn't use the damage type because A_CustomPunch
and A_CustomMeleeAttack allow passing any damage type they want.
- Added a sprite option as an alternative of particles for FX_ROCKET
and FX_GRENADE.
- Fixed: The minimum parameter count for ACS_Execute and ACS_ExecuteAlways for
DECORATE was wrong (2 instead of 1.)
- Changed: Hexen set every cluster to be a hub if it hadn't been defined before
a level using this cluster. Now it will only do that if HexenHack is true,
i.e. when original Hexen format MAPINFOs are parsed. For ZDoom format
MAPINFOs it will now be the same as for the other games which means that
'hub' has to be declared explicitly.
- Added an Idle state that is entered in place of the spawn state if a monster
has to return to its inactive state if it can't find any more targets.
- Added MF5_NOINTERACTION flag which completely disables all physics related
code for any actor with this flag. Mostly useful for particle effects where
the actors just move a certain distance and then disappear.
- Removed the last remains of the antialias precalculation code from
am_map.cpp because it was no longer used.
- Fixed: Two-sided lines bordering a secret sector were not drawn in the
proper color
- Fixed: The automap didn't check ACS_LockedExecuteDoor for its lock color.
- Switched sounds local to the listener from head-relative 3D sounds to 2D
sounds so stereo sounds have full separation. I tried using set3DSpread,
but that still caused some blending of the channels.
- Changed FScanner so that opening a lump gives the complete wad+lump name
rather than a generic one, so identifying errors among files that all have
the same lump name no longer involves any degree of guesswork in
determining exactly which file the error occurred in.
- Added a check to S_ParseSndSeq() for SNDSEQ lumps with unterminated final
sequences.
- Fixed: Parts of s_sndseq.cpp that scan the Sequences array need NULL
pointer checks, in case an improper sequence was encountered during
parsing but not early enough to avoid creating a slot for it in the array.
- Added support for dumping from RAW/DRO/IMF files, so now anything that
can be played as OPL can also be dumped.
- Removed the opl_enable cvar, since OPL playback is now selectable as just
another MIDI device.
- Added support for DRO playback and dual-chip RAW playback.
- Removed MUS support from OPLMUSSong, since using the OPLMIDIDevice with
MUSSong2 works just as well. There are still lots of leftover bits in
the class that should probably be removed at some point, too.
- Added dual-chip dumping support for the RAW format.
- Added DosBox Raw OPL (.DRO) dumping support. For whatever reason,
in_adlib calculates the song length for this format wrong, even though
the exact length is stored right in the header. (But in_adlib seems buggy
in general; too bad it's the only Windows version of Adplug that seems to
exist.)
- Rewrote the OPL dumper to work with MIDI as well as MUS.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@86 b0f79afe-0144-0410-b225-9a4edf0717df
2008-04-05 13:28:48 +00:00
|
|
|
{ discrete, "Rocket Trails", {&cl_rockettrails}, {4.0}, {0.0}, {0.0}, {RocketTrailTypes} },
|
2008-01-27 11:25:03 +00:00
|
|
|
{ discrete, "Blood Type", {&cl_bloodtype}, {3.0}, {0.0}, {0.0}, {BloodTypes} },
|
|
|
|
|
{ discrete, "Bullet Puff Type", {&cl_pufftype}, {2.0}, {0.0}, {0.0}, {PuffTypes} },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#define CROSSHAIR_INDEX 9
|
|
|
|
|
|
|
|
|
|
menu_t VideoMenu =
|
|
|
|
|
{
|
|
|
|
|
"DISPLAY OPTIONS",
|
|
|
|
|
0,
|
|
|
|
|
countof(VideoItems),
|
|
|
|
|
0,
|
|
|
|
|
VideoItems,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*=======================================
|
|
|
|
|
*
|
|
|
|
|
* Automap Menu
|
|
|
|
|
*
|
|
|
|
|
*=======================================*/
|
|
|
|
|
static void StartMapColorsMenu (void);
|
|
|
|
|
|
|
|
|
|
EXTERN_CVAR (Int, am_rotate)
|
|
|
|
|
EXTERN_CVAR (Int, am_overlay)
|
|
|
|
|
EXTERN_CVAR (Bool, am_usecustomcolors)
|
|
|
|
|
EXTERN_CVAR (Bool, am_showitems)
|
|
|
|
|
EXTERN_CVAR (Bool, am_showmonsters)
|
|
|
|
|
EXTERN_CVAR (Bool, am_showsecrets)
|
|
|
|
|
EXTERN_CVAR (Bool, am_showtime)
|
|
|
|
|
EXTERN_CVAR (Int, am_map_secrets)
|
|
|
|
|
EXTERN_CVAR (Bool, am_showtotaltime)
|
|
|
|
|
EXTERN_CVAR (Bool, am_drawmapback)
|
|
|
|
|
|
|
|
|
|
static value_t MapColorTypes[] = {
|
|
|
|
|
{ 1, "Custom" },
|
|
|
|
|
{ 0, "Traditional Doom" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static value_t SecretTypes[] = {
|
|
|
|
|
{ 0, "Never" },
|
|
|
|
|
{ 1, "Only when found" },
|
|
|
|
|
{ 2, "Always" },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static value_t RotateTypes[] = {
|
|
|
|
|
{ 0, "Off" },
|
|
|
|
|
{ 1, "On" },
|
|
|
|
|
{ 2, "On for overlay only" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static value_t OverlayTypes[] = {
|
|
|
|
|
{ 0, "Off" },
|
|
|
|
|
{ 1, "Overlay+Normal" },
|
|
|
|
|
{ 2, "Overlay Only" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static menuitem_t AutomapItems[] = {
|
|
|
|
|
{ discrete, "Map color set", {&am_usecustomcolors}, {2.0}, {0.0}, {0.0}, {MapColorTypes} },
|
|
|
|
|
{ more, "Set custom colors", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t*)StartMapColorsMenu} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ discrete, "Rotate automap", {&am_rotate}, {3.0}, {0.0}, {0.0}, {RotateTypes} },
|
|
|
|
|
{ discrete, "Overlay automap", {&am_overlay}, {3.0}, {0.0}, {0.0}, {OverlayTypes} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ discrete, "Show item counts", {&am_showitems}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
|
|
|
|
{ discrete, "Show monster counts", {&am_showmonsters}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
|
|
|
|
{ discrete, "Show secret counts", {&am_showsecrets}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
|
|
|
|
{ discrete, "Show time elapsed", {&am_showtime}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
|
|
|
|
{ discrete, "Show total time elapsed", {&am_showtotaltime}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
|
|
|
|
{ discrete, "Show secrets on map", {&am_map_secrets}, {3.0}, {0.0}, {0.0}, {SecretTypes} },
|
|
|
|
|
{ discrete, "Draw map background", {&am_drawmapback}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
menu_t AutomapMenu =
|
|
|
|
|
{
|
|
|
|
|
"AUTOMAP OPTIONS",
|
|
|
|
|
0,
|
|
|
|
|
countof(AutomapItems),
|
|
|
|
|
0,
|
|
|
|
|
AutomapItems,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*=======================================
|
|
|
|
|
*
|
|
|
|
|
* Map Colors Menu
|
|
|
|
|
*
|
|
|
|
|
*=======================================*/
|
|
|
|
|
static void DefaultCustomColors();
|
|
|
|
|
|
|
|
|
|
EXTERN_CVAR (Color, am_backcolor)
|
|
|
|
|
EXTERN_CVAR (Color, am_yourcolor)
|
|
|
|
|
EXTERN_CVAR (Color, am_wallcolor)
|
|
|
|
|
EXTERN_CVAR (Color, am_secretwallcolor)
|
|
|
|
|
EXTERN_CVAR (Color, am_tswallcolor)
|
|
|
|
|
EXTERN_CVAR (Color, am_fdwallcolor)
|
|
|
|
|
EXTERN_CVAR (Color, am_cdwallcolor)
|
|
|
|
|
EXTERN_CVAR (Color, am_thingcolor)
|
|
|
|
|
EXTERN_CVAR (Color, am_gridcolor)
|
|
|
|
|
EXTERN_CVAR (Color, am_xhaircolor)
|
|
|
|
|
EXTERN_CVAR (Color, am_notseencolor)
|
|
|
|
|
EXTERN_CVAR (Color, am_lockedcolor)
|
|
|
|
|
EXTERN_CVAR (Color, am_ovyourcolor)
|
|
|
|
|
EXTERN_CVAR (Color, am_ovwallcolor)
|
|
|
|
|
EXTERN_CVAR (Color, am_ovthingcolor)
|
|
|
|
|
EXTERN_CVAR (Color, am_ovotherwallscolor)
|
|
|
|
|
EXTERN_CVAR (Color, am_ovunseencolor)
|
|
|
|
|
EXTERN_CVAR (Color, am_ovtelecolor)
|
|
|
|
|
EXTERN_CVAR (Color, am_intralevelcolor)
|
|
|
|
|
EXTERN_CVAR (Color, am_interlevelcolor)
|
|
|
|
|
EXTERN_CVAR (Color, am_secretsectorcolor)
|
|
|
|
|
EXTERN_CVAR (Color, am_thingcolor_friend)
|
|
|
|
|
EXTERN_CVAR (Color, am_thingcolor_monster)
|
|
|
|
|
EXTERN_CVAR (Color, am_thingcolor_item)
|
|
|
|
|
EXTERN_CVAR (Color, am_ovthingcolor_friend)
|
|
|
|
|
EXTERN_CVAR (Color, am_ovthingcolor_monster)
|
|
|
|
|
EXTERN_CVAR (Color, am_ovthingcolor_item)
|
|
|
|
|
|
|
|
|
|
static menuitem_t MapColorsItems[] = {
|
|
|
|
|
{ rsafemore, "Restore default custom colors", {NULL}, {0}, {0}, {0}, {(value_t*)DefaultCustomColors} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "Background", {&am_backcolor}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "You", {&am_yourcolor}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "1-sided walls", {&am_wallcolor}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "2-sided walls with different floors", {&am_fdwallcolor}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "2-sided walls with different ceilings", {&am_cdwallcolor}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "Map grid", {&am_gridcolor}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "Center point", {&am_xhaircolor}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "Not-yet-seen walls", {&am_notseencolor}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "Locked doors", {&am_lockedcolor}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "Teleporter to the same map", {&am_intralevelcolor}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "Teleporter to a different map", {&am_interlevelcolor}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "Secret sector", {&am_secretsectorcolor}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "Invisible 2-sided walls (for cheat)", {&am_tswallcolor}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "Secret walls (for cheat)", {&am_secretwallcolor}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "Actors (for cheat)", {&am_thingcolor}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "Monsters (for cheat)", {&am_thingcolor_monster}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "Friends (for cheat)", {&am_thingcolor_friend}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "Items (for cheat)", {&am_thingcolor_item}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "You (overlay)", {&am_ovyourcolor}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "1-sided walls (overlay)", {&am_ovwallcolor}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "2-sided walls (overlay)", {&am_ovotherwallscolor},{0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "Not-yet-seen walls (overlay)", {&am_ovunseencolor}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "Teleporter (overlay)", {&am_ovtelecolor}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "Actors (overlay) (for cheat)", {&am_ovthingcolor}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "Monsters (overlay) (for cheat)", {&am_ovthingcolor_monster}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "Friends (overlay) (for cheat)", {&am_ovthingcolor_friend}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ colorpicker, "Items (overlay) (for cheat)", {&am_ovthingcolor_item}, {0}, {0}, {0}, {0} },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
menu_t MapColorsMenu =
|
|
|
|
|
{
|
|
|
|
|
"CUSTOMIZE MAP COLORS",
|
|
|
|
|
0,
|
|
|
|
|
countof(MapColorsItems),
|
|
|
|
|
48,
|
|
|
|
|
MapColorsItems,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*=======================================
|
|
|
|
|
*
|
|
|
|
|
* Color Picker Sub-menu
|
|
|
|
|
*
|
|
|
|
|
*=======================================*/
|
|
|
|
|
static void StartColorPickerMenu (const char *colorname, FColorCVar *cvar);
|
|
|
|
|
static void ColorPickerReset ();
|
|
|
|
|
static int CurrColorIndex;
|
|
|
|
|
static int SelColorIndex;
|
|
|
|
|
static void UpdateSelColor (int index);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static menuitem_t ColorPickerItems[] = {
|
|
|
|
|
{ redtext, NULL, {NULL}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ intslider, "Red", {NULL}, {0}, {255}, {15}, {0} },
|
|
|
|
|
{ intslider, "Green", {NULL}, {0}, {255}, {15}, {0} },
|
|
|
|
|
{ intslider, "Blue", {NULL}, {0}, {255}, {15}, {0} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ more, "Undo changes", {NULL}, {0}, {0}, {0}, {(value_t*)ColorPickerReset} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ palettegrid, " ", {NULL}, {0}, {0}, {0}, {0} },
|
|
|
|
|
{ palettegrid, " ", {NULL}, {1}, {0}, {0}, {0} },
|
|
|
|
|
{ palettegrid, " ", {NULL}, {2}, {0}, {0}, {0} },
|
|
|
|
|
{ palettegrid, " ", {NULL}, {3}, {0}, {0}, {0} },
|
|
|
|
|
{ palettegrid, " ", {NULL}, {4}, {0}, {0}, {0} },
|
|
|
|
|
{ palettegrid, " ", {NULL}, {5}, {0}, {0}, {0} },
|
|
|
|
|
{ palettegrid, " ", {NULL}, {6}, {0}, {0}, {0} },
|
|
|
|
|
{ palettegrid, " ", {NULL}, {7}, {0}, {0}, {0} },
|
|
|
|
|
{ palettegrid, " ", {NULL}, {8}, {0}, {0}, {0} },
|
|
|
|
|
{ palettegrid, " ", {NULL}, {9}, {0}, {0}, {0} },
|
|
|
|
|
{ palettegrid, " ", {NULL}, {10}, {0}, {0}, {0} },
|
|
|
|
|
{ palettegrid, " ", {NULL}, {11}, {0}, {0}, {0} },
|
|
|
|
|
{ palettegrid, " ", {NULL}, {12}, {0}, {0}, {0} },
|
|
|
|
|
{ palettegrid, " ", {NULL}, {13}, {0}, {0}, {0} },
|
|
|
|
|
{ palettegrid, " ", {NULL}, {14}, {0}, {0}, {0} },
|
|
|
|
|
{ palettegrid, " ", {NULL}, {15}, {0}, {0}, {0} },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
menu_t ColorPickerMenu =
|
|
|
|
|
{
|
|
|
|
|
"SELECT COLOR",
|
|
|
|
|
2,
|
|
|
|
|
countof(ColorPickerItems),
|
|
|
|
|
0,
|
|
|
|
|
ColorPickerItems,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*=======================================
|
|
|
|
|
*
|
|
|
|
|
* Messages Menu
|
|
|
|
|
*
|
|
|
|
|
*=======================================*/
|
|
|
|
|
EXTERN_CVAR (Int, con_scaletext)
|
|
|
|
|
EXTERN_CVAR (Bool, con_centernotify)
|
|
|
|
|
EXTERN_CVAR (Int, msg0color)
|
|
|
|
|
EXTERN_CVAR (Int, msg1color)
|
|
|
|
|
EXTERN_CVAR (Int, msg2color)
|
|
|
|
|
EXTERN_CVAR (Int, msg3color)
|
|
|
|
|
EXTERN_CVAR (Int, msg4color)
|
|
|
|
|
EXTERN_CVAR (Int, msgmidcolor)
|
|
|
|
|
EXTERN_CVAR (Int, msglevel)
|
|
|
|
|
|
|
|
|
|
static value_t ScaleValues[] =
|
|
|
|
|
{
|
|
|
|
|
{ 0.0, "Off" },
|
|
|
|
|
{ 1.0, "On" },
|
|
|
|
|
{ 2.0, "Double" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static value_t TextColors[] =
|
|
|
|
|
{
|
|
|
|
|
{ 0.0, "brick" },
|
|
|
|
|
{ 1.0, "tan" },
|
|
|
|
|
{ 2.0, "gray" },
|
|
|
|
|
{ 3.0, "green" },
|
|
|
|
|
{ 4.0, "brown" },
|
|
|
|
|
{ 5.0, "gold" },
|
|
|
|
|
{ 6.0, "red" },
|
|
|
|
|
{ 7.0, "blue" },
|
|
|
|
|
{ 8.0, "orange" },
|
|
|
|
|
{ 9.0, "white" },
|
|
|
|
|
{ 10.0, "yellow" },
|
|
|
|
|
{ 11.0, "default" },
|
|
|
|
|
{ 12.0, "black" },
|
|
|
|
|
{ 13.0, "light blue" },
|
|
|
|
|
{ 14.0, "cream" },
|
|
|
|
|
{ 15.0, "olive" },
|
|
|
|
|
{ 16.0, "dark green" },
|
|
|
|
|
{ 17.0, "dark red" },
|
|
|
|
|
{ 18.0, "dark brown" },
|
|
|
|
|
{ 19.0, "purple" },
|
|
|
|
|
{ 20.0, "dark gray" },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static value_t MessageLevels[] = {
|
|
|
|
|
{ 0.0, "Item Pickup" },
|
|
|
|
|
{ 1.0, "Obituaries" },
|
|
|
|
|
{ 2.0, "Critical Messages" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static menuitem_t MessagesItems[] = {
|
|
|
|
|
{ discrete, "Show messages", {&show_messages}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
|
|
|
|
{ discrete, "Show obituaries", {&show_obituaries}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
|
|
|
|
{ discrete, "Scale text in high res", {&con_scaletext}, {3.0}, {0.0}, {0.0}, {ScaleValues} },
|
|
|
|
|
{ discrete, "Minimum message level", {&msglevel}, {3.0}, {0.0}, {0.0}, {MessageLevels} },
|
|
|
|
|
{ discrete, "Center messages", {&con_centernotify}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ whitetext, "Message Colors", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ cdiscrete, "Item Pickup", {&msg0color}, {21.0}, {0.0}, {0.0}, {TextColors} },
|
|
|
|
|
{ cdiscrete, "Obituaries", {&msg1color}, {21.0}, {0.0}, {0.0}, {TextColors} },
|
|
|
|
|
{ cdiscrete, "Critical Messages", {&msg2color}, {21.0}, {0.0}, {0.0}, {TextColors} },
|
|
|
|
|
{ cdiscrete, "Chat Messages", {&msg3color}, {21.0}, {0.0}, {0.0}, {TextColors} },
|
|
|
|
|
{ cdiscrete, "Team Messages", {&msg4color}, {21.0}, {0.0}, {0.0}, {TextColors} },
|
2008-02-20 16:51:40 +00:00
|
|
|
{ cdiscrete, "Centered Messages", {&msgmidcolor}, {21.0}, {0.0}, {0.0}, {TextColors} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ discrete, "Screenshot messages", {&screenshot_quiet}, {2.0}, {0.0}, {0.0}, {OffOn} },
|
|
|
|
|
{ discrete, "Detailed save messages",{&longsavemessages}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
2008-01-27 11:25:03 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
menu_t MessagesMenu =
|
|
|
|
|
{
|
|
|
|
|
"MESSAGES",
|
|
|
|
|
0,
|
|
|
|
|
countof(MessagesItems),
|
|
|
|
|
0,
|
|
|
|
|
MessagesItems,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*=======================================
|
|
|
|
|
*
|
|
|
|
|
* Scoreboard Menu
|
|
|
|
|
*
|
|
|
|
|
*=======================================*/
|
|
|
|
|
|
|
|
|
|
EXTERN_CVAR (Bool, sb_cooperative_enable)
|
|
|
|
|
EXTERN_CVAR (Int, sb_cooperative_headingcolor)
|
|
|
|
|
EXTERN_CVAR (Int, sb_cooperative_yourplayercolor)
|
|
|
|
|
EXTERN_CVAR (Int, sb_cooperative_otherplayercolor)
|
|
|
|
|
|
|
|
|
|
EXTERN_CVAR (Bool, sb_deathmatch_enable)
|
|
|
|
|
EXTERN_CVAR (Int, sb_deathmatch_headingcolor)
|
|
|
|
|
EXTERN_CVAR (Int, sb_deathmatch_yourplayercolor)
|
|
|
|
|
EXTERN_CVAR (Int, sb_deathmatch_otherplayercolor)
|
|
|
|
|
|
|
|
|
|
EXTERN_CVAR (Bool, sb_teamdeathmatch_enable)
|
|
|
|
|
EXTERN_CVAR (Int, sb_teamdeathmatch_headingcolor)
|
|
|
|
|
|
|
|
|
|
static menuitem_t ScoreboardItems[] = {
|
|
|
|
|
{ whitetext, "Cooperative Options", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ discrete, "Enable Scoreboard", {&sb_cooperative_enable}, {21.0}, {0.0}, {0.0}, {YesNo} },
|
|
|
|
|
{ cdiscrete, "Header Color", {&sb_cooperative_headingcolor}, {21.0}, {0.0}, {0.0}, {TextColors} },
|
|
|
|
|
{ cdiscrete, "Your Player Color", {&sb_cooperative_yourplayercolor}, {21.0}, {0.0}, {0.0}, {TextColors} },
|
|
|
|
|
{ cdiscrete, "Other Players' Color", {&sb_cooperative_otherplayercolor}, {21.0}, {0.0}, {0.0}, {TextColors} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ whitetext, "Deathmatch Options", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ discrete, "Enable Scoreboard", {&sb_deathmatch_enable}, {21.0}, {0.0}, {0.0}, {YesNo} },
|
|
|
|
|
{ cdiscrete, "Header Color", {&sb_deathmatch_headingcolor}, {21.0}, {0.0}, {0.0}, {TextColors} },
|
|
|
|
|
{ cdiscrete, "Your Player Color", {&sb_deathmatch_yourplayercolor}, {21.0}, {0.0}, {0.0}, {TextColors} },
|
|
|
|
|
{ cdiscrete, "Other Players' Color", {&sb_deathmatch_otherplayercolor}, {21.0}, {0.0}, {0.0}, {TextColors} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ whitetext, "Team Deathmatch Options", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ discrete, "Enable Scoreboard", {&sb_teamdeathmatch_enable}, {21.0}, {0.0}, {0.0}, {YesNo} },
|
|
|
|
|
{ cdiscrete, "Header Color", {&sb_teamdeathmatch_headingcolor}, {21.0}, {0.0}, {0.0}, {TextColors} }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
menu_t ScoreboardMenu =
|
|
|
|
|
{
|
|
|
|
|
"SCOREBOARD OPTIONS",
|
|
|
|
|
2,
|
|
|
|
|
countof(ScoreboardItems),
|
|
|
|
|
0,
|
|
|
|
|
ScoreboardItems,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*=======================================
|
|
|
|
|
*
|
|
|
|
|
* Video Modes Menu
|
|
|
|
|
*
|
|
|
|
|
*=======================================*/
|
|
|
|
|
|
|
|
|
|
extern bool setmodeneeded;
|
|
|
|
|
extern int NewWidth, NewHeight, NewBits;
|
|
|
|
|
extern int DisplayBits;
|
|
|
|
|
|
|
|
|
|
int testingmode; // Holds time to revert to old mode
|
|
|
|
|
int OldWidth, OldHeight, OldBits;
|
|
|
|
|
|
|
|
|
|
void M_FreeModesList ();
|
|
|
|
|
static void BuildModesList (int hiwidth, int hiheight, int hi_id);
|
|
|
|
|
static bool GetSelectedSize (int line, int *width, int *height);
|
|
|
|
|
static void SetModesMenu (int w, int h, int bits);
|
|
|
|
|
|
|
|
|
|
EXTERN_CVAR (Int, vid_defwidth)
|
|
|
|
|
EXTERN_CVAR (Int, vid_defheight)
|
|
|
|
|
EXTERN_CVAR (Int, vid_defbits)
|
|
|
|
|
|
|
|
|
|
static FIntCVar DummyDepthCvar (NULL, 0, 0);
|
|
|
|
|
|
|
|
|
|
EXTERN_CVAR (Bool, fullscreen)
|
|
|
|
|
|
|
|
|
|
static value_t Depths[22];
|
|
|
|
|
|
|
|
|
|
EXTERN_CVAR (Bool, vid_tft) // Defined below
|
|
|
|
|
CUSTOM_CVAR (Int, menu_screenratios, 0, CVAR_ARCHIVE)
|
|
|
|
|
{
|
|
|
|
|
if (self < 0 || self > 4)
|
|
|
|
|
{
|
|
|
|
|
self = 3;
|
|
|
|
|
}
|
|
|
|
|
else if (self == 4 && !vid_tft)
|
|
|
|
|
{
|
|
|
|
|
self = 3;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
BuildModesList (SCREENWIDTH, SCREENHEIGHT, DisplayBits);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static value_t Ratios[] =
|
|
|
|
|
{
|
|
|
|
|
{ 0.0, "4:3" },
|
|
|
|
|
{ 1.0, "16:9" },
|
|
|
|
|
{ 2.0, "16:10" },
|
|
|
|
|
{ 3.0, "All" }
|
|
|
|
|
};
|
|
|
|
|
static value_t RatiosTFT[] =
|
|
|
|
|
{
|
|
|
|
|
{ 0.0, "4:3" },
|
|
|
|
|
{ 4.0, "5:4" },
|
|
|
|
|
{ 1.0, "16:9" },
|
|
|
|
|
{ 2.0, "16:10" },
|
|
|
|
|
{ 3.0, "All" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static char VMEnterText[] = "Press ENTER to set mode";
|
|
|
|
|
static char VMTestText[] = "T to test mode for 5 seconds";
|
|
|
|
|
|
|
|
|
|
static menuitem_t ModesItems[] = {
|
|
|
|
|
// { discrete, "Screen mode", {&DummyDepthCvar}, {0.0}, {0.0}, {0.0}, {Depths} },
|
|
|
|
|
{ discrete, "Aspect ratio", {&menu_screenratios}, {4.0}, {0.0}, {0.0}, {Ratios} },
|
|
|
|
|
{ discrete, "Renderer", {&vid_renderer}, {2.0}, {0.0}, {0.0}, {Renderers} }, // [ZDoomGL]
|
|
|
|
|
{ discrete, "Fullscreen", {&fullscreen}, {2.0}, {0.0}, {0.0}, {YesNo} },
|
|
|
|
|
{ discrete, "Enable 5:4 aspect ratio",{&vid_tft}, {2.0}, {0.0}, {0.0}, {YesNo} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ screenres,NULL, {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ screenres,NULL, {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ screenres,NULL, {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ screenres,NULL, {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ screenres,NULL, {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ screenres,NULL, {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ screenres,NULL, {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ screenres,NULL, {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ screenres,NULL, {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ screenres,NULL, {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
// { whitetext,"Note: Only 8 bpp modes are supported",{NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, VMEnterText, {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ redtext, VMTestText, {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#define VM_DEPTHITEM 0
|
|
|
|
|
#define VM_ASPECTITEM 0
|
|
|
|
|
#define VM_RESSTART 5
|
|
|
|
|
#define VM_ENTERLINE 15
|
|
|
|
|
#define VM_TESTLINE 17
|
|
|
|
|
|
|
|
|
|
menu_t ModesMenu =
|
|
|
|
|
{
|
|
|
|
|
"VIDEO MODE",
|
|
|
|
|
2,
|
|
|
|
|
countof(ModesItems),
|
|
|
|
|
0,
|
|
|
|
|
ModesItems,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
CUSTOM_CVAR (Bool, vid_tft, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
|
|
|
|
|
{
|
|
|
|
|
if (self)
|
|
|
|
|
{
|
|
|
|
|
ModesItems[VM_ASPECTITEM].b.numvalues = 5.f;
|
|
|
|
|
ModesItems[VM_ASPECTITEM].e.values = RatiosTFT;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
ModesItems[VM_ASPECTITEM].b.numvalues = 4.f;
|
|
|
|
|
ModesItems[VM_ASPECTITEM].e.values = Ratios;
|
|
|
|
|
if (menu_screenratios == 4)
|
|
|
|
|
{
|
|
|
|
|
menu_screenratios = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*=======================================
|
|
|
|
|
*
|
|
|
|
|
* Gameplay Options (dmflags) Menu
|
|
|
|
|
*
|
|
|
|
|
*=======================================*/
|
|
|
|
|
value_t SmartAim[4] = {
|
|
|
|
|
{ 0.0, "Off" },
|
|
|
|
|
{ 1.0, "On" },
|
|
|
|
|
{ 2.0, "Never friends" },
|
|
|
|
|
{ 3.0, "Only monsters" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
value_t FallingDM[4] = {
|
|
|
|
|
{ 0, "Off" },
|
|
|
|
|
{ DF_FORCE_FALLINGZD, "Old" },
|
|
|
|
|
{ DF_FORCE_FALLINGHX, "Hexen" },
|
|
|
|
|
{ DF_FORCE_FALLINGZD|DF_FORCE_FALLINGHX, "Strife" }
|
|
|
|
|
};
|
|
|
|
|
|
2008-03-19 11:19:03 +00:00
|
|
|
value_t DF_Jump[3] = {
|
|
|
|
|
{ 0, "Default" },
|
|
|
|
|
{ DF_NO_JUMP, "Off" },
|
|
|
|
|
{ DF_YES_JUMP, "On" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
value_t DF_Crouch[3] = {
|
|
|
|
|
{ 0, "Default" },
|
|
|
|
|
{ DF_NO_CROUCH, "Off" },
|
|
|
|
|
{ DF_YES_CROUCH, "On" }
|
|
|
|
|
};
|
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
|
static menuitem_t DMFlagsItems[] = {
|
|
|
|
|
{ discrete, "Teamplay", {&teamplay}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
|
|
|
|
{ slider, "Team damage scalar", {&teamdamage}, {0.0}, {1.0}, {0.05},{NULL} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ discrete, "Smart Autoaim", {&sv_smartaim}, {4.0}, {0.0}, {0.0}, {SmartAim} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ bitmask, "Falling damage", {&dmflags}, {4.0}, {DF_FORCE_FALLINGZD|DF_FORCE_FALLINGHX}, {0}, {FallingDM} },
|
|
|
|
|
{ bitflag, "Drop weapon", {&dmflags2}, {0}, {0}, {0}, {(value_t *)DF2_YES_WEAPONDROP} },
|
|
|
|
|
{ bitflag, "Double ammo", {&dmflags2}, {0}, {0}, {0}, {(value_t *)DF2_YES_DOUBLEAMMO} },
|
|
|
|
|
{ bitflag, "Infinite ammo", {&dmflags}, {0}, {0}, {0}, {(value_t *)DF_INFINITE_AMMO} },
|
|
|
|
|
{ bitflag, "Infinite inventory", {&dmflags2}, {0}, {0}, {0}, {(value_t *)DF2_INFINITE_INVENTORY} },
|
|
|
|
|
{ bitflag, "No monsters", {&dmflags}, {0}, {0}, {0}, {(value_t *)DF_NO_MONSTERS} },
|
|
|
|
|
{ bitflag, "Monsters respawn", {&dmflags}, {0}, {0}, {0}, {(value_t *)DF_MONSTERS_RESPAWN} },
|
|
|
|
|
{ bitflag, "No respawn", {&dmflags2}, {0}, {0}, {0}, {(value_t *)DF2_NO_RESPAWN} },
|
|
|
|
|
{ bitflag, "Items respawn", {&dmflags}, {0}, {0}, {0}, {(value_t *)DF_ITEMS_RESPAWN} },
|
|
|
|
|
{ bitflag, "Big powerups respawn", {&dmflags}, {0}, {0}, {0}, {(value_t *)DF_RESPAWN_SUPER} },
|
|
|
|
|
{ bitflag, "Fast monsters", {&dmflags}, {0}, {0}, {0}, {(value_t *)DF_FAST_MONSTERS} },
|
|
|
|
|
{ bitflag, "Degeneration", {&dmflags2}, {0}, {0}, {0}, {(value_t *)DF2_YES_DEGENERATION} },
|
2008-03-19 11:19:03 +00:00
|
|
|
{ bitmask, "Allow jump", {&dmflags}, {3.0}, {DF_NO_JUMP|DF_YES_JUMP}, {0}, {DF_Jump} },
|
|
|
|
|
{ bitmask, "Allow crouch", {&dmflags}, {3.0}, {DF_NO_CROUCH|DF_YES_CROUCH}, {0}, {DF_Crouch} },
|
2008-01-27 11:25:03 +00:00
|
|
|
{ bitflag, "Allow freelook", {&dmflags}, {1}, {0}, {0}, {(value_t *)DF_NO_FREELOOK} },
|
|
|
|
|
{ bitflag, "Allow FOV", {&dmflags}, {1}, {0}, {0}, {(value_t *)DF_NO_FOV} },
|
|
|
|
|
{ bitflag, "Allow BFG aiming", {&dmflags2}, {1}, {0}, {0}, {(value_t *)DF2_NO_FREEAIMBFG} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0}, {0}, {0}, {NULL} },
|
|
|
|
|
{ whitetext,"Deathmatch Settings", {NULL}, {0}, {0}, {0}, {NULL} },
|
|
|
|
|
{ bitflag, "Weapons stay", {&dmflags}, {0}, {0}, {0}, {(value_t *)DF_WEAPONS_STAY} },
|
|
|
|
|
{ bitflag, "Allow powerups", {&dmflags}, {1}, {0}, {0}, {(value_t *)DF_NO_ITEMS} },
|
|
|
|
|
{ bitflag, "Allow health", {&dmflags}, {1}, {0}, {0}, {(value_t *)DF_NO_HEALTH} },
|
|
|
|
|
{ bitflag, "Allow armor", {&dmflags}, {1}, {0}, {0}, {(value_t *)DF_NO_ARMOR} },
|
|
|
|
|
{ bitflag, "Spawn farthest", {&dmflags}, {0}, {0}, {0}, {(value_t *)DF_SPAWN_FARTHEST} },
|
|
|
|
|
{ bitflag, "Same map", {&dmflags}, {0}, {0}, {0}, {(value_t *)DF_SAME_LEVEL} },
|
|
|
|
|
{ bitflag, "Force respawn", {&dmflags}, {0}, {0}, {0}, {(value_t *)DF_FORCE_RESPAWN} },
|
|
|
|
|
{ bitflag, "Allow exit", {&dmflags}, {1}, {0}, {0}, {(value_t *)DF_NO_EXIT} },
|
|
|
|
|
{ bitflag, "Barrels respawn", {&dmflags2}, {0}, {0}, {0}, {(value_t *)DF2_BARRELS_RESPAWN} },
|
|
|
|
|
{ bitflag, "Respawn protection", {&dmflags2}, {0}, {0}, {0}, {(value_t *)DF2_YES_RESPAWN_INVUL} },
|
|
|
|
|
{ bitflag, "Lose frag if fragged", {&dmflags2}, {0}, {0}, {0}, {(value_t *)DF2_YES_LOSEFRAG} },
|
|
|
|
|
{ bitflag, "Keep frags gained", {&dmflags2}, {0}, {0}, {0}, {(value_t *)DF2_YES_KEEPFRAGS} },
|
|
|
|
|
{ bitflag, "No team switching", {&dmflags2}, {0}, {0}, {0}, {(value_t *)DF2_NO_TEAM_SWITCH} },
|
|
|
|
|
|
|
|
|
|
{ redtext, " ", {NULL}, {0}, {0}, {0}, {NULL} },
|
|
|
|
|
{ whitetext,"Cooperative Settings", {NULL}, {0}, {0}, {0}, {NULL} },
|
|
|
|
|
{ bitflag, "Spawn multi. weapons", {&dmflags}, {1}, {0}, {0}, {(value_t *)DF_NO_COOP_WEAPON_SPAWN} },
|
|
|
|
|
{ bitflag, "Lose entire inventory",{&dmflags}, {0}, {0}, {0}, {(value_t *)DF_COOP_LOSE_INVENTORY} },
|
|
|
|
|
{ bitflag, "Keep keys", {&dmflags}, {1}, {0}, {0}, {(value_t *)DF_COOP_LOSE_KEYS} },
|
|
|
|
|
{ bitflag, "Keep weapons", {&dmflags}, {1}, {0}, {0}, {(value_t *)DF_COOP_LOSE_WEAPONS} },
|
|
|
|
|
{ bitflag, "Keep armor", {&dmflags}, {1}, {0}, {0}, {(value_t *)DF_COOP_LOSE_ARMOR} },
|
|
|
|
|
{ bitflag, "Keep powerups", {&dmflags}, {1}, {0}, {0}, {(value_t *)DF_COOP_LOSE_POWERUPS} },
|
|
|
|
|
{ bitflag, "Keep ammo", {&dmflags}, {1}, {0}, {0}, {(value_t *)DF_COOP_LOSE_AMMO} },
|
|
|
|
|
{ bitflag, "Lose half ammo", {&dmflags}, {0}, {0}, {0}, {(value_t *)DF_COOP_HALVE_AMMO} },
|
|
|
|
|
{ bitflag, "Spawn where died", {&dmflags2}, {0}, {0}, {0}, {(value_t *)DF2_SAME_SPAWN_SPOT} },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static menu_t DMFlagsMenu =
|
|
|
|
|
{
|
|
|
|
|
"GAMEPLAY OPTIONS",
|
|
|
|
|
0,
|
|
|
|
|
countof(DMFlagsItems),
|
|
|
|
|
0,
|
|
|
|
|
DMFlagsItems,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*=======================================
|
|
|
|
|
*
|
|
|
|
|
* Compatibility Options Menu
|
|
|
|
|
*
|
|
|
|
|
*=======================================*/
|
|
|
|
|
|
|
|
|
|
static menuitem_t CompatibilityItems[] = {
|
|
|
|
|
{ bitflag, "Find shortest textures like Doom", {&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_SHORTTEX} },
|
|
|
|
|
{ bitflag, "Use buggier stair building", {&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_STAIRINDEX} },
|
|
|
|
|
{ bitflag, "Limit Pain Elementals' Lost Souls", {&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_LIMITPAIN} },
|
|
|
|
|
{ bitflag, "Don't let others hear your pickups", {&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_SILENTPICKUP} },
|
|
|
|
|
{ bitflag, "Actors are infinitely tall", {&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_NO_PASSMOBJ} },
|
|
|
|
|
{ bitflag, "Cripple sound for silent BFG trick", {&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_MAGICSILENCE} },
|
|
|
|
|
{ bitflag, "Enable wall running", {&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_WALLRUN} },
|
|
|
|
|
{ bitflag, "Spawn item drops on the floor", {&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_NOTOSSDROPS} },
|
|
|
|
|
{ bitflag, "All special lines can block <use>", {&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_USEBLOCKING} },
|
|
|
|
|
{ bitflag, "Disable BOOM door light effect", {&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_NODOORLIGHT} },
|
|
|
|
|
{ bitflag, "Raven scrollers use original speed", {&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_RAVENSCROLL} },
|
|
|
|
|
{ bitflag, "Use original sound target handling", {&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_SOUNDTARGET} },
|
|
|
|
|
{ bitflag, "DEH health settings like Doom2.exe", {&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_DEHHEALTH} },
|
|
|
|
|
{ bitflag, "Self ref. sectors don't block shots", {&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_TRACE} },
|
|
|
|
|
{ bitflag, "Monsters get stuck over dropoffs", {&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_DROPOFF} },
|
|
|
|
|
{ bitflag, "Monsters see invisible players", {&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_INVISIBILITY} },
|
|
|
|
|
{ bitflag, "Boom scrollers are additive", {&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_BOOMSCROLL} },
|
2008-05-14 17:49:11 +00:00
|
|
|
{ bitflag, "Inst. moving floors are not silent", {&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_SILENT_INSTANT_FLOORS} },
|
2008-07-19 23:52:06 +00:00
|
|
|
{ bitflag, "Sector sounds use center as source", {&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_SECTORSOUNDS} },
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
|
{ discrete, "Interpolate monster movement", {&nomonsterinterpolation}, {2.0}, {0.0}, {0.0}, {NoYes} },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static menu_t CompatibilityMenu =
|
|
|
|
|
{
|
|
|
|
|
"COMPATIBILITY OPTIONS",
|
|
|
|
|
0,
|
|
|
|
|
countof(CompatibilityItems),
|
|
|
|
|
0,
|
|
|
|
|
CompatibilityItems,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*=======================================
|
|
|
|
|
*
|
|
|
|
|
* Sound Options Menu
|
|
|
|
|
*
|
|
|
|
|
*=======================================*/
|
|
|
|
|
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
|
EXTERN_CVAR (Float, snd_movievolume)
|
|
|
|
|
#endif
|
|
|
|
|
EXTERN_CVAR (Bool, snd_flipstereo)
|
|
|
|
|
EXTERN_CVAR (Bool, snd_pitched)
|
- Update to ZDoom r858:
- Added FMOD_OPENONLY to the callback version of CreateStream() to prevent it
from doing prebuffering of the song. This was causing the Linux version to
hang while waiting for input from the pipe, since Timidity hadn't been
started yet. I tried using a select call in the FillStream() method, but it
always seems to return the pipe as having nothing available. Unfortunately,
the game still falls all over itself if Timidity isn't available. Instead
of execvp failing nicely, X errors kill the game. I don't know why it's
doing that. My advice for Linux music: Skip Timidity++ and get a DLS patch
set (/WINDOWS/system32/drivers/gm.dls is probably the most common by far)
and set the snd_midipatchset cvar to point to it. It's faster and also
sounds a whole lot better than the crappy freepats Ubuntu wants to install
with Timidity++ (thank goodness I have the official patches from a real
GUS so I don't need to use them).
- GCC fixes.
- Fixed: After starting new music the music volume has to be reset so that
the song's relative volume takes effect.
- Removed the arbitrary 1024 bytes limit when the file being played is a MIDI
file. I had a D_DM2TTL that's only 990 bytes.
- Restructured I_RegisterSong so that $mididevice works again and also supports
selecting FMOD.
- Added Jim' Linux fix.
- Added MartinHowe's fix for mugshot display in status bars.
- The garbage collector is now run one last time just before exiting the game.
- Removed movie volume from the sound menu and renamed some of the other
options to give the MIDI device name more room to display itself.
- Moved the midi device selection into the main sound menu.
- Added FMOD as MIDI device -1, to replace the MIDI mapper. This is still the
default device. By default, it uses exactly the same DLS instruments as the
Microsoft GS Wavetable Synth. If you have another set DLS level 1 patch set
you want to use, set the snd_midipatchset cvar to specify where it should
load the instruments from.
- Changed the ProduceMIDI function to store its output into a TArray<BYTE>.
An overloaded version wraps around it to continue to supply file-writing
support for external Timidity++ usage.
- Added an FMOD credits banner to comply with their non-commercial license.
- Reimplemented the snd_buffersize cvar for the FMOD Ex sound system. Rather
than a time in ms, this is now the length in samples of the DSP buffer.
Also added the snd_buffercount cvar to offer complete control over the
call to FMOD::System::setDSPBufferSize(). Note that with any snd_samplerate
below about 44kHz, you will need to set snd_buffersize to avoid long
latencies.
- Reimplemented the snd_output cvar for the FMOD Ex sound system.
- Changed snd_samplerate default to 0. This now means to use the default
sample rate.
- Made snd_output, snd_output_format, snd_speakermode, snd_resampler, and
snd_hrtf available through the menu.
- Split the HRTF effect selection into its own cvar: snd_hrtf.
- Removed 96000 Hz option from the menu. It's still available through the
cvar, if desired.
- Fixed: If Windows sound init failed, retry with DirectSound. (Apparently,
WASAPI doesn't work with more than two speakers and PCM-Float output at the
same time.)
- Fixed: Area sounds only played from the front speakers once you got within
the 2D panning area.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@79 b0f79afe-0144-0410-b225-9a4edf0717df
2008-03-27 18:31:46 +00:00
|
|
|
EXTERN_CVAR (String, snd_output_format)
|
|
|
|
|
EXTERN_CVAR (String, snd_speakermode)
|
|
|
|
|
EXTERN_CVAR (String, snd_resampler)
|
|
|
|
|
EXTERN_CVAR (String, snd_output)
|
|
|
|
|
EXTERN_CVAR (Int, snd_buffersize)
|
|
|
|
|
EXTERN_CVAR (Int, snd_buffercount)
|
|
|
|
|
EXTERN_CVAR (Int, snd_samplerate)
|
|
|
|
|
EXTERN_CVAR (Bool, snd_hrtf)
|
|
|
|
|
EXTERN_CVAR (Bool, snd_waterreverb)
|
2008-05-17 08:47:26 +00:00
|
|
|
EXTERN_CVAR (Float, snd_waterlp)
|
- Update to ZDoom r858:
- Added FMOD_OPENONLY to the callback version of CreateStream() to prevent it
from doing prebuffering of the song. This was causing the Linux version to
hang while waiting for input from the pipe, since Timidity hadn't been
started yet. I tried using a select call in the FillStream() method, but it
always seems to return the pipe as having nothing available. Unfortunately,
the game still falls all over itself if Timidity isn't available. Instead
of execvp failing nicely, X errors kill the game. I don't know why it's
doing that. My advice for Linux music: Skip Timidity++ and get a DLS patch
set (/WINDOWS/system32/drivers/gm.dls is probably the most common by far)
and set the snd_midipatchset cvar to point to it. It's faster and also
sounds a whole lot better than the crappy freepats Ubuntu wants to install
with Timidity++ (thank goodness I have the official patches from a real
GUS so I don't need to use them).
- GCC fixes.
- Fixed: After starting new music the music volume has to be reset so that
the song's relative volume takes effect.
- Removed the arbitrary 1024 bytes limit when the file being played is a MIDI
file. I had a D_DM2TTL that's only 990 bytes.
- Restructured I_RegisterSong so that $mididevice works again and also supports
selecting FMOD.
- Added Jim' Linux fix.
- Added MartinHowe's fix for mugshot display in status bars.
- The garbage collector is now run one last time just before exiting the game.
- Removed movie volume from the sound menu and renamed some of the other
options to give the MIDI device name more room to display itself.
- Moved the midi device selection into the main sound menu.
- Added FMOD as MIDI device -1, to replace the MIDI mapper. This is still the
default device. By default, it uses exactly the same DLS instruments as the
Microsoft GS Wavetable Synth. If you have another set DLS level 1 patch set
you want to use, set the snd_midipatchset cvar to specify where it should
load the instruments from.
- Changed the ProduceMIDI function to store its output into a TArray<BYTE>.
An overloaded version wraps around it to continue to supply file-writing
support for external Timidity++ usage.
- Added an FMOD credits banner to comply with their non-commercial license.
- Reimplemented the snd_buffersize cvar for the FMOD Ex sound system. Rather
than a time in ms, this is now the length in samples of the DSP buffer.
Also added the snd_buffercount cvar to offer complete control over the
call to FMOD::System::setDSPBufferSize(). Note that with any snd_samplerate
below about 44kHz, you will need to set snd_buffersize to avoid long
latencies.
- Reimplemented the snd_output cvar for the FMOD Ex sound system.
- Changed snd_samplerate default to 0. This now means to use the default
sample rate.
- Made snd_output, snd_output_format, snd_speakermode, snd_resampler, and
snd_hrtf available through the menu.
- Split the HRTF effect selection into its own cvar: snd_hrtf.
- Removed 96000 Hz option from the menu. It's still available through the
cvar, if desired.
- Fixed: If Windows sound init failed, retry with DirectSound. (Apparently,
WASAPI doesn't work with more than two speakers and PCM-Float output at the
same time.)
- Fixed: Area sounds only played from the front speakers once you got within
the 2D panning area.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@79 b0f79afe-0144-0410-b225-9a4edf0717df
2008-03-27 18:31:46 +00:00
|
|
|
EXTERN_CVAR (Int, snd_mididevice)
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
|
static void MakeSoundChanges ();
|
|
|
|
|
static void AdvSoundOptions ();
|
Update to ZDoom r1017:
- Fixed: MAPINFO's 'lookup' option should only work for actual strings but
not for lump and file names.
- Added a few 'activator == NULL' checks to some ACS functions.
- Added line and vertex lists to polyobjects so that I can do some
changes that won't work with only a seg list being maintained.
(SBarInfo update #23)
- Fixed: Drawing the amount of an inventory item in the player's inventory did
not work
- Added: PowerupTime to drawnumber and drawbar. You must specify a
powerupgiver. Although drawnumber goes in seconds the powerup has left
drawbar will use ticks for extra accuracy.
- I have increased cross-port compatibility with Skulltag. If an unknown
game mode is provided for sbarinfo's gamemode command it will ignore it and
continue.
- Added an option to consider intermission screens gameplay for purposes of
capturing the mouse.
- Changed: Telefragging should not thrust the victim if it isn't in precisely the
same position as the killer.
- fixed: A_SpawnItemEx must call P_TeleportMove before checking the spawned
object's position.
- Fixed: Ouch state was far to easy to achieve.
- Made all the basic texture classes local to their implementation.
They are not needed anywhere else.
- Changed the HackHack hack for corrupt 256 pixel high textures that
FMultiPatchTexture only calls a virtual function instead of doing any
type checks of the patch itself.
- Cleaned up the constant definitions in doomdata.h.
- Moved the TEXTUREx structures from doomdata.h to multipatchtexture.cpp
because they are used only in this one file.
- Removed some more typedefs from r_defs.h and doomdata.h
- Moved local polyobject data definitions from p_local.h to po_man.cpp.
- Renamed player_s to player_t globally to get rid of the duplicate names
for this class.
- Added coordinate range checking to DCanvas::ParseDrawTextureTags() to avoid
potential crashes in the situation that con_scaletext is 2 and somebody
uses a hud message as if a hud size was specified, but forgot to actually
set the hud size.
- Consolidated the mug shot code shared by DSBarInfo and DDoomStatusBar
into a single place.
- Fixed: Setting an invalid mug shot state crashed the game.
- Fixed my attempts to be clever with strings yesterday.
- If an actor's current target temporarily goes unshootable, its threshold
is now reset to 0, so it will more readily switch back to it.
- Fixed: Deactivating the game no longer allows reverb effects to continue
playing while the sound is paused.
- Fixed: S_StartNamedSound() looked for SECF_SILENT in MoreFlags instead of
Flags.
- Fixed: DSBarInfo::updateState() and DDoomStatusBar::UpdateState() sprung
leaks and didn't allocate enough space for the fullStateName string.
- Disabled DUMB's mono destination mixers. It's not like I'm ever going to
target an original SoundBlaster, so they're a waste of space to have around.
This trims resample.obj down to ~60k now.
- Fixed: PrtScn/SysRq key did not work on Linux.
- Added an alternate module replay engine that uses foo_dumb's replayer, a
heavily customized version of DUMB (Dynamic Universal Music Bibliotheque).
It has been slightly modified by me:
* Added support for Ogg Vorbis-compressed samples in XM files ala FMOD.
* Removed excessive mallocs from the replay core.
* Rerolled the loops in resample.c. Unrolling them made the object file
~250k large while providing little benefit. Even at ~100k, I think it's
still larger than it ought to be, but I'll live with it for now.
Other than that, it's essentially the same thing you'd hear in foobar2000,
minus some subsong detection features. Release builds of the library look
like they might even be slightly faster than FMOD, which is a plus.
- Fixed: Timidity::font_add() did not release the file reader it created.
- Fixed: The SF2 loader did not free the sample headers in its destructor.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@113 b0f79afe-0144-0410-b225-9a4edf0717df
2008-06-03 21:48:49 +00:00
|
|
|
static void ModReplayerOptions ();
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
|
static value_t SampleRates[] =
|
|
|
|
|
{
|
- Update to ZDoom r858:
- Added FMOD_OPENONLY to the callback version of CreateStream() to prevent it
from doing prebuffering of the song. This was causing the Linux version to
hang while waiting for input from the pipe, since Timidity hadn't been
started yet. I tried using a select call in the FillStream() method, but it
always seems to return the pipe as having nothing available. Unfortunately,
the game still falls all over itself if Timidity isn't available. Instead
of execvp failing nicely, X errors kill the game. I don't know why it's
doing that. My advice for Linux music: Skip Timidity++ and get a DLS patch
set (/WINDOWS/system32/drivers/gm.dls is probably the most common by far)
and set the snd_midipatchset cvar to point to it. It's faster and also
sounds a whole lot better than the crappy freepats Ubuntu wants to install
with Timidity++ (thank goodness I have the official patches from a real
GUS so I don't need to use them).
- GCC fixes.
- Fixed: After starting new music the music volume has to be reset so that
the song's relative volume takes effect.
- Removed the arbitrary 1024 bytes limit when the file being played is a MIDI
file. I had a D_DM2TTL that's only 990 bytes.
- Restructured I_RegisterSong so that $mididevice works again and also supports
selecting FMOD.
- Added Jim' Linux fix.
- Added MartinHowe's fix for mugshot display in status bars.
- The garbage collector is now run one last time just before exiting the game.
- Removed movie volume from the sound menu and renamed some of the other
options to give the MIDI device name more room to display itself.
- Moved the midi device selection into the main sound menu.
- Added FMOD as MIDI device -1, to replace the MIDI mapper. This is still the
default device. By default, it uses exactly the same DLS instruments as the
Microsoft GS Wavetable Synth. If you have another set DLS level 1 patch set
you want to use, set the snd_midipatchset cvar to specify where it should
load the instruments from.
- Changed the ProduceMIDI function to store its output into a TArray<BYTE>.
An overloaded version wraps around it to continue to supply file-writing
support for external Timidity++ usage.
- Added an FMOD credits banner to comply with their non-commercial license.
- Reimplemented the snd_buffersize cvar for the FMOD Ex sound system. Rather
than a time in ms, this is now the length in samples of the DSP buffer.
Also added the snd_buffercount cvar to offer complete control over the
call to FMOD::System::setDSPBufferSize(). Note that with any snd_samplerate
below about 44kHz, you will need to set snd_buffersize to avoid long
latencies.
- Reimplemented the snd_output cvar for the FMOD Ex sound system.
- Changed snd_samplerate default to 0. This now means to use the default
sample rate.
- Made snd_output, snd_output_format, snd_speakermode, snd_resampler, and
snd_hrtf available through the menu.
- Split the HRTF effect selection into its own cvar: snd_hrtf.
- Removed 96000 Hz option from the menu. It's still available through the
cvar, if desired.
- Fixed: If Windows sound init failed, retry with DirectSound. (Apparently,
WASAPI doesn't work with more than two speakers and PCM-Float output at the
same time.)
- Fixed: Area sounds only played from the front speakers once you got within
the 2D panning area.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@79 b0f79afe-0144-0410-b225-9a4edf0717df
2008-03-27 18:31:46 +00:00
|
|
|
{ 0.f, "Default" },
|
|
|
|
|
{ 4000.f, "4000 Hz" },
|
|
|
|
|
{ 8000.f, "8000 Hz" },
|
|
|
|
|
{ 11025.f, "11025 Hz" },
|
|
|
|
|
{ 22050.f, "22050 Hz" },
|
|
|
|
|
{ 32000.f, "32000 Hz" },
|
|
|
|
|
{ 44100.f, "44100 Hz" },
|
|
|
|
|
{ 48000.f, "48000 Hz" }
|
2008-01-27 11:25:03 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static value_t BufferSizes[] =
|
|
|
|
|
{
|
- Update to ZDoom r858:
- Added FMOD_OPENONLY to the callback version of CreateStream() to prevent it
from doing prebuffering of the song. This was causing the Linux version to
hang while waiting for input from the pipe, since Timidity hadn't been
started yet. I tried using a select call in the FillStream() method, but it
always seems to return the pipe as having nothing available. Unfortunately,
the game still falls all over itself if Timidity isn't available. Instead
of execvp failing nicely, X errors kill the game. I don't know why it's
doing that. My advice for Linux music: Skip Timidity++ and get a DLS patch
set (/WINDOWS/system32/drivers/gm.dls is probably the most common by far)
and set the snd_midipatchset cvar to point to it. It's faster and also
sounds a whole lot better than the crappy freepats Ubuntu wants to install
with Timidity++ (thank goodness I have the official patches from a real
GUS so I don't need to use them).
- GCC fixes.
- Fixed: After starting new music the music volume has to be reset so that
the song's relative volume takes effect.
- Removed the arbitrary 1024 bytes limit when the file being played is a MIDI
file. I had a D_DM2TTL that's only 990 bytes.
- Restructured I_RegisterSong so that $mididevice works again and also supports
selecting FMOD.
- Added Jim' Linux fix.
- Added MartinHowe's fix for mugshot display in status bars.
- The garbage collector is now run one last time just before exiting the game.
- Removed movie volume from the sound menu and renamed some of the other
options to give the MIDI device name more room to display itself.
- Moved the midi device selection into the main sound menu.
- Added FMOD as MIDI device -1, to replace the MIDI mapper. This is still the
default device. By default, it uses exactly the same DLS instruments as the
Microsoft GS Wavetable Synth. If you have another set DLS level 1 patch set
you want to use, set the snd_midipatchset cvar to specify where it should
load the instruments from.
- Changed the ProduceMIDI function to store its output into a TArray<BYTE>.
An overloaded version wraps around it to continue to supply file-writing
support for external Timidity++ usage.
- Added an FMOD credits banner to comply with their non-commercial license.
- Reimplemented the snd_buffersize cvar for the FMOD Ex sound system. Rather
than a time in ms, this is now the length in samples of the DSP buffer.
Also added the snd_buffercount cvar to offer complete control over the
call to FMOD::System::setDSPBufferSize(). Note that with any snd_samplerate
below about 44kHz, you will need to set snd_buffersize to avoid long
latencies.
- Reimplemented the snd_output cvar for the FMOD Ex sound system.
- Changed snd_samplerate default to 0. This now means to use the default
sample rate.
- Made snd_output, snd_output_format, snd_speakermode, snd_resampler, and
snd_hrtf available through the menu.
- Split the HRTF effect selection into its own cvar: snd_hrtf.
- Removed 96000 Hz option from the menu. It's still available through the
cvar, if desired.
- Fixed: If Windows sound init failed, retry with DirectSound. (Apparently,
WASAPI doesn't work with more than two speakers and PCM-Float output at the
same time.)
- Fixed: Area sounds only played from the front speakers once you got within
the 2D panning area.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@79 b0f79afe-0144-0410-b225-9a4edf0717df
2008-03-27 18:31:46 +00:00
|
|
|
{ 0.f, "Default" },
|
|
|
|
|
{ 64.f, "64 samples" },
|
|
|
|
|
{ 128.f, "128 samples" },
|
|
|
|
|
{ 256.f, "256 samples" },
|
|
|
|
|
{ 512.f, "512 samples" },
|
|
|
|
|
{ 1024.f, "1024 samples" },
|
|
|
|
|
{ 2048.f, "2048 samples" },
|
|
|
|
|
{ 4096.f, "4096 samples" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static value_t BufferCounts[] =
|
|
|
|
|
{
|
|
|
|
|
{ 0.f, "Default" },
|
|
|
|
|
{ 2.f, "2" },
|
|
|
|
|
{ 3.f, "3" },
|
|
|
|
|
{ 4.f, "4" },
|
|
|
|
|
{ 5.f, "5" },
|
|
|
|
|
{ 6.f, "6" },
|
|
|
|
|
{ 7.f, "7" },
|
|
|
|
|
{ 8.f, "8" },
|
|
|
|
|
{ 9.f, "9" },
|
|
|
|
|
{ 10.f, "10" },
|
|
|
|
|
{ 11.f, "11" },
|
|
|
|
|
{ 12.f, "12" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static valueenum_t Outputs[] =
|
|
|
|
|
{
|
|
|
|
|
{ "Default", "Default" },
|
|
|
|
|
#if defined(_WIN32)
|
|
|
|
|
{ "DirectSound", "DirectSound" },
|
|
|
|
|
{ "WASAPI", "Vista WASAPI" },
|
|
|
|
|
{ "ASIO", "ASIO" },
|
|
|
|
|
{ "WaveOut", "WaveOut" },
|
|
|
|
|
{ "OpenAL", "OpenAL (very beta)" },
|
|
|
|
|
#elif defined(unix)
|
|
|
|
|
{ "OSS", "OSS" },
|
|
|
|
|
{ "ALSA", "ALSA" },
|
|
|
|
|
{ "ESD", "ESD" },
|
|
|
|
|
#elif defined(__APPLE__)
|
|
|
|
|
{ "Sound Manager", "Sound Manager" },
|
|
|
|
|
{ "Core Audio", "Core Audio" },
|
|
|
|
|
#endif
|
|
|
|
|
{ "No sound", "No sound" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static valueenum_t OutputFormats[] =
|
|
|
|
|
{
|
|
|
|
|
{ "PCM-8", "8-bit" },
|
|
|
|
|
{ "PCM-16", "16-bit" },
|
|
|
|
|
{ "PCM-24", "24-bit" },
|
|
|
|
|
{ "PCM-32", "32-bit" },
|
|
|
|
|
{ "PCM-Float", "32-bit float" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static valueenum_t SpeakerModes[] =
|
|
|
|
|
{
|
|
|
|
|
{ "Auto", "Auto" },
|
|
|
|
|
{ "Mono", "Mono" },
|
|
|
|
|
{ "Stereo", "Stereo" },
|
|
|
|
|
{ "Prologic", "Dolby Prologic Decoder" },
|
|
|
|
|
{ "Quad", "Quad" },
|
|
|
|
|
{ "Surround", "5 speakers" },
|
|
|
|
|
{ "5.1", "5.1 speakers" },
|
|
|
|
|
{ "7.1", "7.1 speakers" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static valueenum_t Resamplers[] =
|
|
|
|
|
{
|
|
|
|
|
{ "NoInterp", "No interpolation" },
|
|
|
|
|
{ "Linear", "Linear" },
|
|
|
|
|
{ "Cubic", "Cubic" },
|
|
|
|
|
{ "Spline", "Spline" }
|
2008-01-27 11:25:03 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static menuitem_t SoundItems[] =
|
|
|
|
|
{
|
- Update to ZDoom r858:
- Added FMOD_OPENONLY to the callback version of CreateStream() to prevent it
from doing prebuffering of the song. This was causing the Linux version to
hang while waiting for input from the pipe, since Timidity hadn't been
started yet. I tried using a select call in the FillStream() method, but it
always seems to return the pipe as having nothing available. Unfortunately,
the game still falls all over itself if Timidity isn't available. Instead
of execvp failing nicely, X errors kill the game. I don't know why it's
doing that. My advice for Linux music: Skip Timidity++ and get a DLS patch
set (/WINDOWS/system32/drivers/gm.dls is probably the most common by far)
and set the snd_midipatchset cvar to point to it. It's faster and also
sounds a whole lot better than the crappy freepats Ubuntu wants to install
with Timidity++ (thank goodness I have the official patches from a real
GUS so I don't need to use them).
- GCC fixes.
- Fixed: After starting new music the music volume has to be reset so that
the song's relative volume takes effect.
- Removed the arbitrary 1024 bytes limit when the file being played is a MIDI
file. I had a D_DM2TTL that's only 990 bytes.
- Restructured I_RegisterSong so that $mididevice works again and also supports
selecting FMOD.
- Added Jim' Linux fix.
- Added MartinHowe's fix for mugshot display in status bars.
- The garbage collector is now run one last time just before exiting the game.
- Removed movie volume from the sound menu and renamed some of the other
options to give the MIDI device name more room to display itself.
- Moved the midi device selection into the main sound menu.
- Added FMOD as MIDI device -1, to replace the MIDI mapper. This is still the
default device. By default, it uses exactly the same DLS instruments as the
Microsoft GS Wavetable Synth. If you have another set DLS level 1 patch set
you want to use, set the snd_midipatchset cvar to specify where it should
load the instruments from.
- Changed the ProduceMIDI function to store its output into a TArray<BYTE>.
An overloaded version wraps around it to continue to supply file-writing
support for external Timidity++ usage.
- Added an FMOD credits banner to comply with their non-commercial license.
- Reimplemented the snd_buffersize cvar for the FMOD Ex sound system. Rather
than a time in ms, this is now the length in samples of the DSP buffer.
Also added the snd_buffercount cvar to offer complete control over the
call to FMOD::System::setDSPBufferSize(). Note that with any snd_samplerate
below about 44kHz, you will need to set snd_buffersize to avoid long
latencies.
- Reimplemented the snd_output cvar for the FMOD Ex sound system.
- Changed snd_samplerate default to 0. This now means to use the default
sample rate.
- Made snd_output, snd_output_format, snd_speakermode, snd_resampler, and
snd_hrtf available through the menu.
- Split the HRTF effect selection into its own cvar: snd_hrtf.
- Removed 96000 Hz option from the menu. It's still available through the
cvar, if desired.
- Fixed: If Windows sound init failed, retry with DirectSound. (Apparently,
WASAPI doesn't work with more than two speakers and PCM-Float output at the
same time.)
- Fixed: Area sounds only played from the front speakers once you got within
the 2D panning area.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@79 b0f79afe-0144-0410-b225-9a4edf0717df
2008-03-27 18:31:46 +00:00
|
|
|
{ slider, "Sounds volume", {&snd_sfxvolume}, {0.0}, {1.0}, {0.05}, {NULL} },
|
2008-03-09 16:01:55 +00:00
|
|
|
{ slider, "Music volume", {&snd_musicvolume}, {0.0}, {1.0}, {0.05}, {NULL} },
|
- Update to ZDoom r858:
- Added FMOD_OPENONLY to the callback version of CreateStream() to prevent it
from doing prebuffering of the song. This was causing the Linux version to
hang while waiting for input from the pipe, since Timidity hadn't been
started yet. I tried using a select call in the FillStream() method, but it
always seems to return the pipe as having nothing available. Unfortunately,
the game still falls all over itself if Timidity isn't available. Instead
of execvp failing nicely, X errors kill the game. I don't know why it's
doing that. My advice for Linux music: Skip Timidity++ and get a DLS patch
set (/WINDOWS/system32/drivers/gm.dls is probably the most common by far)
and set the snd_midipatchset cvar to point to it. It's faster and also
sounds a whole lot better than the crappy freepats Ubuntu wants to install
with Timidity++ (thank goodness I have the official patches from a real
GUS so I don't need to use them).
- GCC fixes.
- Fixed: After starting new music the music volume has to be reset so that
the song's relative volume takes effect.
- Removed the arbitrary 1024 bytes limit when the file being played is a MIDI
file. I had a D_DM2TTL that's only 990 bytes.
- Restructured I_RegisterSong so that $mididevice works again and also supports
selecting FMOD.
- Added Jim' Linux fix.
- Added MartinHowe's fix for mugshot display in status bars.
- The garbage collector is now run one last time just before exiting the game.
- Removed movie volume from the sound menu and renamed some of the other
options to give the MIDI device name more room to display itself.
- Moved the midi device selection into the main sound menu.
- Added FMOD as MIDI device -1, to replace the MIDI mapper. This is still the
default device. By default, it uses exactly the same DLS instruments as the
Microsoft GS Wavetable Synth. If you have another set DLS level 1 patch set
you want to use, set the snd_midipatchset cvar to specify where it should
load the instruments from.
- Changed the ProduceMIDI function to store its output into a TArray<BYTE>.
An overloaded version wraps around it to continue to supply file-writing
support for external Timidity++ usage.
- Added an FMOD credits banner to comply with their non-commercial license.
- Reimplemented the snd_buffersize cvar for the FMOD Ex sound system. Rather
than a time in ms, this is now the length in samples of the DSP buffer.
Also added the snd_buffercount cvar to offer complete control over the
call to FMOD::System::setDSPBufferSize(). Note that with any snd_samplerate
below about 44kHz, you will need to set snd_buffersize to avoid long
latencies.
- Reimplemented the snd_output cvar for the FMOD Ex sound system.
- Changed snd_samplerate default to 0. This now means to use the default
sample rate.
- Made snd_output, snd_output_format, snd_speakermode, snd_resampler, and
snd_hrtf available through the menu.
- Split the HRTF effect selection into its own cvar: snd_hrtf.
- Removed 96000 Hz option from the menu. It's still available through the
cvar, if desired.
- Fixed: If Windows sound init failed, retry with DirectSound. (Apparently,
WASAPI doesn't work with more than two speakers and PCM-Float output at the
same time.)
- Fixed: Area sounds only played from the front speakers once you got within
the 2D panning area.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@79 b0f79afe-0144-0410-b225-9a4edf0717df
2008-03-27 18:31:46 +00:00
|
|
|
{ discrete, "MIDI device", {&snd_mididevice}, {0.0}, {0.0}, {0.0}, {NULL} },
|
2008-01-27 11:25:03 +00:00
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
- Update to ZDoom r858:
- Added FMOD_OPENONLY to the callback version of CreateStream() to prevent it
from doing prebuffering of the song. This was causing the Linux version to
hang while waiting for input from the pipe, since Timidity hadn't been
started yet. I tried using a select call in the FillStream() method, but it
always seems to return the pipe as having nothing available. Unfortunately,
the game still falls all over itself if Timidity isn't available. Instead
of execvp failing nicely, X errors kill the game. I don't know why it's
doing that. My advice for Linux music: Skip Timidity++ and get a DLS patch
set (/WINDOWS/system32/drivers/gm.dls is probably the most common by far)
and set the snd_midipatchset cvar to point to it. It's faster and also
sounds a whole lot better than the crappy freepats Ubuntu wants to install
with Timidity++ (thank goodness I have the official patches from a real
GUS so I don't need to use them).
- GCC fixes.
- Fixed: After starting new music the music volume has to be reset so that
the song's relative volume takes effect.
- Removed the arbitrary 1024 bytes limit when the file being played is a MIDI
file. I had a D_DM2TTL that's only 990 bytes.
- Restructured I_RegisterSong so that $mididevice works again and also supports
selecting FMOD.
- Added Jim' Linux fix.
- Added MartinHowe's fix for mugshot display in status bars.
- The garbage collector is now run one last time just before exiting the game.
- Removed movie volume from the sound menu and renamed some of the other
options to give the MIDI device name more room to display itself.
- Moved the midi device selection into the main sound menu.
- Added FMOD as MIDI device -1, to replace the MIDI mapper. This is still the
default device. By default, it uses exactly the same DLS instruments as the
Microsoft GS Wavetable Synth. If you have another set DLS level 1 patch set
you want to use, set the snd_midipatchset cvar to specify where it should
load the instruments from.
- Changed the ProduceMIDI function to store its output into a TArray<BYTE>.
An overloaded version wraps around it to continue to supply file-writing
support for external Timidity++ usage.
- Added an FMOD credits banner to comply with their non-commercial license.
- Reimplemented the snd_buffersize cvar for the FMOD Ex sound system. Rather
than a time in ms, this is now the length in samples of the DSP buffer.
Also added the snd_buffercount cvar to offer complete control over the
call to FMOD::System::setDSPBufferSize(). Note that with any snd_samplerate
below about 44kHz, you will need to set snd_buffersize to avoid long
latencies.
- Reimplemented the snd_output cvar for the FMOD Ex sound system.
- Changed snd_samplerate default to 0. This now means to use the default
sample rate.
- Made snd_output, snd_output_format, snd_speakermode, snd_resampler, and
snd_hrtf available through the menu.
- Split the HRTF effect selection into its own cvar: snd_hrtf.
- Removed 96000 Hz option from the menu. It's still available through the
cvar, if desired.
- Fixed: If Windows sound init failed, retry with DirectSound. (Apparently,
WASAPI doesn't work with more than two speakers and PCM-Float output at the
same time.)
- Fixed: Area sounds only played from the front speakers once you got within
the 2D panning area.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@79 b0f79afe-0144-0410-b225-9a4edf0717df
2008-03-27 18:31:46 +00:00
|
|
|
{ discrete, "Underwater reverb", {&snd_waterreverb}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
2008-05-17 08:47:26 +00:00
|
|
|
{ slider, "Underwater cutoff", {&snd_waterlp}, {0.0}, {2000.0},{50.0}, {NULL} },
|
- Update to ZDoom r858:
- Added FMOD_OPENONLY to the callback version of CreateStream() to prevent it
from doing prebuffering of the song. This was causing the Linux version to
hang while waiting for input from the pipe, since Timidity hadn't been
started yet. I tried using a select call in the FillStream() method, but it
always seems to return the pipe as having nothing available. Unfortunately,
the game still falls all over itself if Timidity isn't available. Instead
of execvp failing nicely, X errors kill the game. I don't know why it's
doing that. My advice for Linux music: Skip Timidity++ and get a DLS patch
set (/WINDOWS/system32/drivers/gm.dls is probably the most common by far)
and set the snd_midipatchset cvar to point to it. It's faster and also
sounds a whole lot better than the crappy freepats Ubuntu wants to install
with Timidity++ (thank goodness I have the official patches from a real
GUS so I don't need to use them).
- GCC fixes.
- Fixed: After starting new music the music volume has to be reset so that
the song's relative volume takes effect.
- Removed the arbitrary 1024 bytes limit when the file being played is a MIDI
file. I had a D_DM2TTL that's only 990 bytes.
- Restructured I_RegisterSong so that $mididevice works again and also supports
selecting FMOD.
- Added Jim' Linux fix.
- Added MartinHowe's fix for mugshot display in status bars.
- The garbage collector is now run one last time just before exiting the game.
- Removed movie volume from the sound menu and renamed some of the other
options to give the MIDI device name more room to display itself.
- Moved the midi device selection into the main sound menu.
- Added FMOD as MIDI device -1, to replace the MIDI mapper. This is still the
default device. By default, it uses exactly the same DLS instruments as the
Microsoft GS Wavetable Synth. If you have another set DLS level 1 patch set
you want to use, set the snd_midipatchset cvar to specify where it should
load the instruments from.
- Changed the ProduceMIDI function to store its output into a TArray<BYTE>.
An overloaded version wraps around it to continue to supply file-writing
support for external Timidity++ usage.
- Added an FMOD credits banner to comply with their non-commercial license.
- Reimplemented the snd_buffersize cvar for the FMOD Ex sound system. Rather
than a time in ms, this is now the length in samples of the DSP buffer.
Also added the snd_buffercount cvar to offer complete control over the
call to FMOD::System::setDSPBufferSize(). Note that with any snd_samplerate
below about 44kHz, you will need to set snd_buffersize to avoid long
latencies.
- Reimplemented the snd_output cvar for the FMOD Ex sound system.
- Changed snd_samplerate default to 0. This now means to use the default
sample rate.
- Made snd_output, snd_output_format, snd_speakermode, snd_resampler, and
snd_hrtf available through the menu.
- Split the HRTF effect selection into its own cvar: snd_hrtf.
- Removed 96000 Hz option from the menu. It's still available through the
cvar, if desired.
- Fixed: If Windows sound init failed, retry with DirectSound. (Apparently,
WASAPI doesn't work with more than two speakers and PCM-Float output at the
same time.)
- Fixed: Area sounds only played from the front speakers once you got within
the 2D panning area.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@79 b0f79afe-0144-0410-b225-9a4edf0717df
2008-03-27 18:31:46 +00:00
|
|
|
{ discrete, "Randomize pitches", {&snd_pitched}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
2008-01-27 11:25:03 +00:00
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
- Update to ZDoom r858:
- Added FMOD_OPENONLY to the callback version of CreateStream() to prevent it
from doing prebuffering of the song. This was causing the Linux version to
hang while waiting for input from the pipe, since Timidity hadn't been
started yet. I tried using a select call in the FillStream() method, but it
always seems to return the pipe as having nothing available. Unfortunately,
the game still falls all over itself if Timidity isn't available. Instead
of execvp failing nicely, X errors kill the game. I don't know why it's
doing that. My advice for Linux music: Skip Timidity++ and get a DLS patch
set (/WINDOWS/system32/drivers/gm.dls is probably the most common by far)
and set the snd_midipatchset cvar to point to it. It's faster and also
sounds a whole lot better than the crappy freepats Ubuntu wants to install
with Timidity++ (thank goodness I have the official patches from a real
GUS so I don't need to use them).
- GCC fixes.
- Fixed: After starting new music the music volume has to be reset so that
the song's relative volume takes effect.
- Removed the arbitrary 1024 bytes limit when the file being played is a MIDI
file. I had a D_DM2TTL that's only 990 bytes.
- Restructured I_RegisterSong so that $mididevice works again and also supports
selecting FMOD.
- Added Jim' Linux fix.
- Added MartinHowe's fix for mugshot display in status bars.
- The garbage collector is now run one last time just before exiting the game.
- Removed movie volume from the sound menu and renamed some of the other
options to give the MIDI device name more room to display itself.
- Moved the midi device selection into the main sound menu.
- Added FMOD as MIDI device -1, to replace the MIDI mapper. This is still the
default device. By default, it uses exactly the same DLS instruments as the
Microsoft GS Wavetable Synth. If you have another set DLS level 1 patch set
you want to use, set the snd_midipatchset cvar to specify where it should
load the instruments from.
- Changed the ProduceMIDI function to store its output into a TArray<BYTE>.
An overloaded version wraps around it to continue to supply file-writing
support for external Timidity++ usage.
- Added an FMOD credits banner to comply with their non-commercial license.
- Reimplemented the snd_buffersize cvar for the FMOD Ex sound system. Rather
than a time in ms, this is now the length in samples of the DSP buffer.
Also added the snd_buffercount cvar to offer complete control over the
call to FMOD::System::setDSPBufferSize(). Note that with any snd_samplerate
below about 44kHz, you will need to set snd_buffersize to avoid long
latencies.
- Reimplemented the snd_output cvar for the FMOD Ex sound system.
- Changed snd_samplerate default to 0. This now means to use the default
sample rate.
- Made snd_output, snd_output_format, snd_speakermode, snd_resampler, and
snd_hrtf available through the menu.
- Split the HRTF effect selection into its own cvar: snd_hrtf.
- Removed 96000 Hz option from the menu. It's still available through the
cvar, if desired.
- Fixed: If Windows sound init failed, retry with DirectSound. (Apparently,
WASAPI doesn't work with more than two speakers and PCM-Float output at the
same time.)
- Fixed: Area sounds only played from the front speakers once you got within
the 2D panning area.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@79 b0f79afe-0144-0410-b225-9a4edf0717df
2008-03-27 18:31:46 +00:00
|
|
|
{ more, "Restart sound", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)MakeSoundChanges} },
|
2008-01-27 11:25:03 +00:00
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
- Update to ZDoom r858:
- Added FMOD_OPENONLY to the callback version of CreateStream() to prevent it
from doing prebuffering of the song. This was causing the Linux version to
hang while waiting for input from the pipe, since Timidity hadn't been
started yet. I tried using a select call in the FillStream() method, but it
always seems to return the pipe as having nothing available. Unfortunately,
the game still falls all over itself if Timidity isn't available. Instead
of execvp failing nicely, X errors kill the game. I don't know why it's
doing that. My advice for Linux music: Skip Timidity++ and get a DLS patch
set (/WINDOWS/system32/drivers/gm.dls is probably the most common by far)
and set the snd_midipatchset cvar to point to it. It's faster and also
sounds a whole lot better than the crappy freepats Ubuntu wants to install
with Timidity++ (thank goodness I have the official patches from a real
GUS so I don't need to use them).
- GCC fixes.
- Fixed: After starting new music the music volume has to be reset so that
the song's relative volume takes effect.
- Removed the arbitrary 1024 bytes limit when the file being played is a MIDI
file. I had a D_DM2TTL that's only 990 bytes.
- Restructured I_RegisterSong so that $mididevice works again and also supports
selecting FMOD.
- Added Jim' Linux fix.
- Added MartinHowe's fix for mugshot display in status bars.
- The garbage collector is now run one last time just before exiting the game.
- Removed movie volume from the sound menu and renamed some of the other
options to give the MIDI device name more room to display itself.
- Moved the midi device selection into the main sound menu.
- Added FMOD as MIDI device -1, to replace the MIDI mapper. This is still the
default device. By default, it uses exactly the same DLS instruments as the
Microsoft GS Wavetable Synth. If you have another set DLS level 1 patch set
you want to use, set the snd_midipatchset cvar to specify where it should
load the instruments from.
- Changed the ProduceMIDI function to store its output into a TArray<BYTE>.
An overloaded version wraps around it to continue to supply file-writing
support for external Timidity++ usage.
- Added an FMOD credits banner to comply with their non-commercial license.
- Reimplemented the snd_buffersize cvar for the FMOD Ex sound system. Rather
than a time in ms, this is now the length in samples of the DSP buffer.
Also added the snd_buffercount cvar to offer complete control over the
call to FMOD::System::setDSPBufferSize(). Note that with any snd_samplerate
below about 44kHz, you will need to set snd_buffersize to avoid long
latencies.
- Reimplemented the snd_output cvar for the FMOD Ex sound system.
- Changed snd_samplerate default to 0. This now means to use the default
sample rate.
- Made snd_output, snd_output_format, snd_speakermode, snd_resampler, and
snd_hrtf available through the menu.
- Split the HRTF effect selection into its own cvar: snd_hrtf.
- Removed 96000 Hz option from the menu. It's still available through the
cvar, if desired.
- Fixed: If Windows sound init failed, retry with DirectSound. (Apparently,
WASAPI doesn't work with more than two speakers and PCM-Float output at the
same time.)
- Fixed: Area sounds only played from the front speakers once you got within
the 2D panning area.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@79 b0f79afe-0144-0410-b225-9a4edf0717df
2008-03-27 18:31:46 +00:00
|
|
|
{ ediscrete,"Output system", {&snd_output}, {countof(Outputs)}, {0.0}, {0.0}, {(value_t *)Outputs} },
|
|
|
|
|
{ ediscrete,"Output format", {&snd_output_format}, {5.0}, {0.0}, {0.0}, {(value_t *)OutputFormats} },
|
|
|
|
|
{ ediscrete,"Speaker mode", {&snd_speakermode}, {8.0}, {0.0}, {0.0}, {(value_t *)SpeakerModes} },
|
|
|
|
|
{ ediscrete,"Resampler", {&snd_resampler}, {4.0}, {0.0}, {0.0}, {(value_t *)Resamplers} },
|
|
|
|
|
{ discrete, "HRTF filter", {&snd_hrtf}, {2.0}, {0.0}, {0.0}, {(value_t *)OnOff} },
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
- Update to ZDoom r858:
- Added FMOD_OPENONLY to the callback version of CreateStream() to prevent it
from doing prebuffering of the song. This was causing the Linux version to
hang while waiting for input from the pipe, since Timidity hadn't been
started yet. I tried using a select call in the FillStream() method, but it
always seems to return the pipe as having nothing available. Unfortunately,
the game still falls all over itself if Timidity isn't available. Instead
of execvp failing nicely, X errors kill the game. I don't know why it's
doing that. My advice for Linux music: Skip Timidity++ and get a DLS patch
set (/WINDOWS/system32/drivers/gm.dls is probably the most common by far)
and set the snd_midipatchset cvar to point to it. It's faster and also
sounds a whole lot better than the crappy freepats Ubuntu wants to install
with Timidity++ (thank goodness I have the official patches from a real
GUS so I don't need to use them).
- GCC fixes.
- Fixed: After starting new music the music volume has to be reset so that
the song's relative volume takes effect.
- Removed the arbitrary 1024 bytes limit when the file being played is a MIDI
file. I had a D_DM2TTL that's only 990 bytes.
- Restructured I_RegisterSong so that $mididevice works again and also supports
selecting FMOD.
- Added Jim' Linux fix.
- Added MartinHowe's fix for mugshot display in status bars.
- The garbage collector is now run one last time just before exiting the game.
- Removed movie volume from the sound menu and renamed some of the other
options to give the MIDI device name more room to display itself.
- Moved the midi device selection into the main sound menu.
- Added FMOD as MIDI device -1, to replace the MIDI mapper. This is still the
default device. By default, it uses exactly the same DLS instruments as the
Microsoft GS Wavetable Synth. If you have another set DLS level 1 patch set
you want to use, set the snd_midipatchset cvar to specify where it should
load the instruments from.
- Changed the ProduceMIDI function to store its output into a TArray<BYTE>.
An overloaded version wraps around it to continue to supply file-writing
support for external Timidity++ usage.
- Added an FMOD credits banner to comply with their non-commercial license.
- Reimplemented the snd_buffersize cvar for the FMOD Ex sound system. Rather
than a time in ms, this is now the length in samples of the DSP buffer.
Also added the snd_buffercount cvar to offer complete control over the
call to FMOD::System::setDSPBufferSize(). Note that with any snd_samplerate
below about 44kHz, you will need to set snd_buffersize to avoid long
latencies.
- Reimplemented the snd_output cvar for the FMOD Ex sound system.
- Changed snd_samplerate default to 0. This now means to use the default
sample rate.
- Made snd_output, snd_output_format, snd_speakermode, snd_resampler, and
snd_hrtf available through the menu.
- Split the HRTF effect selection into its own cvar: snd_hrtf.
- Removed 96000 Hz option from the menu. It's still available through the
cvar, if desired.
- Fixed: If Windows sound init failed, retry with DirectSound. (Apparently,
WASAPI doesn't work with more than two speakers and PCM-Float output at the
same time.)
- Fixed: Area sounds only played from the front speakers once you got within
the 2D panning area.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@79 b0f79afe-0144-0410-b225-9a4edf0717df
2008-03-27 18:31:46 +00:00
|
|
|
{ more, "Advanced options", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)AdvSoundOptions} },
|
Update to ZDoom r1017:
- Fixed: MAPINFO's 'lookup' option should only work for actual strings but
not for lump and file names.
- Added a few 'activator == NULL' checks to some ACS functions.
- Added line and vertex lists to polyobjects so that I can do some
changes that won't work with only a seg list being maintained.
(SBarInfo update #23)
- Fixed: Drawing the amount of an inventory item in the player's inventory did
not work
- Added: PowerupTime to drawnumber and drawbar. You must specify a
powerupgiver. Although drawnumber goes in seconds the powerup has left
drawbar will use ticks for extra accuracy.
- I have increased cross-port compatibility with Skulltag. If an unknown
game mode is provided for sbarinfo's gamemode command it will ignore it and
continue.
- Added an option to consider intermission screens gameplay for purposes of
capturing the mouse.
- Changed: Telefragging should not thrust the victim if it isn't in precisely the
same position as the killer.
- fixed: A_SpawnItemEx must call P_TeleportMove before checking the spawned
object's position.
- Fixed: Ouch state was far to easy to achieve.
- Made all the basic texture classes local to their implementation.
They are not needed anywhere else.
- Changed the HackHack hack for corrupt 256 pixel high textures that
FMultiPatchTexture only calls a virtual function instead of doing any
type checks of the patch itself.
- Cleaned up the constant definitions in doomdata.h.
- Moved the TEXTUREx structures from doomdata.h to multipatchtexture.cpp
because they are used only in this one file.
- Removed some more typedefs from r_defs.h and doomdata.h
- Moved local polyobject data definitions from p_local.h to po_man.cpp.
- Renamed player_s to player_t globally to get rid of the duplicate names
for this class.
- Added coordinate range checking to DCanvas::ParseDrawTextureTags() to avoid
potential crashes in the situation that con_scaletext is 2 and somebody
uses a hud message as if a hud size was specified, but forgot to actually
set the hud size.
- Consolidated the mug shot code shared by DSBarInfo and DDoomStatusBar
into a single place.
- Fixed: Setting an invalid mug shot state crashed the game.
- Fixed my attempts to be clever with strings yesterday.
- If an actor's current target temporarily goes unshootable, its threshold
is now reset to 0, so it will more readily switch back to it.
- Fixed: Deactivating the game no longer allows reverb effects to continue
playing while the sound is paused.
- Fixed: S_StartNamedSound() looked for SECF_SILENT in MoreFlags instead of
Flags.
- Fixed: DSBarInfo::updateState() and DDoomStatusBar::UpdateState() sprung
leaks and didn't allocate enough space for the fullStateName string.
- Disabled DUMB's mono destination mixers. It's not like I'm ever going to
target an original SoundBlaster, so they're a waste of space to have around.
This trims resample.obj down to ~60k now.
- Fixed: PrtScn/SysRq key did not work on Linux.
- Added an alternate module replay engine that uses foo_dumb's replayer, a
heavily customized version of DUMB (Dynamic Universal Music Bibliotheque).
It has been slightly modified by me:
* Added support for Ogg Vorbis-compressed samples in XM files ala FMOD.
* Removed excessive mallocs from the replay core.
* Rerolled the loops in resample.c. Unrolling them made the object file
~250k large while providing little benefit. Even at ~100k, I think it's
still larger than it ought to be, but I'll live with it for now.
Other than that, it's essentially the same thing you'd hear in foobar2000,
minus some subsong detection features. Release builds of the library look
like they might even be slightly faster than FMOD, which is a plus.
- Fixed: Timidity::font_add() did not release the file reader it created.
- Fixed: The SF2 loader did not free the sample headers in its destructor.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@113 b0f79afe-0144-0410-b225-9a4edf0717df
2008-06-03 21:48:49 +00:00
|
|
|
{ more, "Module replayer options", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)ModReplayerOptions} },
|
2008-01-27 11:25:03 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static menu_t SoundMenu =
|
|
|
|
|
{
|
|
|
|
|
"SOUND OPTIONS",
|
|
|
|
|
0,
|
|
|
|
|
countof(SoundItems),
|
|
|
|
|
0,
|
|
|
|
|
SoundItems,
|
|
|
|
|
};
|
|
|
|
|
|
- Update to ZDoom r858:
- Added FMOD_OPENONLY to the callback version of CreateStream() to prevent it
from doing prebuffering of the song. This was causing the Linux version to
hang while waiting for input from the pipe, since Timidity hadn't been
started yet. I tried using a select call in the FillStream() method, but it
always seems to return the pipe as having nothing available. Unfortunately,
the game still falls all over itself if Timidity isn't available. Instead
of execvp failing nicely, X errors kill the game. I don't know why it's
doing that. My advice for Linux music: Skip Timidity++ and get a DLS patch
set (/WINDOWS/system32/drivers/gm.dls is probably the most common by far)
and set the snd_midipatchset cvar to point to it. It's faster and also
sounds a whole lot better than the crappy freepats Ubuntu wants to install
with Timidity++ (thank goodness I have the official patches from a real
GUS so I don't need to use them).
- GCC fixes.
- Fixed: After starting new music the music volume has to be reset so that
the song's relative volume takes effect.
- Removed the arbitrary 1024 bytes limit when the file being played is a MIDI
file. I had a D_DM2TTL that's only 990 bytes.
- Restructured I_RegisterSong so that $mididevice works again and also supports
selecting FMOD.
- Added Jim' Linux fix.
- Added MartinHowe's fix for mugshot display in status bars.
- The garbage collector is now run one last time just before exiting the game.
- Removed movie volume from the sound menu and renamed some of the other
options to give the MIDI device name more room to display itself.
- Moved the midi device selection into the main sound menu.
- Added FMOD as MIDI device -1, to replace the MIDI mapper. This is still the
default device. By default, it uses exactly the same DLS instruments as the
Microsoft GS Wavetable Synth. If you have another set DLS level 1 patch set
you want to use, set the snd_midipatchset cvar to specify where it should
load the instruments from.
- Changed the ProduceMIDI function to store its output into a TArray<BYTE>.
An overloaded version wraps around it to continue to supply file-writing
support for external Timidity++ usage.
- Added an FMOD credits banner to comply with their non-commercial license.
- Reimplemented the snd_buffersize cvar for the FMOD Ex sound system. Rather
than a time in ms, this is now the length in samples of the DSP buffer.
Also added the snd_buffercount cvar to offer complete control over the
call to FMOD::System::setDSPBufferSize(). Note that with any snd_samplerate
below about 44kHz, you will need to set snd_buffersize to avoid long
latencies.
- Reimplemented the snd_output cvar for the FMOD Ex sound system.
- Changed snd_samplerate default to 0. This now means to use the default
sample rate.
- Made snd_output, snd_output_format, snd_speakermode, snd_resampler, and
snd_hrtf available through the menu.
- Split the HRTF effect selection into its own cvar: snd_hrtf.
- Removed 96000 Hz option from the menu. It's still available through the
cvar, if desired.
- Fixed: If Windows sound init failed, retry with DirectSound. (Apparently,
WASAPI doesn't work with more than two speakers and PCM-Float output at the
same time.)
- Fixed: Area sounds only played from the front speakers once you got within
the 2D panning area.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@79 b0f79afe-0144-0410-b225-9a4edf0717df
2008-03-27 18:31:46 +00:00
|
|
|
#define MIDI_DEVICE_ITEM 2
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
|
/*=======================================
|
|
|
|
|
*
|
|
|
|
|
* Advanced Sound Options Menu
|
|
|
|
|
*
|
|
|
|
|
*=======================================*/
|
|
|
|
|
|
|
|
|
|
EXTERN_CVAR (Bool, opl_onechip)
|
|
|
|
|
|
|
|
|
|
static menuitem_t AdvSoundItems[] =
|
|
|
|
|
{
|
2008-03-29 08:20:02 +00:00
|
|
|
{ discrete, "Sample rate", {&snd_samplerate}, {8.0}, {0.0}, {0.0}, {SampleRates} },
|
|
|
|
|
{ discrete, "Buffer size", {&snd_buffersize}, {8.0}, {0.0}, {0.0}, {BufferSizes} },
|
|
|
|
|
{ discrete, "Buffer count", {&snd_buffercount}, {12.0}, {0.0}, {0.0}, {BufferCounts} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ whitetext,"OPL Synthesis", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
2008-01-27 11:25:03 +00:00
|
|
|
{ discrete, "Only emulate one OPL chip", {&opl_onechip}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static menu_t AdvSoundMenu =
|
|
|
|
|
{
|
|
|
|
|
"ADVANCED SOUND OPTIONS",
|
2008-03-29 08:20:02 +00:00
|
|
|
0,
|
2008-01-27 11:25:03 +00:00
|
|
|
countof(AdvSoundItems),
|
|
|
|
|
0,
|
|
|
|
|
AdvSoundItems,
|
|
|
|
|
};
|
|
|
|
|
|
Update to ZDoom r1017:
- Fixed: MAPINFO's 'lookup' option should only work for actual strings but
not for lump and file names.
- Added a few 'activator == NULL' checks to some ACS functions.
- Added line and vertex lists to polyobjects so that I can do some
changes that won't work with only a seg list being maintained.
(SBarInfo update #23)
- Fixed: Drawing the amount of an inventory item in the player's inventory did
not work
- Added: PowerupTime to drawnumber and drawbar. You must specify a
powerupgiver. Although drawnumber goes in seconds the powerup has left
drawbar will use ticks for extra accuracy.
- I have increased cross-port compatibility with Skulltag. If an unknown
game mode is provided for sbarinfo's gamemode command it will ignore it and
continue.
- Added an option to consider intermission screens gameplay for purposes of
capturing the mouse.
- Changed: Telefragging should not thrust the victim if it isn't in precisely the
same position as the killer.
- fixed: A_SpawnItemEx must call P_TeleportMove before checking the spawned
object's position.
- Fixed: Ouch state was far to easy to achieve.
- Made all the basic texture classes local to their implementation.
They are not needed anywhere else.
- Changed the HackHack hack for corrupt 256 pixel high textures that
FMultiPatchTexture only calls a virtual function instead of doing any
type checks of the patch itself.
- Cleaned up the constant definitions in doomdata.h.
- Moved the TEXTUREx structures from doomdata.h to multipatchtexture.cpp
because they are used only in this one file.
- Removed some more typedefs from r_defs.h and doomdata.h
- Moved local polyobject data definitions from p_local.h to po_man.cpp.
- Renamed player_s to player_t globally to get rid of the duplicate names
for this class.
- Added coordinate range checking to DCanvas::ParseDrawTextureTags() to avoid
potential crashes in the situation that con_scaletext is 2 and somebody
uses a hud message as if a hud size was specified, but forgot to actually
set the hud size.
- Consolidated the mug shot code shared by DSBarInfo and DDoomStatusBar
into a single place.
- Fixed: Setting an invalid mug shot state crashed the game.
- Fixed my attempts to be clever with strings yesterday.
- If an actor's current target temporarily goes unshootable, its threshold
is now reset to 0, so it will more readily switch back to it.
- Fixed: Deactivating the game no longer allows reverb effects to continue
playing while the sound is paused.
- Fixed: S_StartNamedSound() looked for SECF_SILENT in MoreFlags instead of
Flags.
- Fixed: DSBarInfo::updateState() and DDoomStatusBar::UpdateState() sprung
leaks and didn't allocate enough space for the fullStateName string.
- Disabled DUMB's mono destination mixers. It's not like I'm ever going to
target an original SoundBlaster, so they're a waste of space to have around.
This trims resample.obj down to ~60k now.
- Fixed: PrtScn/SysRq key did not work on Linux.
- Added an alternate module replay engine that uses foo_dumb's replayer, a
heavily customized version of DUMB (Dynamic Universal Music Bibliotheque).
It has been slightly modified by me:
* Added support for Ogg Vorbis-compressed samples in XM files ala FMOD.
* Removed excessive mallocs from the replay core.
* Rerolled the loops in resample.c. Unrolling them made the object file
~250k large while providing little benefit. Even at ~100k, I think it's
still larger than it ought to be, but I'll live with it for now.
Other than that, it's essentially the same thing you'd hear in foobar2000,
minus some subsong detection features. Release builds of the library look
like they might even be slightly faster than FMOD, which is a plus.
- Fixed: Timidity::font_add() did not release the file reader it created.
- Fixed: The SF2 loader did not free the sample headers in its destructor.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@113 b0f79afe-0144-0410-b225-9a4edf0717df
2008-06-03 21:48:49 +00:00
|
|
|
/*=======================================
|
|
|
|
|
*
|
|
|
|
|
* Module Replayer Options Menu
|
|
|
|
|
*
|
|
|
|
|
*=======================================*/
|
|
|
|
|
|
|
|
|
|
EXTERN_CVAR(Bool, mod_dumb)
|
|
|
|
|
EXTERN_CVAR(Int, mod_samplerate)
|
|
|
|
|
EXTERN_CVAR(Int, mod_volramp)
|
|
|
|
|
EXTERN_CVAR(Int, mod_interp)
|
|
|
|
|
EXTERN_CVAR(Bool, mod_autochip)
|
|
|
|
|
EXTERN_CVAR(Int, mod_autochip_size_force)
|
|
|
|
|
EXTERN_CVAR(Int, mod_autochip_size_scan)
|
|
|
|
|
EXTERN_CVAR(Int, mod_autochip_scan_threshold)
|
|
|
|
|
|
|
|
|
|
static value_t ModReplayers[] =
|
|
|
|
|
{
|
|
|
|
|
{ 0.0, "FMOD" },
|
|
|
|
|
{ 1.0, "foo_dumb" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static value_t ModInterpolations[] =
|
|
|
|
|
{
|
|
|
|
|
{ 0.0, "None" },
|
|
|
|
|
{ 1.0, "Linear" },
|
|
|
|
|
{ 2.0, "Cubic" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static value_t ModVolumeRamps[] =
|
|
|
|
|
{
|
|
|
|
|
{ 0.0, "None" },
|
|
|
|
|
{ 1.0, "Logarithmic" },
|
|
|
|
|
{ 2.0, "Linear" },
|
|
|
|
|
{ 3.0, "XM=lin, else none" },
|
|
|
|
|
{ 4.0, "XM=lin, else log" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static menuitem_t ModReplayerItems[] =
|
|
|
|
|
{
|
|
|
|
|
{ discrete, "Replayer engine", {&mod_dumb}, {2.0}, {0.0}, {0.0}, {ModReplayers} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ discrete, "Sample rate", {&mod_samplerate}, {8.0}, {0.0}, {0.0}, {SampleRates} },
|
|
|
|
|
{ discrete, "Interpolation", {&mod_interp}, {3.0}, {0.0}, {0.0}, {ModInterpolations} },
|
|
|
|
|
{ discrete, "Volume ramping", {&mod_volramp}, {5.0}, {0.0}, {0.0}, {ModVolumeRamps} },
|
|
|
|
|
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
|
|
|
|
{ discrete, "Chip-o-matic", {&mod_autochip}, {2.0}, {0.0}, {0.0}, {OnOff} },
|
|
|
|
|
// TODO if the menu system is ever rewritten: Provide a decent
|
|
|
|
|
// mechanism to edit the chip-o-matic settings like you can with
|
|
|
|
|
// the foo_dumb preferences in foobar2000.
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static menu_t ModReplayerMenu =
|
|
|
|
|
{
|
|
|
|
|
"MODULE REPLAYER OPTIONS",
|
|
|
|
|
0,
|
|
|
|
|
countof(ModReplayerItems),
|
|
|
|
|
0,
|
|
|
|
|
ModReplayerItems,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//===========================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
static void ActivateConfirm (const char *text, void (*func)())
|
|
|
|
|
{
|
|
|
|
|
ConfirmItems[0].label = text;
|
|
|
|
|
ConfirmItems[0].e.mfunc = func;
|
|
|
|
|
ConfirmMenu.lastOn = 3;
|
|
|
|
|
M_SwitchMenu (&ConfirmMenu);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void ConfirmIsAGo ()
|
|
|
|
|
{
|
|
|
|
|
M_PopMenuStack ();
|
|
|
|
|
ConfirmItems[0].e.mfunc ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
|
// Set some stuff up for the video modes menu
|
|
|
|
|
//
|
|
|
|
|
static BYTE BitTranslate[32];
|
|
|
|
|
|
|
|
|
|
void M_OptInit (void)
|
|
|
|
|
{
|
|
|
|
|
if (gameinfo.gametype == GAME_Doom)
|
|
|
|
|
{
|
|
|
|
|
LabelColor = CR_UNTRANSLATED;
|
|
|
|
|
ValueColor = CR_GRAY;
|
|
|
|
|
MoreColor = CR_GRAY;
|
|
|
|
|
}
|
|
|
|
|
else if (gameinfo.gametype == GAME_Heretic)
|
|
|
|
|
{
|
|
|
|
|
LabelColor = CR_GREEN;
|
|
|
|
|
ValueColor = CR_UNTRANSLATED;
|
|
|
|
|
MoreColor = CR_UNTRANSLATED;
|
|
|
|
|
}
|
|
|
|
|
else // Hexen
|
|
|
|
|
{
|
|
|
|
|
LabelColor = CR_RED;
|
|
|
|
|
ValueColor = CR_UNTRANSLATED;
|
|
|
|
|
MoreColor = CR_UNTRANSLATED;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (gl_disabled)
|
|
|
|
|
{
|
|
|
|
|
// If the GL system is permanently disabled change the GL menu items.
|
|
|
|
|
VideoItems[1].label = "Enable OpenGL system";
|
|
|
|
|
ModesItems[1].type = nochoice;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void M_InitVideoModesMenu ()
|
|
|
|
|
{
|
|
|
|
|
int dummy1, dummy2;
|
|
|
|
|
size_t currval = 0;
|
|
|
|
|
|
|
|
|
|
M_RefreshModesList();
|
|
|
|
|
|
|
|
|
|
for (unsigned int i = 1; i <= 32 && currval < countof(Depths); i++)
|
|
|
|
|
{
|
|
|
|
|
Video->StartModeIterator (i, screen->IsFullscreen());
|
|
|
|
|
if (Video->NextMode (&dummy1, &dummy2, NULL))
|
|
|
|
|
{
|
|
|
|
|
/*
|
|
|
|
|
Depths[currval].value = currval;
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
mysnprintf (name, countof(name), "%d bit", i);
|
2008-01-27 11:25:03 +00:00
|
|
|
Depths[currval].name = copystring (name);
|
|
|
|
|
*/
|
|
|
|
|
BitTranslate[currval++] = i;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//ModesItems[VM_DEPTHITEM].b.min = (float)currval;
|
|
|
|
|
|
|
|
|
|
switch (Video->GetDisplayType ())
|
|
|
|
|
{
|
|
|
|
|
case DISPLAY_FullscreenOnly:
|
|
|
|
|
ModesItems[2].type = nochoice;
|
|
|
|
|
ModesItems[2].b.min = 1.f;
|
|
|
|
|
break;
|
|
|
|
|
case DISPLAY_WindowOnly:
|
|
|
|
|
ModesItems[2].type = nochoice;
|
|
|
|
|
ModesItems[2].b.min = 0.f;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
|
// Toggle messages on/off
|
|
|
|
|
//
|
|
|
|
|
void M_ChangeMessages ()
|
|
|
|
|
{
|
|
|
|
|
if (show_messages)
|
|
|
|
|
{
|
|
|
|
|
Printf (128, "%s\n", GStrings("MSGOFF"));
|
|
|
|
|
show_messages = false;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
Printf (128, "%s\n", GStrings("MSGON"));
|
|
|
|
|
show_messages = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CCMD (togglemessages)
|
|
|
|
|
{
|
|
|
|
|
M_ChangeMessages ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void M_SizeDisplay (int diff)
|
|
|
|
|
{
|
|
|
|
|
// changing screenblocks automatically resizes the display
|
|
|
|
|
screenblocks = screenblocks + diff;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CCMD (sizedown)
|
|
|
|
|
{
|
|
|
|
|
M_SizeDisplay (-1);
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/change", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CCMD (sizeup)
|
|
|
|
|
{
|
|
|
|
|
M_SizeDisplay (1);
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/change", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Draws a string in the console font, scaled to the 8x8 cells
|
|
|
|
|
// used by the default console font.
|
|
|
|
|
static void M_DrawConText (int color, int x, int y, const char *str)
|
|
|
|
|
{
|
|
|
|
|
int len = (int)strlen(str);
|
|
|
|
|
|
|
|
|
|
screen->SetFont (ConFont);
|
|
|
|
|
x = (x - 160) * CleanXfac + screen->GetWidth() / 2;
|
|
|
|
|
y = (y - 100) * CleanYfac + screen->GetHeight() / 2;
|
|
|
|
|
screen->DrawText (color, x, y, str,
|
|
|
|
|
DTA_CellX, 8 * CleanXfac,
|
|
|
|
|
DTA_CellY, 8 * CleanYfac,
|
|
|
|
|
TAG_DONE);
|
|
|
|
|
screen->SetFont (SmallFont);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void M_BuildKeyList (menuitem_t *item, int numitems)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < numitems; i++, item++)
|
|
|
|
|
{
|
|
|
|
|
if (item->type == control)
|
|
|
|
|
C_GetKeysForCommand (item->e.command, &item->b.key1, &item->c.key2);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void CalcIndent (menu_t *menu)
|
|
|
|
|
{
|
|
|
|
|
int i, widest = 0, thiswidth;
|
|
|
|
|
menuitem_t *item;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < menu->numitems; i++)
|
|
|
|
|
{
|
|
|
|
|
item = menu->items + i;
|
|
|
|
|
if (item->type != whitetext && item->type != redtext && item->type != screenres)
|
|
|
|
|
{
|
|
|
|
|
thiswidth = SmallFont->StringWidth (item->label);
|
|
|
|
|
if (thiswidth > widest)
|
|
|
|
|
widest = thiswidth;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
menu->indent = widest + 4;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void M_SwitchMenu (menu_t *menu)
|
|
|
|
|
{
|
|
|
|
|
MenuStack[MenuStackDepth].menu.newmenu = menu;
|
|
|
|
|
MenuStack[MenuStackDepth].isNewStyle = true;
|
|
|
|
|
MenuStack[MenuStackDepth].drawSkull = false;
|
|
|
|
|
MenuStackDepth++;
|
|
|
|
|
|
|
|
|
|
CanScrollUp = false;
|
|
|
|
|
CanScrollDown = false;
|
|
|
|
|
CurrentMenu = menu;
|
|
|
|
|
CurrentItem = menu->lastOn;
|
|
|
|
|
|
|
|
|
|
if (!menu->indent)
|
|
|
|
|
{
|
|
|
|
|
CalcIndent (menu);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
flagsvar = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool M_StartOptionsMenu (void)
|
|
|
|
|
{
|
|
|
|
|
M_SwitchMenu (&OptionMenu);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void M_DrawSlider (int x, int y, float min, float max, float cur)
|
|
|
|
|
{
|
|
|
|
|
float range;
|
|
|
|
|
|
|
|
|
|
range = max - min;
|
|
|
|
|
|
|
|
|
|
if (cur > max)
|
|
|
|
|
cur = max;
|
|
|
|
|
else if (cur < min)
|
|
|
|
|
cur = min;
|
|
|
|
|
|
|
|
|
|
cur -= min;
|
|
|
|
|
|
|
|
|
|
M_DrawConText(CR_WHITE, x, y, "\x10\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x12");
|
|
|
|
|
M_DrawConText(CR_ORANGE, x + 5 + (int)((cur * 78.f) / range), y, "\x13");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int M_FindCurVal (float cur, value_t *values, int numvals)
|
|
|
|
|
{
|
|
|
|
|
int v;
|
|
|
|
|
|
|
|
|
|
for (v = 0; v < numvals; v++)
|
|
|
|
|
if (values[v].value == cur)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int M_FindCurVal (float cur, valuestring_t *values, int numvals)
|
|
|
|
|
{
|
|
|
|
|
int v;
|
|
|
|
|
|
|
|
|
|
for (v = 0; v < numvals; v++)
|
|
|
|
|
if (values[v].value == cur)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int M_FindCurGUID (const GUID &guid, GUIDName *values, int numvals)
|
|
|
|
|
{
|
|
|
|
|
int v;
|
|
|
|
|
|
|
|
|
|
for (v = 0; v < numvals; v++)
|
|
|
|
|
if (memcmp (&values[v].ID, &guid, sizeof(GUID)) == 0)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
|
- Update to ZDoom r858:
- Added FMOD_OPENONLY to the callback version of CreateStream() to prevent it
from doing prebuffering of the song. This was causing the Linux version to
hang while waiting for input from the pipe, since Timidity hadn't been
started yet. I tried using a select call in the FillStream() method, but it
always seems to return the pipe as having nothing available. Unfortunately,
the game still falls all over itself if Timidity isn't available. Instead
of execvp failing nicely, X errors kill the game. I don't know why it's
doing that. My advice for Linux music: Skip Timidity++ and get a DLS patch
set (/WINDOWS/system32/drivers/gm.dls is probably the most common by far)
and set the snd_midipatchset cvar to point to it. It's faster and also
sounds a whole lot better than the crappy freepats Ubuntu wants to install
with Timidity++ (thank goodness I have the official patches from a real
GUS so I don't need to use them).
- GCC fixes.
- Fixed: After starting new music the music volume has to be reset so that
the song's relative volume takes effect.
- Removed the arbitrary 1024 bytes limit when the file being played is a MIDI
file. I had a D_DM2TTL that's only 990 bytes.
- Restructured I_RegisterSong so that $mididevice works again and also supports
selecting FMOD.
- Added Jim' Linux fix.
- Added MartinHowe's fix for mugshot display in status bars.
- The garbage collector is now run one last time just before exiting the game.
- Removed movie volume from the sound menu and renamed some of the other
options to give the MIDI device name more room to display itself.
- Moved the midi device selection into the main sound menu.
- Added FMOD as MIDI device -1, to replace the MIDI mapper. This is still the
default device. By default, it uses exactly the same DLS instruments as the
Microsoft GS Wavetable Synth. If you have another set DLS level 1 patch set
you want to use, set the snd_midipatchset cvar to specify where it should
load the instruments from.
- Changed the ProduceMIDI function to store its output into a TArray<BYTE>.
An overloaded version wraps around it to continue to supply file-writing
support for external Timidity++ usage.
- Added an FMOD credits banner to comply with their non-commercial license.
- Reimplemented the snd_buffersize cvar for the FMOD Ex sound system. Rather
than a time in ms, this is now the length in samples of the DSP buffer.
Also added the snd_buffercount cvar to offer complete control over the
call to FMOD::System::setDSPBufferSize(). Note that with any snd_samplerate
below about 44kHz, you will need to set snd_buffersize to avoid long
latencies.
- Reimplemented the snd_output cvar for the FMOD Ex sound system.
- Changed snd_samplerate default to 0. This now means to use the default
sample rate.
- Made snd_output, snd_output_format, snd_speakermode, snd_resampler, and
snd_hrtf available through the menu.
- Split the HRTF effect selection into its own cvar: snd_hrtf.
- Removed 96000 Hz option from the menu. It's still available through the
cvar, if desired.
- Fixed: If Windows sound init failed, retry with DirectSound. (Apparently,
WASAPI doesn't work with more than two speakers and PCM-Float output at the
same time.)
- Fixed: Area sounds only played from the front speakers once you got within
the 2D panning area.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@79 b0f79afe-0144-0410-b225-9a4edf0717df
2008-03-27 18:31:46 +00:00
|
|
|
const char *M_FindCurVal(const char *cur, valueenum_t *values, int numvals)
|
|
|
|
|
{
|
|
|
|
|
for (int v = 0; v < numvals; ++v)
|
|
|
|
|
{
|
|
|
|
|
if (stricmp(values[v].value, cur) == 0)
|
|
|
|
|
{
|
|
|
|
|
return values[v].name;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return cur;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const char *M_FindPrevVal(const char *cur, valueenum_t *values, int numvals)
|
|
|
|
|
{
|
|
|
|
|
for (int v = 0; v < numvals; ++v)
|
|
|
|
|
{
|
|
|
|
|
if (stricmp(values[v].value, cur) == 0)
|
|
|
|
|
{
|
|
|
|
|
return values[v == 0 ? numvals - 1 : v - 1].value;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return values[0].value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const char *M_FindNextVal(const char *cur, valueenum_t *values, int numvals)
|
|
|
|
|
{
|
|
|
|
|
for (int v = 0; v < numvals; ++v)
|
|
|
|
|
{
|
|
|
|
|
if (stricmp(values[v].value, cur) == 0)
|
|
|
|
|
{
|
|
|
|
|
return values[v == numvals - 1 ? 0 : v + 1].value;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return values[0].value;
|
|
|
|
|
}
|
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void M_OptDrawer ()
|
|
|
|
|
{
|
|
|
|
|
EColorRange color;
|
|
|
|
|
int y, width, i, x, ytop, fontheight;
|
|
|
|
|
menuitem_t *item;
|
|
|
|
|
UCVarValue value;
|
Update to ZDoom r1017:
- Fixed: MAPINFO's 'lookup' option should only work for actual strings but
not for lump and file names.
- Added a few 'activator == NULL' checks to some ACS functions.
- Added line and vertex lists to polyobjects so that I can do some
changes that won't work with only a seg list being maintained.
(SBarInfo update #23)
- Fixed: Drawing the amount of an inventory item in the player's inventory did
not work
- Added: PowerupTime to drawnumber and drawbar. You must specify a
powerupgiver. Although drawnumber goes in seconds the powerup has left
drawbar will use ticks for extra accuracy.
- I have increased cross-port compatibility with Skulltag. If an unknown
game mode is provided for sbarinfo's gamemode command it will ignore it and
continue.
- Added an option to consider intermission screens gameplay for purposes of
capturing the mouse.
- Changed: Telefragging should not thrust the victim if it isn't in precisely the
same position as the killer.
- fixed: A_SpawnItemEx must call P_TeleportMove before checking the spawned
object's position.
- Fixed: Ouch state was far to easy to achieve.
- Made all the basic texture classes local to their implementation.
They are not needed anywhere else.
- Changed the HackHack hack for corrupt 256 pixel high textures that
FMultiPatchTexture only calls a virtual function instead of doing any
type checks of the patch itself.
- Cleaned up the constant definitions in doomdata.h.
- Moved the TEXTUREx structures from doomdata.h to multipatchtexture.cpp
because they are used only in this one file.
- Removed some more typedefs from r_defs.h and doomdata.h
- Moved local polyobject data definitions from p_local.h to po_man.cpp.
- Renamed player_s to player_t globally to get rid of the duplicate names
for this class.
- Added coordinate range checking to DCanvas::ParseDrawTextureTags() to avoid
potential crashes in the situation that con_scaletext is 2 and somebody
uses a hud message as if a hud size was specified, but forgot to actually
set the hud size.
- Consolidated the mug shot code shared by DSBarInfo and DDoomStatusBar
into a single place.
- Fixed: Setting an invalid mug shot state crashed the game.
- Fixed my attempts to be clever with strings yesterday.
- If an actor's current target temporarily goes unshootable, its threshold
is now reset to 0, so it will more readily switch back to it.
- Fixed: Deactivating the game no longer allows reverb effects to continue
playing while the sound is paused.
- Fixed: S_StartNamedSound() looked for SECF_SILENT in MoreFlags instead of
Flags.
- Fixed: DSBarInfo::updateState() and DDoomStatusBar::UpdateState() sprung
leaks and didn't allocate enough space for the fullStateName string.
- Disabled DUMB's mono destination mixers. It's not like I'm ever going to
target an original SoundBlaster, so they're a waste of space to have around.
This trims resample.obj down to ~60k now.
- Fixed: PrtScn/SysRq key did not work on Linux.
- Added an alternate module replay engine that uses foo_dumb's replayer, a
heavily customized version of DUMB (Dynamic Universal Music Bibliotheque).
It has been slightly modified by me:
* Added support for Ogg Vorbis-compressed samples in XM files ala FMOD.
* Removed excessive mallocs from the replay core.
* Rerolled the loops in resample.c. Unrolling them made the object file
~250k large while providing little benefit. Even at ~100k, I think it's
still larger than it ought to be, but I'll live with it for now.
Other than that, it's essentially the same thing you'd hear in foobar2000,
minus some subsong detection features. Release builds of the library look
like they might even be slightly faster than FMOD, which is a plus.
- Fixed: Timidity::font_add() did not release the file reader it created.
- Fixed: The SF2 loader did not free the sample headers in its destructor.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@113 b0f79afe-0144-0410-b225-9a4edf0717df
2008-06-03 21:48:49 +00:00
|
|
|
DWORD overlay;
|
2008-01-27 11:25:03 +00:00
|
|
|
int labelofs;
|
|
|
|
|
|
|
|
|
|
if (!CurrentMenu->DontDim)
|
|
|
|
|
{
|
|
|
|
|
screen->Dim ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (CurrentMenu->PreDraw != NULL)
|
|
|
|
|
{
|
|
|
|
|
CurrentMenu->PreDraw ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (CurrentMenu->y != 0)
|
|
|
|
|
{
|
|
|
|
|
y = CurrentMenu->y;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (BigFont && CurrentMenu->texttitle)
|
|
|
|
|
{
|
|
|
|
|
screen->SetFont (BigFont);
|
|
|
|
|
screen->DrawText (gameinfo.gametype == GAME_Doom ? CR_RED : CR_UNTRANSLATED,
|
|
|
|
|
160-BigFont->StringWidth (CurrentMenu->texttitle)/2, 10,
|
|
|
|
|
CurrentMenu->texttitle, DTA_Clean, true, TAG_DONE);
|
|
|
|
|
screen->SetFont (SmallFont);
|
|
|
|
|
y = 15 + BigFont->GetHeight ();
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
y = 15;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (gameinfo.gametype & GAME_Raven)
|
|
|
|
|
{
|
|
|
|
|
labelofs = 2;
|
|
|
|
|
y -= 2;
|
|
|
|
|
fontheight = 9;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
labelofs = 0;
|
|
|
|
|
fontheight = 8;
|
|
|
|
|
}
|
|
|
|
|
ytop = y + CurrentMenu->scrolltop * 8;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < CurrentMenu->numitems && y <= 200 - SmallFont->GetHeight(); i++, y += fontheight)
|
|
|
|
|
{
|
|
|
|
|
if (i == CurrentMenu->scrolltop)
|
|
|
|
|
{
|
|
|
|
|
i += CurrentMenu->scrollpos;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
item = CurrentMenu->items + i;
|
Update to ZDoom r1017:
- Fixed: MAPINFO's 'lookup' option should only work for actual strings but
not for lump and file names.
- Added a few 'activator == NULL' checks to some ACS functions.
- Added line and vertex lists to polyobjects so that I can do some
changes that won't work with only a seg list being maintained.
(SBarInfo update #23)
- Fixed: Drawing the amount of an inventory item in the player's inventory did
not work
- Added: PowerupTime to drawnumber and drawbar. You must specify a
powerupgiver. Although drawnumber goes in seconds the powerup has left
drawbar will use ticks for extra accuracy.
- I have increased cross-port compatibility with Skulltag. If an unknown
game mode is provided for sbarinfo's gamemode command it will ignore it and
continue.
- Added an option to consider intermission screens gameplay for purposes of
capturing the mouse.
- Changed: Telefragging should not thrust the victim if it isn't in precisely the
same position as the killer.
- fixed: A_SpawnItemEx must call P_TeleportMove before checking the spawned
object's position.
- Fixed: Ouch state was far to easy to achieve.
- Made all the basic texture classes local to their implementation.
They are not needed anywhere else.
- Changed the HackHack hack for corrupt 256 pixel high textures that
FMultiPatchTexture only calls a virtual function instead of doing any
type checks of the patch itself.
- Cleaned up the constant definitions in doomdata.h.
- Moved the TEXTUREx structures from doomdata.h to multipatchtexture.cpp
because they are used only in this one file.
- Removed some more typedefs from r_defs.h and doomdata.h
- Moved local polyobject data definitions from p_local.h to po_man.cpp.
- Renamed player_s to player_t globally to get rid of the duplicate names
for this class.
- Added coordinate range checking to DCanvas::ParseDrawTextureTags() to avoid
potential crashes in the situation that con_scaletext is 2 and somebody
uses a hud message as if a hud size was specified, but forgot to actually
set the hud size.
- Consolidated the mug shot code shared by DSBarInfo and DDoomStatusBar
into a single place.
- Fixed: Setting an invalid mug shot state crashed the game.
- Fixed my attempts to be clever with strings yesterday.
- If an actor's current target temporarily goes unshootable, its threshold
is now reset to 0, so it will more readily switch back to it.
- Fixed: Deactivating the game no longer allows reverb effects to continue
playing while the sound is paused.
- Fixed: S_StartNamedSound() looked for SECF_SILENT in MoreFlags instead of
Flags.
- Fixed: DSBarInfo::updateState() and DDoomStatusBar::UpdateState() sprung
leaks and didn't allocate enough space for the fullStateName string.
- Disabled DUMB's mono destination mixers. It's not like I'm ever going to
target an original SoundBlaster, so they're a waste of space to have around.
This trims resample.obj down to ~60k now.
- Fixed: PrtScn/SysRq key did not work on Linux.
- Added an alternate module replay engine that uses foo_dumb's replayer, a
heavily customized version of DUMB (Dynamic Universal Music Bibliotheque).
It has been slightly modified by me:
* Added support for Ogg Vorbis-compressed samples in XM files ala FMOD.
* Removed excessive mallocs from the replay core.
* Rerolled the loops in resample.c. Unrolling them made the object file
~250k large while providing little benefit. Even at ~100k, I think it's
still larger than it ought to be, but I'll live with it for now.
Other than that, it's essentially the same thing you'd hear in foobar2000,
minus some subsong detection features. Release builds of the library look
like they might even be slightly faster than FMOD, which is a plus.
- Fixed: Timidity::font_add() did not release the file reader it created.
- Fixed: The SF2 loader did not free the sample headers in its destructor.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@113 b0f79afe-0144-0410-b225-9a4edf0717df
2008-06-03 21:48:49 +00:00
|
|
|
overlay = 0;
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
|
if (item->type != screenres)
|
|
|
|
|
{
|
|
|
|
|
width = SmallFont->StringWidth (item->label);
|
|
|
|
|
switch (item->type)
|
|
|
|
|
{
|
|
|
|
|
case more:
|
|
|
|
|
case safemore:
|
|
|
|
|
x = CurrentMenu->indent - width;
|
|
|
|
|
color = MoreColor;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case numberedmore:
|
|
|
|
|
case rsafemore:
|
|
|
|
|
case rightmore:
|
|
|
|
|
x = CurrentMenu->indent + 14;
|
|
|
|
|
color = item->type != rightmore ? CR_GREEN : MoreColor;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case redtext:
|
|
|
|
|
x = 160 - width / 2;
|
|
|
|
|
color = LabelColor;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case whitetext:
|
|
|
|
|
x = 160 - width / 2;
|
|
|
|
|
color = CR_GOLD;//ValueColor;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case listelement:
|
|
|
|
|
x = CurrentMenu->indent + 14;
|
|
|
|
|
color = LabelColor;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case colorpicker:
|
|
|
|
|
x = CurrentMenu->indent + 14;
|
|
|
|
|
color = MoreColor;
|
|
|
|
|
break;
|
|
|
|
|
|
Update to ZDoom r1017:
- Fixed: MAPINFO's 'lookup' option should only work for actual strings but
not for lump and file names.
- Added a few 'activator == NULL' checks to some ACS functions.
- Added line and vertex lists to polyobjects so that I can do some
changes that won't work with only a seg list being maintained.
(SBarInfo update #23)
- Fixed: Drawing the amount of an inventory item in the player's inventory did
not work
- Added: PowerupTime to drawnumber and drawbar. You must specify a
powerupgiver. Although drawnumber goes in seconds the powerup has left
drawbar will use ticks for extra accuracy.
- I have increased cross-port compatibility with Skulltag. If an unknown
game mode is provided for sbarinfo's gamemode command it will ignore it and
continue.
- Added an option to consider intermission screens gameplay for purposes of
capturing the mouse.
- Changed: Telefragging should not thrust the victim if it isn't in precisely the
same position as the killer.
- fixed: A_SpawnItemEx must call P_TeleportMove before checking the spawned
object's position.
- Fixed: Ouch state was far to easy to achieve.
- Made all the basic texture classes local to their implementation.
They are not needed anywhere else.
- Changed the HackHack hack for corrupt 256 pixel high textures that
FMultiPatchTexture only calls a virtual function instead of doing any
type checks of the patch itself.
- Cleaned up the constant definitions in doomdata.h.
- Moved the TEXTUREx structures from doomdata.h to multipatchtexture.cpp
because they are used only in this one file.
- Removed some more typedefs from r_defs.h and doomdata.h
- Moved local polyobject data definitions from p_local.h to po_man.cpp.
- Renamed player_s to player_t globally to get rid of the duplicate names
for this class.
- Added coordinate range checking to DCanvas::ParseDrawTextureTags() to avoid
potential crashes in the situation that con_scaletext is 2 and somebody
uses a hud message as if a hud size was specified, but forgot to actually
set the hud size.
- Consolidated the mug shot code shared by DSBarInfo and DDoomStatusBar
into a single place.
- Fixed: Setting an invalid mug shot state crashed the game.
- Fixed my attempts to be clever with strings yesterday.
- If an actor's current target temporarily goes unshootable, its threshold
is now reset to 0, so it will more readily switch back to it.
- Fixed: Deactivating the game no longer allows reverb effects to continue
playing while the sound is paused.
- Fixed: S_StartNamedSound() looked for SECF_SILENT in MoreFlags instead of
Flags.
- Fixed: DSBarInfo::updateState() and DDoomStatusBar::UpdateState() sprung
leaks and didn't allocate enough space for the fullStateName string.
- Disabled DUMB's mono destination mixers. It's not like I'm ever going to
target an original SoundBlaster, so they're a waste of space to have around.
This trims resample.obj down to ~60k now.
- Fixed: PrtScn/SysRq key did not work on Linux.
- Added an alternate module replay engine that uses foo_dumb's replayer, a
heavily customized version of DUMB (Dynamic Universal Music Bibliotheque).
It has been slightly modified by me:
* Added support for Ogg Vorbis-compressed samples in XM files ala FMOD.
* Removed excessive mallocs from the replay core.
* Rerolled the loops in resample.c. Unrolling them made the object file
~250k large while providing little benefit. Even at ~100k, I think it's
still larger than it ought to be, but I'll live with it for now.
Other than that, it's essentially the same thing you'd hear in foobar2000,
minus some subsong detection features. Release builds of the library look
like they might even be slightly faster than FMOD, which is a plus.
- Fixed: Timidity::font_add() did not release the file reader it created.
- Fixed: The SF2 loader did not free the sample headers in its destructor.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@113 b0f79afe-0144-0410-b225-9a4edf0717df
2008-06-03 21:48:49 +00:00
|
|
|
case discrete:
|
|
|
|
|
if (item->d.graycheck != NULL && !(**item->d.graycheck))
|
|
|
|
|
{
|
|
|
|
|
overlay = MAKEARGB(128,0,0,0);
|
|
|
|
|
}
|
|
|
|
|
// Intentional fall-through
|
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
default:
|
|
|
|
|
x = CurrentMenu->indent - width;
|
|
|
|
|
color = (item->type == control && menuactive == MENU_WaitKey && i == CurrentItem)
|
|
|
|
|
? CR_YELLOW : LabelColor;
|
|
|
|
|
break;
|
|
|
|
|
}
|
Update to ZDoom r1017:
- Fixed: MAPINFO's 'lookup' option should only work for actual strings but
not for lump and file names.
- Added a few 'activator == NULL' checks to some ACS functions.
- Added line and vertex lists to polyobjects so that I can do some
changes that won't work with only a seg list being maintained.
(SBarInfo update #23)
- Fixed: Drawing the amount of an inventory item in the player's inventory did
not work
- Added: PowerupTime to drawnumber and drawbar. You must specify a
powerupgiver. Although drawnumber goes in seconds the powerup has left
drawbar will use ticks for extra accuracy.
- I have increased cross-port compatibility with Skulltag. If an unknown
game mode is provided for sbarinfo's gamemode command it will ignore it and
continue.
- Added an option to consider intermission screens gameplay for purposes of
capturing the mouse.
- Changed: Telefragging should not thrust the victim if it isn't in precisely the
same position as the killer.
- fixed: A_SpawnItemEx must call P_TeleportMove before checking the spawned
object's position.
- Fixed: Ouch state was far to easy to achieve.
- Made all the basic texture classes local to their implementation.
They are not needed anywhere else.
- Changed the HackHack hack for corrupt 256 pixel high textures that
FMultiPatchTexture only calls a virtual function instead of doing any
type checks of the patch itself.
- Cleaned up the constant definitions in doomdata.h.
- Moved the TEXTUREx structures from doomdata.h to multipatchtexture.cpp
because they are used only in this one file.
- Removed some more typedefs from r_defs.h and doomdata.h
- Moved local polyobject data definitions from p_local.h to po_man.cpp.
- Renamed player_s to player_t globally to get rid of the duplicate names
for this class.
- Added coordinate range checking to DCanvas::ParseDrawTextureTags() to avoid
potential crashes in the situation that con_scaletext is 2 and somebody
uses a hud message as if a hud size was specified, but forgot to actually
set the hud size.
- Consolidated the mug shot code shared by DSBarInfo and DDoomStatusBar
into a single place.
- Fixed: Setting an invalid mug shot state crashed the game.
- Fixed my attempts to be clever with strings yesterday.
- If an actor's current target temporarily goes unshootable, its threshold
is now reset to 0, so it will more readily switch back to it.
- Fixed: Deactivating the game no longer allows reverb effects to continue
playing while the sound is paused.
- Fixed: S_StartNamedSound() looked for SECF_SILENT in MoreFlags instead of
Flags.
- Fixed: DSBarInfo::updateState() and DDoomStatusBar::UpdateState() sprung
leaks and didn't allocate enough space for the fullStateName string.
- Disabled DUMB's mono destination mixers. It's not like I'm ever going to
target an original SoundBlaster, so they're a waste of space to have around.
This trims resample.obj down to ~60k now.
- Fixed: PrtScn/SysRq key did not work on Linux.
- Added an alternate module replay engine that uses foo_dumb's replayer, a
heavily customized version of DUMB (Dynamic Universal Music Bibliotheque).
It has been slightly modified by me:
* Added support for Ogg Vorbis-compressed samples in XM files ala FMOD.
* Removed excessive mallocs from the replay core.
* Rerolled the loops in resample.c. Unrolling them made the object file
~250k large while providing little benefit. Even at ~100k, I think it's
still larger than it ought to be, but I'll live with it for now.
Other than that, it's essentially the same thing you'd hear in foobar2000,
minus some subsong detection features. Release builds of the library look
like they might even be slightly faster than FMOD, which is a plus.
- Fixed: Timidity::font_add() did not release the file reader it created.
- Fixed: The SF2 loader did not free the sample headers in its destructor.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@113 b0f79afe-0144-0410-b225-9a4edf0717df
2008-06-03 21:48:49 +00:00
|
|
|
screen->DrawText (color, x, y, item->label, DTA_Clean, true, DTA_ColorOverlay, overlay, TAG_DONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
|
switch (item->type)
|
|
|
|
|
{
|
|
|
|
|
case numberedmore:
|
|
|
|
|
if (item->b.position != 0)
|
|
|
|
|
{
|
|
|
|
|
char tbuf[16];
|
|
|
|
|
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
mysnprintf (tbuf, countof(tbuf), "%d.", item->b.position);
|
2008-01-27 11:25:03 +00:00
|
|
|
x = CurrentMenu->indent - SmallFont->StringWidth (tbuf);
|
|
|
|
|
screen->DrawText (CR_GREY, x, y, tbuf, DTA_Clean, true, TAG_DONE);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case bitmask:
|
|
|
|
|
{
|
|
|
|
|
int v, vals;
|
|
|
|
|
|
|
|
|
|
value = item->a.cvar->GetGenericRep (CVAR_Int);
|
|
|
|
|
value.Float = value.Int & int(item->c.max);
|
|
|
|
|
vals = (int)item->b.numvalues;
|
|
|
|
|
|
|
|
|
|
v = M_FindCurVal (value.Float, item->e.values, vals);
|
|
|
|
|
|
|
|
|
|
if (v == vals)
|
|
|
|
|
{
|
|
|
|
|
screen->DrawText (ValueColor, CurrentMenu->indent + 14, y, "Unknown",
|
|
|
|
|
DTA_Clean, true, TAG_DONE);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
screen->DrawText (item->type == cdiscrete ? v : ValueColor,
|
|
|
|
|
CurrentMenu->indent + 14, y, item->e.values[v].name,
|
|
|
|
|
DTA_Clean, true, TAG_DONE);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case discretes:
|
|
|
|
|
case discrete:
|
|
|
|
|
case cdiscrete:
|
|
|
|
|
case inverter:
|
|
|
|
|
{
|
|
|
|
|
int v, vals;
|
|
|
|
|
|
Update to ZDoom r1017:
- Fixed: MAPINFO's 'lookup' option should only work for actual strings but
not for lump and file names.
- Added a few 'activator == NULL' checks to some ACS functions.
- Added line and vertex lists to polyobjects so that I can do some
changes that won't work with only a seg list being maintained.
(SBarInfo update #23)
- Fixed: Drawing the amount of an inventory item in the player's inventory did
not work
- Added: PowerupTime to drawnumber and drawbar. You must specify a
powerupgiver. Although drawnumber goes in seconds the powerup has left
drawbar will use ticks for extra accuracy.
- I have increased cross-port compatibility with Skulltag. If an unknown
game mode is provided for sbarinfo's gamemode command it will ignore it and
continue.
- Added an option to consider intermission screens gameplay for purposes of
capturing the mouse.
- Changed: Telefragging should not thrust the victim if it isn't in precisely the
same position as the killer.
- fixed: A_SpawnItemEx must call P_TeleportMove before checking the spawned
object's position.
- Fixed: Ouch state was far to easy to achieve.
- Made all the basic texture classes local to their implementation.
They are not needed anywhere else.
- Changed the HackHack hack for corrupt 256 pixel high textures that
FMultiPatchTexture only calls a virtual function instead of doing any
type checks of the patch itself.
- Cleaned up the constant definitions in doomdata.h.
- Moved the TEXTUREx structures from doomdata.h to multipatchtexture.cpp
because they are used only in this one file.
- Removed some more typedefs from r_defs.h and doomdata.h
- Moved local polyobject data definitions from p_local.h to po_man.cpp.
- Renamed player_s to player_t globally to get rid of the duplicate names
for this class.
- Added coordinate range checking to DCanvas::ParseDrawTextureTags() to avoid
potential crashes in the situation that con_scaletext is 2 and somebody
uses a hud message as if a hud size was specified, but forgot to actually
set the hud size.
- Consolidated the mug shot code shared by DSBarInfo and DDoomStatusBar
into a single place.
- Fixed: Setting an invalid mug shot state crashed the game.
- Fixed my attempts to be clever with strings yesterday.
- If an actor's current target temporarily goes unshootable, its threshold
is now reset to 0, so it will more readily switch back to it.
- Fixed: Deactivating the game no longer allows reverb effects to continue
playing while the sound is paused.
- Fixed: S_StartNamedSound() looked for SECF_SILENT in MoreFlags instead of
Flags.
- Fixed: DSBarInfo::updateState() and DDoomStatusBar::UpdateState() sprung
leaks and didn't allocate enough space for the fullStateName string.
- Disabled DUMB's mono destination mixers. It's not like I'm ever going to
target an original SoundBlaster, so they're a waste of space to have around.
This trims resample.obj down to ~60k now.
- Fixed: PrtScn/SysRq key did not work on Linux.
- Added an alternate module replay engine that uses foo_dumb's replayer, a
heavily customized version of DUMB (Dynamic Universal Music Bibliotheque).
It has been slightly modified by me:
* Added support for Ogg Vorbis-compressed samples in XM files ala FMOD.
* Removed excessive mallocs from the replay core.
* Rerolled the loops in resample.c. Unrolling them made the object file
~250k large while providing little benefit. Even at ~100k, I think it's
still larger than it ought to be, but I'll live with it for now.
Other than that, it's essentially the same thing you'd hear in foobar2000,
minus some subsong detection features. Release builds of the library look
like they might even be slightly faster than FMOD, which is a plus.
- Fixed: Timidity::font_add() did not release the file reader it created.
- Fixed: The SF2 loader did not free the sample headers in its destructor.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@113 b0f79afe-0144-0410-b225-9a4edf0717df
2008-06-03 21:48:49 +00:00
|
|
|
overlay = 0;
|
2008-01-27 11:25:03 +00:00
|
|
|
value = item->a.cvar->GetGenericRep (CVAR_Float);
|
|
|
|
|
if (item->type == inverter)
|
|
|
|
|
{
|
|
|
|
|
value.Float = (value.Float < 0.f);
|
|
|
|
|
vals = 2;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
vals = (int)item->b.numvalues;
|
|
|
|
|
}
|
|
|
|
|
if (item->type != discretes)
|
|
|
|
|
{
|
|
|
|
|
v = M_FindCurVal (value.Float, item->e.values, vals);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
v = M_FindCurVal (value.Float, item->e.valuestrings, vals);
|
|
|
|
|
}
|
Update to ZDoom r1017:
- Fixed: MAPINFO's 'lookup' option should only work for actual strings but
not for lump and file names.
- Added a few 'activator == NULL' checks to some ACS functions.
- Added line and vertex lists to polyobjects so that I can do some
changes that won't work with only a seg list being maintained.
(SBarInfo update #23)
- Fixed: Drawing the amount of an inventory item in the player's inventory did
not work
- Added: PowerupTime to drawnumber and drawbar. You must specify a
powerupgiver. Although drawnumber goes in seconds the powerup has left
drawbar will use ticks for extra accuracy.
- I have increased cross-port compatibility with Skulltag. If an unknown
game mode is provided for sbarinfo's gamemode command it will ignore it and
continue.
- Added an option to consider intermission screens gameplay for purposes of
capturing the mouse.
- Changed: Telefragging should not thrust the victim if it isn't in precisely the
same position as the killer.
- fixed: A_SpawnItemEx must call P_TeleportMove before checking the spawned
object's position.
- Fixed: Ouch state was far to easy to achieve.
- Made all the basic texture classes local to their implementation.
They are not needed anywhere else.
- Changed the HackHack hack for corrupt 256 pixel high textures that
FMultiPatchTexture only calls a virtual function instead of doing any
type checks of the patch itself.
- Cleaned up the constant definitions in doomdata.h.
- Moved the TEXTUREx structures from doomdata.h to multipatchtexture.cpp
because they are used only in this one file.
- Removed some more typedefs from r_defs.h and doomdata.h
- Moved local polyobject data definitions from p_local.h to po_man.cpp.
- Renamed player_s to player_t globally to get rid of the duplicate names
for this class.
- Added coordinate range checking to DCanvas::ParseDrawTextureTags() to avoid
potential crashes in the situation that con_scaletext is 2 and somebody
uses a hud message as if a hud size was specified, but forgot to actually
set the hud size.
- Consolidated the mug shot code shared by DSBarInfo and DDoomStatusBar
into a single place.
- Fixed: Setting an invalid mug shot state crashed the game.
- Fixed my attempts to be clever with strings yesterday.
- If an actor's current target temporarily goes unshootable, its threshold
is now reset to 0, so it will more readily switch back to it.
- Fixed: Deactivating the game no longer allows reverb effects to continue
playing while the sound is paused.
- Fixed: S_StartNamedSound() looked for SECF_SILENT in MoreFlags instead of
Flags.
- Fixed: DSBarInfo::updateState() and DDoomStatusBar::UpdateState() sprung
leaks and didn't allocate enough space for the fullStateName string.
- Disabled DUMB's mono destination mixers. It's not like I'm ever going to
target an original SoundBlaster, so they're a waste of space to have around.
This trims resample.obj down to ~60k now.
- Fixed: PrtScn/SysRq key did not work on Linux.
- Added an alternate module replay engine that uses foo_dumb's replayer, a
heavily customized version of DUMB (Dynamic Universal Music Bibliotheque).
It has been slightly modified by me:
* Added support for Ogg Vorbis-compressed samples in XM files ala FMOD.
* Removed excessive mallocs from the replay core.
* Rerolled the loops in resample.c. Unrolling them made the object file
~250k large while providing little benefit. Even at ~100k, I think it's
still larger than it ought to be, but I'll live with it for now.
Other than that, it's essentially the same thing you'd hear in foobar2000,
minus some subsong detection features. Release builds of the library look
like they might even be slightly faster than FMOD, which is a plus.
- Fixed: Timidity::font_add() did not release the file reader it created.
- Fixed: The SF2 loader did not free the sample headers in its destructor.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@113 b0f79afe-0144-0410-b225-9a4edf0717df
2008-06-03 21:48:49 +00:00
|
|
|
if (item->type == discrete)
|
|
|
|
|
{
|
|
|
|
|
if (item->d.graycheck != NULL && !(**item->d.graycheck))
|
|
|
|
|
{
|
|
|
|
|
overlay = MAKEARGB(96,48,0,0);
|
|
|
|
|
}
|
|
|
|
|
}
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
|
if (v == vals)
|
|
|
|
|
{
|
|
|
|
|
screen->DrawText (ValueColor, CurrentMenu->indent + 14, y, "Unknown",
|
Update to ZDoom r1017:
- Fixed: MAPINFO's 'lookup' option should only work for actual strings but
not for lump and file names.
- Added a few 'activator == NULL' checks to some ACS functions.
- Added line and vertex lists to polyobjects so that I can do some
changes that won't work with only a seg list being maintained.
(SBarInfo update #23)
- Fixed: Drawing the amount of an inventory item in the player's inventory did
not work
- Added: PowerupTime to drawnumber and drawbar. You must specify a
powerupgiver. Although drawnumber goes in seconds the powerup has left
drawbar will use ticks for extra accuracy.
- I have increased cross-port compatibility with Skulltag. If an unknown
game mode is provided for sbarinfo's gamemode command it will ignore it and
continue.
- Added an option to consider intermission screens gameplay for purposes of
capturing the mouse.
- Changed: Telefragging should not thrust the victim if it isn't in precisely the
same position as the killer.
- fixed: A_SpawnItemEx must call P_TeleportMove before checking the spawned
object's position.
- Fixed: Ouch state was far to easy to achieve.
- Made all the basic texture classes local to their implementation.
They are not needed anywhere else.
- Changed the HackHack hack for corrupt 256 pixel high textures that
FMultiPatchTexture only calls a virtual function instead of doing any
type checks of the patch itself.
- Cleaned up the constant definitions in doomdata.h.
- Moved the TEXTUREx structures from doomdata.h to multipatchtexture.cpp
because they are used only in this one file.
- Removed some more typedefs from r_defs.h and doomdata.h
- Moved local polyobject data definitions from p_local.h to po_man.cpp.
- Renamed player_s to player_t globally to get rid of the duplicate names
for this class.
- Added coordinate range checking to DCanvas::ParseDrawTextureTags() to avoid
potential crashes in the situation that con_scaletext is 2 and somebody
uses a hud message as if a hud size was specified, but forgot to actually
set the hud size.
- Consolidated the mug shot code shared by DSBarInfo and DDoomStatusBar
into a single place.
- Fixed: Setting an invalid mug shot state crashed the game.
- Fixed my attempts to be clever with strings yesterday.
- If an actor's current target temporarily goes unshootable, its threshold
is now reset to 0, so it will more readily switch back to it.
- Fixed: Deactivating the game no longer allows reverb effects to continue
playing while the sound is paused.
- Fixed: S_StartNamedSound() looked for SECF_SILENT in MoreFlags instead of
Flags.
- Fixed: DSBarInfo::updateState() and DDoomStatusBar::UpdateState() sprung
leaks and didn't allocate enough space for the fullStateName string.
- Disabled DUMB's mono destination mixers. It's not like I'm ever going to
target an original SoundBlaster, so they're a waste of space to have around.
This trims resample.obj down to ~60k now.
- Fixed: PrtScn/SysRq key did not work on Linux.
- Added an alternate module replay engine that uses foo_dumb's replayer, a
heavily customized version of DUMB (Dynamic Universal Music Bibliotheque).
It has been slightly modified by me:
* Added support for Ogg Vorbis-compressed samples in XM files ala FMOD.
* Removed excessive mallocs from the replay core.
* Rerolled the loops in resample.c. Unrolling them made the object file
~250k large while providing little benefit. Even at ~100k, I think it's
still larger than it ought to be, but I'll live with it for now.
Other than that, it's essentially the same thing you'd hear in foobar2000,
minus some subsong detection features. Release builds of the library look
like they might even be slightly faster than FMOD, which is a plus.
- Fixed: Timidity::font_add() did not release the file reader it created.
- Fixed: The SF2 loader did not free the sample headers in its destructor.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@113 b0f79afe-0144-0410-b225-9a4edf0717df
2008-06-03 21:48:49 +00:00
|
|
|
DTA_Clean, true, DTA_ColorOverlay, overlay, TAG_DONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
screen->DrawText (item->type == cdiscrete ? v : ValueColor,
|
|
|
|
|
CurrentMenu->indent + 14, y,
|
|
|
|
|
item->type != discretes ? item->e.values[v].name : item->e.valuestrings[v].name.GetChars(),
|
Update to ZDoom r1017:
- Fixed: MAPINFO's 'lookup' option should only work for actual strings but
not for lump and file names.
- Added a few 'activator == NULL' checks to some ACS functions.
- Added line and vertex lists to polyobjects so that I can do some
changes that won't work with only a seg list being maintained.
(SBarInfo update #23)
- Fixed: Drawing the amount of an inventory item in the player's inventory did
not work
- Added: PowerupTime to drawnumber and drawbar. You must specify a
powerupgiver. Although drawnumber goes in seconds the powerup has left
drawbar will use ticks for extra accuracy.
- I have increased cross-port compatibility with Skulltag. If an unknown
game mode is provided for sbarinfo's gamemode command it will ignore it and
continue.
- Added an option to consider intermission screens gameplay for purposes of
capturing the mouse.
- Changed: Telefragging should not thrust the victim if it isn't in precisely the
same position as the killer.
- fixed: A_SpawnItemEx must call P_TeleportMove before checking the spawned
object's position.
- Fixed: Ouch state was far to easy to achieve.
- Made all the basic texture classes local to their implementation.
They are not needed anywhere else.
- Changed the HackHack hack for corrupt 256 pixel high textures that
FMultiPatchTexture only calls a virtual function instead of doing any
type checks of the patch itself.
- Cleaned up the constant definitions in doomdata.h.
- Moved the TEXTUREx structures from doomdata.h to multipatchtexture.cpp
because they are used only in this one file.
- Removed some more typedefs from r_defs.h and doomdata.h
- Moved local polyobject data definitions from p_local.h to po_man.cpp.
- Renamed player_s to player_t globally to get rid of the duplicate names
for this class.
- Added coordinate range checking to DCanvas::ParseDrawTextureTags() to avoid
potential crashes in the situation that con_scaletext is 2 and somebody
uses a hud message as if a hud size was specified, but forgot to actually
set the hud size.
- Consolidated the mug shot code shared by DSBarInfo and DDoomStatusBar
into a single place.
- Fixed: Setting an invalid mug shot state crashed the game.
- Fixed my attempts to be clever with strings yesterday.
- If an actor's current target temporarily goes unshootable, its threshold
is now reset to 0, so it will more readily switch back to it.
- Fixed: Deactivating the game no longer allows reverb effects to continue
playing while the sound is paused.
- Fixed: S_StartNamedSound() looked for SECF_SILENT in MoreFlags instead of
Flags.
- Fixed: DSBarInfo::updateState() and DDoomStatusBar::UpdateState() sprung
leaks and didn't allocate enough space for the fullStateName string.
- Disabled DUMB's mono destination mixers. It's not like I'm ever going to
target an original SoundBlaster, so they're a waste of space to have around.
This trims resample.obj down to ~60k now.
- Fixed: PrtScn/SysRq key did not work on Linux.
- Added an alternate module replay engine that uses foo_dumb's replayer, a
heavily customized version of DUMB (Dynamic Universal Music Bibliotheque).
It has been slightly modified by me:
* Added support for Ogg Vorbis-compressed samples in XM files ala FMOD.
* Removed excessive mallocs from the replay core.
* Rerolled the loops in resample.c. Unrolling them made the object file
~250k large while providing little benefit. Even at ~100k, I think it's
still larger than it ought to be, but I'll live with it for now.
Other than that, it's essentially the same thing you'd hear in foobar2000,
minus some subsong detection features. Release builds of the library look
like they might even be slightly faster than FMOD, which is a plus.
- Fixed: Timidity::font_add() did not release the file reader it created.
- Fixed: The SF2 loader did not free the sample headers in its destructor.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@113 b0f79afe-0144-0410-b225-9a4edf0717df
2008-06-03 21:48:49 +00:00
|
|
|
DTA_Clean, true, DTA_ColorOverlay, overlay, TAG_DONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
- Update to ZDoom r858:
- Added FMOD_OPENONLY to the callback version of CreateStream() to prevent it
from doing prebuffering of the song. This was causing the Linux version to
hang while waiting for input from the pipe, since Timidity hadn't been
started yet. I tried using a select call in the FillStream() method, but it
always seems to return the pipe as having nothing available. Unfortunately,
the game still falls all over itself if Timidity isn't available. Instead
of execvp failing nicely, X errors kill the game. I don't know why it's
doing that. My advice for Linux music: Skip Timidity++ and get a DLS patch
set (/WINDOWS/system32/drivers/gm.dls is probably the most common by far)
and set the snd_midipatchset cvar to point to it. It's faster and also
sounds a whole lot better than the crappy freepats Ubuntu wants to install
with Timidity++ (thank goodness I have the official patches from a real
GUS so I don't need to use them).
- GCC fixes.
- Fixed: After starting new music the music volume has to be reset so that
the song's relative volume takes effect.
- Removed the arbitrary 1024 bytes limit when the file being played is a MIDI
file. I had a D_DM2TTL that's only 990 bytes.
- Restructured I_RegisterSong so that $mididevice works again and also supports
selecting FMOD.
- Added Jim' Linux fix.
- Added MartinHowe's fix for mugshot display in status bars.
- The garbage collector is now run one last time just before exiting the game.
- Removed movie volume from the sound menu and renamed some of the other
options to give the MIDI device name more room to display itself.
- Moved the midi device selection into the main sound menu.
- Added FMOD as MIDI device -1, to replace the MIDI mapper. This is still the
default device. By default, it uses exactly the same DLS instruments as the
Microsoft GS Wavetable Synth. If you have another set DLS level 1 patch set
you want to use, set the snd_midipatchset cvar to specify where it should
load the instruments from.
- Changed the ProduceMIDI function to store its output into a TArray<BYTE>.
An overloaded version wraps around it to continue to supply file-writing
support for external Timidity++ usage.
- Added an FMOD credits banner to comply with their non-commercial license.
- Reimplemented the snd_buffersize cvar for the FMOD Ex sound system. Rather
than a time in ms, this is now the length in samples of the DSP buffer.
Also added the snd_buffercount cvar to offer complete control over the
call to FMOD::System::setDSPBufferSize(). Note that with any snd_samplerate
below about 44kHz, you will need to set snd_buffersize to avoid long
latencies.
- Reimplemented the snd_output cvar for the FMOD Ex sound system.
- Changed snd_samplerate default to 0. This now means to use the default
sample rate.
- Made snd_output, snd_output_format, snd_speakermode, snd_resampler, and
snd_hrtf available through the menu.
- Split the HRTF effect selection into its own cvar: snd_hrtf.
- Removed 96000 Hz option from the menu. It's still available through the
cvar, if desired.
- Fixed: If Windows sound init failed, retry with DirectSound. (Apparently,
WASAPI doesn't work with more than two speakers and PCM-Float output at the
same time.)
- Fixed: Area sounds only played from the front speakers once you got within
the 2D panning area.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@79 b0f79afe-0144-0410-b225-9a4edf0717df
2008-03-27 18:31:46 +00:00
|
|
|
case ediscrete:
|
|
|
|
|
{
|
|
|
|
|
const char *v;
|
|
|
|
|
|
|
|
|
|
value = item->a.cvar->GetGenericRep (CVAR_String);
|
|
|
|
|
v = M_FindCurVal(value.String, item->e.enumvalues, (int)item->b.numvalues);
|
|
|
|
|
screen->DrawText(ValueColor, CurrentMenu->indent + 14, y, v, DTA_Clean, true, TAG_DONE);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
case discrete_guid:
|
|
|
|
|
{
|
|
|
|
|
int v, vals;
|
|
|
|
|
|
|
|
|
|
vals = (int)item->b.numvalues;
|
|
|
|
|
v = M_FindCurGUID (*(item->a.guidcvar), item->e.guidvalues, vals);
|
|
|
|
|
|
|
|
|
|
if (v == vals)
|
|
|
|
|
{
|
|
|
|
|
UCVarValue val = item->a.guidcvar->GetGenericRep (CVAR_String);
|
|
|
|
|
screen->DrawText (ValueColor, CurrentMenu->indent + 14, y, val.String, DTA_Clean, true, TAG_DONE);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
screen->DrawText (ValueColor, CurrentMenu->indent + 14, y, item->e.guidvalues[v].Name,
|
|
|
|
|
DTA_Clean, true, TAG_DONE);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case nochoice:
|
|
|
|
|
screen->DrawText (CR_GOLD, CurrentMenu->indent + 14, y,
|
|
|
|
|
(item->e.values[(int)item->b.min]).name, DTA_Clean, true, TAG_DONE);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case slider:
|
|
|
|
|
value = item->a.cvar->GetGenericRep (CVAR_Float);
|
|
|
|
|
M_DrawSlider (CurrentMenu->indent + 14, y + labelofs, item->b.min, item->c.max, value.Float);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case absslider:
|
|
|
|
|
value = item->a.cvar->GetGenericRep (CVAR_Float);
|
|
|
|
|
M_DrawSlider (CurrentMenu->indent + 14, y + labelofs, item->b.min, item->c.max, fabs(value.Float));
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case intslider:
|
|
|
|
|
M_DrawSlider (CurrentMenu->indent + 14, y + labelofs, item->b.min, item->c.max, item->a.fval);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case control:
|
|
|
|
|
{
|
|
|
|
|
char description[64];
|
|
|
|
|
|
|
|
|
|
C_NameKeys (description, item->b.key1, item->c.key2);
|
2008-06-28 13:29:59 +00:00
|
|
|
if (description[0])
|
|
|
|
|
{
|
|
|
|
|
M_DrawConText(CR_WHITE, CurrentMenu->indent + 14, y-1+labelofs, description);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
screen->DrawText(CR_BLACK, CurrentMenu->indent + 14, y + labelofs, "---",
|
|
|
|
|
DTA_Clean, true, TAG_DONE);
|
|
|
|
|
}
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case colorpicker:
|
|
|
|
|
{
|
|
|
|
|
int box_x, box_y;
|
|
|
|
|
box_x = (CurrentMenu->indent - 35 - 160) * CleanXfac + screen->GetWidth()/2;
|
|
|
|
|
box_y = (y - ((gameinfo.gametype & GAME_Raven) ? 99 : 100)) * CleanYfac + screen->GetHeight()/2;
|
|
|
|
|
screen->Clear (box_x, box_y, box_x + 32*CleanXfac, box_y + (fontheight-1)*CleanYfac,
|
|
|
|
|
item->a.colorcvar->GetIndex(), 0);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case palettegrid:
|
|
|
|
|
{
|
|
|
|
|
int box_x, box_y;
|
|
|
|
|
int x1, p;
|
|
|
|
|
const int w = fontheight*CleanXfac;
|
|
|
|
|
const int h = fontheight*CleanYfac;
|
|
|
|
|
|
|
|
|
|
box_y = (y - 98) * CleanYfac + screen->GetHeight()/2;
|
|
|
|
|
p = 0;
|
|
|
|
|
box_x = (CurrentMenu->indent - 32 - 160) * CleanXfac + screen->GetWidth()/2;
|
|
|
|
|
for (x1 = 0, p = int(item->b.min * 16); x1 < 16; ++p, ++x1)
|
|
|
|
|
{
|
|
|
|
|
screen->Clear (box_x, box_y, box_x + w, box_y + h, p, 0);
|
|
|
|
|
if (p == CurrColorIndex || (i == CurrentItem && x1 == SelColorIndex))
|
|
|
|
|
{
|
|
|
|
|
int r, g, b;
|
|
|
|
|
DWORD col;
|
|
|
|
|
double blinky;
|
|
|
|
|
if (i == CurrentItem && x1 == SelColorIndex)
|
|
|
|
|
{
|
|
|
|
|
r = 255, g = 128, b = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
r = 200, g = 200, b = 255;
|
|
|
|
|
}
|
|
|
|
|
// Make sure the cursors stand out against similar colors
|
|
|
|
|
// by pulsing them.
|
|
|
|
|
blinky = fabs(sin(I_MSTime()/1000.0)) * 0.5 + 0.5;
|
|
|
|
|
col = MAKEARGB(255,int(r*blinky),int(g*blinky),int(b*blinky));
|
|
|
|
|
|
|
|
|
|
screen->Clear (box_x, box_y, box_x + w, box_y + 1, -1, col);
|
|
|
|
|
screen->Clear (box_x, box_y + h-1, box_x + w, box_y + h, -1, col);
|
|
|
|
|
screen->Clear (box_x, box_y, box_x + 1, box_y + h, -1, col);
|
|
|
|
|
screen->Clear (box_x + w - 1, box_y, box_x + w, box_y + h, -1, col);
|
|
|
|
|
}
|
|
|
|
|
box_x += w;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case bitflag:
|
|
|
|
|
{
|
|
|
|
|
value_t *value;
|
|
|
|
|
const char *str;
|
|
|
|
|
|
|
|
|
|
if (item->b.min)
|
|
|
|
|
value = NoYes;
|
|
|
|
|
else
|
|
|
|
|
value = YesNo;
|
|
|
|
|
|
|
|
|
|
if (item->a.cvar)
|
|
|
|
|
{
|
|
|
|
|
if ((*(item->a.intcvar)) & item->e.flagmask)
|
|
|
|
|
str = value[1].name;
|
|
|
|
|
else
|
|
|
|
|
str = value[0].name;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
str = "???";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
screen->DrawText (ValueColor,
|
|
|
|
|
CurrentMenu->indent + 14, y, str, DTA_Clean, true, TAG_DONE);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (item->type != palettegrid && // Palette grids draw their own cursor
|
|
|
|
|
i == CurrentItem &&
|
|
|
|
|
(skullAnimCounter < 6 || menuactive == MENU_WaitKey))
|
|
|
|
|
{
|
|
|
|
|
M_DrawConText(CR_RED, CurrentMenu->indent + 3, y-1+labelofs, "\xd");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
char *str = NULL;
|
|
|
|
|
|
|
|
|
|
for (x = 0; x < 3; x++)
|
|
|
|
|
{
|
|
|
|
|
switch (x)
|
|
|
|
|
{
|
|
|
|
|
case 0: str = item->b.res1; break;
|
|
|
|
|
case 1: str = item->c.res2; break;
|
|
|
|
|
case 2: str = item->d.res3; break;
|
|
|
|
|
}
|
|
|
|
|
if (str)
|
|
|
|
|
{
|
|
|
|
|
if (x == item->e.highlight)
|
|
|
|
|
color = CR_GOLD; //ValueColor;
|
|
|
|
|
else
|
|
|
|
|
color = CR_BRICK; //LabelColor;
|
|
|
|
|
|
|
|
|
|
screen->DrawText (color, 104 * x + 20, y, str, DTA_Clean, true, TAG_DONE);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (i == CurrentItem && ((item->a.selmode != -1 && (skullAnimCounter < 6 || menuactive == MENU_WaitKey)) || testingmode))
|
|
|
|
|
{
|
|
|
|
|
M_DrawConText(CR_RED, item->a.selmode * 104 + 8, y-1 + labelofs, "\xd");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CanScrollUp = (CurrentMenu->scrollpos > 0);
|
|
|
|
|
CanScrollDown = (i < CurrentMenu->numitems);
|
|
|
|
|
VisBottom = i - 1;
|
|
|
|
|
|
|
|
|
|
if (CanScrollUp)
|
|
|
|
|
{
|
|
|
|
|
M_DrawConText(CR_ORANGE, 3, ytop + labelofs, "\x1a");
|
|
|
|
|
}
|
|
|
|
|
if (CanScrollDown)
|
|
|
|
|
{
|
|
|
|
|
M_DrawConText(CR_ORANGE, 3, y - 8 + labelofs, "\x1b");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (flagsvar)
|
|
|
|
|
{
|
|
|
|
|
static const FIntCVar *const vars[3] = { &dmflags, &dmflags2, &compatflags };
|
|
|
|
|
char flagsblah[256];
|
|
|
|
|
char *fillptr = flagsblah;
|
|
|
|
|
bool printed = false;
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < 3; ++i)
|
|
|
|
|
{
|
|
|
|
|
if (flagsvar & (1 << i))
|
|
|
|
|
{
|
|
|
|
|
if (printed)
|
|
|
|
|
{
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
fillptr += mysnprintf (fillptr, countof(flagsblah) - (fillptr - flagsblah), " ");
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
|
printed = true;
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
fillptr += mysnprintf (fillptr, countof(flagsblah) - (fillptr - flagsblah), "%s = %d", vars[i]->GetName (), **vars[i]);
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
screen->DrawText (ValueColor,
|
|
|
|
|
160 - (SmallFont->StringWidth (flagsblah) >> 1), 0, flagsblah,
|
|
|
|
|
DTA_Clean, true, TAG_DONE);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void M_OptResponder (event_t *ev)
|
|
|
|
|
{
|
|
|
|
|
menuitem_t *item;
|
|
|
|
|
int ch = tolower (ev->data1);
|
|
|
|
|
UCVarValue value;
|
|
|
|
|
|
|
|
|
|
item = CurrentMenu->items + CurrentItem;
|
|
|
|
|
|
|
|
|
|
if (menuactive == MENU_WaitKey && ev->type == EV_KeyDown)
|
|
|
|
|
{
|
|
|
|
|
if (ev->data1 != KEY_ESCAPE)
|
|
|
|
|
{
|
|
|
|
|
C_ChangeBinding (item->e.command, ev->data1);
|
|
|
|
|
M_BuildKeyList (CurrentMenu->items, CurrentMenu->numitems);
|
|
|
|
|
}
|
|
|
|
|
menuactive = MENU_On;
|
|
|
|
|
CurrentMenu->items[0].label = OldMessage;
|
|
|
|
|
CurrentMenu->items[0].type = OldType;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ev->subtype == EV_GUI_KeyRepeat)
|
|
|
|
|
{
|
|
|
|
|
if (ch != GK_LEFT && ch != GK_RIGHT && ch != GK_UP && ch != GK_DOWN)
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (ev->subtype != EV_GUI_KeyDown)
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (item->type == bitflag &&
|
|
|
|
|
(ch == GK_LEFT || ch == GK_RIGHT || ch == '\r')
|
|
|
|
|
&& !demoplayback)
|
|
|
|
|
{
|
|
|
|
|
*(item->a.intcvar) = (*(item->a.intcvar)) ^ item->e.flagmask;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch (ch)
|
|
|
|
|
{
|
|
|
|
|
case GK_DOWN:
|
|
|
|
|
if (CurrentMenu->numitems > 1)
|
|
|
|
|
{
|
|
|
|
|
int modecol;
|
|
|
|
|
|
|
|
|
|
if (item->type == screenres)
|
|
|
|
|
{
|
|
|
|
|
modecol = item->a.selmode;
|
|
|
|
|
item->a.selmode = -1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
modecol = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
CurrentItem++;
|
|
|
|
|
if (CanScrollDown && CurrentItem == VisBottom)
|
|
|
|
|
{
|
|
|
|
|
CurrentMenu->scrollpos++;
|
|
|
|
|
VisBottom++;
|
|
|
|
|
}
|
|
|
|
|
if (CurrentItem == CurrentMenu->numitems)
|
|
|
|
|
{
|
|
|
|
|
CurrentMenu->scrollpos = 0;
|
|
|
|
|
CurrentItem = 0;
|
|
|
|
|
}
|
|
|
|
|
} while (CurrentMenu->items[CurrentItem].type == redtext ||
|
|
|
|
|
CurrentMenu->items[CurrentItem].type == whitetext ||
|
|
|
|
|
(CurrentMenu->items[CurrentItem].type == screenres &&
|
|
|
|
|
!CurrentMenu->items[CurrentItem].b.res1) ||
|
|
|
|
|
(CurrentMenu->items[CurrentItem].type == numberedmore &&
|
|
|
|
|
!CurrentMenu->items[CurrentItem].b.position));
|
|
|
|
|
|
|
|
|
|
if (CurrentMenu->items[CurrentItem].type == screenres)
|
|
|
|
|
{
|
|
|
|
|
item = &CurrentMenu->items[CurrentItem];
|
|
|
|
|
while ((modecol == 2 && !item->d.res3) || (modecol == 1 && !item->c.res2))
|
|
|
|
|
{
|
|
|
|
|
modecol--;
|
|
|
|
|
}
|
|
|
|
|
CurrentMenu->items[CurrentItem].a.selmode = modecol;
|
|
|
|
|
}
|
|
|
|
|
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/cursor", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case GK_UP:
|
|
|
|
|
if (CurrentMenu->numitems > 1)
|
|
|
|
|
{
|
|
|
|
|
int modecol;
|
|
|
|
|
|
|
|
|
|
if (item->type == screenres)
|
|
|
|
|
{
|
|
|
|
|
modecol = item->a.selmode;
|
|
|
|
|
item->a.selmode = -1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
modecol = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
CurrentItem--;
|
|
|
|
|
if (CurrentMenu->scrollpos > 0 &&
|
|
|
|
|
CurrentItem == CurrentMenu->scrolltop + CurrentMenu->scrollpos)
|
|
|
|
|
{
|
|
|
|
|
CurrentMenu->scrollpos--;
|
|
|
|
|
}
|
|
|
|
|
if (CurrentItem < 0)
|
|
|
|
|
{
|
|
|
|
|
int maxitems, rowheight;
|
|
|
|
|
|
|
|
|
|
// Figure out how many lines of text fit on the menu
|
|
|
|
|
if (BigFont && CurrentMenu->texttitle)
|
|
|
|
|
{
|
|
|
|
|
maxitems = 15 + BigFont->GetHeight ();
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
maxitems = 15;
|
|
|
|
|
}
|
|
|
|
|
if (gameinfo.gametype != GAME_Doom)
|
|
|
|
|
{
|
|
|
|
|
maxitems -= 2;
|
|
|
|
|
rowheight = 9;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
rowheight = 8;
|
|
|
|
|
}
|
|
|
|
|
maxitems = (200 - SmallFont->GetHeight () - maxitems) / rowheight + 1;
|
|
|
|
|
|
|
|
|
|
CurrentMenu->scrollpos = MAX (0,CurrentMenu->numitems - maxitems + CurrentMenu->scrolltop);
|
|
|
|
|
CurrentItem = CurrentMenu->numitems - 1;
|
|
|
|
|
}
|
|
|
|
|
} while (CurrentMenu->items[CurrentItem].type == redtext ||
|
|
|
|
|
CurrentMenu->items[CurrentItem].type == whitetext ||
|
|
|
|
|
(CurrentMenu->items[CurrentItem].type == screenres &&
|
|
|
|
|
!CurrentMenu->items[CurrentItem].b.res1) ||
|
|
|
|
|
(CurrentMenu->items[CurrentItem].type == numberedmore &&
|
|
|
|
|
!CurrentMenu->items[CurrentItem].b.position));
|
|
|
|
|
|
|
|
|
|
if (CurrentMenu->items[CurrentItem].type == screenres)
|
|
|
|
|
CurrentMenu->items[CurrentItem].a.selmode = modecol;
|
|
|
|
|
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/cursor", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case GK_PGUP:
|
|
|
|
|
if (CurrentMenu->scrollpos > 0)
|
|
|
|
|
{
|
|
|
|
|
CurrentMenu->scrollpos -= VisBottom - CurrentMenu->scrollpos - CurrentMenu->scrolltop;
|
|
|
|
|
if (CurrentMenu->scrollpos < 0)
|
|
|
|
|
{
|
|
|
|
|
CurrentMenu->scrollpos = 0;
|
|
|
|
|
}
|
|
|
|
|
CurrentItem = CurrentMenu->scrolltop + CurrentMenu->scrollpos + 1;
|
|
|
|
|
while (CurrentMenu->items[CurrentItem].type == redtext ||
|
|
|
|
|
CurrentMenu->items[CurrentItem].type == whitetext ||
|
|
|
|
|
(CurrentMenu->items[CurrentItem].type == screenres &&
|
|
|
|
|
!CurrentMenu->items[CurrentItem].b.res1) ||
|
|
|
|
|
(CurrentMenu->items[CurrentItem].type == numberedmore &&
|
|
|
|
|
!CurrentMenu->items[CurrentItem].b.position))
|
|
|
|
|
{
|
|
|
|
|
++CurrentItem;
|
|
|
|
|
}
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/cursor", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case GK_PGDN:
|
|
|
|
|
if (CanScrollDown)
|
|
|
|
|
{
|
|
|
|
|
int pagesize = VisBottom - CurrentMenu->scrollpos - CurrentMenu->scrolltop;
|
|
|
|
|
CurrentMenu->scrollpos += pagesize;
|
|
|
|
|
if (CurrentMenu->scrollpos + CurrentMenu->scrolltop + pagesize > CurrentMenu->numitems)
|
|
|
|
|
{
|
|
|
|
|
CurrentMenu->scrollpos = CurrentMenu->numitems - CurrentMenu->scrolltop - pagesize;
|
|
|
|
|
}
|
|
|
|
|
CurrentItem = CurrentMenu->scrolltop + CurrentMenu->scrollpos + 1;
|
|
|
|
|
while (CurrentMenu->items[CurrentItem].type == redtext ||
|
|
|
|
|
CurrentMenu->items[CurrentItem].type == whitetext ||
|
|
|
|
|
(CurrentMenu->items[CurrentItem].type == screenres &&
|
|
|
|
|
!CurrentMenu->items[CurrentItem].b.res1) ||
|
|
|
|
|
(CurrentMenu->items[CurrentItem].type == numberedmore &&
|
|
|
|
|
!CurrentMenu->items[CurrentItem].b.position))
|
|
|
|
|
{
|
|
|
|
|
++CurrentItem;
|
|
|
|
|
}
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/cursor", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case GK_LEFT:
|
|
|
|
|
switch (item->type)
|
|
|
|
|
{
|
|
|
|
|
case slider:
|
|
|
|
|
case absslider:
|
|
|
|
|
case intslider:
|
|
|
|
|
{
|
|
|
|
|
UCVarValue newval;
|
|
|
|
|
bool reversed;
|
|
|
|
|
|
|
|
|
|
if (item->type == intslider)
|
|
|
|
|
value.Float = item->a.fval;
|
|
|
|
|
else
|
|
|
|
|
value = item->a.cvar->GetGenericRep (CVAR_Float);
|
|
|
|
|
reversed = item->type == absslider && value.Float < 0.f;
|
|
|
|
|
newval.Float = (reversed ? -value.Float : value.Float) - item->d.step;
|
|
|
|
|
|
|
|
|
|
if (newval.Float < item->b.min)
|
|
|
|
|
newval.Float = item->b.min;
|
|
|
|
|
else if (newval.Float > item->c.max)
|
|
|
|
|
newval.Float = item->c.max;
|
|
|
|
|
|
|
|
|
|
if (reversed)
|
|
|
|
|
{
|
|
|
|
|
newval.Float = -newval.Float;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (item->type == intslider)
|
|
|
|
|
item->a.fval = newval.Float;
|
|
|
|
|
else if (item->e.cfunc)
|
|
|
|
|
item->e.cfunc (item->a.cvar, newval.Float);
|
|
|
|
|
else
|
|
|
|
|
item->a.cvar->SetGenericRep (newval, CVAR_Float);
|
|
|
|
|
}
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/change", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case palettegrid:
|
|
|
|
|
SelColorIndex = (SelColorIndex - 1) & 15;
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/cursor", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case discretes:
|
|
|
|
|
case discrete:
|
|
|
|
|
case cdiscrete:
|
|
|
|
|
{
|
|
|
|
|
int cur;
|
|
|
|
|
int numvals;
|
|
|
|
|
|
|
|
|
|
numvals = (int)item->b.min;
|
|
|
|
|
value = item->a.cvar->GetGenericRep (CVAR_Float);
|
|
|
|
|
if (item->type != discretes)
|
|
|
|
|
{
|
|
|
|
|
cur = M_FindCurVal (value.Float, item->e.values, numvals);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
cur = M_FindCurVal (value.Float, item->e.valuestrings, numvals);
|
|
|
|
|
}
|
|
|
|
|
if (--cur < 0)
|
|
|
|
|
cur = numvals - 1;
|
|
|
|
|
|
|
|
|
|
value.Float = item->type != discretes ? item->e.values[cur].value : item->e.valuestrings[cur].value;
|
|
|
|
|
item->a.cvar->SetGenericRep (value, CVAR_Float);
|
|
|
|
|
|
|
|
|
|
// Hack hack. Rebuild list of resolutions
|
|
|
|
|
if (item->e.values == Depths)
|
|
|
|
|
BuildModesList (SCREENWIDTH, SCREENHEIGHT, DisplayBits);
|
|
|
|
|
}
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/change", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
break;
|
|
|
|
|
|
- Update to ZDoom r858:
- Added FMOD_OPENONLY to the callback version of CreateStream() to prevent it
from doing prebuffering of the song. This was causing the Linux version to
hang while waiting for input from the pipe, since Timidity hadn't been
started yet. I tried using a select call in the FillStream() method, but it
always seems to return the pipe as having nothing available. Unfortunately,
the game still falls all over itself if Timidity isn't available. Instead
of execvp failing nicely, X errors kill the game. I don't know why it's
doing that. My advice for Linux music: Skip Timidity++ and get a DLS patch
set (/WINDOWS/system32/drivers/gm.dls is probably the most common by far)
and set the snd_midipatchset cvar to point to it. It's faster and also
sounds a whole lot better than the crappy freepats Ubuntu wants to install
with Timidity++ (thank goodness I have the official patches from a real
GUS so I don't need to use them).
- GCC fixes.
- Fixed: After starting new music the music volume has to be reset so that
the song's relative volume takes effect.
- Removed the arbitrary 1024 bytes limit when the file being played is a MIDI
file. I had a D_DM2TTL that's only 990 bytes.
- Restructured I_RegisterSong so that $mididevice works again and also supports
selecting FMOD.
- Added Jim' Linux fix.
- Added MartinHowe's fix for mugshot display in status bars.
- The garbage collector is now run one last time just before exiting the game.
- Removed movie volume from the sound menu and renamed some of the other
options to give the MIDI device name more room to display itself.
- Moved the midi device selection into the main sound menu.
- Added FMOD as MIDI device -1, to replace the MIDI mapper. This is still the
default device. By default, it uses exactly the same DLS instruments as the
Microsoft GS Wavetable Synth. If you have another set DLS level 1 patch set
you want to use, set the snd_midipatchset cvar to specify where it should
load the instruments from.
- Changed the ProduceMIDI function to store its output into a TArray<BYTE>.
An overloaded version wraps around it to continue to supply file-writing
support for external Timidity++ usage.
- Added an FMOD credits banner to comply with their non-commercial license.
- Reimplemented the snd_buffersize cvar for the FMOD Ex sound system. Rather
than a time in ms, this is now the length in samples of the DSP buffer.
Also added the snd_buffercount cvar to offer complete control over the
call to FMOD::System::setDSPBufferSize(). Note that with any snd_samplerate
below about 44kHz, you will need to set snd_buffersize to avoid long
latencies.
- Reimplemented the snd_output cvar for the FMOD Ex sound system.
- Changed snd_samplerate default to 0. This now means to use the default
sample rate.
- Made snd_output, snd_output_format, snd_speakermode, snd_resampler, and
snd_hrtf available through the menu.
- Split the HRTF effect selection into its own cvar: snd_hrtf.
- Removed 96000 Hz option from the menu. It's still available through the
cvar, if desired.
- Fixed: If Windows sound init failed, retry with DirectSound. (Apparently,
WASAPI doesn't work with more than two speakers and PCM-Float output at the
same time.)
- Fixed: Area sounds only played from the front speakers once you got within
the 2D panning area.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@79 b0f79afe-0144-0410-b225-9a4edf0717df
2008-03-27 18:31:46 +00:00
|
|
|
case ediscrete:
|
|
|
|
|
value = item->a.cvar->GetGenericRep(CVAR_String);
|
|
|
|
|
value.String = const_cast<char *>(M_FindPrevVal(value.String, item->e.enumvalues, (int)item->b.numvalues));
|
|
|
|
|
item->a.cvar->SetGenericRep(value, CVAR_String);
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/change", 1, ATTN_NONE);
|
- Update to ZDoom r858:
- Added FMOD_OPENONLY to the callback version of CreateStream() to prevent it
from doing prebuffering of the song. This was causing the Linux version to
hang while waiting for input from the pipe, since Timidity hadn't been
started yet. I tried using a select call in the FillStream() method, but it
always seems to return the pipe as having nothing available. Unfortunately,
the game still falls all over itself if Timidity isn't available. Instead
of execvp failing nicely, X errors kill the game. I don't know why it's
doing that. My advice for Linux music: Skip Timidity++ and get a DLS patch
set (/WINDOWS/system32/drivers/gm.dls is probably the most common by far)
and set the snd_midipatchset cvar to point to it. It's faster and also
sounds a whole lot better than the crappy freepats Ubuntu wants to install
with Timidity++ (thank goodness I have the official patches from a real
GUS so I don't need to use them).
- GCC fixes.
- Fixed: After starting new music the music volume has to be reset so that
the song's relative volume takes effect.
- Removed the arbitrary 1024 bytes limit when the file being played is a MIDI
file. I had a D_DM2TTL that's only 990 bytes.
- Restructured I_RegisterSong so that $mididevice works again and also supports
selecting FMOD.
- Added Jim' Linux fix.
- Added MartinHowe's fix for mugshot display in status bars.
- The garbage collector is now run one last time just before exiting the game.
- Removed movie volume from the sound menu and renamed some of the other
options to give the MIDI device name more room to display itself.
- Moved the midi device selection into the main sound menu.
- Added FMOD as MIDI device -1, to replace the MIDI mapper. This is still the
default device. By default, it uses exactly the same DLS instruments as the
Microsoft GS Wavetable Synth. If you have another set DLS level 1 patch set
you want to use, set the snd_midipatchset cvar to specify where it should
load the instruments from.
- Changed the ProduceMIDI function to store its output into a TArray<BYTE>.
An overloaded version wraps around it to continue to supply file-writing
support for external Timidity++ usage.
- Added an FMOD credits banner to comply with their non-commercial license.
- Reimplemented the snd_buffersize cvar for the FMOD Ex sound system. Rather
than a time in ms, this is now the length in samples of the DSP buffer.
Also added the snd_buffercount cvar to offer complete control over the
call to FMOD::System::setDSPBufferSize(). Note that with any snd_samplerate
below about 44kHz, you will need to set snd_buffersize to avoid long
latencies.
- Reimplemented the snd_output cvar for the FMOD Ex sound system.
- Changed snd_samplerate default to 0. This now means to use the default
sample rate.
- Made snd_output, snd_output_format, snd_speakermode, snd_resampler, and
snd_hrtf available through the menu.
- Split the HRTF effect selection into its own cvar: snd_hrtf.
- Removed 96000 Hz option from the menu. It's still available through the
cvar, if desired.
- Fixed: If Windows sound init failed, retry with DirectSound. (Apparently,
WASAPI doesn't work with more than two speakers and PCM-Float output at the
same time.)
- Fixed: Area sounds only played from the front speakers once you got within
the 2D panning area.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@79 b0f79afe-0144-0410-b225-9a4edf0717df
2008-03-27 18:31:46 +00:00
|
|
|
break;
|
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
case bitmask:
|
|
|
|
|
{
|
|
|
|
|
int cur;
|
|
|
|
|
int numvals;
|
|
|
|
|
int bmask = int(item->c.max);
|
|
|
|
|
|
|
|
|
|
numvals = (int)item->b.min;
|
|
|
|
|
value = item->a.cvar->GetGenericRep (CVAR_Int);
|
|
|
|
|
|
|
|
|
|
cur = M_FindCurVal (value.Int & bmask, item->e.values, numvals);
|
|
|
|
|
if (--cur < 0)
|
|
|
|
|
cur = numvals - 1;
|
|
|
|
|
|
|
|
|
|
value.Int = (value.Int & ~bmask) | int(item->e.values[cur].value);
|
|
|
|
|
item->a.cvar->SetGenericRep (value, CVAR_Int);
|
|
|
|
|
}
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/change", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case discrete_guid:
|
|
|
|
|
{
|
|
|
|
|
int cur;
|
|
|
|
|
int numvals;
|
|
|
|
|
|
|
|
|
|
numvals = (int)item->b.numvalues;
|
|
|
|
|
cur = M_FindCurGUID (*(item->a.guidcvar), item->e.guidvalues, numvals);
|
|
|
|
|
if (--cur < 0)
|
|
|
|
|
cur = numvals - 1;
|
|
|
|
|
|
|
|
|
|
*(item->a.guidcvar) = item->e.guidvalues[cur].ID;
|
|
|
|
|
}
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/change", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case inverter:
|
|
|
|
|
value = item->a.cvar->GetGenericRep (CVAR_Float);
|
|
|
|
|
value.Float = -value.Float;
|
|
|
|
|
item->a.cvar->SetGenericRep (value, CVAR_Float);
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/change", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case screenres:
|
|
|
|
|
{
|
|
|
|
|
int col;
|
|
|
|
|
|
|
|
|
|
col = item->a.selmode - 1;
|
|
|
|
|
if (col < 0)
|
|
|
|
|
{
|
|
|
|
|
if (CurrentItem > 0)
|
|
|
|
|
{
|
|
|
|
|
if (CurrentMenu->items[CurrentItem - 1].type == screenres)
|
|
|
|
|
{
|
|
|
|
|
item->a.selmode = -1;
|
|
|
|
|
CurrentMenu->items[--CurrentItem].a.selmode = 2;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
item->a.selmode = col;
|
|
|
|
|
}
|
|
|
|
|
}
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/cursor", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case GK_RIGHT:
|
|
|
|
|
switch (item->type)
|
|
|
|
|
{
|
|
|
|
|
case slider:
|
|
|
|
|
case absslider:
|
|
|
|
|
case intslider:
|
|
|
|
|
{
|
|
|
|
|
UCVarValue newval;
|
|
|
|
|
bool reversed;
|
|
|
|
|
|
|
|
|
|
if (item->type == intslider)
|
|
|
|
|
value.Float = item->a.fval;
|
|
|
|
|
else
|
|
|
|
|
value = item->a.cvar->GetGenericRep (CVAR_Float);
|
|
|
|
|
reversed = item->type == absslider && value.Float < 0.f;
|
|
|
|
|
newval.Float = (reversed ? -value.Float : value.Float) + item->d.step;
|
|
|
|
|
|
|
|
|
|
if (newval.Float > item->c.max)
|
|
|
|
|
newval.Float = item->c.max;
|
|
|
|
|
else if (newval.Float < item->b.min)
|
|
|
|
|
newval.Float = item->b.min;
|
|
|
|
|
|
|
|
|
|
if (reversed)
|
|
|
|
|
{
|
|
|
|
|
newval.Float = -newval.Float;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (item->type == intslider)
|
|
|
|
|
item->a.fval = newval.Float;
|
|
|
|
|
else if (item->e.cfunc)
|
|
|
|
|
item->e.cfunc (item->a.cvar, newval.Float);
|
|
|
|
|
else
|
|
|
|
|
item->a.cvar->SetGenericRep (newval, CVAR_Float);
|
|
|
|
|
}
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/change", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case palettegrid:
|
|
|
|
|
SelColorIndex = (SelColorIndex + 1) & 15;
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/cursor", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case discretes:
|
|
|
|
|
case discrete:
|
|
|
|
|
case cdiscrete:
|
|
|
|
|
{
|
|
|
|
|
int cur;
|
|
|
|
|
int numvals;
|
|
|
|
|
|
|
|
|
|
numvals = (int)item->b.min;
|
|
|
|
|
value = item->a.cvar->GetGenericRep (CVAR_Float);
|
|
|
|
|
if (item->type != discretes)
|
|
|
|
|
{
|
|
|
|
|
cur = M_FindCurVal (value.Float, item->e.values, numvals);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
cur = M_FindCurVal (value.Float, item->e.valuestrings, numvals);
|
|
|
|
|
}
|
|
|
|
|
if (++cur >= numvals)
|
|
|
|
|
cur = 0;
|
|
|
|
|
|
|
|
|
|
value.Float = item->type != discretes ? item->e.values[cur].value : item->e.valuestrings[cur].value;
|
|
|
|
|
item->a.cvar->SetGenericRep (value, CVAR_Float);
|
|
|
|
|
|
|
|
|
|
// Hack hack. Rebuild list of resolutions
|
|
|
|
|
if (item->e.values == Depths)
|
|
|
|
|
BuildModesList (SCREENWIDTH, SCREENHEIGHT, DisplayBits);
|
|
|
|
|
}
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/change", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
break;
|
|
|
|
|
|
- Update to ZDoom r858:
- Added FMOD_OPENONLY to the callback version of CreateStream() to prevent it
from doing prebuffering of the song. This was causing the Linux version to
hang while waiting for input from the pipe, since Timidity hadn't been
started yet. I tried using a select call in the FillStream() method, but it
always seems to return the pipe as having nothing available. Unfortunately,
the game still falls all over itself if Timidity isn't available. Instead
of execvp failing nicely, X errors kill the game. I don't know why it's
doing that. My advice for Linux music: Skip Timidity++ and get a DLS patch
set (/WINDOWS/system32/drivers/gm.dls is probably the most common by far)
and set the snd_midipatchset cvar to point to it. It's faster and also
sounds a whole lot better than the crappy freepats Ubuntu wants to install
with Timidity++ (thank goodness I have the official patches from a real
GUS so I don't need to use them).
- GCC fixes.
- Fixed: After starting new music the music volume has to be reset so that
the song's relative volume takes effect.
- Removed the arbitrary 1024 bytes limit when the file being played is a MIDI
file. I had a D_DM2TTL that's only 990 bytes.
- Restructured I_RegisterSong so that $mididevice works again and also supports
selecting FMOD.
- Added Jim' Linux fix.
- Added MartinHowe's fix for mugshot display in status bars.
- The garbage collector is now run one last time just before exiting the game.
- Removed movie volume from the sound menu and renamed some of the other
options to give the MIDI device name more room to display itself.
- Moved the midi device selection into the main sound menu.
- Added FMOD as MIDI device -1, to replace the MIDI mapper. This is still the
default device. By default, it uses exactly the same DLS instruments as the
Microsoft GS Wavetable Synth. If you have another set DLS level 1 patch set
you want to use, set the snd_midipatchset cvar to specify where it should
load the instruments from.
- Changed the ProduceMIDI function to store its output into a TArray<BYTE>.
An overloaded version wraps around it to continue to supply file-writing
support for external Timidity++ usage.
- Added an FMOD credits banner to comply with their non-commercial license.
- Reimplemented the snd_buffersize cvar for the FMOD Ex sound system. Rather
than a time in ms, this is now the length in samples of the DSP buffer.
Also added the snd_buffercount cvar to offer complete control over the
call to FMOD::System::setDSPBufferSize(). Note that with any snd_samplerate
below about 44kHz, you will need to set snd_buffersize to avoid long
latencies.
- Reimplemented the snd_output cvar for the FMOD Ex sound system.
- Changed snd_samplerate default to 0. This now means to use the default
sample rate.
- Made snd_output, snd_output_format, snd_speakermode, snd_resampler, and
snd_hrtf available through the menu.
- Split the HRTF effect selection into its own cvar: snd_hrtf.
- Removed 96000 Hz option from the menu. It's still available through the
cvar, if desired.
- Fixed: If Windows sound init failed, retry with DirectSound. (Apparently,
WASAPI doesn't work with more than two speakers and PCM-Float output at the
same time.)
- Fixed: Area sounds only played from the front speakers once you got within
the 2D panning area.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@79 b0f79afe-0144-0410-b225-9a4edf0717df
2008-03-27 18:31:46 +00:00
|
|
|
case ediscrete:
|
|
|
|
|
value = item->a.cvar->GetGenericRep(CVAR_String);
|
|
|
|
|
value.String = const_cast<char *>(M_FindNextVal(value.String, item->e.enumvalues, (int)item->b.numvalues));
|
|
|
|
|
item->a.cvar->SetGenericRep(value, CVAR_String);
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/change", 1, ATTN_NONE);
|
- Update to ZDoom r858:
- Added FMOD_OPENONLY to the callback version of CreateStream() to prevent it
from doing prebuffering of the song. This was causing the Linux version to
hang while waiting for input from the pipe, since Timidity hadn't been
started yet. I tried using a select call in the FillStream() method, but it
always seems to return the pipe as having nothing available. Unfortunately,
the game still falls all over itself if Timidity isn't available. Instead
of execvp failing nicely, X errors kill the game. I don't know why it's
doing that. My advice for Linux music: Skip Timidity++ and get a DLS patch
set (/WINDOWS/system32/drivers/gm.dls is probably the most common by far)
and set the snd_midipatchset cvar to point to it. It's faster and also
sounds a whole lot better than the crappy freepats Ubuntu wants to install
with Timidity++ (thank goodness I have the official patches from a real
GUS so I don't need to use them).
- GCC fixes.
- Fixed: After starting new music the music volume has to be reset so that
the song's relative volume takes effect.
- Removed the arbitrary 1024 bytes limit when the file being played is a MIDI
file. I had a D_DM2TTL that's only 990 bytes.
- Restructured I_RegisterSong so that $mididevice works again and also supports
selecting FMOD.
- Added Jim' Linux fix.
- Added MartinHowe's fix for mugshot display in status bars.
- The garbage collector is now run one last time just before exiting the game.
- Removed movie volume from the sound menu and renamed some of the other
options to give the MIDI device name more room to display itself.
- Moved the midi device selection into the main sound menu.
- Added FMOD as MIDI device -1, to replace the MIDI mapper. This is still the
default device. By default, it uses exactly the same DLS instruments as the
Microsoft GS Wavetable Synth. If you have another set DLS level 1 patch set
you want to use, set the snd_midipatchset cvar to specify where it should
load the instruments from.
- Changed the ProduceMIDI function to store its output into a TArray<BYTE>.
An overloaded version wraps around it to continue to supply file-writing
support for external Timidity++ usage.
- Added an FMOD credits banner to comply with their non-commercial license.
- Reimplemented the snd_buffersize cvar for the FMOD Ex sound system. Rather
than a time in ms, this is now the length in samples of the DSP buffer.
Also added the snd_buffercount cvar to offer complete control over the
call to FMOD::System::setDSPBufferSize(). Note that with any snd_samplerate
below about 44kHz, you will need to set snd_buffersize to avoid long
latencies.
- Reimplemented the snd_output cvar for the FMOD Ex sound system.
- Changed snd_samplerate default to 0. This now means to use the default
sample rate.
- Made snd_output, snd_output_format, snd_speakermode, snd_resampler, and
snd_hrtf available through the menu.
- Split the HRTF effect selection into its own cvar: snd_hrtf.
- Removed 96000 Hz option from the menu. It's still available through the
cvar, if desired.
- Fixed: If Windows sound init failed, retry with DirectSound. (Apparently,
WASAPI doesn't work with more than two speakers and PCM-Float output at the
same time.)
- Fixed: Area sounds only played from the front speakers once you got within
the 2D panning area.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@79 b0f79afe-0144-0410-b225-9a4edf0717df
2008-03-27 18:31:46 +00:00
|
|
|
break;
|
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
case bitmask:
|
|
|
|
|
{
|
|
|
|
|
int cur;
|
|
|
|
|
int numvals;
|
|
|
|
|
int bmask = int(item->c.max);
|
|
|
|
|
|
|
|
|
|
numvals = (int)item->b.min;
|
|
|
|
|
value = item->a.cvar->GetGenericRep (CVAR_Int);
|
|
|
|
|
|
|
|
|
|
cur = M_FindCurVal (value.Int & bmask, item->e.values, numvals);
|
|
|
|
|
if (++cur >= numvals)
|
|
|
|
|
cur = 0;
|
|
|
|
|
|
|
|
|
|
value.Int = (value.Int & ~bmask) | int(item->e.values[cur].value);
|
|
|
|
|
item->a.cvar->SetGenericRep (value, CVAR_Int);
|
|
|
|
|
}
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/change", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case discrete_guid:
|
|
|
|
|
{
|
|
|
|
|
int cur;
|
|
|
|
|
int numvals;
|
|
|
|
|
|
|
|
|
|
numvals = (int)item->b.numvalues;
|
|
|
|
|
cur = M_FindCurGUID (*(item->a.guidcvar), item->e.guidvalues, numvals);
|
|
|
|
|
if (++cur >= numvals)
|
|
|
|
|
cur = 0;
|
|
|
|
|
|
|
|
|
|
*(item->a.guidcvar) = item->e.guidvalues[cur].ID;
|
|
|
|
|
}
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/change", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case inverter:
|
|
|
|
|
value = item->a.cvar->GetGenericRep (CVAR_Float);
|
|
|
|
|
value.Float = -value.Float;
|
|
|
|
|
item->a.cvar->SetGenericRep (value, CVAR_Float);
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/change", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case screenres:
|
|
|
|
|
{
|
|
|
|
|
int col;
|
|
|
|
|
|
|
|
|
|
col = item->a.selmode + 1;
|
|
|
|
|
if ((col > 2) || (col == 2 && !item->d.res3) || (col == 1 && !item->c.res2))
|
|
|
|
|
{
|
|
|
|
|
if (CurrentMenu->numitems - 1 > CurrentItem)
|
|
|
|
|
{
|
|
|
|
|
if (CurrentMenu->items[CurrentItem + 1].type == screenres)
|
|
|
|
|
{
|
|
|
|
|
if (CurrentMenu->items[CurrentItem + 1].b.res1)
|
|
|
|
|
{
|
|
|
|
|
item->a.selmode = -1;
|
|
|
|
|
CurrentMenu->items[++CurrentItem].a.selmode = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
item->a.selmode = col;
|
|
|
|
|
}
|
|
|
|
|
}
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/cursor", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '\b':
|
|
|
|
|
if (item->type == control)
|
|
|
|
|
{
|
|
|
|
|
C_UnbindACommand (item->e.command);
|
|
|
|
|
item->b.key1 = item->c.key2 = 0;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '0':
|
|
|
|
|
case '1':
|
|
|
|
|
case '2':
|
|
|
|
|
case '3':
|
|
|
|
|
case '4':
|
|
|
|
|
case '5':
|
|
|
|
|
case '6':
|
|
|
|
|
case '7':
|
|
|
|
|
case '8':
|
|
|
|
|
case '9':
|
|
|
|
|
{
|
|
|
|
|
int lookfor = ch == '0' ? 10 : ch - '0', i;
|
|
|
|
|
for (i = 0; i < CurrentMenu->numitems; ++i)
|
|
|
|
|
{
|
|
|
|
|
if (CurrentMenu->items[i].b.position == lookfor)
|
|
|
|
|
{
|
|
|
|
|
CurrentItem = i;
|
|
|
|
|
item = &CurrentMenu->items[i];
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (i == CurrentMenu->numitems)
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
// Otherwise, fall through to '\r' below
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case '\r':
|
|
|
|
|
if (CurrentMenu == &ModesMenu && item->type == screenres)
|
|
|
|
|
{
|
|
|
|
|
if (!GetSelectedSize (CurrentItem, &NewWidth, &NewHeight))
|
|
|
|
|
{
|
|
|
|
|
NewWidth = SCREENWIDTH;
|
|
|
|
|
NewHeight = SCREENHEIGHT;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
testingmode = 1;
|
|
|
|
|
setmodeneeded = true;
|
|
|
|
|
NewBits = BitTranslate[DummyDepthCvar];
|
|
|
|
|
}
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/choose", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
SetModesMenu (NewWidth, NewHeight, NewBits);
|
|
|
|
|
}
|
|
|
|
|
else if ((item->type == more ||
|
|
|
|
|
item->type == numberedmore ||
|
|
|
|
|
item->type == rightmore ||
|
|
|
|
|
item->type == rsafemore ||
|
|
|
|
|
item->type == safemore)
|
|
|
|
|
&& item->e.mfunc)
|
|
|
|
|
{
|
|
|
|
|
CurrentMenu->lastOn = CurrentItem;
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/choose", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
if (item->type == safemore || item->type == rsafemore)
|
|
|
|
|
{
|
|
|
|
|
ActivateConfirm (item->label, item->e.mfunc);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
item->e.mfunc();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (item->type == discrete || item->type == cdiscrete || item->type == discretes)
|
|
|
|
|
{
|
|
|
|
|
int cur;
|
|
|
|
|
int numvals;
|
|
|
|
|
|
|
|
|
|
numvals = (int)item->b.min;
|
|
|
|
|
value = item->a.cvar->GetGenericRep (CVAR_Float);
|
|
|
|
|
if (item->type != discretes)
|
|
|
|
|
{
|
|
|
|
|
cur = M_FindCurVal (value.Float, item->e.values, numvals);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
cur = M_FindCurVal (value.Float, item->e.valuestrings, numvals);
|
|
|
|
|
}
|
|
|
|
|
if (++cur >= numvals)
|
|
|
|
|
cur = 0;
|
|
|
|
|
|
|
|
|
|
value.Float = item->type != discretes ? item->e.values[cur].value : item->e.valuestrings[cur].value;
|
|
|
|
|
item->a.cvar->SetGenericRep (value, CVAR_Float);
|
|
|
|
|
|
|
|
|
|
// Hack hack. Rebuild list of resolutions
|
|
|
|
|
if (item->e.values == Depths)
|
|
|
|
|
BuildModesList (SCREENWIDTH, SCREENHEIGHT, DisplayBits);
|
|
|
|
|
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/change", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
|
else if (item->type == control)
|
|
|
|
|
{
|
|
|
|
|
menuactive = MENU_WaitKey;
|
|
|
|
|
OldMessage = CurrentMenu->items[0].label;
|
|
|
|
|
OldType = CurrentMenu->items[0].type;
|
|
|
|
|
CurrentMenu->items[0].label = "Press new key for control, ESC to cancel";
|
|
|
|
|
CurrentMenu->items[0].type = redtext;
|
|
|
|
|
}
|
|
|
|
|
else if (item->type == listelement)
|
|
|
|
|
{
|
|
|
|
|
CurrentMenu->lastOn = CurrentItem;
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/choose", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
item->e.lfunc (CurrentItem);
|
|
|
|
|
}
|
|
|
|
|
else if (item->type == inverter)
|
|
|
|
|
{
|
|
|
|
|
value = item->a.cvar->GetGenericRep (CVAR_Float);
|
|
|
|
|
value.Float = -value.Float;
|
|
|
|
|
item->a.cvar->SetGenericRep (value, CVAR_Float);
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/change", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
|
else if (item->type == screenres)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
else if (item->type == colorpicker)
|
|
|
|
|
{
|
|
|
|
|
CurrentMenu->lastOn = CurrentItem;
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/choose", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
StartColorPickerMenu (item->label, item->a.colorcvar);
|
|
|
|
|
}
|
|
|
|
|
else if (item->type == palettegrid)
|
|
|
|
|
{
|
|
|
|
|
UpdateSelColor (SelColorIndex + int(item->b.min * 16));
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case GK_ESCAPE:
|
|
|
|
|
CurrentMenu->lastOn = CurrentItem;
|
|
|
|
|
if (CurrentMenu->EscapeHandler != NULL)
|
|
|
|
|
{
|
|
|
|
|
CurrentMenu->EscapeHandler ();
|
|
|
|
|
}
|
|
|
|
|
M_PopMenuStack ();
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
if (ch == 't')
|
|
|
|
|
{
|
|
|
|
|
// Test selected resolution
|
|
|
|
|
if (CurrentMenu == &ModesMenu)
|
|
|
|
|
{
|
|
|
|
|
if (!(item->type == screenres &&
|
|
|
|
|
GetSelectedSize (CurrentItem, &NewWidth, &NewHeight)))
|
|
|
|
|
{
|
|
|
|
|
NewWidth = SCREENWIDTH;
|
|
|
|
|
NewHeight = SCREENHEIGHT;
|
|
|
|
|
}
|
|
|
|
|
OldWidth = SCREENWIDTH;
|
|
|
|
|
OldHeight = SCREENHEIGHT;
|
|
|
|
|
OldBits = DisplayBits;
|
|
|
|
|
NewBits = BitTranslate[DummyDepthCvar];
|
|
|
|
|
setmodeneeded = true;
|
|
|
|
|
testingmode = I_GetTime(false) + 5 * TICRATE;
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, "menu/choose", 1, ATTN_NONE);
|
2008-01-27 11:25:03 +00:00
|
|
|
SetModesMenu (NewWidth, NewHeight, NewBits);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void GoToConsole (void)
|
|
|
|
|
{
|
|
|
|
|
M_ClearMenus ();
|
|
|
|
|
C_ToggleConsole ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void UpdateStuff (void)
|
|
|
|
|
{
|
|
|
|
|
M_SizeDisplay (0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Reset2Defaults (void)
|
|
|
|
|
{
|
|
|
|
|
C_SetDefaultBindings ();
|
|
|
|
|
C_SetCVarsToDefaults ();
|
|
|
|
|
UpdateStuff();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Reset2Saved (void)
|
|
|
|
|
{
|
|
|
|
|
GameConfig->DoGlobalSetup ();
|
|
|
|
|
GameConfig->DoGameSetup (GameNames[gameinfo.gametype]);
|
|
|
|
|
UpdateStuff();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void StartMessagesMenu (void)
|
|
|
|
|
{
|
|
|
|
|
M_SwitchMenu (&MessagesMenu);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void StartAutomapMenu (void)
|
|
|
|
|
{
|
|
|
|
|
M_SwitchMenu (&AutomapMenu);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void StartScoreboardMenu (void)
|
|
|
|
|
{
|
|
|
|
|
M_SwitchMenu (&ScoreboardMenu);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CCMD (menu_messages)
|
|
|
|
|
{
|
|
|
|
|
M_StartControlPanel (true);
|
|
|
|
|
OptionsActive = true;
|
|
|
|
|
StartMessagesMenu ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CCMD (menu_automap)
|
|
|
|
|
{
|
|
|
|
|
M_StartControlPanel (true);
|
|
|
|
|
OptionsActive = true;
|
|
|
|
|
StartAutomapMenu ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CCMD (menu_scoreboard)
|
|
|
|
|
{
|
|
|
|
|
M_StartControlPanel (true);
|
|
|
|
|
OptionsActive = true;
|
|
|
|
|
StartScoreboardMenu ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void StartMapColorsMenu (void)
|
|
|
|
|
{
|
|
|
|
|
M_SwitchMenu (&MapColorsMenu);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CCMD (menu_mapcolors)
|
|
|
|
|
{
|
|
|
|
|
M_StartControlPanel (true);
|
|
|
|
|
OptionsActive = true;
|
|
|
|
|
StartMapColorsMenu ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void DefaultCustomColors ()
|
|
|
|
|
{
|
|
|
|
|
// Find the color cvars by scanning the MapColors menu.
|
|
|
|
|
for (int i = 0; i < MapColorsMenu.numitems; ++i)
|
|
|
|
|
{
|
|
|
|
|
if (MapColorsItems[i].type == colorpicker)
|
|
|
|
|
{
|
|
|
|
|
MapColorsItems[i].a.colorcvar->ResetToDefault ();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void ColorPickerDrawer ()
|
|
|
|
|
{
|
|
|
|
|
DWORD newColor = MAKEARGB(255,
|
|
|
|
|
int(ColorPickerItems[2].a.fval),
|
|
|
|
|
int(ColorPickerItems[3].a.fval),
|
|
|
|
|
int(ColorPickerItems[4].a.fval));
|
|
|
|
|
DWORD oldColor = DWORD(*ColorPickerItems[0].a.colorcvar) | 0xFF000000;
|
|
|
|
|
|
|
|
|
|
int x = screen->GetWidth()*2/3;
|
|
|
|
|
int y = (15 + BigFont->GetHeight() + SmallFont->GetHeight()*2 - 102) * CleanYfac + screen->GetHeight()/2;
|
|
|
|
|
|
|
|
|
|
screen->Clear (x, y, x + 48*CleanXfac, y + 48*CleanYfac, -1, oldColor);
|
|
|
|
|
screen->Clear (x + 48*CleanXfac, y, x + 48*2*CleanXfac, y + 48*CleanYfac, -1, newColor);
|
|
|
|
|
|
|
|
|
|
y += 49*CleanYfac;
|
|
|
|
|
screen->DrawText (CR_GRAY, x+(24-SmallFont->StringWidth("Old")/2)*CleanXfac, y,
|
|
|
|
|
"Old", DTA_CleanNoMove, true, TAG_DONE);
|
|
|
|
|
screen->DrawText (CR_WHITE, x+(48+24-SmallFont->StringWidth("New")/2)*CleanXfac, y,
|
|
|
|
|
"New", DTA_CleanNoMove, true, TAG_DONE);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void SetColorPickerSliders ()
|
|
|
|
|
{
|
|
|
|
|
FColorCVar *cvar = ColorPickerItems[0].a.colorcvar;
|
|
|
|
|
ColorPickerItems[2].a.fval = RPART(DWORD(*cvar));
|
|
|
|
|
ColorPickerItems[3].a.fval = GPART(DWORD(*cvar));
|
|
|
|
|
ColorPickerItems[4].a.fval = BPART(DWORD(*cvar));
|
|
|
|
|
CurrColorIndex = cvar->GetIndex();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void UpdateSelColor (int index)
|
|
|
|
|
{
|
|
|
|
|
ColorPickerItems[2].a.fval = GPalette.BaseColors[index].r;
|
|
|
|
|
ColorPickerItems[3].a.fval = GPalette.BaseColors[index].g;
|
|
|
|
|
ColorPickerItems[4].a.fval = GPalette.BaseColors[index].b;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void ColorPickerReset ()
|
|
|
|
|
{
|
|
|
|
|
SetColorPickerSliders ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void ActivateColorChoice ()
|
|
|
|
|
{
|
|
|
|
|
UCVarValue val;
|
|
|
|
|
val.Int = MAKERGB
|
|
|
|
|
(int(ColorPickerItems[2].a.fval),
|
|
|
|
|
int(ColorPickerItems[3].a.fval),
|
|
|
|
|
int(ColorPickerItems[4].a.fval));
|
|
|
|
|
ColorPickerItems[0].a.colorcvar->SetGenericRep (val, CVAR_Int);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void StartColorPickerMenu (const char *colorname, FColorCVar *cvar)
|
|
|
|
|
{
|
|
|
|
|
ColorPickerMenu.PreDraw = ColorPickerDrawer;
|
|
|
|
|
ColorPickerMenu.EscapeHandler = ActivateColorChoice;
|
|
|
|
|
ColorPickerItems[0].label = colorname;
|
|
|
|
|
ColorPickerItems[0].a.colorcvar = cvar;
|
|
|
|
|
SetColorPickerSliders ();
|
|
|
|
|
M_SwitchMenu (&ColorPickerMenu);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void CustomizeControls (void)
|
|
|
|
|
{
|
|
|
|
|
M_BuildKeyList (ControlsMenu.items, ControlsMenu.numitems);
|
|
|
|
|
M_SwitchMenu (&ControlsMenu);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CCMD (menu_keys)
|
|
|
|
|
{
|
|
|
|
|
M_StartControlPanel (true);
|
|
|
|
|
OptionsActive = true;
|
|
|
|
|
CustomizeControls ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
EXTERN_CVAR (Int, dmflags)
|
|
|
|
|
|
|
|
|
|
static void GameplayOptions (void)
|
|
|
|
|
{
|
|
|
|
|
M_SwitchMenu (&DMFlagsMenu);
|
|
|
|
|
flagsvar = SHOW_DMFlags | SHOW_DMFlags2;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CCMD (menu_gameplay)
|
|
|
|
|
{
|
|
|
|
|
M_StartControlPanel (true);
|
|
|
|
|
OptionsActive = true;
|
|
|
|
|
GameplayOptions ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void CompatibilityOptions (void)
|
|
|
|
|
{
|
|
|
|
|
M_SwitchMenu (&CompatibilityMenu);
|
|
|
|
|
flagsvar = SHOW_CompatFlags;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CCMD (menu_compatibility)
|
|
|
|
|
{
|
|
|
|
|
M_StartControlPanel (true);
|
|
|
|
|
OptionsActive = true;
|
|
|
|
|
CompatibilityOptions ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void MouseOptions ()
|
|
|
|
|
{
|
|
|
|
|
M_SwitchMenu (&MouseMenu);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CCMD (menu_mouse)
|
|
|
|
|
{
|
|
|
|
|
M_StartControlPanel (true);
|
|
|
|
|
OptionsActive = true;
|
|
|
|
|
MouseOptions ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void UpdateJoystickMenu ()
|
|
|
|
|
{
|
|
|
|
|
static FIntCVar * const cvars[8] =
|
|
|
|
|
{
|
|
|
|
|
&joy_xaxis, &joy_yaxis, &joy_zaxis,
|
|
|
|
|
&joy_xrot, &joy_yrot, &joy_zrot,
|
|
|
|
|
&joy_slider, &joy_dial
|
|
|
|
|
};
|
|
|
|
|
static FFloatCVar * const cvars2[5] =
|
|
|
|
|
{
|
|
|
|
|
&joy_yawspeed, &joy_pitchspeed, &joy_forwardspeed,
|
|
|
|
|
&joy_sidespeed, &joy_upspeed
|
|
|
|
|
};
|
|
|
|
|
static FFloatCVar * const cvars3[8] =
|
|
|
|
|
{
|
|
|
|
|
&joy_xthreshold, &joy_ythreshold, &joy_zthreshold,
|
|
|
|
|
&joy_xrotthreshold, &joy_yrotthreshold, &joy_zrotthreshold,
|
|
|
|
|
&joy_sliderthreshold, &joy_dialthreshold
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
int i, line;
|
|
|
|
|
|
|
|
|
|
if (JoystickNames.Size() == 0)
|
|
|
|
|
{
|
|
|
|
|
JoystickItems[0].type = redtext;
|
|
|
|
|
JoystickItems[0].label = "No joysticks connected";
|
|
|
|
|
line = 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
JoystickItems[0].type = discrete;
|
|
|
|
|
JoystickItems[0].label = "Enable joystick";
|
|
|
|
|
|
|
|
|
|
JoystickItems[1].b.numvalues = float(JoystickNames.Size());
|
|
|
|
|
JoystickItems[1].e.guidvalues = &JoystickNames[0];
|
|
|
|
|
|
|
|
|
|
line = 5;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < 8; ++i)
|
|
|
|
|
{
|
|
|
|
|
if (JoyAxisNames[i] != NULL)
|
|
|
|
|
{
|
|
|
|
|
JoystickItems[line].label = JoyAxisNames[i];
|
|
|
|
|
JoystickItems[line].type = discrete;
|
|
|
|
|
JoystickItems[line].a.intcvar = cvars[i];
|
|
|
|
|
JoystickItems[line].b.numvalues = 6.f;
|
|
|
|
|
JoystickItems[line].e.values = JoyAxisMapNames;
|
|
|
|
|
line++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JoystickItems[line].type = redtext;
|
|
|
|
|
JoystickItems[line].label = " ";
|
|
|
|
|
line++;
|
|
|
|
|
|
|
|
|
|
JoystickItems[line].type = whitetext;
|
|
|
|
|
JoystickItems[line].label = "Axis Sensitivity";
|
|
|
|
|
line++;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < 5; ++i)
|
|
|
|
|
{
|
|
|
|
|
JoystickItems[line].type = absslider;
|
|
|
|
|
JoystickItems[line].label = JoyAxisMapNames[i+1].name;
|
|
|
|
|
JoystickItems[line].a.cvar = cvars2[i];
|
|
|
|
|
JoystickItems[line].b.min = 0.0;
|
|
|
|
|
JoystickItems[line].c.max = 4.0;
|
|
|
|
|
JoystickItems[line].d.step = 0.2;
|
|
|
|
|
line++;
|
|
|
|
|
|
|
|
|
|
JoystickItems[line].type = inverter;
|
|
|
|
|
JoystickItems[line].label = JoyAxisMapNames[i+1].name;
|
|
|
|
|
JoystickItems[line].a.cvar = cvars2[i];
|
|
|
|
|
JoystickItems[line].e.values = Inversion;
|
|
|
|
|
line++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JoystickItems[line].type = redtext;
|
|
|
|
|
JoystickItems[line].label = " ";
|
|
|
|
|
line++;
|
|
|
|
|
|
|
|
|
|
JoystickItems[line].type = whitetext;
|
|
|
|
|
JoystickItems[line].label = "Axis Dead Zones";
|
|
|
|
|
line++;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < 8; ++i)
|
|
|
|
|
{
|
|
|
|
|
if (JoyAxisNames[i] != NULL)
|
|
|
|
|
{
|
|
|
|
|
JoystickItems[line].label = JoyAxisNames[i];
|
|
|
|
|
JoystickItems[line].type = slider;
|
|
|
|
|
JoystickItems[line].a.cvar = cvars3[i];
|
|
|
|
|
JoystickItems[line].b.min = 0.0;
|
|
|
|
|
JoystickItems[line].c.max = 0.9;
|
|
|
|
|
JoystickItems[line].d.step = 0.05;
|
|
|
|
|
line++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JoystickMenu.numitems = line;
|
|
|
|
|
if (JoystickMenu.lastOn >= line)
|
|
|
|
|
{
|
|
|
|
|
JoystickMenu.lastOn = line - 1;
|
|
|
|
|
}
|
|
|
|
|
if (screen != NULL)
|
|
|
|
|
{
|
|
|
|
|
CalcIndent (&JoystickMenu);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void JoystickOptions ()
|
|
|
|
|
{
|
|
|
|
|
UpdateJoystickMenu ();
|
|
|
|
|
M_SwitchMenu (&JoystickMenu);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CCMD (menu_joystick)
|
|
|
|
|
{
|
|
|
|
|
M_StartControlPanel (true);
|
|
|
|
|
OptionsActive = true;
|
|
|
|
|
JoystickOptions ();
|
|
|
|
|
}
|
|
|
|
|
|
- Update to ZDoom r858:
- Added FMOD_OPENONLY to the callback version of CreateStream() to prevent it
from doing prebuffering of the song. This was causing the Linux version to
hang while waiting for input from the pipe, since Timidity hadn't been
started yet. I tried using a select call in the FillStream() method, but it
always seems to return the pipe as having nothing available. Unfortunately,
the game still falls all over itself if Timidity isn't available. Instead
of execvp failing nicely, X errors kill the game. I don't know why it's
doing that. My advice for Linux music: Skip Timidity++ and get a DLS patch
set (/WINDOWS/system32/drivers/gm.dls is probably the most common by far)
and set the snd_midipatchset cvar to point to it. It's faster and also
sounds a whole lot better than the crappy freepats Ubuntu wants to install
with Timidity++ (thank goodness I have the official patches from a real
GUS so I don't need to use them).
- GCC fixes.
- Fixed: After starting new music the music volume has to be reset so that
the song's relative volume takes effect.
- Removed the arbitrary 1024 bytes limit when the file being played is a MIDI
file. I had a D_DM2TTL that's only 990 bytes.
- Restructured I_RegisterSong so that $mididevice works again and also supports
selecting FMOD.
- Added Jim' Linux fix.
- Added MartinHowe's fix for mugshot display in status bars.
- The garbage collector is now run one last time just before exiting the game.
- Removed movie volume from the sound menu and renamed some of the other
options to give the MIDI device name more room to display itself.
- Moved the midi device selection into the main sound menu.
- Added FMOD as MIDI device -1, to replace the MIDI mapper. This is still the
default device. By default, it uses exactly the same DLS instruments as the
Microsoft GS Wavetable Synth. If you have another set DLS level 1 patch set
you want to use, set the snd_midipatchset cvar to specify where it should
load the instruments from.
- Changed the ProduceMIDI function to store its output into a TArray<BYTE>.
An overloaded version wraps around it to continue to supply file-writing
support for external Timidity++ usage.
- Added an FMOD credits banner to comply with their non-commercial license.
- Reimplemented the snd_buffersize cvar for the FMOD Ex sound system. Rather
than a time in ms, this is now the length in samples of the DSP buffer.
Also added the snd_buffercount cvar to offer complete control over the
call to FMOD::System::setDSPBufferSize(). Note that with any snd_samplerate
below about 44kHz, you will need to set snd_buffersize to avoid long
latencies.
- Reimplemented the snd_output cvar for the FMOD Ex sound system.
- Changed snd_samplerate default to 0. This now means to use the default
sample rate.
- Made snd_output, snd_output_format, snd_speakermode, snd_resampler, and
snd_hrtf available through the menu.
- Split the HRTF effect selection into its own cvar: snd_hrtf.
- Removed 96000 Hz option from the menu. It's still available through the
cvar, if desired.
- Fixed: If Windows sound init failed, retry with DirectSound. (Apparently,
WASAPI doesn't work with more than two speakers and PCM-Float output at the
same time.)
- Fixed: Area sounds only played from the front speakers once you got within
the 2D panning area.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@79 b0f79afe-0144-0410-b225-9a4edf0717df
2008-03-27 18:31:46 +00:00
|
|
|
static void FreeMIDIMenuList()
|
|
|
|
|
{
|
|
|
|
|
if (SoundItems[MIDI_DEVICE_ITEM].e.values != NULL)
|
|
|
|
|
{
|
|
|
|
|
delete[] SoundItems[MIDI_DEVICE_ITEM].e.values;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
static void SoundOptions ()
|
|
|
|
|
{
|
- Update to ZDoom r858:
- Added FMOD_OPENONLY to the callback version of CreateStream() to prevent it
from doing prebuffering of the song. This was causing the Linux version to
hang while waiting for input from the pipe, since Timidity hadn't been
started yet. I tried using a select call in the FillStream() method, but it
always seems to return the pipe as having nothing available. Unfortunately,
the game still falls all over itself if Timidity isn't available. Instead
of execvp failing nicely, X errors kill the game. I don't know why it's
doing that. My advice for Linux music: Skip Timidity++ and get a DLS patch
set (/WINDOWS/system32/drivers/gm.dls is probably the most common by far)
and set the snd_midipatchset cvar to point to it. It's faster and also
sounds a whole lot better than the crappy freepats Ubuntu wants to install
with Timidity++ (thank goodness I have the official patches from a real
GUS so I don't need to use them).
- GCC fixes.
- Fixed: After starting new music the music volume has to be reset so that
the song's relative volume takes effect.
- Removed the arbitrary 1024 bytes limit when the file being played is a MIDI
file. I had a D_DM2TTL that's only 990 bytes.
- Restructured I_RegisterSong so that $mididevice works again and also supports
selecting FMOD.
- Added Jim' Linux fix.
- Added MartinHowe's fix for mugshot display in status bars.
- The garbage collector is now run one last time just before exiting the game.
- Removed movie volume from the sound menu and renamed some of the other
options to give the MIDI device name more room to display itself.
- Moved the midi device selection into the main sound menu.
- Added FMOD as MIDI device -1, to replace the MIDI mapper. This is still the
default device. By default, it uses exactly the same DLS instruments as the
Microsoft GS Wavetable Synth. If you have another set DLS level 1 patch set
you want to use, set the snd_midipatchset cvar to specify where it should
load the instruments from.
- Changed the ProduceMIDI function to store its output into a TArray<BYTE>.
An overloaded version wraps around it to continue to supply file-writing
support for external Timidity++ usage.
- Added an FMOD credits banner to comply with their non-commercial license.
- Reimplemented the snd_buffersize cvar for the FMOD Ex sound system. Rather
than a time in ms, this is now the length in samples of the DSP buffer.
Also added the snd_buffercount cvar to offer complete control over the
call to FMOD::System::setDSPBufferSize(). Note that with any snd_samplerate
below about 44kHz, you will need to set snd_buffersize to avoid long
latencies.
- Reimplemented the snd_output cvar for the FMOD Ex sound system.
- Changed snd_samplerate default to 0. This now means to use the default
sample rate.
- Made snd_output, snd_output_format, snd_speakermode, snd_resampler, and
snd_hrtf available through the menu.
- Split the HRTF effect selection into its own cvar: snd_hrtf.
- Removed 96000 Hz option from the menu. It's still available through the
cvar, if desired.
- Fixed: If Windows sound init failed, retry with DirectSound. (Apparently,
WASAPI doesn't work with more than two speakers and PCM-Float output at the
same time.)
- Fixed: Area sounds only played from the front speakers once you got within
the 2D panning area.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@79 b0f79afe-0144-0410-b225-9a4edf0717df
2008-03-27 18:31:46 +00:00
|
|
|
I_BuildMIDIMenuList(&SoundItems[MIDI_DEVICE_ITEM].e.values, &SoundItems[MIDI_DEVICE_ITEM].b.min);
|
|
|
|
|
atterm(FreeMIDIMenuList);
|
|
|
|
|
M_SwitchMenu(&SoundMenu);
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CCMD (menu_sound)
|
|
|
|
|
{
|
|
|
|
|
M_StartControlPanel (true);
|
|
|
|
|
OptionsActive = true;
|
|
|
|
|
SoundOptions ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void AdvSoundOptions ()
|
|
|
|
|
{
|
|
|
|
|
M_SwitchMenu (&AdvSoundMenu);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CCMD (menu_advsound)
|
|
|
|
|
{
|
|
|
|
|
M_StartControlPanel (true);
|
|
|
|
|
OptionsActive = true;
|
|
|
|
|
AdvSoundOptions ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void MakeSoundChanges (void)
|
|
|
|
|
{
|
|
|
|
|
static char snd_reset[] = "snd_reset";
|
|
|
|
|
AddCommandString (snd_reset);
|
|
|
|
|
}
|
|
|
|
|
|
Update to ZDoom r1017:
- Fixed: MAPINFO's 'lookup' option should only work for actual strings but
not for lump and file names.
- Added a few 'activator == NULL' checks to some ACS functions.
- Added line and vertex lists to polyobjects so that I can do some
changes that won't work with only a seg list being maintained.
(SBarInfo update #23)
- Fixed: Drawing the amount of an inventory item in the player's inventory did
not work
- Added: PowerupTime to drawnumber and drawbar. You must specify a
powerupgiver. Although drawnumber goes in seconds the powerup has left
drawbar will use ticks for extra accuracy.
- I have increased cross-port compatibility with Skulltag. If an unknown
game mode is provided for sbarinfo's gamemode command it will ignore it and
continue.
- Added an option to consider intermission screens gameplay for purposes of
capturing the mouse.
- Changed: Telefragging should not thrust the victim if it isn't in precisely the
same position as the killer.
- fixed: A_SpawnItemEx must call P_TeleportMove before checking the spawned
object's position.
- Fixed: Ouch state was far to easy to achieve.
- Made all the basic texture classes local to their implementation.
They are not needed anywhere else.
- Changed the HackHack hack for corrupt 256 pixel high textures that
FMultiPatchTexture only calls a virtual function instead of doing any
type checks of the patch itself.
- Cleaned up the constant definitions in doomdata.h.
- Moved the TEXTUREx structures from doomdata.h to multipatchtexture.cpp
because they are used only in this one file.
- Removed some more typedefs from r_defs.h and doomdata.h
- Moved local polyobject data definitions from p_local.h to po_man.cpp.
- Renamed player_s to player_t globally to get rid of the duplicate names
for this class.
- Added coordinate range checking to DCanvas::ParseDrawTextureTags() to avoid
potential crashes in the situation that con_scaletext is 2 and somebody
uses a hud message as if a hud size was specified, but forgot to actually
set the hud size.
- Consolidated the mug shot code shared by DSBarInfo and DDoomStatusBar
into a single place.
- Fixed: Setting an invalid mug shot state crashed the game.
- Fixed my attempts to be clever with strings yesterday.
- If an actor's current target temporarily goes unshootable, its threshold
is now reset to 0, so it will more readily switch back to it.
- Fixed: Deactivating the game no longer allows reverb effects to continue
playing while the sound is paused.
- Fixed: S_StartNamedSound() looked for SECF_SILENT in MoreFlags instead of
Flags.
- Fixed: DSBarInfo::updateState() and DDoomStatusBar::UpdateState() sprung
leaks and didn't allocate enough space for the fullStateName string.
- Disabled DUMB's mono destination mixers. It's not like I'm ever going to
target an original SoundBlaster, so they're a waste of space to have around.
This trims resample.obj down to ~60k now.
- Fixed: PrtScn/SysRq key did not work on Linux.
- Added an alternate module replay engine that uses foo_dumb's replayer, a
heavily customized version of DUMB (Dynamic Universal Music Bibliotheque).
It has been slightly modified by me:
* Added support for Ogg Vorbis-compressed samples in XM files ala FMOD.
* Removed excessive mallocs from the replay core.
* Rerolled the loops in resample.c. Unrolling them made the object file
~250k large while providing little benefit. Even at ~100k, I think it's
still larger than it ought to be, but I'll live with it for now.
Other than that, it's essentially the same thing you'd hear in foobar2000,
minus some subsong detection features. Release builds of the library look
like they might even be slightly faster than FMOD, which is a plus.
- Fixed: Timidity::font_add() did not release the file reader it created.
- Fixed: The SF2 loader did not free the sample headers in its destructor.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@113 b0f79afe-0144-0410-b225-9a4edf0717df
2008-06-03 21:48:49 +00:00
|
|
|
static void ModReplayerOptions()
|
|
|
|
|
{
|
|
|
|
|
for (size_t i = 2; i < countof(ModReplayerItems); ++i)
|
|
|
|
|
{
|
|
|
|
|
if (ModReplayerItems[i].type == discrete)
|
|
|
|
|
{
|
|
|
|
|
ModReplayerItems[i].d.graycheck = &mod_dumb;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
M_SwitchMenu(&ModReplayerMenu);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CCMD (menu_modreplayer)
|
|
|
|
|
{
|
|
|
|
|
M_StartControlPanel(true);
|
|
|
|
|
OptionsActive = true;
|
|
|
|
|
ModReplayerOptions();
|
|
|
|
|
}
|
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
static void VideoOptions (void)
|
|
|
|
|
{
|
|
|
|
|
InitCrosshairsList();
|
|
|
|
|
M_SwitchMenu (&VideoMenu);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CCMD (menu_display)
|
|
|
|
|
{
|
|
|
|
|
M_StartControlPanel (true);
|
|
|
|
|
OptionsActive = true;
|
|
|
|
|
InitCrosshairsList();
|
|
|
|
|
M_SwitchMenu (&VideoMenu);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void BuildModesList (int hiwidth, int hiheight, int hi_bits)
|
|
|
|
|
{
|
|
|
|
|
char strtemp[32], **str;
|
|
|
|
|
int i, c;
|
|
|
|
|
int width, height, showbits;
|
|
|
|
|
bool letterbox=false;
|
|
|
|
|
int ratiomatch;
|
|
|
|
|
|
|
|
|
|
if (menu_screenratios >= 0 && menu_screenratios <= 4 && menu_screenratios != 3)
|
|
|
|
|
{
|
|
|
|
|
ratiomatch = menu_screenratios;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
ratiomatch = -1;
|
|
|
|
|
}
|
|
|
|
|
showbits = BitTranslate[DummyDepthCvar];
|
|
|
|
|
|
|
|
|
|
if (Video != NULL)
|
|
|
|
|
{
|
|
|
|
|
Video->StartModeIterator (showbits, screen->IsFullscreen());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = VM_RESSTART; ModesItems[i].type == screenres; i++)
|
|
|
|
|
{
|
|
|
|
|
ModesItems[i].e.highlight = -1;
|
|
|
|
|
for (c = 0; c < 3; c++)
|
|
|
|
|
{
|
|
|
|
|
bool haveMode = false;
|
|
|
|
|
|
|
|
|
|
switch (c)
|
|
|
|
|
{
|
|
|
|
|
default: str = &ModesItems[i].b.res1; break;
|
|
|
|
|
case 1: str = &ModesItems[i].c.res2; break;
|
|
|
|
|
case 2: str = &ModesItems[i].d.res3; break;
|
|
|
|
|
}
|
|
|
|
|
if (Video != NULL)
|
|
|
|
|
{
|
|
|
|
|
while ((haveMode = Video->NextMode (&width, &height, &letterbox)) &&
|
|
|
|
|
(ratiomatch >= 0 && CheckRatio (width, height) != ratiomatch))
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (haveMode)
|
|
|
|
|
{
|
|
|
|
|
if (/* hi_bits == showbits && */ width == hiwidth && height == hiheight)
|
|
|
|
|
ModesItems[i].e.highlight = ModesItems[i].a.selmode = c;
|
|
|
|
|
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
mysnprintf (strtemp, countof(strtemp), "%dx%d%s", width, height, letterbox?TEXTCOLOR_BROWN" LB":"");
|
2008-01-27 11:25:03 +00:00
|
|
|
ReplaceString (str, strtemp);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (*str)
|
|
|
|
|
{
|
|
|
|
|
delete[] *str;
|
|
|
|
|
*str = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void M_RefreshModesList ()
|
|
|
|
|
{
|
|
|
|
|
BuildModesList (SCREENWIDTH, SCREENHEIGHT, DisplayBits);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void M_FreeModesList ()
|
|
|
|
|
{
|
|
|
|
|
for (int i = VM_RESSTART; ModesItems[i].type == screenres; ++i)
|
|
|
|
|
{
|
|
|
|
|
for (int c = 0; c < 3; ++c)
|
|
|
|
|
{
|
|
|
|
|
char **str;
|
|
|
|
|
|
|
|
|
|
switch (c)
|
|
|
|
|
{
|
|
|
|
|
default: str = &ModesItems[i].b.res1; break;
|
|
|
|
|
case 1: str = &ModesItems[i].c.res2; break;
|
|
|
|
|
case 2: str = &ModesItems[i].d.res3; break;
|
|
|
|
|
}
|
|
|
|
|
if (str != NULL)
|
|
|
|
|
{
|
|
|
|
|
delete[] *str;
|
|
|
|
|
*str = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool GetSelectedSize (int line, int *width, int *height)
|
|
|
|
|
{
|
|
|
|
|
if (ModesItems[line].type != screenres)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
char *res, *breakpt;
|
|
|
|
|
long x, y;
|
|
|
|
|
|
|
|
|
|
switch (ModesItems[line].a.selmode)
|
|
|
|
|
{
|
|
|
|
|
default: res = ModesItems[line].b.res1; break;
|
|
|
|
|
case 1: res = ModesItems[line].c.res2; break;
|
|
|
|
|
case 2: res = ModesItems[line].d.res3; break;
|
|
|
|
|
}
|
|
|
|
|
x = strtol (res, &breakpt, 10);
|
|
|
|
|
y = strtol (breakpt+1, NULL, 10);
|
|
|
|
|
|
|
|
|
|
*width = x;
|
|
|
|
|
*height = y;
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int FindBits (int bits)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < 22; i++)
|
|
|
|
|
{
|
|
|
|
|
if (BitTranslate[i] == bits)
|
|
|
|
|
return i;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void SetModesMenu (int w, int h, int bits)
|
|
|
|
|
{
|
|
|
|
|
DummyDepthCvar = FindBits (bits);
|
|
|
|
|
|
|
|
|
|
if (testingmode <= 1)
|
|
|
|
|
{
|
|
|
|
|
if (ModesItems[VM_ENTERLINE].label != VMEnterText)
|
|
|
|
|
free (const_cast<char *>(ModesItems[VM_ENTERLINE].label));
|
|
|
|
|
ModesItems[VM_ENTERLINE].label = VMEnterText;
|
|
|
|
|
ModesItems[VM_TESTLINE].label = VMTestText;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
char strtemp[64];
|
|
|
|
|
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
mysnprintf (strtemp, countof(strtemp), "TESTING %dx%dx%d", w, h, bits);
|
2008-01-27 11:25:03 +00:00
|
|
|
ModesItems[VM_ENTERLINE].label = copystring (strtemp);
|
|
|
|
|
ModesItems[VM_TESTLINE].label = "Please wait 5 seconds...";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BuildModesList (w, h, bits);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void M_RestoreMode ()
|
|
|
|
|
{
|
|
|
|
|
NewWidth = OldWidth;
|
|
|
|
|
NewHeight = OldHeight;
|
|
|
|
|
NewBits = OldBits;
|
|
|
|
|
setmodeneeded = true;
|
|
|
|
|
testingmode = 0;
|
|
|
|
|
SetModesMenu (OldWidth, OldHeight, OldBits);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void M_SetDefaultMode ()
|
|
|
|
|
{
|
|
|
|
|
// Make current resolution the default
|
|
|
|
|
vid_defwidth = SCREENWIDTH;
|
|
|
|
|
vid_defheight = SCREENHEIGHT;
|
|
|
|
|
vid_defbits = DisplayBits;
|
|
|
|
|
testingmode = 0;
|
|
|
|
|
SetModesMenu (SCREENWIDTH, SCREENHEIGHT, DisplayBits);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void SetVidMode ()
|
|
|
|
|
{
|
|
|
|
|
SetModesMenu (SCREENWIDTH, SCREENHEIGHT, DisplayBits);
|
|
|
|
|
if (ModesMenu.items[ModesMenu.lastOn].type == screenres)
|
|
|
|
|
{
|
|
|
|
|
if (ModesMenu.items[ModesMenu.lastOn].a.selmode == -1)
|
|
|
|
|
{
|
|
|
|
|
ModesMenu.items[ModesMenu.lastOn].a.selmode++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
M_SwitchMenu (&ModesMenu);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CCMD (menu_video)
|
|
|
|
|
{
|
|
|
|
|
M_StartControlPanel (true);
|
|
|
|
|
OptionsActive = true;
|
|
|
|
|
SetVidMode ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void M_LoadKeys (const char *modname, bool dbl)
|
|
|
|
|
{
|
|
|
|
|
char section[64];
|
|
|
|
|
|
|
|
|
|
if (GameNames[gameinfo.gametype] == NULL)
|
|
|
|
|
return;
|
|
|
|
|
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
mysnprintf (section, countof(section), "%s.%s%sBindings", GameNames[gameinfo.gametype], modname,
|
2008-01-27 11:25:03 +00:00
|
|
|
dbl ? ".Double" : ".");
|
|
|
|
|
if (GameConfig->SetSection (section))
|
|
|
|
|
{
|
|
|
|
|
const char *key, *value;
|
|
|
|
|
while (GameConfig->NextInSection (key, value))
|
|
|
|
|
{
|
|
|
|
|
C_DoBind (key, value, dbl);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int M_DoSaveKeys (FConfigFile *config, char *section, int i, bool dbl)
|
|
|
|
|
{
|
|
|
|
|
int most = (int)CustomControlsItems.Size();
|
|
|
|
|
|
|
|
|
|
config->SetSection (section, true);
|
|
|
|
|
config->ClearCurrentSection ();
|
|
|
|
|
for (++i; i < most; ++i)
|
|
|
|
|
{
|
|
|
|
|
menuitem_t *item = &CustomControlsItems[i];
|
|
|
|
|
if (item->type == control)
|
|
|
|
|
{
|
|
|
|
|
C_ArchiveBindings (config, dbl, item->e.command);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return i;
|
|
|
|
|
}
|
|
|
|
|
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
void M_SaveCustomKeys (FConfigFile *config, char *section, char *subsection, size_t sublen)
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
|
|
|
|
if (ControlsMenu.items == ControlsItems)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
// Start after the normal controls
|
|
|
|
|
unsigned int i = countof(ControlsItems);
|
|
|
|
|
unsigned int most = CustomControlsItems.Size();
|
|
|
|
|
|
|
|
|
|
while (i < most)
|
|
|
|
|
{
|
|
|
|
|
menuitem_t *item = &CustomControlsItems[i];
|
|
|
|
|
|
|
|
|
|
if (item->type == whitetext)
|
|
|
|
|
{
|
|
|
|
|
assert (item->e.command != NULL);
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
mysnprintf (subsection, sublen, "%s.Bindings", item->e.command);
|
2008-01-27 11:25:03 +00:00
|
|
|
M_DoSaveKeys (config, section, (int)i, false);
|
Update to ZDoom r1083. Not fully tested yet!
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code.
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@138 b0f79afe-0144-0410-b225-9a4edf0717df
2008-07-23 18:35:55 +00:00
|
|
|
mysnprintf (subsection, sublen, "%s.DoubleBindings", item->e.command);
|
2008-01-27 11:25:03 +00:00
|
|
|
i = M_DoSaveKeys (config, section, (int)i, true);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
i++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int AddKeySpot;
|
|
|
|
|
|
|
|
|
|
void FreeKeySections()
|
|
|
|
|
{
|
|
|
|
|
const unsigned int numStdControls = countof(ControlsItems);
|
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
|
|
for (i = numStdControls; i < CustomControlsItems.Size(); ++i)
|
|
|
|
|
{
|
|
|
|
|
menuitem_t *item = &CustomControlsItems[i];
|
|
|
|
|
if (item->type == whitetext || item->type == control)
|
|
|
|
|
{
|
|
|
|
|
if (item->label != NULL)
|
|
|
|
|
{
|
|
|
|
|
delete[] item->label;
|
|
|
|
|
item->label = NULL;
|
|
|
|
|
}
|
|
|
|
|
if (item->e.command != NULL)
|
|
|
|
|
{
|
|
|
|
|
delete[] item->e.command;
|
|
|
|
|
item->e.command = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CCMD (addkeysection)
|
|
|
|
|
{
|
|
|
|
|
if (argv.argc() != 3)
|
|
|
|
|
{
|
|
|
|
|
Printf ("Usage: addkeysection <menu section name> <ini name>\n");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const int numStdControls = countof(ControlsItems);
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
if (ControlsMenu.items == ControlsItems)
|
|
|
|
|
{ // No custom controls have been defined yet.
|
|
|
|
|
for (i = 0; i < numStdControls; ++i)
|
|
|
|
|
{
|
|
|
|
|
CustomControlsItems.Push (ControlsItems[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// See if this section already exists
|
|
|
|
|
int last = (int)CustomControlsItems.Size();
|
|
|
|
|
for (i = numStdControls; i < last; ++i)
|
|
|
|
|
{
|
|
|
|
|
menuitem_t *item = &CustomControlsItems[i];
|
|
|
|
|
|
|
|
|
|
if (item->type == whitetext &&
|
|
|
|
|
stricmp (item->label, argv[1]) == 0)
|
|
|
|
|
{ // found it
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (i == last)
|
|
|
|
|
{ // Add the new section
|
|
|
|
|
// Limit the ini name to 32 chars
|
|
|
|
|
if (strlen (argv[2]) > 32)
|
|
|
|
|
argv[2][32] = 0;
|
|
|
|
|
|
|
|
|
|
menuitem_t tempItem = { redtext, " " };
|
|
|
|
|
|
|
|
|
|
// Add a blank line to the menu
|
|
|
|
|
CustomControlsItems.Push (tempItem);
|
|
|
|
|
|
|
|
|
|
// Add the section name to the menu
|
|
|
|
|
tempItem.type = whitetext;
|
|
|
|
|
tempItem.label = copystring (argv[1]);
|
|
|
|
|
tempItem.e.command = copystring (argv[2]); // Record ini section name in command field
|
|
|
|
|
CustomControlsItems.Push (tempItem);
|
|
|
|
|
ControlsMenu.items = &CustomControlsItems[0];
|
|
|
|
|
|
|
|
|
|
// Load bindings for this section from the ini
|
|
|
|
|
M_LoadKeys (argv[2], 0);
|
|
|
|
|
M_LoadKeys (argv[2], 1);
|
|
|
|
|
|
|
|
|
|
AddKeySpot = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{ // Add new keys to the end of this section
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
i++;
|
|
|
|
|
} while (i < last && CustomControlsItems[i].type == control);
|
|
|
|
|
if (i < last)
|
|
|
|
|
{
|
|
|
|
|
AddKeySpot = i;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
AddKeySpot = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CCMD (addmenukey)
|
|
|
|
|
{
|
|
|
|
|
if (argv.argc() != 3)
|
|
|
|
|
{
|
|
|
|
|
Printf ("Usage: addmenukey <description> <command>\n");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (ControlsMenu.items == ControlsItems)
|
|
|
|
|
{
|
|
|
|
|
Printf ("You must use addkeysection first.\n");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
menuitem_t newItem = { control, };
|
|
|
|
|
newItem.label = copystring (argv[1]);
|
|
|
|
|
newItem.e.command = copystring (argv[2]);
|
|
|
|
|
if (AddKeySpot == 0)
|
|
|
|
|
{ // Just add to the end of the menu
|
|
|
|
|
CustomControlsItems.Push (newItem);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{ // Add somewhere in the middle of the menu
|
|
|
|
|
size_t movecount = CustomControlsItems.Size() - AddKeySpot;
|
|
|
|
|
CustomControlsItems.Reserve (1);
|
|
|
|
|
memmove (&CustomControlsItems[AddKeySpot+1],
|
|
|
|
|
&CustomControlsItems[AddKeySpot],
|
|
|
|
|
sizeof(menuitem_t)*movecount);
|
|
|
|
|
CustomControlsItems[AddKeySpot++] = newItem;
|
|
|
|
|
}
|
|
|
|
|
ControlsMenu.items = &CustomControlsItems[0];
|
|
|
|
|
ControlsMenu.numitems = (int)CustomControlsItems.Size();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void M_Deinit ()
|
|
|
|
|
{
|
|
|
|
|
// Free bitdepth names for the modes menu.
|
|
|
|
|
for (size_t i = 0; i < countof(Depths); ++i)
|
|
|
|
|
{
|
|
|
|
|
if (Depths[i].name != NULL)
|
|
|
|
|
{
|
|
|
|
|
delete[] Depths[i].name;
|
|
|
|
|
Depths[i].name = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Free resolutions from the modes menu.
|
|
|
|
|
M_FreeModesList();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Reads any XHAIRS lumps for the names of crosshairs and
|
|
|
|
|
// adds them to the display options menu.
|
|
|
|
|
void InitCrosshairsList()
|
|
|
|
|
{
|
|
|
|
|
int lastlump, lump;
|
|
|
|
|
valuestring_t value;
|
|
|
|
|
|
|
|
|
|
lastlump = 0;
|
|
|
|
|
|
|
|
|
|
Crosshairs.Clear();
|
|
|
|
|
value.value = 0;
|
|
|
|
|
value.name = "None";
|
|
|
|
|
Crosshairs.Push(value);
|
|
|
|
|
|
|
|
|
|
while ((lump = Wads.FindLump("XHAIRS", &lastlump)) != -1)
|
|
|
|
|
{
|
- Fixed: The players were not added to FS's list of spawned things.
- Update to ZDoom r882
- Added the option to use $ as a prefix to a string table name everywhere in
MAPINFO where 'lookup' could be specified so that there is one consistent
way to do it.
- Externalized all default episode definitions. Added an 'optional' keyword
to handle M4 and 5 in Doom and Heretic.
- Added P_CheckMapData function and replaced all calls to P_OpenMapData that
only checked for a map's presence with it.
- Added Martin Howe's player statusbar face submission.
- Added an 'adddefaultmap' option for MAPINFO. This is the same as 'defaultmap'
but keeps all existing information in the default and just adds to it. This
is needed because Hexen and Strife set some information in their base
MAPINFO and using 'defaultmap' in a PWAD would override that.
- Fixed: Using MAPINFO's f1 option could cause memory leaks.
- Added option to load lumps by full name to several places:
* Finale texts loaded from a text lump
* Demos
* Local SNDINFOs
* Local SNDSEQs
* Image names in FONTDEFS
* intermission script names
- Changed the STCFN121 handling. The character is not an 'I' but a '|' so
instead of discarding it it should be inserted at position 124.
- Renamed indexfont.fon to indexfont so that I could remove a special case
from V_GetFont that was just added for this one font.
- Added a 'dumpspawnedthings' CVAR that enables a listing of all things in
the map and the actor type they spawned.
SBarInfo Update #16
- Added: fillzeros flag for drawnumber. When set the string will always have
a length of the specified size and zeros will fill in for the missing places.
If the number is negative the negative sign will take the place of the last
digit.
- Added: globalarray type to drawnumber which will display the value in a
global array with the index set to the player's number. Untested.
- Added: isselected command to SBarInfo.
- Fixed: Bi and Tri colored numbers didn't work.
- Fixed: Crash when using nullimage as the last image in drawswitchableimage.
- Applied Graf suggestion to include the y coord when calulating heights to fix
most of the gaps caused by round off errors. At least for now anyways and it
is only applied for drawimage.
- SBarInfo inventory bars have been converted to use screen->DrawTexture()
- Increased limit for demon/melee to 4.
- Fixed: P_CheckSwitchRange accessed invalid memory when testing a one-sided
line.
- Fixed: P_SpawnPuff assumed that all melee attacks have the same range
(MELEERANGE) and didn't set the puff to its melee state if the range
was different. Even worse, it checked a global variable for this so
the behavior was undefined when P_SpawnPuff was called from anywhere
else but P_LineAttack. To reduce the amount of parameters I combined
this information with the hitthing and temporary parameters into one
flags parameter. Also changed P_LineAttack so that it gets passed
an additional parameter that specifies whether the attack is a melee
attack or not and set this to true in all calls that are to be considered
melee attacks. I couldn't use the damage type because A_CustomPunch
and A_CustomMeleeAttack allow passing any damage type they want.
- Added a sprite option as an alternative of particles for FX_ROCKET
and FX_GRENADE.
- Fixed: The minimum parameter count for ACS_Execute and ACS_ExecuteAlways for
DECORATE was wrong (2 instead of 1.)
- Changed: Hexen set every cluster to be a hub if it hadn't been defined before
a level using this cluster. Now it will only do that if HexenHack is true,
i.e. when original Hexen format MAPINFOs are parsed. For ZDoom format
MAPINFOs it will now be the same as for the other games which means that
'hub' has to be declared explicitly.
- Added an Idle state that is entered in place of the spawn state if a monster
has to return to its inactive state if it can't find any more targets.
- Added MF5_NOINTERACTION flag which completely disables all physics related
code for any actor with this flag. Mostly useful for particle effects where
the actors just move a certain distance and then disappear.
- Removed the last remains of the antialias precalculation code from
am_map.cpp because it was no longer used.
- Fixed: Two-sided lines bordering a secret sector were not drawn in the
proper color
- Fixed: The automap didn't check ACS_LockedExecuteDoor for its lock color.
- Switched sounds local to the listener from head-relative 3D sounds to 2D
sounds so stereo sounds have full separation. I tried using set3DSpread,
but that still caused some blending of the channels.
- Changed FScanner so that opening a lump gives the complete wad+lump name
rather than a generic one, so identifying errors among files that all have
the same lump name no longer involves any degree of guesswork in
determining exactly which file the error occurred in.
- Added a check to S_ParseSndSeq() for SNDSEQ lumps with unterminated final
sequences.
- Fixed: Parts of s_sndseq.cpp that scan the Sequences array need NULL
pointer checks, in case an improper sequence was encountered during
parsing but not early enough to avoid creating a slot for it in the array.
- Added support for dumping from RAW/DRO/IMF files, so now anything that
can be played as OPL can also be dumped.
- Removed the opl_enable cvar, since OPL playback is now selectable as just
another MIDI device.
- Added support for DRO playback and dual-chip RAW playback.
- Removed MUS support from OPLMUSSong, since using the OPLMIDIDevice with
MUSSong2 works just as well. There are still lots of leftover bits in
the class that should probably be removed at some point, too.
- Added dual-chip dumping support for the RAW format.
- Added DosBox Raw OPL (.DRO) dumping support. For whatever reason,
in_adlib calculates the song length for this format wrong, even though
the exact length is stored right in the header. (But in_adlib seems buggy
in general; too bad it's the only Windows version of Adplug that seems to
exist.)
- Rewrote the OPL dumper to work with MIDI as well as MUS.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@86 b0f79afe-0144-0410-b225-9a4edf0717df
2008-04-05 13:28:48 +00:00
|
|
|
FScanner sc(lump);
|
2008-01-27 15:34:47 +00:00
|
|
|
while (sc.GetNumber())
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
2008-01-27 15:34:47 +00:00
|
|
|
value.value = float(sc.Number);
|
|
|
|
|
sc.MustGetString();
|
|
|
|
|
value.name = sc.String;
|
2008-01-27 11:25:03 +00:00
|
|
|
if (value.value != 0)
|
|
|
|
|
{ // Check if it already exists. If not, add it.
|
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
|
|
for (i = 1; i < Crosshairs.Size(); ++i)
|
|
|
|
|
{
|
|
|
|
|
if (Crosshairs[i].value == value.value)
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (i < Crosshairs.Size())
|
|
|
|
|
{
|
|
|
|
|
Crosshairs[i].name = value.name;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
Crosshairs.Push(value);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
VideoItems[CROSSHAIR_INDEX].b.numvalues = float(Crosshairs.Size());
|
|
|
|
|
VideoItems[CROSSHAIR_INDEX].e.valuestrings = &Crosshairs[0];
|
|
|
|
|
}
|