diff --git a/source/src/client.cpp b/source/src/client.cpp index d08f7c0b..b788ef90 100644 --- a/source/src/client.cpp +++ b/source/src/client.cpp @@ -884,7 +884,6 @@ hashtable pendingpackages; // cubescript VARP(autodownload, 0, 1, 1); -extern string homedir; void resetpckservers() { @@ -1003,16 +1002,16 @@ int progress_callback(void *clientp, double dltotal, double dlnow, double ultota int processdownload(package *pck) { - string tmpname = ""; - copystring(tmpname, findfile(path("tmp", true), "rb")); + string tmpname = ""; + copystring(tmpname, findfile(path("tmp", true), "rb")); if(!pck->pending) { switch(pck->type) { case PCK_TEXTURE: case PCK_AUDIO: { - const char *pckname = findfile(path(pck->name, true), "w+"); - preparedir(pckname); + const char *pckname = findfile(path(pck->name, true), "w+"); + preparedir(pckname); // with textures/sounds, the image/audio file itself is sent. Just need to copy it from the temporary file if(!copyfile(tmpname, pckname)) conoutf(_("\f3failed to install"), pckname); break; diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index 9250e7d3..80f88a7f 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -1551,7 +1551,7 @@ void setnext(char *mode, char *map) if(!strcmp(mode, modestrings[i])) { nextmode=i+GMODE_NUM; - string nm = ""; itoa(nm, nextmode); + string nm = ""; itoa(nm, nextmode); callvote(SA_MAP, map, nm, "0"); break; }