Commit graph

5998 commits

Author SHA1 Message Date
hendricks266
d67b3edd06 buildtypes.h: Replace the *TYPE macros with a StructName concatenation function.
git-svn-id: https://svn.eduke32.com/eduke32@5998 1a8010ca-5511-0410-912e-c29ae57300e0
2017-01-05 05:29:57 +00:00
hendricks266
b7ee7d404c Add extern "C" to screentext.h so that Lunatic can see its symbols when building as C++.
git-svn-id: https://svn.eduke32.com/eduke32@5997 1a8010ca-5511-0410-912e-c29ae57300e0
2017-01-05 05:29:54 +00:00
hendricks266
d5ab48ab6b Lunatic: Fix build, part 13. Disable inaccurate assertion.
git-svn-id: https://svn.eduke32.com/eduke32@5996 1a8010ca-5511-0410-912e-c29ae57300e0
2017-01-05 05:29:51 +00:00
hendricks266
dc10cd210b Lunatic: Fix build, part 12. playerswhenstarted --> g_mostConcurrentPlayers
git-svn-id: https://svn.eduke32.com/eduke32@5995 1a8010ca-5511-0410-912e-c29ae57300e0
2017-01-05 05:29:47 +00:00
hendricks266
21ac609dd9 Lunatic: Fix build, part 11. g_spriteDeleteQueueSize --> g_deleteQueueSize
git-svn-id: https://svn.eduke32.com/eduke32@5994 1a8010ca-5511-0410-912e-c29ae57300e0
2017-01-05 05:29:44 +00:00
hendricks266
d267ae71de Lunatic: Fix build, part 10. g_currentFrameRate --> g_frameRate
git-svn-id: https://svn.eduke32.com/eduke32@5993 1a8010ca-5511-0410-912e-c29ae57300e0
2017-01-05 05:29:40 +00:00
hendricks266
ca3449bd52 Lunatic: Fix build, part 9. ScriptQuotes --> apStrings
git-svn-id: https://svn.eduke32.com/eduke32@5992 1a8010ca-5511-0410-912e-c29ae57300e0
2017-01-05 05:29:37 +00:00
hendricks266
e036de108d Lunatic: Fix build, part 8. MapInfo --> g_mapInfo
git-svn-id: https://svn.eduke32.com/eduke32@5991 1a8010ca-5511-0410-912e-c29ae57300e0
2017-01-05 05:29:33 +00:00
hendricks266
9f41addab0 Lunatic: Fix build, part 7. M_ChangeMenu --> Menu_Change
git-svn-id: https://svn.eduke32.com/eduke32@5990 1a8010ca-5511-0410-912e-c29ae57300e0
2017-01-05 05:29:29 +00:00
hendricks266
aa89d88569 Add S_StopAllSounds function, guaranteed to be present at link time, whether stubbed (for KenBuild's editor) or calling audiolib's FX_StopAllSounds (for Lunatic).
Also, m32exec should not directly touch audiolib. Only sounds_mapster32.c should interacti with it. KenBuild and its editor do not link to audiolib.

git-svn-id: https://svn.eduke32.com/eduke32@5989 1a8010ca-5511-0410-912e-c29ae57300e0
2017-01-05 05:29:25 +00:00
hendricks266
22f73a9ab5 Lunatic: Fix build, part 5. EpisodeNames --> g_volumeNames
git-svn-id: https://svn.eduke32.com/eduke32@5988 1a8010ca-5511-0410-912e-c29ae57300e0
2017-01-05 05:29:20 +00:00
hendricks266
dcc542c6fc Lunatic: Fix build, part 4. BlimpSpawnSprites --> g_blimpSpawnItems
git-svn-id: https://svn.eduke32.com/eduke32@5987 1a8010ca-5511-0410-912e-c29ae57300e0
2017-01-05 05:29:17 +00:00
hendricks266
7167706837 Lunatic: Fix build, part 3. P_SetWeaponGamevars should be static inline when placed in a header included from multiple objects.
git-svn-id: https://svn.eduke32.com/eduke32@5986 1a8010ca-5511-0410-912e-c29ae57300e0
2017-01-05 05:29:14 +00:00
hendricks266
e9ac1401c3 Lunatic: Fix build, part 2. clip.h needs to know about usectortype and uwalltype.
git-svn-id: https://svn.eduke32.com/eduke32@5985 1a8010ca-5511-0410-912e-c29ae57300e0
2017-01-05 05:29:11 +00:00
hendricks266
7c76b0fc42 Lunatic, KenBuild, SW: window([xy])([12]) --> windowxy$2.$1
git-svn-id: https://svn.eduke32.com/eduke32@5984 1a8010ca-5511-0410-912e-c29ae57300e0
2017-01-05 05:29:06 +00:00
hendricks266
3f15f87dc2 Remove $(ARCH) from COMMONFLAGS, except under Darwin. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@5983 1a8010ca-5511-0410-912e-c29ae57300e0
2017-01-01 17:44:56 +00:00
hendricks266
9af63dc497 Fix warning: enumeral and non-enumeral type in conditional expression [-Wextra]
DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@5982 1a8010ca-5511-0410-912e-c29ae57300e0
2017-01-01 13:23:41 +00:00
hendricks266
533c017e93 sdlayer: Explicitly name our entry point SDL_main on Wii.
git-svn-id: https://svn.eduke32.com/eduke32@5981 1a8010ca-5511-0410-912e-c29ae57300e0
2017-01-01 13:23:38 +00:00
hendricks266
fa37e062b1 Fix some int/int32_t confusion where linking to external libraries is concerned, at least as exposed by building with devkitPPC r28.
git-svn-id: https://svn.eduke32.com/eduke32@5980 1a8010ca-5511-0410-912e-c29ae57300e0
2017-01-01 13:23:35 +00:00
hendricks266
0a14982d4e Some recent cleanup changed uses of int32_t to int, but missed changing every function prototype. This is very bad when int != int32_t.
git-svn-id: https://svn.eduke32.com/eduke32@5979 1a8010ca-5511-0410-912e-c29ae57300e0
2017-01-01 13:23:29 +00:00
hendricks266
c90ef554be Make SDL_config_wii.h #include <stdint.h> instead of defining its own types, because devkitPPC r28 changed the definitions and/or added an error for when they conflict.
git-svn-id: https://svn.eduke32.com/eduke32@5978 1a8010ca-5511-0410-912e-c29ae57300e0
2017-01-01 13:23:23 +00:00
hendricks266
59a75539e0 Adjust wiibuild.bat to not use MinGW or MSYS paths.
git-svn-id: https://svn.eduke32.com/eduke32@5977 1a8010ca-5511-0410-912e-c29ae57300e0
2017-01-01 13:23:18 +00:00
hendricks266
b107d3e0de sdlayer: Clean up wm_msgbox and wm_ynbox and fix them under GTK. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@5976 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-29 02:57:33 +00:00
hendricks266
346f391d4a Mac: 32-bit builds give trouble with the supposed equivalence of CGRect/Size and NSRect/Size. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@5975 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 20:02:51 +00:00
hendricks266
66f353fbf5 Extend SE 26 to use the value provided by a GPSPEED, if any.
git-svn-id: https://svn.eduke32.com/eduke32@5974 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:03:00 +00:00
hendricks266
9627f24d54 CON: Remove bounds check on rotatesprite coordinates.
git-svn-id: https://svn.eduke32.com/eduke32@5973 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:02:56 +00:00
hendricks266
0b75ca3ec1 Windows: Perform keyboard layout switching whenever window focus is gained or lost.
git-svn-id: https://svn.eduke32.com/eduke32@5972 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:02:53 +00:00
hendricks266
fefd94d8ef Windows: Make layout switch duplicate guard bidirectional.
git-svn-id: https://svn.eduke32.com/eduke32@5971 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:02:49 +00:00
hendricks266
d0611405e9 Windows: Refactor keyboard layout switching code into winbits.c and clean it up. No functional changes.
git-svn-id: https://svn.eduke32.com/eduke32@5970 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:02:45 +00:00
hendricks266
735405ed7a sdlayer: Call SDL_StopTextInput immediately after initialization so IMEs do not interfere with gameplay keypresses.
An example of is on Mac, where holding the 'A' key caused a small overlay with accented forms of the character to appear.

git-svn-id: https://svn.eduke32.com/eduke32@5969 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:02:41 +00:00
hendricks266
be22de78ad sdlayer: Place SDL_KEYDOWN events into keyasciififo[] when SDL_TEXTINPUT events are disabled.
This way, SDL_StopTextInput() does not break text entry for code that uses keyasciififo[] but does not currently call SDL_StartTextInput(), or if it cannot, such as Duke's cheat entry.

Technically we could revert r5326 and r5331, but since we only currently have support for showing ASCII text glyphs as bitmap fonts in ART tiles, there is no point to showing an IME on platforms that don't need an on-screen keyboard.

git-svn-id: https://svn.eduke32.com/eduke32@5968 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:02:38 +00:00
hendricks266
2b38557f49 Mac: Make the startup windows responsive and actively updating while in "show message log, the program is working" mode.
git-svn-id: https://svn.eduke32.com/eduke32@5967 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:02:34 +00:00
hendricks266
d1f6dbeaea Mac: Programmatically create the primary program menu since we no longer have a nib or a modal window to do it for us.
git-svn-id: https://svn.eduke32.com/eduke32@5966 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:02:31 +00:00
hendricks266
25f2a5f457 Mac: Change the startup windows display the window normally and start a mini runloop instead of calling using runModalForWindow.
This way, the Quit function works.

git-svn-id: https://svn.eduke32.com/eduke32@5965 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:02:27 +00:00
hendricks266
dc1bbcd419 Mac: Port the startup window to entirely programmatic code. Death to nibs!
git-svn-id: https://svn.eduke32.com/eduke32@5964 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:02:22 +00:00
hendricks266
e520f74894 Mac: Remove more vestiges of SDLMain from SDL 2.0 builds.
git-svn-id: https://svn.eduke32.com/eduke32@5963 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:02:14 +00:00
hendricks266
736ed925b0 sdlayer: Disable a missed instance of sysgamma under EDUKE32_GLES, not just __ANDROID__.
git-svn-id: https://svn.eduke32.com/eduke32@5962 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:02:10 +00:00
hendricks266
2c96410b39 Address a number of harmless instances of "code never reached" identified by Xcode.
git-svn-id: https://svn.eduke32.com/eduke32@5961 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:02:06 +00:00
hendricks266
5c17259a71 Add newlines at EOF to files that need them.
git-svn-id: https://svn.eduke32.com/eduke32@5960 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:02:01 +00:00
hendricks266
a31ad532dd Fix an error introduced in cleanup of the WWII GI Devastator weapon reload animation, as pointed out by Xcode.
Also perform similar cleanup on a similar line elsewhere.

git-svn-id: https://svn.eduke32.com/eduke32@5959 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:01:57 +00:00
hendricks266
d6ace49d54 Apple: Fix Xcode build due to accumulated file additions and moves.
git-svn-id: https://svn.eduke32.com/eduke32@5958 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:01:54 +00:00
hendricks266
11864d8440 Apple: Accept Xcode's suggestions for changes to our project file.
git-svn-id: https://svn.eduke32.com/eduke32@5957 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:01:51 +00:00
hendricks266
d002849b47 Change the type of functions touching vsync setting back to int32_t. Since it is serialized to disk, an explicit size type is important.
git-svn-id: https://svn.eduke32.com/eduke32@5956 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:01:48 +00:00
hendricks266
7380202636 Fix a warning with SDL_TARGET=1 builds.
git-svn-id: https://svn.eduke32.com/eduke32@5955 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:01:44 +00:00
hendricks266
d232f2364b Fix USE_OPENGL=0 RENDERTYPE=WIN and USE_OPENGL=0 SDL_TARGET=1 builds.
git-svn-id: https://svn.eduke32.com/eduke32@5954 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:01:40 +00:00
hendricks266
158fcb5e01 Rename vsync_render and "sdl_vsync" to vsync_renderlayer. An "sdl_" prefix should be used sparingly.
git-svn-id: https://svn.eduke32.com/eduke32@5953 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:01:36 +00:00
hendricks266
e258ca51f8 Rename E_PostInitTables back to E_PostInit and move it back to where it belongs in engine.c (i.e. preinitengine, initengine, "postinitengine"). It should not have been changed.
git-svn-id: https://svn.eduke32.com/eduke32@5952 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:01:32 +00:00
hendricks266
d2934c4ba5 Win32 Startup Window: This should be tokenized.
git-svn-id: https://svn.eduke32.com/eduke32@5951 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:01:28 +00:00
hendricks266
c102a6620a Fix problems with handling of the default crosshair color.
git-svn-id: https://svn.eduke32.com/eduke32@5950 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:01:24 +00:00
hendricks266
c20e41d0c8 Restore pre-r5821 floor glass behavior: nothing.
git-svn-id: https://svn.eduke32.com/eduke32@5949 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:01:18 +00:00