diff --git a/Docs/Release Docs/PJgameFAQ.chm b/Docs/Release Docs/PJgameFAQ.chm deleted file mode 100644 index ea3b39454..000000000 Binary files a/Docs/Release Docs/PJgameFAQ.chm and /dev/null differ diff --git a/Docs/Release Docs/Project64.chm b/Docs/Release Docs/Project64.chm deleted file mode 100644 index 0dfbad879..000000000 Binary files a/Docs/Release Docs/Project64.chm and /dev/null differ diff --git a/Lang/Brazilian Portuguese.pj.Lang b/Lang/Brazilian Portuguese.pj.Lang index 582b5ffcd..8b65a1bda 100644 --- a/Lang/Brazilian Portuguese.pj.Lang +++ b/Lang/Brazilian Portuguese.pj.Lang @@ -69,12 +69,10 @@ //Help Menu #180# "&Ajuda" -#181# "&Manual do Usurio..." -#182# "&FAQ dos Jogos..." -#183# "Sobre &os Arquivos INI" -#184# "&Sobre o Project 64" -#185# "Frum de &Suporte" -#186# "&Home page" +#181# "Sobre &os Arquivos INI" +#182# "&Sobre o Project 64" +#183# "Frum de &Suporte" +#184# "&Home page" //Current Save Slot menu #190# "Padro" diff --git a/Lang/Bulgarian.pj.Lang b/Lang/Bulgarian.pj.Lang index a25ac0b60..257053ca1 100644 --- a/Lang/Bulgarian.pj.Lang +++ b/Lang/Bulgarian.pj.Lang @@ -69,10 +69,8 @@ //Help Menu #180# "&" -#181# "& ..." -#182# "& ..." -#183# " INI &" -#184# "& Project64" +#181# " INI &" +#182# "& Project64" //Current Save Slot menu #190# "& (.pj)" diff --git a/Lang/Chinese (Simplified).pj.Lang b/Lang/Chinese (Simplified).pj.Lang index 4f5de8427..710e5764d 100644 --- a/Lang/Chinese (Simplified).pj.Lang +++ b/Lang/Chinese (Simplified).pj.Lang @@ -69,12 +69,10 @@ //Help Menu #180# "(&H)" -#181# "ûֲ(&U)..." -#182# "Ϸ FAQ(&G)..." -#183# " &INI ļ" -#184# " Project 64(&A)" -#185# "֧̳(&F)" -#186# "ҳ(&H)" +#181# " &INI ļ" +#182# " Project 64(&A)" +#183# "֧̳(&F)" +#184# "ҳ(&H)" //Current Save Slot menu #190# "Ĭ" diff --git a/Lang/Chinese (Taiwan).pj.Lang b/Lang/Chinese (Taiwan).pj.Lang index 647d9cf5a..4a4847a66 100644 --- a/Lang/Chinese (Taiwan).pj.Lang +++ b/Lang/Chinese (Taiwan).pj.Lang @@ -69,12 +69,10 @@ //Help Menu #180# "(&H)" -#181# "ϥΪ̤U(&U)" -#182# "Game FAQ(&G)" -#183# "INI(&F)" -#184# "Project64(&A)" -#185# "U׾ (&F)" -#186# "(&H)" +#181# "INI(&F)" +#182# "Project64(&A)" +#183# "U׾ (&F)" +#184# "(&H)" //Current Save Slot menu #190# "w] &D(.pj)" diff --git a/Lang/Chinese (Traditional).pj.Lang b/Lang/Chinese (Traditional).pj.Lang index 78384f22c..3f87d49fa 100644 --- a/Lang/Chinese (Traditional).pj.Lang +++ b/Lang/Chinese (Traditional).pj.Lang @@ -69,12 +69,10 @@ //Help Menu #180# "(&H)" -#181# "ϥΪ̤U(&U)..." -#182# "`Dѵ(&G)..." -#183# " INI ɮ(&I)" -#184# " Project64(&A)" -#185# "䴩׾(&F)" -#186# "(&H)" +#181# " INI ɮ(&I)" +#182# " Project64(&A)" +#183# "䴩׾(&F)" +#184# "(&H)" //Current Save Slot menu #190# "w]" diff --git a/Lang/ChineseB5.pj.lang b/Lang/ChineseB5.pj.lang index b8b32c20c..9fc8feab4 100644 --- a/Lang/ChineseB5.pj.lang +++ b/Lang/ChineseB5.pj.lang @@ -75,10 +75,8 @@ //Help Menu #180# "U &H" -#181# "ϥΤU... &U" -#182# "`D... &G" -#183# "INI &I" -#184# "Project 64 &A" +#181# "INI &I" +#182# "Project 64 &A" //Current Save Slot menu #190# "l]w" diff --git a/Lang/ChineseGB.pj.lang b/Lang/ChineseGB.pj.lang index 1a426b727..360f2babe 100644 --- a/Lang/ChineseGB.pj.lang +++ b/Lang/ChineseGB.pj.lang @@ -75,10 +75,8 @@ //Help Menu #180# " &H" -#181# "ʹֲ &U" -#182# "⼯ &G" -#183# "INI &I" -#184# "Project 64 &A" +#181# "INI &I" +#182# "Project 64 &A" //Current Save Slot menu #190# "ʼ趨" diff --git a/Lang/Czech.pj.Lang b/Lang/Czech.pj.Lang index 04bdfb513..cfda852e4 100644 --- a/Lang/Czech.pj.Lang +++ b/Lang/Czech.pj.Lang @@ -69,10 +69,8 @@ //Help Menu #180# "&Npovda" -#181# "&Uivatelsk manul..." -#182# "&GameFAQ..." -#183# "O INI &souborech" -#184# "&O programu Project64" +#181# "O INI &souborech" +#182# "&O programu Project64" //Current Save Slot menu #190# "&Standardn sektor (.pj)" diff --git a/Lang/Danish.pj.Lang b/Lang/Danish.pj.Lang index ca0300186..18792e61f 100644 --- a/Lang/Danish.pj.Lang +++ b/Lang/Danish.pj.Lang @@ -69,10 +69,8 @@ //Help Menu #180# "&Hjlp" -#181# "&Bruger Manual..." -#182# "&Spil Hjlp..." -#183# "Om &INI filer" -#184# "&Om Project64" +#181# "Om &INI filer" +#182# "&Om Project64" //Current Save Slot menu #190# "&Standard Spilstadiestadie (.pj)" diff --git a/Lang/Dutch.pj.Lang b/Lang/Dutch.pj.Lang index 85ffa9e29..ac786f1f6 100644 --- a/Lang/Dutch.pj.Lang +++ b/Lang/Dutch.pj.Lang @@ -69,10 +69,8 @@ //Help Menu #180# "Help" -#181# "Gebruikers handleiding..." -#182# "Spel FAQ..." -#183# "Over INI Bestanden" -#184# "Over Project 64" +#181# "Over INI Bestanden" +#182# "Over Project 64" //Current Save Slot menu #190# "Standaard" diff --git a/Lang/English.pj.Lang b/Lang/English.pj.Lang index 30537f1fc..e5f61c6f0 100644 --- a/Lang/English.pj.Lang +++ b/Lang/English.pj.Lang @@ -69,12 +69,10 @@ //Help Menu #180# "&Help" -#181# "&User Manual..." -#182# "&Game FAQ..." -#183# "About &INI Files" -#184# "&About Project 64" -#185# "Support &Forum" -#186# "&Homepage" +#181# "About &INI Files" +#182# "&About Project 64" +#183# "Support &Forum" +#184# "&Homepage" //Current Save Slot menu #190# "Default" diff --git a/Lang/English_alternative.pj.Lang b/Lang/English_alternative.pj.Lang index 3cff0b60a..8679c3768 100644 --- a/Lang/English_alternative.pj.Lang +++ b/Lang/English_alternative.pj.Lang @@ -69,12 +69,10 @@ //Help Menu #180# "&Help" -#181# "&User Manual..." -#182# "&GameFAQ..." -#183# "About INI &files" -#184# "&About Project64" -#185# "Public &Forum" -#186# "&Homepage" +#181# "About INI &files" +#182# "&About Project64" +#183# "Public &Forum" +#184# "&Homepage" //Current Save Slot menu #190# "&Default slot (.pj)" diff --git a/Lang/Finnish.pj.Lang b/Lang/Finnish.pj.Lang index f9961432b..b2708101f 100644 --- a/Lang/Finnish.pj.Lang +++ b/Lang/Finnish.pj.Lang @@ -69,12 +69,10 @@ //Help Menu #180# "A&pua" -#181# "&Kyttohjeet..." -#182# "P&elien usein kysytyt kysymykset (Game FAQ)..." -#183# "Tietoa &INI tiedostoista" -#184# "&Tietoa Project 64 ohjelmasta" -#185# "T&uki keskusteluryhmt" -#186# "K&otisivu" +#181# "Tietoa &INI tiedostoista" +#182# "&Tietoa Project 64 ohjelmasta" +#183# "T&uki keskusteluryhmt" +#184# "K&otisivu" //Current Save Slot menu #190# "&Oletus" diff --git a/Lang/French.pj.Lang b/Lang/French.pj.Lang index 64b37257b..6d87fc782 100644 --- a/Lang/French.pj.Lang +++ b/Lang/French.pj.Lang @@ -69,10 +69,8 @@ //Help Menu #180# "&Aide" -#181# "&Manuel de l'utilisateur..." -#182# "&FAQ sur les jeux..." -#183# "A propos des fichiers &INI" -#184# "A propos de &Project64" +#181# "A propos des fichiers &INI" +#182# "A propos de &Project64" //Current Save Slot menu #190# "&Par dfaut (.pj)" diff --git a/Lang/German.pj.Lang b/Lang/German.pj.Lang index 6564fad4e..decb9eb0c 100644 --- a/Lang/German.pj.Lang +++ b/Lang/German.pj.Lang @@ -69,12 +69,10 @@ //Help Menu #180# "&Hilfe" -#181# "&Bedienungsanleitung..." -#182# "&Game FAQ..." -#183# "Benutzte &Dateien" -#184# "&ber Project64" -#185# "&Forum" -#186# "&Homepage" +#181# "Benutzte &Dateien" +#182# "&ber Project64" +#183# "&Forum" +#184# "&Homepage" //Current Save Slot menu #190# "&Programmeigen (.pj)" diff --git a/Lang/German_int.pj.Lang b/Lang/German_int.pj.Lang index 8e6118025..fae59cd72 100644 --- a/Lang/German_int.pj.Lang +++ b/Lang/German_int.pj.Lang @@ -69,12 +69,10 @@ //Help Menu #180# "&Hilfe" -#181# "&Bedienungsanleitung..." -#182# "&Game FAQ..." -#183# "Benutzte &Dateien" -#184# "&Ueber Project64" -#185# "&Forum" -#186# "&Homepage" +#181# "Benutzte &Dateien" +#182# "&Ueber Project64" +#183# "&Forum" +#184# "&Homepage" //Current Save Slot menu #190# "&Programmeigen (.pj)" diff --git a/Lang/German_localised.pj.Lang b/Lang/German_localised.pj.Lang index c7709bddb..2384654b0 100644 --- a/Lang/German_localised.pj.Lang +++ b/Lang/German_localised.pj.Lang @@ -69,10 +69,8 @@ //Help Menu #180# "&Hilfe" -#181# "&Bedienungsanleitung..." -#182# "&Game FAQ..." -#183# "Benutzte &Dateien" -#184# "&ber Project64" +#181# "Benutzte &Dateien" +#182# "&ber Project64" //Current Save Slot menu #190# "&Programmeigen (.pj)" diff --git a/Lang/Greek.pj.Lang b/Lang/Greek.pj.Lang index 96c3ebb0c..c6197f9e4 100644 --- a/Lang/Greek.pj.Lang +++ b/Lang/Greek.pj.Lang @@ -69,10 +69,8 @@ //Help Menu #180# "&" -#181# "& ..." -#182# "& ..." -#183# "& RDB" -#184# "& Project 64" +#181# "& RDB" +#182# "& Project 64" //Current Save Slot menu #190# "&" diff --git a/Lang/Hungarian.pj.Lang b/Lang/Hungarian.pj.Lang index ac3ba7601..0287cb3ec 100644 --- a/Lang/Hungarian.pj.Lang +++ b/Lang/Hungarian.pj.Lang @@ -69,12 +69,10 @@ //Help Menu #180# "&Sg" -#181# "&Kezelsi tmutat..." -#182# "&Gyakran feltett krdsek..." -#183# "Az &INI fjlokrl" -#184# "&Project 64 nvjegye" -#185# "Segtsg: &Frum" -#186# "&Honlap" +#181# "Az &INI fjlokrl" +#182# "&Project 64 nvjegye" +#183# "Segtsg: &Frum" +#184# "&Honlap" //Current Save Slot menu #190# "Alap" diff --git a/Lang/Italian.pj.Lang b/Lang/Italian.pj.Lang index 3c53423e6..9b33d2ad5 100644 --- a/Lang/Italian.pj.Lang +++ b/Lang/Italian.pj.Lang @@ -69,12 +69,10 @@ //Help Menu #180# "&Aiuto" -#181# "&Manuale d'uso..." -#182# "&FAQ sui giochi..." -#183# "Informazioni sui files &INI" -#184# "Informazioni sul &Project64" -#185# "&Forum di supporto" -#186# "&Homepage" +#181# "Informazioni sui files &INI" +#182# "Informazioni sul &Project64" +#183# "&Forum di supporto" +#184# "&Homepage" //Current Save Slot menu #190# "&Predefinito (.pj)" diff --git a/Lang/Italian_alternative.pj.Lang b/Lang/Italian_alternative.pj.Lang index 07a121686..ed4978512 100644 --- a/Lang/Italian_alternative.pj.Lang +++ b/Lang/Italian_alternative.pj.Lang @@ -69,10 +69,8 @@ //Help Menu #180# "&Aiuto" -#181# "&Manuale d'uso..." -#182# "&FAQ riguardante i singoli giochi..." -#183# "Dettagli sui file &INI" -#184# "Dettagli sul &Project64" +#181# "Dettagli sui file &INI" +#182# "Dettagli sul &Project64" //Current Save Slot menu #190# "&slot predefinito (.pj)" diff --git a/Lang/Japanese.pj.Lang b/Lang/Japanese.pj.Lang index 97b01604c..b03a44640 100644 --- a/Lang/Japanese.pj.Lang +++ b/Lang/Japanese.pj.Lang @@ -69,12 +69,10 @@ //Help Menu #180# "wv(&H)" -#181# "[U[}jA(&U)..." -#182# "Q[FAQ(&G)..." -#183# "ݒt@Cɂ‚(&I)" -#184# "Project 64ɂ‚(&A)" -#185# "T|[gtH[(&F)" -#186# "z[y[W(&H)" +#181# "ݒt@Cɂ‚(&I)" +#182# "Project 64ɂ‚(&A)" +#183# "T|[gtH[(&F)" +#184# "z[y[W(&H)" //Current Save Slot menu #190# "ftHg" diff --git a/Lang/Lithuanian.pj.Lang b/Lang/Lithuanian.pj.Lang index 306229d73..a24377d21 100644 --- a/Lang/Lithuanian.pj.Lang +++ b/Lang/Lithuanian.pj.Lang @@ -69,12 +69,10 @@ //Help Menu #180# "Pa&galba" -#181# "&Vartotojo vadovas..." -#182# "ai&dim DUK..." -#183# "Apie &INI failus" -#184# "&Apie Project64" -#185# "Pagalbos &forumas" -#186# "&Tinklapis" +#181# "Apie &INI failus" +#182# "&Apie Project64" +#183# "Pagalbos &forumas" +#184# "&Tinklapis" //Current Save Slot menu #190# "&Nustatyta" diff --git a/Lang/Norwegian.pj.Lang b/Lang/Norwegian.pj.Lang index 3f58dfcf1..979c2e8b1 100644 --- a/Lang/Norwegian.pj.Lang +++ b/Lang/Norwegian.pj.Lang @@ -69,12 +69,10 @@ //Help Menu #180# "&Hjelp" -#181# "&Bruker manual..." -#182# "&Spill FAQ..." -#183# "Om &ini filene" -#184# "&Om Project 64" -#185# "Sttte &Forum" -#186# "&Hjemmeside" +#181# "Om &ini filene" +#182# "&Om Project 64" +#183# "Sttte &Forum" +#184# "&Hjemmeside" //Current Save Slot menu #190# "&Standard (.pj)" diff --git a/Lang/Polish.pj.Lang b/Lang/Polish.pj.Lang index 0ec41c8a0..5813df683 100644 --- a/Lang/Polish.pj.Lang +++ b/Lang/Polish.pj.Lang @@ -69,12 +69,10 @@ //Help Menu #180# "Po&moc" -#181# "&Podrcznik uytkownika..." -#182# "&Game FAQ..." -#183# "O plikach &INI" -#184# "&O programie Project 64" -#185# "Forum" -#186# "&Strona domowa" +#181# "O plikach &INI" +#182# "&O programie Project 64" +#183# "Forum" +#184# "&Strona domowa" //Current Save Slot menu #190# "Domylny" diff --git a/Lang/Russian.pj.Lang b/Lang/Russian.pj.Lang index 9b14da9c0..d07d3ee1a 100644 --- a/Lang/Russian.pj.Lang +++ b/Lang/Russian.pj.Lang @@ -69,12 +69,10 @@ //Help Menu #180# "&" -#181# "&..." -#182# "& ..." -#183# " &" -#184# "& Project 64" -#185# "& " -#186# "& " +#181# " &" +#182# "& Project 64" +#183# "& " +#184# "& " //Current Save Slot menu #190# " " diff --git a/Lang/Spanish (South America).pj.Lang b/Lang/Spanish (South America).pj.Lang index 65c9dfe7a..dde4e98db 100644 --- a/Lang/Spanish (South America).pj.Lang +++ b/Lang/Spanish (South America).pj.Lang @@ -69,14 +69,12 @@ //Help Menu #180# "A&yuda" -#181# "&Manual del Usuario..." -#182# "&FAQ del Juego..." -#183# "Acerca de los archi&vos INI" -#184# "A&cerca de Project 64" +#181# "Acerca de los archi&vos INI" +#182# "A&cerca de Project 64" //Help Menu for 1.6 -#185# "Foro de Ay&uda" -#186# "&Pagina Web" +#183# "Foro de Ay&uda" +#184# "&Pagina Web" //Current Save Slot menu #190# "Prederteminado" diff --git a/Lang/Spanish (Spain).pj.Lang b/Lang/Spanish (Spain).pj.Lang index 497e1d829..5bbcef7f3 100644 --- a/Lang/Spanish (Spain).pj.Lang +++ b/Lang/Spanish (Spain).pj.Lang @@ -69,12 +69,10 @@ //Help Menu #180# "A&yuda" -#181# "&Manual del Usuario..." -#182# "&FAQ del Juego..." -#183# "Acerca de los archi&vos INI" -#184# "A&cerca de Project 64" -#185# "Visitar el &Foro" -#186# "&Pgina Principal" +#181# "Acerca de los archi&vos INI" +#182# "A&cerca de Project 64" +#183# "Visitar el &Foro" +#184# "&Pgina Principal" //Current Save Slot menu #190# "Prederteminado" diff --git a/Lang/Spanish.pj.Lang b/Lang/Spanish.pj.Lang index 306475a32..fb3f100f0 100644 --- a/Lang/Spanish.pj.Lang +++ b/Lang/Spanish.pj.Lang @@ -69,10 +69,8 @@ //Help Menu #180# "A&yuda" -#181# "&Manual del Usuario..." -#182# "&FAQ del Juego..." -#183# "Acerca de los archi&vos INI" -#184# "A&cerca de Project 64" +#181# "Acerca de los archi&vos INI" +#182# "A&cerca de Project 64" //Current Save Slot menu #190# "Prederteminado" diff --git a/Lang/Swedish.pj.Lang b/Lang/Swedish.pj.Lang index 8863fa6e2..0e9795a80 100644 --- a/Lang/Swedish.pj.Lang +++ b/Lang/Swedish.pj.Lang @@ -69,10 +69,8 @@ //Help Menu #180# "&Hjlp" -#181# "&Anvndar Manual..." -#182# "&Spel FAQ..." -#183# "Om &INI Filer" -#184# "&Om Project 64" +#181# "Om &INI Filer" +#182# "&Om Project 64" //Current Save Slot menu #190# "Standard" @@ -428,8 +426,8 @@ Byta plugin och starta om nu?" * Menu **************************************** **************************************** */ //Help Menu -#185# "Support &Forum" -#186# "&Hemsida" +#183# "Support &Forum" +#184# "&Hemsida" /**************************************** **************************************** * * Rom Browser * diff --git a/Lang/T-Chinese.pj.Lang b/Lang/T-Chinese.pj.Lang index daff00843..2cb7114bd 100644 --- a/Lang/T-Chinese.pj.Lang +++ b/Lang/T-Chinese.pj.Lang @@ -69,10 +69,8 @@ //Help Menu #180# "(&H)" -#181# "ϥΪ̤U(&U)" -#182# "C(&G)" -#183# "INIɮ(&F)" -#184# "Project64(&A)" +#181# "INIɮ(&F)" +#182# "Project64(&A)" //Current Save Slot menu #190# "w] &D(.pj)" diff --git a/Lang/Ukrainian.pj.Lang b/Lang/Ukrainian.pj.Lang index 3f9266d37..9fbc7bc6a 100644 --- a/Lang/Ukrainian.pj.Lang +++ b/Lang/Ukrainian.pj.Lang @@ -69,12 +69,10 @@ //Help Menu #180# "&" -#181# "&..." -#182# "& ..." -#183# " &" -#184# "& Project 64" -#185# " &" -#186# "& " +#181# " &" +#182# "& Project 64" +#183# " &" +#184# "& " //Current Save Slot menu #190# "& " diff --git a/Source/Installer/Installer.iss b/Source/Installer/Installer.iss index 1dd04c4c8..a9128ab14 100644 --- a/Source/Installer/Installer.iss +++ b/Source/Installer/Installer.iss @@ -24,8 +24,6 @@ Filename: "{app}\Project64.exe"; Description: "{cm:LaunchProgram,{#StringChange( [Files] Source: "{#BaseDir}\Bin\{#Configuration}\Project64.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BaseDir}\Docs\Release Docs\PJgameFAQ.chm"; DestDir: "{app}" -Source: "{#BaseDir}\Docs\Release Docs\Project64.chm"; DestDir: "{app}" Source: "{#BaseDir}\Docs\Release Docs\Cheat - Changes.txt"; DestDir: "{app}\Docs" Source: "{#BaseDir}\Docs\Release Docs\Cheat - Readme.txt"; DestDir: "{app}\Docs" Source: "{#BaseDir}\Docs\Release Docs\GameFAQ - WhatsNew.txt"; DestDir: "{app}\Docs" diff --git a/Source/Project64/3rd Party/HTML Help/HTMLHELP.H b/Source/Project64/3rd Party/HTML Help/HTMLHELP.H deleted file mode 100644 index 58c6177ab..000000000 --- a/Source/Project64/3rd Party/HTML Help/HTMLHELP.H +++ /dev/null @@ -1,429 +0,0 @@ -/**************************************************************************** -* * -* HtmlHelp.h * -* * -* Copyright (c) 1996-1997, Microsoft Corp. All rights reserved. * -* * -****************************************************************************/ - -#pragma comment(lib, "3rd Party\\HTML Help\\HTMLHELP.LIB") - - -#if _MSC_VER > 1000 -#pragma once -#endif - -#ifndef __HTMLHELP_H__ -#define __HTMLHELP_H__ - -#ifdef __cplusplus -extern "C" { -#endif // __cplusplus - -// Defines for Win64 -#ifndef _WIN64 -#define DWORD_PTR DWORD -#endif - -// Commands to pass to HtmlHelp() - -#define HH_DISPLAY_TOPIC 0x0000 -#define HH_HELP_FINDER 0x0000 // WinHelp equivalent -#define HH_DISPLAY_TOC 0x0001 -#define HH_DISPLAY_INDEX 0x0002 -#define HH_DISPLAY_SEARCH 0x0003 -#define HH_SET_WIN_TYPE 0x0004 -#define HH_GET_WIN_TYPE 0x0005 -#define HH_GET_WIN_HANDLE 0x0006 -#define HH_ENUM_INFO_TYPE 0x0007 // Get Info type name, call repeatedly to enumerate, -1 at end -#define HH_SET_INFO_TYPE 0x0008 // Add Info type to filter. -#define HH_SYNC 0x0009 -#define HH_RESERVED1 0x000A -#define HH_RESERVED2 0x000B -#define HH_RESERVED3 0x000C -#define HH_KEYWORD_LOOKUP 0x000D -#define HH_DISPLAY_TEXT_POPUP 0x000E // display string resource id or text in a popup window -#define HH_HELP_CONTEXT 0x000F // display mapped numeric value in dwData -#define HH_TP_HELP_CONTEXTMENU 0x0010 // text popup help, same as WinHelp HELP_CONTEXTMENU -#define HH_TP_HELP_WM_HELP 0x0011 // text popup help, same as WinHelp HELP_WM_HELP -#define HH_CLOSE_ALL 0x0012 // close all windows opened directly or indirectly by the caller -#define HH_ALINK_LOOKUP 0x0013 // ALink version of HH_KEYWORD_LOOKUP -#define HH_GET_LAST_ERROR 0x0014 // not currently implemented // See HHERROR.h -#define HH_ENUM_CATEGORY 0x0015 // Get category name, call repeatedly to enumerate, -1 at end -#define HH_ENUM_CATEGORY_IT 0x0016 // Get category info type members, call repeatedly to enumerate, -1 at end -#define HH_RESET_IT_FILTER 0x0017 // Clear the info type filter of all info types. -#define HH_SET_INCLUSIVE_FILTER 0x0018 // set inclusive filtering method for untyped topics to be included in display -#define HH_SET_EXCLUSIVE_FILTER 0x0019 // set exclusive filtering method for untyped topics to be excluded from display -#define HH_INITIALIZE 0x001C // Initializes the help system. -#define HH_UNINITIALIZE 0x001D // Uninitializes the help system. -#define HH_PRETRANSLATEMESSAGE 0x00fd // Pumps messages. (NULL, NULL, MSG*). -#define HH_SET_GLOBAL_PROPERTY 0x00fc // Set a global property. (NULL, NULL, HH_GPROP) - -#define HHWIN_PROP_TAB_AUTOHIDESHOW (1 << 0) // Automatically hide/show tri-pane window -#define HHWIN_PROP_ONTOP (1 << 1) // Top-most window -#define HHWIN_PROP_NOTITLEBAR (1 << 2) // no title bar -#define HHWIN_PROP_NODEF_STYLES (1 << 3) // no default window styles (only HH_WINTYPE.dwStyles) -#define HHWIN_PROP_NODEF_EXSTYLES (1 << 4) // no default extended window styles (only HH_WINTYPE.dwExStyles) -#define HHWIN_PROP_TRI_PANE (1 << 5) // use a tri-pane window -#define HHWIN_PROP_NOTB_TEXT (1 << 6) // no text on toolbar buttons -#define HHWIN_PROP_POST_QUIT (1 << 7) // post WM_QUIT message when window closes -#define HHWIN_PROP_AUTO_SYNC (1 << 8) // automatically ssync contents and index -#define HHWIN_PROP_TRACKING (1 << 9) // send tracking notification messages -#define HHWIN_PROP_TAB_SEARCH (1 << 10) // include search tab in navigation pane -#define HHWIN_PROP_TAB_HISTORY (1 << 11) // include history tab in navigation pane -#define HHWIN_PROP_TAB_FAVORITES (1 << 12) // include favorites tab in navigation pane -#define HHWIN_PROP_CHANGE_TITLE (1 << 13) // Put current HTML title in title bar -#define HHWIN_PROP_NAV_ONLY_WIN (1 << 14) // Only display the navigation window -#define HHWIN_PROP_NO_TOOLBAR (1 << 15) // Don't display a toolbar -#define HHWIN_PROP_MENU (1 << 16) // Menu -#define HHWIN_PROP_TAB_ADVSEARCH (1 << 17) // Advanced FTS UI. -#define HHWIN_PROP_USER_POS (1 << 18) // After initial creation, user controls window size/position -#define HHWIN_PROP_TAB_CUSTOM1 (1 << 19) // Use custom tab #1 -#define HHWIN_PROP_TAB_CUSTOM2 (1 << 20) // Use custom tab #2 -#define HHWIN_PROP_TAB_CUSTOM3 (1 << 21) // Use custom tab #3 -#define HHWIN_PROP_TAB_CUSTOM4 (1 << 22) // Use custom tab #4 -#define HHWIN_PROP_TAB_CUSTOM5 (1 << 23) // Use custom tab #5 -#define HHWIN_PROP_TAB_CUSTOM6 (1 << 24) // Use custom tab #6 -#define HHWIN_PROP_TAB_CUSTOM7 (1 << 25) // Use custom tab #7 -#define HHWIN_PROP_TAB_CUSTOM8 (1 << 26) // Use custom tab #8 -#define HHWIN_PROP_TAB_CUSTOM9 (1 << 27) // Use custom tab #9 -#define HHWIN_TB_MARGIN (1 << 28) // the window type has a margin - -#define HHWIN_PARAM_PROPERTIES (1 << 1) // valid fsWinProperties -#define HHWIN_PARAM_STYLES (1 << 2) // valid dwStyles -#define HHWIN_PARAM_EXSTYLES (1 << 3) // valid dwExStyles -#define HHWIN_PARAM_RECT (1 << 4) // valid rcWindowPos -#define HHWIN_PARAM_NAV_WIDTH (1 << 5) // valid iNavWidth -#define HHWIN_PARAM_SHOWSTATE (1 << 6) // valid nShowState -#define HHWIN_PARAM_INFOTYPES (1 << 7) // valid apInfoTypes -#define HHWIN_PARAM_TB_FLAGS (1 << 8) // valid fsToolBarFlags -#define HHWIN_PARAM_EXPANSION (1 << 9) // valid fNotExpanded -#define HHWIN_PARAM_TABPOS (1 << 10) // valid tabpos -#define HHWIN_PARAM_TABORDER (1 << 11) // valid taborder -#define HHWIN_PARAM_HISTORY_COUNT (1 << 12) // valid cHistory -#define HHWIN_PARAM_CUR_TAB (1 << 13) // valid curNavType - -#define HHWIN_BUTTON_EXPAND (1 << 1) // Expand/contract button -#define HHWIN_BUTTON_BACK (1 << 2) // Back button -#define HHWIN_BUTTON_FORWARD (1 << 3) // Forward button -#define HHWIN_BUTTON_STOP (1 << 4) // Stop button -#define HHWIN_BUTTON_REFRESH (1 << 5) // Refresh button -#define HHWIN_BUTTON_HOME (1 << 6) // Home button -#define HHWIN_BUTTON_BROWSE_FWD (1 << 7) // not implemented -#define HHWIN_BUTTON_BROWSE_BCK (1 << 8) // not implemented -#define HHWIN_BUTTON_NOTES (1 << 9) // not implemented -#define HHWIN_BUTTON_CONTENTS (1 << 10) // not implemented -#define HHWIN_BUTTON_SYNC (1 << 11) // Sync button -#define HHWIN_BUTTON_OPTIONS (1 << 12) // Options button -#define HHWIN_BUTTON_PRINT (1 << 13) // Print button -#define HHWIN_BUTTON_INDEX (1 << 14) // not implemented -#define HHWIN_BUTTON_SEARCH (1 << 15) // not implemented -#define HHWIN_BUTTON_HISTORY (1 << 16) // not implemented -#define HHWIN_BUTTON_FAVORITES (1 << 17) // not implemented -#define HHWIN_BUTTON_JUMP1 (1 << 18) -#define HHWIN_BUTTON_JUMP2 (1 << 19) -#define HHWIN_BUTTON_ZOOM (1 << 20) -#define HHWIN_BUTTON_TOC_NEXT (1 << 21) -#define HHWIN_BUTTON_TOC_PREV (1 << 22) - -#define HHWIN_DEF_BUTTONS \ - (HHWIN_BUTTON_EXPAND | \ - HHWIN_BUTTON_BACK | \ - HHWIN_BUTTON_OPTIONS | \ - HHWIN_BUTTON_PRINT) - -// Button IDs - -#define IDTB_EXPAND 200 -#define IDTB_CONTRACT 201 -#define IDTB_STOP 202 -#define IDTB_REFRESH 203 -#define IDTB_BACK 204 -#define IDTB_HOME 205 -#define IDTB_SYNC 206 -#define IDTB_PRINT 207 -#define IDTB_OPTIONS 208 -#define IDTB_FORWARD 209 -#define IDTB_NOTES 210 // not implemented -#define IDTB_BROWSE_FWD 211 -#define IDTB_BROWSE_BACK 212 -#define IDTB_CONTENTS 213 // not implemented -#define IDTB_INDEX 214 // not implemented -#define IDTB_SEARCH 215 // not implemented -#define IDTB_HISTORY 216 // not implemented -#define IDTB_FAVORITES 217 // not implemented -#define IDTB_JUMP1 218 -#define IDTB_JUMP2 219 -#define IDTB_CUSTOMIZE 221 -#define IDTB_ZOOM 222 -#define IDTB_TOC_NEXT 223 -#define IDTB_TOC_PREV 224 - -// Notification codes - -#define HHN_FIRST (0U-860U) -#define HHN_LAST (0U-879U) - -#define HHN_NAVCOMPLETE (HHN_FIRST-0) -#define HHN_TRACK (HHN_FIRST-1) -#define HHN_WINDOW_CREATE (HHN_FIRST-2) - -typedef struct tagHHN_NOTIFY -{ - NMHDR hdr; - PCSTR pszUrl; // Multi-byte, null-terminated string -} HHN_NOTIFY; - -typedef struct tagHH_POPUP -{ - int cbStruct; // sizeof this structure - HINSTANCE hinst; // instance handle for string resource - UINT idString; // string resource id, or text id if pszFile is specified in HtmlHelp call - LPCTSTR pszText; // used if idString is zero - POINT pt; // top center of popup window - COLORREF clrForeground; // use -1 for default - COLORREF clrBackground; // use -1 for default - RECT rcMargins; // amount of space between edges of window and text, -1 for each member to ignore - LPCTSTR pszFont; // facename, point size, char set, BOLD ITALIC UNDERLINE -} HH_POPUP; - -typedef struct tagHH_AKLINK -{ - int cbStruct; // sizeof this structure - BOOL fReserved; // must be FALSE (really!) - LPCTSTR pszKeywords; // semi-colon separated keywords - LPCTSTR pszUrl; // URL to jump to if no keywords found (may be NULL) - LPCTSTR pszMsgText; // Message text to display in MessageBox if pszUrl is NULL and no keyword match - LPCTSTR pszMsgTitle; // Message text to display in MessageBox if pszUrl is NULL and no keyword match - LPCTSTR pszWindow; // Window to display URL in - BOOL fIndexOnFail; // Displays index if keyword lookup fails. -} HH_AKLINK; - -enum { - HHWIN_NAVTYPE_TOC, - HHWIN_NAVTYPE_INDEX, - HHWIN_NAVTYPE_SEARCH, - HHWIN_NAVTYPE_FAVORITES, - HHWIN_NAVTYPE_HISTORY, // not implemented - HHWIN_NAVTYPE_AUTHOR, - HHWIN_NAVTYPE_CUSTOM_FIRST = 11 -}; - -enum { - IT_INCLUSIVE, - IT_EXCLUSIVE, - IT_HIDDEN, -}; - -typedef struct tagHH_ENUM_IT -{ - int cbStruct; // size of this structure - int iType; // the type of the information type ie. Inclusive, Exclusive, or Hidden - LPCSTR pszCatName; // Set to the name of the Category to enumerate the info types in a category; else NULL - LPCSTR pszITName; // volitile pointer to the name of the infotype. Allocated by call. Caller responsible for freeing - LPCSTR pszITDescription; // volitile pointer to the description of the infotype. -} HH_ENUM_IT, *PHH_ENUM_IT; - -typedef struct tagHH_ENUM_CAT -{ - int cbStruct; // size of this structure - LPCSTR pszCatName; // volitile pointer to the category name - LPCSTR pszCatDescription; // volitile pointer to the category description -} HH_ENUM_CAT, *PHH_ENUM_CAT; - -typedef struct tagHH_SET_INFOTYPE -{ - int cbStruct; // the size of this structure - LPCSTR pszCatName; // the name of the category, if any, the InfoType is a member of. - LPCSTR pszInfoTypeName; // the name of the info type to add to the filter -} HH_SET_INFOTYPE, *PHH_SET_INFOTYPE; - -typedef DWORD HH_INFOTYPE; -typedef HH_INFOTYPE* PHH_INFOTYPE; - -enum { - HHWIN_NAVTAB_TOP, - HHWIN_NAVTAB_LEFT, - HHWIN_NAVTAB_BOTTOM, -}; - -#define HH_MAX_TABS 19 // maximum number of tabs - -enum { - HH_TAB_CONTENTS, - HH_TAB_INDEX, - HH_TAB_SEARCH, - HH_TAB_FAVORITES, - HH_TAB_HISTORY, - HH_TAB_AUTHOR, - - HH_TAB_CUSTOM_FIRST = 11, - HH_TAB_CUSTOM_LAST = HH_MAX_TABS -}; - -#define HH_MAX_TABS_CUSTOM (HH_TAB_CUSTOM_LAST - HH_TAB_CUSTOM_FIRST + 1) - -// HH_DISPLAY_SEARCH Command Related Structures and Constants - -#define HH_FTS_DEFAULT_PROXIMITY (-1) - -typedef struct tagHH_FTS_QUERY -{ - int cbStruct; // Sizeof structure in bytes. - BOOL fUniCodeStrings; // TRUE if all strings are unicode. - LPCTSTR pszSearchQuery; // String containing the search query. - LONG iProximity; // Word proximity. - BOOL fStemmedSearch; // TRUE for StemmedSearch only. - BOOL fTitleOnly; // TRUE for Title search only. - BOOL fExecute; // TRUE to initiate the search. - LPCTSTR pszWindow; // Window to display in -} HH_FTS_QUERY; - -// HH_WINTYPE Structure - -typedef struct tagHH_WINTYPE { - int cbStruct; // IN: size of this structure including all Information Types - BOOL fUniCodeStrings; // IN/OUT: TRUE if all strings are in UNICODE - LPCTSTR pszType; // IN/OUT: Name of a type of window - DWORD fsValidMembers; // IN: Bit flag of valid members (HHWIN_PARAM_) - DWORD fsWinProperties; // IN/OUT: Properties/attributes of the window (HHWIN_) - - LPCTSTR pszCaption; // IN/OUT: Window title - DWORD dwStyles; // IN/OUT: Window styles - DWORD dwExStyles; // IN/OUT: Extended Window styles - RECT rcWindowPos; // IN: Starting position, OUT: current position - int nShowState; // IN: show state (e.g., SW_SHOW) - - HWND hwndHelp; // OUT: window handle - HWND hwndCaller; // OUT: who called this window - - HH_INFOTYPE* paInfoTypes; // IN: Pointer to an array of Information Types - - // The following members are only valid if HHWIN_PROP_TRI_PANE is set - - HWND hwndToolBar; // OUT: toolbar window in tri-pane window - HWND hwndNavigation; // OUT: navigation window in tri-pane window - HWND hwndHTML; // OUT: window displaying HTML in tri-pane window - int iNavWidth; // IN/OUT: width of navigation window - RECT rcHTML; // OUT: HTML window coordinates - - LPCTSTR pszToc; // IN: Location of the table of contents file - LPCTSTR pszIndex; // IN: Location of the index file - LPCTSTR pszFile; // IN: Default location of the html file - LPCTSTR pszHome; // IN/OUT: html file to display when Home button is clicked - DWORD fsToolBarFlags; // IN: flags controling the appearance of the toolbar - BOOL fNotExpanded; // IN: TRUE/FALSE to contract or expand, OUT: current state - int curNavType; // IN/OUT: UI to display in the navigational pane - int tabpos; // IN/OUT: HHWIN_NAVTAB_TOP, HHWIN_NAVTAB_LEFT, or HHWIN_NAVTAB_BOTTOM - int idNotify; // IN: ID to use for WM_NOTIFY messages - BYTE tabOrder[HH_MAX_TABS + 1]; // IN/OUT: tab order: Contents, Index, Search, History, Favorites, Reserved 1-5, Custom tabs - int cHistory; // IN/OUT: number of history items to keep (default is 30) - LPCTSTR pszJump1; // Text for HHWIN_BUTTON_JUMP1 - LPCTSTR pszJump2; // Text for HHWIN_BUTTON_JUMP2 - LPCTSTR pszUrlJump1; // URL for HHWIN_BUTTON_JUMP1 - LPCTSTR pszUrlJump2; // URL for HHWIN_BUTTON_JUMP2 - RECT rcMinSize; // Minimum size for window (ignored in version 1) - int cbInfoTypes; // size of paInfoTypes; - LPCTSTR pszCustomTabs; // multiple zero-terminated strings -} HH_WINTYPE, *PHH_WINTYPE; - -enum { - HHACT_TAB_CONTENTS, - HHACT_TAB_INDEX, - HHACT_TAB_SEARCH, - HHACT_TAB_HISTORY, - HHACT_TAB_FAVORITES, - - HHACT_EXPAND, - HHACT_CONTRACT, - HHACT_BACK, - HHACT_FORWARD, - HHACT_STOP, - HHACT_REFRESH, - HHACT_HOME, - HHACT_SYNC, - HHACT_OPTIONS, - HHACT_PRINT, - HHACT_HIGHLIGHT, - HHACT_CUSTOMIZE, - HHACT_JUMP1, - HHACT_JUMP2, - HHACT_ZOOM, - HHACT_TOC_NEXT, - HHACT_TOC_PREV, - HHACT_NOTES, - - HHACT_LAST_ENUM, -}; - -typedef struct tagHHNTRACK -{ - NMHDR hdr; - PCSTR pszCurUrl; // Multi-byte, null-terminated string - int idAction; // HHACT_ value - HH_WINTYPE* phhWinType; // Current window type structure -} HHNTRACK; - -HWND -WINAPI -HtmlHelpA( - HWND hwndCaller, - LPCSTR pszFile, - UINT uCommand, - DWORD_PTR dwData - ); - -HWND -WINAPI -HtmlHelpW( - HWND hwndCaller, - LPCWSTR pszFile, - UINT uCommand, - DWORD_PTR dwData - ); -#ifdef UNICODE -#define HtmlHelp HtmlHelpW -#else -#define HtmlHelp HtmlHelpA -#endif // !UNICODE - -// Use the following for GetProcAddress to load from hhctrl.ocx - -#define ATOM_HTMLHELP_API_ANSI (LPTSTR)((DWORD)((WORD)(14))) -#define ATOM_HTMLHELP_API_UNICODE (LPTSTR)((DWORD)((WORD)(15))) - -/////////////////////////////////////////////////////////////////////////////// -// -// Global Control Properties. -// -typedef enum tagHH_GPROPID -{ - HH_GPROPID_SINGLETHREAD=1, // VARIANT_BOOL: True for single thread - HH_GPROPID_TOOLBAR_MARGIN=2, // long: Provides a left/right margin around the toolbar. - HH_GPROPID_UI_LANGUAGE=3, // long: LangId of the UI. - HH_GPROPID_CURRENT_SUBSET=4, // BSTR: Current subset. - HH_GPROPID_CONTENT_LANGUAGE=5 // long: LandId for desired content. -} HH_GPROPID; - -/////////////////////////////////////////////////////////////////////////////// -// -// Global Property structure -// -#ifdef __oaidl_h__ - -#pragma pack(push, 8) - -typedef struct tagHH_GLOBAL_PROPERTY -{ - HH_GPROPID id; - VARIANT var; -} HH_GLOBAL_PROPERTY ; - -#pragma pack(pop) -#endif - -#ifdef __cplusplus -} -#endif // __cplusplus - -#endif // __HTMLHELP_H__ diff --git a/Source/Project64/3rd Party/HTML Help/HTMLHELP.LIB b/Source/Project64/3rd Party/HTML Help/HTMLHELP.LIB deleted file mode 100644 index 78f4a55b3..000000000 Binary files a/Source/Project64/3rd Party/HTML Help/HTMLHELP.LIB and /dev/null differ diff --git a/Source/Project64/Multilanguage.h b/Source/Project64/Multilanguage.h index aa677cd67..1cf33f606 100644 --- a/Source/Project64/Multilanguage.h +++ b/Source/Project64/Multilanguage.h @@ -88,12 +88,10 @@ enum LanguageStringID{ MENU_LANGUAGE = 175, MENU_HELP = 180, - MENU_USER_MAN = 181, - MENU_GAME_FAQ = 182, - MENU_ABOUT_INI = 183, - MENU_ABOUT_PJ64 = 184, - MENU_FORUM = 185, - MENU_HOMEPAGE = 186, + MENU_ABOUT_INI = 181, + MENU_ABOUT_PJ64 = 182, + MENU_FORUM = 183, + MENU_HOMEPAGE = 184, //Current Save Slot menu MENU_SLOT_DEFAULT = 190, diff --git a/Source/Project64/Multilanguage/Language Class.cpp b/Source/Project64/Multilanguage/Language Class.cpp index 1570d5d51..4a4ac197b 100644 --- a/Source/Project64/Multilanguage/Language Class.cpp +++ b/Source/Project64/Multilanguage/Language Class.cpp @@ -95,8 +95,6 @@ void CLanguage::LoadDefaultStrings (void) DEF_STR(MENU_DEBUGGER, "&Debugger" ); DEF_STR(MENU_LANGUAGE, "&Language" ); DEF_STR(MENU_HELP, "&Help" ); - DEF_STR(MENU_USER_MAN, "&User Manual..." ); - DEF_STR(MENU_GAME_FAQ, "&Game FAQ..." ); DEF_STR(MENU_ABOUT_INI, "About &INI Files" ); DEF_STR(MENU_ABOUT_PJ64, "&About Project 64" ); diff --git a/Source/Project64/Project64.vcproj b/Source/Project64/Project64.vcproj index fe3238282..42494391c 100644 --- a/Source/Project64/Project64.vcproj +++ b/Source/Project64/Project64.vcproj @@ -1312,14 +1312,6 @@ RelativePath="3rd Party\zip.h" > - - - - diff --git a/Source/Project64/Project64.vcxproj b/Source/Project64/Project64.vcxproj index cc352ba00..1a7589751 100644 --- a/Source/Project64/Project64.vcxproj +++ b/Source/Project64/Project64.vcxproj @@ -313,7 +313,6 @@ - diff --git a/Source/Project64/Project64.vcxproj.filters b/Source/Project64/Project64.vcxproj.filters index 24f069bea..7889ae8fb 100644 --- a/Source/Project64/Project64.vcxproj.filters +++ b/Source/Project64/Project64.vcxproj.filters @@ -100,9 +100,6 @@ {21f6da31-289d-4d03-80bb-b77fe60355d7} - - {53a1d70d-ec39-415a-88eb-70d6b6eaa918} - {ef4a164b-c5ed-4469-a0e2-4eb21f800b11} @@ -815,9 +812,6 @@ Header Files\3rd Party Headers - - Header Files\3rd Party Headers\HTML Help - Header Files\3rd Party Headers\Zlib Headers diff --git a/Source/Project64/User Interface/Main Menu Class.cpp b/Source/Project64/User Interface/Main Menu Class.cpp index 52f397cde..9bcd78300 100644 --- a/Source/Project64/User Interface/Main Menu Class.cpp +++ b/Source/Project64/User Interface/Main Menu Class.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "..\\3rd Party\\HTML Help\\HTMLHELP.H" CMainMenu::CMainMenu ( CMainGui * hMainWindow ): CBaseMenu(), @@ -482,36 +481,6 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI Notify().DisplayMessage(3,"Save Slot (%s) selected",GetSaveSlotString((MenuID - ID_CURRENT_SAVE_1) + 1).c_str()); g_Settings->SaveDword(Game_CurrentSaveState,(DWORD)((MenuID - ID_CURRENT_SAVE_1) + 1)); break; - case ID_HELP_CONTENTS: - { - char path_buffer[_MAX_PATH], drive[_MAX_DRIVE] ,dir[_MAX_DIR]; - char fname[_MAX_FNAME],ext[_MAX_EXT], HelpFileName[_MAX_PATH]; - - GetModuleFileName(NULL,path_buffer,sizeof(path_buffer)); - _splitpath(path_buffer, drive, dir, fname, ext); - _makepath(HelpFileName, drive, dir, "Project64", "chm"); - - if (HtmlHelp((HWND)hWnd, HelpFileName, HH_DISPLAY_TOPIC, 0) == NULL) { - ShellExecute((HWND)hWnd, "open", HelpFileName, NULL, NULL, SW_SHOW); - } - } - break; - case ID_HELP_GAMEFAQ: - { - char path_buffer[_MAX_PATH], drive[_MAX_DRIVE] ,dir[_MAX_DIR]; - char fname[_MAX_FNAME],ext[_MAX_EXT], HelpFileName[_MAX_PATH], HelpFileName2[_MAX_PATH]; - - GetModuleFileName(NULL,path_buffer,sizeof(path_buffer)); - _splitpath( path_buffer, drive, dir, fname, ext ); - _makepath( HelpFileName, drive, dir, "PJgameFAQ", "chm" ); - strcpy(HelpFileName2, HelpFileName); - strcat(HelpFileName, "::/html/8 FAQ/games/_index.htm"); - - if (HtmlHelp((HWND)hWnd, HelpFileName, HH_DISPLAY_TOPIC, 0) == NULL) { - ShellExecute((HWND)hWnd, "open", HelpFileName2, NULL, NULL, SW_SHOW); - } - } - break; case ID_HELP_SUPPORTFORUM: ShellExecute(NULL, "open", "http://forum.pj64-emu.com/", NULL, NULL, SW_SHOWMAXIMIZED); break; case ID_HELP_HOMEPAGE: ShellExecute(NULL, "open", "http://www.pj64-emu.com", NULL, NULL, SW_SHOWMAXIMIZED); break; case ID_HELP_ABOUT: _Gui->AboutBox(); break; @@ -1129,9 +1098,6 @@ void CMainMenu::FillOutMenu ( HMENU hMenu ) { ****************/ MenuItemList HelpMenu; - HelpMenu.push_back(MENU_ITEM(ID_HELP_CONTENTS, MENU_USER_MAN )); - HelpMenu.push_back(MENU_ITEM(ID_HELP_GAMEFAQ, MENU_GAME_FAQ )); - HelpMenu.push_back(MENU_ITEM(SPLITER )); HelpMenu.push_back(MENU_ITEM(ID_HELP_SUPPORTFORUM, MENU_FORUM )); HelpMenu.push_back(MENU_ITEM(ID_HELP_HOMEPAGE, MENU_HOMEPAGE )); HelpMenu.push_back(MENU_ITEM(SPLITER )); diff --git a/Source/Project64/User Interface/Main Menu Class.h b/Source/Project64/User Interface/Main Menu Class.h index a8fa12d83..d1bc0a78b 100644 --- a/Source/Project64/User Interface/Main Menu Class.h +++ b/Source/Project64/User Interface/Main Menu Class.h @@ -46,7 +46,7 @@ enum MainMenuID { ID_PROFILE_PROFILE, ID_PROFILE_RESETCOUNTER, ID_PROFILE_GENERATELOG, //Help Menu - ID_HELP_CONTENTS, ID_HELP_GAMEFAQ, ID_HELP_SUPPORTFORUM, ID_HELP_HOMEPAGE, ID_HELP_ABOUTSETTINGFILES, ID_HELP_ABOUT, + ID_HELP_SUPPORTFORUM, ID_HELP_HOMEPAGE, ID_HELP_ABOUTSETTINGFILES, ID_HELP_ABOUT, }; class CMainMenu :