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

Merge pull request #694 from randomstuff/cleanup 

Minor Cleanup
This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis 2015-08-03 00:09:11 +02:00
parent 4b94e2fe37 8c68f4a06b
commit ac6bdddae3
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/cfg/cfg.cpp
View File

@ -448,7 +448,7 @@ void cfgSaveInt(const wchar * Section, const wchar * Key, s32 Int)
sprintf(tmp,"%d", Int);
cfgSaveStr(Section,Key,tmp);
}
void cfgSetVitual(const wchar * Section, const wchar * Key, const wchar * String)
void cfgSetVirtual(const wchar * Section, const wchar * Key, const wchar * String)
{
vlist.push_back(vitem(Section,Key,String));
//cfgdb.GetEntry(Section,CEM_VIRTUAL)->SetEntry(Key,String,CEM_VIRTUAL);

4
core/cfg/cfg.h
View File

@ -16,6 +16,6 @@ void cfgLoadStr(const wchar * lpSection, const wchar * lpKey, wchar * lpReturn,
string cfgLoadStr(const wchar * Section, const wchar * Key, const wchar* Default);
void cfgSaveStr(const wchar * lpSection, const wchar * lpKey, const wchar * lpString);
s32 cfgExists(const wchar * Section, const wchar * Key);
void cfgSetVitual(const wchar * lpSection, const wchar * lpKey, const wchar * lpString);
void cfgSetVirtual(const wchar * lpSection, const wchar * lpKey, const wchar * lpString);
bool ParseCommandLine(int argc,wchar* argv[]);
bool ParseCommandLine(int argc,wchar* argv[]);

10
core/cfg/cl.cpp
View File

@ -83,7 +83,7 @@ int setconfig(wchar** arg,int cl)
constval="";
printf("Virtual cfg %s:%s=%s\n",sect,key,value);
cfgSetVitual(sect,key,value);
cfgSetVirtual(sect,key,value);
rv++;
if (cl>=3 && stricmp(arg[2],",")==0)
@ -129,12 +129,12 @@ bool ParseCommandLine(int argc,wchar* argv[])
}
else if (strstr(*arg, ".cdi") || strstr(*arg, ".chd")) {
printf("Using '%s' as cd image\n", *arg);
cfgSetVitual("config", "image", *arg);
cfgSetVirtual("config", "image", *arg);
}
else if (strstr(*arg, ".elf")) {
printf("Using '%s' as reios elf file\n", *arg);
cfgSetVitual("config", "reios.enabled", "1");
cfgSetVitual("reios", "ElfFile", *arg);
cfgSetVirtual("config", "reios.enabled", "1");
cfgSetVirtual("reios", "ElfFile", *arg);
}
else
{
@ -145,4 +145,4 @@ bool ParseCommandLine(int argc,wchar* argv[])
}
printf("\n");
return false;
}
}

2
core/hw/sh4/dyna/driver.cpp
View File

@ -309,7 +309,7 @@ void* DYNACALL rdv_LinkBlock(u8* code,u32 dpc)
rbi=bm_GetStaleBlock(code);
}
verify((int)rbi);
verify(rbi != NULL);
u32 bcls=BET_GET_CLS(rbi->BlockType);

2
core/nullDC.cpp
View File

@ -4,6 +4,7 @@
//initialse Emu
#include "types.h"
#include "oslib/oslib.h"
#include "oslib/audiostream.h"
#include "hw/mem/_vmem.h"
#include "stdclass.h"
#include "cfg/cfg.h"
@ -196,7 +197,6 @@ int dc_init(int argc,wchar* argv[])
printf("Using Interpreter\n");
}
void InitAudio();
InitAudio();
sh4_cpu.Init();