Coding fix
Krzysztof H
parent
81f46cfab6
commit
343cb0ce66
214
src/misc.cpp
214
src/misc.cpp
|
|
@ -1,4 +1,4 @@
|
||||||
// * This file is part of the COLOBOT source code
|
// * This file is part of the COLOBOT source code
|
||||||
// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch
|
// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch
|
||||||
// *
|
// *
|
||||||
// * This program is free software: you can redistribute it and/or modify
|
// * This program is free software: you can redistribute it and/or modify
|
||||||
|
|
@ -41,7 +41,7 @@ static char g_userDir[100] = "";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Donne un <EFBFBD>v<EFBFBD>nement utilisateur unique.
|
// Donne un événement utilisateur unique.
|
||||||
|
|
||||||
EventMsg GetUniqueEventMsg()
|
EventMsg GetUniqueEventMsg()
|
||||||
{
|
{
|
||||||
|
|
@ -54,73 +54,73 @@ EventMsg GetUniqueEventMsg()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Retourne une lettre non accentu<EFBFBD>e.
|
// Retourne une lettre non accentuée.
|
||||||
|
|
||||||
char RetNoAccent(char letter)
|
char RetNoAccent(char letter)
|
||||||
{
|
{
|
||||||
if ( letter < 0 )
|
if ( letter < 0 )
|
||||||
{
|
{
|
||||||
if ( letter == '<EFBFBD>' ||
|
if ( letter == 'á' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'à' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'â' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'ä' ||
|
||||||
letter == '<EFBFBD>' ) return 'a';
|
letter == 'ã' ) return 'a';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ||
|
if ( letter == 'é' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'è' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'ê' ||
|
||||||
letter == '<EFBFBD>' ) return 'e';
|
letter == 'ë' ) return 'e';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ||
|
if ( letter == 'í' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'ì' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'î' ||
|
||||||
letter == '<EFBFBD>' ) return 'i';
|
letter == 'ï' ) return 'i';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ||
|
if ( letter == 'ó' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'ò' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'ô' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'ö' ||
|
||||||
letter == '<EFBFBD>' ) return 'o';
|
letter == 'õ' ) return 'o';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ||
|
if ( letter == 'ú' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'ù' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'û' ||
|
||||||
letter == '<EFBFBD>' ) return 'u';
|
letter == 'ü' ) return 'u';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ) return 'c';
|
if ( letter == 'ç' ) return 'c';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ) return 'n';
|
if ( letter == 'ñ' ) return 'n';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ||
|
if ( letter == 'Á' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'À' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'Â' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'Ä' ||
|
||||||
letter == '<EFBFBD>' ) return 'A';
|
letter == 'Ã' ) return 'A';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ||
|
if ( letter == 'É' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'È' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'Ê' ||
|
||||||
letter == '<EFBFBD>' ) return 'E';
|
letter == 'Ë' ) return 'E';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ||
|
if ( letter == 'Í' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'Ì' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'Î' ||
|
||||||
letter == '<EFBFBD>' ) return 'I';
|
letter == 'Ï' ) return 'I';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ||
|
if ( letter == 'Ó' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'Ò' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'Ô' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'Ö' ||
|
||||||
letter == '<EFBFBD>' ) return 'O';
|
letter == 'Õ' ) return 'O';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ||
|
if ( letter == 'Ú' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'Ù' ||
|
||||||
letter == '<EFBFBD>' ||
|
letter == 'Û' ||
|
||||||
letter == '<EFBFBD>' ) return 'U';
|
letter == 'Ü' ) return 'U';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ) return 'C';
|
if ( letter == 'Ç' ) return 'C';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ) return 'N';
|
if ( letter == 'Ñ' ) return 'N';
|
||||||
}
|
}
|
||||||
|
|
||||||
return letter;
|
return letter;
|
||||||
|
|
@ -132,36 +132,36 @@ char RetToUpper(char letter)
|
||||||
{
|
{
|
||||||
if ( letter < 0 )
|
if ( letter < 0 )
|
||||||
{
|
{
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'á' ) return 'Á';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'à' ) return 'À';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'â' ) return 'Â';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'ä' ) return 'Ä';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'ã' ) return 'Ã';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'é' ) return 'É';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'è' ) return 'È';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'ê' ) return 'Ê';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'ë' ) return 'Ë';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'í' ) return 'Í';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'ì' ) return 'Ì';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'î' ) return 'Î';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'ï' ) return 'Ï';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'ó' ) return 'Ó';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'ò' ) return 'Ò';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'ô' ) return 'Ô';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'ö' ) return 'Ö';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'õ' ) return 'Õ';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'ú' ) return 'Ú';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'ù' ) return 'Ù';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'û' ) return 'Û';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'ü' ) return 'Ü';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'ç' ) return 'Ç';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'ñ' ) return 'Ñ';
|
||||||
}
|
}
|
||||||
|
|
||||||
return toupper(letter);
|
return toupper(letter);
|
||||||
|
|
@ -173,43 +173,43 @@ char RetToLower(char letter)
|
||||||
{
|
{
|
||||||
if ( letter < 0 )
|
if ( letter < 0 )
|
||||||
{
|
{
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'Á' ) return 'á';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'À' ) return 'à';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'Â' ) return 'â';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'Ä' ) return 'ä';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'Ã' ) return 'ã';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'É' ) return 'é';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'È' ) return 'è';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'Ê' ) return 'ê';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'Ë' ) return 'ë';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'Í' ) return 'í';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'Ì' ) return 'ì';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'Î' ) return 'î';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'Ï' ) return 'ï';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'Ó' ) return 'ó';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'Ò' ) return 'ò';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'Ô' ) return 'ô';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'Ö' ) return 'ö';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'Õ' ) return 'õ';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'Ú' ) return 'ú';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'Ù' ) return 'ù';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'Û' ) return 'û';
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'Ü' ) return 'ü';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'Ç' ) return 'ç';
|
||||||
|
|
||||||
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
|
if ( letter == 'Ñ' ) return 'ñ';
|
||||||
}
|
}
|
||||||
|
|
||||||
return tolower(letter);
|
return tolower(letter);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Conversion du temps en cha<EFBFBD>ne.
|
// Conversion du temps en chaîne.
|
||||||
|
|
||||||
void TimeToAscii(time_t time, char *buffer)
|
void TimeToAscii(time_t time, char *buffer)
|
||||||
{
|
{
|
||||||
|
|
@ -239,7 +239,7 @@ void TimeToAscii(time_t time, char *buffer)
|
||||||
{
|
{
|
||||||
strcpy(format, "am");
|
strcpy(format, "am");
|
||||||
}
|
}
|
||||||
else // apr<EFBFBD>s-midi ?
|
else // après-midi ?
|
||||||
{
|
{
|
||||||
strcpy(format, "pm");
|
strcpy(format, "pm");
|
||||||
hour -= 12; // 0..11
|
hour -= 12; // 0..11
|
||||||
|
|
@ -316,7 +316,7 @@ BOOL CopyFileToTemp(char* filename)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Copie une liste de fichiers num<EFBFBD>rot<EFBFBD>s dans le dossier temporaire.
|
// Copie une liste de fichiers numérotés dans le dossier temporaire.
|
||||||
|
|
||||||
BOOL CopyFileListToTemp(char* filename, int* list, int total)
|
BOOL CopyFileListToTemp(char* filename, int* list, int total)
|
||||||
{
|
{
|
||||||
|
|
@ -355,16 +355,16 @@ BOOL CopyFileListToTemp(char* filename, int* list, int total)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Ajoute une extension <EFBFBD> un fichier, s'il n'en a pas d<>j<EFBFBD> une.
|
// Ajoute une extension à un fichier, s'il n'en a pas déjà une.
|
||||||
|
|
||||||
void AddExt(char* filename, char* ext)
|
void AddExt(char* filename, char* ext)
|
||||||
{
|
{
|
||||||
if ( strchr(filename, '.') != 0 ) return; // d<EFBFBD>j<EFBFBD> une extension ?
|
if ( strchr(filename, '.') != 0 ) return; // déjà une extension ?
|
||||||
strcat(filename, ext);
|
strcat(filename, ext);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Sp<EFBFBD>cifie le dossier utilisateur.
|
// Spécifie le dossier utilisateur.
|
||||||
|
|
||||||
void UserDir(BOOL bUser, char* dir)
|
void UserDir(BOOL bUser, char* dir)
|
||||||
{
|
{
|
||||||
|
|
@ -372,7 +372,7 @@ void UserDir(BOOL bUser, char* dir)
|
||||||
strcpy(g_userDir, dir);
|
strcpy(g_userDir, dir);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remplace la cha<EFBFBD>ne %user% par le dossier utilisateur.
|
// Remplace la chaîne %user% par le dossier utilisateur.
|
||||||
// in: dir = "%user%toto.txt"
|
// in: dir = "%user%toto.txt"
|
||||||
// def = "abc\"
|
// def = "abc\"
|
||||||
// out: buffer = "abc\toto.txt"
|
// out: buffer = "abc\toto.txt"
|
||||||
|
|
@ -418,7 +418,7 @@ void UserDir(char* buffer, char* dir, char* def)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Retourne la lettre correspondant <EFBFBD> la langue.
|
// Retourne la lettre correspondant à la langue.
|
||||||
|
|
||||||
char RetLanguageLetter()
|
char RetLanguageLetter()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue