[netPanzer-CVS] netpanzer/src/NetPanzer Classes/Units/Vehicle.c...

[Matthias Braun]

CVSROOT:        /cvsroot/netpanzer
Module name:    netpanzer
Branch:         
Changes by:     Matthias Braun <address@hidden> 03/09/14 06:09:22

Modified files:
        src/NetPanzer/Classes/Units: Vehicle.cpp Vehicle.hpp 
        src/NetPanzer/Interfaces: MouseInterface.cpp 
        src/NetPanzer/Port: Gdatstct.cpp Gdatstct.hpp 

Log message:
        finally removed some old strange database code

Patches:
Index: netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp:1.6 
netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp:1.7
--- netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp:1.6       Sat Sep 13 
18:38:21 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp   Sun Sep 14 06:09:22 2003
@@ -34,9 +34,6 @@
 #include "ConsoleInterface.hpp"
 #include "ParticleInterface.hpp"
 
-animation_dbase VEHICLE_DBASE;
-animation_dbase COLOR_VEHICLE_DBASE;
-
 enum{ _rotate_and_move, _rotate_stop_move };
 
 Vehicle::Vehicle( iXY initial_loc )
Index: netpanzer/src/NetPanzer/Classes/Units/Vehicle.hpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Vehicle.hpp:1.4 
netpanzer/src/NetPanzer/Classes/Units/Vehicle.hpp:1.5
--- netpanzer/src/NetPanzer/Classes/Units/Vehicle.hpp:1.4       Sat Sep 13 
18:38:21 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Vehicle.hpp   Sun Sep 14 06:09:22 2003
@@ -26,11 +26,6 @@
 #include "Sprite.hpp"
 #include "SelectionBoxSprite.hpp"
 
