Commit graph

645 commits

Author SHA1 Message Date
hendricks266
9c23735d98 Menu stuff
git-svn-id: https://svn.eduke32.com/eduke32@6720 1a8010ca-5511-0410-912e-c29ae57300e0
2018-03-06 10:25:07 +00:00
hendricks266
821814fe32 Avoid filtering seams by drawing custom scrollbars twice, like the scuba gear and chaingun.
Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6719 1a8010ca-5511-0410-912e-c29ae57300e0
2018-03-06 10:25:04 +00:00
hendricks266
a1f3ec8c63 Menus: Allow mouse axis scale to go to zero.
git-svn-id: https://svn.eduke32.com/eduke32@6718 1a8010ca-5511-0410-912e-c29ae57300e0
2018-03-06 10:24:59 +00:00
hendricks266
ab3c4366e4 Fix "setvarvar: Gv_GetVarX(): invalid player ID -1" message for certain userdef accesses
git-svn-id: https://svn.eduke32.com/eduke32@6717 1a8010ca-5511-0410-912e-c29ae57300e0
2018-03-03 08:22:55 +00:00
hendricks266
478165f00c Fix "too many sprites spawned" check
git-svn-id: https://svn.eduke32.com/eduke32@6716 1a8010ca-5511-0410-912e-c29ae57300e0
2018-03-03 06:37:16 +00:00
hendricks266
1adf766fac Move "EVENT_DISPLAYREST" after "EVENT_DISPLAYCROSSHAIR".
Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6715 1a8010ca-5511-0410-912e-c29ae57300e0
2018-03-01 13:46:56 +00:00
hendricks266
293491644f 1. Fix translucency in the mouse cursor.
2. In "EVENT_DISPLAYCROSSHAIR" and "EVENT_DISPLAYCURSOR", make "userdef[].return" 1 and 2 return the coordinates, and 3 the alpha ("EVENT_DISPLAYCURSOR" only).
3. New event "EVENT_DISPLAYPOINTER"
Similar to "EVENT_DISPLAYCURSOR", it is used to display the pointer that controls the aiming in Wii. "RETURN" / "userdef[].return" work in the same way as "EVENT_DISPLAYCURSOR".

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6714 1a8010ca-5511-0410-912e-c29ae57300e0
2018-03-01 13:46:52 +00:00
hendricks266
920ec3f6a2 Fix the position of the notch when scaling the slidebar with the mouse.
Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6713 1a8010ca-5511-0410-912e-c29ae57300e0
2018-03-01 13:46:48 +00:00
terminx
b7dfd992ae Revert change to _multivc.h because it fucked up the volume slider
git-svn-id: https://svn.eduke32.com/eduke32@6712 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-27 16:54:42 +00:00
terminx
1c342e0bde Reduce max volume to prevent audio clipping
git-svn-id: https://svn.eduke32.com/eduke32@6711 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-27 15:21:01 +00:00
hendricks266
de272d0d00 Hide the joystick menu instead of disabling it.
git-svn-id: https://svn.eduke32.com/eduke32@6710 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-27 01:11:47 +00:00
pogokeen
94b2fc68af astub.cpp: only call GL functions if we are in a GL mode
git-svn-id: https://svn.eduke32.com/eduke32@6709 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-27 00:52:28 +00:00
hendricks266
322f1b46dd Disable the switching of keyboard layout on window focus gain and loss.
git-svn-id: https://svn.eduke32.com/eduke32@6708 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-26 20:27:58 +00:00
hendricks266
3a14b405a2 Clean up order of UserdefsLabels[].
Bump BYTEVERSION.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6707 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-26 20:20:05 +00:00
hendricks266
4f17a26061 New userdef structure "return"
This works like an extension of the RETURN gamevar and it accepts multiple values. Reading or writing the value of "userdef[].return 0" is the same as reading of writing the RETURN gamevar.

The following userdefs are now aliases:
- m_origin_x = userdef[].return 1
- m_origin_y = userdef[].return 2
- screenarea_x1 = userdef[].return 0
- screenarea_y1 = userdef[].return 1
- screenarea_x1 = userdef[].return 2

Additionally, the API for EVENT_PLAYLEVELMUSICSLOT is hereby redefined to use return 1 and 2 (not 0) _instead of_ ud.m_*_number.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6706 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-26 20:20:00 +00:00
hendricks266
9878d0c322 Revise the userdef code to accept multiple values.
Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6705 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-26 20:19:55 +00:00
hendricks266
e26760b6af Use the user's desktop resolution, fullscreen, as the default, instead of 1024x768 windowed.
git-svn-id: https://svn.eduke32.com/eduke32@6704 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-26 14:46:52 +00:00
hendricks266
9deeb94f06 Invalidate TILE_SAVESHOT whenever it is overwritten, so that it updates properly in GL.
(Also remove a redundant call to the screenshot function.)

