Commit graph

15905 commits

Author SHA1 Message Date
Christoph Oelckers
4a563f449d - fixed: The wbstartstruct that gets passed to the level summary screen needs to be static
This variable is needed long after the function which sets it up will be exited. So this either needs to be dynamically allocated or static, and in this case using a static variable is simpler.  However, unlike before, it is only being accessed in the one function that needs to initialize it and pass to the summary screen and nowhere else.

# Conflicts:
#	src/g_level.cpp
2019-08-06 17:13:30 +02:00
Christoph Oelckers
2b51e8d5dd - allow the language table to supersede the title patches, if appropriate
For the Doom IWADs the provided font looks almost identical to the characters used on the title patches. So, for any level name that got replaced in some language, it will now check if the retrieved name comes from the default table, and if not, ignore the title patch and print the name with the specified font.

This also required removing the 'en' label from the default table,  because with this present, the text would always be picked from 'en' instead of 'default'. Since 'en' and 'default' had the same contents, in any English locale the 'default' table was never hit, so this won't make any difference for the texts being chosen.

Last but not least, wminfo has been made a local variable in G_DoCompleted. There were two places where this was accessed from outside the summary screen or its setup code, and both were incorrect.

# Conflicts:
#	src/g_hub.cpp
#	src/g_level.cpp
#	src/gamedata/g_mapinfo.h
#	src/gi.h
#	src/p_setup.cpp
#	src/stringtable.cpp
#	src/stringtable.h
#	wadsrc/static/zscript/ui/statscreen/statscreen.zs
#	wadsrc_extra/static/iwadinfo.txt

# Conflicts:
#	src/gi.h
#	wadsrc_extra/static/iwadinfo.txt
2019-08-06 17:13:21 +02:00
drfrag
2172b1bd63 - Changed GAMEINFO flags to an enum. 2019-08-06 17:08:33 +02:00
Blue Shadow
b9a9e3f8b7 - moved GetSaveAmount() from the base armor class 2019-08-05 13:29:02 +02:00
Blue Shadow
80c561a056 - fixed buggy ArmorFactor behavior when set to a value other than 1.0 2019-08-05 13:29:01 +02:00
Christoph Oelckers
070dde2e2b - made adjustments to the text placement on the summary screen.
With extended fonts much of the old code did not work anymore, this needed more precise checks for the sources of the printed texts.

Without the adjustments, just added GetMaxAscender for compatibility. (drfrag)

# Conflicts:
#	src/gamedata/fonts/font.cpp
#	src/scripting/vmthunks.cpp
#	wadsrc/static/zscript/ui/statscreen/statscreen.zs
2019-08-05 13:28:43 +02:00
drfrag
31b823a796 - Tweaked 1K Deaths. 2019-08-05 12:56:35 +02:00
drfrag
dadbc828dc - Take quicksave slots into account for the new savegame list order. 2019-07-29 20:12:04 +02:00
drfrag
a62c7fc31c - Missing strings. 2019-07-29 18:54:45 +02:00
Kevin Hutchins
ac238545fd Adds option to use a rotation of quicksaves instead of having one quicksave slot that needs to be manually created. 2019-07-29 18:54:43 +02:00
alexey.lysiuk
d5e6453120 - updated bzip2 to version 1.0.8
https://www.sourceware.org/bzip2/
https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
2019-07-29 18:54:25 +02:00
drfrag
865d1581dd - Extended the fake generic font support for the dialogue system. 2019-07-27 12:56:32 +02:00
Christoph Oelckers
6a647afff1 - changed subtitle duration to last at least 7 seconds, even for shorter sounds so that there is sufficient time to read them. 2019-07-26 21:59:46 +02:00
alexey.lysiuk
c7516a0fc5 - added ability to specify display duration of subtitles
Duration of sound playback and subtitles display will be synchronized if sound id is specified
For existing Strife messages this works out of the box

