Commit graph

97 commits

Author SHA1 Message Date
Scott Knauert
2c6a2f68b7 Merged in Gtk gui_message fix as the netplay GUI actually uses these. 2008-07-26 10:05:17 +00:00
Scott Knauert
da20a501f9 Netplay Gtk GUI now compiles without error. It needs serious work as its not very functional and uses a lot of bad programming practices. I would seriously argue against including this in trunk unless we ifdef it out. If its just a base for GUI work in the netplay branch, then don't take my criticism the wrong way. 2008-07-26 06:20:50 +00:00
Jesse Dean
7e70821f20 First commit of netplay refactoring to current trunk, netplay core compiles, netplay gui does not 2008-07-25 21:00:12 +00:00
Scott Knauert
9263428e6d KDE4 GUI slots now work (if slot is changed elsewhere, menu shows correct slot), slot is persistant. Added multirom archive suport to KDE4 GUI rombrowser. Minor KDE4 and Gtk GUI menu text / accelerator and mnemonic updates. 2008-07-22 18:23:46 +00:00
Scott Knauert
d673b2a899 Initial fix of KDE4 GUI. It now compiles. Uses new GUI API and recieves rombrowser info from RCS. Changes to main/gui_gtk/rombrowser.c are improved comments. The KDE4 GUI still needs a lot of work. 2008-07-20 18:11:44 +00:00
Scott Knauert
a67da4502b Fixed reload() compiler warning. Shouldn't be in header since its not a public function. 2008-07-14 06:45:28 +00:00
Scott Knauert
a2ed083f95 Overhaul of messaging system. Mainly remove guifuncs.c and the associated includes. Double checked GUI=NONE build. Also changed alert_message to error_message as this is the more logical name. Also merged the three gui message functions which included a lot of repeated code as to simplify the gui api. 2008-07-14 06:42:33 +00:00
Scott Knauert
195afbe213 Fix semicolon bug in rom.c's hack detection for loop. Changed noask and messaging to only allow confirmation in GUI mode. Added #ifndefs for GUI=NONE option. Removed console confirmation code from guifuncs and the gui confirm.
-This line, and those below, will be ignored--

