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

Compilation error fix and updated about box credits a bit. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4203 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2011-01-12 07:30:17 +00:00
parent 76ac40c614
commit 3f948fa4fa
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcsx2/gui/Dialogs/AboutBoxDialog.cpp
View File

@ -37,13 +37,15 @@ Dialogs::AboutBoxDialog::AboutBoxDialog( wxWindow* parent )
wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN
)
{
// [TODO] : About box should be upgraded to use scrollable read-only text boxes.
static const wxString LabelAuthors = fromUTF8(
"Arcum42, Refraction, drk||raziel, cottonvibes, gigaherz, "
"rama, Jake.Stine, saqib, Tmkk, pseudonym"
"rama, Jake.Stine, saqib, pseudonym, gregory.hainaut"
"\n\n"
"Previous versions: Alexey silinov, Aumatt, "
"Florin, goldfinger, Linuzappz, loser, "
"Nachbrenner, shadow, Zerofrog"
"Nachbrenner, shadow, Zerofrog, tmkk"
"\n\n"
"Betatesting: Bositman, ChaosCode, "
"CKemu, crushtest, GeneralPlot, "
@ -53,7 +55,7 @@ Dialogs::AboutBoxDialog::AboutBoxDialog( wxWindow* parent )
);
static const wxString LabelGreets = fromUTF8(
"Hiryu and Sjeep (libcdvd / iso filesystem), nneeve (fpu and vu), gregory (linux distros)"
"Hiryu and Sjeep (libcdvd / iso filesystem), nneeve (fpu and vu), n1ckname (compilation guides)"
"\n\n"
"Plugin Specialists: ChickenLiver (Lilypad), Efp (efp), "
"Gabest (Gsdx, Cdvdolio, Xpad), Zeydlitz (ZZogl)"

2
pcsx2/gui/SysState.cpp
View File

@ -434,7 +434,7 @@ protected:
// the emulator/vm thread. Sleeping the executor thread briefly before doing file
// transactions should help reduce overhead. --air
Yield(4);
pxYield(4);
// Write the version and screenshot:
ScopedPtr<pxOutputStream> out( new pxOutputStream(tempfile, new wxZipOutputStream(woot)) );