Merge everything except the new GSdx texture cache fix (not tested enough yet).

git-svn-id: http://pcsx2.googlecode.com/svn/branches/0.9.8@4600 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2 2011-04-26 12:44:44 +00:00
parent 358233ae0d
commit 544601aec8
9 changed files with 190 additions and 60 deletions

View File

@ -1841,7 +1841,7 @@ Compat = 5
Serial = SLUS-20034
Name = Unreal Tournament
Region = NTSC-U
Compat = 2
Compat = 5
---------------------------------------------
Serial = SLUS-20035
Name = Baldur's Gate - Dark Alliance
@ -1880,7 +1880,7 @@ Compat = 4
Serial = SLUS-20044
Name = Star Wars - StarFighter
Region = NTSC-U
Compat = 2
Compat = 5
---------------------------------------------
Serial = SLUS-20045
Name = Legend of Alon Dar, The
@ -2022,7 +2022,7 @@ Compat = 4
Serial = SLUS-20085
Name = Silpheed Lost Planet
Region = NTSC-U
Compat = 1
Compat = 5
---------------------------------------------
Serial = SLUS-20086
Name = Commandos 2 - Men of Courage
@ -2073,7 +2073,7 @@ Compat = 4
Serial = SLUS-20096
Name = Swing Away Golf
Region = NTSC-U
Compat = 2
Compat = 5
---------------------------------------------
Serial = SLUS-20097
Name = FIFA Soccer 2001
@ -2126,7 +2126,7 @@ Compat = 5
Serial = SLUS-20109
Name = Rune - Viking Warlord
Region = NTSC-U
Compat = 1
Compat = 5
---------------------------------------------
Serial = SLUS-20111
Name = Deus Ex - The Conspiracy
@ -2434,7 +2434,7 @@ Compat = 5
Serial = SLUS-20195
Name = Dragon Rage
Region = NTSC-U
Compat = 1
Compat = 5
---------------------------------------------
Serial = SLUS-20196
Name = Soccer America
@ -2505,7 +2505,7 @@ Region = NTSC-U
Serial = SLUS-20208
Name = Sunny Garcia Surfing
Region = NTSC-U
Compat = 1
Compat = 3
---------------------------------------------
Serial = SLUS-20209
Name = Midnight Club II
@ -2530,7 +2530,7 @@ Compat = 5
Serial = SLUS-20210
Name = 18 Wheeler - American Pro Trucker
Region = NTSC-U
Compat = 3
Compat = 5
---------------------------------------------
Serial = SLUS-20211
Name = Top Gun - Combat Zone
@ -2613,7 +2613,7 @@ Region = NTSC-U
Serial = SLUS-20228
Name = Silent Hill 2
Region = NTSC-U
Compat = 4
Compat = 5
---------------------------------------------
Serial = SLUS-20229
Name = Jonny Moseley - Mad Trix
@ -2843,7 +2843,7 @@ Region = NTSC-U
Serial = SLUS-20284
Name = Freaky Flyers
Region = NTSC-U
Compat = 1
Compat = 4
---------------------------------------------
Serial = SLUS-20285
Name = Moto GP 2
@ -3180,7 +3180,7 @@ Compat = 4
Serial = SLUS-20361
Name = Rally Fusion - Race of Champions
Region = NTSC-U
Compat = 1
Compat = 2
---------------------------------------------
Serial = SLUS-20362
Name = Need for Speed - Hot Pursuit 2
@ -3471,7 +3471,7 @@ Compat = 4
Serial = SLUS-20425
Name = Spongebob Squarepants - Revenge of the Flying Dutchman
Region = NTSC-U
Compat = 2
Compat = 5
---------------------------------------------
Serial = SLUS-20428
Name = Fisherman's Bass Club
@ -3522,7 +3522,7 @@ Compat = 5
Serial = SLUS-20438
Name = NHL Hitz 2003
Region = NTSC-U
Compat = 1
Compat = 5
---------------------------------------------
Serial = SLUS-20439
Name = Futurama
@ -3670,7 +3670,7 @@ Region = NTSC-U
Serial = SLUS-20473
Name = Rocket Power - Beach Bandits
Region = NTSC-U
Compat = 2
Compat = 5
---------------------------------------------
Serial = SLUS-20474
Name = NFL Blitz 2003
@ -3902,12 +3902,12 @@ Compat = 5
Serial = SLUS-20524
Name = Fighter Maker 2
Region = NTSC-U
Compat = 1
Compat = 5
---------------------------------------------
Serial = SLUS-20525
Name = Ejay Club World
Region = NTSC-U
Compat = 1
Compat = 5
---------------------------------------------
Serial = SLUS-20526
Name = RockSteady ~~UNRELEASED~~
@ -4127,7 +4127,7 @@ Region = NTSC-U
Serial = SLUS-20575
Name = Island Xtreme Stunts
Region = NTSC-U
Compat = 2
Compat = 5
---------------------------------------------
Serial = SLUS-20576
Name = Harry Potter and The Chamber of Secrets
@ -4141,6 +4141,7 @@ Compat = 4
Serial = SLUS-20578
Name = Lord of the Rings, The - The Two Towers
Region = NTSC-U
Compat = 5
---------------------------------------------
Serial = SLUS-20579
Name = James Bond 007 - Nightfire
@ -4160,7 +4161,7 @@ Compat = 3
Serial = SLUS-20584
Name = Speed Kings
Region = NTSC-U
Compat = 1
Compat = 2
---------------------------------------------
Serial = SLUS-20585
Name = Powerpuff Girls, The - Relish Rampage
@ -4238,7 +4239,7 @@ Region = NTSC-U
Serial = SLUS-20603
Name = Mary-Kate & Ashley - Sweet Sixteen - Licensed to Drive
Region = NTSC-U
Compat = 2
Compat = 5
---------------------------------------------
Serial = SLUS-20604
Name = MTV's Celebrity Deathmatch
@ -4692,7 +4693,7 @@ Compat = 5
Serial = SLUS-20706
Name = Kill Switch
Region = NTSC-U
Compat = 1
Compat = 5
---------------------------------------------
Serial = SLUS-20707
Name = Spawn - Armageddon
@ -4944,7 +4945,7 @@ Compat = 4
Serial = SLUS-20764
Name = Bombastic
Region = NTSC-U
Compat = 1
Compat = 3
---------------------------------------------
Serial = SLUS-20765
Name = Resident Evil - Outbreak
@ -5030,7 +5031,8 @@ Region = NTSC-U
Serial = SLUS-20786
Name = Metal Arms - Glitch in the System
Region = NTSC-U
Compat = 2
Compat = 5
EETimingHack = 1 //text flicker
---------------------------------------------
Serial = SLUS-20787
Name = WWE SmackDown! Here Comes the Pain
@ -6101,7 +6103,7 @@ Compat = 5
Serial = SLUS-21015
Name = Madagascar
Region = NTSC-U
Compat = 1
Compat = 5
---------------------------------------------
Serial = SLUS-21016
Name = 25 to Life
@ -6126,7 +6128,7 @@ Compat = 4
Serial = SLUS-21020
Name = GunGrave - OverDose
Region = NTSC-U
Compat = 1
Compat = 5
---------------------------------------------
Serial = SLUS-21021
Name = Cabela's Deer Hunt - 2005 Season
@ -6321,7 +6323,7 @@ Compat = 5
Serial = SLUS-21064
Name = GoldenEye - Rogue Agent
Region = NTSC-U
Compat = 1
Compat = 5
---------------------------------------------
Serial = SLUS-21065
Name = Need for Speed - Underground 2
@ -6407,7 +6409,7 @@ Compat = 5
Serial = SLUS-21082
Name = Chronicles of Narnia, The - The Lion, The Witch and The Wardrobe
Region = NTSC-U
Compat = 1
Compat = 5
---------------------------------------------
Serial = SLUS-21083
Name = LEGO Star Wars
@ -6449,7 +6451,7 @@ Compat = 5
Serial = SLUS-21093
Name = Worms Forts - Under Siege!
Region = NTSC-U
Compat = 2
Compat = 4
---------------------------------------------
Serial = SLUS-21094
Name = Midway Arcade Treasures 3
@ -6526,7 +6528,7 @@ Compat = 4
Serial = SLUS-21109
Name = Drive to Survive
Region = NTSC-U
Compat = 2
Compat = 5
---------------------------------------------
Serial = SLUS-21110
Name = Pirates of the Caribbean - The Legend of Jack Sparrow
@ -7147,7 +7149,7 @@ Compat = 4
Serial = SLUS-21242
Name = Burnout Revenge
Region = NTSC-U
Compat = 2
Compat = 5
---------------------------------------------
Serial = SLUS-21243
Name = Metal Gear Solid 3 - Subsistence
@ -7290,7 +7292,7 @@ Compat = 2
Serial = SLUS-21272
Name = Super Monkey Ball Adventure
Region = NTSC-U
Compat = 1
Compat = 5
---------------------------------------------
Serial = SLUS-21273
Name = Matrix, The - Path of Neo
@ -7338,7 +7340,7 @@ Compat = 3
Serial = SLUS-21282
Name = James Bond 007 - From Russia with Love
Region = NTSC-U
Compat = 4
Compat = 5
---------------------------------------------
Serial = SLUS-21283
Name = Total Overdose - A Gunslinger's Tale in Mexico
@ -7453,7 +7455,7 @@ Compat = 2
Serial = SLUS-21307
Name = Ice Age 2 - The Meltdown
Region = NTSC-U
Compat = 1
Compat = 3
---------------------------------------------
Serial = SLUS-21309
Name = Let's Ride - Silver Buckle Stables
@ -7917,7 +7919,7 @@ Compat = 4
Serial = SLUS-21402
Name = Micro Machines v4
Region = NTSC-U
Compat = 2
Compat = 5
---------------------------------------------
Serial = SLUS-21403
Name = Backyard Baseball '07
@ -9122,7 +9124,7 @@ Region = NTSC-U
Serial = SLUS-21697
Name = Iridium Runners
Region = NTSC-U
Compat = 1
Compat = 4
---------------------------------------------
Serial = SLUS-21698
Name = NCAA March Madness '08
@ -9264,7 +9266,7 @@ Region = NTSC-U
Serial = SLUS-21730
Name = Jumper
Region = NTSC-U
Compat = 1
Compat = 5
---------------------------------------------
Serial = SLUS-21731
Name = Silent Hill - Origins
@ -9322,7 +9324,7 @@ Region = NTSC-U
Serial = SLUS-21742
Name = Women's Volleyball Championship
Region = NTSC-U
Compat = 1
Compat = 5
---------------------------------------------
Serial = SLUS-21743
Name = Code Lyoko - Quest for Infinity
@ -9399,7 +9401,7 @@ Compat = 5
Serial = SLUS-21761
Name = B-Boy
Region = NTSC-U
Compat = 1
Compat = 5
---------------------------------------------
Serial = SLUS-21763
Name = NHL 2K9
@ -9608,7 +9610,7 @@ Compat = 4
Serial = SLUS-21813
Name = James Bond 007 - Quantum Of Solace
Region = NTSC-U
Compat = 1
Compat = 5
---------------------------------------------
Serial = SLUS-21814
Name = Disney - Think Fast
@ -9657,7 +9659,7 @@ eeClampMode = 3 //connect hits, able to summon... etc...
Serial = SLUS-21825
Name = Pro Bull - Riding Out Of The Chute
Region = NTSC-U
Compat = 2
Compat = 5
---------------------------------------------
Serial = SLUS-21826
Name = Disney - Sing It
@ -9676,7 +9678,7 @@ Compat = 3
Serial = SLUS-21831
Name = Army Men - Soldiers Of Misfortune
Region = NTSC-U
Compat = 1
Compat = 5
---------------------------------------------
Serial = SLUS-21834
Name = Goosebumps Horrorland - Happy Halloween
@ -13873,7 +13875,7 @@ Region = NTSC-J
Serial = SLPM-62029
Name = Dance Summit 2001
Region = NTSC-J
Compat = 2
Compat = 5
---------------------------------------------
Serial = SLPM-62031
Name = Primal Image for Printer
@ -15955,7 +15957,7 @@ Region = NTSC-J
Serial = SLPM-62703
Name = Sega Rally Championship '95
Region = NTSC-J
Compat = 1
Compat = 5
---------------------------------------------
Serial = SLPM-62704
Name = Oretachi Geasen Zoku Sono Vol.10 - Quarth
@ -16170,7 +16172,7 @@ Region = NTSC-J
Serial = SLPM-62770
Name = Volleyball World Cup - Venus Evolution
Region = NTSC-J
Compat = 1
Compat = 5
---------------------------------------------
Serial = SLPM-62771
Name = Choro Q HG 3 [Atlus Best Collection]
@ -20896,6 +20898,7 @@ Region = NTSC-J
Serial = SLPM-66354
Name = Black
Region = NTSC-J
Compat = 5
vuClampMode = 0
---------------------------------------------
Serial = SLPM-66356
@ -27955,6 +27958,11 @@ Serial = SLPS-25905
Name = Dragon Ball Z: Infinite World
Region = NTSC-J
---------------------------------------------
Serial = SLPS-25906
Name = ADK Tamashii
Region = NTSC-J
Compat = 5
---------------------------------------------
Serial = SLPS-25914
Name = Kidou Senshi Gundam: Giren no Yabou - Axis no Kyoui V
Region = NTSC-J
@ -29966,7 +29974,7 @@ Region = PAL-M3
Serial = SLES-50031
Name = X-Squad
Region = PAL-Unk
Compat = 1
Compat = 5
---------------------------------------------
Serial = SLES-50032
Name = Theme Park World
@ -30721,6 +30729,7 @@ Region = PAL-Unk
Serial = SLES-50382
Name = Silent Hill 2
Region = PAL-M6
Compat = 5
---------------------------------------------
Serial = SLES-50383
Name = Metal Gear Solid 2 - Sons of Liberty
@ -32864,6 +32873,7 @@ Region = PAL-Unk
Serial = SLES-51434
Name = Silent Hill 3
Region = PAL-M5
Compat = 5
---------------------------------------------
Serial = SLES-51435
Name = International Superstar Soccer 3
@ -33741,7 +33751,7 @@ Region = PAL-F
Serial = SLES-51877
Name = Bloody Roar 4
Region = PAL-Unk
Compat = 4
Compat = 5
---------------------------------------------
Serial = SLES-51879
Name = Hot Wheels World Race
@ -34232,8 +34242,8 @@ Region = PAL-Unk
---------------------------------------------
Serial = SLES-52118
Name = Castlevania - Lament of Innocence
Region = PAL-Unk
Compat = 3
Region = PAL-M5
Compat = 5
---------------------------------------------
Serial = SLES-52122
Name = Crime Life - Gang Wars
@ -34850,7 +34860,8 @@ Region = PAL-Unk
---------------------------------------------
Serial = SLES-52478
Name = Red Dead Revolver
Region = PAL-Unk
Region = PAL-M5
Compat = 4
---------------------------------------------
Serial = SLES-52479
Name = Samurai Jack - The Shadow of Aku
@ -35919,7 +35930,8 @@ Region = PAL-Unk
---------------------------------------------
Serial = SLES-52950
Name = Shadow of Rome
Region = PAL-Unk
Region = PAL-M5
Compat = 5
---------------------------------------------
Serial = SLES-52951
Name = Phantom Brave
@ -37070,7 +37082,7 @@ Name = Tony Hawk's American Wasteland
Region = PAL-Unk
---------------------------------------------
Serial = SLES-53536
Name = Police Madness
Name = London Racer - Police Madness
Region = PAL-Unk
Compat = 2
---------------------------------------------
@ -37760,7 +37772,7 @@ Region = PAL-Unk
Serial = SLES-53886
Name = Black
Region = PAL-Unk
Compat = 1
Compat = 5
vuClampMode = 0
---------------------------------------------
Serial = SLES-53899
@ -39089,6 +39101,11 @@ Name = GrimGrimoire
Region = PAL-E
Compat = 5
---------------------------------------------
Serial = SLES-54904
Name = The Simpsons Game
Region = PAL-M4
Compat = 5
---------------------------------------------
Serial = SLES-54913
Name = Pro Evolution Soccer 2008
Region = PAL-E