git-svn-id: https://svn.eduke32.com/eduke32@6703 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-26 14:46:48 +00:00
hendricks266
d155564975 Menus: Improve text position over save/load screenshots.
git-svn-id: https://svn.eduke32.com/eduke32@6702 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-26 14:46:44 +00:00
hendricks266
5bb5612cba Menus: Don't allow loading previous version saves.
git-svn-id: https://svn.eduke32.com/eduke32@6701 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-26 14:46:40 +00:00
hendricks266
6f7313a46a Fix whitespace issues
git-svn-id: https://svn.eduke32.com/eduke32@6700 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-26 14:46:36 +00:00
hendricks266
dfffa5a9c5 Clear userquotes when returning to the menu.
git-svn-id: https://svn.eduke32.com/eduke32@6699 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-26 14:46:31 +00:00
pogokeen
c0b0ed2240 polymost.cpp: fix polymost_dorotatesprite() issue where sprites could be rendered with fractional positions and sizes leading to GL filtering imperfections.
git-svn-id: https://svn.eduke32.com/eduke32@6698 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-26 11:26:40 +00:00
pogokeen
cb9ee858bf menus.cpp: Make windowed-only resolutions clear in both their name and by disabling the fullscreen menu option
Additionally, increase MAXRESOLUTIONSTRINGLENGTH to accomodate new resolution name suffix

git-svn-id: https://svn.eduke32.com/eduke32@6697 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-26 02:48:09 +00:00
pogokeen
15b11232c3 sdlayer.h/winlayer.cpp: If a resolution is supported for fullscreen, also support the mode as a windowed resolution.
git-svn-id: https://svn.eduke32.com/eduke32@6696 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-26 02:48:06 +00:00
pogokeen
5370beb026 baselayer.cpp: add 1280x720 resolution to defaultres windowed resolutions
git-svn-id: https://svn.eduke32.com/eduke32@6695 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-26 02:48:03 +00:00
hendricks266
3117dcf006 Save the player's map time before EVENT_ENDLEVELSCREEN, which happens regardless of whether the hardcoded bonus screen is displayed.
Make sure ud.displaybonusscreen is set to 1 if you want this to take place. The bonus screen can still be skipped by setting RETURN to -1 in EVENT_ENDLEVELSCREEN.

git-svn-id: https://svn.eduke32.com/eduke32@6694 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-25 01:18:36 +00:00
hendricks266
042c0e9796 Fix the interaction between starttrack and toggling music off.
git-svn-id: https://svn.eduke32.com/eduke32@6693 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-25 01:18:32 +00:00
hendricks266
aa94f12666 Fix autoaim getting overwritten on load by whatever it was when the save was created.
git-svn-id: https://svn.eduke32.com/eduke32@6692 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-25 01:18:29 +00:00
hendricks266
cd796647d1 animlib: Editorialize the code style a bit more.
git-svn-id: https://svn.eduke32.com/eduke32@6691 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-25 01:18:25 +00:00
hendricks266
f10551086b animlib: Make some weird code easier to read.
git-svn-id: https://svn.eduke32.com/eduke32@6690 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-25 01:18:21 +00:00
pogokeen
9f48927ea8 sdlayer.cpp: fix vsync heartbeat issue on some NVidia & Intel drivers
git-svn-id: https://svn.eduke32.com/eduke32@6689 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-22 23:25:56 +00:00
hendricks266
b2470aa677 Fix typo in collections.h. DONT_BUILD
git-svn-id: https://svn.eduke32.com/eduke32@6688 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-22 14:15:13 +00:00
hendricks266
7a9684e350 Amend previous commit
git-svn-id: https://svn.eduke32.com/eduke32@6687 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-22 14:09:38 +00:00
hendricks266
63d93e8d9f New userdef structures: "menu_scrollbartilenum", "menu_scrollbarz", "menu_scrollcursorz"
Set "menu_scrollbartilenum" to the first tilenum of a series of 4 tiles:

<tilenum> = Middle (tiled to fill the scrollbar height)
<tilenum> + 1 = Top
<tilenum> + 2 = Bottom
<tilenum> + 3 = Cursor
Default value for menu_scrollbartilenum is -1, which will display EDuke32's default scrollbar.

