Converted remaining pcx files.

Tried to fix the patches-loaded-in-campaign-mode problem.
  this fix must be tested now...
Fixed problem with pasting host address.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@376 4a71c877-e1ca-e34f-864e-861f7616d084
master
Rodolphe Suescun 2005-12-22 14:33:32 +00:00
parent 5c9ab850c1
commit 458fa98415
11 changed files with 25 additions and 6 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 320 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 371 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 339 KiB

View File

@ -203,13 +203,16 @@ static void overwriteChar(STRING *pBuffer, UDWORD *pPos, STRING ch)
/* Put a character into a text buffer overwriting any text under the cursor */ /* Put a character into a text buffer overwriting any text under the cursor */
static void putSelection(STRING *pBuffer, UDWORD *pPos) static void putSelection(STRING *pBuffer, UDWORD *pPos)
{ {
static char* scrap = NULL;
int scraplen; int scraplen;
char* scrap = NULL;
get_scrap(T('T','E','X','T'), &scraplen, &scrap); get_scrap(T('T','E','X','T'), &scraplen, &scrap);
strncpy(pBuffer, scrap, scraplen); if (scraplen > 0 && scraplen < WIDG_MAXSTR-2)
pBuffer[scraplen] = '\0'; {
*pPos = scraplen; strncpy(pBuffer, scrap, scraplen);
pBuffer[scraplen] = '\0';
*pPos = scraplen;
}
} }

View File

@ -757,7 +757,7 @@ BOOL loadLevels(int patchlevel)
} }
FREE(pBuffer); FREE(pBuffer);
debug(LOG_WZ, "Loading patches up to patchlevel %d", patchlevel); debug(LOG_WZ, "***** Loading patches up to patchlevel %d *****", patchlevel);
/* Load every addon.lev file in patchlevel range */ /* Load every addon.lev file in patchlevel range */
for (j = 1; j <= patchlevel; j++) { for (j = 1; j <= patchlevel; j++) {
char path[MAX_PATH]; char path[MAX_PATH];

View File

@ -715,6 +715,14 @@ BOOL levLoadData(STRING *pName, STRING *pSaveName, SDWORD saveType)
} }
} }
// if this is a single player level - disable the multiple WDG
if (psNewLevel->type < LDS_NONE)
{
loadLevels(0);
} else {
loadLevels(MAX_NUM_PATCHES);
}
// reset the old mission data if necessary // reset the old mission data if necessary
if (psCurrLevel != NULL) if (psCurrLevel != NULL)
{ {

View File

@ -201,6 +201,14 @@ static void make_dir(char *dest, char *dirname, char *subdir)
strcat(dest, "/"); strcat(dest, "/");
strcat(dest, subdir); strcat(dest, subdir);
} }
{
unsigned int l = strlen(dest);
if (dest[l-1] != '/') {
dest[l] = '/';
dest[l] = '\0';
}
}
PHYSFS_mkdir(dest); PHYSFS_mkdir(dest);
if (PHYSFS_isDirectory(dest) == 0) { if (PHYSFS_isDirectory(dest) == 0) {
debug(LOG_ERROR, "Unable to create directory \"%s\" in write dir \"%s\"!", debug(LOG_ERROR, "Unable to create directory \"%s\" in write dir \"%s\"!",

View File

@ -1 +1 @@
#define SVN_REVISION "Revision ????" #define SVN_REVISION "Revision 17M"