View File

@ -99,9 +99,11 @@ CRC::Game CRC::m_games[] =
{0x5D02CC5B, OnePieceGrandBattle, NoRegion, 0},
{0x6F8545DB, ICO, US, 0},
{0xB01A4C95, ICO, JP, 0},
{0x2DF2C1EA, ICO, KO, 0},
{0x5C991F4E, ICO, NoRegion, 0},
{0x7ACF7E03, ICO, NoRegion, 0},
{0xAEAD1CA3, GT4, JP, 0},
{0x30E41D93, GT4, KO, 0},
{0x44A61C8F, GT4, NoRegion, 0},
{0x0086E35B, GT4, NoRegion, 0},
{0x77E61C8A, GT4, NoRegion, 0},
@ -125,6 +127,7 @@ CRC::Game CRC::m_games[] =
{0x013E349D, ResidentEvil4, US, 0},
{0x6BA2F6B9, ResidentEvil4, NoRegion, 0},
{0x60FA8C69, ResidentEvil4, JP, 0},
{0x5F254B7C, ResidentEvil4, KO, 0},
{0x72E1E60E, Spartan, NoRegion, 0},
{0x5ED8FB53, AceCombat4, JP, 0},
{0x1B9B7563, AceCombat4, NoRegion, 0},
@ -133,10 +136,12 @@ CRC::Game CRC::m_games[] =
{0x1F88EE37, Tekken5, EU, 0},
{0x1F88BECD, Tekken5, EU, 0}, //language selector...
{0x652050D2, Tekken5, US, 0},
{0xEA64EF39, Tekken5, KO, 0},
{0x9E98B8AE, IkkiTousen, JP, 0},
{0xD6385328, GodOfWar, US, 0},
{0xFB0E6D72, GodOfWar, EU, 0},
{0xEB001875, GodOfWar, EU, 0},
{0xBFCC1795, GodOfWar, KO, 0},
{0xA61A4C6D, GodOfWar, NoRegion, 0},
{0xE23D532B, GodOfWar, NoRegion, 0},
{0xDF1AF973, GodOfWar, NoRegion, 0},
@ -144,7 +149,7 @@ CRC::Game CRC::m_games[] =
{0x2F123FD8, GodOfWar2, RU, 0},
{0x2F123FD8, GodOfWar2, US, 0},
{0x44A8A22A, GodOfWar2, EU, 0},
{0x4340C7C6, GodOfWar2, NoRegion, 0},
{0x4340C7C6, GodOfWar2, KO, 0},
{0xF8CD3DF6, GodOfWar2, NoRegion, 0},
{0x0B82BFF7, GodOfWar2, NoRegion, 0},
{0x5D482F18, JackieChanAdv, NoRegion, 0},
@ -154,6 +159,7 @@ CRC::Game CRC::m_games[] =
{0x95CC86EF, GiTS, US, 0},
{0xA5768F53, GiTS, JP, 0},
{0x6BF11378, Onimusha3, US, 0},
{0xDAFFFB0D, Onimusha3, KO, 0},
{0xF442260C, MajokkoALaMode2, JP, 0},
{0x14FE77F7, TalesOfAbyss, US, 0},
{0x045D77E9, TalesOfAbyss, JPUNDUB, 0},
@ -162,6 +168,8 @@ CRC::Game CRC::m_games[] =
{0x8C913264, SonicUnleashed, EU, 0},
{0x4C7BB3C8, SimpsonsGame, NoRegion, 0},
{0x4C94B32C, SimpsonsGame, NoRegion, 0},
{0x206779D8, SimpsonsGame, EU, 0},
{0xBBE4D862, SimpsonsGame, US, 0},
{0xD71B57F4, Genji, NoRegion, 0},
{0xE04EA200, StarOcean3, EU, 0},
{0x23A97857, StarOcean3, US, 0},
@ -190,6 +198,7 @@ CRC::Game CRC::m_games[] =
{0x64C58FB4, TenchuFS, US, 0},
{0xE7CCCB1E, TenchuFS, EU, 0},
{0x1969B19A, TenchuFS, ES, 0}, //PAL Spanish
{0x696BBEC3, TenchuFS, KO, 0},
{0x525C1994, TenchuFS, ASIA, 0},
{0x767E383D, TenchuWoH, US, 0},
{0x83261085, TenchuWoH, EU, 0}, //PAL German
@ -209,6 +218,16 @@ CRC::Game CRC::m_games[] =
{0xC818BEC2, LordOfTheRingsTwoTowers, US, 0},
{0x9ABF90FB, LordOfTheRingsTwoTowers, ES, 0},
{0xC0E909E9, LordOfTheRingsTwoTowers, JP, 0},
{0x2498951B, SilentHill3, US, 0},
{0x5088CCDB, SilentHill3, EU, 0},
{0x8E8E384B, SilentHill2, US, 0},
{0x6DF62AEA, BleachBladeBattlers, JP, 0},
{0x6EB71AB0, BleachBladeBattlers, JP, 0}, //2nd
{0x3A446111, CastlevaniaCoD, US, 0},
{0xF321BC38, CastlevaniaCoD, EU, 0},
{0x28270F7D, CastlevaniaLoI, US, 0},
{0x306CDADA, CastlevaniaLoI, EU, 0},
{0xA36CFF6C, CastlevaniaLoI, JP, 0},
};
hash_map<uint32, CRC::Game*> CRC::m_map;

