Commit graph

2800 commits

Author SHA1 Message Date
terminx
09c03151db Uncomment extra check in COMBINE_STRIPS
git-svn-id: https://svn.eduke32.com/eduke32@6573 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-20 08:35:49 +00:00
hendricks266
2c48a359e2 Fix corruption in filenames in new savegame system
git-svn-id: https://svn.eduke32.com/eduke32@6572 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-19 01:26:18 +00:00
pogokeen
9c695d6bc4 Fix line spacing tab issue in rev 6570.
git-svn-id: https://svn.eduke32.com/eduke32@6571 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-19 00:03:12 +00:00
pogokeen
741305e976 Fix a number of cases where files opened with cache1d.cpp's kopen_internal() could be leaked.
git-svn-id: https://svn.eduke32.com/eduke32@6570 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-18 23:36:05 +00:00
hendricks266
d9b0479343 ZDoom-style saves
git-svn-id: https://svn.eduke32.com/eduke32@6569 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-18 11:24:53 +00:00
hendricks266
29a0fffd5b Menu tweak
git-svn-id: https://svn.eduke32.com/eduke32@6568 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-18 11:24:46 +00:00
terminx
ca308d5879 Happened to be reading a SDL doc and noticed we were creating our surface with the wrong flags
git-svn-id: https://svn.eduke32.com/eduke32@6567 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-17 09:27:32 +00:00
terminx
c728176352 Revert a tweak made for HTTKC
git-svn-id: https://svn.eduke32.com/eduke32@6566 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-17 09:27:27 +00:00
pogokeen
59597982c5 Fixed file handle leak when loading a save game
git-svn-id: https://svn.eduke32.com/eduke32@6565 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-17 02:03:55 +00:00
pogokeen
efaf328e4d Fixed race condition where XMP voices could be played by the audio driver thread before they were fully initialized or fully freed
git-svn-id: https://svn.eduke32.com/eduke32@6564 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-17 02:03:52 +00:00
hendricks266
bcb41aac3e New player structures "frags" and "deaths"
player[<killer>].frags <victim>

Equals how many times player <killer> killed <victim>. Note that the sum of these values will not equal the total kills or deaths for a player since another player may disconnect, so use "frag" or "deaths" instead.

player[<id>].deaths

Equals the total number of times the player died in the round, not including suicides.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6563 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-12 05:14:19 +00:00
hendricks266
71e3948e70 Fix the position of the "KILLS" header and the number of deaths for each player in the frag screen.
Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6562 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-12 05:14:15 +00:00
hendricks266
4c095c954d Fix tints with negative shades in r_usenewshading 4.
Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6561 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-12 05:14:12 +00:00
hendricks266
583dc0f47a Polymost: Account for yscale when deciding if the sky is tall enough to repeat or not. Comment out code that is not working as expected.
Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6560 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-12 05:14:09 +00:00
hendricks266
b6d7de7d27 Add def "globalflags" bit 4, and for individual palettes the "tint" flag bit 512. This makes fog the same for all shades. Make fog behave normally with sector structure .fogpal.
Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6559 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-12 05:14:06 +00:00
hendricks266
2f98d759f6 Fix visibility in Polymer with r_usenewshading 4.
Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6558 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-12 05:14:02 +00:00
hendricks266
ae47d2f11d New def tokens for "tint": "shadered" or "sr", "shadeblue" or "sb", "shadegreen" or "sg"
tint { pal <pal> shadered <0-255> shadegreen <0-255> shadeblue <0-255> }

Make shade apply a tint based on the RGB.
Default values for shade are zero (black).

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6557 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-12 05:13:58 +00:00
hendricks266
756fa2bbd8 New userdef structure "screenfade"
Set to zero to disable the hard-coded fade to black transition between screens, menu or when the level ends.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6556 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-12 05:13:53 +00:00
hendricks266
63748e5381 New LOGO_FLAGS bits:
- LOGO_STOPMISCSOUNDS = 2097152: Don't play NITEVISION_ONOFF when the logo starts.
- LOGO_NOGAMETITLE = 4194304: Don't display the title (INGAMEDUKETHREEDEE and PLUTOPAKSPRITE+2) in the main menu.
- LOGO_NOTITLEBAR = 8388608: Don't display the title bar background (TITLEBAR) above the menu.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6555 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-12 05:13:49 +00:00
hendricks266
ea36d5289a New event "EVENT_SETDEFAULTS".
Use this event to change the value of userdefs when initializing cfg settings with defaults.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6554 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-12 05:13:46 +00:00
hendricks266
9765526948 Move the modern status bar option into the screen size slider.
Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6553 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-12 05:13:42 +00:00
hendricks266
084c661fa0 New def tokens for "cutscene": "texturefilter", "forcefilter", "forcenofilter"
Changes the filtering for cutscenes. By default, ANMs are unfiltered and IVFs filtered regardless of the filtering option in the menu. Use “texturefilter” to use the same filtering as textures, “forcenofilter” to never use filtering and “forcefilter” to always use filtering.

cutscene <path> { texturefilter }

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6552 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-12 05:13:38 +00:00
hendricks266
45a8742e42 New def token for "cutscene": "aspect"
Overrides the aspect ratio for IVF files.

cutscene <path> { aspect <numerator> <denominator> }

Note: For ANMs, you can use rotatesprite and setaspect to draw TILE_ANIM (currently defined as 30716) in EVENT_CUTSCENE with a custom aspect.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6551 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-12 05:13:32 +00:00
terminx
415c5e219e screenpeek for EVENT_RECOGSOUND
git-svn-id: https://svn.eduke32.com/eduke32@6550 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-10 03:24:47 +00:00
terminx
d3417b763a Untabify engine.cpp
git-svn-id: https://svn.eduke32.com/eduke32@6547 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-09 02:56:31 +00:00
terminx
4edc1c6523 Revert a minor change I made to EVENT_LOGO
git-svn-id: https://svn.eduke32.com/eduke32@6546 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-09 02:56:26 +00:00
terminx
3ab1c2c722 Fix problem where sometimes fullscreen GL modes display incorrectly. I'm not sure why this fixes it and I believe it to be a SDL bug.
git-svn-id: https://svn.eduke32.com/eduke32@6544 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-09 02:56:17 +00:00
terminx
f97aee59c8 Address issue where timers will no longer update after several hours of runtime
git-svn-id: https://svn.eduke32.com/eduke32@6543 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-09 02:56:12 +00:00
terminx
948fe80304 Fix undefined behavior in gameexec.cpp
git-svn-id: https://svn.eduke32.com/eduke32@6542 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-09 02:56:05 +00:00
terminx
3c8f050565 Fix memory leak with .ANM playback in Polymost
git-svn-id: https://svn.eduke32.com/eduke32@6541 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-02 12:42:40 +00:00
terminx
bb836cfc0b Fix small memory leak in OSD
git-svn-id: https://svn.eduke32.com/eduke32@6540 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-02 12:42:36 +00:00
terminx
a66703b01a tabs -> spaces
git-svn-id: https://svn.eduke32.com/eduke32@6539 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-02 12:42:31 +00:00
terminx
cba4b950ef Fix memory leak in MACT scriplib.cpp
git-svn-id: https://svn.eduke32.com/eduke32@6538 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-02 12:42:25 +00:00
terminx
de5f16b1c5 Fix events added in recent commits
git-svn-id: https://svn.eduke32.com/eduke32@6537 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-02 09:24:55 +00:00
terminx
9e9f4168af Fix huge memory leak with savemapstate
git-svn-id: https://svn.eduke32.com/eduke32@6536 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-02 08:45:09 +00:00
terminx
6231c0bdf5 Change ARRAY_SSIZE macro to return type native_t
git-svn-id: https://svn.eduke32.com/eduke32@6535 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-02 08:45:04 +00:00
terminx
a18d03635c Fix crash issue with nested console script execution
git-svn-id: https://svn.eduke32.com/eduke32@6534 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-02 08:44:59 +00:00
terminx
bf2047bc0f Print message to console at startup when successfully loading a RTS file instead of when the RTS file is missing
git-svn-id: https://svn.eduke32.com/eduke32@6533 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-02 08:44:53 +00:00
hendricks266
c5ebf96217 Remix screencapture_begin into OutputFileCounter.
git-svn-id: https://svn.eduke32.com/eduke32@6532 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-01 06:19:19 +00:00
hendricks266
f9a90e6f33 Add anticipatory fields to ud; bump BYTEVERSION.
git-svn-id: https://svn.eduke32.com/eduke32@6531 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-01 06:19:15 +00:00
hendricks266
d722b998ed Make sure I_EnterText never writes a null terminator out of bounds.
git-svn-id: https://svn.eduke32.com/eduke32@6530 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-01 06:19:12 +00:00
hendricks266
4313460da7 Bump savegame name limits from 22 in memory and 19 in practice to 32 in memory and 30 in practice.
This bumps SV_MINOR_VER.

git-svn-id: https://svn.eduke32.com/eduke32@6529 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-01 06:19:09 +00:00
hendricks266
f808648079 Cleanups to handling of old save versions
git-svn-id: https://svn.eduke32.com/eduke32@6528 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-01 06:19:04 +00:00
terminx
ee0524bc23 Revise previous commit
git-svn-id: https://svn.eduke32.com/eduke32@6527 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-01 02:07:34 +00:00
terminx
933161fc2d Fix issue with non-actor sprites not being deleted at size 0
git-svn-id: https://svn.eduke32.com/eduke32@6526 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-01 01:49:00 +00:00
terminx
7acf811eae Re-comment out part of COMBINE_STRIPS in polymost.cpp
git-svn-id: https://svn.eduke32.com/eduke32@6525 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-30 23:54:23 +00:00
terminx
845abb435a Drop VSPMAX back to 2048 from 4096
git-svn-id: https://svn.eduke32.com/eduke32@6524 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-30 23:54:18 +00:00
hendricks266
90045e4ce3 Revert r6496
git-svn-id: https://svn.eduke32.com/eduke32@6523 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-30 02:57:23 +00:00
hendricks266
5de5dc9fcd Menus: Change "Size:" entries in HUD Setup to "Scale:" and indent them.
git-svn-id: https://svn.eduke32.com/eduke32@6522 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-29 07:29:57 +00:00
hendricks266
12c4d033f1 Polymost: Set r_parallaxskypanning to 1 by default.
This enables sky panning, which allows the effect of CLOUDYSKIES to work properly.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6521 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-29 07:29:54 +00:00
hendricks266
ad83ca0188 Polymost: Display paper-skies correctly when looking up or down.
Show a solid color for skies taller than 256 px, otherwise repeat.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6520 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-29 07:29:51 +00:00
hendricks266
5fbe1b89be New def token for "multipsky": "yscale".
multipsky <tile> { yscale <yscale> }

Default value is 65536.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6519 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-29 07:29:48 +00:00
hendricks266
6164e3dae8 Revise view background / border drawing code.
New event "EVENT_UPDATESCREENAREA"

Use this event to change the size of the game view, similar to when you press + or -.

New event "EVENT_DISPLAYBORDER"

Set RETURN to change the background tile of the game view, set -1 to disable the background and border.

New userdef structures "screenarea_x1", "screenarea_y1", "screenarea_x2", "screenarea_y2"

