mazmazz
50c5cfaba5
Split colormap netsync to Load/SaveExtraColormap methods
2018-09-11 22:44:31 -04:00
mazmazz
8e4d87a739
Add R_CheckEqualColormaps comparison method
2018-09-11 22:43:12 -04:00
mazmazz
86e619e1bf
R_AddColormaps method
2018-09-11 21:03:55 -04:00
mazmazz
41735f1da8
Extra macros R_GetRgbaRGB; R_PutRgbaR/G/B/A/RGB/RGBA
2018-09-11 17:30:43 -04:00
mazmazz
9869e13eda
Don't set sector's extra_colormap if we just made a default clone
...
* Allow colormap parsing to proceed in p_setup always
* Add R_CheckDefaultColormap
* Add R_GetRgbaR/G/B/A macros
2018-09-11 17:08:57 -04:00
mazmazz
cf271e33dd
Ifdef typo
2018-09-11 15:59:56 -04:00
mazmazz
186a75b7d3
Consolidate colormap matching into R_GetColormapFromList
2018-09-11 15:56:21 -04:00
mazmazz
14d7057bf9
Add R_CopyColormap
2018-09-11 15:20:30 -04:00
mazmazz
73db00488c
Merge branch 'master' into colormap-overhaul
2018-09-11 15:02:35 -04:00
mazmazz
7da83e13f0
Smarter string digit parsing; allow alpha-only values
...
* GetDefaultColormap and CheckDefaultColormapValues methods
2018-09-11 15:01:05 -04:00
mazmazz
a22f660bc8
Clear colormaps properly (resolve sigsegv crash)
2018-09-11 13:46:34 -04:00
mazmazz
2cac83d5e9
Initialize extra_colormaps to NULL on program start
2018-09-11 13:31:09 -04:00
mazmazz
029d47376b
Remove cr/cg/cb/ca in favor of rgba * Change default colormap values to be in sync with rgba/fadergba
2018-09-11 13:27:04 -04:00
Monster Iestyn
78130e830e
Merge branch 'public_next'
...
# Conflicts:
# src/p_setup.c
# src/r_data.c
2018-09-11 16:41:27 +01:00
Monster Iestyn
d8f73b0d97
Merge branch 'master' into next
2018-09-11 16:34:16 +01:00
Monster Iestyn
bf6379c3df
Merge branch 'colormap-code-cleanup' into 'master'
...
Colormap code cleanup
See merge request STJr/SRB2!275
2018-09-11 11:31:56 -04:00
mazmazz
bbab5fc735
Add COLORMAPREVERSELIST ifdef to toggle Newest -> Oldest extra_colormaps order
2018-09-10 22:37:27 -04:00
mazmazz
a4052d96b0
Make default extracolormap on init
...
* Calc fadedist in R_CreateLightTable
2018-09-10 21:56:57 -04:00
mazmazz
7000d27175
Savegame fixes
2018-09-10 21:15:34 -04:00
mazmazz
96b07962fd
Fixed colormap matching code again * Added debug messages for matching code
2018-09-10 20:56:59 -04:00
mazmazz
c3fafd18be
Remove MAXCOLORMAPS
2018-09-10 20:41:12 -04:00
mazmazz
c1d1f08ea6
extracolormap_t refinement and netsyncing
...
* Store raw values per rgba in extracolormap_t (no maskcolor or fadecolor)
* Crunched some UINT16/32 into UINT8
* Calculate mask values in R_CreateLightTable
* ifdef out EXTRACOLORMAPLUMPS
2018-09-10 20:36:34 -04:00
mazmazz
78f984e362
Remove bottommap and topmap from savegame because unused
2018-09-10 16:50:35 -04:00
mazmazz
27a8309ea4
Savegame netsync for sector colormaps; add spawn_midmap and co for comparison
2018-09-10 16:50:27 -04:00
mazmazz
102467489e
Fix shared colormap matching
2018-09-10 16:42:07 -04:00
mazmazz
c767436629
Type 606 renderer check allow OGL again
2018-09-10 16:32:54 -04:00
mazmazz
0344ca70ba
Compiler fixes
2018-09-10 16:28:39 -04:00
mazmazz
d8056b1fea
Get rid of bottommap, midmap, topmap
2018-09-10 16:16:04 -04:00
mazmazz
5f03a9b1a9
P_LoadRawSideDefs2 colormap cleanup (merge ogl and software to one block)
2018-09-10 16:08:43 -04:00
mazmazz
15aded0882
Colormap overhaul in r_data.c
...
* Split R_CreateColormap to R_CreateLightTable
* Replace extra_colormaps array with next/prev pointer chain
* Remove foundcolormaps; instead store lumpnum in extracolormap_t
* Add properties to extracolormap_t for portability
2018-09-10 15:59:31 -04:00
mazmazz
e3fd7eee79
Merge remote-tracking branch 'public-gitlab/colormap-code-cleanup' into colormap-cleanup
2018-09-10 13:24:57 -04:00
Monster Iestyn
22b799a655
Remove commented out stuff, now I've confirmed everything works fine without them
2018-09-10 15:49:21 +01:00
Monster Iestyn
a5ba47cb3a
R_CreateColormap2 and R_MakeColormaps have been made obsolete, it's just R_CreateColormap now, like it used to be!
...
With that, I moved R_CreateColormap2's exclusive software colormap malloc code to R_CreateColormap, and merged the two software-only blocks of code into one. I also disabled any unneeded variables and fixed a preprocessor-related goofup
2018-09-09 22:48:09 +01:00
Monster Iestyn
ae6085ef1a
Merge branch 'netcode-nitpicking' into 'next'
...
Netcode nitpicking
See merge request STJr/SRB2!274
2018-09-07 15:59:49 -04:00
Digiku
8d015bd7cc
Merge branch 'flicky-things' into 'master'
...
Flicky Thing Types
See merge request STJr/SRB2Internal!154
2018-09-06 16:02:19 -04:00
mazmazz
fbd6b2c826
Flicky colors indexing fix
2018-09-06 13:20:55 -04:00
mazmazz
a430d133b4
Compiler errors
2018-09-06 13:16:50 -04:00
mazmazz
4dcf3835e3
Stray comments
2018-09-06 12:13:03 -04:00
mazmazz
7f404345f0
Make default flicky home radius 384
2018-09-06 11:59:55 -04:00
mazmazz
fd037fe763
Limit random fish color to SRB2's defaults
2018-09-06 11:56:55 -04:00
mazmazz
2b93a38f8e
Change default radius to 448
...
* Put default radius back in FLICKY_CENTER states
2018-09-06 11:54:06 -04:00
mazmazz
7b3c4aee33
Impose home radius on aimless flickies; improve randomness of flickyhitwall angle
2018-09-06 11:17:08 -04:00
mazmazz
04a59aacc4
Only allow flicky bounce (MF_NOCLIPTHING) if also in-place (MF_GRENADEBOUNCE)
2018-09-06 10:32:26 -04:00
mazmazz
c61cbcdf22
Erase default home radius from states and impose default on home check
2018-09-06 10:20:01 -04:00
mazmazz
fe508088b2
Re-organize flags for FLICKY_CENTER
...
* Flickies can be in-place with just one flag (MF_GRENADEBOUNCE)
* Flickies can now hop whether orbiting, aimless, or in-place
* Removed ability to customize movedir for orbit; will always be random
* Removed ability to customize gravity sink for aimless flying flickies
* Misc: Use P_SetTarget to set actor->tracer for flicky center
2018-09-06 10:17:41 -04:00
mazmazz
2d86dddb00
Merge branch 'master' into flicky-things
2018-09-06 08:09:02 -04:00
mazmazz
0ff48976b1
Impose default radius for orbiting flickies
2018-09-06 08:08:53 -04:00
mazmazz
9ef7c09d89
Make default behavior: aimless flying flickies stay at Z height
2018-09-06 08:07:13 -04:00
mazmazz
6426d88141
Store extravalue1 (home radius) immediately in A_FlickyCenter, not during player look routine
2018-09-06 07:55:15 -04:00
mazmazz
a095b47980
Change flicky thing #s to 2200s
2018-09-06 07:24:46 -04:00
