ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

misc: Added the PlayStation name properly. (#3915)

This commit is contained in:
Dylan Smit 2020-12-06 10:27:51 +01:00 committed by GitHub
parent 16d33f8960
commit 65ee46c0fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/bug_report.md vendored
View File

@ -9,7 +9,7 @@ assignees: ''
<!-- Important: Read First --> <!-- Important: Read First -->
<!-- Please do not make support requests on Github. --> <!-- Please do not make support requests on GitHub. -->
<!-- Our issue tracker is for tracking bugs and feature requests only. --> <!-- Our issue tracker is for tracking bugs and feature requests only. -->
<!-- If you need help configuring the emulator please make a request on our forums or contact us on discord. --> <!-- If you need help configuring the emulator please make a request on our forums or contact us on discord. -->
<!-- If you are unsure, start with discord or the forums. --> <!-- If you are unsure, start with discord or the forums. -->

2
bin/docs/PCSX2.1
View File

@ -177,7 +177,7 @@ User configuration and data directory.
.An PCSX2 Dev Team and many other contributors .An PCSX2 Dev Team and many other contributors
.Sh BUGS .Sh BUGS
Bugs can be reported by submitting an issue at the Bugs can be reported by submitting an issue at the
.Lk https://github.com/PCSX2/pcsx2/issues "PCSX2 Github issue tracker" . .Lk https://github.com/PCSX2/pcsx2/issues "PCSX2 GitHub issue tracker" .
.Sh PCSX2 RELATED WEBSITES .Sh PCSX2 RELATED WEBSITES
.Bl -bullet .Bl -bullet
.It .It

2
debian-packager/control
View File

@ -36,7 +36,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libc6-i686
Recommends: libasound2-plugins, Recommends: libasound2-plugins,
libusb-0.1-4 libusb-0.1-4
Conflicts: pcsx2 Conflicts: pcsx2
Description: Playstation 2 emulator Description: PlayStation 2 emulator
PCSX2 is a PlayStation 2 emulator for Windows and Linux. PCSX2 is a PlayStation 2 emulator for Windows and Linux.
. .
WARNING: It requires a CPU with SSE2 instructions. If your CPU does not support WARNING: It requires a CPU with SSE2 instructions. If your CPU does not support

2
debian-packager/menu
View File

@ -2,5 +2,5 @@
needs="X11" \ needs="X11" \
section="Applications/Emulators" \ section="Applications/Emulators" \
title="PCSX2" \ title="PCSX2" \
longtitle="A playstation 2 emulator" \ longtitle="A PlayStation 2 emulator" \
command="/usr/games/PCSX2-linux.sh" command="/usr/games/PCSX2-linux.sh"

2
linux_various/pre-commit
View File

@ -7,7 +7,7 @@
# modifications for clang-format by rene.milk@wwu.de # modifications for clang-format by rene.milk@wwu.de
# This file is part of a set of unofficial pre-commit hooks available # This file is part of a set of unofficial pre-commit hooks available
# at github. # at GitHub.
# Link: https://github.com/githubbrowser/Pre-commit-hooks # Link: https://github.com/githubbrowser/Pre-commit-hooks
# Contact: David Martin, david.martin.mailbox@googlemail.com # Contact: David Martin, david.martin.mailbox@googlemail.com

2
nsis/ApplyExeProps.nsh
View File

@ -5,7 +5,7 @@
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${APP_NAME}" VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${APP_NAME}"
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright 2019 PCSX2 Dev Team" VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright 2019 PCSX2 Dev Team"
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Installs PCSX2, a Playstation 2 Emulator for the PC." VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Installs PCSX2, a PlayStation 2 Emulator for the PC."
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${APP_VERSION}" VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${APP_VERSION}"
VIProductVersion "${APP_VERSION}.0" VIProductVersion "${APP_VERSION}.0"

2
nsis/SharedShortcuts.nsh
View File

@ -10,6 +10,6 @@ Section "Desktop Shortcut" SEC_DESKTOP
${If} $option_desktop == 1 ${If} $option_desktop == 1
; CreateShortCut gets the working directory from OutPath ; CreateShortCut gets the working directory from OutPath
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
CreateShortCut "$DESKTOP\${APP_NAME}.lnk" "${APP_EXE}" "" "${APP_EXE}" 0 "" "" "A Playstation 2 Emulator" CreateShortCut "$DESKTOP\${APP_NAME}.lnk" "${APP_EXE}" "" "${APP_EXE}" 0 "" "" "A PlayStation 2 Emulator"
${EndIf} ${EndIf}
SectionEnd SectionEnd

2
nsis/pcsx2_full_install.nsi
View File

@ -53,7 +53,7 @@ Section ""
; Write the installation path into the registry ; Write the installation path into the registry
WriteRegStr HKLM Software\PCSX2 "Install_Dir" "$INSTDIR" WriteRegStr HKLM Software\PCSX2 "Install_Dir" "$INSTDIR"
; Write the uninstall keys for Windows ; Write the uninstall keys for Windows
WriteRegStr HKLM "${INSTDIR_REG_KEY}" "DisplayName" "PCSX2 - Playstation 2 Emulator" WriteRegStr HKLM "${INSTDIR_REG_KEY}" "DisplayName" "PCSX2 - PlayStation 2 Emulator"
WriteRegStr HKLM "${INSTDIR_REG_KEY}" "Publisher" "PCSX2 Team" WriteRegStr HKLM "${INSTDIR_REG_KEY}" "Publisher" "PCSX2 Team"
WriteRegStr HKLM "${INSTDIR_REG_KEY}" "DisplayIcon" "$INSTDIR\pcsx2.exe" WriteRegStr HKLM "${INSTDIR_REG_KEY}" "DisplayIcon" "$INSTDIR\pcsx2.exe"
WriteRegStr HKLM "${INSTDIR_REG_KEY}" "DisplayVersion" "${APP_VERSION}" WriteRegStr HKLM "${INSTDIR_REG_KEY}" "DisplayVersion" "${APP_VERSION}"

2
pcsx2/Elfheader.cpp
View File

@ -352,7 +352,7 @@ int GetPS2ElfName( wxString& name )
if( retype == 0 ) if( retype == 0 )
{ {
Console.Error("(GetElfName) Disc image is *not* a Playstation or PS2 game!"); Console.Error("(GetElfName) Disc image is *not* a PlayStation or PS2 game!");
return 0; return 0;
} }
} }

