Commit graph

376 commits

Author SHA1 Message Date
James Hood
5a27989463 -Fixed menu "accelerator" problem. The correct term to use for the underlined letter in the file menu items is "mnemonic". Anyway, they work now.
-Minor change to man page.
2008-04-17 06:00:23 +00:00
James Hood
f6d65f0ab6 -Added multi-threading support to gtk gui. This allows info_message, confirm_message, alert_message functions to safely be called from any thread.
-I also changed the name of gui_parseArgs to gui_init, which will affect the kde4 gui code slightly when it's merged back into trunk.
2008-04-15 23:38:29 +00:00
James Hood
2baec5c8eb Added cheat menu and implemented dialog to enable/disable cheats during gameplay. This dialog does not allow you to add/edit cheats. That's coming soon. 2008-04-14 19:32:07 +00:00
Louai Al-Khanji
61e36c3925 Fix a header/implementation disrepancy. 2008-04-14 17:54:22 +00:00
Richard Goedeken
9f10d202be Reverted all changes on trunk from rev 189. The reason why I made a branch was so that you would not commit these things on the trunk. 2008-04-14 11:29:15 +00:00
John Chadwick
ec8445cc55 Attempt 3 at commiting the patches.
THIS PATCH IS PRELIMINARY AND DOES NOT WORK.
It also needs some major cleanup and most plugins are not yet compiling. Going to need any help I can get here, but I'll be working on it.
2008-04-14 04:37:57 +00:00
Richard Goedeken
2fbc704681 Reverted speed changing / fast forward code in commit 178. This is now on a branch 2008-04-11 01:05:18 +00:00
Scott Gorman
e38581339a Added FPS_Modifier functions, however due to plugin code, if you do not disable audio sync in your plugin configuration, the modifiers will not work and may make gameplay choppy. I suggest we write a small GUI for jttl audio, and disable audio sync by default. 2008-04-10 14:40:51 +00:00
James Hood
ee9cc495dc Simplified execute_cheat function 2008-04-10 06:15:07 +00:00
Scott Gorman
a5ea948c58 Added more cases, fixed a few bugs. 2008-04-09 22:50:45 +00:00
James Hood
f7339c8d4f fixed minor syntax error introduced during debug testing 2008-04-09 22:18:06 +00:00
James Hood
04112142fc -Added GS button support in cheat_apply_cheats.
-Readded boot code handling (it was lost during cleanup).
-Made conditional cheat code handling cleaner (got rid of do_next var).
2008-04-09 21:13:26 +00:00
James Hood
13bc1f9744 D'oh, my last implementation of GS Button didn't work because of how SDL handles keyup events. I had to change the implementation. Now there's a function in cheat.c that will allow you to query whether the GS button is pressed or not. 2008-04-09 20:33:20 +00:00
James Hood
0165af30c5 -Added global variable representing whether the Gameshark button is pressed or not.
-Added 'g' shortcut key that will act as the Gameshark button.
-Added user ability to map a joystick button to the Gameshark button.

Note, I did not add support for the Gameshark button to the emulator core yet, so cheats triggered by the GS button will not work until that's done.
2008-04-09 17:11:00 +00:00
Scott Gorman
c133e08e6c removed always_enabled but changed it to enabled.
i dont see why this is needed.
2008-04-09 13:51:20 +00:00
James Hood
5f40aa84cc -major cleanup of the cheat code.
-Changed name of cheat config file to cheats.cfg. File is now read in on startup and written out on exit.
-Changed cheat config file format to the following:

