diff options
author | Simon Howard | 2012-10-28 23:45:08 +0000 |
---|---|---|
committer | Simon Howard | 2012-10-28 23:45:08 +0000 |
commit | 993315afc4b1fddaf8952e7e55d1373b5052dd7c (patch) | |
tree | 94aa07d101ddced8404ceaa92ce051ed17fe2a88 /src/doom/m_menu.c | |
parent | a1b2ce54d02823aa85c7df6aa016c567185451ae (diff) | |
parent | ad11652dcd8e0923432ad272e6535276c51d39eb (diff) | |
download | chocolate-doom-993315afc4b1fddaf8952e7e55d1373b5052dd7c.tar.gz chocolate-doom-993315afc4b1fddaf8952e7e55d1373b5052dd7c.tar.bz2 chocolate-doom-993315afc4b1fddaf8952e7e55d1373b5052dd7c.zip |
Merge from trunk.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2537
Diffstat (limited to 'src/doom/m_menu.c')
-rw-r--r-- | src/doom/m_menu.c | 43 |
1 files changed, 41 insertions, 2 deletions
diff --git a/src/doom/m_menu.c b/src/doom/m_menu.c index e54ac7ff..b0eeee06 100644 --- a/src/doom/m_menu.c +++ b/src/doom/m_menu.c @@ -132,6 +132,7 @@ char savegamestrings[10][SAVESTRINGSIZE]; char endstring[160]; +static boolean opldev; // // MENU TYPEDEFS @@ -1887,6 +1888,39 @@ void M_StartControlPanel (void) itemOn = currentMenu->lastOn; // JDC } +// Display OPL debug messages - hack for GENMIDI development. + +static void M_DrawOPLDev(void) +{ + extern void I_OPL_DevMessages(char *); + char debug[1024]; + char *curr, *p; + int line; + + I_OPL_DevMessages(debug); + curr = debug; + line = 0; + + for (;;) + { + p = strchr(curr, '\n'); + + if (p != NULL) + { + *p = '\0'; + } + + M_WriteText(0, line * 8, curr); + ++line; + + if (p == NULL) + { + break; + } + + curr = p + 1; + } +} // // M_Drawer @@ -1938,6 +1972,11 @@ void M_Drawer (void) return; } + if (opldev) + { + M_DrawOPLDev(); + } + if (!menuactive) return; @@ -1965,7 +2004,6 @@ void M_Drawer (void) V_DrawPatchDirect(x + SKULLXOFF, currentMenu->y - 5 + itemOn*LINEHEIGHT, W_CacheLumpName(DEH_String(skullName[whichSkull]), PU_CACHE)); - } @@ -2046,6 +2084,7 @@ void M_Init (void) default: break; } - + + opldev = M_CheckParm("-opldev") > 0; } |