diff --git a/src/debug/debug.cpp b/src/debug/debug.cpp index 44dc221f..7b76d573 100644 --- a/src/debug/debug.cpp +++ b/src/debug/debug.cpp @@ -402,7 +402,7 @@ void CBreakpoint::ActivateBreakpoints(PhysPt adr, bool activate) CBreakpoint* bp; for(i=BPoints.begin(); i != BPoints.end(); i++) { bp = (*i); - // Do not activate, when bp is an actual adress + // Do not activate, when bp is an actual address if (activate && (bp->GetType()==BKPNT_PHYSICAL) && (bp->GetLocation()==adr)) { // Do not activate :) continue; @@ -681,7 +681,7 @@ static void DrawData(void) { Bit32u address; /* Data win */ for (int y=0; y<8; y++) { - // Adress + // Address if (add<0x10000) mvwprintw (dbg.win_data,1+y,0,"%04X:%04X ",dataSeg,add); else mvwprintw (dbg.win_data,1+y,0,"%04X:%08X ",dataSeg,add); for (int x=0; x<16; x++) { @@ -2424,7 +2424,7 @@ void DEBUG_HeavyWriteLogInstruction(void) { out << hex << noshowbase << setfill('0') << uppercase; Bit32u startLog = logCount; do { - // Write Intructions + // Write Instructions TLogInst & inst = logInst[startLog]; out << setw(4) << inst.s_cs << ":" << setw(8) << inst.eip << " " << inst.dline << " " << inst.res << " EAX:" << setw(8)<< inst.eax diff --git a/src/gui/sdl_mapper.cpp b/src/gui/sdl_mapper.cpp index 7615b19a..82d1baa6 100644 --- a/src/gui/sdl_mapper.cpp +++ b/src/gui/sdl_mapper.cpp @@ -2107,7 +2107,7 @@ static void CreateDefaultBinds(void) { } void MAPPER_AddHandler(MAPPER_Handler * handler,MapKeys key,Bitu mods,char const * const eventname,char const * const buttonname) { - //Check if it allready exists=> if so return. + //Check if it already exists=> if so return. for(CHandlerEventVector_it it=handlergroup.begin();it!=handlergroup.end();it++) if(strcmp((*it)->buttonname,buttonname) == 0) return; diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp index d495042e..31a5e458 100644 --- a/src/gui/sdlmain.cpp +++ b/src/gui/sdlmain.cpp @@ -1916,7 +1916,7 @@ int main(int argc, char* argv[]) { Section_prop * sdl_sec=static_cast(control->GetSection("sdl")); if (control->cmdline->FindExist("-fullscreen") || sdl_sec->Get_bool("fullscreen")) { - if(!sdl.desktop.fullscreen) { //only switch if not allready in fullscreen + if(!sdl.desktop.fullscreen) { //only switch if not already in fullscreen GFX_SwitchFullScreen(); } } diff --git a/src/hardware/hardware.cpp b/src/hardware/hardware.cpp index ff7881ce..dcacb089 100644 --- a/src/hardware/hardware.cpp +++ b/src/hardware/hardware.cpp @@ -323,7 +323,7 @@ void CAPTURE_AddImage(Bitu width, Bitu height, Bitu bpp, Bitu pitch, Bitu flags, /* Open the actual file */ FILE * fp=OpenCaptureFile("Screenshot",".png"); if (!fp) goto skip_shot; - /* First try to alloacte the png structures */ + /* First try to allocate the png structures */ png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL,NULL, NULL); if (!png_ptr) goto skip_shot; info_ptr = png_create_info_struct(png_ptr); diff --git a/src/hardware/mixer.cpp b/src/hardware/mixer.cpp index 64c18462..829d99a8 100644 --- a/src/hardware/mixer.cpp +++ b/src/hardware/mixer.cpp @@ -601,7 +601,7 @@ MixerChannel* MixerObject::Install(MIXER_Handler handler,Bitu freq,const char * installed = true; return MIXER_AddChannel(handler,freq,name); } else { - E_Exit("allready added mixer channel."); + E_Exit("already added mixer channel."); return 0; //Compiler happy } } diff --git a/src/hardware/serialport/libserial.cpp b/src/hardware/serialport/libserial.cpp index 3f2d52f8..c780e9d1 100644 --- a/src/hardware/serialport/libserial.cpp +++ b/src/hardware/serialport/libserial.cpp @@ -197,7 +197,7 @@ int SERIAL_getextchar(COMPORT port) { char chRead; int retval = 0; - // receive a byte; TODO communicate faliure + // receive a byte; TODO communicate failure if (ReadFile (port->porthandle, &chRead, 1, &dwRead, NULL)) { if (dwRead) { // check for errors @@ -580,7 +580,7 @@ int SERIAL_getextchar(COMPORT port) { char chRead; int retval = 0; - // receive a byte; TODO communicate faliure + // receive a byte; TODO communicate failure if (DosRead(port->porthandle, &chRead, 1, &dwRead) == NO_ERROR) { if (dwRead) { // check for errors; will OS/2 clear the error on reading its data? diff --git a/src/hardware/vga_draw.cpp b/src/hardware/vga_draw.cpp index 37dce8ac..e2089371 100644 --- a/src/hardware/vga_draw.cpp +++ b/src/hardware/vga_draw.cpp @@ -82,7 +82,7 @@ static Bit8u * VGA_Draw_CGA16_Line(Bitu vidstart, Bitu line) { //Generate a temporary bitline to calculate the avarage //over bit-2 bit-1 bit bit+1. //Combine this number with the current colour to get - //an unique index in the pallete. Or it with bit 7 as they are stored + //an unique index in the pallette. Or it with bit 7 as they are stored //in the upperpart to keep them from interfering the regular cga stuff for(Bitu x = 0; x < 640; x++) diff --git a/src/hardware/vga_s3.cpp b/src/hardware/vga_s3.cpp index 1de9599e..d79b42bb 100644 --- a/src/hardware/vga_s3.cpp +++ b/src/hardware/vga_s3.cpp @@ -341,7 +341,7 @@ void SVGA_S3_WriteCRTC(Bitu reg,Bitu val,Bitu iolen) { vga.svga.bank_write = vga.svga.bank_read; VGA_SetupHandlers(); break; - case 0x6b: // BIOS scratchpad: LFB adress + case 0x6b: // BIOS scratchpad: LFB address vga.s3.reg_6b=(Bit8u)val; break; default: diff --git a/src/ints/bios_disk.cpp b/src/ints/bios_disk.cpp index f3486045..952987ed 100644 --- a/src/ints/bios_disk.cpp +++ b/src/ints/bios_disk.cpp @@ -104,7 +104,7 @@ void swapInDisks(void) { Bits swapPos = swapPosition; int i; - /* Check to make sure there's atleast one setup image */ + /* Check to make sure that there is at least one setup image */ for(i=0;imode <= 3) diff --git a/src/misc/messages.cpp b/src/misc/messages.cpp index a1dc1814..b266ace6 100644 --- a/src/misc/messages.cpp +++ b/src/misc/messages.cpp @@ -98,7 +98,7 @@ static void LoadMessageFile(const char * fname) { strcpy(name,linein+1); /* End of string marker */ } else if (linein[0]=='.') { - /* Replace/Add the string to the internal langaugefile */ + /* Replace/Add the string to the internal languagefile */ /* Remove last newline (marker is \n.\n) */ size_t ll = strlen(string); if(ll && string[ll - 1] == '\n') string[ll - 1] = 0; //Second if should not be needed, but better be safe. diff --git a/src/shell/shell.cpp b/src/shell/shell.cpp index a7464a19..62d44aac 100644 --- a/src/shell/shell.cpp +++ b/src/shell/shell.cpp @@ -49,14 +49,14 @@ typedef std::list::iterator auto_it; void VFILE_Remove(const char *name); void AutoexecObject::Install(const std::string &in) { - if(GCC_UNLIKELY(installed)) E_Exit("autoexec: allready created %s",buf.c_str()); + if(GCC_UNLIKELY(installed)) E_Exit("autoexec: already created %s",buf.c_str()); installed = true; buf = in; autoexec_strings.push_back(buf); this->CreateAutoexec(); //autoexec.bat is normally created AUTOEXEC_Init. - //But if we are allready running (first_shell) + //But if we are already running (first_shell) //we have to update the envirionment to display changes if(first_shell) { @@ -77,7 +77,7 @@ void AutoexecObject::Install(const std::string &in) { } void AutoexecObject::InstallBefore(const std::string &in) { - if(GCC_UNLIKELY(installed)) E_Exit("autoexec: allready created %s",buf.c_str()); + if(GCC_UNLIKELY(installed)) E_Exit("autoexec: already created %s",buf.c_str()); installed = true; buf = in; autoexec_strings.push_front(buf); diff --git a/src/shell/shell_cmds.cpp b/src/shell/shell_cmds.cpp index 4840c834..5146be19 100644 --- a/src/shell/shell_cmds.cpp +++ b/src/shell/shell_cmds.cpp @@ -287,7 +287,7 @@ void DOS_Shell::CMD_ECHO(char * args){ args++;//skip first character. either a slash or dot or space size_t len = strlen(args); //TODO check input of else ook nodig is. if(len && args[len - 1] == '\r') { - LOG(LOG_MISC,LOG_WARN)("Hu ? carriage return allready present. Is this possible?"); + LOG(LOG_MISC,LOG_WARN)("Hu ? carriage return already present. Is this possible?"); WriteOut("%s\n",args); } else WriteOut("%s\r\n",args); } diff --git a/src/shell/shell_misc.cpp b/src/shell/shell_misc.cpp index faca8a63..a4e528da 100644 --- a/src/shell/shell_misc.cpp +++ b/src/shell/shell_misc.cpp @@ -299,7 +299,7 @@ void DOS_Shell::InputCommand(char * line) { } res=DOS_FindNext(); } - /* Add excutable list to front of completion list. */ + /* Add executable list to front of completion list. */ std::copy(executable.begin(),executable.end(),std::front_inserter(l_completion)); it_completion = l_completion.begin(); dos.dta(save_dta);