Use these structures to change the boundaries of the view in EVENT_UPDATESCREENAREA.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6518 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-29 07:29:44 +00:00
hendricks266
1c107bd877 CON: Add EVENT_RECOGSOUND.
Set RETURN to -1 to disable the sound played when an enemy awaken. You have to use a command to play a sound, because the bosses use globalsound.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6517 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-29 07:29:40 +00:00
hendricks266
102a720402 CON: Add EVENT_OPENMENUSOUND.
Set RETURN to the sound played when the menu is opened. -1 to cancel.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6516 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-29 07:29:37 +00:00
hendricks266
66162032a0 Add r_usenewshading 4.
Uses a constant determined from the shade tables.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6515 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-29 07:29:33 +00:00
hendricks266
5adb8364b6 Calculate the perceptual (i.e. "real") max shade in the given tables.
git-svn-id: https://svn.eduke32.com/eduke32@6514 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-29 07:29:30 +00:00
hendricks266
23b1b650bb Clean up E_PostLoadPalette.
git-svn-id: https://svn.eduke32.com/eduke32@6513 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-29 07:29:27 +00:00
hendricks266
c9981e76af CON: Add EVENT_DISPLAYEND and EVENT_DISPLAYROOMSEND.
EVENT_DISPLAYROOMSEND: Triggered right after the game world is rendered and before any sprite above the screen.
EVENT_DISPLAYEND: Triggered after the game draws everything above the screen, including menus. A counterpart to EVENT_DISPLAYSTART.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6512 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-29 07:29:23 +00:00
hendricks266
50f7f6cda4 Pause the game when playing IVF files with startcutscene.
Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6511 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-29 07:29:20 +00:00
hendricks266
a72295f7f1 Fix flickering in IVF files.
Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6510 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-29 07:29:17 +00:00
hendricks266
74908b1def CON: Add screenpal command.
screenpal <r> <g> <b> <a>

Similar to palfrom, but works on screen events. Values range from 0 to 255.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6509 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-29 07:29:14 +00:00
hendricks266
f6678b336a CON: Add command "startscreen" and corresponding EVENT_SCREEN.
Use startscreen to take control away from the game and display content with rotatesprite.

RETURN is set to 1 when any key is pressed, and if it is nonzero when the event ends, the screen ends and the game resumes.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6508 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-29 07:29:11 +00:00
hendricks266
dbd8b72d10 CON: Add EVENT_SKIPCUTSCENE.
Used with startcutscene. RETURN is set to 1 when any key is pressed, and is used to control when a cutscene ends.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6507 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-29 07:29:07 +00:00
hendricks266
1377afe414 CON: Add EVENT_PRECUTSCENE.
Used with startcutscene. RETURN sets the frame of an ANM before it is rendered.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6506 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-29 07:29:04 +00:00
hendricks266
a89ad84f4d CON: Run EVENT_CUTSCENE during IVFs as well.
Changing the frame of an IVF file is unsupported, so its only purpose is to play sounds.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6505 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-29 07:29:01 +00:00
hendricks266
38df0b7e82 CON: Add "actorsound" command.
Patch from Striker.

git-svn-id: https://svn.eduke32.com/eduke32@6504 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-29 07:28:58 +00:00
hendricks266
bad61e3934 Replace arbitrary MAXGAMEEVENTS macro with the properly generated MAXEVENTS.
git-svn-id: https://svn.eduke32.com/eduke32@6503 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-29 07:28:54 +00:00
terminx
67e3166fb3 Add palette emulation menu options to control r_usetileshades and r_pr_artmapping
git-svn-id: https://svn.eduke32.com/eduke32@6502 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-22 05:23:43 +00:00
terminx
5df760b347 Small change to G_FPSLimit()
git-svn-id: https://svn.eduke32.com/eduke32@6501 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-22 05:23:38 +00:00
terminx
63d3f70258 Minor hard-coded Duke sprite cleanup
git-svn-id: https://svn.eduke32.com/eduke32@6500 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-22 05:23:33 +00:00
terminx
15b223840b Useless removal of a couple of redundant blocks of code
git-svn-id: https://svn.eduke32.com/eduke32@6499 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-22 05:23:28 +00:00
terminx
fe9c6d25f4 Move autoexec.cfg execution to directly after settings.cfg execution
git-svn-id: https://svn.eduke32.com/eduke32@6498 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-22 05:23:23 +00:00
hendricks266
9d0e76b2e3 Fox's projection patch 2.0
git-svn-id: https://svn.eduke32.com/eduke32@6496 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-06 05:56:48 +00:00
hendricks266
7033d83d26 Fox's maskwall fix 2.0
git-svn-id: https://svn.eduke32.com/eduke32@6495 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-02 04:25:59 +00:00
terminx
7fd86d09ad If Fox's patch to fix flickering masked walls is correct, this change should improve FPS in some areas.
git-svn-id: https://svn.eduke32.com/eduke32@6494 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-31 02:09:44 +00:00
terminx
7bdd0e1361 Crash fix
git-svn-id: https://svn.eduke32.com/eduke32@6493 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-31 02:09:39 +00:00
terminx
c52e003e2a Fix issue with arrays, saved map states, and savegames
git-svn-id: https://svn.eduke32.com/eduke32@6492 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-31 02:09:25 +00:00
hendricks266
366d823894 Revert r6490.
git-svn-id: https://svn.eduke32.com/eduke32@6491 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-31 00:35:23 +00:00
hendricks266
e12b63c3bd A potential fix for the disappearing maskwall problem.
Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6490 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-30 03:48:31 +00:00
hendricks266
e979aa1ff4 Eliminate the need for cache1d to calculate and remember the CRC32 of every GRP loaded.
git-svn-id: https://svn.eduke32.com/eduke32@6489 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-30 03:48:28 +00:00
terminx
d33107808e Fix crash with "setrendermode 4" in builds with Polymer disabled
git-svn-id: https://svn.eduke32.com/eduke32@6488 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-16 21:17:53 +00:00
terminx
3b9587cfa2 Fix issue with savemapstate/loadmapstate and gamearrays
git-svn-id: https://svn.eduke32.com/eduke32@6487 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-16 21:17:47 +00:00
hendricks266
c746b486b7 Polymost: New projection hack algorithm: Keep zoom equivalent to Classic when looking straight ahead.
Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6486 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-16 03:32:37 +00:00
hendricks266
d6682d58d3 Expand use of VM_GetKeywordForID to all other references to vm_keywords[].
Fixes printing of incorrect keywords, reported by Trooper Dan.

git-svn-id: https://svn.eduke32.com/eduke32@6485 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-16 03:32:34 +00:00
hendricks266
b3455b7b4d Amend r6460 to move vm_keywords[] back to gamedef.cpp and factor the ID to keyword mapping into VM_GetKeywordForID().
git-svn-id: https://svn.eduke32.com/eduke32@6484 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-16 03:32:30 +00:00
hendricks266
aea57fde17 Fix infinite loop when requesting to open an invalid map from the command line.
git-svn-id: https://svn.eduke32.com/eduke32@6483 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-16 03:32:26 +00:00
hendricks266
ddd94d7b92 Re-add GAMETYPE_FRAGBAR to the default cases for deathmatch modes.
While the fragbar is indeed too cumbersome for use with more than 8 players, and a "show current score overlay" button is a better and more modern solution, this flag should connote whether a mode is *eligible* for it, not whether it is used at all.

TODO: Add a cvar for toggling the fragbar and turn it off by default.

git-svn-id: https://svn.eduke32.com/eduke32@6482 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-15 23:10:21 +00:00
hendricks266
6aaddf3fa2 Enumify the definition of g_gametypeFlags.
git-svn-id: https://svn.eduke32.com/eduke32@6481 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-15 23:10:18 +00:00
hendricks266
04d1f0eb29 Fix the bug where tapping (but not holding) fire with 1 ammo left for the chaingun would fail to switch away.
Reported by RunningDuke.

git-svn-id: https://svn.eduke32.com/eduke32@6480 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-15 23:10:15 +00:00
hendricks266
17c4d27298 if (A ? 1 : B) --> if (A || B)
git-svn-id: https://svn.eduke32.com/eduke32@6479 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-15 23:10:12 +00:00
hendricks266
2c7840d928 Fix infinite loop in OSD_StripColors() when trying to display a quote containing '^' not followed by a number.
This fixes Mission 2 of Platoon Leader, as reported by RunningDuke.

git-svn-id: https://svn.eduke32.com/eduke32@6478 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-15 23:10:09 +00:00
hendricks266
486791b3ee Add the Platoon Leader expansion for WWII GI to the GRP list.
git-svn-id: https://svn.eduke32.com/eduke32@6477 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-15 23:10:06 +00:00
hendricks266
1a256f2509 Duke: Scan for *.dat in addition to .grp, .zip, .ssi, etc.
git-svn-id: https://svn.eduke32.com/eduke32@6476 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-15 23:10:03 +00:00
hendricks266
64d76db260 Add support for MTM modules.
git-svn-id: https://svn.eduke32.com/eduke32@6475 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-15 23:09:59 +00:00
hendricks266
a14d427359 libxmp-lite: Import mtm_load.c
git-svn-id: https://svn.eduke32.com/eduke32@6474 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-15 23:09:55 +00:00
hendricks266
95d93f770e Eliminate the force-disabling of glprojectionhacks during showview.
Please notify me if this change negatively affects your code.

git-svn-id: https://svn.eduke32.com/eduke32@6473 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-09 07:37:17 +00:00
hendricks266
dfb98028f1 compat.h: Use C++17, C++11, or C11 static_assert if available.
git-svn-id: https://svn.eduke32.com/eduke32@6472 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-09 07:37:14 +00:00
hendricks266
4966b0922d compat.h: Only use C++ attribute versions of fallthrough if C++11 or greater.
git-svn-id: https://svn.eduke32.com/eduke32@6471 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-09 07:37:11 +00:00
hendricks266
3ac0a936c8 build.h: Error out if Visual Studio is older than 2013.
We keep getting support requests about this. See previous commit.

git-svn-id: https://svn.eduke32.com/eduke32@6470 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-09 07:37:08 +00:00
hendricks266
8ff6d59688 compat.h: Add EDUKE32_MSVC_CXX_PREREQ().
It is necessary for testing C++11 functionality because Visual Studio never defines __cplusplus to be 201112L.

git-svn-id: https://svn.eduke32.com/eduke32@6469 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-09 07:37:05 +00:00
hendricks266
7c2f233450 compat.h: Add detection of C++17.
git-svn-id: https://svn.eduke32.com/eduke32@6468 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-09 07:37:01 +00:00
hendricks266
32d3ca1591 Some more standalone stuff.
git-svn-id: https://svn.eduke32.com/eduke32@6467 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-09 07:36:58 +00:00
hendricks266
60fcb6527c Menus: If you open the Help menu with the F1 key, make Help the selected item on the main menu, if applicable.
git-svn-id: https://svn.eduke32.com/eduke32@6466 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-09 07:36:55 +00:00
hendricks266
ae81b6dce7 Menus: Factor out code into Menu_AboutToStartDisplaying and Menu_ChangingTo.
git-svn-id: https://svn.eduke32.com/eduke32@6465 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-09 07:36:52 +00:00
hendricks266
e971005153 Menus: Use SMALLFNTCURSOR for a text caret in the absence of a SPINNINGNUKEICON tile.
git-svn-id: https://svn.eduke32.com/eduke32@6464 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-09 07:36:48 +00:00
hendricks266
0ed359244e Menus: Factor out SPINNINGNUKEICON drawing
git-svn-id: https://svn.eduke32.com/eduke32@6463 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-09 07:36:45 +00:00
hendricks266
7e914f838a Avoid an unused variable warning with EDUKE32_STANDALONE.
git-svn-id: https://svn.eduke32.com/eduke32@6462 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-09 07:36:40 +00:00
terminx
ff8d608caf Fix in-game 2d map view line colors when using palettes that differ completely from Duke3D's palette
git-svn-id: https://svn.eduke32.com/eduke32@6461 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-08 22:15:51 +00:00
terminx
938d444b35 This should fix the scrambled log output when the game crashes while executing a CON script somewhere
git-svn-id: https://svn.eduke32.com/eduke32@6460 1a8010ca-5511-0410-912e-c29ae57300e0
2017-10-04 22:30:53 +00:00
hendricks266
5967749a10 Menus: Don't play EXITMENUSOUND when trying to close a root menu outside of an active game.
git-svn-id: https://svn.eduke32.com/eduke32@6459 1a8010ca-5511-0410-912e-c29ae57300e0
2017-09-27 05:22:35 +00:00
hendricks266
788ba4f373 Amend r6452.
git-svn-id: https://svn.eduke32.com/eduke32@6458 1a8010ca-5511-0410-912e-c29ae57300e0
2017-09-27 05:22:32 +00:00
hendricks266
029340b3a5 Prevent P_GetP from treating player indexes that are >= g_mostConcurrentPlayers as player 0, by checking against MAXPLAYERS instead.
Prevents the "gib on spawn in multiplayer" bug, and allows fake players to work properly.

