diff --git a/README.md b/README.md index a7ac0e4..968e654 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,7 @@ Supports data files from Windows and Full Tilt versions of the game. | Nintendo Switch | averne | | | webOS TV | mariotaku | | | Android (WIP) | Iscle | https://github.com/Iscle/SpaceCadetPinball | -| Nintendo Wii | MaikelChan | https://github.com/MaikelChan/SpaceCadetPinball | -| Nintendo 3DS | MaikelChan | https://github.com/MaikelChan/SpaceCadetPinball/tree/3ds | +| Nintendo Wii (WIP) | MaikelChan | https://github.com/MaikelChan/SpaceCadetPinball | | Nintendo Wii U | IntriguingTiles | https://github.com/IntriguingTiles/SpaceCadetPinball-WiiU | Platforms covered by this project: desktop Windows, Linux and macOS. diff --git a/SpaceCadetPinball/GroupData.cpp b/SpaceCadetPinball/GroupData.cpp index ee46dea..5ef2542 100644 --- a/SpaceCadetPinball/GroupData.cpp +++ b/SpaceCadetPinball/GroupData.cpp @@ -295,7 +295,6 @@ void DatFile::Finalize() IM_FREE(rcData); // PINBALL2.MID is an alternative font provided in 3DPB data - // Scaled down because it is too large for top text box /*auto file = pinball::make_path_name("PINBALL2.MID"); auto fileHandle = fopen(file.c_str(), "rb"); fseek(fileHandle, 0, SEEK_END); @@ -304,11 +303,8 @@ void DatFile::Finalize() fseek(fileHandle, 0, SEEK_SET); fread(rcData, 1, fileSize, fileHandle); fclose(fileHandle); - auto groupId = Groups.back()->GroupId + 1u; AddMsgFont(rcData, "pbmsg_ft"); - delete[] rcData; - for (auto i = groupId; i < Groups.size(); i++) - Groups[i]->GetBitmap(0)->ScaleIndexed(0.84f, 0.84f);*/ + delete[] rcData;*/ } for (auto group : Groups) diff --git a/SpaceCadetPinball/gdrv.cpp b/SpaceCadetPinball/gdrv.cpp index 02d65c3..b060ca0 100644 --- a/SpaceCadetPinball/gdrv.cpp +++ b/SpaceCadetPinball/gdrv.cpp @@ -79,38 +79,6 @@ gdrv_bitmap8::~gdrv_bitmap8() } } -void gdrv_bitmap8::ScaleIndexed(float scaleX, float scaleY) -{ - if (!IndexedBmpPtr) - { - assertm(false, "Scaling non-indexed bitmap"); - return; - } - - int newWidht = static_cast(Width * scaleX), newHeight = static_cast(Height * scaleY); - if (Width == newWidht && Height == newHeight) - return; - - auto newIndBuf = new char[newHeight * newWidht]; - for (int dst = 0, y = 0; y < newHeight; y++) - { - for (int x = 0; x < newWidht; x++, dst++) - { - auto px = static_cast(x / scaleX); - auto py = static_cast(y / scaleY); - newIndBuf[dst] = IndexedBmpPtr[(py * IndexedStride) + px]; - } - } - - Stride = IndexedStride = Width = newWidht; - Height = newHeight; - - delete IndexedBmpPtr; - IndexedBmpPtr = newIndBuf; - delete BmpBufPtr1; - BmpBufPtr1 = new ColorRgba[Stride * Height]; -} - int gdrv::display_palette(ColorRgba* plt) { const uint32_t sysPaletteColors[] diff --git a/SpaceCadetPinball/gdrv.h b/SpaceCadetPinball/gdrv.h index 4d2d51f..e0da784 100644 --- a/SpaceCadetPinball/gdrv.h +++ b/SpaceCadetPinball/gdrv.h @@ -42,7 +42,6 @@ struct gdrv_bitmap8 gdrv_bitmap8(int width, int height, bool indexed); gdrv_bitmap8(const struct dat8BitBmpHeader& header); ~gdrv_bitmap8(); - void ScaleIndexed(float scaleX, float scaleY); ColorRgba* BmpBufPtr1; char* IndexedBmpPtr; int Width;