https://forum.zdoom.org/viewtopic.php?t=65379
2019-07-26 21:59:43 +02:00
Christoph Oelckers
768959af45 - fixed: The numcommands value in A_KoraxCommand needs to be decremented by one because the max parameter of the random function is inclusive. 2019-07-26 14:15:57 +02:00
drfrag
1f54466e33 - Fixed fuzz style fallback not working in GL legacy mode.
- Changed default since software style was too expensive on old cards.
2019-07-26 14:08:18 +02:00
Christoph Oelckers
c31b4f0b9b - fixed line breaking on non-spaces for multi-byte UTF-8 characters.
This needs to backtrack the entire code point, not just one byte.

# Conflicts:
#	src/gamedata/fonts/v_text.cpp
2019-07-25 00:06:14 +02:00
Major Cooke
7f5a2d3a11 Added A_SoundPitch and an optional pitch parameter to A_PlaySound and S_Sound.
- Note: Because sound channels are not in zscript, there's no way to modify a sound made by S_Sound.

# Conflicts:
#	src/s_sound.cpp
#	wadsrc/static/zscript/base.zs
2019-07-25 00:06:12 +02:00
alexey.lysiuk
4f56ab45ad - fixed crash on player unmorph after falling death
Rearranged conditions to avoid accessing player from obsolete morphed pawn
Unmorphing upon death resets player in morphed actor, so player alive state should be tested first
Removed duplicate health check as well

https://forum.zdoom.org/viewtopic.php?t=65429
2019-07-25 00:06:08 +02:00
drfrag
77c5ec0e23 - New version. 2019-07-19 13:30:41 +02:00
drfrag
f84ad33134 - Moved a graphic and changed its format to 32 bit PNG. 2019-07-18 17:48:45 +02:00
Christoph Oelckers
136e828de9 - use proper interface calls to give the initial BasicArmor to the player.
The old code didn't check if giving the item was proper and just went ahead adding it to the inventory unconditionally.
2019-07-18 14:30:09 +02:00
alexey.lysiuk
f38c83f96c - added PSprite.bMirror flag to ZScript class definition
https://forum.zdoom.org/viewtopic.php?t=65372
2019-07-18 14:30:05 +02:00
Christoph Oelckers
6999c89cbb - moved several IWAD dependent files into the game_support resource
* sprite offset definitions, which are IWAD dependent
* Freedoom's decal overrides
* conversation ID definitions for the Strife teasers
* the fallback BigFont now can also be loaded by IWADs which declare themselves as GAME_Heretic or GAME_Hexen.

# Conflicts:
#	src/gamedata/fonts/v_font.cpp
2019-07-18 14:28:40 +02:00
Christoph Oelckers
1d8f735a27 - renamed zd_extra.pk3 to game_support.pk3
# Conflicts:
#	src/version.h
2019-07-18 14:28:35 +02:00
Rachael Alexanderson
264f1d875f - add +ZDOOMTRANS to BFGExtra in order to force classic transparency per user setting. 2019-07-18 13:57:59 +02:00
Christoph Oelckers
cf88ecf36a - remove test code. 2019-07-18 13:53:24 +02:00
Christoph Oelckers
7757798d22 - moved iwadinfo.txt to zd_extra.pk3.
This was done for two reasons:

1. It forces loading of zd_extra.pk3 for the stock IWADs, eliminating a certain kind of user error.
2. It removes the stock IWAD definitions for custom games that distribute the engine along with their data, so that it doesn't pick up on Steam and GOG installations and shows an inappropriate IWAD picker.
2019-07-18 13:53:20 +02:00
Christoph Oelckers
2114641cef - dynamic light definitions for Hacx. 2019-07-18 13:51:33 +02:00
Christoph Oelckers
e51f9a6c13 - allow setting the font used for the status screen's content text.
But only works partially for Raven games (hacked). (drfrag)

# Conflicts:
#	src/gi.cpp
#	wadsrc/static/mapinfo/chex.txt
#	wadsrc/static/mapinfo/doomcommon.txt
#	wadsrc/static/mapinfo/heretic.txt
#	wadsrc/static/mapinfo/hexen.txt
#	wadsrc/static/mapinfo/mindefaults.txt
#	wadsrc/static/mapinfo/strife.txt
#	wadsrc/static/zscript/ui/statscreen/statscreen_sp.zs
#	wadsrc_hacxextra/static/zmapinfo.txt
2019-07-18 13:22:44 +02:00
drfrag
f9759dc894 - Some missing strings. 2019-07-18 13:08:15 +02:00
alexey.lysiuk
2b3d0467e7 - fixed: subtitles background renains visible on new game
https://forum.zdoom.org/viewtopic.php?t=65366