View File

@ -93,6 +93,11 @@ public:
TimeSplitters2,
ReZ,
LordOfTheRingsTwoTowers,
SilentHill3,
SilentHill2,
BleachBladeBattlers,
CastlevaniaCoD,
CastlevaniaLoI,
TitleCount,
};
@ -109,6 +114,7 @@ public:
IT,
ES,
ASIA,
KO,
RegionCount,
};

View File

@ -185,7 +185,7 @@ class GSRendererHW : public GSRendererT<Vertex>
uint32 FBW = m_context->FRAME.FBW;
uint32 FPSM = m_context->FRAME.PSM;
if(FBP == 0x01800 && FPSM == PSM_PSMZ24)
if((FBP == 0x01500 || FBP == 0x01800) && FPSM == PSM_PSMZ24) //0x1800 pal, 0x1500 ntsc
{
// instead of just simply drawing a full height 512x512 sprite to clear the z buffer,
// it uses a 512x256 sprite only, yet it is still able to fill the whole surface with zeros,

View File

@ -339,8 +339,18 @@ GSVector2i GSState::GetDeviceSize(int i)
}*/
//Fixme : Just slightly better than the hack above
if(m_regs->SMODE2.INT && m_regs->SMODE2.FFMD && h > 1){
if (!IsEnabled(0) || !IsEnabled(1)){h >>= 1;}
if(m_regs->SMODE2.INT && m_regs->SMODE2.FFMD && h > 1)
{
if (IsEnabled(0) || IsEnabled(1))
{
h >>= 1;
}
}
//Fixme: These games elude the code above, worked with the old hack
else if(m_game.title == CRC::SilentHill2 || m_game.title == CRC::SilentHill3)
{
h /= 2;
}
return GSVector2i(w, h);
@ -2414,6 +2424,26 @@ bool GSC_SonicUnleashed(const GSFrameInfo& fi, int& skip)
return true;
}
bool GSC_SimpsonsGame(const GSFrameInfo& fi, int& skip)
{
if(skip == 0)
{
if(fi.TME && fi.FBP == fi.TBP0 && fi.FPSM == fi.TPSM && fi.TBP0 == 0x03000 && fi.TPSM == PSM_PSMCT32)
{
skip = 100;
}
}
else
{
if(fi.TME && fi.FBP == 0x03000 && fi.FPSM == PSM_PSMCT32 && fi.TPSM == PSM_PSMT8H)
{
skip = 2;
}
}
return true;
}
bool GSC_Genji(const GSFrameInfo& fi, int& skip)
{
if(skip == 0)
@ -2682,6 +2712,32 @@ bool GSC_LordOfTheRingsTwoTowers(const GSFrameInfo& fi, int& skip)
return true;
}
bool GSC_BleachBladeBattlers(const GSFrameInfo& fi, int& skip)
{
if(skip == 0)
{
if(fi.TME && fi.FBP == 0x01180 && fi.FPSM == fi.TPSM && fi.TBP0 == 0x03fc0 && fi.TPSM == PSM_PSMCT32)
{
skip = 1;
}
}
return true;
}
bool GSC_Castlevania(const GSFrameInfo& fi, int& skip)
{
if(skip == 0)
{
if(fi.TME && fi.FBP == 0x00000 && fi.FPSM == PSM_PSMCT32 && fi.TPSM == PSM_PSMCT16S && fi.FBMSK == 0x00FFFFFF)
{
skip = 2;
}
}
return true;
}
bool GSState::IsBadFrame(int& skip, int UserHacks_SkipDraw)
{
GSFrameInfo fi;
@ -2733,6 +2789,7 @@ bool GSState::IsBadFrame(int& skip, int UserHacks_SkipDraw)
map[CRC::Onimusha3] = GSC_Onimusha3;
map[CRC::TalesOfAbyss] = GSC_TalesOfAbyss;
map[CRC::SonicUnleashed] = GSC_SonicUnleashed;
map[CRC::SimpsonsGame] = GSC_SimpsonsGame;
map[CRC::Genji] = GSC_Genji;
map[CRC::StarOcean3] = GSC_StarOcean3;
map[CRC::ValkyrieProfile2] = GSC_ValkyrieProfile2;
@ -2748,6 +2805,9 @@ bool GSState::IsBadFrame(int& skip, int UserHacks_SkipDraw)
map[CRC::TimeSplitters2] = GSC_TimeSplitters2;
map[CRC::ReZ] = GSC_ReZ;
map[CRC::LordOfTheRingsTwoTowers] = GSC_LordOfTheRingsTwoTowers;
map[CRC::BleachBladeBattlers] = GSC_BleachBladeBattlers;
map[CRC::CastlevaniaCoD] = GSC_Castlevania;
map[CRC::CastlevaniaLoI] = GSC_Castlevania;
}
// TODO: just set gsc in SetGameCRC once

