Previous 15994 Revisions Next

r951 Tuesday 11th September, 2007 at 23:25:23 UTC by Nathan Woods
Fixed crash introduced in 0.118u6 update
[src/mess]messopts.c osdmess.h
[src/mess/osd/windows]configms.c
[src/mess/tools/messtest]tststubs.c
[src/osd/windows]drawd3d.c

src/osd/windows/drawd3d.c
r950r951
706706   d3d->presentation.MultiSampleType            = D3DMULTISAMPLE_NONE;
707707   d3d->presentation.SwapEffect               = D3DSWAPEFFECT_DISCARD;
708708   d3d->presentation.hDeviceWindow               = window->hwnd;
709   d3d->presentation.Windowed                  = !window->fullscreen || win_has_menu(window);
709   d3d->presentation.Windowed                  = !window->fullscreen || HAS_WINDOW_MENU;
710710   d3d->presentation.EnableAutoDepthStencil      = FALSE;
711711   d3d->presentation.AutoDepthStencilFormat      = D3DFMT_D16;
712712   d3d->presentation.Flags                     = 0;
r950r951
11071107   }
11081108
11091109   // choose a resolution: window mode case
1110   if (!window->fullscreen || win_has_menu(window))
1110   if (!window->fullscreen || HAS_WINDOW_MENU)
11111111   {
11121112      RECT client;
11131113
src/mess/tools/messtest/tststubs.c
r950r951
213213
214214
215215
216void osd_mess_options_init(void)
216void osd_mess_options_init(core_options *options)
217217{
218218}
219219
src/mess/osd/windows/configms.c
r950r951
3535
3636//============================================================
3737
38void osd_mess_options_init(void)
38void osd_mess_options_init(core_options *opts)
3939{
4040   extern const options_entry mess_win_options[];
41   options_add_entries(mame_options(), mess_win_options);
41   options_add_entries(opts, mess_win_options);
4242}
4343
4444
src/mess/messopts.c
r950r951
163163   options_add_entries(opts, mess_core_options);
164164
165165   /* add OSD-MESS specific options (hack!) */
166   osd_mess_options_init();
166   osd_mess_options_init(opts);
167167
168168   /* hacky global variable to track whether we have added device options */
169169   added_device_options = FALSE;
src/mess/osdmess.h
r950r951
1111
1212#include "osdcore.h"
1313#include "mamecore.h"
14#include "options.h"
1415
1516struct _mame_file;
1617typedef struct _mess_image mess_image;
r950r951
225226int osd_num_devices(void);
226227const char *osd_get_device_name(int idx);
227228
228void osd_mess_options_init(void);
229void osd_mess_options_init(core_options *opts);
229230
230231#endif /* __OSDMESS_H__ */

Previous 15994 Revisions Next


© 1998-2018 The MESS Team