frontend: initial cheats support

diff --git a/frontend/main.c b/frontend/main.c
index d6f4cd1..9d3cc33 100644 (file)
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -22,6 +22,7 @@
 #include "menu.h"
 #include "plat.h"
 #include "../libpcsxcore/misc.h"
+#include "../libpcsxcore/cheat.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/cdrcimg/cdrcimg.h"
 #include "common/plat.h"
@@ -265,6 +266,119 @@ do_state_slot:
        printf("* %s\n", hud_msg);
 }
 
+static int cdidcmp(const char *id1, const char *id2)
+{
+       while (*id1 != 0 && *id2 != 0) {
+               if (*id1 == '_') { id1++; continue; }
+               if (*id2 == '_') { id2++; continue; }
+               if (*id1 != *id2)
+                       break;
+               id1++;
+               id2++;
+       }
+
+       return *id1 - *id2;
+}
+
+static void parse_cwcheat(void)
+{
+       char line[256], buf[64], name[64], *p;
+       int newcheat = 1;
+       u32 a, v;
+       FILE *f;
+
+       f = fopen("cheatpops.db", "r");
+       if (f == NULL)
+               return;
+
+       /* find the game */
+       while (fgets(line, sizeof(line), f)) {
+               if (sscanf(line, "_S %63s", buf) != 1)
+                       continue;
+               if (cdidcmp(buf, CdromId) == 0)
+                       break;
+       }
+
+       if (feof(f))
+               goto out;
+
+       printf("cwcheat section found for %s\n", CdromId);
+       while (fgets(line, sizeof(line), f))
+       {
+               p = line + strlen(line);
+               for (p--; p >= line && (*p == '\r' || *p == '\n' || *p == ' '); p--)
+                       *p = 0;
+               if (*p == 0 || *p == '#' || *p == ';')
+                       continue;
+
+               if (strncmp(line, "_S", 2) == 0)
+                       break;
+               if (strncmp(line, "_G", 2) == 0) {
+                       printf("  cwcheat game name: '%s'\n", line + 3);
+                       continue;
+               }
+               if (strncmp(line, "_C0", 3) == 0) {
+                       if (!newcheat && Cheats[NumCheats - 1].n == 0) {
+                               printf("cheat '%s' failed to parse\n", name);
+                               free(Cheats[NumCheats - 1].Descr);
+                               NumCheats--;
+                       }
+                       snprintf(name, sizeof(name), "%s", line + 4);
+                       newcheat = 1;
+                       continue;
+               }
+               if (sscanf(line, "_L %x %x", &a, &v) != 2) {
+                       printf("line failed to parse: '%s'\n", line);
+                       continue;
+               }
+
+               if (newcheat) {
+                       if (NumCheats >= NumCheatsAllocated) {
+                               NumCheatsAllocated += 16;
+                               Cheats = realloc(Cheats, sizeof(Cheat) *
+                                               NumCheatsAllocated);
+                               if (Cheats == NULL)
+                                       break;
+                       }
+                       Cheats[NumCheats].Descr = strdup(name);
+                       Cheats[NumCheats].Enabled = 0;
+                       Cheats[NumCheats].First = NumCodes;
+                       Cheats[NumCheats].n = 0;
+                       NumCheats++;
+                       newcheat = 0;
+               }
+
+               if (NumCodes >= NumCodesAllocated) {
+                       NumCodesAllocated += 16;
+                       CheatCodes = realloc(CheatCodes, sizeof(CheatCode) *
+                               NumCodesAllocated);
+                       if (CheatCodes == NULL)
+                               break;
+               }
+               CheatCodes[NumCodes].Addr = a;
+               CheatCodes[NumCodes].Val = v;
+               NumCodes++;
+               Cheats[NumCheats - 1].n++;
+       }
+
+out:
+       fclose(f);
+}
+
+void emu_on_new_cd(void)
+{
+       ClearAllCheats();
+       parse_cwcheat();
+
+       if (Config.HLE) {
+               printf("note: running with HLE BIOS, expect compatibility problems\n");
+               printf("----------------------------------------------------------\n");
+       }
+
+       snprintf(hud_msg, sizeof(hud_msg), "Booting up...");
+       hud_new_msg = 2;
+}
+
 int main(int argc, char *argv[])
 {
        // what is the name of the config file?
@@ -399,6 +513,7 @@ int main(int argc, char *argv[])
                                printf(_("Could not load CD-ROM!\n"));
                                return -1;
                        }
