mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix items and cutscenes

pull/876/head
galaxyhaxz 6 years ago committed by Anders Jenbo
parent
edb6badd43
commit
2c60ceb92a
5 changed files with 182 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 93
      Source/interfac.cpp
  2. 88
      Source/items.cpp
  3. 12
      Source/items.h
  4. 21
      Source/scrollrt.cpp
  5. 4
      defs.h

93
Source/interfac.cpp
Unescape View File

@ -252,9 +252,19 @@ void InitCutscene(unsigned int uMsg)
progress_id = 1;
break;
case 1:
sgpBackCel = LoadFileInMem("Gendata\\Cutl1d.CEL", NULL);
LoadPalette("Gendata\\Cutl1d.pal");
progress_id = 0;
#ifdef HELLFIRE
if (currlevel < 17) {
#endif
sgpBackCel = LoadFileInMem("Gendata\\Cutl1d.CEL", NULL);
LoadPalette("Gendata\\Cutl1d.pal");
progress_id = 0;
#ifdef HELLFIRE
} else {
sgpBackCel = LoadFileInMem("Nlevels\\cutl5.CEL", NULL);
LoadPalette("Nlevels\\cutl5.pal");
progress_id = 1;
}
#endif
break;
case 2:
sgpBackCel = LoadFileInMem("Gendata\\Cut2.CEL", NULL);
@ -262,9 +272,19 @@ void InitCutscene(unsigned int uMsg)
progress_id = 2;
break;
case 3:
sgpBackCel = LoadFileInMem("Gendata\\Cut3.CEL", NULL);
LoadPalette("Gendata\\Cut3.pal");
progress_id = 1;
#ifdef HELLFIRE
if (currlevel < 17) {
#endif
sgpBackCel = LoadFileInMem("Gendata\\Cut3.CEL", NULL);
LoadPalette("Gendata\\Cut3.pal");
progress_id = 1;
#ifdef HELLFIRE
} else {
sgpBackCel = LoadFileInMem("Nlevels\\cutl6.CEL", NULL);
LoadPalette("Nlevels\\cutl6.pal");
progress_id = 1;
}
#endif
break;
case 4:
if (currlevel < 15) {
@ -297,9 +317,19 @@ void InitCutscene(unsigned int uMsg)
progress_id = 1;
break;
case 1:
sgpBackCel = LoadFileInMem("Gendata\\Cutl1d.CEL", NULL);
LoadPalette("Gendata\\Cutl1d.pal");
progress_id = 0;
#ifdef HELLFIRE
if (currlevel < 17) {
#endif
sgpBackCel = LoadFileInMem("Gendata\\Cutl1d.CEL", NULL);
LoadPalette("Gendata\\Cutl1d.pal");
progress_id = 0;
#ifdef HELLFIRE
} else {
sgpBackCel = LoadFileInMem("Nlevels\\cutl5.CEL", NULL);
LoadPalette("Nlevels\\cutl5.pal");
progress_id = 1;
}
#endif
break;
case 2:
sgpBackCel = LoadFileInMem("Gendata\\Cut2.CEL", NULL);
@ -307,9 +337,19 @@ void InitCutscene(unsigned int uMsg)
progress_id = 2;
break;
case 3:
sgpBackCel = LoadFileInMem("Gendata\\Cut3.CEL", NULL);
LoadPalette("Gendata\\Cut3.pal");
progress_id = 1;
#ifdef HELLFIRE
if (currlevel < 17) {
#endif
sgpBackCel = LoadFileInMem("Gendata\\Cut3.CEL", NULL);
LoadPalette("Gendata\\Cut3.pal");
progress_id = 1;
#ifdef HELLFIRE
} else {
sgpBackCel = LoadFileInMem("Nlevels\\cutl6.CEL", NULL);
LoadPalette("Nlevels\\cutl6.pal");
progress_id = 1;
}
#endif
break;
case 4:
sgpBackCel = LoadFileInMem("Gendata\\Cut4.CEL", NULL);
@ -377,15 +417,38 @@ void InitCutscene(unsigned int uMsg)
LoadPalette("Gendata\\Cuttt.pal");
progress_id = 1;
break;
#ifdef HELLFIRE
case 1:
if (plr[myplr].plrlevel < 17) {
sgpBackCel = LoadFileInMem("Gendata\\Cutl1d.CEL", NULL);
LoadPalette("Gendata\\Cutl1d.pal");
progress_id = 0;
} else {
sgpBackCel = LoadFileInMem("Nlevels\\Cutl5.CEL", NULL);
LoadPalette("Nlevels\\Cutl5.pal");
progress_id = 1;
}
break;
#endif
case 2:
sgpBackCel = LoadFileInMem("Gendata\\Cut2.CEL", NULL);
LoadPalette("Gendata\\Cut2.pal");
progress_id = 2;
break;
case 3:
sgpBackCel = LoadFileInMem("Gendata\\Cut3.CEL", NULL);
LoadPalette("Gendata\\Cut3.pal");
progress_id = 1;
#ifdef HELLFIRE
if (plr[myplr].plrlevel < 17) {
#endif
sgpBackCel = LoadFileInMem("Gendata\\Cut3.CEL", NULL);
LoadPalette("Gendata\\Cut3.pal");
progress_id = 1;
#ifdef HELLFIRE
} else {
sgpBackCel = LoadFileInMem("Nlevels\\Cutl6.CEL", NULL);
LoadPalette("Nlevels\\Cutl6.pal");
progress_id = 1;
}
#endif
break;
case 4:
sgpBackCel = LoadFileInMem("Gendata\\Cut4.CEL", NULL);

88
Source/items.cpp
Unescape View File

@ -42,7 +42,8 @@ char OilNames[10][25] = {
int MaxGold = GOLD_MAX_LIMIT;
#endif
BYTE ItemCAnimTbl[169] = {
BYTE ItemCAnimTbl[] = {
#ifndef HELLFIRE
20, 16, 16, 16, 4, 4, 4, 12, 12, 12,
12, 12, 12, 12, 12, 21, 21, 25, 12, 28,
28, 28, 0, 0, 0, 32, 0, 0, 0, 24,
@ -60,8 +61,33 @@ BYTE ItemCAnimTbl[169] = {
33, 1, 1, 1, 1, 1, 7, 7, 7, 14,
14, 17, 17, 17, 0, 34, 1, 0, 3, 17,
8, 8, 6, 1, 3, 3, 11, 3, 4
#else
20, 16, 16, 16, 4, 4, 4, 12, 12, 12,
12, 12, 12, 12, 12, 21, 21, 25, 12, 28,
28, 28, 38, 38, 38, 32, 38, 38, 38, 24,
24, 26, 2, 25, 22, 23, 24, 25, 27, 27,
29, 0, 0, 0, 12, 12, 12, 12, 12, 0,
8, 8, 0, 8, 8, 8, 8, 8, 8, 6,
8, 8, 8, 6, 8, 8, 6, 8, 8, 6,
6, 6, 8, 8, 8, 5, 9, 13, 13, 13,
5, 5, 5, 15, 5, 5, 18, 18, 18, 30,
5, 5, 14, 5, 14, 13, 16, 18, 5, 5,
7, 1, 3, 17, 1, 15, 10, 14, 3, 11,
8, 0, 1, 7, 0, 7, 15, 7, 3, 3,
3, 6, 6, 11, 11, 11, 31, 14, 14, 14,
6, 6, 7, 3, 8, 14, 0, 14, 14, 0,
33, 1, 1, 1, 1, 1, 7, 7, 7, 14,
14, 17, 17, 17, 0, 34, 1, 0, 3, 17,
8, 8, 6, 1, 3, 3, 11, 3, 12, 12,
12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
12, 12, 12, 12, 12, 12, 12, 35, 39, 36,
36, 36, 37, 38, 38, 38, 38, 38, 41, 42,
8, 8, 8, 17, 0, 6, 8, 11, 11, 3,
3, 1, 6, 6, 6, 1, 8, 6, 11, 3,
6, 8, 1, 6, 6, 17, 40, 0, 0
#endif
};
char *ItemDropNames[ITEMTYPES] = {
char *ItemDropNames[] = {
"Armor2",
"Axe",
"FBttle",
@ -96,9 +122,19 @@ char *ItemDropNames[ITEMTYPES] = {
"Innsign",
"Bldstn",
"Fanvil",
"FLazStaf"
"FLazStaf",
#ifdef HELLFIRE
"bombs1",
"halfps1",
"wholeps1",
"runes1",
"teddys1",
"cows1",
"donkys1",
"mooses1"
#endif
};
BYTE ItemAnimLs[ITEMTYPES] = {
BYTE ItemAnimLs[] = {
15,
13,
16,
@ -133,9 +169,19 @@ BYTE ItemAnimLs[ITEMTYPES] = {
13,
13,
13,
8
8,
#ifdef HELLFIRE
10,
16,
16,
10,
10,
15,
15,
15
#endif
};
int ItemDropSnds[ITEMTYPES] = {
int ItemDropSnds[] = {
IS_FHARM,
IS_FAXE,
IS_FPOT,
@ -170,9 +216,19 @@ int ItemDropSnds[ITEMTYPES] = {
IS_ISIGN,
IS_FBLST,
IS_FANVL,
IS_FSTAF
IS_FSTAF,
#ifdef HELLFIRE
IS_FROCK,
IS_FSCRL,
IS_FSCRL,
IS_FROCK,
IS_FMUSH,
IS_FHARM,
IS_FLARM,
IS_FLARM
#endif
};
int ItemInvSnds[ITEMTYPES] = {
int ItemInvSnds[] = {
IS_IHARM,
IS_IAXE,
IS_IPOT,
@ -207,7 +263,17 @@ int ItemInvSnds[ITEMTYPES] = {
IS_ISIGN,
IS_IBLST,
IS_IANVL,
IS_ISTAF
IS_ISTAF,
#ifdef HELLFIRE
IS_IROCK,
IS_ISCROL,
IS_ISCROL,
IS_IROCK,
IS_IMUSH,
IS_IHARM,
IS_ILARM,
IS_ILARM
#endif
};
#ifdef HELLFIRE
char *off_4A5AC4 = "SItem";
@ -434,7 +500,7 @@ void InitItemGFX()
int i;
char arglist[64];
for (i = 0; i < 35; i++) {
for (i = 0; i < ITEMTYPES; i++) {
sprintf(arglist, "Items\\%s.CEL", ItemDropNames[i]);
itemanims[i] = LoadFileInMem(arglist, NULL);
}
@ -3077,7 +3143,7 @@ void FreeItemGFX()
int i;
#endif
for (i = 0; i < 35; i++) {
for (i = 0; i < ITEMTYPES; i++) {
MemFreeDbg(itemanims[i]);
}
}

12
Source/items.h
Unescape View File

@ -15,7 +15,7 @@ extern int ColOfCornerStone;
extern int dword_691CB0;
extern ItemStruct CornerItemMaybe;
#endif
extern BYTE *itemanims[35];
extern BYTE *itemanims[ITEMTYPES];
extern BOOL UniqueItemFlag[128];
extern int numitems;
extern int gnNumGetRecords;
@ -185,11 +185,11 @@ extern char OilNames[10][25];
extern int MaxGold;
#endif
extern BYTE ItemCAnimTbl[169];
extern char *ItemDropNames[35];
extern BYTE ItemAnimLs[35];
extern int ItemDropSnds[35];
extern int ItemInvSnds[35];
extern BYTE ItemCAnimTbl[];
extern char *ItemDropNames[];
extern BYTE ItemAnimLs[];
extern int ItemDropSnds[];
extern int ItemInvSnds[];
extern int idoppely;
extern int premiumlvladd[6];

21
Source/scrollrt.cpp
Unescape View File

@ -167,12 +167,25 @@ static void scrollrt_draw_cursor_item()
if (!plr[myplr].HoldItem._iStatFlag) {
col = PAL16_RED + 5;
}
CelBlitOutlineSafe(col, mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels, pcurs, cursW, 0, 8);
if (col != PAL16_RED + 5) {
CelClippedDrawSafe(mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels, pcurs, cursW, 0, 8);
#ifdef HELLFIRE
if (pcurs <= 179) {
#endif
CelBlitOutlineSafe(col, mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels, pcurs, cursW, 0, 8);
if (col != PAL16_RED + 5) {
CelClippedDrawSafe(mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels, pcurs, cursW, 0, 8);
} else {
CelDrawLightRedSafe(mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels, pcurs, cursW, 0, 8, 1);
}
#ifdef HELLFIRE
} else {
CelDrawLightRedSafe(mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels, pcurs, cursW, 0, 8, 1);
CelBlitOutlineSafe(col, mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels2, pcurs - 179, cursW, 0, 8);
if (col != PAL16_RED + 5) {
CelClippedDrawSafe(mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels2, pcurs - 179, cursW, 0, 8);
} else {
CelDrawLightRedSafe(mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels2, pcurs - 179, cursW, 0, 8, 1);
}
}
#endif
} else {
CelClippedDrawSafe(mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels, pcurs, cursW, 0, 8);
}

4
defs.h
Unescape View File

@ -63,7 +63,11 @@
#define MDMAXX 40
#define MDMAXY 40
#define MAXCHARLEVEL 51
#ifdef HELLFIRE
#define ITEMTYPES 43
#else
#define ITEMTYPES 35
#endif
// number of inventory grid cells
#define NUM_INV_GRID_ELEM 40

Write Preview
Loading…
Cancel
Save