Use "menu_scrollbarz" and "menu_scrollcursorz" to control the scale of the scrollbar. Default values are 65536.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6686 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-22 13:34:34 +00:00
hendricks266
50ac58f374 Improve translucence of menu cursor
git-svn-id: https://svn.eduke32.com/eduke32@6685 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-22 13:34:28 +00:00
hendricks266
3543d6f3fa Some screentext fixes (that don't affect CON scripts)
git-svn-id: https://svn.eduke32.com/eduke32@6684 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-22 13:34:24 +00:00
pogokeen
e5c6cc2238 sdlayer.cpp: remove unnecessary call to SDL_WarpMouseInWindow() on SDL2 that was causing issues with mouse movement when vsync was enabled on some hardware
git-svn-id: https://svn.eduke32.com/eduke32@6683 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-22 03:38:54 +00:00
pogokeen
94246b5dd1 game.cpp: fixed GL vsync resetting issue due to system_getcvars() call coming before cvars were loaded
git-svn-id: https://svn.eduke32.com/eduke32@6682 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-22 01:05:18 +00:00
hendricks266
92091a4425 CON: Change OSD_Printf to initprintf for addlog and addlogvar
git-svn-id: https://svn.eduke32.com/eduke32@6681 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-20 11:55:28 +00:00
hendricks266
d26635cfa9 Menu stuff
git-svn-id: https://svn.eduke32.com/eduke32@6680 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-20 11:55:24 +00:00
hendricks266
7a30b3452f CON: Add undefinecheat.
git-svn-id: https://svn.eduke32.com/eduke32@6679 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-20 11:55:20 +00:00
hendricks266
5bd6f6e28f Menus: Hide blank cheats
git-svn-id: https://svn.eduke32.com/eduke32@6678 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-20 11:55:16 +00:00
hendricks266
26749bf881 CON: Add resetplayerflag 4, which always loads if possible
git-svn-id: https://svn.eduke32.com/eduke32@6677 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-20 11:55:13 +00:00
hendricks266
60223012be Menus: Add MenuEntryFlag "Hidden", which is safer than setting the entry's position in its parent's EntryList to null.
git-svn-id: https://svn.eduke32.com/eduke32@6676 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-20 11:55:07 +00:00
pogokeen
9001ec60a0 Polymost: workaround for texcache expecting all mipmap levels to be available
git-svn-id: https://svn.eduke32.com/eduke32@6675 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-19 06:11:44 +00:00
hendricks266
dc7e727f0c Fix the definetint def token, broken in r6557.
git-svn-id: https://svn.eduke32.com/eduke32@6674 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-18 00:24:54 +00:00
hendricks266
3ae7cb1de5 Replace bespoke CON/def module and clipmap filename array reallocing with a new class, GrowArray.
git-svn-id: https://svn.eduke32.com/eduke32@6673 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-17 22:30:39 +00:00
hendricks266
a5be1c2e17 Update credits.
git-svn-id: https://svn.eduke32.com/eduke32@6672 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-17 22:30:26 +00:00
pogokeen
d6926cb7d3 Fix building on Visual Studio after GLAD & Polymost changes
git-svn-id: https://svn.eduke32.com/eduke32@6671 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-17 06:38:15 +00:00
terminx
97de73a760 Don't save skill level to settings.cfg
git-svn-id: https://svn.eduke32.com/eduke32@6670 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-17 00:06:01 +00:00
pogokeen
59b01d9d67 Polymost: fix typo causing bug where persistentStreamBuffer was being reset to the config value when it should be disabled
git-svn-id: https://svn.eduke32.com/eduke32@6669 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-16 08:35:45 +00:00
hendricks266
a8370e8d0c Keep individually specified RTS files and the rtsname cfg setting completely separate. This fixes a few issues.
git-svn-id: https://svn.eduke32.com/eduke32@6668 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-16 08:33:44 +00:00
hendricks266
0c9b00e277 CON: Remove GAMEFUNC_* hardcoded labels.
git-svn-id: https://svn.eduke32.com/eduke32@6666 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-16 08:33:36 +00:00
hendricks266
aa4c8f75f5 Make sure we clear the keyboard buffer when beginning text input.
git-svn-id: https://svn.eduke32.com/eduke32@6665 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-16 08:33:32 +00:00
pogokeen
451bdb4601 Polymost: fix bug where polymost2_drawVBO() wouldn't reset the bound buffer state properly for polymost1
git-svn-id: https://svn.eduke32.com/eduke32@6664 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-16 06:38:54 +00:00
pogokeen
7b2ac67e9d Polymost: adjust parenthesis to cease compiler warnings
git-svn-id: https://svn.eduke32.com/eduke32@6663 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-16 06:38:51 +00:00
pogokeen
1f133cd049 Polymost: streaming VBO optimizations for polymost_drawpoly()
git-svn-id: https://svn.eduke32.com/eduke32@6662 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-16 06:38:48 +00:00
pogokeen
e416c0a953 GLAD: update to include "GL_ARB_sync" extension
git-svn-id: https://svn.eduke32.com/eduke32@6661 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-16 06:38:44 +00:00
pogokeen
512b396c54 screens.cpp: Fixed a bug in FPS calculation
git-svn-id: https://svn.eduke32.com/eduke32@6660 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-16 06:38:40 +00:00
pogokeen
8ebb8083a5 polymost_dorotatesprite(): fix for Polymer bug introduced by Polymost drawarrays optimization
git-svn-id: https://svn.eduke32.com/eduke32@6659 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-16 06:38:37 +00:00
pogokeen
ff1d948d44 In-progress POLYMOST2 work
git-svn-id: https://svn.eduke32.com/eduke32@6658 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-16 06:38:34 +00:00
pogokeen
a2cf961591 Moved BUILD engine defined CSTAT enums into the BUILD engine side of the code base.
git-svn-id: https://svn.eduke32.com/eduke32@6657 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-16 06:38:31 +00:00
pogokeen
3ca5f33c73 Moved to GLAD for dynamic GL/WGL and extension loading.
Refactored extension usage that became core in GL2, and adjusted some types for GL2 compatibility.

git-svn-id: https://svn.eduke32.com/eduke32@6656 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-16 06:38:21 +00:00
pogokeen
037289a812 polymost_drawpoly(): only change the blend mode if blending is enabled
git-svn-id: https://svn.eduke32.com/eduke32@6655 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-16 06:38:07 +00:00
pogokeen
28f9fcebb4 Polymost: Avoid generation of mipmaps if filter mode isn't set to use them
git-svn-id: https://svn.eduke32.com/eduke32@6654 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-16 06:38:05 +00:00
pogokeen
a1c88b740f Polymost: texture format optimizations
git-svn-id: https://svn.eduke32.com/eduke32@6653 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-16 06:38:02 +00:00
pogokeen
464e65541c polymost_drawpoly(): drawarrays optimization
git-svn-id: https://svn.eduke32.com/eduke32@6652 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-16 06:37:58 +00:00
hendricks266
ff0768eaa9 Fix build issues with ARM and USE_OPENGL=0. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@6651 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-15 03:49:23 +00:00
hendricks266
8094104f0b Menu stuff
git-svn-id: https://svn.eduke32.com/eduke32@6650 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-13 00:13:06 +00:00
hendricks266
7be5abbe37 Revert the functional changes of r4741 and r4703 relating to conveyors. This restores conveyor belts to their original v1.5 speeds at the expense of the corner cases the original commits addressed.
This can be revisited in the future to address these corner cases without breaking the original game.

git-svn-id: https://svn.eduke32.com/eduke32@6649 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-12 02:32:43 +00:00
hendricks266
8ddcef89fc Fix FPS limiter in EVENT_SCREEN.
git-svn-id: https://svn.eduke32.com/eduke32@6648 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-12 02:32:39 +00:00
hendricks266
f2538230b7 Re-allow MUSICANDSFX ambient sounds with a hitag in the interval [32768, 65535].
git-svn-id: https://svn.eduke32.com/eduke32@6647 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-11 05:04:03 +00:00
hendricks266
9cf6c85623 Move new CON_FOR iterators to the bottom of their enum to unbreak savegames using CON_FOR made before r6635.
git-svn-id: https://svn.eduke32.com/eduke32@6646 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-11 05:03:59 +00:00
hendricks266
d68c9b45c6 Add "rtsname" token to grpinfo grammar.
git-svn-id: https://svn.eduke32.com/eduke32@6645 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-11 05:03:55 +00:00
hendricks266
0cbb522ff0 Use an unsigned type when we need right shifts to zero-extend for use in tagbitmap.
Fixes crash in boeing.map.

git-svn-id: https://svn.eduke32.com/eduke32@6644 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-11 05:03:50 +00:00
hendricks266
65b3bccf06 Add support for MapArt from within zip files.
git-svn-id: https://svn.eduke32.com/eduke32@6643 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-11 05:03:46 +00:00
hendricks266
4cea9ec804 Fix MSVC build breakage.
git-svn-id: https://svn.eduke32.com/eduke32@6642 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-10 22:58:38 +00:00
hendricks266
210f3e54ff Apply the FPS limiter to EVENT_SCREEN.
git-svn-id: https://svn.eduke32.com/eduke32@6641 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-10 22:58:34 +00:00
hendricks266
f228b68736 CON: Add if statements if(var(var)){a,b}(e).
Inspired by x86 assembly, these stand for "above" and "below", and perform unsigned versions of greater-than and less-than, respectively.

Useful for testing array bounds.

git-svn-id: https://svn.eduke32.com/eduke32@6640 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-31 05:23:48 +00:00
hendricks266
190d71832a Temporarily revert r6633.
git-svn-id: https://svn.eduke32.com/eduke32@6639 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-31 05:23:43 +00:00
hendricks266
d2fd7a2c30 Re-revise r6625.
git-svn-id: https://svn.eduke32.com/eduke32@6638 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-31 05:23:39 +00:00
terminx
3bc83a7ceb Revise r6625
git-svn-id: https://svn.eduke32.com/eduke32@6637 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-31 04:13:40 +00:00
terminx
cd02a9223e Use enum
git-svn-id: https://svn.eduke32.com/eduke32@6636 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-31 04:13:35 +00:00
terminx
d9a5b4aa13 Restore previous behavior of "allsprites" iterator for CON_FOR and add "allspritesbystat" and "allspritesbysect"
git-svn-id: https://svn.eduke32.com/eduke32@6635 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-31 04:13:31 +00:00
terminx
9c408fc26c Useless assertion that only fires in alternate universes
git-svn-id: https://svn.eduke32.com/eduke32@6634 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-31 04:13:25 +00:00
hendricks266
0542d32989 Modernize naming of gamefuncs.
Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6633 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-30 16:02:33 +00:00
hendricks266
27d93ac698 Satisfy -Wmaybe-uninitialized warnings exposed by -Og.
git-svn-id: https://svn.eduke32.com/eduke32@6632 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-30 16:02:29 +00:00
hendricks266
874b7df3aa Remix r5063
git-svn-id: https://svn.eduke32.com/eduke32@6630 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-30 16:02:20 +00:00
hendricks266
b497a6cbde CON: Add STR_USERMAPFILENAME for qgetsysstr.
Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6629 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-30 01:03:50 +00:00
hendricks266
e741c8d067 Unbreak r6608.
git-svn-id: https://svn.eduke32.com/eduke32@6628 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-29 15:28:07 +00:00
hendricks266
ea6955009f Fix a bug in r6587, where "statusbarcustom" was not saved in the cfg file.
Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6627 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-29 11:14:20 +00:00
hendricks266
12f1767de2 New userdef structure "shadow_pal"
Sets the black palette used for enemy shadows and for black rectangles in the menu. Default value is 4.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6626 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-29 11:14:17 +00:00
hendricks266
4bedc0c39d Fix overflow issue with tsprite shade of gibs.
Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6625 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-29 11:14:12 +00:00
hendricks266
e7cbf0b1a9 New events EVENT_PLAYLEVELMUSICSLOT and EVENT_CONTINUELEVELMUSICSLOT.
Called when a music track will be started from the beginning, and when the current track is continued after loading a save, etc.

The requested track is passed into PLAYLEVELMUSICSLOT via ud.m_volume_number and ud.m_level_number.

git-svn-id: https://svn.eduke32.com/eduke32@6624 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-29 11:14:08 +00:00
hendricks266
d41a013a57 CON: Add commands "swaptrackslot" and "preloadtrackslotforswap"
git-svn-id: https://svn.eduke32.com/eduke32@6623 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-29 11:14:04 +00:00
hendricks266
0d1137be5d Add read-only userdefs music_episode and music_level.
TODO: Exposing whether any music is currently playing at all. (No, it is not ud.musictoggle.)

git-svn-id: https://svn.eduke32.com/eduke32@6622 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-29 11:13:59 +00:00
hendricks266
969c9b77d6 Turn get/setmusicposition into no-ops.
People were using these commands in spite of my explicit instructions not to.

Now that music track is saved properly, no one has any excuse to continue using these.

git-svn-id: https://svn.eduke32.com/eduke32@6621 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-29 11:13:55 +00:00
hendricks266
6470b51fb9 Properly save the currently playing music track in savegames.
Bump BYTEVERSION.

git-svn-id: https://svn.eduke32.com/eduke32@6620 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-29 11:13:49 +00:00
hendricks266
d792054ce2 Refactor all calls to S_PlayMusic.
This allows as much of the control flow as possible to fail gracefully without interruping currently playing music.

git-svn-id: https://svn.eduke32.com/eduke32@6619 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-29 11:13:43 +00:00