[Scummvm-cvs-logs] SF.net SVN: scummvm:[46048] scummvm/trunk

[lordhoto at users.sourceforge.net]

Revision: 46048
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46048&view=rev
Author:   lordhoto
Date:     2009-11-21 20:26:55 +0000 (Sat, 21 Nov 2009)

Log Message:
-----------
Ooops...

Modified Paths:
--------------
    scummvm/trunk/common/archive.cpp
    scummvm/trunk/engines/kyra/resource.h

Modified: scummvm/trunk/common/archive.cpp
===================================================================
--- scummvm/trunk/common/archive.cpp	2009-11-21 20:20:24 UTC (rev 46047)
+++ scummvm/trunk/common/archive.cpp	2009-11-21 20:26:55 UTC (rev 46048)
@@ -54,7 +54,7 @@
 	for ( ; it != allNames.end(); ++it) {
 		// TODO: We match case-insenstivie for now, our API does not define whether that's ok or not though...
 		// For our use case case-insensitive is probably what we want to have though.
-		if ((*it)->getName().matchString(lowercasePattern, true, true)) {
+		if ((*it)->getName().matchString(pattern, true, true)) {
 			list.push_back(*it);
 			matches++;
 		}

Modified: scummvm/trunk/engines/kyra/resource.h
===================================================================
--- scummvm/trunk/engines/kyra/resource.h	2009-11-21 20:20:24 UTC (rev 46047)
+++ scummvm/trunk/engines/kyra/resource.h	2009-11-21 20:26:55 UTC (rev 46048)
@@ -335,240 +335,8 @@
 	kLolCredits,
 
 	kLolHistory,
-	k1ForestSeq,
-	k1KallakWritingSeq,
-	k1KyrandiaLogoSeq,
-	k1KallakMalcolmSeq,
-	k1MalcolmTreeSeq,
-	k1WestwoodLogoSeq,
+#endif
 
-	k1Demo1Seq,
-	k1Demo2Seq,
-	k1Demo3Seq,
-	k1Demo4Seq,
-
-	k1AmuleteAnimSeq,
-
-	k1OutroReunionSeq,
-
-	k1IntroCPSStrings,
-	k1IntroCOLStrings,
-	k1IntroWSAStrings,
-	k1IntroStrings,
-
-	k1OutroHomeString,
-
-	k1RoomFilenames,
-	k1RoomList,
-
-	k1CharacterImageFilenames,
-
-	k1ItemNames,
-	k1TakenStrings,
-	k1PlacedStrings,
-	k1DroppedStrings,
-	k1NoDropStrings,
-
-	k1PutDownString,
-	k1WaitAmuletString,
-	k1BlackJewelString,
-	k1PoisonGoneString,
-	k1HealingTipString,
-	k1WispJewelStrings,
-	k1MagicJewelStrings,
-
-	k1ThePoisonStrings,
-	k1FluteStrings,
-
-	k1FlaskFullString,
-	k1FullFlaskString,
-
-	k1VeryCleverString,
-	k1NewGameString,
-
-	k1DefaultShapes,
-	k1Healing1Shapes,
-	k1Healing2Shapes,
-	k1PoisonDeathShapes,
-	k1FluteShapes,
-	k1Winter1Shapes,
-	k1Winter2Shapes,
-	k1Winter3Shapes,
-	k1DrinkShapes,
-	k1WispShapes,
-	k1MagicAnimShapes,
-	k1BranStoneShapes,
-
-	k1SpecialPalette1,
-	k1SpecialPalette2,
-	k1SpecialPalette3,
-	k1SpecialPalette4,
-	k1SpecialPalette5,
-	k1SpecialPalette6,
-	k1SpecialPalette7,
-	k1SpecialPalette8,
-	k1SpecialPalette9,
-	k1SpecialPalette10,
-	k1SpecialPalette11,
-	k1SpecialPalette12,
-	k1SpecialPalette13,
-	k1SpecialPalette14,
-	k1SpecialPalette15,
-	k1SpecialPalette16,
-	k1SpecialPalette17,
-	k1SpecialPalette18,
-	k1SpecialPalette19,
-	k1SpecialPalette20,
-	k1SpecialPalette21,
-	k1SpecialPalette22,
-	k1SpecialPalette23,
-	k1SpecialPalette24,
-	k1SpecialPalette25,
-	k1SpecialPalette26,
-	k1SpecialPalette27,
-	k1SpecialPalette28,
-	k1SpecialPalette29,
-	k1SpecialPalette30,
-	k1SpecialPalette31,
-	k1SpecialPalette32,
-	k1SpecialPalette33,
-
-	k1GUIStrings,
-	k1ConfigStrings,
-
-	k1AudioTracks,
-	k1AudioTracksIntro,
-
-	k1CreditsStrings,
-
-	k1TownsSFXwdTable,
-	k1TownsSFXbtTable,
-	k1TownsCDATable,
-
-	k1PC98StoryStrings,
-	k1PC98IntroSfx,
-
-	k1AmigaIntroSFXTable,
-	k1AmigaGameSFXTable,
-
-	k2SeqplayPakFiles,
-	k2SeqplayCredits,
-	k2SeqplayCreditsSpecial,
-	k2SeqplayStrings,
-	k2SeqplaySfxFiles,
-	k2SeqplayTlkFiles,
-	k2SeqplaySeqData,
-	k2SeqplayIntroTracks,
-	k2SeqplayFinaleTracks,
-	k2SeqplayIntroCDA,
-	k2SeqplayFinaleCDA,
-	k2SeqplayShapeAnimData,
-
-	k2IngamePakFiles,
-	k2IngameSfxFiles,
-	k2IngameSfxIndex,
-	k2IngameTracks,
-	k2IngameCDA,
-	k2IngameTalkObjIndex,
-	k2IngameTimJpStrings,
-	k2IngameShapeAnimData,
-	k2IngameTlkDemoStrings,
-
-	k3MainMenuStrings,
-	k3MusicFiles,
-	k3ScoreTable,
-	k3SfxFiles,
-	k3SfxMap,
-	k3ItemAnimData,
-	k3ItemMagicTable,
-	k3ItemStringMap,
-
-#ifdef ENABLE_LOL
-	kLolIngamePakFiles,
-	kLolCharacterDefs,
-	kLolIngameSfxFiles,
-	kLolIngameSfxIndex,
-	kLolMusicTrackMap,
-	kLolIngameGMSfxIndex,
-	kLolIngameMT32SfxIndex,
-	kLolIngamePcSpkSfxIndex,
-	kLolSpellProperties,
-	kLolGameShapeMap,
-	kLolSceneItemOffs,
-	kLolCharInvIndex,
-	kLolCharInvDefs,
-	kLolCharDefsMan,
-	kLolCharDefsWoman,
-	kLolCharDefsKieran,
-	kLolCharDefsAkshel,
-	kLolExpRequirements,
-	kLolMonsterModifiers,
-	kLolMonsterShiftOffsets,
-	kLolMonsterDirFlags,
-	kLolMonsterScaleY,
-	kLolMonsterScaleX,
-	kLolMonsterScaleWH,
-	kLolFlyingObjectShp,
-	kLolInventoryDesc,
-
-	kLolLevelShpList,
-	kLolLevelDatList,
-	kLolCompassDefs,
-	kLolItemPrices,
-	kLolStashSetup,
-
-	kLolDscUnk1,
-	kLolDscShapeIndex,
-	kLolDscOvlMap,
-	kLolDscScaleWidthData,
-	kLolDscScaleHeightData,
-	kLolDscX,
-	kLolDscY,
-	kLolDscTileIndex,
-	kLolDscUnk2,
-	kLolDscDoorShapeIndex,
-	kLolDscDimData1,
-	kLolDscDimData2,
-	kLolDscBlockMap,
-	kLolDscDimMap,
-	kLolDscDoor1,
-	kLolDscDoorScale,
-	kLolDscDoor4,
-	kLolDscDoorX,
-	kLolDscDoorY,
-	kLolDscOvlIndex,
-	kLolDscBlockIndex,
-
-	kLolScrollXTop,
-	kLolScrollYTop,
-	kLolScrollXBottom,
-	kLolScrollYBottom,
-
-	kLolButtonDefs,
-	kLolButtonList1,
-	kLolButtonList2,
-	kLolButtonList3,
-	kLolButtonList4,
-	kLolButtonList5,
-	kLolButtonList6,
-	kLolButtonList7,
-	kLolButtonList8,
-
-	kLolLegendData,
-	kLolMapCursorOvl,
-	kLolMapStringId,
-
-	kLolSpellbookAnim,
-	kLolSpellbookCoords,
-	kLolHealShapeFrames,
-	kLolLightningDefs,
-	kLolFireballCoords,
-
-	kLolCredits,
-
-	kLolHistory,
-#endif // ENABLE_LOL
-
 	kMaxResIDs
 };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.