mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Twinaphex 2020-05-21 22:31:51 +02:00
parent 4b4a8693ac
commit ede03659ca
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/gfx_widgets.c
View File

@ -1509,7 +1509,9 @@ void gfx_widgets_frame(void *data)
bool widgets_is_rewinding; bool widgets_is_rewinding;
bool runloop_is_slowmotion; bool runloop_is_slowmotion;
int top_right_x_advance; int top_right_x_advance;
int scissor_me_timbers; #ifdef HAVE_CHEEVOS
int scissor_me_timbers = 0;
#endif
if (!widgets_active) if (!widgets_active)
return; return;
@ -1528,7 +1530,6 @@ void gfx_widgets_frame(void *data)
widgets_is_rewinding = video_info->widgets_is_rewinding; widgets_is_rewinding = video_info->widgets_is_rewinding;
runloop_is_slowmotion = video_info->runloop_is_slowmotion; runloop_is_slowmotion = video_info->runloop_is_slowmotion;
top_right_x_advance = video_width; top_right_x_advance = video_width;
scissor_me_timbers = 0;
gfx_widgets_frame_count++; gfx_widgets_frame_count++;

21
retroarch.c
View File

@ -5771,26 +5771,27 @@ static bool run_translation_service(bool paused)
json_buffer = (char*)malloc(json_length); json_buffer = (char*)malloc(json_length);
if (!json_buffer) if (!json_buffer)
goto finish; goto finish;
/* Image data */ /* Image data */
memcpy(json_buffer, (const void*)rf1, 11*sizeof(uint8_t)); memcpy(json_buffer, (const void*)rf1, 11 * sizeof(uint8_t));
memcpy(json_buffer+11, bmp64_buffer, (out_length)*sizeof(uint8_t)); memcpy(json_buffer + 11, bmp64_buffer, out_length * sizeof(uint8_t));
memcpy(json_buffer+11+out_length, "\"", 1*sizeof(uint8_t)); memcpy(json_buffer + 11 + out_length, "\"", 1 * sizeof(uint8_t));
curr_length = 11+out_length+1; curr_length = 11 + out_length + 1;
/* State data */ /* State data */
memcpy(json_buffer+curr_length, state_son, state_son_length*sizeof(uint8_t)); memcpy(json_buffer+curr_length, state_son, state_son_length*sizeof(uint8_t));
curr_length+= state_son_length; curr_length += state_son_length;
/* System Label */ /* System Label */
if (rf3) if (rf3)
{ {
memcpy(json_buffer+curr_length, (const void*)rf3, (15+strlen(system_label))*sizeof(uint8_t)); memcpy(json_buffer + curr_length, (const void*)rf3, (15 + strlen(system_label)) * sizeof(uint8_t));
curr_length+=15+strlen(system_label); curr_length += 15 + strlen(system_label);
} }
else else
{ {
memcpy(json_buffer+curr_length, (const void*)rf2, 3*sizeof(uint8_t)); memcpy(json_buffer + curr_length, (const void*)rf2, 3 * sizeof(uint8_t));
curr_length+=3; curr_length += 3;
} }
#ifdef DEBUG #ifdef DEBUG
@ -21690,7 +21691,7 @@ static bool video_driver_init_internal(bool *video_is_threaded)
if (config_file_directory) if (config_file_directory)
{ {
dir_list_is_free = !dir_init_shader( dir_init_shader(
config_file_directory, config_file_directory,
settings->bools.show_hidden_files); settings->bools.show_hidden_files);
free(config_file_directory); free(config_file_directory);