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

Rename VERSIOn to STKVERSION

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8132 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2011-03-30 23:41:25 +00:00
parent 1c270cde1f
commit b548b1bc93
5 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/addons/network_http.cpp
View File

@ -454,7 +454,7 @@ bool NetworkHttp::conditionFulfilled(const std::string &cond)
if(cond[0]=="stkversion") if(cond[0]=="stkversion")
{ {
int news_version = versionToInt(cond[2]); int news_version = versionToInt(cond[2]);
int stk_version = versionToInt(VERSION); int stk_version = versionToInt(STK_VERSION);
if(cond[1]=="=") if(cond[1]=="=")
{ {
if(news_version!=stk_version) return false; if(news_version!=stk_version) return false;
@ -574,7 +574,7 @@ std::string NetworkHttp::downloadToStrInternal(std::string url)
std::string full_url = (std::string)UserConfigParams::m_server_addons std::string full_url = (std::string)UserConfigParams::m_server_addons
+ "/" + url; + "/" + url;
curl_easy_setopt(session, CURLOPT_URL, full_url.c_str()); curl_easy_setopt(session, CURLOPT_URL, full_url.c_str());
std::string uagent = (std::string)"SuperTuxKart/" + VERSION; std::string uagent = (std::string)"SuperTuxKart/" + STK_VERSION;
curl_easy_setopt(session, CURLOPT_USERAGENT, uagent.c_str()); curl_easy_setopt(session, CURLOPT_USERAGENT, uagent.c_str());
std::string fout; std::string fout;
@ -607,7 +607,7 @@ bool NetworkHttp::downloadFileInternal(const std::string &file,
std::string full_url = (std::string)UserConfigParams::m_server_addons std::string full_url = (std::string)UserConfigParams::m_server_addons
+ "/" + file; + "/" + file;
curl_easy_setopt(session, CURLOPT_URL, full_url.c_str()); curl_easy_setopt(session, CURLOPT_URL, full_url.c_str());
std::string uagent = (std::string)"SuperTuxKart/" + VERSION; std::string uagent = (std::string)"SuperTuxKart/" + STK_VERSION;
curl_easy_setopt(session, CURLOPT_USERAGENT, uagent.c_str()); curl_easy_setopt(session, CURLOPT_USERAGENT, uagent.c_str());
FILE * fout = fopen(file_manager->getAddonsFile(save_filename).c_str(), FILE * fout = fopen(file_manager->getAddonsFile(save_filename).c_str(),
"wb"); "wb");

5
src/main.cpp
View File

@ -364,12 +364,9 @@ int handleCmdLinePreliminary(int argc, char **argv)
else if( !strcmp(argv[i], "--version") || !strcmp(argv[i], "-V") ) else if( !strcmp(argv[i], "--version") || !strcmp(argv[i], "-V") )
{ {
printf("==============================\n"); printf("==============================\n");
fprintf ( stdout, "SuperTuxKart, %s.\n", VERSION ) ; fprintf ( stdout, "SuperTuxKart, %s.\n", STK_VERSION ) ;
#ifdef SVNVERSION #ifdef SVNVERSION
fprintf ( stdout, "SuperTuxKart, SVN revision number '%s'.\n", SVNVERSION ) ; fprintf ( stdout, "SuperTuxKart, SVN revision number '%s'.\n", SVNVERSION ) ;
#endif
#if !defined(VERSION) && !defined(SVNVERSION)
fprintf ( stdout, "SuperTuxKart, unknown version\n" ) ;
#endif #endif
printf("==============================\n"); printf("==============================\n");
exit(0); exit(0);

6
src/race/history.cpp
View File

@ -172,7 +172,7 @@ void History::Save()
World *world = World::getWorld(); World *world = World::getWorld();
int num_karts = world->getNumKarts(); int num_karts = world->getNumKarts();
fprintf(fd, "Version: %s\n", VERSION); fprintf(fd, "Version: %s\n", STK_VERSION);
fprintf(fd, "numkarts: %d\n", num_karts); fprintf(fd, "numkarts: %d\n", num_karts);
fprintf(fd, "numplayers: %d\n", race_manager->getNumPlayers()); fprintf(fd, "numplayers: %d\n", race_manager->getNumPlayers());
fprintf(fd, "difficulty: %d\n", race_manager->getDifficulty()); fprintf(fd, "difficulty: %d\n", race_manager->getDifficulty());
@ -251,10 +251,10 @@ void History::Load()
} }
else else
{ {
if (strcmp(s1,VERSION)) if (strcmp(s1,STK_VERSION))
{ {
fprintf(stderr, "WARNING: history is version '%s'\n",s1); fprintf(stderr, "WARNING: history is version '%s'\n",s1);
fprintf(stderr, " STK version is '%s'\n",VERSION); fprintf(stderr, " STK version is '%s'\n",STK_VERSION);
} }
} }

2
src/utils/constants.cpp
View File

@ -26,4 +26,4 @@ static const char* endianness_test_ptr = (const char*)&endianness_test;
// in little-endian, byte 0 will be 0. in big endian, byte 0 will be 1 // in little-endian, byte 0 will be 0. in big endian, byte 0 will be 1
bool IS_LITTLE_ENDIAN = (endianness_test_ptr[0] == 0); bool IS_LITTLE_ENDIAN = (endianness_test_ptr[0] == 0);
const char* VERSION = "svn"; const char* STK_VERSION = "svn";

2
src/utils/constants.hpp
View File

@ -53,6 +53,6 @@ extern bool IS_LITTLE_ENDIAN;
#define DEFAULT_GROUP_NAME "standard" #define DEFAULT_GROUP_NAME "standard"
extern char* VERSION; extern char* STK_VERSION;
#endif #endif