+                       emu_on_new_cd();
                        ready_to_go = 1;
                }
        }

diff --git a/frontend/main.h b/frontend/main.h
index 22a42f6..9483798 100644 (file)
--- a/frontend/main.h
+++ b/frontend/main.h
@@ -36,6 +36,8 @@ extern char cfgfile_basename[MAXPATHLEN];
 
 extern int state_slot;
 void emu_set_default_config(void);
+void emu_on_new_cd(void);
+
 int get_state_filename(char *buf, int size, int i);
 int emu_check_state(int slot);
 int emu_save_state(int slot);

diff --git a/frontend/menu.c b/frontend/menu.c
index e469580..3fd5425 100644 (file)
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -30,6 +30,7 @@
 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/cdrom.h"
 #include "../libpcsxcore/cdriso.h"
+#include "../libpcsxcore/cheat.h"
 #include "../libpcsxcore/psemu_plugin_defs.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/dfinput/main.h"
@@ -52,6 +53,8 @@ typedef enum
        MA_MAIN_SWAP_CD_MULTI,
        MA_MAIN_RUN_BIOS,
        MA_MAIN_RUN_EXE,
+       MA_MAIN_LOAD_CHEATS,
+       MA_MAIN_CHEATS,
        MA_MAIN_CONTROLS,
        MA_MAIN_CREDITS,
        MA_MAIN_EXIT,
@@ -1560,6 +1563,59 @@ static int menu_loop_memcards(int id, int keys)
        return 0;
 }
 
+// ------------ cheats menu ------------
+
+static void draw_cheatlist(int sel)
+{
+       int max_cnt, start, i, pos, active;
+
+       max_cnt = g_menuscreen_h / me_sfont_h;
+       start = max_cnt / 2 - sel;
+
+       menu_draw_begin(1);
+
+       for (i = 0; i < NumCheats; i++) {
+               pos = start + i;
+               if (pos < 0) continue;
+               if (pos >= max_cnt) break;
+               active = Cheats[i].Enabled;
+               smalltext_out16(14,                pos * me_sfont_h,
+                       active ? "ON " : "OFF", active ? 0xfff6 : 0xffff);
+               smalltext_out16(14 + me_sfont_w*4, pos * me_sfont_h,
+                       Cheats[i].Descr, active ? 0xfff6 : 0xffff);
+       }
+       pos = start + i;
+       if (pos < max_cnt)
+               smalltext_out16(14, pos * me_sfont_h, "done", 0xffff);
+
+       text_out16(5, max_cnt / 2 * me_sfont_h, ">");
+       menu_draw_end();
+}
+
+static void menu_loop_cheats(void)
+{
+       static int menu_sel = 0;
+       int inp;
+
+       for (;;)
+       {
+               draw_cheatlist(menu_sel);
+               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_L|PBTN_R
+                               |PBTN_MOK|PBTN_MBACK, NULL, 33);
+               if (inp & PBTN_UP  ) { menu_sel--; if (menu_sel < 0) menu_sel = NumCheats; }
+               if (inp & PBTN_DOWN) { menu_sel++; if (menu_sel > NumCheats) menu_sel = 0; }
+               if (inp &(PBTN_LEFT|PBTN_L))  { menu_sel-=10; if (menu_sel < 0) menu_sel = 0; }
+               if (inp &(PBTN_RIGHT|PBTN_R)) { menu_sel+=10; if (menu_sel > NumCheats) menu_sel = NumCheats; }
+               if (inp & PBTN_MOK) { // action
+                       if (menu_sel < NumCheats)
+                               Cheats[menu_sel].Enabled = !Cheats[menu_sel].Enabled;
+                       else    break;
+               }
+               if (inp & PBTN_MBACK)
+                       break;
+       }
+}
+
 // --------- main menu help ----------
 
 static void menu_bios_warn(void)