# Conflicts:
#	src/g_statusbar/shared_sbar.cpp
2019-07-18 12:35:01 +02:00
Christoph Oelckers
fd3c760244 - fixed: The countdown for the subtitles display was never counted down so the messages remained forever. 2019-07-18 12:34:36 +02:00
Christoph Oelckers
65a054ba88 - implemented subtitle display for Blackbird's voiceover messages.
# Conflicts:
#	src/g_statusbar/shared_sbar.cpp
2019-07-18 12:33:48 +02:00
drfrag
a87d8ef7e2 - Missing strings. 2019-07-18 12:32:36 +02:00
drfrag
b92ceac25f - Fixed compilation.
# Conflicts:
#	src/c_console.cpp
2019-07-18 12:32:33 +02:00
Christoph Oelckers
1fb5361a82 - implemented subtitles for intermission slideshows.
# Conflicts:
#	src/d_main.cpp
#	wadsrc/static/language.csv
2019-07-18 12:30:19 +02:00
drfrag
0beb8b85bd - Changed default keybindings for Strife. 2019-07-18 00:47:26 +02:00
drfrag
74d8fa8a28 - added printlocalized CCMD to check strings in-game.
(patch by Graf)
2019-07-18 00:10:25 +02:00
Rachael Alexanderson
c992604b7f - set language cvar to global config, it should not be game-specific
# Conflicts:
#	src/g_cvars.cpp
2019-07-18 00:10:23 +02:00
alexey.lysiuk
fa7dae2676 - fixed compilation error with GCC and Clang
src/intermission/intermission_parse.cpp:941:2: error: no matching function for call to 'F_StartFinale'
2019-07-18 00:10:18 +02:00
Christoph Oelckers
b6799e7843 - added a 'testfinale' CCMD, so that the layout of finale texts can be tested more easily
# Conflicts:
#	src/gamedata/stringtable.cpp
#	src/gamedata/stringtable.h

# Conflicts:
#	src/intermission/intermission_parse.cpp
2019-07-18 00:10:14 +02:00
drfrag
ef1047db20 - Changes to the language table.
(patch by Graf)
2019-07-18 00:04:31 +02:00
drfrag
02ee44772c - fake VGA font support to the MessageBoxMenu class 2019-07-17 23:58:12 +02:00
drfrag
8c941ba1cf - A few more missing things for compatibility.
# Conflicts:
#	wadsrc/static/language.enu
2019-07-17 23:58:09 +02:00
drfrag
b702a5a514 - fake generic font support for the dialogue system. 2019-07-17 23:49:47 +02:00
alexey.lysiuk
cedc5a9702 - fixed UMAPINFO episode parsing
* bounds checking for accessing episode tokens
* support empty tokens in episode definition
* handle upper cased episode shortcut

https://forum.zdoom.org/viewtopic.php?t=65364

# Conflicts:
#	src/gamedata/umapinfo.cpp
2019-07-17 18:15:09 +02:00
alexey.lysiuk
95f0f7eadd - cleaned up language detection leftovers
# Conflicts:
#	src/posix/sdl/i_system.cpp
2019-07-17 18:14:53 +02:00
Christoph Oelckers
9c25d75f65 - removed a few obsolete definitions from basictypes.h
# Conflicts:
#	src/win32/i_specialpaths.cpp
2019-07-17 17:54:30 +02:00
Christoph Oelckers
1697e6ff3a - eliminated dependency of CVar code on AActor.
As a low level feature, the CVAR management should not access game structures like actors, just to retrieve a player index. The index should be calculated by the calling code instead and passed into the function.

# Conflicts:
#	src/win32/i_specialpaths.cpp

# Conflicts:
#	src/p_acs.cpp
2019-07-17 17:54:28 +02:00