hans/CnC_Remastered_Collection
1
0
Fork 0
mirror of https://github.com/jmarshall23/CnC_Remastered_Collection.git synced 2026-08-18 09:04:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Aircraft remaster assets now load.

Browse Source
This commit is contained in:
Justin Marshall
2020-06-21 19:53:01 -07:00
parent 6834288c16
commit 332c36efa3
2 changed files with 72 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/REDALERT/AIRCRAFT.CPP
+30 -23
View File
@@ -409,6 +409,7 @@ void AircraftClass::Draw_It(int x, int y, WindowNumberType window) const
** Verify the legality of the unit class.
*/
void const * shapefile = Get_Image_Data();
Image_t* hdShapeFile = Get_HDImage_Data();
if (!shapefile) return;
int shapenum = Shape_Number();
@@ -440,33 +441,39 @@ void AircraftClass::Draw_It(int x, int y, WindowNumberType window) const
static int _jitter[] = {0,0,0,0,1,1,1,0,0,0,0,0,-1,-1,-1,0};
jitter = _jitter[::Frame % 16];
}
// Virtual window needs to draw the body first so it's considered the primary object and the shadow is a sub-object
if (window == WINDOW_VIRTUAL) {
/*
** Draw the root body of the unit.
*/
Techno_Draw_Object(shapefile, shapenum, x, y+jitter, window, rotation);
/*
** Special manual shadow draw code.
*/
if (Visual_Character() <= VISUAL_DARKEN) {
CC_Draw_Shape(this, shapefile, shapenum, x+1, y+2, window, SHAPE_PREDATOR|SHAPE_CENTER|SHAPE_WIN_REL|SHAPE_FADING, DisplayClass::FadingShade, NULL);
}
} else {
/*
** Special manual shadow draw code.
*/
if (Visual_Character() <= VISUAL_DARKEN) {
CC_Draw_Shape(this, shapefile, shapenum, x+1, y+2, window, SHAPE_PREDATOR|SHAPE_CENTER|SHAPE_WIN_REL|SHAPE_FADING, DisplayClass::FadingShade, NULL);
}
// jmarshall
// // Virtual window needs to draw the body first so it's considered the primary object and the shadow is a sub-object
// if (window == WINDOW_VIRTUAL) {
// /*
// ** Draw the root body of the unit.
// */
// Techno_Draw_Object(shapefile, shapenum, x, y+jitter, window, rotation);
//
// /*
// ** Special manual shadow draw code.
// */
// if (Visual_Character() <= VISUAL_DARKEN) {
// CC_Draw_Shape(this, shapefile, shapenum, x+1, y+2, window, SHAPE_PREDATOR|SHAPE_CENTER|SHAPE_WIN_REL|SHAPE_FADING, DisplayClass::FadingShade, NULL);
// }
// } else {
// /*
// ** Special manual shadow draw code.
// */
// if (Visual_Character() <= VISUAL_DARKEN) {
// CC_Draw_Shape(this, shapefile, shapenum, x+1, y+2, window, SHAPE_PREDATOR|SHAPE_CENTER|SHAPE_WIN_REL|SHAPE_FADING, DisplayClass::FadingShade, NULL);
// }
/*
** Draw the root body of the unit.
*/
Techno_Draw_Object(shapefile, shapenum, x, y+jitter, window, rotation);
}
if (hdShapeFile) {
Techno_Draw_Object_HD(hdShapeFile, shapenum, x, y + jitter, window, rotation);
}
else {
Techno_Draw_Object(shapefile, shapenum, x, y + jitter, window, rotation);
}
// }
// jmarshall end
/*
** If this aircraft is equipped with rotor blades, then draw them at this time.