Patch from Striker.

git-svn-id: https://svn.eduke32.com/eduke32@6457 1a8010ca-5511-0410-912e-c29ae57300e0
2017-09-27 02:30:37 +00:00
hendricks266
ee94494e3a Fix display of the fragbar in widescreen.
Patch from Striker.

git-svn-id: https://svn.eduke32.com/eduke32@6456 1a8010ca-5511-0410-912e-c29ae57300e0
2017-09-27 02:30:34 +00:00
hendricks266
b776c689bb Fix the fragbar not respecting GAMETYPE_FRAGBAR.
Patch from Striker.

git-svn-id: https://svn.eduke32.com/eduke32@6455 1a8010ca-5511-0410-912e-c29ae57300e0
2017-09-27 02:30:31 +00:00
hendricks266
11ce89d294 Fix randomseed in multiplayer.
Merged from private network branch.

Patch by [IFOC]75, prepared by Striker.

git-svn-id: https://svn.eduke32.com/eduke32@6454 1a8010ca-5511-0410-912e-c29ae57300e0
2017-09-27 02:30:28 +00:00
hendricks266
fc0eabebb6 Add player[].connected.
Patch from Striker.

git-svn-id: https://svn.eduke32.com/eduke32@6453 1a8010ca-5511-0410-912e-c29ae57300e0
2017-09-27 02:30:24 +00:00
hendricks266
385a3f9182 Address an oversight in r6212.
git-svn-id: https://svn.eduke32.com/eduke32@6452 1a8010ca-5511-0410-912e-c29ae57300e0
2017-09-27 02:30:21 +00:00
hendricks266
5f79c71aa0 Address a typo in r6435 affecting SDL 1.2 builds.
git-svn-id: https://svn.eduke32.com/eduke32@6449 1a8010ca-5511-0410-912e-c29ae57300e0
2017-09-23 03:17:35 +00:00
hendricks266
36eb156d7d macOS: Fix crash in startup window when no game data is found.
git-svn-id: https://svn.eduke32.com/eduke32@6448 1a8010ca-5511-0410-912e-c29ae57300e0
2017-09-23 03:17:32 +00:00
hendricks266
c07e705c48 Update fallthrough__ definitions.
git-svn-id: https://svn.eduke32.com/eduke32@6447 1a8010ca-5511-0410-912e-c29ae57300e0
2017-09-23 03:17:29 +00:00
hendricks266
01c073f18a Update credits.
git-svn-id: https://svn.eduke32.com/eduke32@6446 1a8010ca-5511-0410-912e-c29ae57300e0
2017-09-23 03:17:26 +00:00
hendricks266
b713b8489d Pass the parameters of the warp and skill cheats to EVENT_ACTIVATECHEAT through userdef[].m_* and read them back afterward.
git-svn-id: https://svn.eduke32.com/eduke32@6445 1a8010ca-5511-0410-912e-c29ae57300e0
2017-09-23 03:17:22 +00:00
terminx
f203ca78a2 Amend r6439
git-svn-id: https://svn.eduke32.com/eduke32@6444 1a8010ca-5511-0410-912e-c29ae57300e0
2017-09-21 04:32:14 +00:00
terminx
ab79264047 Make setinput work better in EVENT_PROCESSINPUT
git-svn-id: https://svn.eduke32.com/eduke32@6443 1a8010ca-5511-0410-912e-c29ae57300e0
2017-09-19 19:10:51 +00:00
terminx
bdf81027ec NETCODE_DISABLE implementation tweaks. I think this is better.
git-svn-id: https://svn.eduke32.com/eduke32@6442 1a8010ca-5511-0410-912e-c29ae57300e0
2017-09-19 19:10:45 +00:00
terminx
389c71e185 uint64_t based FPS limiter
git-svn-id: https://svn.eduke32.com/eduke32@6441 1a8010ca-5511-0410-912e-c29ae57300e0
2017-09-19 19:10:39 +00:00
terminx
60d06d8757 useless change
git-svn-id: https://svn.eduke32.com/eduke32@6440 1a8010ca-5511-0410-912e-c29ae57300e0
2017-09-19 19:10:33 +00:00
terminx
ac3faa5fd4 Force enabling NVIDIA threaded optimizations. Probably only works on Linux, but the extra putenv() call doesn't hurt anyone anywhere else.
git-svn-id: https://svn.eduke32.com/eduke32@6439 1a8010ca-5511-0410-912e-c29ae57300e0
2017-09-19 19:10:27 +00:00
terminx
29fc836bb1 Switch palookup memory allocation to Xalligned_alloc and fix what looks like a botched preprocessor condition
git-svn-id: https://svn.eduke32.com/eduke32@6438 1a8010ca-5511-0410-912e-c29ae57300e0
2017-09-19 19:10:19 +00:00
terminx
c7d2f0b869 Add a few 2560 x XXXX modes to the default video modes added to the various lists
git-svn-id: https://svn.eduke32.com/eduke32@6437 1a8010ca-5511-0410-912e-c29ae57300e0
2017-08-27 10:20:53 +00:00
terminx
0958b57047 Refer to video modes as "software" and "OpenGL" in the startup window instead of simply by how many bpp they are. End users are likely to understand this distinction more.
git-svn-id: https://svn.eduke32.com/eduke32@6436 1a8010ca-5511-0410-912e-c29ae57300e0
2017-08-27 10:20:48 +00:00
terminx
5cde84e58a Ignore video modes with resolutions less than 640x480 or with aspect ratios taller than around 4:3 when populating the mode lists used in the startup window and menus. Sorry to the two guys still using nasty 5:4 1280x1024 monitors in 2017; you'll have to set your resolution using the console now.
git-svn-id: https://svn.eduke32.com/eduke32@6435 1a8010ca-5511-0410-912e-c29ae57300e0
2017-08-27 10:20:41 +00:00
terminx
6889b64da8 Tweak Polymost z-fighting avoidance code
git-svn-id: https://svn.eduke32.com/eduke32@6434 1a8010ca-5511-0410-912e-c29ae57300e0
2017-08-27 10:20:35 +00:00
terminx
332b037c39 Expose "show2dsector" to CON
git-svn-id: https://svn.eduke32.com/eduke32@6433 1a8010ca-5511-0410-912e-c29ae57300e0
2017-08-27 10:20:29 +00:00
terminx
98cd4a5c6c Use tokenmap_t struct to define all CON keywords
git-svn-id: https://svn.eduke32.com/eduke32@6432 1a8010ca-5511-0410-912e-c29ae57300e0
2017-08-27 10:20:23 +00:00
hendricks266
af679d2ca8 CON: Call I_ClearAllInput before Anim_Play when executing startcutscene.
git-svn-id: https://svn.eduke32.com/eduke32@6428 1a8010ca-5511-0410-912e-c29ae57300e0
2017-08-06 13:45:05 +00:00
hendricks266
df70cbbbeb CON: Add "stopallmusic" command.
git-svn-id: https://svn.eduke32.com/eduke32@6427 1a8010ca-5511-0410-912e-c29ae57300e0
2017-08-06 13:45:02 +00:00
hendricks266
c750f8262a Partial build fix for Lunatic.
git-svn-id: https://svn.eduke32.com/eduke32@6426 1a8010ca-5511-0410-912e-c29ae57300e0
2017-08-06 13:44:59 +00:00
hendricks266
534747be90 Disable compiling some functions in miniz that we don't use, and that cause portability issues.
git-svn-id: https://svn.eduke32.com/eduke32@6421 1a8010ca-5511-0410-912e-c29ae57300e0
2017-08-06 13:44:47 +00:00
hendricks266
8f0848d901 Makefile: Mess with Wii stuff to fix a majority of its make invocation circumstances.
git-svn-id: https://svn.eduke32.com/eduke32@6420 1a8010ca-5511-0410-912e-c29ae57300e0
2017-08-06 13:44:44 +00:00
hendricks266
599a18fe0b KenBuild: Fix OSD_SetParameters signature.
git-svn-id: https://svn.eduke32.com/eduke32@6417 1a8010ca-5511-0410-912e-c29ae57300e0
2017-08-06 13:44:36 +00:00
hendricks266
092631ca0d KenBuild, SW: Fix screencapture signature.
git-svn-id: https://svn.eduke32.com/eduke32@6416 1a8010ca-5511-0410-912e-c29ae57300e0
2017-08-06 13:44:32 +00:00
terminx
72f7a6983a Remove user map menu from EDUKE32_SIMPLE_MENU builds. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@6415 1a8010ca-5511-0410-912e-c29ae57300e0
2017-08-04 23:06:37 +00:00
hendricks266
cbb18f5c70 CON: Add starttrackslot <volume> <level>
Clobbering ud.volume_number is a hack no one should need to use any more.

Only this command supports specifying -1 for volume to access the main menu, briefing, etc themes.

git-svn-id: https://svn.eduke32.com/eduke32@6414 1a8010ca-5511-0410-912e-c29ae57300e0
2017-08-01 09:48:59 +00:00
hendricks266
bc1ed207d6 CON parser: Merge some cases for code size savings.
git-svn-id: https://svn.eduke32.com/eduke32@6413 1a8010ca-5511-0410-912e-c29ae57300e0
2017-08-01 09:48:55 +00:00
hendricks266
c3fcd92db3 Menus: Fix RangeInt32.
git-svn-id: https://svn.eduke32.com/eduke32@6412 1a8010ca-5511-0410-912e-c29ae57300e0
2017-08-01 09:48:52 +00:00
terminx
a1d17f3a49 Continuation of r6409
git-svn-id: https://svn.eduke32.com/eduke32@6411 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-31 03:14:51 +00:00
hendricks266
2a75137f79 Fix two warnings. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@6410 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-31 01:53:16 +00:00
terminx
fe05c5dcc1 Unimportant menu changes to kick off synthesis
git-svn-id: https://svn.eduke32.com/eduke32@6409 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-31 01:34:54 +00:00
hendricks266
bb13b0db85 CON: Fix checkavailweapon command.
git-svn-id: https://svn.eduke32.com/eduke32@6408 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-30 21:23:51 +00:00
hendricks266
fe10e46778 Fix a fallthrough annotation. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@6407 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-30 05:42:01 +00:00
hendricks266
3e8c80a3d3 Fix a warning. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@6406 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-30 04:27:44 +00:00
hendricks266
8c5fe26b14 CON: Fix playervar quick structure access.
git-svn-id: https://svn.eduke32.com/eduke32@6404 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-29 20:40:00 +00:00
hendricks266
d414d15b52 Menus: Disable compilation of all code pertaining to MenuRangeDouble_t, since we're not using any.
git-svn-id: https://svn.eduke32.com/eduke32@6403 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-29 20:39:57 +00:00
hendricks266
88d5da2859 Menus: Clean up MenuRanges.
git-svn-id: https://svn.eduke32.com/eduke32@6402 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-29 20:39:53 +00:00
hendricks266
33c138fdf9 Tweak UNREFERENCED_CONST_PARAMETER
git-svn-id: https://svn.eduke32.com/eduke32@6401 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-29 20:39:50 +00:00
hendricks266
0f54975751 Yet another round of trailing whitespace.
git-svn-id: https://svn.eduke32.com/eduke32@6400 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-29 20:39:46 +00:00
terminx
d89909997c Fix issue with screenshots
git-svn-id: https://svn.eduke32.com/eduke32@6399 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-29 09:48:43 +00:00
terminx
7c7f550100 Useless change to force a synthesis build
git-svn-id: https://svn.eduke32.com/eduke32@6398 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-28 20:24:54 +00:00
hendricks266
e2c1e6b12c In md3postload_polymer, always clear the triangle buffer (tribuf) to zero, not just when its allocation size is enlarged.
Fixes strange issues with lighting on models.

git-svn-id: https://svn.eduke32.com/eduke32@6396 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-28 11:29:16 +00:00
hendricks266
d1de78d8bc Don't drink and copypaste, kids.
Unfucks r6379.

