ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Incomplete non-GBA build fixes

This commit is contained in:
Vicki Pfau 2019-12-02 19:18:48 -08:00
parent d3ec40b392
commit c300da9be6
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/platform/qt/CheatsView.cpp
View File

@ -129,7 +129,6 @@ void CheatsView::addSet() {
} }
void CheatsView::removeSet() { void CheatsView::removeSet() {
GBACheatSet* set;
QModelIndexList selection = m_ui.cheatList->selectionModel()->selectedIndexes(); QModelIndexList selection = m_ui.cheatList->selectionModel()->selectedIndexes();
if (selection.count() < 1) { if (selection.count() < 1) {
return; return;

4
src/platform/qt/MultiplayerController.cpp
View File

@ -22,11 +22,13 @@ MultiplayerController::Player::Player(CoreController* coreController, GBSIOLocks
{ {
} }
#ifdef M_CORE_GBA
MultiplayerController::Player::Player(CoreController* coreController, GBASIOLockstepNode* node) MultiplayerController::Player::Player(CoreController* coreController, GBASIOLockstepNode* node)
: controller(coreController) : controller(coreController)
, gbaNode(node) , gbaNode(node)
{ {
} }
#endif
MultiplayerController::MultiplayerController() { MultiplayerController::MultiplayerController() {
mLockstepInit(&m_lockstep); mLockstepInit(&m_lockstep);
@ -71,10 +73,12 @@ MultiplayerController::MultiplayerController() {
if (!id) { if (!id) {
for (int i = 1; i < controller->m_players.count(); ++i) { for (int i = 1; i < controller->m_players.count(); ++i) {
Player* player = &controller->m_players[i]; Player* player = &controller->m_players[i];
#ifdef M_CORE_GBA
if (player->controller->platform() == PLATFORM_GBA && player->gbaNode->d.p->mode != controller->m_players[0].gbaNode->d.p->mode) { if (player->controller->platform() == PLATFORM_GBA && player->gbaNode->d.p->mode != controller->m_players[0].gbaNode->d.p->mode) {
player->controller->setSync(true); player->controller->setSync(true);
continue; continue;
} }
#endif
player->controller->setSync(false); player->controller->setSync(false);
player->cyclesPosted += cycles; player->cyclesPosted += cycles;
if (player->awake < 1) { if (player->awake < 1) {

4
src/platform/qt/MultiplayerController.h
View File

@ -45,8 +45,12 @@ signals:
private: private:
struct Player { struct Player {
#ifdef M_CORE_GB
Player(CoreController* controller, GBSIOLockstepNode* node); Player(CoreController* controller, GBSIOLockstepNode* node);
#endif
#ifdef M_CORE_GBA
Player(CoreController* controller, GBASIOLockstepNode* node); Player(CoreController* controller, GBASIOLockstepNode* node);
#endif
CoreController* controller; CoreController* controller;
GBSIOLockstepNode* gbNode = nullptr; GBSIOLockstepNode* gbNode = nullptr;