Commit graph

8632 commits

Author SHA1 Message Date
terminx
330119f482 MSVC build fix
git-svn-id: https://svn.eduke32.com/eduke32@4532 1a8010ca-5511-0410-912e-c29ae57300e0
2014-07-06 00:11:11 +00:00
terminx
e4733449fd Add support for pressing backspace to go up one dir in the file selector in Mapster32
git-svn-id: https://svn.eduke32.com/eduke32@4531 1a8010ca-5511-0410-912e-c29ae57300e0
2014-07-06 00:11:01 +00:00
terminx
7dae4a8e96 MSVC build fix
git-svn-id: https://svn.eduke32.com/eduke32@4530 1a8010ca-5511-0410-912e-c29ae57300e0
2014-07-06 00:10:46 +00:00
terminx
9eb8efa442 Android updates from Emile
git-svn-id: https://svn.eduke32.com/eduke32@4529 1a8010ca-5511-0410-912e-c29ae57300e0
2014-07-06 00:10:33 +00:00
terminx
b81a28b334 Fix MSVC warning caused by r4488
git-svn-id: https://svn.eduke32.com/eduke32@4528 1a8010ca-5511-0410-912e-c29ae57300e0
2014-07-06 00:10:14 +00:00
terminx
9378066660 lround for MSVC
git-svn-id: https://svn.eduke32.com/eduke32@4527 1a8010ca-5511-0410-912e-c29ae57300e0
2014-07-06 00:09:59 +00:00
terminx
398d20fc5f Enable -usecwd for Mapster32 on Windows (same functionality as EDuke32)
git-svn-id: https://svn.eduke32.com/eduke32@4526 1a8010ca-5511-0410-912e-c29ae57300e0
2014-07-06 00:09:41 +00:00
hendricks266
ca03f7af44 Hotfix to allow display of E1L8's par time and 3DR time if no usermap has been played yet.
Note that the user map function still overwrites everything in slot E1L8 for the time being, which is a deeper problem I need to address.

git-svn-id: https://svn.eduke32.com/eduke32@4525 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-23 02:25:20 +00:00
hendricks266
beec5ec512 Keep track of allocated cache space for ANM files so they aren't allocated multiple times. Also, unlock the handles after playback is done so they can be freed if necessary.
git-svn-id: https://svn.eduke32.com/eduke32@4524 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-23 02:25:07 +00:00
hendricks266
1497a75ef0 Disable the diagnostic log message upon successfully using the "animsounds" def command.
git-svn-id: https://svn.eduke32.com/eduke32@4523 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-23 02:24:53 +00:00
hendricks266
83490ade50 Fix building ivfrate.
git-svn-id: https://svn.eduke32.com/eduke32@4522 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-23 02:24:39 +00:00
hendricks266
879b3e406b Fix a warning in menus.c, introduced in r4519.
git-svn-id: https://svn.eduke32.com/eduke32@4521 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-23 02:24:28 +00:00
hendricks266
24728ba291 Allow EVENT_SOUND to return -1 to cancel a sound without printing a warning to the console and log.
NOTE: Other negative values are reserved!

git-svn-id: https://svn.eduke32.com/eduke32@4520 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-23 02:24:10 +00:00
hendricks266
fc43cc666c Fix saving a savegame's name.
git-svn-id: https://svn.eduke32.com/eduke32@4519 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-21 15:31:01 +00:00
hendricks266
41fb46b1bc Fix a display error with the bonus screen when a map's 3DR time was zero.
git-svn-id: https://svn.eduke32.com/eduke32@4518 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-21 15:30:48 +00:00
hendricks266
27c9651fde Fix a problem with r4514.
git-svn-id: https://svn.eduke32.com/eduke32@4517 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-21 15:30:33 +00:00
hendricks266
f4becd06d5 Instead of displaying "Unknown GRP - EDuke32", simply display "EDuke32".
Much classier this way.

git-svn-id: https://svn.eduke32.com/eduke32@4516 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-16 23:17:11 +00:00
hendricks266
fd78e9f954 By request, implement EVENT_ACTIVATECHEAT.
git-svn-id: https://svn.eduke32.com/eduke32@4515 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-16 23:16:55 +00:00
hendricks266
45deabc782 Add the following LOGO_FLAGS:
LOGO_NOE1ENDSCREEN
LOGO_NOE2ENDSCREEN
LOGO_NOE3RADLOGO
LOGO_NODUKETEAMTEXT
LOGO_NODUKETEAMPIC

As part of this, the LOGO_NOE*BONUSSCENE flags no longer remove the entire end sequence in one go. They now only remove the primary cinematic. If you want their previous effect, you'll have to add these additional bits.

