Commit graph

265 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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