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

Re-added CTY scheme to the list of selectable bankswitch schemes, 

and fixed some minor warnings generated from GCC 6.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3294 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2016-03-05 18:35:25 +00:00
parent dd480fdb7e
commit f3fce85633
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/index.html
View File

@ -3236,6 +3236,7 @@ Ms Pac-Man (Stella extended codes):
<tr><td>BF </td><td>CPUWIZ 256K </td></tr>
<tr><td>BFSC </td><td>CPUWIZ 256K + ram</td></tr>
<tr><td>CM &#185;</td><td>Spectravideo CompuMate </td></tr>
<tr><td>CTY &#185;&#178;</td><td>CDW - Chetiry </td></tr>
<tr><td>CV </td><td>Commavid extra ram </td></tr>
<tr><td>CV+ </td><td>Extended Commavid extra ram</td></tr>
<tr><td>DASH </td><td>Boulder Dash 2 </td></tr>

2
src/common/bspf.hxx
View File

@ -160,7 +160,7 @@ inline size_t BSPF_findIgnoreCase(const string& s1, const string& s2, int startp
s2.begin(), s2.end(), [](char ch1, char ch2) {
return toupper(uInt8(ch1)) == toupper(uInt8(ch2));
});
return pos == s1.end() ? string::npos : pos - (s1.begin()+startpos);
return pos == s1.end() ? string::npos : size_t(pos - (s1.begin()+startpos));
}
// Test whether the first string ends with the second one (case insensitive)

3
src/emucore/Cart.cxx
View File

@ -981,9 +981,10 @@ Cartridge::BankswitchType Cartridge::ourBSList[ourNumBSTypes] = {
{ "AR", "AR (Supercharger)" },
{ "BF", "BF (CPUWIZ 256K)" },
{ "BFSC", "BFSC (CPUWIZ 256K + ram)" },
{ "CM", "CM (SpectraVideo CompuMate)" },
{ "CTY", "CTY (CDW - Chetiry)" },
{ "CV", "CV (Commavid extra ram)" },
{ "CV+", "CV+ (Extended Commavid)" },
{ "CM", "CM (SpectraVideo CompuMate)" },
{ "DASH", "DASH (Experimental)" },
{ "DF", "DF (CPUWIZ 128K)" },
{ "DFSC", "DFSC (CPUWIZ 128K + ram)" },

2
src/emucore/Cart.hxx
View File

@ -190,7 +190,7 @@ class Cartridge : public Device
const char* type;
const char* desc;
};
enum { ourNumBSTypes = 46 };
enum { ourNumBSTypes = 47 };
static BankswitchType ourBSList[ourNumBSTypes];
protected:

2
src/unix/FSNodePOSIX.cxx
View File

@ -236,5 +236,5 @@ AbstractFSNode* FilesystemNodePOSIX::getParent() const
const char* start = _path.c_str();
const char* end = lastPathComponent(_path);
return new FilesystemNodePOSIX(string(start, end - start));
return new FilesystemNodePOSIX(string(start, size_t(end - start)));
}