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

Merge branch 'master' of https://github.com/stella-emu/stella

This commit is contained in:
thrust26 2023-05-03 19:04:15 +02:00
parent e51600ad87 d6655fc9ab
commit e78942876b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/debugger.html
View File

@ -311,7 +311,7 @@ more convenient.
</li> </li>
<li> <li>
"&lt;rom_filename&gt;.sym" (located in the same directory as the ROM)</br> "&lt;rom_filename&gt;.sym" (located in the same directory as the ROM)</br>
If you provied the -l and -s parameters DASM will create these two files during If you provide the -l and -s parameters DASM will create these two files during
assembly. Stella uses the file content to display the correct labels. assembly. Stella uses the file content to display the correct labels.
</li> </li>
</ul> </ul>
@ -1107,7 +1107,7 @@ VDELBL selects the register that is used to control the ball. This is
visualized in the debugger in the same way as the two copies of GRP0 and visualized in the debugger in the same way as the two copies of GRP0 and
GRP1</p> GRP1</p>
<p>For many registers, writes don't take effect immediatelly as the <p>For many registers, writes don't take effect immediately as the
TIA takes some color clocks to change state. In Stella's TIA core, this TIA takes some color clocks to change state. In Stella's TIA core, this
is implemented by queueing the writes, and the contents of this queue is implemented by queueing the writes, and the contents of this queue
are visualized in the debugger in the "Queued Writes" area of the TIA tab.</p> are visualized in the debugger in the "Queued Writes" area of the TIA tab.</p>
@ -1594,7 +1594,7 @@ disassembly line's address and bank</li>
isn't already a defined label).</li> isn't already a defined label).</li>
<li><b>Show GFX as binary</b>: Switch between displaying/editing GFX and PGFX sections <li><b>Show GFX as binary</b>: Switch between displaying/editing GFX and PGFX sections
in either binary or hexidecimal.</li> in either binary or hexadecimal.</li>
<li><b>Use address relocation</b>: Corresponds to the DiStella '-r' option <li><b>Use address relocation</b>: Corresponds to the DiStella '-r' option
(Relocate calls out of address range).</br> (Relocate calls out of address range).</br>

4
src/emucore/Settings.cxx
View File

@ -37,8 +37,8 @@
//#endif //#endif
#if defined(BSPF_UNIX) || defined(BSPF_MACOS) #if defined(BSPF_UNIX) || defined(BSPF_MACOS)
#include <cstdio>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <stdio.h>
#include <unistd.h> #include <unistd.h>
#endif #endif
@ -843,7 +843,7 @@ void Settings::usage()
{ {
row = 0; row = 0;
cout << "Press \"Enter\"" << std::flush; cout << "Press \"Enter\"" << std::flush;
getchar(); std::ignore = getchar();
cout << endl; cout << endl;
} }
string substr; string substr;