-// NOTE: Temp until new sprites put in
-#include "Gdatstct.hpp"
-extern animation_dbase VEHICLE_DBASE;
-extern animation_dbase COLOR_VEHICLE_DBASE;
-
 enum { _control_idle, 
        _control_move, 
           _control_move_map_square,
Index: netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.11 
netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.12
--- netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.11  Sat Sep 13 
21:03:15 2003
+++ netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp       Sun Sep 14 
06:09:22 2003
@@ -58,14 +58,9 @@
 MouseEventQueue MouseInterface::event_queue;
 MouseInterface::cursors_t MouseInterface::cursors;
 
-#include "Gdatstct.hpp"
 void MouseInterface::initialize()
 {
        event_queue.initialize( 20 );
-
-       sprite_dbase CURSOR_DBASE;
-       CURSOR_DBASE.load_dbase( "./gdbase/cursor.dbs");
-       
 
        const char* cursorpath = "pics/cursors/";
        char** cursorfiles = FileSystem::enumerateFiles(cursorpath);
Index: netpanzer/src/NetPanzer/Port/Gdatstct.cpp
diff -u netpanzer/src/NetPanzer/Port/Gdatstct.cpp:1.7 
netpanzer/src/NetPanzer/Port/Gdatstct.cpp:1.8
--- netpanzer/src/NetPanzer/Port/Gdatstct.cpp:1.7       Sat Sep 13 21:04:18 2003
+++ netpanzer/src/NetPanzer/Port/Gdatstct.cpp   Sun Sep 14 06:09:22 2003
@@ -28,339 +28,6 @@
 #include "Exception.hpp"
 
 //*****************************************************************************
-sprite_dbase::sprite_dbase( void )
- {
-  dbase_loaded = false;
- }
-
-//*****************************************************************************
-short sprite_dbase::unload_dbase( void )
- {
-  short sprite_loop;
-  short sprite_count;
-  sprite_data  *sprite;
-
-  if ( dbase_loaded == true )
-   {
-    sprite_count = header.sprite_count;
-  
-    for ( sprite_loop = 0; sprite_loop < sprite_count; sprite_loop++ )
-     {
-      sprite = &sprite_list[ sprite_loop]; 
-      free( sprite->data ); 
-     }
-   
-    dbase_loaded = false; 
-    return( true );
-   } 
- 
-  return( false );
- }
-//*****************************************************************************
-
-short sprite_dbase::load_dbase( char *dbase_path )
- {
-  FILE *infile;
-  short sprite_loop;
-  short sprite_count;
-  sprite_data  *sprite;
-  
-  unload_dbase();
-  
-  infile = fopen( dbase_path, "rb" );
-  if(infile == 0)
-         throw Exception("couldn't load sprite database '%s'.", dbase_path);
-  
-  fread( &header, sizeof (sprite_dbase_header_type ), 1, infile );
-  
-  sprite_count = header.sprite_count;
-  
-  for ( sprite_loop = 0; sprite_loop < sprite_count; sprite_loop++ )
-   {
-    sprite = &sprite_list[ sprite_loop]; 
-    
-    fread( sprite, sizeof ( sprite_data ), 1, infile );
-    sprite->data = (unsigned char * ) malloc( sprite->data_size );
-    fread( sprite->data, sprite->data_size, 1, infile ); 
-   }
-  
-  fclose( infile );
-
-  dbase_loaded = true;
-
-  return( true ); 
-}
-
-//*****************************************************************************
-
-short sprite_dbase::get_sprite_index( short index, sprite_data *record )
- {
-  if ( (index >= 0) && (index < header.sprite_count) )
-   {
-    record = &sprite_list[ index ];
-    return( true );
-   }
-
-  record = 0;
-  return ( false ); 
- }
-
-short sprite_dbase::get_sprite_index( short index, Surface &surface )
- {
-  if ( (index >= 0) && (index < header.sprite_count) )
-   {
-    surface.setTo( (void *) (sprite_list[ index ].data), 
-                   iXY( sprite_list[ index ].x_size, sprite_list[ index 
].y_size ),
-                                  sprite_list[ index ].x_size, 
-                   1 );
-    return( true );
-   }
-
-  return ( false ); 
- }
-
-short sprite_dbase::get_sprite_id( short id_num, sprite_data *record )
- {
-  short sprite_loop;
-  short sprite_count;
- 
-  sprite_count = header.sprite_count;
-  
-  for ( sprite_loop = 0; sprite_loop < sprite_count; sprite_loop++ )
-   {
-    if ( id_num == sprite_list[ sprite_loop ].pyro_id )
-     {
-      record = &sprite_list[ sprite_loop ];
-      return( true ); 
-     } 
-   }
- 
-  record = 0;
-  return ( false ); 
- }
- 
-//*****************************************************************************
-
-short sprite_dbase::get_sprite_name( char *name, Surface &surface ) 
- {
-  short sprite_loop;
-  short sprite_count;
- 
-  sprite_count = header.sprite_count;
-  
-  for ( sprite_loop = 0; sprite_loop < sprite_count; sprite_loop++ )
-   {
-    if ( !strcmp( name, sprite_list[sprite_loop].name)  )
-     {
-      surface.setTo( (void *) (sprite_list[ sprite_loop ].data), 
-                       iXY( sprite_list[ sprite_loop ].x_size, sprite_list[ 
sprite_loop ].y_size ),
-                                      sprite_list[ sprite_loop ].x_size, 
-                       1 );
-
-      return( true ); 
-     } 
-   }
- 
-  return ( false ); 
- }
-
-//*****************************************************************************
-
-short sprite_dbase::get_sprite_name( char *name, sprite_data *record ) 
- {
-  short sprite_loop;
-  short sprite_count;
- 
-  sprite_count = header.sprite_count;
-  
-  for ( sprite_loop = 0; sprite_loop < sprite_count; sprite_loop++ )
-   {
-    if ( !strcmp( name, sprite_list[sprite_loop].name)  )
-     {
-      record = &sprite_list[ sprite_loop ];
-      return( true ); 
-     } 
-   }
- 
-  record = 0;
-  return ( false ); 
- }
-
-//*****************************************************************************
-animation_dbase::animation_dbase(void)
- {
-  dbase_loaded = false;
- }
-
-//*****************************************************************************
 
-
-short animation_dbase::unload_dbase( void ) 
- {
-  short animation_loop;
-  short animation_count;
-  animation_data  *anim;
-
-  if ( dbase_loaded == true ) 
-   {
-    animation_count = header.animation_count;
-  
-    for ( animation_loop = 0; animation_loop < animation_count; 
animation_loop++ )
-     {
-      anim = &animation_list[ animation_loop]; 
-      free( anim->data ); 
-     }
- 
-    dbase_loaded = false;
-    return( true ); 
-   }
-  
-  return (false );
- }
-//*****************************************************************************
-
-
-short animation_dbase::load_dbase( char *dbase_path )
- {
-  FILE *infile;
-  short animation_loop;
-  short animation_count;
-  animation_data  *anim;
-  
-  unload_dbase();
-  
-  infile = fopen( dbase_path, "rb" );
-  if(infile == 0)
-         throw Exception("couldn't load dbase '%s'.", dbase_path);
-  
-  fread( &header, sizeof (anim_dbase_header_type ), 1, infile );
-  
-  animation_count = header.animation_count;
-  
-  for ( animation_loop = 0; animation_loop < animation_count; animation_loop++ 
)
-   {
-    anim = &animation_list[ animation_loop]; 
-    
-    fread( anim, sizeof ( animation_data ), 1, infile );
-    anim->data = (unsigned char * ) malloc( anim->data_size );
-    fread( anim->data, anim->data_size, 1, infile ); 
-   }
-  
-  fclose( infile );
-
-  dbase_loaded = true;
-  return( true ); 
-}
- 
-
-//*****************************************************************************
-
-short animation_dbase::get_anim_index( short index, animation_data *record )
- {
-  if ( (index >= 0) && (index < header.animation_count) )
-   {
-    record = &animation_list[ index ];
-    return( true );
-   }
-
-  record = 0;
-  return ( false ); 
- }
-
-short animation_dbase::get_anim_id( short id_num, animation_data *record )
- {
-  short anim_loop;
-  short anim_count;
- 
-  anim_count = header.animation_count;
-  
-  for ( anim_loop = 0; anim_loop < anim_count; anim_loop++ )
-   {
-    if ( id_num == animation_list[ anim_loop ].pyro_id )
-     {
-      record = &animation_list[ anim_loop ];
-      return( true ); 
-     } 
-   }
- 
-  record = 0;
-  return ( false ); 
- }
- 
-//*****************************************************************************
-
-short animation_dbase::get_anim_name( char *name, animation_data *record ) 
- {
-  short anim_loop;
-  short anim_count;
- 
-  anim_count = header.animation_count;
-  
-  for ( anim_loop = 0; anim_loop < anim_count; anim_loop++ )
-   {
-    if ( !strcasecmp( name, animation_list[anim_loop].name)  )
-     {
-      record = &animation_list[ anim_loop ];
-      return( true ); 
-     } 
-   }
- 
-  record = 0;
-  return ( false ); 
- 
- }
-
-//*****************************************************************************
-
-short animation_dbase::get_anim_name( char *name, SpriteSurface &sprite ) 
- {
-  short anim_loop;
-  short anim_count;
- 
-  anim_count = header.animation_count;
-  
-  for ( anim_loop = 0; anim_loop < anim_count; anim_loop++ )
-   {
-    if ( !strcasecmp( name, animation_list[anim_loop].name)  )
-     {
-      sprite.setData( (void *) (animation_list[anim_loop].data), 
-                                animation_list[anim_loop].x_size,
-                                               
animation_list[anim_loop].y_size,
-                                               
animation_list[anim_loop].frames * animation_list[anim_loop].direct_count );
- 
-     return ( true ); 
-    } 
-   }
- 
-  return ( false ); 
-
- }
-
-short animation_dbase::get_anim_name( char *name, Surface &surface ) 
- {
-  short anim_loop;
-  short anim_count;
- 
-  anim_count = header.animation_count;
-  
-  for ( anim_loop = 0; anim_loop < anim_count; anim_loop++ )
-   {
-    if ( !strcasecmp( name, animation_list[anim_loop].name)  )
-     {
-      surface.setTo( (void *) (animation_list[anim_loop].data), 
-                      iXY( animation_list[anim_loop].x_size, 
animation_list[anim_loop].y_size ),
-                      animation_list[anim_loop].x_size,
-                                     animation_list[anim_loop].frames * 
animation_list[anim_loop].direct_count );
- 
-     return ( true ); 
-    } 
-   }
- 
-  return ( false ); 
-
- }
-
-
-//*****************************************************************************
 
 tile_dbase::tile_dbase( void )
  {
Index: netpanzer/src/NetPanzer/Port/Gdatstct.hpp
diff -u netpanzer/src/NetPanzer/Port/Gdatstct.hpp:1.4 
netpanzer/src/NetPanzer/Port/Gdatstct.hpp:1.5
--- netpanzer/src/NetPanzer/Port/Gdatstct.hpp:1.4       Sat Sep 13 18:38:21 2003
+++ netpanzer/src/NetPanzer/Port/Gdatstct.hpp   Sun Sep 14 06:09:22 2003
@@ -18,70 +18,6 @@
 #ifndef _GDATSTCT_HPP
 #define _GDATSTCT_HPP
 
-#include "Sprite.hpp"
-
-struct sprite_data
-{
-       char  name[32];  // name of sprite -- default file from which it was 
extracted
-       short pyro_id;   // pryosoft id #
-       short x_size;    // width of sprite in pixels
-       short y_size;    // height of sprite in pixels
-   
-       short g_attrib;  // sprite attributes
-                    // bit 0 = standard pic
-                    // bit 1 = transparent 
-                    // bit 2 = shadowed 
-
-       long data_size;  // size of sprite data in bytes 
-                    // ususally x_size * y_size 
-       unsigned char *data;
-};
-
-//***************************************************************************
-
-struct animation_data
-{
-       char  name[32];  // name of sprite -- default file from which it was 
extracted
-       short pyro_id;   // pryosoft id #
-       short x_size;    // width of animation frame in pixels
-       short y_size;    // height of animation frame in pixels
-
-       short g_attrib;    // sprite attributes
-                                          // bit 0 = standard pic
-                                          // bit 1 = transparent 
-                                          // bit 2 = shadowed 
-
-   unsigned char anim_type;   // type of animations
-                      // bit 0 = standard multiframe animation;
-                      // bit 1 = directional animations
-                      // bit 2 = part of multi section animation
-                      // bit 4 = partioned directional
-              
-
-   short frames;      // # of frames in animations
-   short frame_size;  // size of frame in bytes
-   
-   short direct_count;// # of directions
-   short direct_size; // size of all direction frames in byts
-   
-   long  data_size;   // size of anim data in bytes 
-
-   unsigned char *directions[76];  
-   
-   unsigned char *data;
-};
-
-//***************************************************************************
-
-struct tile_info_type
-{
-    unsigned char t_attrib; // tile attributes
-                    // bits 0-3 height value of terrain
-                    // bits 4-7 reserved
-                    
-    unsigned char move_val; //movement value for tile
-};
-
 //***************************************************************************
    
 struct tile_dbase_header_type
@@ -94,64 +30,6 @@
     short tile_count;         // tile_count;
     unsigned char palette[768];       // pallette for tileset;
 };
-
-//***************************************************************************
-
-struct sprite_dbase_header_type
-{
-    char  pyro_id_header[64]; // file text identification;
-    short pyro_sprite_dbs_id;   // internal tile set identification;
-    short sprite_count;
-};
-
-//***************************************************************************
-
-struct anim_dbase_header_type
-{
-       char  pyro_id_header[64]; // file text identification;
-       short pyro_anim_dbs_id;   // internal tile set identification;
-       short animation_count;
-};
-
-//***************************************************************************
-
-class sprite_dbase
-{ 
-public: 
-       short dbase_loaded; 
-       sprite_dbase_header_type header;
-       sprite_data sprite_list[255];
- 
-       sprite_dbase( void );
-       short load_dbase( char *dbase_path );
-       short unload_dbase( void );
-       short get_sprite_index( short index, sprite_data *record );
-       short get_sprite_id( short id_num, sprite_data *record );
-       short get_sprite_name( char *name, sprite_data *record ); 
-       short get_sprite_name( char *name, Surface &surface ); 
-       short get_sprite_index( short index, Surface &surface );
-};
-
-//***************************************************************************
-
-class animation_dbase
- {
-  
-  public:
-   short dbase_loaded;
-   anim_dbase_header_type header;
-   animation_data animation_list[255];
- 
-  animation_dbase(void);
-  short load_dbase( char *dbase_path );
-  short unload_dbase( void ); 
-  short get_anim_index( short index, animation_data *record );
-  short get_anim_id( short id_num, animation_data *record );
-  short get_anim_name( char *name, animation_data *record ); 
-  short get_anim_name( char *name, SpriteSurface &sprite ); 
-  short get_anim_name( char *name, Surface &surface );
- };
-
 
 class tile_dbase
 {