Monster Iestyn
fe2af34ee5
Merge branch 'master' into next
2018-10-14 20:49:35 +01:00
Monster Iestyn
423403eab5
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
b720cb10dc
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
b2f196d418
Merge branch 'no-doubling-texture-heights-plz-backport' into 'next'
...
No doubling texture heights plz
See merge request STJr/SRB2!296
2018-10-14 15:43:57 -04:00
Monster Iestyn
cc7d9509f2
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
3886888b30
Fix missing commas and missed interface
2018-10-14 10:14:07 +01:00
Sryder
6184f91dd3
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
c1d5c711a9
Be gone ye old texture hack
2018-10-11 21:08:25 +01:00
Monster Iestyn
9c464742b7
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
ef78c942f7
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
49c5a6f7e4
Remove unused "runcount" variable from p_local.h
2018-10-11 20:00:23 +01:00
Monster Iestyn
91b2f5e570
"t" is not needed to take out fencepost cases from viewangletox
2018-10-11 20:00:05 +01:00
Monster Iestyn
07dd527e7e
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
61a29bed85
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
a4419abfdc
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
8196c59557
Merge branch 'master' into next
2018-10-09 22:55:55 +01:00
Monster Iestyn
c469fc242f
Merge branch 'movechasecamera-crashfix' into 'next'
...
Fix for Chicmunk's weird camera related crash
See merge request STJr/SRB2!284
2018-10-09 15:20:06 -04:00
Monster Iestyn
1b531ddcfe
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
497314fdc4
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
44ed8cebbb
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
1324e0bfcd
* 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
12e0222929
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
1049f3451a
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
1115f41f8e
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
027e6e8e3c
Change win_snd.c also
2018-10-07 15:00:48 -04:00
Steel Titanium
232a7ae7b7
Change order of the ifdef
2018-10-07 14:52:25 -04:00
Steel Titanium
def090c9f0
Move the ifdef
2018-10-07 14:45:03 -04:00
Monster Iestyn
a5fb2143fd
Merge branch 'fixer-mixer' into 'master'
...
Fixer mixer: Mixer Memory Leaks
See merge request STJr/SRB2!287
2018-10-07 13:10:26 -04:00
toaster
b1e02467bf
Weather is already run client-side. What if we ran it render-side, for major performance gains? This commit will answer all your questions - and more!
2018-10-07 15:00:58 +01:00
Sryder
fb6c329870
Fix the crashing bug hopefully
...
A value of 1 in freesrc for Mix_LoadWAV_RW and Mix_LoadMus_RW calls SDL_RWclose on the RWops anyway.
For Mix_LoadWAV_RW the RWops is freed right after the data is loaded (because it makes a copy of the data in memory)
For Mix_LoadMUS_RW the RWops is freed when Mix_FreeMusic is called (because the data is not a copy)
So setting 1 on freesrc doesn't actually free the RWops immediately on Mix_LoadMus_RW *unless* it failed to load any music.
2018-10-07 10:37:45 +01:00
Sryder
02597e0bf9
Fix compiler warnings.
2018-10-07 09:26:18 +01:00
Sryder
d072dd2725
I think that should be NULL, not 0 actually.
2018-10-07 00:22:23 +01:00
Sryder
7b417b573c
Mix_QuickLoad_RAW sets a flag in the Mix_Chunk so that Mix_FreeChunk doesn't actually Free the sound.
...
Checks for the flag when freeing, and if it's 0, we free the data manually after Mix_FreeChunk.
I went back to Z_Malloc and Z_Free for this because they still work after this.
2018-10-07 00:15:42 +01:00
Sryder
725a65c1f7
Call SDL_RWclose after an SDL_RWFromMem call to close the RWops.
2018-10-07 00:15:11 +01:00
Monster Iestyn
1ec601af6b
Draw a star for continues if invalid skin numbers are somehow supplied
2018-10-05 22:42:36 +01:00
Steel Titanium
b812a6a4ab
Really fix DD compiling this time.
2018-10-04 22:56:11 -04:00
Steel Titanium
fc5d969642
Fix DD compiling
2018-10-04 22:44:26 -04:00
Steel Titanium
49cb1ffe9f
Restore deleted endif
2018-10-04 22:38:59 -04:00
Steel Titanium
79f5f4885c
Split zlib and libpng
2018-10-04 19:47:19 -04:00
Alam Ed Arias
348f4dc2cd
Merge branch 'master' into next
2018-10-02 09:14:59 -04:00
Monster Iestyn
a605ee9c11
Merge branch 'linux-better-mem-report' into 'master'
...
Use MemAvailable instead
See merge request STJr/SRB2!281
2018-10-01 16:25:21 -04:00
Monster Iestyn
800b3bb240
Move player + player mobj existence checks to top of P_MoveChaseCamera. This is the only place it makes sense to even check them tbh.
...
While I'm at it, let's also use the "mo" variable instead of player->mo throughout the function (to be consistent)
2018-09-30 22:18:48 +01:00
Steel Titanium
f88708bb75
Fix the weird indentation
2018-09-21 12:05:52 -04:00
Steel Titanium
68ec811909
Rearrange the code.
...
Thanks again MonsterIestyn!
2018-09-21 11:26:08 -04:00
Steel
af58ba9ae3
Remove this that somehow slipped in.
2018-09-21 07:21:49 -04:00
Steel
be74b4e58b
Fix up errors with buildbots
2018-09-21 07:16:54 -04:00
Steel Titanium
378495cb2b
Add some stuff
2018-09-20 18:33:50 -04:00
Steel Titanium
a53f036149
Use MemAvailable instead
2018-09-20 18:30:46 -04:00
Monster Iestyn
1763087844
Merge branch 'public-var2s-fix' into 'next'
...
Level spec thinker: Netsync var2s
See merge request STJr/SRB2!280
2018-09-17 14:43:44 -04:00
mazmazz
20c4702986
Line exec trigger netsync: Save var2s in addition to vars
2018-09-17 14:13:31 -04:00
