hendricks266
ef4a19bb50
Fix a bug where FLAC sound effects would loop when they were not supposed to.
...
git-svn-id: https://svn.eduke32.com/eduke32@4947 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-25 12:17:25 +00:00
hendricks266
3018dee77c
Menus: Mouse, touch, and pointer controls now take the origin into account.
...
git-svn-id: https://svn.eduke32.com/eduke32@4946 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-25 12:17:10 +00:00
hendricks266
93a3ff34e8
Add events EVENT_DISPLAYINACTIVEMENU and EVENT_DISPLAYINACTIVEMENUREST and userdef members m_origin_x and m_origin_y.
...
This allows for CON screen display code to use menu animations. The following is an example of how to adapt screen features that should animate.
before:
onevent EVENT_DISPLAYMENUREST
ifvare current_menu 0 // main menu
{
setvar x 1
setvar y 1
rotatesprite x y zoom ang tilenum shade pal orientation 0 0 xdim ydim
}
endevent
after:
state DisplayMenuCommon
ifvare RETURN 0 // main menu
{
getuserdef[THISACTOR].m_origin_x x
getuserdef[THISACTOR].m_origin_y y
addvar x 65536
addvar y 65536
rotatesprite16 x y zoom ang tilenum shade pal orientation 0 0 xdim ydim
}
ends
onevent EVENT_DISPLAYMENUREST state DisplayMenuCommon endevent
onevent EVENT_DISPLAYINACTIVEMENUREST state DisplayMenuCommon endevent
git-svn-id: https://svn.eduke32.com/eduke32@4945 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-25 12:16:58 +00:00
hendricks266
7fb76291ee
Make my menu animation code a little bit more modular.
...
git-svn-id: https://svn.eduke32.com/eduke32@4944 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-25 12:16:34 +00:00
hendricks266
74bb822804
Revise r4707 to fix some remaining issues with next/previous weapon.
...
git-svn-id: https://svn.eduke32.com/eduke32@4943 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-25 12:16:22 +00:00
hendricks266
6048f9d766
Simplify the macros used for distinguishing between OS X and iOS.
...
git-svn-id: https://svn.eduke32.com/eduke32@4942 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-25 12:16:10 +00:00
hendricks266
36291f2e30
Fix "rv may be used uninitialized".
...
git-svn-id: https://svn.eduke32.com/eduke32@4941 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-25 12:15:50 +00:00
hendricks266
3c8b06c688
Fix "textsize.x may be used uninitialized".
...
git-svn-id: https://svn.eduke32.com/eduke32@4940 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-25 12:15:37 +00:00
helixhorned
038a9f8eb6
Lunatic: fix build and linking. DONT_BUILD.
...
- t{sector,wall}type are simply typedef'd to the non-t versions
- make FORCE_INLINE unconditional of DISABLE_INLINING (otherwise there are
multiple definitions of these functions)
- update lunatic/doc/lpeg-lunatic.patch to apply against the LPeg 0.12 I just
downloaded
git-svn-id: https://svn.eduke32.com/eduke32@4937 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-19 00:11:25 +00:00
helixhorned
621b52aec5
osdfuncs.c: get rid of a warning with GCC. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4936 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-19 00:03:00 +00:00
helixhorned
ace6087f7b
Classic: fix "windowed" modes (r_size >= 12) by reverting r4920; adapt.
...
In setview(), we now assert windowx2 < xdim. The only calling places where its
non-violation is non-trivial to ascertain are (1) showview from CON and
(2) draw-to-tile for look-sideways in game.c. AFAICS case 1 should be fine.
Case 2 is adapted; see comments there.
git-svn-id: https://svn.eduke32.com/eduke32@4935 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-18 23:16:37 +00:00
helixhorned
3a433130bb
Fix bsearch() call for user G_LoadMapHack(): don't access nonexistent storage. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4933 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-18 20:31:37 +00:00
hendricks266
b8783d0448
Fix warning in previous commit. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4929 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-17 05:40:42 +00:00
hendricks266
011fd40dda
CON: Add new commands "getmusicposition" and "setmusicposition" that operate on the playback position of the current music track.
...
// Example: Switch between tracks like radio stations.
getmusicposition temp
starttrackvar next_music_track
setmusicposition temp
Only implemented for Ogg Vorbis, FLAC, and XA. Consult the devs before using these commands.
git-svn-id: https://svn.eduke32.com/eduke32@4928 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-17 00:28:49 +00:00
hendricks266
86e7a97ef7
Fix a crash exposed by animating the menu back button.
...
git-svn-id: https://svn.eduke32.com/eduke32@4927 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-17 00:27:46 +00:00
hendricks266
e7b7a9fcf1
Clean up duplicate and strangely-formed cases in C_ParseCommand().
...
git-svn-id: https://svn.eduke32.com/eduke32@4926 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-17 00:27:19 +00:00
terminx
bd27267b6b
Fix savemapstate/loadmapstate (fixes a crash at shutdown, among other things)
...
git-svn-id: https://svn.eduke32.com/eduke32@4923 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-16 06:30:42 +00:00
terminx
4c883f81b6
MSVC build fix... guess it was upset about the macro expansion
...
git-svn-id: https://svn.eduke32.com/eduke32@4921 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-15 06:45:24 +00:00
terminx
cdaa25ef07
Implement better fade-out for quotes and for the mouse cursor in the menu.
...
git-svn-id: https://svn.eduke32.com/eduke32@4919 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-15 06:45:14 +00:00
hendricks266
2d161b1bf7
Menus: Implement better back button.
...
git-svn-id: https://svn.eduke32.com/eduke32@4918 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-13 12:57:29 +00:00
hendricks266
c42faee32e
Menus: Make black background boxes translucent again.
...
git-svn-id: https://svn.eduke32.com/eduke32@4917 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-13 12:57:11 +00:00
hendricks266
c1c672032b
Menus: Add proper edging for the tops and bottoms of scrolling lists.
...
git-svn-id: https://svn.eduke32.com/eduke32@4916 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-13 12:56:54 +00:00
hendricks266
53306244f0
Improve weapon switching:
...
1. If you switch away from a weapon and switch to a third when the gun is still going down, continue lowering the first weapon instead of immediately raising the third.
2. If you switch away from a weapon and switch back to it before it lowers completely, raise it from its current position instead of going all the way to the bottom.
git-svn-id: https://svn.eduke32.com/eduke32@4915 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-13 12:56:36 +00:00
hendricks266
49ba033faa
Convert some multi-line UI messages to single G_ScreenText calls with line breaks.
...
git-svn-id: https://svn.eduke32.com/eduke32@4914 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-13 12:56:19 +00:00
hendricks266
7bcb05f7f0
Fix aligned screentext with newlines.
...
git-svn-id: https://svn.eduke32.com/eduke32@4913 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-13 12:55:56 +00:00
terminx
7daf4fdcd3
Fix tdupsprite in m32script.
...
git-svn-id: https://svn.eduke32.com/eduke32@4911 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-12 09:28:46 +00:00
terminx
d70ac064b7
Make dist() and ldist() take void pointers so we can compare spritetype with tspritetype without inserting casts everywhere.
...
git-svn-id: https://svn.eduke32.com/eduke32@4910 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-12 09:28:41 +00:00
terminx
0b1433b07c
Disable mouse input affecting the menu when the console is down. This code is awful, because I am an awful man.
...
git-svn-id: https://svn.eduke32.com/eduke32@4906 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-12 01:54:18 +00:00
terminx
107bb7a3fa
Introduce "twalltype" for temporary uses of walltype where using wall_tracker_hook() would be invalid. This is similar to "tspritetype" and fixes a bunch of problems in the editor that cropped up when changing the tracker sanity checks to an assert that only exists in debug builds (branching upon any write to a sprite, sector or wall had an unacceptable impact on performance).
...
git-svn-id: https://svn.eduke32.com/eduke32@4903 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-11 04:56:38 +00:00
terminx
364cf15c4f
Questionable CON changes and optimizations. <3
...
git-svn-id: https://svn.eduke32.com/eduke32@4902 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-11 04:56:10 +00:00
terminx
64943543a4
Place the current loading percentage into RETURN for EVENT_DISPLAYLOADINGSCREEN.
...
git-svn-id: https://svn.eduke32.com/eduke32@4900 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-11 04:55:36 +00:00
terminx
4911b9a949
Revise C++ structure trackers for performance and introduce "tspritetype", for temporary sprites or other usages where using the trackers would be invalid or undesired. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4898 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-11 04:55:07 +00:00
terminx
655bbed3b1
Faster/better optimized access to game structures from C-CON.
...
git-svn-id: https://svn.eduke32.com/eduke32@4897 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-11 04:54:11 +00:00
terminx
1f2705c4bc
Clean up/refactor a few gamevar related functions based on building as C++/C99 and some interesting articles I read about how GCC and Clang optimize switches. Worth a few FPS here.
...
git-svn-id: https://svn.eduke32.com/eduke32@4895 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-11 04:53:44 +00:00
terminx
c591711fe8
MSVC C++ build fixes. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4890 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-11 04:52:15 +00:00
terminx
9ab6ab7139
Fix up weapon switching deficiencies
...
git-svn-id: https://svn.eduke32.com/eduke32@4888 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-11 04:51:17 +00:00
hendricks266
0699a44e4e
When using search paths detected from a Megaton installation, also use the SC-55 oggs included with it.
...
git-svn-id: https://svn.eduke32.com/eduke32@4887 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-08 15:15:10 +00:00
hendricks266
e3de98e2ae
Clean up autodetected game install search paths on all platforms that use them.
...
This should prevent Lunar Apocalypse from becoming Nuclear Winter with Megaton on Linux and Mac.
git-svn-id: https://svn.eduke32.com/eduke32@4886 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-08 15:14:47 +00:00
hendricks266
1f3ce84585
Menus: Disable the spinning nuke icon back button on Android.
...
git-svn-id: https://svn.eduke32.com/eduke32@4885 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-08 15:14:18 +00:00
hendricks266
589c993c39
Implement UserMapHacks.
...
git-svn-id: https://svn.eduke32.com/eduke32@4884 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-08 15:14:00 +00:00
helixhorned
b5bb86b8e2
Mapster32: make sprite duplication examples in m32script_ex.map work again.
...
- Work around a sequencing issue (assignment of searchstat) in
M32_DrawRoomsAndMasks()
- When having sprites highlighted and changing shade, since r1943 change
every highlighted sprite's shade if one of them is aimed at. With this
revision, if SHIFT is pressed while doing that, only change the aimed at
sprite's shade
- a.m32: Use 'break' from a state instead of 'return'. The former may be
"sticky" in a way that is not intended. Needs to be debugged later.
- Update instructions in m32script_ex.map
DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@4880 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-06 19:56:41 +00:00
helixhorned
a9cb38dbcf
game.c: revert changes of r4861 ("consult g_mirrorCount instead of gotpic[]").
...
git-svn-id: https://svn.eduke32.com/eduke32@4879 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-05 21:54:31 +00:00
helixhorned
8f1df579e1
Lunatic: in control/lua, sync ALLOWED_VIEWTYPE with change from r4814 (allow 2).
...
DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@4878 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-05 21:54:28 +00:00
helixhorned
17fab4d8ac
Cleanup of various engine functions.
...
- factor out calculation of player-relative and screen+clipped-player-relative
coordinates into get_rel_coords() and get_screen_coords(), respectively
- the usual beautification stuff, especially since we're now on C99
git-svn-id: https://svn.eduke32.com/eduke32@4875 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-04 18:45:00 +00:00
helixhorned
b0c48eec25
CON: always return non-negative values from 'clipmove' and related.
...
Previously, the C function clipmove() returned negative values when hit a
wall (32768+wallnum) or sprite (49152+spritenum) because internally,
these values were encoded into a *signed* 16-bit integer. This made no
difference to C code using it, since it always proceeded by bit checks,
but was inconsistent with documentation on CON 'clipmove' on the wiki.
The following commands are affected too, since they use the value returned
by clipmove(): 'clipmovenoslide', 'movesprite'. Also, the value of
actor[].movflag ('htmovflag' from CON).
Also, fix 'clipmove*' in LunaCON and add lunatic/test/checknearwall.con
as an example of how to implement a being-close-to-a-wall checker as
requested in
http://forums.duke4.net/topic/7869-determining-closeness-to-a-wall/
git-svn-id: https://svn.eduke32.com/eduke32@4874 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-04 18:44:58 +00:00
helixhorned
2daa44ca6a
engine.c: fix clipmove() against floor-aligned sprites.
...
Introduced in r3207. Oops.
git-svn-id: https://svn.eduke32.com/eduke32@4873 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-30 20:05:22 +00:00
helixhorned
61f7c9e30f
sounds.c: don't crash S_PlayMusic() if passed null pointer for 'fn'.
...
This may happen if no title/end music is defined from CON.
Thanks to Zaxtor for the bug report.
git-svn-id: https://svn.eduke32.com/eduke32@4871 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-28 22:12:40 +00:00
hendricks266
d73c7f1afe
Menus: Amend r4862 so that touch devices, which do not display the crosshair as a cursor, are not completely prevented from using touch input by the lack of a crosshair tile.
...
git-svn-id: https://svn.eduke32.com/eduke32@4870 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-28 21:36:09 +00:00
hendricks266
fcbd0737bb
Menus: Fix the Screen Size slider so that it works properly after the screen size has been modified in-game with [-]/[+].
...
git-svn-id: https://svn.eduke32.com/eduke32@4869 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-28 21:35:56 +00:00
hendricks266
aa9f767052
Menus: Fix selecting "None" for Anisotropy.
...
git-svn-id: https://svn.eduke32.com/eduke32@4868 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-28 21:35:44 +00:00
hendricks266
3bc47565a3
Menus: Fix opening a MenuEntryOptionList when the option's value is "Custom".
...
git-svn-id: https://svn.eduke32.com/eduke32@4867 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-28 21:35:32 +00:00
hendricks266
6797e8a3d5
Menus: Convert MenuRange*_t's "displaytype" field to "flags", add a flag to enforce clamping to the defined intervals, and apply this flag to the Screen Size slider.
...
git-svn-id: https://svn.eduke32.com/eduke32@4866 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-28 21:35:20 +00:00
hendricks266
a74317a104
Menus: When pressing left or right on a slider that has moved by the mouse to a position between the defined intervals, do not round to the nearest interval and then increment or decrement. Instead, check if rounding will satisfy the movement before moving further.
...
git-svn-id: https://svn.eduke32.com/eduke32@4865 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-28 21:35:07 +00:00
hendricks266
571a44cd8d
Menus: Mouse controls now respect MenuEntry_t's disabled flag.
...
git-svn-id: https://svn.eduke32.com/eduke32@4864 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-28 21:34:54 +00:00
helixhorned
d7b88df6af
actors.c: replace hard-coded list with missing check for SFLAG_NODAMAGEPUSH.
...
In A_RadiusDamage(). The code snippet that is disabled for such actors
increases the damaged actor's .xvel by (4 times the) damage amount and
is responsible for the strange effect of enemies becoming faster TOWARDS
the player on being hit with an RPG frontally.
Thanks to Fox for a keen eye.
git-svn-id: https://svn.eduke32.com/eduke32@4863 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-28 20:57:13 +00:00
helixhorned
7033205fcf
Menus: disable mouse pointer if CROSSHAIR is void. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4862 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-28 19:48:20 +00:00
helixhorned
1734e0db53
In G_HandleMirror(), consult g_mirrorCount instead of gotpic[] w/ MIRROR.
...
DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@4861 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-28 15:40:06 +00:00
helixhorned
c320dba4d0
Lunatic translator: add stand-alone option -fnames, generating names.h file.
...
git-svn-id: https://svn.eduke32.com/eduke32@4860 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-28 15:40:04 +00:00
hendricks266
ec3a73efd2
Fix playing end-of-episode ANMs.
...
git-svn-id: https://svn.eduke32.com/eduke32@4859 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-27 20:39:43 +00:00
hendricks266
4bc4735480
If you save over an autonamed savegame and change the name, don't overwrite your edit with another autofill.
...
git-svn-id: https://svn.eduke32.com/eduke32@4858 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-27 20:39:30 +00:00
hendricks266
8a68f2d5a9
Menus: Enumify the "status" parameter of M_MenuText into MenuTextFlags_t.
...
git-svn-id: https://svn.eduke32.com/eduke32@4857 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-27 18:37:39 +00:00
hendricks266
7a1e94440a
Menus: Implement mouse/touch/pointer controls for all widgets.
...
git-svn-id: https://svn.eduke32.com/eduke32@4856 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-27 18:37:27 +00:00
hendricks266
6ac1850482
Menus: Replace the "disabled" member of MenuEntry_t with "flags" so that the other 31 bits can be utilized.
...
git-svn-id: https://svn.eduke32.com/eduke32@4855 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-27 18:37:12 +00:00
hendricks266
4f9831d45c
Menus: Disable normal left-click/touch menu functionality when the mouse is active.
...
git-svn-id: https://svn.eduke32.com/eduke32@4854 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-27 18:36:58 +00:00
hendricks266
598e33319c
Add the necessary plumbing to sdlayer to detect mousedown, mouseup, and dragging.
...
git-svn-id: https://svn.eduke32.com/eduke32@4853 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-27 18:36:43 +00:00
hendricks266
bfb3614b92
Introduce preprocessor token EDUKE32_TOUCH_DEVICES that covers both Android and iOS, and replace selected instances of __ANDROID__ with it.
...
git-svn-id: https://svn.eduke32.com/eduke32@4852 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-27 18:36:14 +00:00
hendricks266
b010dfd2ee
Menus: Add scrollbars to the FileSelect menu type.
...
git-svn-id: https://svn.eduke32.com/eduke32@4851 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-27 18:35:48 +00:00
hendricks266
1c3043bf50
Tabs to spaces in menus.c.
...
git-svn-id: https://svn.eduke32.com/eduke32@4850 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-27 18:35:34 +00:00
hendricks266
399c062326
Refactor menus in preparation for touch functionality.
...
git-svn-id: https://svn.eduke32.com/eduke32@4849 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-27 18:35:21 +00:00
helixhorned
cb45393b3a
Mapster32: disable all loop checks as they spam the log too much. DONT_BUILD.
...
The one introduced with r4569.
git-svn-id: https://svn.eduke32.com/eduke32@4848 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-27 17:17:53 +00:00
helixhorned
2494c56768
Propagate 'smoothratio' to scenes drawn from the position of a camera.
...
That is, make interpolation work properly there -- both when 'using' a
VIEWSCREEN and when rendering the scene onto a TILE_VIEWSCR. This makes
a difference only if the camera is in a moving sector.
git-svn-id: https://svn.eduke32.com/eduke32@4847 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-27 17:17:52 +00:00
helixhorned
8024273aca
Prettify viewscreen turned to STATIC in breakable cameras mode. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4845 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-26 18:05:41 +00:00
helixhorned
f3532f8a34
C-CON: fix 'writearraytofile' for 64-bit platforms.
...
git-svn-id: https://svn.eduke32.com/eduke32@4844 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-26 17:30:01 +00:00
helixhorned
51fe706907
Tweak the behavior of viewscreens to what is more logical IMO.
...
- At a given time, at most one viewscreen may display TILE_VIEWSCR, namely
that one which is g_curViewscreen
- sync kinds of distance to compare against VIEWSCREEN_ACTIVE_DISTANCE (was
Manhattan vs. dist(), now both the latter)
- fix resetting to VIEWSCREEN tile when player is greater from it than that
distance. When the player is closer to it again, it is *not* reset to
TILE_VIEWSCR.
- more sync'd g_curViewscreen and sprite[i].yvel (for 'i' being the viewscreen
sprite)
Note: in a multiplayer context, this needs to be thought about once more.
git-svn-id: https://svn.eduke32.com/eduke32@4843 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-26 17:30:00 +00:00
helixhorned
a1091233d2
CON: allow passing more than one flag to the 'spriteflags' directive.
...
These will be bitwise-OR'd.
git-svn-id: https://svn.eduke32.com/eduke32@4841 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-26 17:29:58 +00:00
helixhorned
2eff7bf6ce
gamedef.c: factor out some dup'd code into C_BitOrNextValue(), C_FinishBitOr().
...
git-svn-id: https://svn.eduke32.com/eduke32@4840 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-26 17:29:57 +00:00
helixhorned
b2e09b5a18
In C-CON build, prevent leak of gamevar/gamearray labels on savegame loading.
...
Also, rewrite the loops in Gv_Free() and Gv_Clear() in the plain fashion so
that they are correct even if the number of gamearrays exceeds the number of
gamevars.
git-svn-id: https://svn.eduke32.com/eduke32@4839 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-26 17:29:56 +00:00
helixhorned
7da543e4f0
cache1d.c: Revert changes in r4665 unrelated to unrolling, fixing oob write.
...
Specifically, we must make sure that dasizeof <= LZWSIZE (or so) in
c1d_{read,write}_compressed() (what the assertion in the last commit was about,
and is now redundant). This fixes saving of e.g. large gamearrays with the C-CON
build. Bump BYTEVERSION.
An alternative for setting dasizeof to 1 would be to factor it and keep dividing
as long as it's > LZWSIZE.
git-svn-id: https://svn.eduke32.com/eduke32@4838 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-26 17:29:55 +00:00
helixhorned
584ed7982a
Convert voxels to models only when starting or changing to Polymost.
...
Analogously to the way models are processed in a deferred manner for Polymer.
git-svn-id: https://svn.eduke32.com/eduke32@4836 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-26 17:29:53 +00:00
helixhorned
3a6bcdc102
engine.c: style-cleanup drawvox(). Also clean up ALL of voxmodel.c.
...
No deliberate semantic changes here.
git-svn-id: https://svn.eduke32.com/eduke32@4834 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-26 17:29:48 +00:00
helixhorned
3a741de9fe
menus.c: Reset next-viewscreen-redraw counter from M_CloseMenu().
...
git-svn-id: https://svn.eduke32.com/eduke32@4832 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-21 15:51:50 +00:00
helixhorned
8b7c10892c
Minor cleanup around security cameras / viewscreens. DONT_BUILD.
...
The only semantic change is that an out-of-sync instance of a distance to
check (viewscreen sprite <-> player sprite) is changed in
actors.c:G_MoveStandables(), from 2048 (as in Duke3D 1.5) to 8192, now
represented by the define VIEWSCREEN_ACTIVE_DISTANCE. I have not yet observed
any change in behavior regarding this change (but there ought to be one).
Also, in DNCOORDS display, print 'totalclock' count, too.
git-svn-id: https://svn.eduke32.com/eduke32@4831 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-21 15:51:48 +00:00
helixhorned
b716534104
Lunatic: sync MAXJOYAXES, add lunatic/test/sprite_addtv.con. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4829 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-20 13:08:27 +00:00
hendricks266
ac4bbaf0f1
Wii: Display all hat directions in the joystick buttons menu instead of just up.
...
git-svn-id: https://svn.eduke32.com/eduke32@4828 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-18 18:16:29 +00:00
hendricks266
989f182eb4
Wii: Bump MAXJOYAXES to 9 to avoid menu corruption, and fix _functio.h, CONFIG_FunctionNameToNum, CONFIG_AnalogNameToNum, so that this does not crash.
...
git-svn-id: https://svn.eduke32.com/eduke32@4827 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-18 18:16:16 +00:00
hendricks266
eca33954db
Fix the MAXJOYBUTTONS discrepancy between _control.h and gamedefs.h.
...
git-svn-id: https://svn.eduke32.com/eduke32@4826 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-18 18:15:51 +00:00
hendricks266
dbcca52303
Polish up the video menu a bit.
...
git-svn-id: https://svn.eduke32.com/eduke32@4823 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-18 18:14:45 +00:00
hendricks266
933ffc92ce
Fix "bright red" player color.
...
git-svn-id: https://svn.eduke32.com/eduke32@4822 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-18 18:14:27 +00:00
hendricks266
8ec58a208d
Wii: Tweaks.
...
*Move the FPS display down from the top of the screen, as we do for quotes.
*Don't show a non-functional mouse cursor in the center of the screen.
*Don't display the "Startup window" option in Game Settings.
*Display the IR pointer crosshair in addition to the aiming crosshair, not instead of it.
*Eliminate some assumptions from wiibuild.bat.
*DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@4818 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-17 13:00:54 +00:00
helixhorned
01fa7eeabc
Makefile.common: in non-release builds, explicitly pass -fno-omit-frame-pointer.
...
So that stack traces can be gotten with optimized DEBUGANYWAY builds, e.g. for
Linux's 'perf' --> flame graphs. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@4817 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-15 19:50:52 +00:00
helixhorned
3db594912f
Lunatic: for '(display)rand*', use math.floor(); correct create_additive_trans() help.
...
DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@4816 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-14 20:48:05 +00:00
helixhorned
52b58dde26
Lunatic: show on-screen errors even in passive menu; fix '(display)rand*' for large values.
...
Also, some minor style cleanup in game.c. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@4815 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-14 14:31:34 +00:00
helixhorned
ca7a5acce7
LunaCON: expose more members, properly handle setting ud.screen_size.
...
BUILD_LUNATIC.
git-svn-id: https://svn.eduke32.com/eduke32@4814 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-13 22:33:07 +00:00
helixhorned
70cbde87eb
Move g_noFloorPal[] to the engine side and adapt other stuff accordingly.
...
- 'nofloorpalrange' DEF token: now handled for both game and editor (for the
latter, it's effective only for "shade preview" mode, [']+[X]).
- in generatefogpals(), assign g_noFloorPal[] = 1 for every generated (default)
fog pal; get rid of its return value / g_firstFogPal
git-svn-id: https://svn.eduke32.com/eduke32@4811 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-13 22:33:04 +00:00
hendricks266
750a98953b
BSD: Fix the previous commit. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4805 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-08 10:30:33 +00:00
hendricks266
828382c290
Linux: Add detection of the Steam releases of Duke 3D and NAM. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4804 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-08 10:26:32 +00:00
hendricks266
735525758d
Refine the previous commit a bit. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4802 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-08 07:32:58 +00:00
hendricks266
0b91499ee0
Mac OS X: Add detection of the Steam and GOG releases of Duke 3D and the Steam release of NAM. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4801 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-08 04:31:57 +00:00
helixhorned
442a9bbfef
voxmodel.c: fix Polymost rendering of voxels.
...
This reverts/corrects two semantic changes of r4639 as far as what is now
voxmodel.c (formerly part of mdsprite.c) is concerned. One correction ends
up having no effect (m->bscale is always 1.f for voxel models, as far as I
can see), but is the proper rewrite.
Also, in osdcmds.c:registerosdcommands(), tweak two help strings.
git-svn-id: https://svn.eduke32.com/eduke32@4800 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-06 21:05:36 +00:00
helixhorned
5e35448560
m32script: fix tilesizx[]/tilesizy[] access. Can also 'copy' from them.
...
git-svn-id: https://svn.eduke32.com/eduke32@4799 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-06 19:09:53 +00:00
helixhorned
74d99fe2e1
M32Script cleanup. Fixes at least one non-minor and one minor bug.
...
git-svn-id: https://svn.eduke32.com/eduke32@4798 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-06 19:09:50 +00:00
helixhorned
badd7ca115
Lunatic: fix actor[] and player[] indexing after LuaJIT bugfix 66515a054c0826ce.
...
git-svn-id: https://svn.eduke32.com/eduke32@4796 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-05 23:12:35 +00:00
helixhorned
973d4950bb
LunaCON: implement 'qstrncat' command.
...
git-svn-id: https://svn.eduke32.com/eduke32@4795 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-05 23:12:33 +00:00
helixhorned
7cce9c39cb
astub.c: revert portions of r4763, fixing display of some "member edit" dialogs.
...
Specifically, this fixes edit lines for 2 members, e.g. "(X,Y)pan".
git-svn-id: https://svn.eduke32.com/eduke32@4794 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-05 23:12:30 +00:00
helixhorned
09e12917f0
gamevars.c: don't leak memory in Gv_NewArray(). DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4793 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-05 20:02:19 +00:00
helixhorned
e00b2c627a
Bump BYTEVERSION, necessary since the changes of r4703. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4792 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-02 21:56:28 +00:00
hendricks266
2f116d81a6
Add dummy command line parameters to allow us to serve as a drop-in replacement for the NAM Steam release's dosbox.exe
...
git-svn-id: https://svn.eduke32.com/eduke32@4791 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-02 06:16:15 +00:00
hendricks266
80ed260c1a
Windows: Detect installation paths of 3DR's Duke Nukem 3D package, the 3DR Anthology, and the NAM Steam release.
...
git-svn-id: https://svn.eduke32.com/eduke32@4790 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-02 06:16:02 +00:00
hendricks266
47d3f07ccf
Remove the structure fields in grpscan.c that blocked my code for allowing NAM, NAPALM, and WWII GI to fall back to GAME.CON.
...
git-svn-id: https://svn.eduke32.com/eduke32@4789 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-02 06:15:49 +00:00
hendricks266
9a7bf9e72e
Remove the blackout when starting a new game on episode 4.
...
git-svn-id: https://svn.eduke32.com/eduke32@4788 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-02 06:15:33 +00:00
hendricks266
44844bb4cc
Fix USE_OPENGL=0 build error in r4779.
...
git-svn-id: https://svn.eduke32.com/eduke32@4787 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-02 06:15:19 +00:00
terminx
944d64215e
Fix EVENT_ANIMATESPRITES.
...
git-svn-id: https://svn.eduke32.com/eduke32@4784 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-30 23:19:11 +00:00
hendricks266
20e18ef41d
Open the load and save menus with the last used slot highlighted. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4782 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-30 04:59:34 +00:00
hendricks266
19396e39e6
Fix names of savegames. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4781 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-30 04:56:09 +00:00
hendricks266
f8d4b6c9ef
Fix displaying a savegame preview shot when in OpenGL and/or when the selected slot is empty. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4780 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-30 04:23:22 +00:00
hendricks266
050f2b36f4
Re-allow the player color option to take effect. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4779 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-30 03:37:56 +00:00
hendricks266
4f1f23c566
Menu structure revision. Structs reordered to eliminate slop. MenuGroup_t eliminated. MenuPos_t split into MenuMenuFormat_t and MenuEntryFormat_t. DROIDMENU build fixed. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4778 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-30 02:04:36 +00:00
hendricks266
f2fc1a6f15
Make sure the mouse is captured when the main menu transitions into MODE_GAME. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4776 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-29 03:43:11 +00:00
hendricks266
731e4ffa99
Fix POLYMER=0 GTK C++ build. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4773 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-29 02:29:42 +00:00
hendricks266
e29e5bfbcb
GTK: Fix warnings and errors related to the banners. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4770 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-28 23:47:46 +00:00
hendricks266
9268b9f0b6
Make a bunch of things extern "C". This should fix C++ builds on OS X and with Lunatic. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4766 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-26 04:39:23 +00:00
hendricks266
d89caf5187
Fix Lunatic C build. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4765 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-26 04:37:22 +00:00
hendricks266
4e034e1331
Eliminate the printf_nowarn stuff that has long since been supplanted by TrackerCast. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4763 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-25 21:08:58 +00:00
hendricks266
f22e202d88
Fix some things when building on OS X. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4762 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-24 08:19:50 +00:00
hendricks266
60a91c6c79
Fix oversight in mouse cursor code. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4760 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-24 06:03:58 +00:00
helixhorned
9907e79a0b
Fix C build and build on Linux/SDL2.
...
- for the first point: 'struct glattribs sdlayer_gl_attributes[]' was defined
at file scope, but 'glmultisample > 0' is not a compile-time constant.
- for the second point: r4749 changed the meaning of some conditional
compilation (supposedly, unintentionally). I'm reverting it to pre-r4749
but keeping the rewritten style. It's concerned with mouse thumb buttons.
git-svn-id: https://svn.eduke32.com/eduke32@4755 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-22 18:37:16 +00:00
terminx
1bbb077fca
Add missing "break" to M_RunMenuInput(), revert android gltexapplyprops() menu fuckery. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4751 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-22 12:34:11 +00:00
terminx
cf339e8105
Clean up the sound remapping stuff... remove the bits relating to sounds we haven't actually used anywhere in the source directly. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4748 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-22 12:33:15 +00:00
terminx
99e21ffa94
Part 1 of attempting to adhere to C standard section 7.1.3. It turns out it's illegal to use identifiers that begin with _ or have __ anywhere in them. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4747 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-22 12:32:56 +00:00
terminx
bf3c0de73a
Mainly misc cleanups (and a fix for the C++ build), but there are a few important changes in here.
...
VM_OnEvent() has become VM_OnEvent(), VM_OnEventWithReturn(), VM_OnEventWithDist(), and VM_OnEventWithBoth() (the latter of which is only ever used once...). Of course, this required every call to VM_OnEvent() be changed.
memberlabel_t and vmstate_t have been changed to use the regular "int" type versus explicitly specifying int32_t as they did previously. The rationale for this change is simply that it looks cleaner, and I think we should move toward just using "int" in most cases where there's no particular reason to specify an explicit data type.
Also changes CON_KILLIT to just "return" instead of "continue". DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@4745 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-22 12:29:25 +00:00
terminx
3e7f96c32d
Fix up conveyor belts. This fixes breakage of the movement in general, as well as corrects the general behavior of the effect so that a player on a moving surface is moved at a constant rate, regardless of whether the player crouches, is shrunk, etc. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4741 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-22 12:28:12 +00:00
hendricks266
a0e4692d59
Fix minor menu bugs. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4739 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-17 08:14:33 +00:00
hendricks266
164d9ccb41
Set up mouse cursor display in menus, with idle timeout fully implemented. No functionality yet. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4738 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-17 07:39:12 +00:00
helixhorned
e5923955ef
Fix C++ build. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4737 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-07 22:07:14 +00:00
helixhorned
205b8a7677
C-CON: fix 'readgamearray' and 'resizearray' on Windows.
...
We must not use Xrealloc(), since gamearrays are now allocated with
Xaligned_alloc().
NOTE: I did not check all potential problematic cases, only those to get
LNGA3 up and running.
git-svn-id: https://svn.eduke32.com/eduke32@4735 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-07 22:07:12 +00:00
helixhorned
108a4022fa
C-CON: fix 'readgamearray' on 64-bit platforms.
...
Also prettify P_DisplaySpit().
git-svn-id: https://svn.eduke32.com/eduke32@4734 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-07 22:07:12 +00:00
helixhorned
0cc9f05b8b
LunaCON: player[].loogcnt, userdef[].color, minor fixes.
...
git-svn-id: https://svn.eduke32.com/eduke32@4732 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-07 22:07:10 +00:00
helixhorned
76d60511bc
LunaCON: fix tilesizx[] and tilesizy[] system gamearrays.
...
git-svn-id: https://svn.eduke32.com/eduke32@4731 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-07 22:07:07 +00:00
helixhorned
142b5e2d2f
Lunatic: some minor doc tweaks. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4729 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-06 23:58:33 +00:00
helixhorned
e278842ce4
gameexec.c: In VM_OnEvent_, don't form address like &sprite[-1].
...
The practical rationale: Clang-sanitize catches this, so this is bad.
The real rationale: I *think* it is undefined behavior to even form such a
pointer in C99. However, I would be hard pressed to provide a nice formal
argument in terms of the Standard wording right now. It looks like
6.5.3.2#4 is to blame.
git-svn-id: https://svn.eduke32.com/eduke32@4727 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-06 23:43:51 +00:00
terminx
764f77d1cd
Sometimes I wonder why MSVC neglects to provide useful warnings. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4722 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-02 05:38:57 +00:00
terminx
4186c89aed
Minor tweaks to VM_OnEvent_(). DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4721 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-02 05:36:53 +00:00
helixhorned
f24ccdecc0
menus.c: prevent using a null pointer as arg to "%s" format for sprintf().
...
DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@4712 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-01 18:01:28 +00:00
helixhorned
ce6176757b
Add forgotten events_defs.h, oops. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4711 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-31 21:09:26 +00:00
helixhorned
96541f3521
Lunatic: fix building and startup up to tilesizx[] failure. DONT_BUILD.
...
- Needed to rip out enum GameEvent_t into own header file to prevent what
would be a circular #include otherwise
- Added some forgotten #ifdef LUNATIC
- updated structure and function declarations on the Lua FFI side
git-svn-id: https://svn.eduke32.com/eduke32@4710 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-30 21:44:22 +00:00
helixhorned
ae63745eb3
C-CON: fix possible crash when a CON error is raised due to access of invalid sprite.
...
For example, in
CON_ERRPRINTF("invalid target sprite (%d) %d %d\n", iActor, vm.g_i, TrackerCast(vm.g_sp->picnum));
vm.g_i can be -1 and vm.g_sp can be NULL then. (Not anymore.)
DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@4709 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-30 21:44:21 +00:00
helixhorned
8605285f7f
compat.h: pedantic whitespace formatting. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4708 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-30 04:59:23 +00:00
terminx
7f232bcbd1
Alter weapon switching to cycle through GROW_WEAPON when using next/previous weapon keys. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4707 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-29 17:08:03 +00:00
terminx
633cb8764b
Default map zoom to something a bit more useful on Android. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4706 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-29 17:07:47 +00:00
terminx
ce210a9fd7
Clean up some player code a bit... make bobposx/bobposy a vec2_t, make fricxv/fricyv a per-player vec2_t (TODO: CON access), promote angvel in input_t to int16_t and allow for player angle changes that result in odd numbered angles (we were effectively artificially limiting the angle to 1024 values before), fix some HUD model ID stuff that should help with the weapons in the HRP, clean up a bunch of random functions (P_FireWeapon(), P_DisplayTip(), P_DisplayAccess(), P_DisplayWeapon(), P_GetInput(), etc). Also clean up G_SetupFilenameBasedMusic() to loop through flac/ogg/mid when searching for usermap music replacements. Some of this really needs a BYTEVERSION bump, but these commits aren't for synthesis to build so we're not doing it yet. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4703 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-29 17:07:11 +00:00
terminx
183b34f48e
More EDUKE32_PREDICT_FALSE, mostly in OSD_Printf(OSD_ERROR...) cases
...
git-svn-id: https://svn.eduke32.com/eduke32@4699 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-29 17:05:46 +00:00
terminx
6f5726e015
Aligned gamevar/gamearray allocation
...
git-svn-id: https://svn.eduke32.com/eduke32@4698 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-29 17:05:29 +00:00
terminx
384aec522a
Fix a couple of clang warnings. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4697 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-29 17:05:15 +00:00
terminx
ec83998c89
Android updates from Emile. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4693 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-29 17:03:50 +00:00
hendricks266
3d43f1c346
Fix the menu animations so that they are what I actually intended. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4689 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-28 20:46:14 +00:00
hendricks266
5bbb4afd76
Menu transition animations. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4688 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-27 10:14:50 +00:00
hendricks266
5dd1abd647
Two files forgotten in the previous commit. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4687 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-27 07:24:37 +00:00
hendricks266
1ed4df36f1
Update the menu code so that everything drawn to the screen is relative to an origin point, which for now remains zero.
...
The three things using windowx/y hackery to crop tiles (user map menu background, color correction panels, automatic scrolling indicators) have been rewritten not to, so that the origin point would work properly with them. All three are slightly different now.
The changes are more extensive than you might predict, because I had to modify every rotatesprite/*text call to add its coordinates (shifted left by 16 if they weren't already) to the origin point.
DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@4686 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-27 07:09:41 +00:00
hendricks266
5241070ab3
Fix a few lingering issues with recent menu changes. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4682 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-25 10:16:49 +00:00
terminx
8934226bb2
Another 5000 lines of pain and tears. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4680 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-25 03:36:34 +00:00
terminx
1c68e84e5a
Hi-res security viewscreens
...
git-svn-id: https://svn.eduke32.com/eduke32@4679 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-25 03:35:21 +00:00
terminx
1e2fdef0e2
Forgot this in a previous commit, just removes a function prototype I moved elsewhere
...
git-svn-id: https://svn.eduke32.com/eduke32@4677 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-25 03:34:50 +00:00
terminx
57fd527308
Fix in-game sound menu (F4)
...
git-svn-id: https://svn.eduke32.com/eduke32@4676 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-25 03:34:38 +00:00
terminx
62f13fad76
Rename VM_OnEvent to VM_OnEvent_ and add move the checks for whether the event is actually defined or not to a wrapper declared static inline
...
git-svn-id: https://svn.eduke32.com/eduke32@4673 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-25 03:33:53 +00:00
terminx
f15a25a144
Adjust default security camera refresh times
...
git-svn-id: https://svn.eduke32.com/eduke32@4672 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-25 03:33:38 +00:00
terminx
088808eb3e
Mapster32 build fix
...
git-svn-id: https://svn.eduke32.com/eduke32@4668 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-25 03:32:42 +00:00
terminx
36e2aa01cd
if 0 the input check at the beginning of animation playback as it seems to cause some cutscenes to be skipped.
...
git-svn-id: https://svn.eduke32.com/eduke32@4662 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-25 03:30:51 +00:00
terminx
508595cac8
Fix a couple of botched FindDistance3D calls
...
git-svn-id: https://svn.eduke32.com/eduke32@4659 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-25 03:29:38 +00:00
terminx
6c6b68d534
Various additional optimizations: add CLASSIC_SLICE_BY_4 mode to unroll some of the loops in a-c, replace integer divisions by a divisor unknown at compile time with usage of libdivide, clean up pragmas further by removing more old stuff that wasn't used anywhere. This is another one of those nasty commits that make people cry. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4658 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-25 03:29:21 +00:00
terminx
6f332e645d
Fix r4643, NUM_HARDCODED_ANIMS was increased for a reason. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4657 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-25 03:27:50 +00:00
terminx
06a0350af0
Fix a bug where if you had a savegame with an active viewscreen, the tile in the world wouldn't update until totalclock > what totalclock was when the game was saved.
...
git-svn-id: https://svn.eduke32.com/eduke32@4655 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-25 03:27:13 +00:00
terminx
b7b0b2c7ba
Fix up some incorrect PWEAPON macro usage
...
git-svn-id: https://svn.eduke32.com/eduke32@4654 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-25 03:27:01 +00:00
terminx
3eaf78da8b
Tie a few random things previously hardcoded to p->curr_weapon == KNEE_WEAPON to curr_weapon being a weapon with a workslike of KNEE_WEAPON instead, and do the same with stuff hard coded for HANDREMOTE_WEAPON
...
git-svn-id: https://svn.eduke32.com/eduke32@4650 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-25 03:25:57 +00:00
terminx
57cc3fe82a
Clean up GL background tinting a little bit. Remove access to glRectd in favor of glRecti.
...
git-svn-id: https://svn.eduke32.com/eduke32@4649 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-25 03:25:35 +00:00
hendricks266
62b37ddb68
Further work on the Xcode project.
...
git-svn-id: https://svn.eduke32.com/eduke32@4648 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-20 07:37:29 +00:00
hendricks266
8771614f87
Fix the Wii build and clean up remaining warnings. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4647 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-19 00:44:23 +00:00
hendricks266
6ff363a049
OS X: Add a preliminary Xcode project. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4646 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-18 04:50:47 +00:00
hendricks266
f46d901fe2
Fix warnings in menus.c. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4645 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-16 22:21:00 +00:00
hendricks266
295cf82323
Clean up warnings and build issues when building under OS X 10.9. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4644 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-16 21:03:24 +00:00
helixhorned
ff7d664d1e
Fix an oob access in parsedefinitions_game(). DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4643 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-05 18:32:59 +00:00
terminx
706aec5527
Rename crc32() to Bcrc32() to avoid conflicts with the crc32() function in libpng/libz. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@4642 1a8010ca-5511-0410-912e-c29ae57300e0
2014-10-01 17:09:54 +00:00
terminx
a46994a668
I thought I was clever, MinGW thought I should eat shit.
...
git-svn-id: https://svn.eduke32.com/eduke32@4633 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:16:47 +00:00
terminx
71bb5e5c8e
Gamevar cleanup: drop "register" qualifiers, shuffle a few things around.
...
git-svn-id: https://svn.eduke32.com/eduke32@4631 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:16:21 +00:00
terminx
c2517d0d99
Suppress tile and sound remapping debug output in debug builds when not using -condebug
...
git-svn-id: https://svn.eduke32.com/eduke32@4630 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:16:06 +00:00
terminx
f553d6ad10
Add assertion for memory error handler in debug builds, add .def load time information to log, call Gv_ResetSystemDefaults() at startup to populate fake tilesizx/tilesizy arrays for CON
...
git-svn-id: https://svn.eduke32.com/eduke32@4629 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:15:53 +00:00
terminx
8e98cbe083
Free h_labels table when done compiling CONs
...
git-svn-id: https://svn.eduke32.com/eduke32@4628 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:15:41 +00:00
terminx
10474ad635
CON VM: get rid of extra VM_Execute() calls on CON_LEFTBRACE and get rid of returns on CON_RIGHTBRACE
...
git-svn-id: https://svn.eduke32.com/eduke32@4627 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:15:29 +00:00
terminx
9839802457
Optimize .anm playback; update frames on screen at the .anm's framerate instead of blindly looping as fast as possible
...
git-svn-id: https://svn.eduke32.com/eduke32@4626 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:15:17 +00:00
terminx
423b87a707
Faster CRC32 implementation (slicing-by-4 for 32-bit platforms and slicing-by-8 for 64-bit)
...
git-svn-id: https://svn.eduke32.com/eduke32@4625 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:15:04 +00:00
terminx
31d2f15b24
Use option name for menubar title for options that display as a separate menu page with a scrolling list
...
git-svn-id: https://svn.eduke32.com/eduke32@4624 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:14:35 +00:00
terminx
144a4798ce
More Polymost cleanup, also consolidate tilesizx and tilesizy into a single tilesiz vec2_t to ensure both x and y are always in the same cache line. I may add a new vec2_16t later. Still need to take care of emulating the old flat array for the sake of CON access.
...
git-svn-id: https://svn.eduke32.com/eduke32@4623 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:14:21 +00:00
terminx
e20f297774
r_showfps 2, displaying min and max fps
...
git-svn-id: https://svn.eduke32.com/eduke32@4622 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:13:14 +00:00
terminx
5d1475b26c
Remove some #if 0'd functions from audiolib
...
git-svn-id: https://svn.eduke32.com/eduke32@4621 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:12:57 +00:00
terminx
f8b340de02
Next time I'll test with sound enabled when attempting to fix a warning in audiolib ;)
...
git-svn-id: https://svn.eduke32.com/eduke32@4616 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:09:03 +00:00
terminx
3681d5e553
Respect ud.bgstretch when displaying the title screen during netplay
...
git-svn-id: https://svn.eduke32.com/eduke32@4614 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:08:35 +00:00
terminx
0a62ba1a21
On Android, remove the counter that automatically proceeds from the startup screen to the main menu and require a button press instead.
...
git-svn-id: https://svn.eduke32.com/eduke32@4613 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:08:23 +00:00
terminx
f4a8cdfa28
Don't display QUOTE_F1HELP on Android when starting a new game with the shareware version.
...
git-svn-id: https://svn.eduke32.com/eduke32@4612 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:08:10 +00:00
terminx
c97d01111a
Change vid_brightness/contrast/gamma cvars to float vs double and do the same for OSD text scaling
...
git-svn-id: https://svn.eduke32.com/eduke32@4611 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:07:57 +00:00
terminx
ee82c62afc
Allow loading the header from savegames with a different version. This is needed to allow starting a new game on the episode/level/skill saved in an incompatible savegame.
...
git-svn-id: https://svn.eduke32.com/eduke32@4610 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:07:41 +00:00
terminx
b8c8f153ac
WIP menu restructuring and updates. Revolt is in the air...
...
git-svn-id: https://svn.eduke32.com/eduke32@4609 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:07:29 +00:00