diff --git a/msvc/Release/doomretro.cfg b/msvc/Release/doomretro.cfg new file mode 100644 index 0000000000..50e5d9af43 --- /dev/null +++ b/msvc/Release/doomretro.cfg @@ -0,0 +1,122 @@ +am_grid off +am_rotatemode on +autosave on +episode "Knee-Deep in the Dead" +expansion "Hell on Earth" +gp_automap back +gp_automap_clearmark - +gp_automap_followmode - +gp_automap_grid - +gp_automap_mark - +gp_automap_maxzoom - +gp_automap_rotatemode - +gp_automap_zoomin rightshoulder +gp_automap_zoomout leftshoulder +gp_deadzone_left 24% +gp_deadzone_right 26.5% +gp_fire righttrigger +gp_menu start +gp_nextweapon gamepad2 +gp_prevweapon gamepad4 +gp_run lefttrigger +gp_sensitivity 32 +gp_swapthumbsticks off +gp_use gamepad1 +gp_vibrate on +gp_weapon1 - +gp_weapon2 - +gp_weapon3 - +gp_weapon4 - +gp_weapon5 - +gp_weapon6 - +gp_weapon7 - +iwadfolder "C:\wads" +key_automap tab +key_automap_clearmark 'c' +key_automap_followmode 'f' +key_automap_grid 'g' +key_automap_mark 'm' +key_automap_maxzoom '0' +key_automap_rotatemode 'r' +key_automap_zoomin '+' +key_automap_zoomout '-' +key_down down +key_down2 's' +key_fire ctrl +key_left left +key_prevweapon - +key_nextweapon - +key_right right +key_run shift +key_strafe alt +key_strafeleft 'a' +key_strafeleft2 ',' +key_straferight 'd' +key_straferight2 '.' +key_up up +key_up2 'w' +key_use space +key_weapon1 '1' +key_weapon2 '2' +key_weapon3 '3' +key_weapon4 '4' +key_weapon5 '5' +key_weapon6 '6' +key_weapon7 '7' +m_acceleration 2.0 +m_doubleclick_use off +m_fire left +m_forward - +m_nextweapon wheeldown +m_novertical on +m_prevweapon wheelup +m_sensitivity 16 +m_strafe - +m_threshold 10 +m_use - +mapfixes on +messages off +playername "you" +pm_alwaysrun off +pm_centerweapon on +pm_walkbob 75% +runcount 155 +r_brightmaps on +r_corpses_mirrored on +r_corpses_moreblood on +r_corpses_slide on +r_corpses_smearblood on +r_detail high +r_floatbob on +r_gamma 0.75 +r_homindicator off +r_hud on +r_liquid_animatedheight on +r_liquid_clipsprites on +r_lowpixelheight 2 +r_lowpixelwidth 2 +r_maxbloodsplats unlimited +r_mirrorweapons off +r_rockettrails on +r_shadows on +r_translucency on +r_viewsize 7 +s_maxslicetime 28 +s_musicvolume 100% +s_sfxvolume 100% +s_timiditycfgpath "" +savegame 0 +skilllevel "Hurt me plenty." +spritefixes on +vid_capfps off +vid_display 1 +vid_fullscreen on +vid_scaledriver "opengl" +vid_scalefilter "nearest" +vid_screenheight desktop +vid_screenwidth desktop +vid_vsync off +vid_widescreen on +vid_windowposition "" +vid_windowheight 480 +vid_windowwidth 640 diff --git a/src/c_cmds.c b/src/c_cmds.c index de14fa0342..c9b7938ed7 100644 --- a/src/c_cmds.c +++ b/src/c_cmds.c @@ -349,7 +349,6 @@ static void C_Help(char *, char *, char *); static void C_Hud(char *, char *, char *); static void C_Int(char *, char *, char *); static void C_Kill(char *, char *, char *); -static void C_LinedefList(char *, char *, char *); static void C_Load(char *, char *, char *); static void C_Map(char *, char *, char *); static void C_MapList(char *, char *, char *); @@ -366,8 +365,6 @@ static void C_ScaleFilter(char *, char *, char *); #endif static void C_ScreenSize(char *, char *, char *); static void C_ScreenResolution(char *, char *, char *); -static void C_SectorList(char *, char *, char *); -static void C_SidedefList(char *, char *, char *); static void C_Spawn(char *, char *, char *); static void C_Str(char *, char *, char *); static void C_ThingList(char *, char *, char *); @@ -377,7 +374,6 @@ static void C_TotalKills(char *, char *, char *); static void C_TotalMapped(char *, char *, char *); static void C_TotalSecrets(char *, char *, char *); static void C_UnBind(char *, char *, char *); -static void C_VertexList(char *, char *, char *); static void C_Volume(char *, char *, char *); #if defined(SDL20) static void C_Vsync(char *, char *, char *); @@ -479,7 +475,6 @@ consolecmd_t consolecmds[] = CMD_CHEAT (idspispopd, 0), CVAR_STR (iwadfolder, C_NoCondition, C_Str, iwadfolder, "The folder where an IWAD file was last opened."), CMD (kill, C_KillCondition, C_Kill, 1, "[all|~type~]", "Kill the player, all monsters or a type of monster."), - CMD (linedeflist, C_GameCondition, C_LinedefList, 0, "", "Display a list of linedefs in the current map."), CMD (load, C_LoadCondition, C_Load, 1, "~filename~.save", "Load a game from a file."), CVAR_FLOAT(m_acceleration, C_FloatCondition, C_Float, CF_NONE, mouse_acceleration, "The amount the mouse accelerates."), CVAR_BOOL (m_doubleclick_use, C_BoolCondition, C_Bool, dclick_use, DCLICKUSE, "Toggle double-clicking a mouse button for the +use action."), @@ -525,8 +520,6 @@ consolecmd_t consolecmds[] = CVAR_STR (s_timiditycfgpath, C_NoCondition, C_Str, timidity_cfg_path, "The path of Timidity's configuration file."), CMD (save, C_SaveCondition, C_Save, 1, "~filename~.save", "Save the game to a file."), CVAR_STR (savegamefolder, C_NoCondition, C_Str, savegamefolder, "The folder where savegames are saved."), - CMD (sectorlist, C_GameCondition, C_SectorList, 0, "", "Display a list of sectors in the current map."), - CMD (sidedeflist, C_GameCondition, C_SidedefList, 0, "", "Display a list of sidedefs in the current map."), CVAR_INT (skilllevel, C_IntCondition, C_Int, CF_NONE, selectedskilllevel, 0, SKILLLEVEL, "The currently selected skill level in the menu."), CMD (spawn, C_SpawnCondition, C_Spawn, 1, SPAWNCMDFORMAT, "Spawn a monster or item."), CVAR_BOOL (spritefixes, C_BoolCondition, C_Bool, spritefixes, SPRITEFIXES, "Toggle applying fixes to sprite offsets."), @@ -538,7 +531,6 @@ consolecmd_t consolecmds[] = CMD (totalmapped, C_GameCondition, C_TotalMapped, 0, "", "Show the amount of the current map that has been mapped."), CMD (totalsecrets, C_GameCondition, C_TotalSecrets, 0, "", "Show the number of secrets in the current map."), CMD (unbind, C_NoCondition, C_UnBind, 1, "~control~", "Unbind the action from a control."), - CMD (vertexlist, C_GameCondition, C_VertexList, 0, "", "Display a list of vertexes in the current map."), CVAR_BOOL (vid_capfps, C_BoolCondition, C_Bool, capfps, CAPFPS, "Toggle capping of the framerate at 35 FPS."), #if defined(SDL20) CVAR_INT (vid_display, C_NoCondition, C_Int, CF_NONE, display, 0, DISPLAY, "The display used to render the game."), @@ -1396,8 +1388,6 @@ static void C_Kill(char *cmd, char *parm1, char *parm2) } } -static void C_LinedefList(char *cmd, char *parm1, char *parm2) {} - static boolean C_LoadCondition(char *cmd, char *parm1, char *parm2) { return (parm1[0] != '\0'); @@ -1854,23 +1844,6 @@ static void C_ScreenSize(char *cmd, char *parm1, char *parm2) C_Output("%i", screensize); } -static void C_SectorList(char *cmd, char *parm1, char *parm2) -{ - int i; - int tabs[8] = { 45, 120, 200, 270, 335, 395, 415, 585 }; - - C_TabbedOutput(tabs, "\tfloorheight\tceilingheight\tfloorpic\tceilingpic\tlightlevel\tspecial\t\ttag"); - for (i = 0; i < numsectors; ++i) - C_TabbedOutput(tabs, "%i.\t%i\t%i\t%.8s\t%.8s\t%i\t%i\t%s\t%i", - i + 1, sectors[i].floorheight >> FRACBITS, sectors[i].ceilingheight >> FRACBITS, - uppercase(lumpinfo[firstflat + sectors[i].floorpic].name), - uppercase(lumpinfo[firstflat + sectors[i].ceilingpic].name), sectors[i].lightlevel, - sectors[i].special, sectorspecials[sectors[i].special], sectors[i].tag); -} - - -static void C_SidedefList(char *cmd, char *parm1, char *parm2) {} - static int spawntype = NUMMOBJTYPES; static boolean C_SpawnCondition(char *cmd, char *parm1, char *parm2) @@ -2051,16 +2024,6 @@ static void C_UnBind(char *cmd, char *parm1, char *parm2) C_Bind(cmd, parm1, "none"); } -static void C_VertexList(char *cmd, char *parm1, char *parm2) -{ - int i; - int tabs[8] = { 45, 0, 0, 0, 0, 0, 0, 0 }; - - for (i = 0; i < numvertexes; ++i) - C_TabbedOutput(tabs, "%i.\t(%i,%i)", - i + 1, vertexes[i].x >> FRACBITS, vertexes[i].y >> FRACBITS); -} - static boolean C_VolumeCondition(char *cmd, char *parm1, char *parm2) { int value = -1; diff --git a/src/p_spec.c b/src/p_spec.c index 72f2d41e14..4d90335605 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -47,28 +47,6 @@ #include "w_wad.h" #include "z_zone.h" -char *sectorspecials[] = -{ - "-", - "Light Blinks (randomly)", - "Light Blinks (2 Hz)", - "Light Blinks (1 Hz)", - "Damage -10 or 20% Health and Light Blinks (2 Hz)", - "Damage -5 or 10% Health", - "-", - "Damage -2 or 5% Health", - "Light Glows (1+ sec)", - "Secret", - "Door Close Stay (after 30 sec)", - "Damage -10 or 20% Health and End Level", - "Light Blinks (1 Hz synchronized)", - "Light Blinks (2 Hz synchronized)", - "Door Open Close (opens after 5 min)", - "-", - "Damage -10 or 20% Health", - "Light Flickers (randomly)" -}; - // // Animating textures and planes // There is another anim_t used in wi_stuff, unrelated. diff --git a/src/p_spec.h b/src/p_spec.h index b44a2bbdd8..fd34ac0f8c 100644 --- a/src/p_spec.h +++ b/src/p_spec.h @@ -39,7 +39,6 @@ #if !defined(__P_SPEC__) #define __P_SPEC__ -extern char *sectorspecials[]; extern boolean *isliquid; // Define values for map objects diff --git a/src/p_switch.c b/src/p_switch.c index d4806952d4..4d01f2b7ec 100644 --- a/src/p_switch.c +++ b/src/p_switch.c @@ -236,7 +236,7 @@ boolean P_UseSpecialLine(mobj_t *thing, line_t *line, int side) P_ChangeSwitchTexture(line, 0); break; - case S1_Floor_RaiseDonutChangesTexture: + case S1_Floor_RaiseDonut_ChangesTexture: if (EV_DoDonut(line)) P_ChangeSwitchTexture(line, 0); break; diff --git a/src/r_defs.h b/src/r_defs.h index 4efc87c79b..2df234f09e 100644 --- a/src/r_defs.h +++ b/src/r_defs.h @@ -241,7 +241,7 @@ typedef enum W1_Crusher_StartWithFastDamage = 6, S1_Stairs_RaiseBy8 = 7, W1_Stairs_RaiseBy8 = 8, - S1_Floor_RaiseDonutChangesTexture = 9, + S1_Floor_RaiseDonut_ChangesTexture = 9, W1_Lift_LowerWaitRaise = 10, S1_ExitLevel = 11, W1_Light_ChangeToBrightestAdjacent = 12,