git-svn-id: https://svn.eduke32.com/eduke32@6395 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-28 11:29:12 +00:00
hendricks266
32ed49e5c5 Slightly change readarrayfromfile so that attempting to read arrays of a size that does not evenly divide into the requested type rounds up instead of down and zero-pads the difference.
This should help hackish persuits such as reading map files through this command.

git-svn-id: https://svn.eduke32.com/eduke32@6394 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-28 08:27:38 +00:00
hendricks266
201ee80f87 Fix readarrayfromfile with bitmaps and uint32s. Also improve it.
git-svn-id: https://svn.eduke32.com/eduke32@6393 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-28 08:27:35 +00:00
hendricks266
6e7daf6d1b Introduce GAMEARRAY_SIZE_MASK.
git-svn-id: https://svn.eduke32.com/eduke32@6392 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-28 08:27:31 +00:00
hendricks266
b01b25bc93 Revise part of r6385 for clarity.
git-svn-id: https://svn.eduke32.com/eduke32@6391 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-28 08:27:28 +00:00
hendricks266
9eaf935757 Connect minitext_ to MF_Minifont.
git-svn-id: https://svn.eduke32.com/eduke32@6390 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-28 08:27:24 +00:00
terminx
652a56e3d3 Derp. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@6389 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-27 20:05:48 +00:00
terminx
eeaf1f1d54 Build fix
git-svn-id: https://svn.eduke32.com/eduke32@6387 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-27 10:08:52 +00:00
terminx
494f09f80c Build fix
git-svn-id: https://svn.eduke32.com/eduke32@6386 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-27 10:02:13 +00:00
terminx
769b1255f6 I think this fixes readarrayfromfile and writearraytofile
git-svn-id: https://svn.eduke32.com/eduke32@6385 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-27 09:13:37 +00:00
terminx
d9c43bb560 Fix issue with r6374
git-svn-id: https://svn.eduke32.com/eduke32@6384 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-27 09:13:32 +00:00
terminx
1fd79171d8 Fix console background when using oversized font characters
git-svn-id: https://svn.eduke32.com/eduke32@6383 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-27 09:13:26 +00:00
terminx
b00266b47f CON-solidation
Sorry for the shitty pun

git-svn-id: https://svn.eduke32.com/eduke32@6382 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-27 09:13:21 +00:00
terminx
fa02c6433b Switch allocation of sprite/wall/sector to individual aligned allocations instead of the weird thing I was doing with multiple pointers to different parts of a single large block
git-svn-id: https://svn.eduke32.com/eduke32@6381 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-27 09:13:15 +00:00
terminx
9b9b6baecd Set default number of voices to 256, remove voices option from menu when compiled with SIMPLE_MENU=1
git-svn-id: https://svn.eduke32.com/eduke32@6380 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-27 09:13:09 +00:00
hendricks266
e229fc607c mdsprite: Augment or revert portions of r4639.
Substantial work done in md3postload_common, md3postload_polymer_check, and md3postload_polymer.

git-svn-id: https://svn.eduke32.com/eduke32@6379 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-22 04:00:33 +00:00
hendricks266
a782247eac inthi_rintf
git-svn-id: https://svn.eduke32.com/eduke32@6378 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-22 04:00:30 +00:00
hendricks266
715d2ec25a Menu stuff
git-svn-id: https://svn.eduke32.com/eduke32@6377 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-22 04:00:26 +00:00
hendricks266
e87f1591f9 Duke 3D: Make the OSD use tilesizes to determine character positioning instead of hardcoded constants.
git-svn-id: https://svn.eduke32.com/eduke32@6376 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-22 04:00:23 +00:00
hendricks266
5c77a6a13c compat.h: Update ssize_t under MSVC.
git-svn-id: https://svn.eduke32.com/eduke32@6375 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-22 04:00:20 +00:00
hendricks266
d5f8c7a028 compat.h: Update u/native_t by introducing reg_t from LZ4.
git-svn-id: https://svn.eduke32.com/eduke32@6374 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-22 04:00:18 +00:00
hendricks266
366ccd7900 Add a fallthrough__ entry for VS.
git-svn-id: https://svn.eduke32.com/eduke32@6373 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-22 04:00:13 +00:00
terminx
ef8bd42b49 Another attempt at fixing the problems caused by my recent changes to gamearrays
git-svn-id: https://svn.eduke32.com/eduke32@6372 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-20 08:57:50 +00:00
terminx
efcdd0cde0 derp
git-svn-id: https://svn.eduke32.com/eduke32@6371 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-19 06:06:19 +00:00
terminx
dad337add8 Fix gcc 7.1.0 warnings
git-svn-id: https://svn.eduke32.com/eduke32@6370 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-18 20:53:41 +00:00
terminx
484f640f71 Maybe, possibly, unfuck gamearrays.
git-svn-id: https://svn.eduke32.com/eduke32@6368 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-18 20:53:22 +00:00
terminx
af0a291a59 Improve C_AddDefaultDefinitions()
git-svn-id: https://svn.eduke32.com/eduke32@6367 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-18 20:53:15 +00:00
terminx
dc282fcb7c Remove extraneous "updated cfgname.cfg" message
git-svn-id: https://svn.eduke32.com/eduke32@6366 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-18 20:53:10 +00:00
terminx
fd19569099 Drop libpng and zlib in favor of a custom < 100 line .png writer and a drop-in zlib replacement called miniz.
git-svn-id: https://svn.eduke32.com/eduke32@6365 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-18 20:53:00 +00:00
terminx
bf18114d31 Fix compiler warning
git-svn-id: https://svn.eduke32.com/eduke32@6363 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-18 20:52:36 +00:00
hendricks266
494c778feb Fix some int/int32_t mismatches. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@6362 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-15 21:56:21 +00:00
hendricks266
f01c9205e9 Fix USE_OPENGL=0 build.
git-svn-id: https://svn.eduke32.com/eduke32@6361 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-15 21:56:17 +00:00
hendricks266
1b1fd9e0eb CON: ifspawnedby and ifwasweapon are really the same command. Merge the code to execute them.
git-svn-id: https://svn.eduke32.com/eduke32@6360 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-15 21:56:12 +00:00
terminx
d703ac2c62 Fix issue with changing settings in the startup window
git-svn-id: https://svn.eduke32.com/eduke32@6359 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-12 04:10:37 +00:00
terminx
f4e1012081 "qputs" alias for "redefinequote"
git-svn-id: https://svn.eduke32.com/eduke32@6358 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-12 04:10:29 +00:00
terminx
3141084a65 More array work: support for reading and writing the new array types from disk. Not tested.
git-svn-id: https://svn.eduke32.com/eduke32@6357 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-11 04:03:01 +00:00
terminx
01d92aeed2 Syntax changes for gamevar and gamearray declarations:
Gamevar: default value and flags are now optional. A var declared without a value will default to 0 and a var declared without flags will default to global. Multiple flags can now be stacked one after another in a var declaration, and the most useful ones (GAMEVAR_PERPLAYER, GAMEVAR_PERACTOR, GAMEVAR_NODEFAULT, and GAMEVAR_NORESET) are now pre-defined tokens for easy use.

Gamearray: flags field now allows stacking of multiple flags as described above. Arrays can now be defined with specific data types, including int16_t, uint8_t, and a new bit-packed boolean data type. The tokens GAMEARRAY_RESTORE, GAMEARRAY_INT16, GAMEARRAY_UINT8, and GAMEARRAY_BOOLEAN are pre-defined for use of this feature.

This is all still pretty experimental.

git-svn-id: https://svn.eduke32.com/eduke32@6356 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-11 04:02:52 +00:00
hendricks266
1c4c1e9b55 Polymer: Address an oversight in r4600.
git-svn-id: https://svn.eduke32.com/eduke32@6355 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-10 13:44:10 +00:00
hendricks266
b702ebb085 Menus: Draw most text using YCenter and YOffsetZero modes to facilitate certain kinds of visual cues.
git-svn-id: https://svn.eduke32.com/eduke32@6354 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-10 13:44:07 +00:00
hendricks266
37b2a751b9 compat.h: Add preliminary FALLTHROUGH macro to support
git-svn-id: https://svn.eduke32.com/eduke32@6353 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-10 13:44:04 +00:00
hendricks266
4252a60af9 Add an error directive to C++ standards versions < 2011.
git-svn-id: https://svn.eduke32.com/eduke32@6352 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-10 13:44:01 +00:00
hendricks266
bbff77b20e Add a THISACTOR for tiledata and paldata, referring to the current actor's picnum and pal.
git-svn-id: https://svn.eduke32.com/eduke32@6351 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-10 13:43:57 +00:00
hendricks266
ebe2e67439 Fix a bug with undefinegamefunc breaking the key configuration menu.
git-svn-id: https://svn.eduke32.com/eduke32@6350 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-10 13:43:54 +00:00
hendricks266
c980410ecc Remove special limitations on CON customization access to the DNCGS cheat.
git-svn-id: https://svn.eduke32.com/eduke32@6349 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-10 13:43:50 +00:00
terminx
f164fde06b What a hilarious typo
git-svn-id: https://svn.eduke32.com/eduke32@6348 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-08 22:01:59 +00:00
terminx
3706ac1b43 Allow scripts to change MAXSPRITESONSCREEN before calls to drawrooms() and friends
git-svn-id: https://svn.eduke32.com/eduke32@6347 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-08 19:42:11 +00:00
terminx
4c981137be Check constants before THISACTOR in Gv_GetManyVars(). Seems much more likely to be true.
git-svn-id: https://svn.eduke32.com/eduke32@6346 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-08 19:42:01 +00:00
terminx
8be8ae8743 Revise some CON VM error messages for consistency. Upgrade a couple of CON VM errors to a new critical error type which pops up a dialog box when the error is encountered. If you've been writing crappy scripts that spam "divide by zero!" errors into the log that you've been ignoring, you're gonna have a bad time.
git-svn-id: https://svn.eduke32.com/eduke32@6345 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-08 19:41:55 +00:00
terminx
8d7f23a842 Reduce MAXSPRITESONSCREEN from 4096 to 2048. Email me if you have a map so poorly designed that this actually breaks something!
git-svn-id: https://svn.eduke32.com/eduke32@6344 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-08 19:41:49 +00:00
terminx
da0cc1b9bd Some work on CON arrays. Hopefully nothing is broken!
git-svn-id: https://svn.eduke32.com/eduke32@6343 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-08 19:41:43 +00:00
terminx
19c58edb40 Add support for bitmap gamearrays and expose gotpic to CON
git-svn-id: https://svn.eduke32.com/eduke32@6342 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-08 19:41:36 +00:00
terminx
1e647ca499 Change wordy error message I didn't like
git-svn-id: https://svn.eduke32.com/eduke32@6341 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-08 19:41:29 +00:00
terminx
8d2fe8ec1d Fix old Build engine bug: setgotpic() not called from parascan()
git-svn-id: https://svn.eduke32.com/eduke32@6340 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-08 19:41:21 +00:00
terminx
c23b1fe076 Read setup again after compiling scripts
git-svn-id: https://svn.eduke32.com/eduke32@6339 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-08 05:18:51 +00:00
terminx
b3b40c9581 Allow writing to 8 and 16-bit CON arrays
git-svn-id: https://svn.eduke32.com/eduke32@6338 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-08 05:18:43 +00:00
terminx
cabb918c64 Fix out of bounds write caused by memset call missed when tilesiz was changed from vec2_t to vec2s_t
git-svn-id: https://svn.eduke32.com/eduke32@6337 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-08 01:48:01 +00:00
terminx
2b7cd33fc2 script command aliases
git-svn-id: https://svn.eduke32.com/eduke32@6336 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-07 22:50:47 +00:00
terminx
15b2186696 Internal menu tweaks
git-svn-id: https://svn.eduke32.com/eduke32@6335 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-07 22:50:42 +00:00
terminx
2aa0be17d7 Minor mact cleanup
git-svn-id: https://svn.eduke32.com/eduke32@6334 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-07 22:50:37 +00:00
terminx
224475402f Remove errant EDUKE32_PREDICT_FALSE
git-svn-id: https://svn.eduke32.com/eduke32@6333 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-07 22:50:29 +00:00
hendricks266
a6842482de Allow certain debugging-specific cheats to be used from the console even in skill 4.
git-svn-id: https://svn.eduke32.com/eduke32@6332 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-06 14:43:17 +00:00
hendricks266
96c30ffade Turn DWM composition toggling (Windows Vista and 7 only) off by default.
We should only turn this on in specific cases, and turning it off by default will allow us to add these special cases as we get reports.

