Mercurial > mm7
comparison mm7_data.h @ 320:0b2af9c5f70f
Merge
author | Nomad |
---|---|
date | Wed, 20 Feb 2013 02:56:46 +0200 |
parents | 5a66be213cff 981fbe2da232 |
children | 15decc249a94 |
comparison
equal
deleted
inserted
replaced
319:5a66be213cff | 320:0b2af9c5f70f |
---|---|
364 extern char aBitmaps[]; // idb | 364 extern char aBitmaps[]; // idb |
365 extern char aIcons[]; // idb | 365 extern char aIcons[]; // idb |
366 extern char aPending[]; // idb | 366 extern char aPending[]; // idb |
367 extern char aCanTFindS[]; // idb | 367 extern char aCanTFindS[]; // idb |
368 extern char pDayMoonPhase[28]; | 368 extern char pDayMoonPhase[28]; |
369 extern char *spellbook_texture_filename_suffices[8]; // weak | 369 extern char spellbook_texture_filename_suffices[9]; // weak |
370 extern __int16 word_4E1D3A[]; // weak | 370 extern __int16 word_4E1D3A[]; // weak |
371 extern __int16 pTownPortalBook_xs[6]; | 371 extern __int16 pTownPortalBook_xs[6]; |
372 extern __int16 pTownPortalBook_ys[6]; | 372 extern __int16 pTownPortalBook_ys[6]; |
373 extern __int16 pTownPortalBook_ws[6]; | 373 extern __int16 pTownPortalBook_ws[6]; |
374 extern __int16 pTownPortalBook_hs[6]; | 374 extern __int16 pTownPortalBook_hs[6]; |