@@ -1599,6 +1655,7 @@ static void menu_bios_warn(void)
 
 // ------------ main menu ------------
 
+static menu_entry e_menu_main[];
 void OnFile_Exit();
 
 static void draw_frame_main(void)
@@ -1752,9 +1809,9 @@ static int run_cd_image(const char *fname)
                return -1;
        }
 
+       emu_on_new_cd();
        ready_to_go = 1;
-       snprintf(hud_msg, sizeof(hud_msg), "Booting up...");
-       hud_new_msg = 2;
+
        return 0;
 }
 
@@ -1787,9 +1844,6 @@ static int romsel_run(void)
                        return -1;
        }
 
-       if (Config.HLE)
-               printf("note: running without BIOS, expect compatibility problems\n");
-
        strcpy(last_selected_fname, rom_fname_reload);
        return 0;
 }
@@ -1842,6 +1896,28 @@ static int swap_cd_multidisk(void)
        return 0;
 }
 
+static void load_pcsx_cht(void)
+{
+       char path[256];
+       char *fname;
+
+       path[0] = 0;
+       fname = menu_loop_romsel(path, sizeof(path));
+       if (fname == NULL)
+               return;
+
+       printf("selected cheat file: %s\n", fname);
+       LoadCheats(fname);
+
+       if (NumCheats == 0 && NumCodes == 0)
+               me_update_msg("failed to load cheats");
+       else {
+               snprintf(path, sizeof(path), "%d cheat(s) loaded", NumCheats + NumCodes);
+               me_update_msg(path);
+       }
+       me_enable(e_menu_main, MA_MAIN_CHEATS, ready_to_go && NumCheats);
+}
+
 static int main_menu_handler(int id, int keys)
 {
        switch (id)
@@ -1882,6 +1958,12 @@ static int main_menu_handler(int id, int keys)
                if (run_exe() == 0)
                        return 1;
                break;
+       case MA_MAIN_CHEATS:
+               menu_loop_cheats();
+               break;
+       case MA_MAIN_LOAD_CHEATS:
+               load_pcsx_cht();
+               break;
        case MA_MAIN_CREDITS:
                draw_menu_message(credits_text, draw_frame_credits);
                in_menu_wait(PBTN_MOK|PBTN_MBACK, NULL, 70);
@@ -1904,6 +1986,7 @@ static menu_entry e_menu_main2[] =
        mee_handler_id("Run BIOS",           MA_MAIN_RUN_BIOS,      main_menu_handler),
        mee_handler_id("Run EXE",            MA_MAIN_RUN_EXE,       main_menu_handler),
        mee_handler   ("Memcard manager",    menu_loop_memcards),
+       mee_handler_id("Load PCSX cheats..", MA_MAIN_LOAD_CHEATS,   main_menu_handler),
        mee_end,
 };
 
@@ -1914,6 +1997,7 @@ static int main_menu2_handler(int id, int keys)
        me_enable(e_menu_main2, MA_MAIN_SWAP_CD,  ready_to_go);
        me_enable(e_menu_main2, MA_MAIN_SWAP_CD_MULTI, ready_to_go && cdrIsoMultidiskCount > 1);
        me_enable(e_menu_main2, MA_MAIN_RUN_BIOS, bios_sel != 0);
+       me_enable(e_menu_main2, MA_MAIN_LOAD_CHEATS, ready_to_go);
 
        return me_loop_d(e_menu_main2, &sel, NULL, draw_frame_main);
 }