git-svn-id: https://svn.eduke32.com/eduke32@6331 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-06 14:43:14 +00:00
hendricks266
4f1343adfc Menus: Use screentext's newline support for more mgametext.
git-svn-id: https://svn.eduke32.com/eduke32@6330 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-06 14:43:11 +00:00
hendricks266
3e7f9ad276 Menu stuff
git-svn-id: https://svn.eduke32.com/eduke32@6329 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-06 14:43:07 +00:00
terminx
5ce9e2b208 Combine CONTROL_KeyBinds and CONTROL_MouseBinds
git-svn-id: https://svn.eduke32.com/eduke32@6328 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-05 05:42:54 +00:00
terminx
bea9a73047 More command line parameter help text cleanup
git-svn-id: https://svn.eduke32.com/eduke32@6327 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-05 05:42:47 +00:00
terminx
3b1cf74fea Revise the error message for the default case in VM_Execute()
git-svn-id: https://svn.eduke32.com/eduke32@6326 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-05 05:42:42 +00:00
terminx
a9e513ecaf Add OSD_PROTECTED flag, set when gamefunc_Show_Console has been undefined from CON. Currently just requires you hold down shift when pressing the console key to open the console.
git-svn-id: https://svn.eduke32.com/eduke32@6325 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-05 05:42:37 +00:00
terminx
6af5f3b478 "Keyboard Keys" -> "Key Configuration"
git-svn-id: https://svn.eduke32.com/eduke32@6324 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-05 05:42:29 +00:00
hendricks266
8d3e0a630e Gv_FillWithVars
git-svn-id: https://svn.eduke32.com/eduke32@6323 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-05 05:38:11 +00:00
hendricks266
93d8d8a890 Add "activatecheat" console command.
git-svn-id: https://svn.eduke32.com/eduke32@6322 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-05 05:38:08 +00:00
hendricks266
980b2be584 Move addammo into own function.
git-svn-id: https://svn.eduke32.com/eduke32@6321 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-05 05:38:05 +00:00
hendricks266
fb337a80b1 Move addinventory command code into its own function.
git-svn-id: https://svn.eduke32.com/eduke32@6320 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-05 05:38:02 +00:00
hendricks266
57a7802f6c Factor out modification of DukePlayer_t->actors_killed into P_AddKills().
git-svn-id: https://svn.eduke32.com/eduke32@6319 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-05 05:37:58 +00:00
hendricks266
9fdfd10723 Double the default pointhighlightdist from 128 to 256, a compromise between reverting r5721 and resetting it to 512.
git-svn-id: https://svn.eduke32.com/eduke32@6318 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-05 05:37:55 +00:00
hendricks266
ad32eaeee0 Don't execute setcfgname if the provided name is the same as the one already in place.
git-svn-id: https://svn.eduke32.com/eduke32@6317 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-05 05:37:52 +00:00
hendricks266
0992cdb03f Menu stuff
git-svn-id: https://svn.eduke32.com/eduke32@6316 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-05 05:37:49 +00:00
hendricks266
d372800b3c Menus: Wrap Menu_Find in Menu_FindFiltered to factor out id filtering for all cases that need it.
git-svn-id: https://svn.eduke32.com/eduke32@6315 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-05 05:37:46 +00:00
hendricks266
d032721aa1 Menus: Improve handling of the color correction screen.
git-svn-id: https://svn.eduke32.com/eduke32@6314 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-05 05:37:43 +00:00
hendricks266
150eb8fd7c Fix a small regression with actions and improve performance while we're at it.
git-svn-id: https://svn.eduke32.com/eduke32@6313 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-05 05:37:39 +00:00
hendricks266
5cdc130692 Remove register keyword from LZ4 and libxmp-lite.
git-svn-id: https://svn.eduke32.com/eduke32@6312 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-05 05:37:35 +00:00
terminx
7d020e3338 Derp
git-svn-id: https://svn.eduke32.com/eduke32@6311 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-02 00:44:36 +00:00
terminx
72dadcbece Revert part of r6230
git-svn-id: https://svn.eduke32.com/eduke32@6309 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-02 00:44:24 +00:00
hendricks266
0bf330b2c6 Revise r6305.
git-svn-id: https://svn.eduke32.com/eduke32@6308 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-28 10:55:41 +00:00
hendricks266
4a69eecc9f Optimize getofs_viewtype for precision and speed.
git-svn-id: https://svn.eduke32.com/eduke32@6307 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-27 11:01:38 +00:00
hendricks266
42a26b5f3c Add action viewtypes 12 (like 7 but not mirrored), 9, and 16.
git-svn-id: https://svn.eduke32.com/eduke32@6306 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-27 11:01:34 +00:00
hendricks266
ea0179bd9b Templatize getofs_viewtype functions.
git-svn-id: https://svn.eduke32.com/eduke32@6305 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-27 11:01:30 +00:00
hendricks266
f55758bc2e When calculating which rotation to use for CON action viewtype 7, offset the frame intervals by 15 degrees instead of 22.5, clearly a copypaste error from viewtypes 5 or 8. Now these are properly centered.
git-svn-id: https://svn.eduke32.com/eduke32@6304 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-27 11:01:26 +00:00
hendricks266
01b6047377 Trailing whitespace.
git-svn-id: https://svn.eduke32.com/eduke32@6303 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-27 11:01:22 +00:00
hendricks266
bf76269906 What the last commit said.
git-svn-id: https://svn.eduke32.com/eduke32@6302 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-27 11:01:12 +00:00
terminx
1568cabdce Derp
git-svn-id: https://svn.eduke32.com/eduke32@6301 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-27 02:44:11 +00:00
terminx
bb75d0fbde Texcache cleanups. No longer allocates a 256 byte buffer for every cache entry's name.
git-svn-id: https://svn.eduke32.com/eduke32@6300 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-27 02:24:34 +00:00
terminx
ee367baaea scriptfile.[cpp|h] cleanups
git-svn-id: https://svn.eduke32.com/eduke32@6299 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-27 02:24:28 +00:00
terminx
f490e5b2cb Fix flickering text on the bonus screen. Derp.
git-svn-id: https://svn.eduke32.com/eduke32@6298 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-27 02:24:22 +00:00
terminx
c25aa4a790 OSD (console) cleanup
git-svn-id: https://svn.eduke32.com/eduke32@6297 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-27 02:24:14 +00:00
terminx
6aa1d36f99 Inconsequential formatting
git-svn-id: https://svn.eduke32.com/eduke32@6296 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-27 02:24:02 +00:00
terminx
1e06189f03 Fix something stupid I noticed
git-svn-id: https://svn.eduke32.com/eduke32@6295 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-27 02:23:57 +00:00
terminx
0f788963b6 Fix bug with setuserdef vm_sprite
git-svn-id: https://svn.eduke32.com/eduke32@6294 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-27 02:23:51 +00:00
terminx
2dfc3acb38 Templatize the clamp functions
git-svn-id: https://svn.eduke32.com/eduke32@6293 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-27 02:23:46 +00:00
terminx
8932251ad2 Reduce MAXVOXELS to 1024.
git-svn-id: https://svn.eduke32.com/eduke32@6292 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-27 02:23:40 +00:00
terminx
d37c26cc2a Respect APPBASENAME when showing command line help
git-svn-id: https://svn.eduke32.com/eduke32@6291 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-27 02:22:42 +00:00
hendricks266
6bbfbb5e1d Fix crash when attempting to play an IVF video in 8-bit.
git-svn-id: https://svn.eduke32.com/eduke32@6290 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-27 01:50:59 +00:00
hendricks266
4b15e4629e Menu stuff
git-svn-id: https://svn.eduke32.com/eduke32@6289 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-27 01:50:55 +00:00
hendricks266
6487dc0db6 Fix standalone warnings.
git-svn-id: https://svn.eduke32.com/eduke32@6288 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-27 01:50:48 +00:00
hendricks266
10d478eba8 When playing an IVF upgraded from an ANM and no sound list has been defined for the IVF, use the ANM's sound list by converting framerates.
git-svn-id: https://svn.eduke32.com/eduke32@6287 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-25 11:24:43 +00:00
hendricks266
35b3cea5a6 If an ANM is upgraded to an IVF, use the sounds defined for the .ivf if any have been.
git-svn-id: https://svn.eduke32.com/eduke32@6286 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-25 11:24:39 +00:00
hendricks266
d57234e668 Replace sound_func function pointer parameter and associate functions for hardcoded ANMs with equivalent animsounds arrays.
git-svn-id: https://svn.eduke32.com/eduke32@6285 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-25 11:24:34 +00:00
hendricks266
5f8c99c3a1 Let animsound value -1 stop all sounds.
git-svn-id: https://svn.eduke32.com/eduke32@6284 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-25 11:24:27 +00:00
hendricks266
018bc98ecb Game defs: Add sounds sub-token to cutscene token that functions identically to animsounds.
git-svn-id: https://svn.eduke32.com/eduke32@6283 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-25 11:24:23 +00:00
hendricks266
4db07ee9af Structify animsounds arrays.
git-svn-id: https://svn.eduke32.com/eduke32@6282 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-25 11:24:19 +00:00
hendricks266
6b880ccb06 Structify the hardcoded Anim_Setup calls.
git-svn-id: https://svn.eduke32.com/eduke32@6281 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-25 11:24:14 +00:00
hendricks266
aebd4c53c4 Game defs: Split Anim_Create out of Anim_Setup and use it for the cutscene token.
git-svn-id: https://svn.eduke32.com/eduke32@6280 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-25 11:24:10 +00:00
hendricks266
7226eb346d Don't stutter for 1/12 second before starting an ANM.
git-svn-id: https://svn.eduke32.com/eduke32@6279 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-25 11:24:06 +00:00
hendricks266
1baac86d72 Game defs: Try loading def modules even if the engine reports failure.
git-svn-id: https://svn.eduke32.com/eduke32@6278 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-25 11:24:02 +00:00
hendricks266
0d7518891b CON: Add wall.blend to structure access.
git-svn-id: https://svn.eduke32.com/eduke32@6277 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-25 11:23:58 +00:00
hendricks266
cb12f25cda Add a wallext structure for non-Lunatic builds so they can have a blend member too.
git-svn-id: https://svn.eduke32.com/eduke32@6276 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-25 11:23:53 +00:00
hendricks266
610d2e3b46 Connect wall.blend to Polymost in Lunatic builds with it enabled.
git-svn-id: https://svn.eduke32.com/eduke32@6275 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-25 11:23:47 +00:00
hendricks266
9286a4d40e Fix Lunatic build.
git-svn-id: https://svn.eduke32.com/eduke32@6274 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-25 11:23:41 +00:00
terminx
48e9b22b4f More standalone stuff
git-svn-id: https://svn.eduke32.com/eduke32@6273 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 21:18:18 +00:00
terminx
07419b18ab Workaround for MSVC bug
git-svn-id: https://svn.eduke32.com/eduke32@6272 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 21:18:12 +00:00
terminx
504b04067b Remove some Duke-specific screen displays from standalone builds
git-svn-id: https://svn.eduke32.com/eduke32@6271 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 21:18:06 +00:00
terminx
854b303d18 Fix command line help window in builds with the startup window disabled
git-svn-id: https://svn.eduke32.com/eduke32@6270 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 21:17:59 +00:00
terminx
0e1784bf4c Clean up command line parameter help text
git-svn-id: https://svn.eduke32.com/eduke32@6269 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 21:17:53 +00:00
terminx
1069db7e1e Fix swapped EDUKE32_STANDALONE ifdefs for screenshot filenames
git-svn-id: https://svn.eduke32.com/eduke32@6268 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 21:17:46 +00:00
terminx
8dc6fb6cfd Don't try to load duke3d.cfg in standalone builds
git-svn-id: https://svn.eduke32.com/eduke32@6267 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 21:17:38 +00:00
terminx
3181e8be9e Rename snd_duketalk cvar to snd_speech
git-svn-id: https://svn.eduke32.com/eduke32@6266 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 21:17:33 +00:00
terminx
047b94d242 Revise r6253
git-svn-id: https://svn.eduke32.com/eduke32@6265 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 21:17:26 +00:00
terminx
e4f0b74a4f Rename two misnamed variables
git-svn-id: https://svn.eduke32.com/eduke32@6264 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 21:16:43 +00:00
hendricks266
5ef942f4ec Shrink the tilesiz vector to use int16_t members as the original arrays were.
git-svn-id: https://svn.eduke32.com/eduke32@6263 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 09:21:13 +00:00
hendricks266
7afc8202d2 CON: Add EVENT_PRELOADGAME and EVENT_POSTLOADGAME.
git-svn-id: https://svn.eduke32.com/eduke32@6262 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 09:21:07 +00:00
hendricks266
df317aa741 CON: Add drawline256 and drawlinergb commands that call the internal functions used for the automap lines.
drawline256 <x0> <y0> <x1> <y1> <index>
drawlinergb <x0> <y0> <x1> <y1> <index> <rgb>

