OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-30 07:30:07 +00:00
Code Issues Projects Releases Wiki Activity

Fixing build

Browse Source
This commit is contained in:
danzel 2017-08-13 11:48:12 +12:00
parent 8ea7673a44
commit 8c58f30d79
3 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/scripted_input/script_runner.cpp
View File

@ -3,6 +3,7 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <glad/glad.h> #include <glad/glad.h>
#include <string.h>
#include "common/logging/log.h" #include "common/logging/log.h"
#include "scripted_input/script_runner.h" #include "scripted_input/script_runner.h"
#include "scripted_input/scripted_buttons.h" #include "scripted_input/scripted_buttons.h"
@ -123,20 +124,32 @@ void ScriptRunner::SaveScreenshot() {
// https://web.archive.org/web/20080912171714/http://www.fortunecity.com/skyscraper/windows/364/bmpffrmt.html // https://web.archive.org/web/20080912171714/http://www.fortunecity.com/skyscraper/windows/364/bmpffrmt.html
int image_bytes = (w * h * 3); int image_bytes = (w * h * 3);
int size = 14 + 40 + image_bytes; int size = 14 + 40 + image_bytes;
unsigned char file_header[14] = {'B', 'M', size, size >> 8, size >> 16, size >> 24, 0, unsigned char file_header[14] = {'B',
0, 0, 0, 14 + 40, 0, 0, 0}; 'M',
static_cast<unsigned char>(size),
static_cast<unsigned char>(size >> 8),
static_cast<unsigned char>(size >> 16),
static_cast<unsigned char>(size >> 24),
0,
0,
0,
0,
14 + 40,
0,
0,
0};
unsigned char info_header[40] = {40, unsigned char info_header[40] = {40,
0, 0,
0, 0,
0, 0,
w, static_cast<unsigned char>(w),
w >> 8, static_cast<unsigned char>(w >> 8),
w >> 16, static_cast<unsigned char>(w >> 16),
w >> 24, static_cast<unsigned char>(w >> 24),
h, static_cast<unsigned char>(h),
h >> 8, static_cast<unsigned char>(h >> 8),
h >> 16, static_cast<unsigned char>(h >> 16),
h >> 24, static_cast<unsigned char>(h >> 24),
1, 1,
0, 0,
24, 24,
@ -145,10 +158,10 @@ void ScriptRunner::SaveScreenshot() {
0, 0,
0, 0,
0, 0,
image_bytes, static_cast<unsigned char>(image_bytes),
image_bytes >> 8, static_cast<unsigned char>(image_bytes >> 8),
image_bytes >> 16, static_cast<unsigned char>(image_bytes >> 16),
image_bytes >> 24, static_cast<unsigned char>(image_bytes >> 24),
0, 0,
0, 0,
0, 0,

1
src/scripted_input/script_runner.h
View File

@ -4,6 +4,7 @@
#pragma once #pragma once
#include <vector>
#include "core/frontend/input.h" #include "core/frontend/input.h"
#include "scripted_input/scripted_buttons.h" #include "scripted_input/scripted_buttons.h"

3
src/scripted_input/scripted_buttons.cpp
View File

@ -3,6 +3,7 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <atomic> #include <atomic>
#include <vector>
#include "scripted_input/scripted_buttons.h" #include "scripted_input/scripted_buttons.h"
const int button_count = 15; const int button_count = 15;
@ -70,7 +71,7 @@ void ScriptedButtons::SetActiveButtons(const std::vector<int>& buttons_active) {
LOG_ERROR( LOG_ERROR(
ScriptedInput, ScriptedInput,
"Button %s isn't mapped but is scripted, it should have engine:scripted,button:%s", "Button %s isn't mapped but is scripted, it should have engine:scripted,button:%s",
button_name_to_index[i], button_name_to_index[i]); button_name_to_index[i].c_str(), button_name_to_index[i].c_str());
} }
} }
} }