git-svn-id: https://svn.eduke32.com/eduke32@4514 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-16 23:16:37 +00:00
hendricks266
304a13e259 Fix build with GCC 4.9.
git-svn-id: https://svn.eduke32.com/eduke32@4513 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-16 23:16:23 +00:00
hendricks266
015acc9fb9 Fix Wii build.
git-svn-id: https://svn.eduke32.com/eduke32@4512 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-16 23:16:08 +00:00
hendricks266
71cf9af5f5 Clean up the menu input layer.
git-svn-id: https://svn.eduke32.com/eduke32@4511 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-16 23:15:49 +00:00
hendricks266
ec3717167e Menus: Fix a bug that crept in with r4508 that prevented any editing of savegame names.
git-svn-id: https://svn.eduke32.com/eduke32@4510 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-16 23:15:31 +00:00
hendricks266
a7714f2c74 Menus: Bring MenuFileSelect_t up to speed with MenuMenu_t.
>They see me scrollin'
>They hatin'

git-svn-id: https://svn.eduke32.com/eduke32@4509 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-13 09:04:31 +00:00
hendricks266
2281e287dd Menus: Fix the recently introduced bug where blank savegames would have their autogenerated names clobbered by the new menu code.
git-svn-id: https://svn.eduke32.com/eduke32@4508 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-13 09:04:17 +00:00
hendricks266
7f3708b55d Menus: Fix the recently introduced bug that would take the keypress given at "PRESS OPEN TO RESTART LEVEL" as a yes at the following prompt to load your most recent savegame, seemingly without asking.
git-svn-id: https://svn.eduke32.com/eduke32@4507 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-13 09:04:05 +00:00
hendricks266
4424648917 Menus: Revise the MenuFileSelect_t structure to remove the unnecessary dir pointer and rename currentlist to currentList.
git-svn-id: https://svn.eduke32.com/eduke32@4506 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-13 09:03:52 +00:00
hendricks266
de35d4ee8c Menus: When at the top or bottom of a scrolling section, show the up/down indicator darkened instead of not at all.
git-svn-id: https://svn.eduke32.com/eduke32@4505 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-13 09:03:38 +00:00
hendricks266
3d37dc86ae [Cosmetic] backtrace.c: tab --> space x 4
git-svn-id: https://svn.eduke32.com/eduke32@4504 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-13 09:03:25 +00:00
hendricks266
e647b6a42f Update ebacktrace to avoid crashes and improve the quality of the diagnostic output.
git-svn-id: https://svn.eduke32.com/eduke32@4503 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-13 09:03:06 +00:00
hendricks266
a03f9bce40 Wrap most calls to exit() with a macro that will print the exit status, file name, line number, and function name to the log when using a debug build.
git-svn-id: https://svn.eduke32.com/eduke32@4502 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-13 09:02:37 +00:00
hendricks266
94ccdb076d Fix a recently-introduced C++ error.
git-svn-id: https://svn.eduke32.com/eduke32@4501 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-13 09:01:58 +00:00
Plagman
f6dd12ffe5 Test commit to make sure synthesis works.
git-svn-id: https://svn.eduke32.com/eduke32@4500 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-02 02:23:08 +00:00
helixhorned
4780912b40 lunatic/util/build.lua: in readdefs(), add option of requesting picnum->name mapping.
That is, the reverse of what is returned with the first outarg. Use that in
lunatic/util/foreachmap.lua. DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4499 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-01 20:50:14 +00:00
helixhorned
1e5549dc2f Polymost: r_npotwallmode, emulating 8-bit for walls w/ nonpow2 height textures.
When that mode is enabled (see below for caveats), wall textures that have a
non-power-of-two height (call it 'h') will be modified to look like in classic:
Let 'H' be the next power of two greater than 'h'. The texture will be uploaded
with height 'H', made up from 'h' hlines of the original texture, followed by
'H'-'h' first hlines of the same.
No panning "corrections" will take place. The mode is disabled by default.

Caveats/notes:
 * the mode requires that r_hightile is disabled
 * it is not implemented in Polymer
 * in the Lunatic build, it is ineffective when a VX map is loaded, as those
   display walls with NPOT height textures correctly

git-svn-id: https://svn.eduke32.com/eduke32@4498 1a8010ca-5511-0410-912e-c29ae57300e0
2014-06-01 11:55:19 +00:00
hendricks266
d4cfdb7da0 Fix non-Windows building.
DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4497 1a8010ca-5511-0410-912e-c29ae57300e0
2014-05-31 15:36:41 +00:00
hendricks266
11e9b8f4ce Ball-busting new menus. Still WIP.
Mouse/touch/pointer support is yet to come. #SOON.

Exposure to scripting is a LONG way off. Months. The spec and data structure needs time for comment and revision. The eventual scripting access will be Lua-only.

