From 343cb0ce660136ac034e6106c0f151466b751398 Mon Sep 17 00:00:00 2001 From: Krzysztof H Date: Mon, 19 Mar 2012 11:51:09 +0100 Subject: Coding fix --- src/misc.cpp | 264 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 132 insertions(+), 132 deletions(-) (limited to 'src') diff --git a/src/misc.cpp b/src/misc.cpp index 3ab827b..11209ec 100644 --- a/src/misc.cpp +++ b/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 // * // * This program is free software: you can redistribute it and/or modify @@ -41,7 +41,7 @@ static char g_userDir[100] = ""; -// Donne un �v�nement utilisateur unique. +// Donne un événement utilisateur unique. EventMsg GetUniqueEventMsg() { @@ -54,73 +54,73 @@ EventMsg GetUniqueEventMsg() -// Retourne une lettre non accentu�e. +// Retourne une lettre non accentuée. char RetNoAccent(char letter) { if ( letter < 0 ) { - if ( letter == '�' || - letter == '�' || - letter == '�' || - letter == '�' || - letter == '�' ) return 'a'; - - if ( letter == '�' || - letter == '�' || - letter == '�' || - letter == '�' ) return 'e'; - - if ( letter == '�' || - letter == '�' || - letter == '�' || - letter == '�' ) return 'i'; - - if ( letter == '�' || - letter == '�' || - letter == '�' || - letter == '�' || - letter == '�' ) return 'o'; - - if ( letter == '�' || - letter == '�' || - letter == '�' || - letter == '�' ) return 'u'; - - if ( letter == '�' ) return 'c'; - - if ( letter == '�' ) return 'n'; - - if ( letter == '�' || - letter == '�' || - letter == '�' || - letter == '�' || - letter == '�' ) return 'A'; - - if ( letter == '�' || - letter == '�' || - letter == '�' || - letter == '�' ) return 'E'; - - if ( letter == '�' || - letter == '�' || - letter == '�' || - letter == '�' ) return 'I'; - - if ( letter == '�' || - letter == '�' || - letter == '�' || - letter == '�' || - letter == '�' ) return 'O'; - - if ( letter == '�' || - letter == '�' || - letter == '�' || - letter == '�' ) return 'U'; - - if ( letter == '�' ) return 'C'; - - if ( letter == '�' ) return 'N'; + if ( letter == 'á' || + letter == 'à' || + letter == 'â' || + letter == 'ä' || + letter == 'ã' ) return 'a'; + + if ( letter == 'é' || + letter == 'è' || + letter == 'ê' || + letter == 'ë' ) return 'e'; + + if ( letter == 'í' || + letter == 'ì' || + letter == 'î' || + letter == 'ï' ) return 'i'; + + if ( letter == 'ó' || + letter == 'ò' || + letter == 'ô' || + letter == 'ö' || + letter == 'õ' ) return 'o'; + + if ( letter == 'ú' || + letter == 'ù' || + letter == 'û' || + letter == 'ü' ) return 'u'; + + if ( letter == 'ç' ) return 'c'; + + if ( letter == 'ñ' ) return 'n'; + + if ( letter == 'Á' || + letter == 'À' || + letter == 'Â' || + letter == 'Ä' || + letter == 'Ã' ) return 'A'; + + if ( letter == 'É' || + letter == 'È' || + letter == 'Ê' || + letter == 'Ë' ) return 'E'; + + if ( letter == 'Í' || + letter == 'Ì' || + letter == 'Î' || + letter == 'Ï' ) return 'I'; + + if ( letter == 'Ó' || + letter == 'Ò' || + letter == 'Ô' || + letter == 'Ö' || + letter == 'Õ' ) return 'O'; + + if ( letter == 'Ú' || + letter == 'Ù' || + letter == 'Û' || + letter == 'Ü' ) return 'U'; + + if ( letter == 'Ç' ) return 'C'; + + if ( letter == 'Ñ' ) return 'N'; } return letter; @@ -132,36 +132,36 @@ char RetToUpper(char letter) { if ( letter < 0 ) { - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - - if ( letter == '�' ) return '�'; - - if ( letter == '�' ) return '�'; + if ( letter == 'á' ) return 'Á'; + if ( letter == 'à' ) return 'À'; + if ( letter == 'â' ) return 'Â'; + if ( letter == 'ä' ) return 'Ä'; + if ( letter == 'ã' ) return 'Ã'; + + if ( letter == 'é' ) return 'É'; + if ( letter == 'è' ) return 'È'; + if ( letter == 'ê' ) return 'Ê'; + if ( letter == 'ë' ) return 'Ë'; + + if ( letter == 'í' ) return 'Í'; + if ( letter == 'ì' ) return 'Ì'; + if ( letter == 'î' ) return 'Î'; + if ( letter == 'ï' ) return 'Ï'; + + if ( letter == 'ó' ) return 'Ó'; + if ( letter == 'ò' ) return 'Ò'; + if ( letter == 'ô' ) return 'Ô'; + if ( letter == 'ö' ) return 'Ö'; + if ( letter == 'õ' ) return 'Õ'; + + if ( letter == 'ú' ) return 'Ú'; + if ( letter == 'ù' ) return 'Ù'; + if ( letter == 'û' ) return 'Û'; + if ( letter == 'ü' ) return 'Ü'; + + if ( letter == 'ç' ) return 'Ç'; + + if ( letter == 'ñ' ) return 'Ñ'; } return toupper(letter); @@ -173,43 +173,43 @@ char RetToLower(char letter) { if ( letter < 0 ) { - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - if ( letter == '�' ) return '�'; - - if ( letter == '�' ) return '�'; - - if ( letter == '�' ) return '�'; + if ( letter == 'Á' ) return 'á'; + if ( letter == 'À' ) return 'à'; + if ( letter == 'Â' ) return 'â'; + if ( letter == 'Ä' ) return 'ä'; + if ( letter == 'Ã' ) return 'ã'; + + if ( letter == 'É' ) return 'é'; + if ( letter == 'È' ) return 'è'; + if ( letter == 'Ê' ) return 'ê'; + if ( letter == 'Ë' ) return 'ë'; + + if ( letter == 'Í' ) return 'í'; + if ( letter == 'Ì' ) return 'ì'; + if ( letter == 'Î' ) return 'î'; + if ( letter == 'Ï' ) return 'ï'; + + if ( letter == 'Ó' ) return 'ó'; + if ( letter == 'Ò' ) return 'ò'; + if ( letter == 'Ô' ) return 'ô'; + if ( letter == 'Ö' ) return 'ö'; + if ( letter == 'Õ' ) return 'õ'; + + if ( letter == 'Ú' ) return 'ú'; + if ( letter == 'Ù' ) return 'ù'; + if ( letter == 'Û' ) return 'û'; + if ( letter == 'Ü' ) return 'ü'; + + if ( letter == 'Ç' ) return 'ç'; + + if ( letter == 'Ñ' ) return 'ñ'; } return tolower(letter); } -// Conversion du temps en cha�ne. +// Conversion du temps en chaîne. void TimeToAscii(time_t time, char *buffer) { @@ -239,7 +239,7 @@ void TimeToAscii(time_t time, char *buffer) { strcpy(format, "am"); } - else // apr�s-midi ? + else // après-midi ? { strcpy(format, "pm"); hour -= 12; // 0..11 @@ -316,7 +316,7 @@ BOOL CopyFileToTemp(char* filename) return TRUE; } -// Copie une liste de fichiers num�rot�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) { @@ -355,16 +355,16 @@ BOOL CopyFileListToTemp(char* filename, int* list, int total) } -// Ajoute une extension � un fichier, s'il n'en a pas d�j� une. +// Ajoute une extension à un fichier, s'il n'en a pas déjà une. void AddExt(char* filename, char* ext) { - if ( strchr(filename, '.') != 0 ) return; // d�j� une extension ? + if ( strchr(filename, '.') != 0 ) return; // déjà une extension ? strcat(filename, ext); } -// Sp�cifie le dossier utilisateur. +// Spécifie le dossier utilisateur. void UserDir(BOOL bUser, char* dir) { @@ -372,7 +372,7 @@ void UserDir(BOOL bUser, char* dir) strcpy(g_userDir, dir); } -// Remplace la cha�ne %user% par le dossier utilisateur. +// Remplace la chaîne %user% par le dossier utilisateur. // in: dir = "%user%toto.txt" // def = "abc\" // out: buffer = "abc\toto.txt" @@ -418,7 +418,7 @@ void UserDir(char* buffer, char* dir, char* def) } -// Retourne la lettre correspondant � la langue. +// Retourne la lettre correspondant à la langue. char RetLanguageLetter() { -- cgit v1.2.3-1-g7c22