From ea5bf444d3654fcdcd649456ee5d63bb4deaa72a Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sat, 21 Nov 2009 22:15:20 +0000 Subject: [PATCH] Fix mismatching resource type IDs for Lands of Lore in kyra.dat. svn-id: r46051 --- dists/engine-data/kyra.dat | Bin 331978 -> 331978 bytes engines/kyra/staticres.cpp | 2 +- tools/create_kyradat/create_kyradat.cpp | 2 +- tools/create_kyradat/extract.cpp | 14 +++++++------- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dists/engine-data/kyra.dat b/dists/engine-data/kyra.dat index bb55fa9faba36ac28833dca31321e0c7058af9bf..0574553fd4c2f37f4e5040a2303279f630d64186 100644 GIT binary patch delta 6664 zcmYk>X|&bU6$kJ?@U$#NeIkNb%EDGfao{AmCj+%~CAqmR4#lA$ilQh`hYDyb_5%_N zDpIYp2->oQA}v-Cc_`1Jf~|r$R8RryfGk^4L`0NH9O%x;$=;Vw@3;2J&YAW}a(QWX zx0hyjTX=Z)T)9d)N-3N&uLCR`BnucWW(hp({}@MV_)!}}W2_*?3_*hT+skHjn-seQ zbsU{P$)OAn2^tE2d6q*Bjls`XqTXUylQb?CIY?KO4PE89*zy`*@|G5h9RwQZc6?qExz0YYpjUF3Vw1%fON#i;ZE#b^2X|!8; z%JtFsuuMY81N=`E;;D@sig5Brj2I_>%t(+6Qv7ZcN9vd%$guAx9BE(~gGTj{MeZrj z!7nzK?HuK~xLDv}x}b)Y0*!A3KKg&k2?AUs2r)wt;opK7Ul+(t`FjbD*}@r83=z~Z zS&-pTK?9o^v=)bbRwbx8hy*Uq6?hmYsNwq0a=u7ori6Sf5Cr&_AjDgO2%Wcbf*7G7 z!6kweGX!@9I}IB zROAK9`PX!GY}-@D9Hj#~I?&Oc#yUiPbf*dt^1h51X+MHzPw+{{F&td!FnuhCaTQ|608jftX2W4QNya7#fkQF5$%u{M73OFw~$8I`WrX7X^#0+6*eRh1$B*U=G0qVrxKWUzO;E=ML52gyaDoN~F{mOZ2xuGT zA{Xrf53dSp_&}hsOW>o+uc{l>0vsU-;R_;+5yY4-$P+9VrPwK;x1&oqcZQ*Y2JU3g zIrXH#!3KegUYC{$%9F{voJEB-!Kirtn*(Rwcn(rYd}l?m6yN=(6P)7JQ0WG`|F(kf z;Sme1s2Vp<;E0dC7QXUhEWDN93a4 z11t}Joz0;2J#>!9!IUPs*k)z=`;+<9(Ck0u`xsQn^wAG6RFGovf-*uKuA|E$ZkFLz z3rErU-Lzagl?KO>%QAf1(H$|7dbPW%x7$?Mtf=&Go`%B~0JH zS%i#*`FDne^KOh6;ND*s-Ky~?NjKRsCFV)FM{9`^QP&>~;)1CfJw zn&e_o?=og4>YgLHp^w>u01FKAqQicQF8#`OW^zWIz!zoMXkq5&vJ=aQnVU!Yb2GPw z6(OrugN{f=$rQ6OhEc5Qh@=YnuFi4x$xIJ}Pbp#ge*YOIs81o<1QDLLpspuad?qJI zamX;frjE;pGa9)6yb82g4?W*rldHf%W@Sco(})((Lz#LW)Ns-T4En&kumsJ74}T;_ z0_=MUM?#FbtOR9?u<~+_#MmN8pnu&0&%FN>Q$gN0I&kIvJ|c7y;oTf`~~vHu^cfk!cV2on5Q zkm3SC9hX|reKI^|K<5vsfv-43AH4C+RqoiqXn~7s1Rib`)bOA{W7931z{gd$F#=2y zgt+~-mfUP0N5v6ZZ!g=`RUD&_fWD0cDgJghH>=~AnVdVrNrDEhXV6#rG=YO#1upWt zL>^{Xq$;VQ@j!JWdLU01_*g6m&@KqERuEyQAV$~OoGrm&j66xv%gRwn9m50}uH<$} z1CMZoep^^6aIi+;;;1>*l%({nVNq8p70z6Wn0lpheXc~VOue2ppF*&QL zOzBRjxjZ7Czb zQbCB-7WDk3(mP`rcOk||L4r#KDKCE2pV{SL8bSSz`<(*7jG7z-(Toi zmw5P(4VluLx~jSnmEJmmj~#*lUkO6=Sk2c&2m~?C5+pcBkmCH+#q+1^LLDWddqe$AV7# zm>o!6$nZ}_9yhRGOBJGeJxJi7o4`d+frs7}rd(gyuS`%^RIa`DXZRQ(2ry7Ud#*%I zhkp`bqJ-%GE(8f?2~y0lFi*<$f(*N)Sp!~|YCu%Gg9Q$T3tar2@WY}ism47lwINfy zOAq7>{*-C`mrU#5;e@N(I?lbV!_;+2rzPu>mSbBZ~s#S)BzlfK2RO# s543hfC$#oyRjp`k?F#y%554R{wZ1;&-j3@Q57^Q34R_xo*AJZZe+aOO=l}o! delta 6662 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 D2b^1~ diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index f82a5ade324..9a693533beb 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -45,7 +45,7 @@ namespace Kyra { -#define RESFILE_VERSION 67 +#define RESFILE_VERSION 68 namespace { bool checkKyraDat(Common::SeekableReadStream *file) { diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp index 27c751eb0e9..129d5329722 100644 --- a/tools/create_kyradat/create_kyradat.cpp +++ b/tools/create_kyradat/create_kyradat.cpp @@ -42,7 +42,7 @@ #include enum { - kKyraDatVersion = 67 + kKyraDatVersion = 68 }; const ExtractFilename extractFilenames[] = { diff --git a/tools/create_kyradat/extract.cpp b/tools/create_kyradat/extract.cpp index 2f3c7f9bcaa..4a6055d498d 100644 --- a/tools/create_kyradat/extract.cpp +++ b/tools/create_kyradat/extract.cpp @@ -99,13 +99,13 @@ const TypeTable typeTable[] = { { k2TypeSfxList, 0 }, { k3TypeRaw16to8, 1 }, { k3TypeShpData, 7 }, - { kLolTypeRaw16, 15 }, - { kLolTypeRaw32, 16 }, - { kLolTypeButtonDef, 14 }, - { kLolTypeCharData, 10 }, - { kLolTypeSpellData, 11 }, - { kLolTypeCompassData, 12 }, - { kLolTypeFlightShpData, 13 }, + { kLolTypeRaw16, 13 }, + { kLolTypeRaw32, 14 }, + { kLolTypeButtonDef, 12 }, + { kLolTypeCharData, 8 }, + { kLolTypeSpellData, 9 }, + { kLolTypeCompassData, 10 }, + { kLolTypeFlightShpData, 11 }, { -1, 0 } };