frederik
/
oscar64
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CTT file import

This commit is contained in:
drmortalwombat 2025-05-15 17:50:59 +02:00
parent c0abe031ee
commit 6ea39d7bfa
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/c64/kernalio.c
View File

@ -422,7 +422,7 @@ int krnio_gets(char fnum, char * data, int num)
if (krnio_chkin(fnum)) if (krnio_chkin(fnum))
{ {
krnioerr err; krnioerr err = KRNIO_OK;
int i = 0; int i = 0;
int ch; int ch;
while (i + 1 < num) while (i + 1 < num)

21
oscar64/Preprocessor.cpp
View File

@ -327,6 +327,16 @@ struct CTMHeader9
uint8 mColors[7]; uint8 mColors[7];
}; };
struct CTTHeader9
{
uint8 mDispMode;
uint8 mColorMethod;
uint8 mFlags;
uint8 mFgridWidth[2], mFGridHeight[2];
char mFGridConfig;
uint8 mColors[6];
};
#if 0 #if 0
#pragma pack(push, 1) #pragma pack(push, 1)
struct SPDHeader5 struct SPDHeader5
@ -486,6 +496,7 @@ void SourceFile::ReadCharPad(Errors* errors, const Location& location, SourceFil
CTMHeader ctmHeader; CTMHeader ctmHeader;
CTMHeader8 ctmHeader8; CTMHeader8 ctmHeader8;
CTMHeader9 ctmHeader9; CTMHeader9 ctmHeader9;
CTTHeader9 cttHeader9;
uint16 ctmMarker, numChars, numTiles; uint16 ctmMarker, numChars, numTiles;
char tileWidth, tileHeight; char tileWidth, tileHeight;
@ -496,10 +507,20 @@ void SourceFile::ReadCharPad(Errors* errors, const Location& location, SourceFil
fread(&ctmHeader8, sizeof(CTMHeader8), 1, mFile); fread(&ctmHeader8, sizeof(CTMHeader8), 1, mFile);
break; break;
case 9: case 9:
if (ctmHeader.mID[2] == 'T')
{
fread(&cttHeader9, sizeof(CTTHeader9), 1, mFile);
ctmHeader8.mDispMode = cttHeader9.mDispMode;
ctmHeader8.mColorMethod = cttHeader9.mColorMethod;
ctmHeader8.mFlags = cttHeader9.mFlags;
}
else
{
fread(&ctmHeader9, sizeof(CTMHeader9), 1, mFile); fread(&ctmHeader9, sizeof(CTMHeader9), 1, mFile);
ctmHeader8.mDispMode = ctmHeader9.mDispMode; ctmHeader8.mDispMode = ctmHeader9.mDispMode;
ctmHeader8.mColorMethod = ctmHeader9.mColorMethod; ctmHeader8.mColorMethod = ctmHeader9.mColorMethod;
ctmHeader8.mFlags = ctmHeader9.mFlags; ctmHeader8.mFlags = ctmHeader9.mFlags;
}
break; break;
} }