drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 7 Pull Requests Actions Releases 9 Activity

[nostalgia] Fix oxPanic parameter order

Browse Source
This commit is contained in:
Gary Talent 2020-02-16 02:06:05 -06:00
parent da3c9107db
commit 1269ee7fad
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nostalgia/core/gba/gfx.cpp
View File

@ -101,7 +101,7 @@ ox::Error shutdownGfx() {
case 3: case 3:
return REG_BG3CNT; return REG_BG3CNT;
default: default:
oxPanic("Looking up non-existent register", OxError(1)); oxPanic(OxError(1), "Looking up non-existent register");
return REG_BG0CNT; return REG_BG0CNT;
} }
} }

4
src/nostalgia/core/gba/mem.cpp
View File

@ -94,7 +94,7 @@ static HeapSegment *findSegmentFor(std::size_t sz) {
return s; return s;
} }
} }
oxPanic("malloc: could not find segment", OxError(1)); oxPanic(OxError(1), "malloc: could not find segment");
return nullptr; return nullptr;
} }
@ -118,7 +118,7 @@ void free(void *ptr) {
} else if (p.segment) { } else if (p.segment) {
p.segment->inUse = false; p.segment->inUse = false;
} else { } else {
oxPanic("Bad heap free", OxError(1)); oxPanic(OxError(1), "Bad heap free");
} }
} }

2
src/nostalgia/core/studio/Pixel.qml
View File

@ -11,7 +11,7 @@ import QtQuick 2.0
Rectangle { Rectangle {
id: pixel; id: pixel;
property int pixelNumber: index property int pixelNumber: index
color: sheetData.palette[pixelNumber < sheetData.pixels.length ? sheetData.pixels[pixelNumber] : 0] color: sheetData ? sheetData.palette[pixelNumber < sheetData.pixels.length ? sheetData.pixels[pixelNumber] : 0] : 'black'
width: parent.width / 8 width: parent.width / 8
height: parent.height / 8 height: parent.height / 8
border.color: '#717d7e' border.color: '#717d7e'

8
src/nostalgia/core/studio/TileSheetEditor.qml
View File

@ -17,6 +17,7 @@ ScrollView {
contentWidth: tileGrid.width contentWidth: tileGrid.width
contentHeight: tileGrid.height contentHeight: tileGrid.height
clip: true clip: true
focusPolicy: Qt.WheelFocus
background: Rectangle { background: Rectangle {
color: '#717d7e' color: '#717d7e'
@ -24,7 +25,8 @@ ScrollView {
MouseArea { MouseArea {
id: mouseArea id: mouseArea
anchors.fill: parent width: tileSheetEditor.width
height: tileSheetEditor.height
acceptedButtons: Qt.LeftButton acceptedButtons: Qt.LeftButton
onPressed: { onPressed: {
@ -76,8 +78,8 @@ ScrollView {
height: tileGrid.rows * tileGrid.baseTileSize * tileGrid.scaleFactor height: tileGrid.rows * tileGrid.baseTileSize * tileGrid.scaleFactor
//anchors.horizontalCenter: parent.horizontalCenter //anchors.horizontalCenter: parent.horizontalCenter
//anchors.verticalCenter: parent.verticalCenter //anchors.verticalCenter: parent.verticalCenter
rows: sheetData.rows rows: sheetData ? sheetData.rows : 1
columns: sheetData.columns columns: sheetData ? sheetData.columns : 1
Repeater { Repeater {
model: tileGrid.rows * tileGrid.columns model: tileGrid.rows * tileGrid.columns
Tile { Tile {

2
src/nostalgia/tools/pack.cpp
View File

@ -52,7 +52,7 @@ int main(int argc, const char **args) {
try { try {
run(ox::ClArgs(argc, args)); run(ox::ClArgs(argc, args));
} catch (const ox::Error &err) { } catch (const ox::Error &err) {
oxPanic("pack failed", err); oxPanic(err, "pack failed");
std::cerr << "pack failed...\n"; std::cerr << "pack failed...\n";
return static_cast<int>(err); return static_cast<int>(err);
} }