1
0
Fork 0

2 small patches from h-a-l-9000. Joystick equimentbit. Don't change drive when there none mounted.

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2641
This commit is contained in:
Peter Veenstra 2006-05-28 09:40:42 +00:00
parent 21ae8be729
commit b950bf43ba
2 changed files with 5 additions and 3 deletions

View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: dos_files.cpp,v 1.73 2006-04-23 14:20:57 c2woody Exp $ */
/* $Id: dos_files.cpp,v 1.74 2006-05-28 09:40:42 qbix79 Exp $ */
#include <string.h>
#include <stdlib.h>
@ -49,7 +49,7 @@ Bit8u DOS_GetDefaultDrive(void) {
}
void DOS_SetDefaultDrive(Bit8u drive) {
if (drive<=DOS_DRIVES) dos.current_drive=drive;
if (drive<=DOS_DRIVES && Drives[drive]) dos.current_drive = drive;
}
bool DOS_MakeName(char * name,char * fullname,Bit8u * drive) {

View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: bios.cpp,v 1.60 2006-05-23 10:30:02 qbix79 Exp $ */
/* $Id: bios.cpp,v 1.61 2006-05-28 09:40:42 qbix79 Exp $ */
#include "dosbox.h"
#include "mem.h"
@ -988,6 +988,8 @@ public:
}
// PS2 mouse
config |= 0x04;
// Gameport
config |= 0x1000;
mem_writew(BIOS_CONFIGURATION,config);
CMOS_SetRegister(0x14,config); //Should be updated on changes
/* Setup extended memory size */