first compiling build. renamed fceux to make me quit being confused about which vs instance is which
[[Split portion of a mixed commit.]]
This commit is contained in:
parent
9b5f554f40
commit
9952260cf5
|
@ -396,7 +396,7 @@ static void ShowRes(void)
|
||||||
static int ShowShortList(char *moe[], int n, int def)
|
static int ShowShortList(char *moe[], int n, int def)
|
||||||
{
|
{
|
||||||
int x,c;
|
int x,c;
|
||||||
unsigned int baa;
|
int baa; //mbg merge 7/17/06 made to normal int
|
||||||
char tmp[16];
|
char tmp[16];
|
||||||
|
|
||||||
red:
|
red:
|
||||||
|
|
|
@ -18,11 +18,8 @@
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
//mbg merge 7/17/06 this code shouldnt be compiled unless we're doing this (i think)
|
|
||||||
#ifdef _USE_SHARED_MEMORY_
|
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
#include "../../fceu.h" //mbg merge 7/18/06 added
|
||||||
#include "basicbot.h"
|
#include "basicbot.h"
|
||||||
|
|
||||||
static HWND hwndBasicBot=0;
|
static HWND hwndBasicBot=0;
|
||||||
|
@ -511,7 +508,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++)
|
||||||
{
|
{
|
||||||
|
@ -627,7 +624,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;
|
||||||
}
|
}
|
||||||
|
@ -692,7 +689,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;
|
||||||
}
|
}
|
||||||
|
@ -933,5 +930,3 @@ void CreateBasicBot()
|
||||||
SetDlgItemText(hwndBasicBot, 1022, Formula[22]);
|
SetDlgItemText(hwndBasicBot, 1022, Formula[22]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -9,6 +9,7 @@ static int discallb(uint16 a, char *s);
|
||||||
static void crs(HWND hParent);
|
static void crs(HWND hParent);
|
||||||
static void Disyou(uint16 a);
|
static void Disyou(uint16 a);
|
||||||
static void UpdateDMem(uint16 a);
|
static void UpdateDMem(uint16 a);
|
||||||
|
int BlockingCheck(void); //mbg merge 7/18/06 yech had to add this
|
||||||
|
|
||||||
static HWND mwin=0;
|
static HWND mwin=0;
|
||||||
static int32 cmsi;
|
static int32 cmsi;
|
||||||
|
@ -457,11 +458,11 @@ static uint8 kbuf[(16*3-1+6+2)*16+1];
|
||||||
static void sexycallb(uint16 a, uint8 v)
|
static void sexycallb(uint16 a, uint8 v)
|
||||||
{
|
{
|
||||||
if((a&15)==15)
|
if((a&15)==15)
|
||||||
sprintf(kbuf+strlen(kbuf),"%02X\r\n",v);
|
sprintf((char*)kbuf+strlen((char*)kbuf),"%02X\r\n",v); //mbg merge 7/18/06 added casts
|
||||||
else if((a&15)==0)
|
else if((a&15)==0)
|
||||||
sprintf(kbuf+strlen(kbuf),"%03xx: %02X ",a>>4,v);
|
sprintf((char*)kbuf+strlen((char*)kbuf),"%03xx: %02X ",a>>4,v); //mbg merge 7/18/06 added casts
|
||||||
else
|
else
|
||||||
sprintf(kbuf+strlen(kbuf),"%02X ",v);
|
sprintf((char*)kbuf+strlen((char*)kbuf),"%02X ",v); //mbg merge 7/18/06 added casts
|
||||||
}
|
}
|
||||||
|
|
||||||
static void MDSSI(void)
|
static void MDSSI(void)
|
||||||
|
@ -482,7 +483,7 @@ static void UpdateDMem(uint16 a)
|
||||||
{
|
{
|
||||||
kbuf[0]=0;
|
kbuf[0]=0;
|
||||||
FCEUI_MemDump(a<<4,256,sexycallb);
|
FCEUI_MemDump(a<<4,256,sexycallb);
|
||||||
SetDlgItemText(mwin,100,kbuf);
|
SetDlgItemText(mwin,100,(char*)kbuf); //mbg merge 7/18/06 added cast
|
||||||
}
|
}
|
||||||
|
|
||||||
int CreateDumpSave(uint32 a1, uint32 a2)
|
int CreateDumpSave(uint32 a1, uint32 a2)
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#include "input.h"
|
#include "input.h"
|
||||||
#include "keyboard.h"
|
#include "keyboard.h"
|
||||||
|
|
||||||
HRESULT ddrval;
|
static HRESULT ddrval; //mbg merge 7/17/06 made static
|
||||||
|
|
||||||
static LPDIRECTINPUTDEVICE7 lpdid=0;
|
static LPDIRECTINPUTDEVICE7 lpdid=0;
|
||||||
|
|
||||||
|
|
|
@ -260,11 +260,12 @@ FCEU XD SP - Sebastian Porst\n\
|
||||||
FCEU MM - CaH4e3\n\
|
FCEU MM - CaH4e3\n\
|
||||||
FCEU TAS - blip & nitsuja\n\
|
FCEU TAS - blip & nitsuja\n\
|
||||||
FCEU TAS+ - Luke Gustafson\n\
|
FCEU TAS+ - Luke Gustafson\n\
|
||||||
|
FCEUX\n\
|
||||||
|
- CaH4e3, Luke Gustafson\n\
|
||||||
|
- Matthew Gambrell, Sebastian Porst\n\
|
||||||
\n\
|
\n\
|
||||||
"__TIME__"\n\
|
"__TIME__" "__DATE__"\n\
|
||||||
"__DATE__"\n\
|
|
||||||
" __COMPILER__STRING__
|
" __COMPILER__STRING__
|
||||||
|
|
||||||
);
|
);
|
||||||
|
|
||||||
MessageBox(hAppWnd,TempArray,"About FCEUXD SP",MB_OK);
|
MessageBox(hAppWnd,TempArray,"About FCEUXD SP",MB_OK);
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
#include "../../fceu.h" //mbg merge 7/18/06 added
|
||||||
#include "memwatch.h"
|
#include "memwatch.h"
|
||||||
|
|
||||||
static HWND hwndMemWatch=0;
|
static HWND hwndMemWatch=0;
|
||||||
|
@ -229,13 +229,13 @@ static void SaveMemWatch()
|
||||||
ofn.lpstrInitialDir=MemWatchDir;
|
ofn.lpstrInitialDir=MemWatchDir;
|
||||||
if(GetSaveFileName(&ofn))
|
if(GetSaveFileName(&ofn))
|
||||||
{
|
{
|
||||||
int i,j;
|
int i; //mbg merge 7/18/06 removed unused decl for j
|
||||||
|
|
||||||
//Save the directory
|
//Save the directory
|
||||||
if(ofn.nFileOffset < 1024)
|
if(ofn.nFileOffset < 1024)
|
||||||
{
|
{
|
||||||
free(MemWatchDir);
|
free(MemWatchDir);
|
||||||
MemWatchDir=malloc(strlen(ofn.lpstrFile)+1);
|
MemWatchDir=(char*)malloc(strlen(ofn.lpstrFile)+1); //mbg merge 7/18/06 added cast
|
||||||
strcpy(MemWatchDir,ofn.lpstrFile);
|
strcpy(MemWatchDir,ofn.lpstrFile);
|
||||||
MemWatchDir[ofn.nFileOffset]=0;
|
MemWatchDir[ofn.nFileOffset]=0;
|
||||||
}
|
}
|
||||||
|
@ -308,7 +308,7 @@ static void LoadMemWatch()
|
||||||
if(ofn.nFileOffset < 1024)
|
if(ofn.nFileOffset < 1024)
|
||||||
{
|
{
|
||||||
free(MemWatchDir);
|
free(MemWatchDir);
|
||||||
MemWatchDir=malloc(strlen(ofn.lpstrFile)+1);
|
MemWatchDir=(char*)malloc(strlen(ofn.lpstrFile)+1); //mbg merge 7/18/06 added cast
|
||||||
strcpy(MemWatchDir,ofn.lpstrFile);
|
strcpy(MemWatchDir,ofn.lpstrFile);
|
||||||
MemWatchDir[ofn.nFileOffset]=0;
|
MemWatchDir[ofn.nFileOffset]=0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -135,7 +135,7 @@ static int InitializeDDraw(int fs)
|
||||||
{
|
{
|
||||||
CloseHandle(mapColorPalette);
|
CloseHandle(mapColorPalette);
|
||||||
mapColorPalette = NULL;
|
mapColorPalette = NULL;
|
||||||
color_palette = malloc(256 * sizeof(PALETTEENTRY));
|
color_palette = (PALETTEENTRY*)malloc(256 * sizeof(PALETTEENTRY)); //mbg merge 7/18/06 added cast
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
color_palette = (PALETTEENTRY *)MapViewOfFile(mapColorPalette, FILE_MAP_WRITE, 0, 0, 0);
|
color_palette = (PALETTEENTRY *)MapViewOfFile(mapColorPalette, FILE_MAP_WRITE, 0, 0, 0);
|
||||||
|
|
2
input.c
2
input.c
|
@ -57,7 +57,7 @@ static uint8 LastStrobe;
|
||||||
|
|
||||||
static int BotMode = 0;
|
static int BotMode = 0;
|
||||||
#ifdef _USE_SHARED_MEMORY_
|
#ifdef _USE_SHARED_MEMORY_
|
||||||
static int BotPointer = 0;
|
static uint32 BotPointer = 0; //mbg merge 7/18/06 changed to uint32
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* This function is a quick hack to get the NSF player to use emulated gamepad
|
/* This function is a quick hack to get the NSF player to use emulated gamepad
|
||||||
|
|
BIN
vc8/fceuxdsp.ncb
BIN
vc8/fceuxdsp.ncb
Binary file not shown.
|
@ -1,26 +0,0 @@
|
||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 9.00
|
|
||||||
# Visual Studio 2005
|
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fceuxdsp", "fceuxdsp.vcproj", "{6893EF44-FEA3-46DF-B236-C4C200F54294}"
|
|
||||||
EndProject
|
|
||||||
Global
|
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
|
||||||
Debug|Win32 = Debug|Win32
|
|
||||||
Debug|x64 = Debug|x64
|
|
||||||
Release|Win32 = Release|Win32
|
|
||||||
Release|x64 = Release|x64
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
|
||||||
{6893EF44-FEA3-46DF-B236-C4C200F54294}.Debug|Win32.ActiveCfg = Debug|Win32
|
|
||||||
{6893EF44-FEA3-46DF-B236-C4C200F54294}.Debug|Win32.Build.0 = Debug|Win32
|
|
||||||
{6893EF44-FEA3-46DF-B236-C4C200F54294}.Debug|x64.ActiveCfg = Debug|x64
|
|
||||||
{6893EF44-FEA3-46DF-B236-C4C200F54294}.Debug|x64.Build.0 = Debug|x64
|
|
||||||
{6893EF44-FEA3-46DF-B236-C4C200F54294}.Release|Win32.ActiveCfg = Release|Win32
|
|
||||||
{6893EF44-FEA3-46DF-B236-C4C200F54294}.Release|Win32.Build.0 = Release|Win32
|
|
||||||
{6893EF44-FEA3-46DF-B236-C4C200F54294}.Release|x64.ActiveCfg = Release|x64
|
|
||||||
{6893EF44-FEA3-46DF-B236-C4C200F54294}.Release|x64.Build.0 = Release|x64
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
|
||||||
HideSolutionNode = FALSE
|
|
||||||
EndGlobalSection
|
|
||||||
EndGlobal
|
|
BIN
vc8/fceuxdsp.suo
BIN
vc8/fceuxdsp.suo
Binary file not shown.
1778
vc8/fceuxdsp.vcproj
1778
vc8/fceuxdsp.vcproj
File diff suppressed because it is too large
Load Diff
|
@ -1,121 +0,0 @@
|
||||||
<?xml version="1.0" encoding="Windows-1252"?>
|
|
||||||
<VisualStudioUserFile
|
|
||||||
ProjectType="Visual C++"
|
|
||||||
Version="8.00"
|
|
||||||
ShowAllFiles="false"
|
|
||||||
>
|
|
||||||
<Configurations>
|
|
||||||
<Configuration
|
|
||||||
Name="Debug|Win32"
|
|
||||||
>
|
|
||||||
<DebugSettings
|
|
||||||
Command="$(TargetPath)"
|
|
||||||
WorkingDirectory=""
|
|
||||||
CommandArguments=""
|
|
||||||
Attach="false"
|
|
||||||
DebuggerType="3"
|
|
||||||
Remote="1"
|
|
||||||
RemoteMachine="ZERO-XP"
|
|
||||||
RemoteCommand=""
|
|
||||||
HttpUrl=""
|
|
||||||
PDBPath=""
|
|
||||||
SQLDebugging=""
|
|
||||||
Environment=""
|
|
||||||
EnvironmentMerge="true"
|
|
||||||
DebuggerFlavor=""
|
|
||||||
MPIRunCommand=""
|
|
||||||
MPIRunArguments=""
|
|
||||||
MPIRunWorkingDirectory=""
|
|
||||||
ApplicationCommand=""
|
|
||||||
ApplicationArguments=""
|
|
||||||
ShimCommand=""
|
|
||||||
MPIAcceptMode=""
|
|
||||||
MPIAcceptFilter=""
|
|
||||||
/>
|
|
||||||
</Configuration>
|
|
||||||
<Configuration
|
|
||||||
Name="Debug|x64"
|
|
||||||
>
|
|
||||||
<DebugSettings
|
|
||||||
Command="$(TargetPath)"
|
|
||||||
WorkingDirectory=""
|
|
||||||
CommandArguments=""
|
|
||||||
Attach="false"
|
|
||||||
DebuggerType="3"
|
|
||||||
Remote="1"
|
|
||||||
RemoteMachine="ZERO-XP"
|
|
||||||
RemoteCommand=""
|
|
||||||
HttpUrl=""
|
|
||||||
PDBPath=""
|
|
||||||
SQLDebugging=""
|
|
||||||
Environment=""
|
|
||||||
EnvironmentMerge="true"
|
|
||||||
DebuggerFlavor=""
|
|
||||||
MPIRunCommand=""
|
|
||||||
MPIRunArguments=""
|
|
||||||
MPIRunWorkingDirectory=""
|
|
||||||
ApplicationCommand=""
|
|
||||||
ApplicationArguments=""
|
|
||||||
ShimCommand=""
|
|
||||||
MPIAcceptMode=""
|
|
||||||
MPIAcceptFilter=""
|
|
||||||
/>
|
|
||||||
</Configuration>
|
|
||||||
<Configuration
|
|
||||||
Name="Release|Win32"
|
|
||||||
>
|
|
||||||
<DebugSettings
|
|
||||||
Command="$(TargetPath)"
|
|
||||||
WorkingDirectory=""
|
|
||||||
CommandArguments=""
|
|
||||||
Attach="false"
|
|
||||||
DebuggerType="3"
|
|
||||||
Remote="1"
|
|
||||||
RemoteMachine="ZERO-XP"
|
|
||||||
RemoteCommand=""
|
|
||||||
HttpUrl=""
|
|
||||||
PDBPath=""
|
|
||||||
SQLDebugging=""
|
|
||||||
Environment=""
|
|
||||||
EnvironmentMerge="true"
|
|
||||||
DebuggerFlavor=""
|
|
||||||
MPIRunCommand=""
|
|
||||||
MPIRunArguments=""
|
|
||||||
MPIRunWorkingDirectory=""
|
|
||||||
ApplicationCommand=""
|
|
||||||
ApplicationArguments=""
|
|
||||||
ShimCommand=""
|
|
||||||
MPIAcceptMode=""
|
|
||||||
MPIAcceptFilter=""
|
|
||||||
/>
|
|
||||||
</Configuration>
|
|
||||||
<Configuration
|
|
||||||
Name="Release|x64"
|
|
||||||
>
|
|
||||||
<DebugSettings
|
|
||||||
Command="$(TargetPath)"
|
|
||||||
WorkingDirectory=""
|
|
||||||
CommandArguments=""
|
|
||||||
Attach="false"
|
|
||||||
DebuggerType="3"
|
|
||||||
Remote="1"
|
|
||||||
RemoteMachine="ZERO-XP"
|
|
||||||
RemoteCommand=""
|
|
||||||
HttpUrl=""
|
|
||||||
PDBPath=""
|
|
||||||
SQLDebugging=""
|
|
||||||
Environment=""
|
|
||||||
EnvironmentMerge="true"
|
|
||||||
DebuggerFlavor=""
|
|
||||||
MPIRunCommand=""
|
|
||||||
MPIRunArguments=""
|
|
||||||
MPIRunWorkingDirectory=""
|
|
||||||
ApplicationCommand=""
|
|
||||||
ApplicationArguments=""
|
|
||||||
ShimCommand=""
|
|
||||||
MPIAcceptMode=""
|
|
||||||
MPIAcceptFilter=""
|
|
||||||
/>
|
|
||||||
</Configuration>
|
|
||||||
</Configurations>
|
|
||||||
</VisualStudioUserFile>
|
|
Loading…
Reference in New Issue