The coordinates are xdim<<12/ydim<<12 based, not 320<<16x200<<16.
<index> is a palette index, and for drawlinergb is used as a fallback in the software renderer.
<rgb> is encoded the same as PROJ_FLASH_COLOR.

git-svn-id: https://svn.eduke32.com/eduke32@6261 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 09:21:03 +00:00
hendricks266
4dbeb30907 Add internal drawlinergb function.
git-svn-id: https://svn.eduke32.com/eduke32@6260 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 09:20:58 +00:00
hendricks266
517517a1bb CON: Add getclosestcol command, which finds the closest palette index given
getclosestcol <return> <color> <limit>

<color> is encoded the same as PROJ_FLASH_COLOR.

<limit> is the index of the last palette color that should be considered. Use 255 for the whole palette, 254 to exclude the transparent color, 239 to exclude Duke 3D's fullbrights, etc.

git-svn-id: https://svn.eduke32.com/eduke32@6259 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 09:20:54 +00:00
hendricks266
ffc7de9911 CON: Add EVENT_DISPLAYOVERHEADMAPTEXT.
Set RETURN to any non-zero value to disable hardcoded display of text.

If you wish to replace the hardcoded text, you must check that userdef[].overhead_on == 2 yourself.

git-svn-id: https://svn.eduke32.com/eduke32@6258 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 09:20:50 +00:00
hendricks266
0d6842800b Replace specialized swap C functions with a templatized version.
git-svn-id: https://svn.eduke32.com/eduke32@6257 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 09:20:46 +00:00
hendricks266
adf62d216c scale(1<<##, b, c) --> divscale##(b, c)
git-svn-id: https://svn.eduke32.com/eduke32@6256 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 09:20:42 +00:00
hendricks266
bd9abf33ad scale(a, b, 1<<##) --> mulscale##(a, b)
git-svn-id: https://svn.eduke32.com/eduke32@6255 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 09:20:37 +00:00
hendricks266
965e40bda7 mulscale(a, b, ##) --> mulscale##(a, b)
git-svn-id: https://svn.eduke32.com/eduke32@6254 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 09:20:21 +00:00
terminx
81ca397802 Fix buggy swinging door behavior
git-svn-id: https://svn.eduke32.com/eduke32@6253 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 06:31:37 +00:00
terminx
4e3f55df9b Dicking around with inlined actor header functions
git-svn-id: https://svn.eduke32.com/eduke32@6252 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 06:31:32 +00:00
terminx
6d3978b471 Revise r6225
git-svn-id: https://svn.eduke32.com/eduke32@6251 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 06:31:26 +00:00
terminx
bf944cf27a Potential CON performance improvements
git-svn-id: https://svn.eduke32.com/eduke32@6250 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 06:31:21 +00:00
terminx
e14d7d2786 Clamp r_maxfps to a minimum of 30 if not 0
git-svn-id: https://svn.eduke32.com/eduke32@6249 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-24 06:31:12 +00:00
hendricks266
ccb6d27349 Polymost: Fix yoffset bouncing of face sprites with cstat 128.
git-svn-id: https://svn.eduke32.com/eduke32@6248 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 09:17:12 +00:00
hendricks266
945944b915 r6210 inadvertantly forced orientation bit 2 for internal gametext. Tidy up affected text.
git-svn-id: https://svn.eduke32.com/eduke32@6247 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 09:17:07 +00:00
terminx
81ac537bd1 More misc small cleanups. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@6246 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 09:16:33 +00:00
terminx
ac2f2bd902 :(
git-svn-id: https://svn.eduke32.com/eduke32@6245 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 09:16:27 +00:00
terminx
65a2c38ba8 Misc cleanups, mostly const correctness
git-svn-id: https://svn.eduke32.com/eduke32@6244 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 09:16:21 +00:00
terminx
50bc1aa2ba Can Duke3D CON version compatibility messages in standalone builds
git-svn-id: https://svn.eduke32.com/eduke32@6243 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 09:16:13 +00:00
terminx
0dd837919e Revise r6239
git-svn-id: https://svn.eduke32.com/eduke32@6242 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 04:32:23 +00:00
terminx
0efb2e146e Revise r6235
git-svn-id: https://svn.eduke32.com/eduke32@6241 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 04:32:16 +00:00
terminx
977c09fa28 Revert test change I accidentally committed
git-svn-id: https://svn.eduke32.com/eduke32@6240 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 04:01:03 +00:00
terminx
b73c449f31 Further reorganization of actor_t. BYTEVERSION bumped.
git-svn-id: https://svn.eduke32.com/eduke32@6239 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 03:59:39 +00:00
terminx
4a7806150c Make r_showfps 2 work a little bit better
git-svn-id: https://svn.eduke32.com/eduke32@6238 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 03:59:32 +00:00
terminx
eae02b26a1 Respect r_maxfps in menus and on startup/bonus/end screens
git-svn-id: https://svn.eduke32.com/eduke32@6237 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 03:59:26 +00:00
terminx
4489e110de More minor optimizations. Breaks savegames.
git-svn-id: https://svn.eduke32.com/eduke32@6236 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 03:59:19 +00:00
terminx
302d6bdfd8 Minor optimizations
git-svn-id: https://svn.eduke32.com/eduke32@6235 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 03:59:11 +00:00
terminx
f698b1e733 Gamevar cleanup
git-svn-id: https://svn.eduke32.com/eduke32@6234 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 03:59:06 +00:00
terminx
49edb0e9f6 Use macros for special gamevar access range checking
git-svn-id: https://svn.eduke32.com/eduke32@6233 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 03:59:00 +00:00
terminx
54a0d8d4ae Consty McConst
git-svn-id: https://svn.eduke32.com/eduke32@6232 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 03:58:54 +00:00
terminx
dac7679633 Replace 2 memcpys with assignments
git-svn-id: https://svn.eduke32.com/eduke32@6231 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 03:58:48 +00:00
terminx
a3fbe4c542 Add clipdist member to player struct to control how close the player can get to walls
git-svn-id: https://svn.eduke32.com/eduke32@6230 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 03:58:43 +00:00
terminx
4ae5f2e298 Remove "BUILD_NOP6", old cruft for running on ancient x86 processors without MMX.
git-svn-id: https://svn.eduke32.com/eduke32@6229 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 03:58:36 +00:00
terminx
d1c0366916 Minor classic mode optimization
git-svn-id: https://svn.eduke32.com/eduke32@6228 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 03:58:31 +00:00
terminx
bcb6d3830b Only show "using dynamic tile remapping" message in debug builds. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@6227 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 03:58:26 +00:00
terminx
c26fcfa786 Remove unused member from actor_t
git-svn-id: https://svn.eduke32.com/eduke32@6226 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 03:58:21 +00:00
terminx
6319b6fb60 Change hard-coded subway effect damage to generic explosive damage that can be handled by CON. Fixes subway kills not counting toward the dead monster count and allows CON scripts to handle subway damage however they like.
git-svn-id: https://svn.eduke32.com/eduke32@6225 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 03:58:13 +00:00
terminx
8cda268514 Fix issue with hud_bgstretch cvar overwriting adjacent values in memory
git-svn-id: https://svn.eduke32.com/eduke32@6224 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 03:58:08 +00:00
terminx
e3f3a8ce33 Move Mapster32 autoexec to before the map specified on the command line is loaded, to allow EVENT_PRELOADMAP and EVENT_LOADMAP to work when loading a map from the command line. This makes the console output of autoexec a little worse but the OSD will be fixed at a later time.
git-svn-id: https://svn.eduke32.com/eduke32@6223 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-23 03:58:01 +00:00
hendricks266
e2c44ae253 CON: Handle the save and savenn commands after the full tic is processed, instead of in the middle of it during execution. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@6222 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-22 22:49:22 +00:00
hendricks266
262e863b33 Polymodes: Only try texcache_fetchmulti on detail texture slots.
git-svn-id: https://svn.eduke32.com/eduke32@6221 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-22 01:32:10 +00:00
hendricks266
b25ec936b3 Polymodes: Check that texture entries have a non-skybox filename before using it in texcache_fetchmulti.
Fixes crash reported by Sgt Jack V.

git-svn-id: https://svn.eduke32.com/eduke32@6220 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-22 01:32:05 +00:00
hendricks266
f03d704ddb Polymost: Don't cut off a row and/or column of texels when drawing floor-aligned sprites with odd dimensions.
git-svn-id: https://svn.eduke32.com/eduke32@6219 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-21 13:47:04 +00:00
hendricks266
ad46ac785f Add new tint flag 256, which always skips hightile when picking an image source.
git-svn-id: https://svn.eduke32.com/eduke32@6218 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-21 13:46:59 +00:00
hendricks266
986a545ff5 Polymodes: Explicitly opt out of hicfindsubst falling back to pal 0 instead of checking against the reserved palnum range.
git-svn-id: https://svn.eduke32.com/eduke32@6217 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-21 13:46:54 +00:00
hendricks266
a032b829bf Factor out hictinting array accesses.
git-svn-id: https://svn.eduke32.com/eduke32@6216 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-21 13:46:50 +00:00
hendricks266
70245fc4f1 Create a new struct for hictinting that uses a uint16_t for flags.r
git-svn-id: https://svn.eduke32.com/eduke32@6215 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-21 13:46:44 +00:00
hendricks266
84c913d04c Only allocate space for tint flags combinations that require a pre-computed texture to be stored in memory, instead of space for every combination.
git-svn-id: https://svn.eduke32.com/eduke32@6214 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-21 13:46:36 +00:00
hendricks266
05945c920b Add new userdef members gametext_tracking, mgametext_tracking, and menutext_tracking.
git-svn-id: https://svn.eduke32.com/eduke32@6213 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-20 09:28:59 +00:00
hendricks266
4f5ea33917 Make internal gametext calls use MF_Bluefont fields in the menus and a newly introduced MF_BluefontGame elsewhere.
git-svn-id: https://svn.eduke32.com/eduke32@6212 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-20 09:28:54 +00:00
hendricks266
cd792277d3 Only use TEXT_GAMETEXTNUMHACK on internal gametext calls that benefit from it.
git-svn-id: https://svn.eduke32.com/eduke32@6211 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-20 09:28:49 +00:00
hendricks266
611031d9e8 Optimize all gametext calls.
git-svn-id: https://svn.eduke32.com/eduke32@6210 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-20 09:28:42 +00:00
hendricks266
cb8dc04660 Make menutext use MF_Redfont fields.
git-svn-id: https://svn.eduke32.com/eduke32@6209 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-19 23:07:23 +00:00
hendricks266
334007d6c3 Optimize all menutext calls.
git-svn-id: https://svn.eduke32.com/eduke32@6208 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-19 23:07:18 +00:00
hendricks266
7f6b26d362 Eliminate the RedfontGreen type and replace it with indentations (like "Apply Changes").
git-svn-id: https://svn.eduke32.com/eduke32@6207 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-19 23:07:12 +00:00
hendricks266
02256c51dd Eliminate the RedfontBlue type and replace it with the Disabled or LookDisabled flags.
git-svn-id: https://svn.eduke32.com/eduke32@6206 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-19 23:07:09 +00:00
hendricks266
ecc60dec44 Add a new MenuEntryFlag to make an option appear disabled but still work.
git-svn-id: https://svn.eduke32.com/eduke32@6205 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-19 23:07:05 +00:00
hendricks266
2e12d10cc6 Namespace all MenuEntryFlags_t.
git-svn-id: https://svn.eduke32.com/eduke32@6204 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-19 23:07:01 +00:00
hendricks266
2afdaf5faf Move cursorPosition and cursorScale from MenuEntryFormat_t to MenuFont_t.
git-svn-id: https://svn.eduke32.com/eduke32@6203 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-19 23:06:57 +00:00
hendricks266
e51960b3a2 Fix memory leaks in audiolib. Fixes issue #59.
git-svn-id: https://svn.eduke32.com/eduke32@6202 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-19 23:06:53 +00:00
hendricks266
da4081c2b6 Fix some indentation of the menu system.
git-svn-id: https://svn.eduke32.com/eduke32@6201 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-19 23:06:48 +00:00
hendricks266
9abe8f7958 Factor some menu code.
git-svn-id: https://svn.eduke32.com/eduke32@6200 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-19 23:06:45 +00:00
hendricks266
57b5a47b9d Scale menu spacers by font zoom.
git-svn-id: https://svn.eduke32.com/eduke32@6199 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-19 23:06:41 +00:00
hendricks266
d85cbcc8cf Attach fonts to spacer menu entries.
git-svn-id: https://svn.eduke32.com/eduke32@6198 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-19 23:06:37 +00:00
hendricks266
6221b0e74d Apply MenuFont_t.zoom to margins and indentations.
git-svn-id: https://svn.eduke32.com/eduke32@6197 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-19 23:06:33 +00:00
hendricks266
72b7e30b19 Add zoom field to MenuFont_t.
git-svn-id: https://svn.eduke32.com/eduke32@6196 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-19 23:06:29 +00:00
hendricks266
f2b7650305 Shrink the MenuFont_t struct.
git-svn-id: https://svn.eduke32.com/eduke32@6195 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-19 23:06:25 +00:00
hendricks266
8e73029ecc Touch up some menu options.
git-svn-id: https://svn.eduke32.com/eduke32@6194 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-19 23:06:21 +00:00
hendricks266
283c5c0644 Center the episode menu vertically like the skill menu.
git-svn-id: https://svn.eduke32.com/eduke32@6193 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-19 23:06:17 +00:00
hendricks266
e79d830deb Clean up episodes, skills, and game modes in standalone builds.
git-svn-id: https://svn.eduke32.com/eduke32@6192 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-19 23:06:07 +00:00
hendricks266
97a9d67148 Fix a bug in r6184.
git-svn-id: https://svn.eduke32.com/eduke32@6191 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-17 21:53:28 +00:00
hendricks266
8deddc19b0 Clean up warnings in standalone mode.
git-svn-id: https://svn.eduke32.com/eduke32@6190 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-17 11:42:20 +00:00
hendricks266
3ae7c3d317 Clean up gamefuncs in standalone mode.
git-svn-id: https://svn.eduke32.com/eduke32@6189 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-17 11:42:15 +00:00
hendricks266
66c85ec71f Don't print any warnings to the log if an unrecognized gamefunc is dispatched; this is expected and normal when they are renamed.
git-svn-id: https://svn.eduke32.com/eduke32@6188 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-17 11:42:12 +00:00
hendricks266
81a6f29dd4 CON: Add undefinegamefunc.
git-svn-id: https://svn.eduke32.com/eduke32@6187 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-17 11:42:08 +00:00
hendricks266
b0d9e94004 Remove an old hack from my menu system that upon closer inspection is no longer needed.
git-svn-id: https://svn.eduke32.com/eduke32@6186 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-17 11:42:04 +00:00
hendricks266
a10893d75f Change the way gamefuncs are handled to support and ignore entries named as the empty string.
git-svn-id: https://svn.eduke32.com/eduke32@6185 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-17 11:41:59 +00:00
hendricks266
6d11c01fd7 Don't store redundant copies of default gamefunc names, since the indices are all that matter.
git-svn-id: https://svn.eduke32.com/eduke32@6184 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-17 11:41:54 +00:00
hendricks266
549ba86e5c Disable G_FadeLoad because it doesn't work in any renderer and only causes glitches.
git-svn-id: https://svn.eduke32.com/eduke32@6183 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-17 11:41:49 +00:00
hendricks266
f26408ea96 Keep music playing without interruption during map or hubmap transitions if the same file will be playing before and after.
git-svn-id: https://svn.eduke32.com/eduke32@6182 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-17 11:41:44 +00:00
hendricks266
7d6a0d965b Update LZ4 to 1.7.5.
git-svn-id: https://svn.eduke32.com/eduke32@6181 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-14 07:00:08 +00:00
hendricks266
95826e79b3 Update xxHash to 0.6.2.
git-svn-id: https://svn.eduke32.com/eduke32@6180 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-14 07:00:02 +00:00
hendricks266
08326d19dd Amend r6174 to un-break libxmp-lite.
git-svn-id: https://svn.eduke32.com/eduke32@6179 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-14 06:59:58 +00:00
hendricks266
f8bdc5814e Re-port our changes to libdivide.h and add new changes so that it works as we need.
git-svn-id: https://svn.eduke32.com/eduke32@6177 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-14 06:59:50 +00:00
hendricks266
284fdf1b63 Replace libdivide.h with an unpatched copy of the latest version.
git-svn-id: https://svn.eduke32.com/eduke32@6176 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-14 06:59:43 +00:00
terminx
feb8b43892 Better support for working with blend in the editor
git-svn-id: https://svn.eduke32.com/eduke32@6175 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-10 08:19:47 +00:00
terminx
d0211379e0 Get MSVC building again, DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@6174 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-10 08:19:35 +00:00
terminx
faf5c90eef Another attempt at fixing Polymost z-fighting. Probably still sucks! :)
git-svn-id: https://svn.eduke32.com/eduke32@6170 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-09 06:41:45 +00:00
terminx
f394f1bc1e Fix window title in EDUKE32_STANDALONE builds. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@6169 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-09 06:41:39 +00:00
terminx
0447c0feb6 Minor optimization
git-svn-id: https://svn.eduke32.com/eduke32@6168 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-09 06:41:33 +00:00
terminx
18870b0bc1 Change savegame filenames from dukesav#.esv to save#.esv.
git-svn-id: https://svn.eduke32.com/eduke32@6167 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-09 06:41:28 +00:00
terminx
b13deef232 The most minor of minor optimizations. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@6166 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-09 06:41:23 +00:00
terminx
5fc04f288c Fix missed label for sectoreffector tag. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@6165 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-09 06:41:17 +00:00
terminx
d76c3c2764 Polymost: fix texture panning floatiness on slight slopes
git-svn-id: https://svn.eduke32.com/eduke32@6164 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-09 06:40:17 +00:00
hendricks266
fc93eb1fe6 libxmp-lite: Changes to build as C++: Apparently an extern declaration must be present for the compiler to expose the symbols of struct objects.
git-svn-id: https://svn.eduke32.com/eduke32@6163 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-09 06:40:07 +00:00
hendricks266
d77d1cff29 libxmp-lite: Changes to build as C++: pointer casting
git-svn-id: https://svn.eduke32.com/eduke32@6162 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-09 06:39:59 +00:00
hendricks266
6700a2a93d libxmp-lite: Changes to build as C++: Structs within other structs cannot be referred to by just the innermost name, and the using keyword does not work either. Split them out into the top level.
git-svn-id: https://svn.eduke32.com/eduke32@6161 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-09 06:39:52 +00:00
hendricks266
35e8792efa libxmp-lite: Changes to build (in C mode).
git-svn-id: https://svn.eduke32.com/eduke32@6160 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-09 06:39:48 +00:00
hendricks266
d715918e45 Add unmodified libxmp-lite sources from its Git repository.
git-svn-id: https://svn.eduke32.com/eduke32@6158 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-09 06:39:37 +00:00
hendricks266
75d25d0d15 LPeg: Necessary changes for building in our environment and with our project. See lpeg-lunatic.patch.
git-svn-id: https://svn.eduke32.com/eduke32@6156 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-09 06:39:18 +00:00
hendricks266
37c7be05ca Add unmodified sources for LPeg 1.0.1.
git-svn-id: https://svn.eduke32.com/eduke32@6155 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-09 06:39:11 +00:00
hendricks266
b3d597200b Common.mak: Massive reorganization/cleanup.
Any functional changes are incidental and minor, other than the outright removals.

git-svn-id: https://svn.eduke32.com/eduke32@6147 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-09 06:38:42 +00:00
hendricks266
0a74a878e1 Rename savegame.lua to lunasave.lua to avoid a collision with savegame.cpp. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@6145 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-07 05:56:35 +00:00
hendricks266
0633795683 Fix an extern "C" that was collateral damage in the last push. Fixes Lunatic build. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@6144 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-07 05:13:54 +00:00
hendricks266
8d8fd61ed0 Remove the register keyword, since it is deprecated in C++11 and removed in C++17.
git-svn-id: https://svn.eduke32.com/eduke32@6143 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-05 10:05:29 +00:00
hendricks266
576ff98f4d Improve what build information we print to the log at startup. New feature: compilers, their versions, and big-endianness. Removed: C++, as it is now mandatory.
git-svn-id: https://svn.eduke32.com/eduke32@6142 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-05 10:05:22 +00:00
hendricks266
25b942de74 Visual Studio apparently still defines __cplusplus as 199711.
git-svn-id: https://svn.eduke32.com/eduke32@6141 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-05 10:05:17 +00:00
hendricks266
f781f21ccd Address some longstanding warnings with printf when building with MinGW's GCC 6 and newer.
Building with said newer versions may fix the -Wodr warning when building for release.

git-svn-id: https://svn.eduke32.com/eduke32@6140 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-05 10:05:12 +00:00
hendricks266
914762513d Introducing buildprint, a type-safe and more performant replacement for printf using C++11 variadic templates. At least, an incomplete version that is enough to implement the next commit.
git-svn-id: https://svn.eduke32.com/eduke32@6139 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-05 10:05:07 +00:00
hendricks266
5a0ed69310 compat.h: Add some more math stuff to support the next commit.
git-svn-id: https://svn.eduke32.com/eduke32@6138 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-05 10:05:03 +00:00
hendricks266
83c06a63b9 Fix some extern "C".
git-svn-id: https://svn.eduke32.com/eduke32@6137 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-05 10:04:56 +00:00
hendricks266
66f43bca24 compat.h: Prevent "warning: private field 'dummy' is not used". DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@6136 1a8010ca-5511-0410-912e-c29ae57300e0
2017-06-01 03:08:39 +00:00
terminx
abfbfec0f0 Fix interpolation of sprites in sectors with SE_31_FLOOR_RISE_FALL
git-svn-id: https://svn.eduke32.com/eduke32@6135 1a8010ca-5511-0410-912e-c29ae57300e0
2017-05-19 02:28:40 +00:00
terminx
0e231ce97e Revert r6133
git-svn-id: https://svn.eduke32.com/eduke32@6134 1a8010ca-5511-0410-912e-c29ae57300e0
2017-05-18 07:03:55 +00:00
terminx
e6d8181e1c Reduce max number of concurrent copies of the same sound from 8 to 4.
git-svn-id: https://svn.eduke32.com/eduke32@6133 1a8010ca-5511-0410-912e-c29ae57300e0
2017-05-17 21:55:09 +00:00
terminx
3861723200 Fix https://forums.duke4.net/topic/9285-con-compiler-bug/page__pid__276767
git-svn-id: https://svn.eduke32.com/eduke32@6132 1a8010ca-5511-0410-912e-c29ae57300e0
2017-05-17 21:55:01 +00:00
terminx
ca30328f53 Fix using defined move/ai/action names in switch/case statements
git-svn-id: https://svn.eduke32.com/eduke32@6131 1a8010ca-5511-0410-912e-c29ae57300e0
2017-05-17 05:46:59 +00:00
terminx
a955f415c4 Improve a couple of tagged sector warning messages. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@6130 1a8010ca-5511-0410-912e-c29ae57300e0
2017-05-17 05:46:52 +00:00
hendricks266
80ebabd08a Amend r6122, as of r6074 all standard library header inclusion is routed through compat.h.
git-svn-id: https://svn.eduke32.com/eduke32@6128 1a8010ca-5511-0410-912e-c29ae57300e0
2017-04-24 05:11:08 +00:00
terminx
28d23ad575 Recognize MacUser shareware demo; data must be renamed from "Duke3D Group" to "duke3d.grp".
git-svn-id: https://svn.eduke32.com/eduke32@6127 1a8010ca-5511-0410-912e-c29ae57300e0
2017-04-24 04:35:32 +00:00
terminx
b2c8c45b41 Potential slight optimization to actor movement.
git-svn-id: https://svn.eduke32.com/eduke32@6125 1a8010ca-5511-0410-912e-c29ae57300e0
2017-04-24 04:35:22 +00:00
terminx
76b83164a5 EDUKE32_STANDALONE improvement. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@6124 1a8010ca-5511-0410-912e-c29ae57300e0
2017-04-24 04:35:18 +00:00
terminx
0acdeb93d1 Save and restore music position when changing to a map with the same music defined. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@6123 1a8010ca-5511-0410-912e-c29ae57300e0
2017-04-24 04:35:13 +00:00
terminx
889a0e7fbc Remove obsolete header standard.h. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@6122 1a8010ca-5511-0410-912e-c29ae57300e0
2017-04-24 04:35:08 +00:00
terminx
9ed9efc4f6 Change screenshot base name to scrn0000 instead of duke0000 for standalone builds. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@6121 1a8010ca-5511-0410-912e-c29ae57300e0
2017-04-24 04:35:01 +00:00
hendricks266
d3c56b8a89 compat.h: Add logbase<size_t>().
git-svn-id: https://svn.eduke32.com/eduke32@6119 1a8010ca-5511-0410-912e-c29ae57300e0
2017-04-12 08:30:35 +00:00
hendricks266
73654c2079 compat.h: Add new types, native_t and unative_t, functionally equivalent to our current bssize_t and bsize_t, respectively, but generated dependably using template metaprogramming when building with C++ >= 11.
git-svn-id: https://svn.eduke32.com/eduke32@6118 1a8010ca-5511-0410-912e-c29ae57300e0
2017-04-12 08:30:32 +00:00
hendricks266
7a40df33b6 compat.h: Add some infrastructure for C++ template metaprogramming.
git-svn-id: https://svn.eduke32.com/eduke32@6117 1a8010ca-5511-0410-912e-c29ae57300e0
2017-04-12 08:30:29 +00:00
hendricks266
a1f317ecfc compat.h: Upgrade our byteswapping functions with new versions that I have experimentally confirmed to compile down to the appropriate single assembly instructions on x86 and x86_64. As part of this, make them constexpr, and remove the OS-specific and inline assembly variants as sub-par due to these two improvements.
git-svn-id: https://svn.eduke32.com/eduke32@6116 1a8010ca-5511-0410-912e-c29ae57300e0
2017-04-12 08:30:26 +00:00
hendricks266
b98b00281c compat.h: Add macros so that we can use constexpr without breaking C++ < 11 and C.
git-svn-id: https://svn.eduke32.com/eduke32@6115 1a8010ca-5511-0410-912e-c29ae57300e0
2017-04-12 08:30:23 +00:00
hendricks266
1ebbd553bd compat.h: Add some definitions for easy testing of language standard versions.
git-svn-id: https://svn.eduke32.com/eduke32@6114 1a8010ca-5511-0410-912e-c29ae57300e0
2017-04-12 08:30:18 +00:00
hendricks266
0c31245cd2 Add registry detection of the Steam path for World Tour installs.
git-svn-id: https://svn.eduke32.com/eduke32@6113 1a8010ca-5511-0410-912e-c29ae57300e0
2017-04-09 13:09:01 +00:00
hendricks266
5441fcdb1e Add the patched World Tour GRP to our checksum entries.
git-svn-id: https://svn.eduke32.com/eduke32@6112 1a8010ca-5511-0410-912e-c29ae57300e0
2017-04-09 13:08:58 +00:00
hendricks266
8cf65eb180 Modify Windows registry reading to check both 32-bit and 64-bit key locations.
git-svn-id: https://svn.eduke32.com/eduke32@6111 1a8010ca-5511-0410-912e-c29ae57300e0
2017-04-09 13:08:53 +00:00
hendricks266
cb2d1f4bce Mac: Address deprecation warnings with the latest Xcode and macOS.
git-svn-id: https://svn.eduke32.com/eduke32@6109 1a8010ca-5511-0410-912e-c29ae57300e0
2017-03-27 17:13:07 +00:00
hendricks266
30ef04893b compat.h: Re-taxonomize one item.
git-svn-id: https://svn.eduke32.com/eduke32@6091 1a8010ca-5511-0410-912e-c29ae57300e0
2017-03-23 03:03:26 +00:00
hendricks266
3e64f08cd1 Fix r5498 so that projectiles actually do not hit their owner during their first tic of movement.
Clear the hitscan bit instead of blocking bit because Proj_MoveCustom uses CLIPMASK1.

git-svn-id: https://svn.eduke32.com/eduke32@6082 1a8010ca-5511-0410-912e-c29ae57300e0
2017-03-20 20:30:04 +00:00
hendricks266
af66b8a99f Factor out code for launching EVENT_GAME and EVENT_PREGAME.
git-svn-id: https://svn.eduke32.com/eduke32@6081 1a8010ca-5511-0410-912e-c29ae57300e0
2017-03-20 20:29:57 +00:00
hendricks266
06a38e3873 Audiolib: Re-add a fixed version of old code for the SDL driver to initialize SDL as a whole or its audio subsystem if it has not yet been initialized.
Patch from NY00123.

DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@6080 1a8010ca-5511-0410-912e-c29ae57300e0
2017-03-01 09:35:58 +00:00
hendricks266
d5bd7681a0 Remove XYZ.voc --> XYZ.flac format upgrades completely for sound effects, and leave them only for music.
XYZ.voc --> XYZ_voc.flac is still available.

git-svn-id: https://svn.eduke32.com/eduke32@6079 1a8010ca-5511-0410-912e-c29ae57300e0
2017-02-25 08:16:04 +00:00
hendricks266
e9c8f44a47 compat.h: Upgrade ARRAY_SIZE.
git-svn-id: https://svn.eduke32.com/eduke32@6078 1a8010ca-5511-0410-912e-c29ae57300e0
2017-02-25 08:16:01 +00:00
hendricks266
d6e820645b compat.h: Upgrade EDUKE32_FUNCTION and add EDUKE32_PRETTY_FUNCTION.
git-svn-id: https://svn.eduke32.com/eduke32@6077 1a8010ca-5511-0410-912e-c29ae57300e0
2017-02-25 08:15:58 +00:00
hendricks266
62a921c409 Remove the implicit "static" from our FORCE_INLINE macro.
This will be important for C++ member functions.

git-svn-id: https://svn.eduke32.com/eduke32@6076 1a8010ca-5511-0410-912e-c29ae57300e0
2017-02-25 08:15:53 +00:00
hendricks266
77875948ba Eliminate more cases of duplication of compat.h's functionality.
git-svn-id: https://svn.eduke32.com/eduke32@6075 1a8010ca-5511-0410-912e-c29ae57300e0
2017-02-25 08:15:45 +00:00
hendricks266
aa04307ad1 Route all inclusion of libc headers and most of POSIX headers through compat.h.
git-svn-id: https://svn.eduke32.com/eduke32@6074 1a8010ca-5511-0410-912e-c29ae57300e0
2017-02-25 08:15:36 +00:00
hendricks266
22fbca52ca Remove HAVE_INTTYPES define.
No #else was ever provided for any build system that lacks inttypes besides MSVC.

git-svn-id: https://svn.eduke32.com/eduke32@6073 1a8010ca-5511-0410-912e-c29ae57300e0
2017-02-25 08:15:20 +00:00
hendricks266
2b8fb9bfc1 Completely reorganize compat.h.
git-svn-id: https://svn.eduke32.com/eduke32@6072 1a8010ca-5511-0410-912e-c29ae57300e0
2017-02-25 08:15:16 +00:00
hendricks266
3f5dbe17f2 Eliminate the windows_inc.h include from compat.h by special-casing UNREFERENCED_PARAMETER in a different way.
git-svn-id: https://svn.eduke32.com/eduke32@6071 1a8010ca-5511-0410-912e-c29ae57300e0
2017-02-25 08:15:13 +00:00
hendricks266
ee4d69093c Remove #define compat_h_macrodef__ and its absent case, which was only ever used for an old JFDuke3D port to PalmOS.
If for some reason you need to target a platform that lacks a libc, you're better off finding a libc, or putting together your own shim layer. It's a weekend project at most.

git-svn-id: https://svn.eduke32.com/eduke32@6070 1a8010ca-5511-0410-912e-c29ae57300e0
2017-02-25 08:15:10 +00:00
hendricks266
6d7191b848 windows_inc.h in two more places
git-svn-id: https://svn.eduke32.com/eduke32@6069 1a8010ca-5511-0410-912e-c29ae57300e0
2017-02-25 08:15:01 +00:00
hendricks266
26e740c0b7 Eliminate many cases of duplication of compat.h's functionality.
git-svn-id: https://svn.eduke32.com/eduke32@6067 1a8010ca-5511-0410-912e-c29ae57300e0
2017-02-19 22:15:56 +00:00
hendricks266
225be10f61 Define NOMINMAX in windows_inc.h.
git-svn-id: https://svn.eduke32.com/eduke32@6066 1a8010ca-5511-0410-912e-c29ae57300e0
2017-02-19 22:15:50 +00:00
hendricks266
d4ee6d00c8 Route inclusion of all Windows headers through a new header, windows_inc.h.
This allows us to make certain guarantees about limits on the extent of namespace pollution these headers introduce.

git-svn-id: https://svn.eduke32.com/eduke32@6065 1a8010ca-5511-0410-912e-c29ae57300e0
2017-02-19 22:15:44 +00:00
hendricks266
79279780a5 More of the previous commit, because VS can be frustrating.
git-svn-id: https://svn.eduke32.com/eduke32@6064 1a8010ca-5511-0410-912e-c29ae57300e0
2017-02-19 22:15:32 +00:00
hendricks266
1aaf246527 Limit what startwin.game.cpp needs to include.
git-svn-id: https://svn.eduke32.com/eduke32@6063 1a8010ca-5511-0410-912e-c29ae57300e0
2017-02-19 22:15:29 +00:00
hendricks266
3faa84f6d4 Remove dead code for selecting sound settings from the Windows startup window.
git-svn-id: https://svn.eduke32.com/eduke32@6062 1a8010ca-5511-0410-912e-c29ae57300e0
2017-02-19 22:15:23 +00:00
hendricks266
d43fb548cf Abolish all " ={ " when assigning a struct. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@6061 1a8010ca-5511-0410-912e-c29ae57300e0
2017-02-05 20:58:33 +00:00
hendricks266
417b047cf3 Bring the previous commit into effect.
git-svn-id: https://svn.eduke32.com/eduke32@6056 1a8010ca-5511-0410-912e-c29ae57300e0
2017-02-01 10:20:54 +00:00
hendricks266
1cc9d13ccf The great repository rearrangement of 2017.
Files moved but not modified. Changes to follow in a subsequent commit.

You down with CPP?

git-svn-id: https://svn.eduke32.com/eduke32@6055 1a8010ca-5511-0410-912e-c29ae57300e0
2017-02-01 10:01:11 +00:00