git-svn-id: https://svn.eduke32.com/eduke32@4496 1a8010ca-5511-0410-912e-c29ae57300e0
2014-05-31 12:26:41 +00:00
hendricks266
c24c08599f Better compile timestamp handling.
git-svn-id: https://svn.eduke32.com/eduke32@4495 1a8010ca-5511-0410-912e-c29ae57300e0
2014-05-31 12:26:13 +00:00
hendricks266
26db62d77d Re-fix the C++ warnings in ENet.
git-svn-id: https://svn.eduke32.com/eduke32@4494 1a8010ca-5511-0410-912e-c29ae57300e0
2014-05-31 12:25:44 +00:00
helixhorned
2153c81afb Mapster32: when pasting onto the bottom part of a [2]-wall, take over y-flipping.
Note that x-flipping is determined by the cstat of the upper part of the wall
(that is, the wall facing the player, not the nextwall, from which the picnum
for the bottom part is taken.)

git-svn-id: https://svn.eduke32.com/eduke32@4493 1a8010ca-5511-0410-912e-c29ae57300e0
2014-05-30 19:39:08 +00:00
helixhorned
66f5b547cf Replace two missed literal numbers with SE_* enum labels.
git-svn-id: https://svn.eduke32.com/eduke32@4492 1a8010ca-5511-0410-912e-c29ae57300e0
2014-05-30 19:39:06 +00:00
helixhorned
0900f4066c Bye, bye, B*alloc(), all hail X*alloc()! Replace large portion of the calls...
... and cull code that is dead with the X*alloc() versions since they never
return NULL on requesting memory.

Use something like
 git grep '[^Xx]\(m\|c\|re\)alloc *('
and
 git grep '[^Xx]strdup *('
to see places where I left the B*alloc() calls intact.

BUILD_LUNATIC.

git-svn-id: https://svn.eduke32.com/eduke32@4491 1a8010ca-5511-0410-912e-c29ae57300e0
2014-05-30 00:02:19 +00:00
helixhorned
1d26121514 Add X{m,c,re}alloc and Xstrdup macros that call an out-of-memory handler on failure.
These wrap the x*alloc or xstrdup functions in compat.c. The handler gets passed
__FILE__, __LINE__ and __func__ (if available) in debugging builds.

Terminating the application process immediately in case of allocation failure
will let us prune many error handling paths and simplify a good portion of code.

git-svn-id: https://svn.eduke32.com/eduke32@4490 1a8010ca-5511-0410-912e-c29ae57300e0
2014-05-30 00:02:16 +00:00
helixhorned
95a6c01045 A couple of stylistic cleanups and missed DAMETH_* flags substitutions.
git-svn-id: https://svn.eduke32.com/eduke32@4489 1a8010ca-5511-0410-912e-c29ae57300e0
2014-05-30 00:02:14 +00:00
helixhorned
89bbfcbdea Miscellaneous cleanup, still with the same suspects...
- in mdloadskin() and gloadtile_hi(), use new function check_nonpow2()
  (bit-twiddling) instead of loop
- Replace a couple of missed literals with CACHEAD_* enum labels

git-svn-id: https://svn.eduke32.com/eduke32@4488 1a8010ca-5511-0410-912e-c29ae57300e0
2014-05-28 22:40:19 +00:00
helixhorned
6fb9929f44 Factor out commonly occuring hictinting[]-accessing code into three functions.
Note: in polymer.c, this was buggy (but harmless) because .r is a char:
  if ((uint32_t)hictinting[MAXPALOOKUPS-1].r & 0xFFFFFF00) != 0xFFFFFF00)

git-svn-id: https://svn.eduke32.com/eduke32@4487 1a8010ca-5511-0410-912e-c29ae57300e0
2014-05-28 22:40:17 +00:00
helixhorned
69c867b8e3 Replace various GL rendering related literal flags with enum labels.
- pthtyp pth->flags bits
- Flags of the <dameth> argument of various functions
- hictinting[].f / gloadtile_hi() and daskinloader() <effect> arg bits
- hicreplctyp hicr->flags bits
- texcacheheader cachead.flags bits

git-svn-id: https://svn.eduke32.com/eduke32@4486 1a8010ca-5511-0410-912e-c29ae57300e0
2014-05-28 22:40:16 +00:00
helixhorned
2c84d175ed polymost.c: stylistic cleanup in gloadtile_hi, uploadtexture, fixtransparency.
git-svn-id: https://svn.eduke32.com/eduke32@4485 1a8010ca-5511-0410-912e-c29ae57300e0
2014-05-28 22:40:15 +00:00
helixhorned
dfa9daa5d3 Polymost: in NPOT wall ypanning "correction", behave like Polymer in one corner case.
Specifically, the handling of one-way walls ([1] in Mapster32) was slightly
different.

git-svn-id: https://svn.eduke32.com/eduke32@4484 1a8010ca-5511-0410-912e-c29ae57300e0
2014-05-28 22:40:14 +00:00
helixhorned
1fab90da10 lunatic/util/mapypan.lua: omit MIRROR, don't print maps w/o problematic tiles.
git-svn-id: https://svn.eduke32.com/eduke32@4483 1a8010ca-5511-0410-912e-c29ae57300e0
2014-05-28 22:40:12 +00:00