View File

@ -346,6 +346,15 @@ bool GSWnd::Create(const string& title, int w, int h)
}
#ifdef _LINUX
// When you reconfigure the plugins during the play, SDL is shutdown so SDL_GetNumVideoDisplays return 0
// and the plugins is badly closed. NOTE: SDL is initialized in SDL_CreateWindow.
//
// I'm not sure this sanity check is still useful, normally (I hope) SDL_CreateWindow will return a null
// hence a false for this current function.
// For the moment do an init -- Gregory
if(!SDL_WasInit(SDL_INIT_VIDEO))
if(SDL_Init(SDL_INIT_VIDEO) < 0) return false;
// Sanity check; if there aren't any video displays available, we can't create a window.
if (SDL_GetNumVideoDisplays() <= 0) return false;
#endif
@ -371,10 +380,14 @@ Display* GSWnd::GetDisplay()
GSVector4i GSWnd::GetClientRect()
{
// TODO
int h, w;
w = theApp.GetConfig("ModeWidth", 640);
h = theApp.GetConfig("ModeHeight", 480);
// Get all SDL events. It refreshes the window parameter do not ask why.
// Anyway it allow to properly resize the window surface
// FIXME: it does not feel a good solution -- Gregory
SDL_PumpEvents();
int h = 480;
int w = 640;
if (m_window) SDL_GetWindowSize(m_window, &w, &h);
return GSVector4i(0, 0, w, h);
}
@ -384,6 +397,16 @@ GSVector4i GSWnd::GetClientRect()
bool GSWnd::SetWindowText(const char* title)
{
// Do not find anyway to check the current fullscreen status
// Better than nothing heuristic, check the window position. Fullscreen = (0,0)
// if(!(m_window->flags & SDL_WINDOW_FULLSCREEN) ) // Do not compile
//
// Same as GetClientRect. We call SDL_PumpEvents to refresh x and y value
// FIXME: it does not feel a good solution -- Gregory
SDL_PumpEvents();
int x,y = 0;
SDL_GetWindowPosition(m_window, &x, &y);
if ( x && y )
SDL_SetWindowTitle(m_window, title);
return true;

View File

@ -71,6 +71,7 @@
// stdc
#include <stddef.h>
#include <stdio.h>
#include <stdarg.h>
#include <math.h>

View File

@ -48,6 +48,9 @@ EXPORT_C_(void) SPU2dmaInterrupt(s32 channel);
// dma irq callbacks not needed anymore, they are handled by the dmac
EXPORT_C_(void) SPU2irqCallback(void (*SPU2callback)());
#else
// These defines are useless and gcc-4.6 complain about redefinition
// so we remove them on linux
#ifndef __LINUX__
EXPORT_C_(void) SPU2readDMA4Mem(u16 *pMem, u32 size);
EXPORT_C_(void) SPU2writeDMA4Mem(u16 *pMem, u32 size);
EXPORT_C_(void) SPU2interruptDMA4();
@ -61,6 +64,7 @@ EXPORT_C_(u32) SPU2ReadMemAddr(int core);
EXPORT_C_(void) SPU2WriteMemAddr(int core,u32 value);
EXPORT_C_(void) SPU2irqCallback(void (*SPU2callback)(),void (*DMA4callback)(),void (*DMA7callback)());
#endif
#endif
// extended funcs
// if start is 1, starts recording spu2 data, else stops

View File

@ -97,6 +97,7 @@ u32 pclocks;
u32 oldlimit;
#ifdef _MSC_VER
void dummy1()
{
}
@ -117,7 +118,6 @@ void dummy7()
#define Cread(a,b,c,d) if(fread(a,b,c,d)<b) break;
#ifdef _MSC_VER
#include "Windows/Dialogs.h"
EXPORT_C_(void) s2r_replay(HWND hwnd, HINSTANCE hinst, LPSTR filename, int nCmdShow)
{