ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added version numbers to tracks and karts (which helps

Browse Source 
not to load older tracks and kart, e.g. if STK is
installed on top of an existing older STK installation).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2944 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2009-01-16 11:13:55 +00:00
parent bf31e79efe
commit 9b32ce8d99
9 changed files with 68 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/stk_config.data
View File

@ -4,6 +4,10 @@
;; STK parameters
;; --------------
(min-kart-version 1 ) ;; Minimum and maximum .kart files supported
(max-kart-version 1 ) ;; by this binary. Older/newer files are ignored.
(min-track-version 1 ) ;; Minimum and maximum .track files supported
(max-track-version 1 ) ;; by this binary, older/newer files are ignored.
(max-karts 8 ) ;; maximum number of karts
(scores 10 8 6 5 4 3 2 1 ) ;; 10 8 6 5 4 3 2 1 0 0
(grid-order 1 ) ;; order for grand prix, 1 is most

11
src/karts/kart_properties.cpp
View File

@ -74,6 +74,7 @@ KartProperties::KartProperties() : m_icon_material(0)
m_camera_max_accel = m_camera_max_brake =
m_camera_distance = UNDEFINED;
m_gravity_center_shift = Vec3(UNDEFINED);
m_version = 0;
m_color.setValue(1.0f, 0.0f, 0.0f);
m_engine_sfx_type = SFXManager::SOUND_ENGINE_SMALL;
} // KartProperties
@ -142,7 +143,10 @@ void KartProperties::load(const std::string &filename, const std::string &node,
// Load model, except when called as part of --list-karts
if(!dont_load_models)
{
m_kart_model.loadModels();
// Only load the model if the .kart file has the appropriate version,
// otherwise warnings are printed.
if(m_version>=1)
m_kart_model.loadModels();
if(m_gravity_center_shift.getX()==UNDEFINED)
{
m_gravity_center_shift.setX(0);
@ -179,7 +183,10 @@ void KartProperties::load(const std::string &filename, const std::string &node,
//-----------------------------------------------------------------------------
void KartProperties::getAllData(const lisp::Lisp* lisp)
{
m_kart_model.loadInfo(lisp);
lisp->get("version", m_version);
// Only load the kart_model data if the .kart file has the appropriate
if(m_version>=1)
m_kart_model.loadInfo(lisp);
lisp->get("name", m_name);
lisp->get("icon-file", m_icon_file);
lisp->get("shadow-file", m_shadow_file);

18
src/karts/kart_properties.hpp
View File

@ -51,8 +51,8 @@ private:
belongs to. */
static float UNDEFINED;
float m_speed_angle_increase; /**< Increase of turn angle with speed. */
int m_version; /**< Version of the .kart file. */
protected:
// Display and gui
// ---------------
std::string m_name; /**< The human readable Name of the kart
@ -164,14 +164,16 @@ public:
void checkAllSet(const std::string &filename);
float getMaxSteerAngle (float speed) const;
Material* getIconMaterial () const {return m_icon_material; }
Material* getIconMaterial () const {return m_icon_material; }
/** Returns a pointer to the KartModel object. */
KartModel* getKartModel () const {return &m_kart_model; }
const std::string& getName () const {return m_name; }
const std::string& getIdent () const {return m_ident; }
const std::string& getShadowFile() const {return m_shadow_file; }
const std::string& getIconFile () const {return m_icon_file; }
const Vec3 &getColor () const {return m_color; }
KartModel* getKartModel () const {return &m_kart_model; }
const std::string& getName () const {return m_name; }
const std::string& getIdent () const {return m_ident; }
const std::string& getShadowFile() const {return m_shadow_file; }
const std::string& getIconFile () const {return m_icon_file; }
/** Returns the version of the .kart file. */
int getVersion () const {return m_version; }
const Vec3 &getColor () const {return m_color; }
const std::vector<std::string>&
getGroups () const {return m_groups; }
float getMass () const {return m_mass; }

13
src/karts/kart_properties_manager.cpp
View File

@ -25,6 +25,7 @@
#include "file_manager.hpp"
#include "string_utils.hpp"
#include "stk_config.hpp"
#include "translation.hpp"
#include "user_config.hpp"
#include "unlock_manager.hpp"
@ -92,6 +93,18 @@ void KartPropertiesManager::loadKartData(bool dont_load_models)
fclose(f);
KartProperties* kp = new KartProperties();
kp->load(kart_file, "tuxkart-kart", dont_load_models);
// If the version of the kart file is not supported,
// ignore this .kart file
if(kp->getVersion()<stk_config->m_min_kart_version ||
kp->getVersion()>stk_config->m_max_kart_version)
{
fprintf(stderr, "Warning: kart '%s' is not supported by this binary, ignored.\n",
kp->getIdent().c_str());
delete kp;
continue;
}
m_karts_properties.push_back(kp);
m_kart_available.push_back(true);
const std::vector<std::string>& groups=kp->getGroups();

12
src/stk_config.cpp
View File

@ -114,6 +114,10 @@ void STKConfig::load(const std::string &filename)
CHECK_NEG(m_explosion_impulse_objects, "explosion-impulse-objects" );
CHECK_NEG(m_max_history, "max-history" );
CHECK_NEG(m_max_skidmarks, "max-skidmarks" );
CHECK_NEG(m_min_kart_version, "min-kart-version" );
CHECK_NEG(m_max_kart_version, "max-kart-version" );
CHECK_NEG(m_min_track_version, "min-track-version" );
CHECK_NEG(m_max_track_version, "max-track-version" );
CHECK_NEG(m_skid_fadeout_time, "skid-fadeout-time" );
CHECK_NEG(m_slowdown_factor, "slowdown-factor" );
CHECK_NEG(m_near_ground, "near-ground" );
@ -145,6 +149,10 @@ void STKConfig::init_defaults()
m_grid_order = -100;
m_max_history = -100;
m_max_skidmarks = -100;
m_min_kart_version = -100;
m_max_kart_version = -100;
m_min_track_version = -100;
m_max_track_version = -100;
m_title_music = NULL;
m_enable_networking = true;
m_scores.clear();
@ -201,6 +209,10 @@ void STKConfig::getAllData(const lisp::Lisp* lisp)
lisp->getVector("scores", m_scores );
lisp->get("max-history", m_max_history );
lisp->get("max-skidmarks", m_max_skidmarks );
lisp->get("min-kart-version", m_min_kart_version );
lisp->get("max-kart-version", m_max_kart_version );
lisp->get("min-track-version", m_min_track_version );
lisp->get("max-track-version", m_max_track_version );
lisp->get("skid-fadeout-time", m_skid_fadeout_time );
lisp->get("slowdown-factor", m_slowdown_factor );
lisp->get("near-ground", m_near_ground );

8
src/stk_config.hpp
View File

@ -17,8 +17,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef HEADER_STKCONFIG_H
#define HEADER_STKCONFIG_H
#ifndef HEADER_STK_CONFIG_HPP
#define HEADER_STK_CONFIG_HPP
#include "karts/kart_properties.hpp"
@ -79,6 +79,10 @@ public:
* ground anymore and the upright
* constraint is disabled to allow for
* more violent explosions. */
int m_min_kart_version, /**<The minimum and maximum .kart file */
m_max_kart_version; /**<version supported by this binary. */
int m_min_track_version, /**<The minimum and maximum .track file */
m_max_track_version; /**<version supported by this binary. */
bool m_enable_networking;
std::vector<float>

2
src/track.cpp
View File

@ -66,6 +66,7 @@ Track::Track( std::string filename_, float w, float h, bool stretch )
m_designer = "";
m_screenshot = "";
m_top_view = "";
m_version = 0;
m_has_final_camera = false;
m_is_arena = false;
loadTrack(m_filename);
@ -869,6 +870,7 @@ void Track::loadTrack(std::string filename_)
LISP->get ("name", m_name);
LISP->get ("description", m_description);
LISP->get ("designer", m_designer);
LISP->get ("version", m_version);
std::vector<std::string> filenames;
LISP->getVector("music", filenames);
getMusicInformation(filenames, m_music);

3
src/track.hpp
View File

@ -58,6 +58,7 @@ private:
Vec3 m_camera_final_position;
Vec3 m_camera_final_hpr;
bool m_is_arena;
int m_version;
public:
enum RoadSide{ RS_DONT_KNOW = -1, RS_LEFT = 0, RS_RIGHT = 1 };
@ -154,6 +155,8 @@ public:
{m_music.push_back(mi); }
ssgBranch* getModel () const {return m_model; }
float getGravity () const {return m_gravity; }
/** Returns the version of the .track file. */
int getVersion () const {return m_version; }
float getTrackLength () const {return m_total_distance; }
const std::string& getIdent () const {return m_ident; }
const char* getName () const {return m_name.c_str(); }

9
src/track_manager.cpp
View File

@ -24,6 +24,7 @@
#include "string_utils.hpp"
#include "track_manager.hpp"
#include "track.hpp"
#include "stk_config.hpp"
#include "audio/sound_manager.hpp"
#include "translation.hpp"
@ -141,6 +142,14 @@ void TrackManager::loadTrackList ()
fclose(f);
Track *track = new Track(config_file);
if(track->getVersion()<stk_config->m_min_track_version ||
track->getVersion()>stk_config->m_max_track_version)
{
fprintf(stderr, "Warning: track '%s' is not supported by this binary, ignored.\n",
track->getIdent().c_str());
delete track;
continue;
}
m_tracks.push_back(track);
m_track_avail.push_back(true);
updateGroups(track);