M    main/gui_gtk/main_gtk.c
M    main/guifuncs.c
M    main/main.c
M    main/rom.c
2008-07-13 23:46:38 +00:00
Scott Knauert
e3b1481a59 Changed rombrowser.cache format, added 4 bytes worth of 0s to the header so older (non RCS) versions simply ignore and rebuild the cache (as opposed to generally running out of memory or segfaulting). When switching back to an RCS version the cache will need to be rebuilt. Also changed some cache_entry types from unsigned short to unsigned chars to save space. Fixed two minor RCS bugs. Also added Penny Racers to the .ini. 2008-07-13 22:25:55 +00:00
Richard Goedeken
1c5a242da3 Changed new AlwaysFullscreen parameter name to GuiStartFullscreen. Reworked parameter init logic so this parameter will only affect behaviour in GUI mode 2008-07-02 04:30:35 +00:00
James Hood
61a39ba35d Added "Always Start in Full Screen Mode" checkbox to config dialog. 2008-07-01 18:04:20 +00:00
Richard Goedeken
44bb98d785 remove brackets around single conditional clauses (except romcache.*) 2008-07-01 03:33:05 +00:00
Richard Goedeken
30a1228913 style corrections for rev 722 - do not change C comments to C++ comments in a C file 2008-07-01 02:35:20 +00:00
Scott Knauert
59b84b98db Added MainWindowXPosition and MainWindowYPosition so Gtk GUI remembers screen location along with sane fallbacks in case the user changes resolution. 2008-07-01 00:27:01 +00:00
Scott Knauert
b2427e1fb3 Fix bug when changing languages in Gtk GUI, simplify code and try to exit more cleanly. 2008-06-30 23:41:32 +00:00
Scott Knauert
9eaf6e88e5 Fixed compiler warning in Glide64, initialized gltexfmt, glpixfmt, glpackfmt to 0. 2008-06-30 19:42:03 +00:00
Scott Knauert
8ea4bb4f53 Two more bugfixes thanks to Valgrind. Free string returned from gtk_combo_box_get_active_text, more correctly hanle RCS pthread. Fixed possible seg fault in filefrompath (although there still seems to be a leak somewhere here). 2008-06-30 17:44:45 +00:00
Scott Knauert
a15ed3a458 Two memory bugs found with valgrind (not freeing 7zip db and having an if(buffer[counter]) for possible unitialized values of buffer). 2008-06-30 13:10:16 +00:00
Scott Knauert
685f42a28e Rough 7zip support. 2008-06-30 01:13:04 +00:00
Scott Knauert
990d14f8fc Changed open_rom() API. Updated its use in main and the Gtk GUI accordingly. Removed Gtk GUI title change to previous - rom internal name when loading via the file chooser since its silly and we don't do it when loading roms other ways. Moved open_rom() and close_rom() to rom.c and cleaned up the merged open_rom()/rom_read() function consolidating code, fixing a seg fault when the .ini couldn't assign a goodname to the loading rom. 2008-06-26 21:02:53 +00:00
Richard Goedeken
4bf03541d0 A few small changes to the new messaging code: dont use newlines in message strings, print to console even if gui is enabled, OSD pause message should be in center, print config/install dir info message to console. Small bugfix in gtk gui statusbar variable-arg code 2008-06-26 02:57:21 +00:00
Richard Goedeken
eaa7093f42 reverted commit 677, which introduced a bug which causes very bad things to happen if you run the same game twice. I suspect this is related to the g_MemHasBeenBSwapped mechanism which was removed in this commit, but there were too many changes to pinpoint the exact cause 2008-06-26 01:10:56 +00:00
Scott Knauert
d607893707 Tied rcs messages with new main_messaging system. Fixed longstanding rcs Gtk GUI bug (cannot load rom via play button), added multifile zip support, cleaned up rom loading functions. 2008-06-25 19:48:49 +00:00
Scott Knauert
b2c2462587 Integrated 2 icons out of 4 icons into theme which I missed, deleted 2 extra unused icons. We now actually make use of the config integration with MainWindowWidth/Height. Many Gtk GUI statusbar improvements. Implemented a unified console/GUI/OSB main_message function as per Richards suggestions. This is a little rough, I'd like suggestions to improve it and include the confirm message code. 2008-06-23 05:32:45 +00:00
Scott Knauert
ec306a5b63 Fixed eeprom issue crash for nogui version due to database RCS dependence. Set default savestate to 0. Savestate now persistent via config integration. Integrated sort column and method with config. Minor speedup to sorting. 2008-06-22 16:20:06 +00:00
Scott Knauert
91efd5b04b Added basic view menu (Toolbar, Filter, Statusbar) fixing Issue 88, also integrated view menu into config system. Haven't integrated the Debugger or VCR menus into it yet, would like to discuss on the best way to do so. Made the rom properties dialogue look nicer and be able to fit on 800x600 screens. Integrated rombrowser columns into config system so one can set which columns are viewable and those selected columns will show up the same way when the emulator is restarted. Ideally we'd also track the order of the columns, but Gtk does not seem to be able to do that. Also changed the way column names are provided as to ease future translation efforts. 2008-06-22 12:19:10 +00:00
Scott Knauert
c6e067fbd2 Added bzip2 support, readded unstream fixes from minizip library and redeleted MupenIniApi (cleanup from merge). 2008-06-19 07:40:49 +00:00
Richard Goedeken
9eebbdb55b Rom Cache System has landed in the trunk. 2008-06-19 04:29:35 +00:00
Scott Knauert
3938f7024d Added a toggle for the Gtk GUI which turns OSD on or off without restarting. Documented --noosd flag. Integrated with config file. Removed old Gtk GUI config defaults from mupen64plus.conf which are no longer used (and haven't been since ~r420). Config overridden on startup by commandline flag so no loss of function for nogui users. 2008-06-14 04:15:17 +00:00
Scott Knauert
02cc55fd0c Fixed gtk bug discovered by compiling against gtk 2.12.10-2. 2008-06-13 02:00:41 +00:00
Richard Goedeken
ca505dce6d Fixed a whole bunch of warnings in the debugger. Most were 64-bit issues 2008-06-12 18:23:51 +00:00
Richard Goedeken
e0d97e7dfe Build mupen64plus instead of mupen64plus_dbg when DBG=1 to avoid install failure; do update_breakpoints() at end of init_breakpoints() in main/gui_gtk/debugger/breakpoints.c to populate list with previously set breakpoints 2008-06-11 13:33:45 +00:00
Richard Goedeken
38e92c3a76 Merged r0286-debugger branch into trunk 2008-06-06 18:25:59 +00:00
Richard Goedeken
44738c78b2 Removed NoAudioDelay core option to resolve issue #48. The Mupen64 v0.5 readme.pdf states that this option is not needed for Mupen64 v0.5, so I believe that it is unnecessary and can be removed 2008-06-03 03:43:00 +00:00
Scott Knauert
b865e7ae9a Merged Gtk toolbar style and spacing bugfix from rcs branch upon developer request. 2008-05-21 19:57:30 +00:00
Richard Goedeken
6bf7e41411 Reverted commit 434 in trunk - invalid double pointer passing to calculateMD5, no console output while loading ROMs, too slow. Please fix and commit to RCS branch 2008-05-14 04:28:42 +00:00
Scott Gorman
0051c4e170 Uses MD5 to find the entry in the database. 2008-05-14 03:53:57 +00:00
John Chadwick
cd8a9065bd Added "NoMemoryExpansion" and corresponding checkbox
Made CPU Core Settings section just "Emulation Settings" because many settings on that section are not related to the CPU Core
2008-05-13 22:50:36 +00:00
Scott Knauert
52629d2a8f Corrected some variable errors, attempt at fixing fill_header() crash
on 64-bit systems.
2008-05-11 18:54:05 +00:00
Scott Knauert
eb8755b000 Overhaul of rom handling functions.
- Calculating MD5 in Gtk GUI rom properties dialogue now works.
- Gtk GUI open rom filter now  has .z64, .v64, and .n64 extensions.
- Rom file decompression handled at single point (as opposed to 
2-3) to prevent duplication of code and make adding 7zip support easier.
- General code cleanup, renaming / comments, etc.

Testing done:
- Tested .zipped (singe and multifile archives), .gzipped, and 
uncompressed .z64 amd .v64 roms.
2008-05-11 08:20:37 +00:00
Scott Knauert
478a26518a Polished cheat GUI, general code cleanup, fixed a Gtk warning. 2008-05-09 01:09:42 +00:00
Scott Knauert
1eff426fe1 Savestate overhaul complete, messages when saving or loading, size_t / int type abuse fixed, general cleanup. 2008-05-08 00:48:13 +00:00
Scott Knauert
bef4ea9b63 - Further cleanup of savestate code.
- Now traps slot changes from core.
2008-05-07 16:50:19 +00:00
Scott Knauert
66620a6331 Changes:
- Cleaned up Gtk GUI emulation menu.
- Added accelerator group for non-meta accelerators so the don't  
interfere with entries (like the filter)
- Added savestate_get_filename() helper function. 
- Changing the savestate in the Gtk GUI is relayed to the user via the 
statusbar.
2008-05-07 09:22:29 +00:00
Jesse Dean
4a0ae5000f Resubmitting fixes to debugger. 2008-04-30 23:34:47 +00:00
James Hood
53b40c8cd5 -cleaned up save state autoincrement feature.
-added joystick mapping support for incrementing the save state slot.
2008-04-26 00:57:37 +00:00
James Hood
a6199536e4 Made the following changes to gtk gui menu for save slots (see issue 35 for details):
-Renamed menu to "Current save slot"
 -When save slot menu is opened, gui checks the current save slot and makes sure the selected slot in the menu matches it.
 -Removed "Default" slot option and replaced with slot 0. Slot 0 is the default on mupen64plus startup.
2008-04-25 21:38:36 +00:00
James Hood
666a1a2ae9 Removed code that resets selected tab of config dialog everytime it's shown. This change was made due to user request. 2008-04-24 15:20:17 +00:00
James Hood
ef14c2cabd Added cheat system support such that if a cheat is disabled during gameplay, the original memory values before the cheat was applied will be written back to memory to attempt to reverse the cheat.
For example, before this fix, if you enabled the "Mario flies without wingcap" cheat during gameplay, it would work, but if you then disabled it during gameplay, Mario would still be able to fly. Now it correctly restores the old memory values so Mario can't fly anymore after you disable the cheat. Note, because cheats are basically writing to a random area of memory, this function may not always restore the previous state depending on the way that area of memory is used by the game.
2008-04-24 07:40:31 +00:00
James Hood
d223e7530d Made cheat dialog prettier, i.e., used table layout widget to line up form widgets more neatly. 2008-04-24 05:50:20 +00:00