{Some Game's CRC}
name=Some Game

[Cheat Name 1]
enabled=1
XXXXXXXX YYYY <-- cheat code (address, new value)
XXXXXXXX YYYY
XXXXXXXX YYYY

[Cheat Name 2]
enabled=0
XXXXXXXX YYYY
XXXXXXXX YYYY
XXXXXXXX YYYY

{Another Game's CRC}
name=Another Game
...

Here's the cheats.cfg I used for testing:

{635a2bff 8b022326}
name=SUPER MARIO 64

[Super Mega Jumps]
enabled=1
8133b176 0008

[Jesus Mode Mario]
enabled=1
81381764 0800
81381766 0024
81000090 3c04
81000092 8034
81000094 8484
81000096 b1e6
81000098 4484
8100009a 3000
810000a0 4680
810000a2 3120
810000a4 4604
810000a6 903c
810000ac 4500
810000ae 0002
810000b4 4600
810000b6 2486
810000b8 080e
810000ba 05db
810000bc e712
2008-04-09 06:59:41 +00:00
Scott Gorman
762e122f81 fixed a infinite loop for games that did not have a cheats.gs entry. 2008-04-09 05:38:57 +00:00
John Chadwick
20295c5989 removes a few now unnecessary things from the gameshark system. 2008-04-09 04:54:12 +00:00
John Chadwick
dc17ec142b Needs clean up, but fixes the conditionals system in the cheating core. 2008-04-09 04:49:24 +00:00
Richard Goedeken
8fd1a809a9 added header files to cheat.c to fix compiler warnings 2008-04-09 02:43:50 +00:00
James Hood
1838894052 fixed segfault if no cheats.gs file exists 2008-04-08 16:05:03 +00:00
Scott Gorman
6ad7a2b218 this should fix it 2008-04-08 14:44:49 +00:00
Scott Gorman
12cdb8b585 this should fix it 2008-04-08 14:44:35 +00:00
Scott Gorman
e7b568cd44 this might update or delete the file 2008-04-08 14:44:22 +00:00
Scott Gorman
51bfc3d9fa Fixed the file reading... successfully reads 1 cheat from /.mupen64plus/cheats.gs
example: (Mario 64)

1
:635a2bff 8b022326
Super Mega Jumps
1
<
8133B1760008
>

This might contain tabs, I'm sorry my editor is messed up... and it's late and I need to goto bed. (I'm working on fixing my editor though... I promise)
2008-04-08 08:38:03 +00:00
James Hood
fa74232ba2 -Replaced custom directory browser in (appeared when you clicked the "Add" button in the "Rom Browser" tab of the config dialog) with a gtk file chooser. Was able to remove dirbrowser.[ch] because of this.
-Removed "Remove All" button from rom browser config tab. There wasn't a stock gtk button for remove all and it didn't really seem necessary since you can select all of the directories and then click the "Remove" button.
-Removed unnecessary callback functions for about dialog, made about dialog not resizable.
2008-04-08 07:32:55 +00:00
John Chadwick
0a170d46e3 even more cheat work, yawn 2008-04-08 07:30:28 +00:00
John Chadwick
7136b73644 More fixing of my own stupidity in the cheat core. 2008-04-08 07:16:50 +00:00
John Chadwick
39ee4f940c More work on the cheating core, added usage load_cheats into main.c 2008-04-08 07:09:22 +00:00
John Chadwick
0877c6d42c Should finish the rest of the gameshark implementation, however, much testing is needed. 2008-04-08 06:47:41 +00:00
James Hood
9de4a1eb8e -GTK_GUI: fixed gtk warnings given on gui reload, e.g., when language is changed. Warnings were introduced by new hotkeys tab in config dialog. 2008-04-08 06:16:53 +00:00
Scott Gorman
740f400cf0 Fixed the struc cheat_code in cheat.h
wrote the apply_cheat's function

almost there
2008-04-08 05:37:26 +00:00
John Chadwick
df25dc8bbe some fixes to the cheat core, mainly can ignore this as it is just for collaborating 2008-04-08 04:43:40 +00:00
John Chadwick
7986997b67 bugfix, delete unnecessary struct entry and add 'enabled' 2008-04-08 04:22:45 +00:00
Richard Goedeken
4e3bd85840 Do not commit code with tabs. Learn how to configure your editor. Add correct file header information; if you don't update it now you never will 2008-04-08 04:17:57 +00:00
Scott Gorman
095766fddb cheat.h basic file 2008-04-08 04:07:06 +00:00
Scott Gorman
87ee6b180b cheat.c basic file - incomplete 2008-04-08 04:06:45 +00:00
James Hood
9920114bc8 -GTK_GUI: change buttons like ok and cancel to use gtk stock buttons.
-GTK_GUI: reorder ok/cancel buttons on dialogs to be consistent with gtk.
-minor whitespace changes.
2008-04-07 23:16:37 +00:00
James Hood
f1e86b8f51 -Added gzip format to open rom file filter.
-Change "clear" button to "delete" in set controller special function dialog. This was because clear and cancel buttons had the same accelerator 'c'.
2008-04-07 22:17:15 +00:00
Richard Goedeken
c512cb02ff Changed NOGUI_ONLY build option to NO_GUI 2008-04-06 23:41:23 +00:00
James Hood
117a8e545e minor whitespace changes 2008-04-06 22:55:37 +00:00
Richard Goedeken
5f32c254fe Converted all tabs to 4-spaces, and all line endings to LF-only 2008-04-06 14:55:37 +00:00
John Chadwick
57bfd1a1ab Bugfix: Correctly adds GtkTreeView to the GtkScrolledWindow, now the headers move properly and type-to-scroll should work properly. 2008-04-06 05:57:57 +00:00
John Chadwick
c3c53540eb Adds "FPS Limiter" Option, enabled by default. Some things need to have this off to operate properly. 2008-04-05 19:26:05 +00:00
James Hood
dd00ce7987 -Added support for mapping emulator special functions (fullscreen, stop emulation, etc) to joystick buttons or axis movements.
-Added new tab to configuration dialog for user to create mappings.
-Minor fix: Reset configuration dialog to have first tab selected everytime it's shown.
2008-04-03 22:07:45 +00:00
James Hood
64e7edc15d Changed screenshot shortcut key to F12 to match code pre gui/nogui merge 2008-04-02 06:14:29 +00:00
James Hood
5796a69ca9 Mapped Print Screen button to screenshot function 2008-04-02 01:13:41 +00:00
James Hood
af3b85e37f -Fixed the rest of the places where deprecated GtkFileSelection widget was being used. Converted to GtkFileChooserDialog.
-Added file filters to load dialogs for a more polished file chooser.
-Removed chdir to the config dir (~/.mupen64plus) from setPaths function. This was a hack to get around the fact that plugins were looking in the current working dir for config files. I've since fixed that issue, so the chdir is no longer necessary. Plus, the chdir was causing the file chooser dialogs to default to ~/.mupen64plus, which could be confusing to a user.
2008-04-01 20:34:53 +00:00
James Hood
4533f0a4c1 added some necessary includes back to main/vcr.c 2008-03-31 23:19:44 +00:00
James Hood
e8551a2754 Replaced deprecated GtkFileSelection widget with GtkFileChooserDialog widget. 2008-03-31 07:03:24 +00:00