notaz.gp2x.de
/
pcsx_rearmed.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ae4e7dc
)
frontend: minor adjustments
author
notaz
<notasas@gmail.com>
Wed, 16 Feb 2011 19:29:41 +0000
(21:29 +0200)
committer
notaz
<notasas@gmail.com>
Wed, 16 Feb 2011 22:44:10 +0000
(
00:44
+0200)
frontend/menu.c
patch
|
blob
|
blame
|
history
diff --git
a/frontend/menu.c
b/frontend/menu.c
index
9ebfa86
..
8eb6c04
100644
(file)
--- a/
frontend/menu.c
+++ b/
frontend/menu.c
@@
-20,6
+20,7
@@
#include "plugin.h"
#include "plugin_lib.h"
#include "omap.h"
#include "plugin.h"
#include "plugin_lib.h"
#include "omap.h"
+#include "pcnt.h"
#include "common/plat.h"
#include "../libpcsxcore/misc.h"
#include "../libpcsxcore/cdrom.h"
#include "common/plat.h"
#include "../libpcsxcore/misc.h"
#include "../libpcsxcore/cdrom.h"
@@
-415,7
+416,7
@@
fail:
static unsigned short fname2color(const char *fname)
{
static const char *cdimg_exts[] = { ".bin", ".img", ".iso", ".cue", ".z", ".bz", ".znx", ".pbp" };
static unsigned short fname2color(const char *fname)
{
static const char *cdimg_exts[] = { ".bin", ".img", ".iso", ".cue", ".z", ".bz", ".znx", ".pbp" };
- static const char *other_exts[] = { ".ccd", ".toc", ".mds", ".sub", ".table", ".index" };
+ static const char *other_exts[] = { ".ccd", ".toc", ".mds", ".sub", ".table", ".index"
, ".sbi"
};
const char *ext = strrchr(fname, '.');
int i;
const char *ext = strrchr(fname, '.');
int i;
@@
-1204,8
+1205,9
@@
static void draw_frame_main(void)
{
if (CdromId[0] != 0) {
char buff[64];
{
if (CdromId[0] != 0) {
char buff[64];
- snprintf(buff, sizeof(buff), "%.32s/%.9s (running as %s)",
- get_cd_label(), CdromId, Config.PsxType ? "PAL" : "NTSC");
+ snprintf(buff, sizeof(buff), "%.32s/%.9s (running as %s, with %s)",
+ get_cd_label(), CdromId, Config.PsxType ? "PAL" : "NTSC",
+ Config.HLE ? "HLE" : "BIOS");
smalltext_out16(4, 1, buff, 0x105f);
}
}
smalltext_out16(4, 1, buff, 0x105f);
}
}
@@
-1256,6
+1258,7
@@
static int run_bios(void)
ClosePlugins();
set_cd_image(NULL);
LoadPlugins();
ClosePlugins();
set_cd_image(NULL);
LoadPlugins();
+ pcnt_hook_plugins();
NetOpened = 0;
if (OpenPlugins() == -1) {
me_update_msg("failed to open plugins");
NetOpened = 0;
if (OpenPlugins() == -1) {
me_update_msg("failed to open plugins");
@@
-1280,6
+1283,7
@@
static int run_cd_image(const char *fname)
ClosePlugins();
set_cd_image(fname);
LoadPlugins();
ClosePlugins();
set_cd_image(fname);
LoadPlugins();
+ pcnt_hook_plugins();
NetOpened = 0;
if (OpenPlugins() == -1) {
me_update_msg("failed to open plugins");
NetOpened = 0;
if (OpenPlugins() == -1) {
me_update_msg("failed to open plugins");