@@ -1931,6 +2015,7 @@ static menu_entry e_menu_main[] =
        mee_handler_id("Load CD image",      MA_MAIN_LOAD_ROM,    main_menu_handler),
        mee_handler   ("Options",            menu_loop_options),
        mee_handler   ("Controls",           menu_loop_keyconfig),
+       mee_handler_id("Cheats",             MA_MAIN_CHEATS,      main_menu_handler),
        mee_handler_h ("Extra stuff",        main_menu2_handler,  h_extra),
        mee_handler_id("Credits",            MA_MAIN_CREDITS,     main_menu_handler),
        mee_handler_id("Exit",               MA_MAIN_EXIT,        main_menu_handler),
@@ -1956,6 +2041,7 @@ void menu_loop(void)
        me_enable(e_menu_main, MA_MAIN_SAVE_STATE,  ready_to_go && CdromId[0]);
        me_enable(e_menu_main, MA_MAIN_LOAD_STATE,  ready_to_go && CdromId[0]);
        me_enable(e_menu_main, MA_MAIN_RESET_GAME,  ready_to_go);
+       me_enable(e_menu_main, MA_MAIN_CHEATS,      ready_to_go && NumCheats);
 
        in_set_config_int(0, IN_CFG_BLOCKING, 1);
 

diff --git a/libpcsxcore/cheat.c b/libpcsxcore/cheat.c
index 21d88b8..9ce7ed8 100644 (file)
--- a/libpcsxcore/cheat.c
+++ b/libpcsxcore/cheat.c
@@ -24,11 +24,11 @@
 
 Cheat *Cheats = NULL;
 int NumCheats = 0;
-static int NumCheatsAllocated = 0;
+int NumCheatsAllocated = 0;
 
 CheatCode *CheatCodes = NULL;
 int NumCodes = 0;
-static int NumCodesAllocated = 0;
+int NumCodesAllocated = 0;
 
 s8 *prevM = NULL;
 u32 *SearchResults = NULL;

diff --git a/libpcsxcore/cheat.h b/libpcsxcore/cheat.h
index d54f22c..c533b93 100644 (file)
--- a/libpcsxcore/cheat.h
+++ b/libpcsxcore/cheat.h
@@ -87,6 +87,9 @@ extern s8 *prevM;
 extern u32 *SearchResults;
 extern int NumSearchResults;
 
+extern int NumCheatsAllocated;
+extern int NumCodesAllocated;
+
 #define PREVM(mem)             (&prevM[mem])
 #define PrevMu8(mem)   (*(u8 *)PREVM(mem))
 #define PrevMu16(mem)  (SWAP16(*(u16 *)PREVM(mem)))

diff --git a/maemo/main.c b/maemo/main.c
index 481e9cd..7412791 100644 (file)
--- a/maemo/main.c
+++ b/maemo/main.c
@@ -125,6 +125,7 @@ int maemo_main(int argc, char **argv)
                                printf(_("Could not load CD-ROM!\n"));
                                return -1;
                        }
+                       emu_on_new_cd();
                        ready_to_go = 1;
                }
        }

diff --git a/readme.txt b/readme.txt
index b1459c8..ff36929 100644 (file)
--- a/readme.txt
+++ b/readme.txt
@@ -72,6 +72,17 @@ builtin_spu    - P.E.Op.S. SPU plugin, optimized for ARM.
 spunull.so     - NULL plugin, i.e. no sound emulation.
 
 
+Cheats
+------
+
+PCSX and cwcheat cheat formats are supported. PCSX .cht file can be loaded from
+"extra stuff" menu after game is loaded, while cwcheat cheats are automatically
+loaded from cheatpops.db file, if one is present in emulator's directory and
+has any cheats for the loaded game in it.
+If any of those files are successfully loaded, 'cheats' option will appear in
+the main menu where it is possible to enable/disable individual cheats.
+
+
 Changelog
 ---------