Menu
▾
▴
[Freedroid-cvslog] FreeDroid/src blocks.c,1.230,1.231 graphics.c,1.223,1.224 leveleditor.c,1.137,1.138 open_gl.c,1.29,1.30 proto.h,1.368,1.369 rahmen.c,1.138,1.139 view.c,1.400,1.401
Update of /cvsroot/freedroid/FreeDroid/src
In directory sc8-pr-cvs1:/tmp/cvs-serv23539
Modified Files:
blocks.c graphics.c leveleditor.c open_gl.c proto.h rahmen.c
view.c
Log Message:
* The get_iso_image code now behaves much more sensible regarding whether
to check for an offset file (and then give an annoying not_found warning)
or not.
* More OpenGL debug output to help trace the 'white noise on screen'-problem
with OpenGL graphics output.
Index: blocks.c
===================================================================
RCS file: /cvsroot/freedroid/FreeDroid/src/blocks.c,v
retrieving revision 1.230
retrieving revision 1.231
diff -C2 -d -r1.230 -r1.231
*** blocks.c 19 Oct 2003 22:00:51 -0000 1.230
--- blocks.c 31 Oct 2003 17:20:11 -0000 1.231
***************
*** 43,48 ****
#include "SDL_rotozoom.h"
- void get_iso_image_from_file_and_path ( char* fpath , iso_image* our_iso_image );
-
char *PrefixToFilename[ ENEMY_ROTATION_MODELS_AVAILABLE ];
int ModelMultiplier[ ENEMY_ROTATION_MODELS_AVAILABLE ];
--- 43,46 ----
***************
*** 81,85 ****
sprintf ( constructed_filename , "blasts/iso_blast_bullet_%04d.png" , j + 1 );
fpath = find_file ( constructed_filename , GRAPHICS_DIR , FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( Blastmap [ 0 ] . image [ j ] ) ) ;
}
--- 79,83 ----
sprintf ( constructed_filename , "blasts/iso_blast_bullet_%04d.png" , j + 1 );
fpath = find_file ( constructed_filename , GRAPHICS_DIR , FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( Blastmap [ 0 ] . image [ j ] ) , TRUE ) ;
}
***************
*** 88,92 ****
sprintf ( constructed_filename , "blasts/iso_blast_droid_%04d.png" , j + 1 );
fpath = find_file ( constructed_filename , GRAPHICS_DIR , FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( Blastmap [ 1 ] . image [ j ] ) ) ;
}
--- 86,90 ----
sprintf ( constructed_filename , "blasts/iso_blast_droid_%04d.png" , j + 1 );
fpath = find_file ( constructed_filename , GRAPHICS_DIR , FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( Blastmap [ 1 ] . image [ j ] ) , TRUE ) ;
}
***************
*** 217,228 ****
SDL_SetColorKey( ItemImageList [ ItemMap [ item_type ] . picture_number ] . ingame_surface , 0 , 0 ); // this should clear any color key in the dest surface
*/
! get_iso_image_from_file_and_path ( fpath , & ( ItemImageList [ ItemMap [ item_type ] . picture_number ] . ingame_iso_image ) );
!
SDL_FreeSurface( Whole_Image );
-
-
}
-
}; // void try_to_load_ingame_item_surface ( int item_number )
--- 215,222 ----
SDL_SetColorKey( ItemImageList [ ItemMap [ item_type ] . picture_number ] . ingame_surface , 0 , 0 ); // this should clear any color key in the dest surface
*/
! get_iso_image_from_file_and_path ( fpath , & ( ItemImageList [ ItemMap [ item_type ] . picture_number ] . ingame_iso_image ) , TRUE );
SDL_FreeSurface( Whole_Image );
}
}; // void try_to_load_ingame_item_surface ( int item_number )
***************
*** 390,403 ****
fpath = find_file ( constructed_filename , GRAPHICS_DIR , FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( Bulletmap [ i ] . image [ k ] [ j ] ) ) ;
}
-
- //--------------------
- // Now we add proper offset in here, so that we can later conveniently use
- // the standard iso_object blitting functions refering to map locations.
- //
- // Bulletmap [ i ] . image [ 0 ] [ j ] . offset_x = - Bulletmap [ i ] . image [ 0 ] [ j ] . surface -> w / 2 ;
- // Bulletmap [ i ] . image [ 0 ] [ j ] . offset_y = - Bulletmap [ i ] . image [ 0 ] [ j ] . surface -> h / 2 ;
}
}
--- 384,390 ----
fpath = find_file ( constructed_filename , GRAPHICS_DIR , FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( Bulletmap [ i ] . image [ k ] [ j ] ) , TRUE ) ;
}
}
}
***************
*** 581,585 ****
if ( ( OffsetFile = fopen ( offset_file_name , "r") ) == NULL )
{
! DebugPrintf ( 1 , "\nSeeking to gain offset from file names '%s'." , offset_file_name );
GiveStandardErrorMessage ( "get_offset_for_iso_image_from_file_and_path(...)" , "\
Freedroid was unable to open a given offset file for an isometric image.\n\
--- 568,572 ----
if ( ( OffsetFile = fopen ( offset_file_name , "r") ) == NULL )
{
! DebugPrintf ( -1000 , "\nObtaining offset failed with file name '%s'." , offset_file_name );
GiveStandardErrorMessage ( "get_offset_for_iso_image_from_file_and_path(...)" , "\
Freedroid was unable to open a given offset file for an isometric image.\n\
***************
*** 631,635 ****
* ---------------------------------------------------------------------- */
void
! get_iso_image_from_file_and_path ( char* fpath , iso_image* our_iso_image )
{
SDL_Surface* Whole_Image;
--- 618,622 ----
* ---------------------------------------------------------------------- */
void
! get_iso_image_from_file_and_path ( char* fpath , iso_image* our_iso_image , int use_offset_file )
{
SDL_Surface* Whole_Image;
***************
*** 644,649 ****
{
fprintf( stderr, "\n\nfpath: '%s'\n" , fpath );
! GiveStandardErrorMessage ( "get_iso_image_from_file_and_path (...)" ,
! va("Could not load image: %s \n",fpath), PLEASE_INFORM, IS_FATAL );
}
--- 631,636 ----
{
fprintf( stderr, "\n\nfpath: '%s'\n" , fpath );
! GiveStandardErrorMessage ( "get_iso_image_from_file_and_path (...)" ,
! va ( "Could not load image: %s \n" , fpath ) , PLEASE_INFORM, IS_FATAL );
}
***************
*** 674,678 ****
// offset information for it.
//
! get_offset_for_iso_image_from_file_and_path ( fpath , our_iso_image );
}; // void get_iso_image_from_file_and_path ( char* fpath , iso_image* our_iso_image )
--- 661,674 ----
// offset information for it.
//
! if ( use_offset_file )
! get_offset_for_iso_image_from_file_and_path ( fpath , our_iso_image );
! else
! {
! //--------------------
! // We _silently_ assume there is no offset file...
! //
! our_iso_image -> offset_x = - INITIAL_BLOCK_WIDTH/2 ;
! our_iso_image -> offset_y = - INITIAL_BLOCK_HEIGHT/2 ;
! }
}; // void get_iso_image_from_file_and_path ( char* fpath , iso_image* our_iso_image )
***************
*** 819,823 ****
DebugPrintf ( 1 , "\nConstructedFileName = %s " , ConstructedFileName );
fpath = find_file ( ConstructedFileName , GRAPHICS_DIR, FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( enemy_iso_images [ ModelNr ] [ i ] [ 0 ] ) ) ;
}
//--------------------
--- 815,819 ----
DebugPrintf ( 1 , "\nConstructedFileName = %s " , ConstructedFileName );
fpath = find_file ( ConstructedFileName , GRAPHICS_DIR, FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( enemy_iso_images [ ModelNr ] [ i ] [ 0 ] ) , TRUE ) ;
}
//--------------------
***************
*** 918,922 ****
DebugPrintf ( 1 , "\nConstructedFileName = %s " , ConstructedFileName );
fpath = find_file ( ConstructedFileName , GRAPHICS_DIR, FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( enemy_iso_images [ ModelNr ] [ i ] [ j ] ) ) ;
}
}
--- 914,918 ----
DebugPrintf ( 1 , "\nConstructedFileName = %s " , ConstructedFileName );
fpath = find_file ( ConstructedFileName , GRAPHICS_DIR, FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( enemy_iso_images [ ModelNr ] [ i ] [ j ] ) , TRUE ) ;
}
}
***************
*** 2291,2295 ****
if ( use_open_gl )
{
! get_iso_image_from_file_and_path ( fpath , & ( obstacle_map [ i ] . image ) );
make_texture_out_of_surface ( & ( obstacle_map [ i ] . image ) ) ;
}
--- 2287,2291 ----
if ( use_open_gl )
{
! get_iso_image_from_file_and_path ( fpath , & ( obstacle_map [ i ] . image ) , TRUE );
make_texture_out_of_surface ( & ( obstacle_map [ i ] . image ) ) ;
}
***************
*** 2320,2324 ****
if ( use_open_gl )
{
! get_iso_image_from_file_and_path ( fpath , & ( floor_iso_images [ tile_type ] ) ) ;
make_texture_out_of_surface ( & ( floor_iso_images [ tile_type ] ) ) ;
}
--- 2316,2320 ----
if ( use_open_gl )
{
! get_iso_image_from_file_and_path ( fpath , & ( floor_iso_images [ tile_type ] ) , TRUE ) ;
make_texture_out_of_surface ( & ( floor_iso_images [ tile_type ] ) ) ;
}
Index: graphics.c
===================================================================
RCS file: /cvsroot/freedroid/FreeDroid/src/graphics.c,v
retrieving revision 1.223
retrieving revision 1.224
diff -C2 -d -r1.223 -r1.224
*** graphics.c 18 Oct 2003 10:52:44 -0000 1.223
--- graphics.c 31 Oct 2003 17:20:12 -0000 1.224
***************
*** 1354,1358 ****
char vid_driver[81];
Uint32 video_flags = 0 ; // flags for SDL video mode
!
char *fpath;
--- 1354,1358 ----
char vid_driver[81];
Uint32 video_flags = 0 ; // flags for SDL video mode
! int video_mode_ok_check_result ;
char *fpath;
***************
*** 1360,1364 ****
// Initialize the SDL library
//
! if ( SDL_Init (SDL_INIT_VIDEO) == -1 )
{
fprintf(stderr, "Couldn't initialize SDL: %s\n",SDL_GetError());
--- 1360,1364 ----
// Initialize the SDL library
//
! if ( SDL_Init ( SDL_INIT_VIDEO ) == -1 )
{
fprintf(stderr, "Couldn't initialize SDL: %s\n",SDL_GetError());
***************
*** 1440,1448 ****
/* Sets up OpenGL double buffering */
! SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
!
! /* get a SDL surface */
Screen = SDL_SetVideoMode( SCREEN_WIDTH, SCREEN_HEIGHT, vid_bpp , video_flags );
- /* Verify there is a surface */
if ( !Screen )
{
--- 1440,1485 ----
/* Sets up OpenGL double buffering */
! if ( SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 ) )
! {
! GiveStandardErrorMessage ( "InitVideo(...)" , "\
! Unable to set SDL_GL_DOUBLEBUFFER attribute!",
! PLEASE_INFORM, IS_FATAL );
! }
!
! //--------------------
! // First we check to see if the mode we wish to set is really supported. If it
! // isn't supported, then we cancel the whole operation...
! //
! video_mode_ok_check_result = SDL_VideoModeOK( SCREEN_WIDTH, SCREEN_HEIGHT, vid_bpp , video_flags );
! switch ( video_mode_ok_check_result )
! {
! case 0:
! GiveStandardErrorMessage ( "InitVideo(...)" , "\
! SDL reported, that the video mode mentioned above is not supported UNDER ANY BIT COLOR DEPTH!\nBreaking off...",
! PLEASE_INFORM, IS_FATAL );
! break;
! default:
! if ( video_mode_ok_check_result == vid_bpp )
! {
! DebugPrintf ( -4 , "\nVideo mode requested seems to be available in this color depth..." );
! }
! else
! {
! DebugPrintf ( -4 , "\nTesting if color depth %d bits is available... " , vid_bpp );
! DebugPrintf ( -4 , "\nThe closest we will get is %d bits per pixel." , video_mode_ok_check_result );
! GiveStandardErrorMessage ( "InitVideo(...)" , "\
! SDL reported, that the video mode mentioned \nabove is not supported UNDER THE COLOR DEPTH MENTIONED ABOVE!\n\
! We'll be using the alternate color depth given above instead...",
! PLEASE_INFORM, IS_WARNING_ONLY );
! vid_bpp = video_mode_ok_check_result ;
! }
! }
!
! //--------------------
! // Now that we know which mode to go for, we can give it a try and get the
! // output surface we want. Of course, some extra checking will be done, so
! // that we know that the surface we're expecting is really there...
! //
Screen = SDL_SetVideoMode( SCREEN_WIDTH, SCREEN_HEIGHT, vid_bpp , video_flags );
if ( !Screen )
{
***************
*** 1451,1454 ****
--- 1488,1495 ----
}
+ //--------------------
+ // Since we want to use openGl, it might be good to check the OpenGL vendor string
+ // provided by the graphics driver. Let's see...
+ //
fprintf( stderr , "\nUse of OpenGL for graphics output has been requested.\nYour GL_VENDOR string seems to be: %s\n", glGetString( GL_VENDOR ) );
Index: leveleditor.c
===================================================================
RCS file: /cvsroot/freedroid/FreeDroid/src/leveleditor.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -C2 -d -r1.137 -r1.138
*** leveleditor.c 30 Oct 2003 07:01:13 -0000 1.137
--- leveleditor.c 31 Oct 2003 17:20:12 -0000 1.138
***************
*** 2269,2273 ****
{
fpath = find_file ( "level_editor_floor_cursor.png" , GRAPHICS_DIR, FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( level_editor_cursor ) ) ;
if ( level_editor_cursor . surface == NULL )
{
--- 2269,2273 ----
{
fpath = find_file ( "level_editor_floor_cursor.png" , GRAPHICS_DIR, FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( level_editor_cursor ) , TRUE ) ;
if ( level_editor_cursor . surface == NULL )
{
***************
*** 2305,2309 ****
{
fpath = find_file ( "level_editor_waypoint_dot.png" , GRAPHICS_DIR, FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( level_editor_dot_cursor ) ) ;
if ( level_editor_dot_cursor . surface == NULL )
{
--- 2305,2309 ----
{
fpath = find_file ( "level_editor_waypoint_dot.png" , GRAPHICS_DIR, FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( level_editor_dot_cursor ) , TRUE ) ;
if ( level_editor_dot_cursor . surface == NULL )
{
***************
*** 2364,2368 ****
{
fpath = find_file ( "level_editor_waypoint_cursor.png" , GRAPHICS_DIR, FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( level_editor_waypoint_cursor ) ) ;
if ( level_editor_waypoint_cursor . surface == NULL )
{
--- 2364,2368 ----
{
fpath = find_file ( "level_editor_waypoint_cursor.png" , GRAPHICS_DIR, FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( level_editor_waypoint_cursor ) , TRUE ) ;
if ( level_editor_waypoint_cursor . surface == NULL )
{
***************
*** 2457,2461 ****
first_function_call = FALSE;
fpath = find_file ( "level_editor_map_label_indicator.png" , GRAPHICS_DIR, FALSE);
! get_iso_image_from_file_and_path ( fpath , & ( map_label_indicator ) );
}
--- 2457,2461 ----
first_function_call = FALSE;
fpath = find_file ( "level_editor_map_label_indicator.png" , GRAPHICS_DIR, FALSE);
! get_iso_image_from_file_and_path ( fpath , & ( map_label_indicator ) , TRUE );
}
Index: open_gl.c
===================================================================
RCS file: /cvsroot/freedroid/FreeDroid/src/open_gl.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** open_gl.c 18 Oct 2003 13:20:16 -0000 1.29
--- open_gl.c 31 Oct 2003 17:20:13 -0000 1.30
***************
*** 1176,1180 ****
sprintf ( constructed_file_name , "light_radius_chunks/iso_light_radius_darkness_%04d.png" , i + 1 );
fpath = find_file ( constructed_file_name , GRAPHICS_DIR , FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( light_radius_chunk [ i ] ) ) ;
tmp = light_radius_chunk [ i ] . surface ;
light_radius_chunk [ i ] . surface = SDL_DisplayFormatAlpha ( light_radius_chunk [ i ] . surface ) ;
--- 1176,1180 ----
sprintf ( constructed_file_name , "light_radius_chunks/iso_light_radius_darkness_%04d.png" , i + 1 );
fpath = find_file ( constructed_file_name , GRAPHICS_DIR , FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( light_radius_chunk [ i ] ) , TRUE ) ;
tmp = light_radius_chunk [ i ] . surface ;
light_radius_chunk [ i ] . surface = SDL_DisplayFormatAlpha ( light_radius_chunk [ i ] . surface ) ;
***************
*** 1395,1399 ****
fpath = find_file ( background_filenames [ i ] , GRAPHICS_DIR , FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( our_backgrounds [ i ] ) ) ;
if ( use_open_gl )
--- 1395,1399 ----
fpath = find_file ( background_filenames [ i ] , GRAPHICS_DIR , FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( our_backgrounds [ i ] ) , FALSE ) ;
if ( use_open_gl )
Index: proto.h
===================================================================
RCS file: /cvsroot/freedroid/FreeDroid/src/proto.h,v
retrieving revision 1.368
retrieving revision 1.369
diff -C2 -d -r1.368 -r1.369
*** proto.h 25 Oct 2003 12:49:38 -0000 1.368
--- proto.h 31 Oct 2003 17:20:13 -0000 1.369
***************
*** 178,182 ****
EXTERN void try_to_load_ingame_item_surface ( int item_type );
EXTERN void iso_load_bullet_surfaces ( void );
! EXTERN void get_iso_image_from_file_and_path ( char* fpath , iso_image* our_iso_image ) ;
EXTERN void make_sure_zoomed_surface_is_there ( iso_image* our_iso_image );
EXTERN void Load_Item_Surfaces (void);
--- 178,182 ----
EXTERN void try_to_load_ingame_item_surface ( int item_type );
EXTERN void iso_load_bullet_surfaces ( void );
! EXTERN void get_iso_image_from_file_and_path ( char* fpath , iso_image* our_iso_image , int use_offset_file ) ;
EXTERN void make_sure_zoomed_surface_is_there ( iso_image* our_iso_image );
EXTERN void Load_Item_Surfaces (void);
Index: rahmen.c
===================================================================
RCS file: /cvsroot/freedroid/FreeDroid/src/rahmen.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -C2 -d -r1.138 -r1.139
*** rahmen.c 18 Oct 2003 12:55:07 -0000 1.138
--- rahmen.c 31 Oct 2003 17:20:14 -0000 1.139
***************
*** 506,510 ****
{
fpath = find_file ( "speed_o_meter.png" , GRAPHICS_DIR, FALSE);
! get_iso_image_from_file_and_path ( fpath , & ( speed_meter_iso_image ) ) ;
tmp = speed_meter_iso_image . surface ;
speed_meter_iso_image . surface = SDL_DisplayFormatAlpha ( speed_meter_iso_image . surface );
--- 506,510 ----
{
fpath = find_file ( "speed_o_meter.png" , GRAPHICS_DIR, FALSE);
! get_iso_image_from_file_and_path ( fpath , & ( speed_meter_iso_image ) , FALSE ) ;
tmp = speed_meter_iso_image . surface ;
speed_meter_iso_image . surface = SDL_DisplayFormatAlpha ( speed_meter_iso_image . surface );
***************
*** 512,516 ****
fpath = find_file ( "speed_o_meter_arrow_energy.png" , GRAPHICS_DIR, FALSE);
! get_iso_image_from_file_and_path ( fpath , & ( SpeedMeterEnergyArrowImage ) ) ;
tmp = SpeedMeterEnergyArrowImage . surface ;
SpeedMeterEnergyArrowImage . surface = SDL_DisplayFormatAlpha ( SpeedMeterEnergyArrowImage . surface ) ;
--- 512,516 ----
fpath = find_file ( "speed_o_meter_arrow_energy.png" , GRAPHICS_DIR, FALSE);
! get_iso_image_from_file_and_path ( fpath , & ( SpeedMeterEnergyArrowImage ) , FALSE ) ;
tmp = SpeedMeterEnergyArrowImage . surface ;
SpeedMeterEnergyArrowImage . surface = SDL_DisplayFormatAlpha ( SpeedMeterEnergyArrowImage . surface ) ;
***************
*** 518,522 ****
fpath = find_file ( "speed_o_meter_arrow_mana.png" , GRAPHICS_DIR, FALSE);
! get_iso_image_from_file_and_path ( fpath , & ( SpeedMeterManaArrowImage ) ) ;
tmp = SpeedMeterManaArrowImage . surface ;
SpeedMeterManaArrowImage . surface = SDL_DisplayFormatAlpha ( SpeedMeterManaArrowImage . surface ) ;
--- 518,522 ----
fpath = find_file ( "speed_o_meter_arrow_mana.png" , GRAPHICS_DIR, FALSE);
! get_iso_image_from_file_and_path ( fpath , & ( SpeedMeterManaArrowImage ) , FALSE ) ;
tmp = SpeedMeterManaArrowImage . surface ;
SpeedMeterManaArrowImage . surface = SDL_DisplayFormatAlpha ( SpeedMeterManaArrowImage . surface ) ;
Index: view.c
===================================================================
RCS file: /cvsroot/freedroid/FreeDroid/src/view.c,v
retrieving revision 1.400
retrieving revision 1.401
diff -C2 -d -r1.400 -r1.401
*** view.c 26 Oct 2003 12:30:55 -0000 1.400
--- view.c 31 Oct 2003 17:20:14 -0000 1.401
***************
*** 1393,1397 ****
sprintf ( constructed_file_name , "light_radius_chunks/iso_light_radius_darkness_%04d.png" , i + 1 );
fpath = find_file ( constructed_file_name , GRAPHICS_DIR , FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( light_radius_chunk [ i ] ) ) ;
tmp = light_radius_chunk [ i ] . surface ;
light_radius_chunk [ i ] . surface = SDL_DisplayFormatAlpha ( light_radius_chunk [ i ] . surface ) ;
--- 1393,1397 ----
sprintf ( constructed_file_name , "light_radius_chunks/iso_light_radius_darkness_%04d.png" , i + 1 );
fpath = find_file ( constructed_file_name , GRAPHICS_DIR , FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( light_radius_chunk [ i ] ) , TRUE ) ;
tmp = light_radius_chunk [ i ] . surface ;
light_radius_chunk [ i ] . surface = SDL_DisplayFormatAlpha ( light_radius_chunk [ i ] . surface ) ;
***************
*** 1773,1777 ****
sprintf ( constructed_filename , "tux_motion_parts/%s/%s%s_%02d_%04d.png" , motion_class_string[motion_class] , part_group_strings [ tux_part_group ] , part_string , rotation_index , our_phase + 1 );
fpath = find_file ( constructed_filename , GRAPHICS_DIR, FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( loaded_tux_images [ tux_part_group ] [ our_phase ] [ rotation_index ] ) ) ;
strcpy ( previously_used_part_strings [ tux_part_group ] , part_string );
}
--- 1773,1777 ----
sprintf ( constructed_filename , "tux_motion_parts/%s/%s%s_%02d_%04d.png" , motion_class_string[motion_class] , part_group_strings [ tux_part_group ] , part_string , rotation_index , our_phase + 1 );
fpath = find_file ( constructed_filename , GRAPHICS_DIR, FALSE );
! get_iso_image_from_file_and_path ( fpath , & ( loaded_tux_images [ tux_part_group ] [ our_phase ] [ rotation_index ] ) , TRUE ) ;
strcpy ( previously_used_part_strings [ tux_part_group ] , part_string );
}
|
