claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

General cleanups.

Browse Source
This commit is contained in:
waltje
2017-05-09 22:07:39 -04:00
parent 95d201d4fd
commit 456aaec627
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/VIDEO/vid_voodoo.c
View File

@@ -2215,7 +2215,7 @@ static __inline void voodoo_tmu_fetch(voodoo_t *voodoo, voodoo_params_t *params,
#define dither2x2 (params->fbzMode & FBZ_DITHER_2x2) #define dither2x2 (params->fbzMode & FBZ_DITHER_2x2)
/*Perform texture fetch and blending for both TMUs*/ /*Perform texture fetch and blending for both TMUs*/
static __inline voodoo_tmu_fetch_and_blend(voodoo_t *voodoo, voodoo_params_t *params, voodoo_state_t *state, int x) static __inline void voodoo_tmu_fetch_and_blend(voodoo_t *voodoo, voodoo_params_t *params, voodoo_state_t *state, int x)
{ {
int r,g,b,a; int r,g,b,a;
int c_reverse, a_reverse; int c_reverse, a_reverse;

4
src/config.c
View File

@@ -795,8 +795,8 @@ void saveconfig(void)
config_set_int(NULL, "netinterface", ethif); config_set_int(NULL, "netinterface", ethif);
config_set_string(NULL, "netcard", network_card_get_internal_name(network_card_current)); config_set_string(NULL, "netcard", network_card_get_internal_name(network_card_current));
config_set_int(NULL, "maclocal", net2000_get_maclocal()); config_set_int(NULL, "maclocal", ne2000_get_maclocal());
config_set_int(NULL, "maclocal_pci", net2000_get_maclocal_pci()); config_set_int(NULL, "maclocal_pci", ne2000_get_maclocal_pci());
config_set_string(NULL, "model", model_get_internal_name()); config_set_string(NULL, "model", model_get_internal_name());
config_set_int(NULL, "cpu_manufacturer", cpu_manufacturer); config_set_int(NULL, "cpu_manufacturer", cpu_manufacturer);