2
pcsx2/MMI.cpp
View File

@ -1052,7 +1052,7 @@ static __fi void _PMADDW(int dd, int ss)
s64 temp = ((s64)cpuRegs.GPR.r[_Rs_].SL[ss] * (s64)cpuRegs.GPR.r[_Rt_].SL[ss]); s64 temp = ((s64)cpuRegs.GPR.r[_Rs_].SL[ss] * (s64)cpuRegs.GPR.r[_Rt_].SL[ss]);
s64 temp2 = temp + ((s64)cpuRegs.HI.SL[ss] << 32); s64 temp2 = temp + ((s64)cpuRegs.HI.SL[ss] << 32);
//Playstation 2 division voodoo, for some reason only the lower half is affected //PlayStation 2 division voodoo, for some reason only the lower half is affected
if (ss == 0) if (ss == 0)
{ {
if (((cpuRegs.GPR.r[_Rt_].SL[ss] & 0x7FFFFFFF) == 0 || (cpuRegs.GPR.r[_Rt_].SL[ss] & 0x7FFFFFFF) == 0x7FFFFFFF) && if (((cpuRegs.GPR.r[_Rt_].SL[ss] & 0x7FFFFFFF) == 0 || (cpuRegs.GPR.r[_Rt_].SL[ss] & 0x7FFFFFFF) == 0x7FFFFFFF) &&

2
pcsx2/gui/Dialogs/FirstTimeWizard.cpp
View File

@ -139,7 +139,7 @@ FirstTimeWizard::FirstTimeWizard( wxWindow* parent )
// Temporary tutorial message for the BIOS, needs proof-reading!! // Temporary tutorial message for the BIOS, needs proof-reading!!
m_page_bios += 12; m_page_bios += 12;
m_page_bios += new pxStaticHeading( &m_page_bios, m_page_bios += new pxStaticHeading( &m_page_bios,
pxE( L"PCSX2 requires a *legal* copy of the PS2 BIOS in order to run games.\nYou cannot use a copy obtained from a friend or the Internet.\nYou must dump the BIOS from your *own* Playstation 2 console." pxE( L"PCSX2 requires a *legal* copy of the PS2 BIOS in order to run games.\nYou cannot use a copy obtained from a friend or the Internet.\nYou must dump the BIOS from your *own* PlayStation 2 console."
) )
) | StdExpand(); ) | StdExpand();

2
pcsx2/gui/MainFrame.cpp
View File

@ -506,7 +506,7 @@ void MainEmuFrame::CreateHelpMenu()
m_menuHelp.Append(MenuId_Help_Website, _("&Website")); m_menuHelp.Append(MenuId_Help_Website, _("&Website"));
m_menuHelp.Append(MenuId_Help_Wiki, _("&Wiki")); m_menuHelp.Append(MenuId_Help_Wiki, _("&Wiki"));
m_menuHelp.Append(MenuId_Help_Forums, _("&Support Forums")); m_menuHelp.Append(MenuId_Help_Forums, _("&Support Forums"));
m_menuHelp.Append(MenuId_Help_Github, _("&Github Repository")); m_menuHelp.Append(MenuId_Help_Github, _("&GitHub Repository"));
m_menuHelp.AppendSeparator(); m_menuHelp.AppendSeparator();
m_menuHelp.Append(MenuId_About, _("&About...")); m_menuHelp.Append(MenuId_About, _("&About..."));
} }

2
pcsx2/ps2/Iop/PsxBios.cpp
View File

@ -58,7 +58,7 @@ void psxBiosReset()
flush_stdout(true); flush_stdout(true);
} }
// Called for Playstation BIOS calls at 0xA0, 0xB0 and 0xC0 in kernel reserved memory (seemingly by actually calling those addresses) // Called for PlayStation BIOS calls at 0xA0, 0xB0 and 0xC0 in kernel reserved memory (seemingly by actually calling those addresses)
// Returns true if we internally process the call, not that we're likely to do any such thing // Returns true if we internally process the call, not that we're likely to do any such thing
bool __fastcall psxBiosCall() bool __fastcall psxBiosCall()
{ {

2
plugins/LilyPad/Tooltips.cpp
View File

@ -51,7 +51,7 @@ LPWSTR dialog_message(int ID, bool *updateText)
L"\"Dualshock 2\" emulates the default PS2 controller for use in both PS1 and PS2 games.\n\n" L"\"Dualshock 2\" emulates the default PS2 controller for use in both PS1 and PS2 games.\n\n"
L"\"Guitar\" emulates a PS2 controller used in the Guitar Hero and Rock Band series of games.\n\n" L"\"Guitar\" emulates a PS2 controller used in the Guitar Hero and Rock Band series of games.\n\n"
L"\"Pop'n Music controller\" emulates a PS2 controller used exclusively in the Japanese Pop'n Music series of games.\n\n" L"\"Pop'n Music controller\" emulates a PS2 controller used exclusively in the Japanese Pop'n Music series of games.\n\n"
L"\"PS1 Mouse\" emulates the Playstation Mouse. This controller can only be used in a number of PS1 games like \"Command & Conquer: Red Alert\" and \"Myst\".\n\n" L"\"PS1 Mouse\" emulates the PlayStation Mouse. This controller can only be used in a number of PS1 games like \"Command & Conquer: Red Alert\" and \"Myst\".\n\n"
L"\"neGcon\" emulates a controller that can be used in a number of PS1 games and PS2 games like the \"Ridge Racer\" and \"Ace Combat\" series."; L"\"neGcon\" emulates a controller that can be used in a number of PS1 games and PS2 games like the \"Ridge Racer\" and \"Ace Combat\" series.";
case IDC_DIAG_LIST: case IDC_DIAG_LIST:
return L"Shows a list of currently available input devices.\n\n" return L"Shows a list of currently available input devices.\n\n"