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

Fixed merger changes, forgot them sorry.

This commit is contained in:
qfox 2006-08-20 15:13:33 +00:00
parent 309a670313
commit 1c30cf754e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/drivers/win/basicbot.cpp
View File

@ -19,7 +19,7 @@
*/ */
#include "common.h" #include "common.h"
#include "../../fceu.h" #include "../../fceu.h" //mbg merge 7/18/06 added
#include "basicbot.h" #include "basicbot.h"
@ -872,7 +872,7 @@ void UpdateBasicBot()
if(better) if(better)
{ {
char tempstring[4096]; char tempstring[4096];
char symbols[16] = "ABET^v<>ABET^v<>"; char symbols[] = "ABET^v<>ABET^v<>"; //mbg merge 7/18/06 changed dim to unspecified to leave room for the null
int seenplayer2=0; int seenplayer2=0;
for(i = 0; i < 4; i++) for(i = 0; i < 4; i++)
{ {
@ -990,7 +990,7 @@ static void SaveBasicBot()
if(ofn.nFileOffset < 1024) if(ofn.nFileOffset < 1024)
{ {
free(BasicBotDir); free(BasicBotDir);
BasicBotDir=malloc(strlen(ofn.lpstrFile)+1); BasicBotDir=(char*)malloc(strlen(ofn.lpstrFile)+1); //mbg merge 7/18/06 added cast
strcpy(BasicBotDir,ofn.lpstrFile); strcpy(BasicBotDir,ofn.lpstrFile);
BasicBotDir[ofn.nFileOffset]=0; BasicBotDir[ofn.nFileOffset]=0;
} }
@ -1081,7 +1081,7 @@ static void LoadBasicBot()
if(ofn.nFileOffset < 1024) if(ofn.nFileOffset < 1024)
{ {
free(BasicBotDir); free(BasicBotDir);
BasicBotDir=malloc(strlen(ofn.lpstrFile)+1); BasicBotDir=(char*)malloc(strlen(ofn.lpstrFile)+1); //mbg merge 7/18/06 added cast
strcpy(BasicBotDir,ofn.lpstrFile); strcpy(BasicBotDir,ofn.lpstrFile);
BasicBotDir[ofn.nFileOffset]=0; BasicBotDir[ofn.nFileOffset]=0;
} }