Monster Iestyn
b749d97bf2
More optimising and otherwise fixing bizarre formatting in hw_trick.c
2018-10-27 18:58:05 +01:00
Monster Iestyn
9b60200cc4
Moved my added slope checks in hw_trick.c to isCeilingFloating/isFloorFloating
...
I also optimised those two functions while I was there (why keep a "floating" variable when setting it to false guarantees the functions return false?)
2018-10-27 18:57:28 +01:00
Monster Iestyn
b07d8283e6
gr_correcttricks fix: don't check if top/bottom textures are missing for sloped sectors, just ignore and cancel the hack
...
This fixes GFZ2's mysterious flying flats at the ramp to the big room
2018-10-27 18:56:38 +01:00
Monster Iestyn
ef230df2c6
Ensure file is closed whenever MD2 reading errors happen
2018-10-27 18:53:38 +01:00
Monster Iestyn
2eb531cf20
Add MD2_INDENT and MD2_VERSION so we can cleanly check that it's a valid MD2 from magic number/version
2018-10-27 18:53:18 +01:00
Monster Iestyn
7a43272e13
Call V_DoPostProcessor only in software mode (it cancels itself in OGL anyway)
2018-10-27 18:52:34 +01:00
Monster Iestyn
993f6b1725
don't bother with inlining the function, on second thoughts
2018-10-27 16:47:56 +01:00
Monster Iestyn
c965964f9a
static the buffer, forgot to do this earlier
2018-10-27 16:27:00 +01:00
Monster Iestyn
69b7699b2f
Use temporary buffer with a max size of 255 bytes instead of having Microsoft's FormatMessageA alloc one for us. Also, provide a fallback message in case no message was available for some reason
2018-10-27 16:09:14 +01:00
Monster Iestyn
ec708dcf13
Save the result of errno (aka WSAGetLastError() for WinSock) as soon as possible, to prevent anything in SOCK_GetNodeAddress resetting the value to 0 while trying to print the message for the error itself!
2018-10-27 15:49:04 +01:00
Monster Iestyn
1d40033de6
Creating a quick get_WSAErrorStr function to act as a wrapper for FormatMessageA so we can string-ify Winsock errors properly
...
Untested!
2018-10-27 15:36:15 +01:00
Monster Iestyn
cf0c450536
Merge branch 'mapheader-lua-unarchive-hotfix' into 'master'
...
mapheader lua unarchive hotfix
See merge request STJr/SRB2!302
2018-10-21 10:37:17 -04:00
Monster Iestyn
d55b4ea3dd
Fix unarchiving of mapheader_t userdata Lua variables
2018-10-21 15:15:54 +01:00
Steel Titanium
bcd8b6fcf2
Merge branch 'public-music-cleanup-st' into 'music-clean'
...
Apply music code cleanup changes
See merge request SteelTitanium/SRB2!1
2018-10-20 14:12:58 -04:00
Steel Titanium
0980e9b4b1
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into music-clean
2018-10-20 14:00:12 -04:00
Monster Iestyn
86032b308e
Merge branch 'public-music-cleanup' into 'master'
...
Music Code Cleanup
See merge request STJr/SRB2!278
2018-10-20 09:12:09 -04:00
mazmazz
82e60f806e
Merge remote-tracking branch 'steeltitanium/music-clean' into test-public-music-cleanup
2018-10-19 23:56:56 -04:00
mazmazz
bf93dace76
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
2018-10-19 22:04:26 -04:00
Monster Iestyn
acdd303b46
Merge branch 'sound-handle-fix' into 'master'
...
Handle fix for SDL Mixer
See merge request STJr/SRB2!301
2018-10-14 15:46:25 -04:00
Monster Iestyn
8cb5bfe356
Merge branch 'pris_accurate-gif-delay' into 'master'
...
More accurate GIF delay
See merge request STJr/SRB2!276
2018-10-14 15:44:33 -04:00
Monster Iestyn
008bb9accc
Merge branch 'mi-a-bit-of-cleanup-backport' into 'master'
...
MI's unimportant code cleanup
See merge request STJr/SRB2!295
2018-10-14 15:43:32 -04:00
Sryder
394075fbe9
Fix missing commas and missed interface
2018-10-14 10:14:07 +01:00
Sryder
4132b39b9a
Add an int to I_PlaySound to tell an interface which channel number SRB2 is using.
...
I've voided this out on other sound interfaces than SDL Mixer ones because I'm both not sure whether they need it, and not sure how to make them work with it if they do.
2018-10-13 23:01:11 +01:00
Monster Iestyn
2eb8613937
Do lightlist height stepping *after* the heights are used by the FOF rendering code, not before (yes, I caught that they remove a heightstep beforehand for FOFs, but that wasn't done for midtextures it seems?)
...
Additionally add some macros for repeated slope end assignments and overflow tests
2018-10-13 18:57:40 +01:00
Monster Iestyn
21d733a18f
Move shared code here instead of duplicating it for both dc_numlights and non-dc_numlights rendering code
...
Also added a few comments, and include the out of range check in the "shared code" above
2018-10-13 15:37:11 +01:00
Steel Titanium
7428fb991c
Remove the condition in restartaudio command.
...
No longer needed as S_RegisterSoundStuff will return early if in
dedicated mode.
2018-10-11 20:11:37 -04:00
Steel Titanium
9b8b5ea57c
Move commands and console variable into s_sound.c
2018-10-11 16:29:43 -04:00
Monster Iestyn
34728b3031
Remove "playerdeadview" variable; it's not been used for its stated purpose for who knows how long now
...
Besides rankings popping up when you die just sounds weird anyway, maybe I'm just used to SRB2 not doing it I guess
2018-10-11 20:00:45 +01:00
Monster Iestyn
a8e9805c06
Remove unused ObjectPlace_OnChange prototype (from when Objectplace was a consvar, which it is not anymore)
2018-10-11 20:00:34 +01:00
Monster Iestyn
5ab6eb8bd7
Remove unused "runcount" variable from p_local.h
2018-10-11 20:00:23 +01:00
Monster Iestyn
adc9d3b1ec
"t" is not needed to take out fencepost cases from viewangletox
2018-10-11 20:00:05 +01:00
Monster Iestyn
bae8dd2e99
Removed unused function prototypes in d_main.h
...
Also corrected what appears to be a typo in some comments above?
2018-10-11 19:59:47 +01:00
Monster Iestyn
6fb3dcb52f
Remove unused sscount variable
...
(it's only set to 0 in software, and only ++'d in OpenGL, what kind of sense does that make?)
2018-10-11 19:59:26 +01:00
Monster Iestyn
41fbdce21e
debugfile is only used by DEBUGFILE code, no need to declare/define it for anything else
2018-10-11 19:59:09 +01:00
Monster Iestyn
6ba97b03a6
These convar externs aren't moving files, I'm just shifting them up to live with their relatives
2018-10-11 19:39:28 +01:00
Monster Iestyn
40c0e554e5
Move analog consvars to g_game.h
2018-10-11 19:39:11 +01:00
Monster Iestyn
277fd8daa8
Moved screenshot/movie consvar externs to m_misc.h
2018-10-11 19:38:11 +01:00
Monster Iestyn
865da5f351
cv_controlperkey probably belongs in g_input.h too
2018-10-11 19:37:48 +01:00
Monster Iestyn
940b393aae
Moved most of d_netcmd.h's 2P mouse consvar externs to the files with their 1P counterparts
2018-10-11 19:37:24 +01:00
Monster Iestyn
7681a15f59
Change when and specifically what colormap[] is applied to in R_Draw2sMultiPatchTranslucentColumn_8
2018-10-11 17:05:23 +01:00
Monster Iestyn
fc90876a0e
Add R_Draw2sMultiPatchTranslucentColumn_8, for columns of multi-patch textures used as midtextures on two-sided linedefs with both transparency AND translucency
...
...that was a mouthful
2018-10-11 17:05:13 +01:00
Monster Iestyn
9914353758
Merge branch 'tiny-joystick-fix' into 'master'
...
Tiny fix so that joystick2 being closed can let the JoystickSubSystem close before game close.
See merge request STJr/SRB2!292
2018-10-09 15:19:41 -04:00
Sryder
a7ba0b958a
Tiny fix so that joystick2 being closed can let the JoystickSubSystem close before game close.
...
No memory leak here, just a very tiny thing I noticed.
2018-10-09 19:43:18 +01:00
Monster Iestyn
bda6a1195b
Merge branch 'freeSOC_stoagoodhome' into 'master'
...
Free SOC_s to a good home
See merge request STJr/SRB2!291
2018-10-08 18:07:23 -04:00
toaster
d62566e3ea
* Fix a memory leak regarding implementation of SOC_ (improperly copypasted code from LUA_LoadLump!!)
...
* Optimise the repeated strlen usage into a single call, which is stored for later.
2018-10-08 18:50:17 +01:00
Monster Iestyn
19eb6ba7de
Merge branch 'drwhoandthesleepingweather' into 'master'
...
Dr. Who And The Sleeping Weather
See merge request STJr/SRB2!288
2018-10-08 09:36:18 -04:00
Monster Iestyn
049d123d1f
Merge branch 'sp-savegame-continue-crash-fix' into 'master'
...
SP savegame continues icon crash
See merge request STJr/SRB2!290
2018-10-08 09:20:45 -04:00
Monster Iestyn
12752e0a43
Merge branch 'zlib-split' into 'master'
...
Makefile: Split zlib and libpng
See merge request STJr/SRB2!285
2018-10-08 07:20:27 -04:00
Steel Titanium
0c9e8cff07
Change win_snd.c also
2018-10-07 15:00:48 -04:00
Steel Titanium
4d883e740d
Change order of the ifdef
2018-10-07 14:52:25 -04:00
