immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed misc.cpp / misc.h

master
krzys-h 2016-04-09 18:46:12 +02:00
parent 139592bc00
commit 04d7c343ef
19 changed files with 17 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/CMakeLists.txt
View File

@ -90,7 +90,6 @@ set(BASE_SOURCES
common/key.cpp
common/language.cpp
common/logger.cpp
common/misc.cpp
common/regex_utils.cpp
common/resources/inputstream.cpp
common/resources/inputstreambuffer.cpp

207
src/common/misc.cpp
View File

@ -1,207 +0,0 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2016, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see http://gnu.org/licenses
*/
#include "common/misc.h"
#include <math.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include <time.h>
#include <sstream>
#include <iomanip>
#include <chrono>
// Returns a non-accented letter.
char GetNoAccent(char letter)
{
/*
if ( letter < 0 )
{
if ( letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ) return 'a';
if ( letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ) return 'e';
if ( letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ) return 'i';
if ( letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ) return 'o';
if ( letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ) return 'u';
if ( letter == '<EFBFBD>' ) return 'c';
if ( letter == '<EFBFBD>' ) return 'n';
if ( letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ) return 'A';
if ( letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ) return 'E';
if ( letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ) return 'I';
if ( letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ) return 'O';
if ( letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ||
letter == '<EFBFBD>' ) return 'U';
if ( letter == '<EFBFBD>' ) return 'C';
if ( letter == '<EFBFBD>' ) return 'N';
}*/
return letter;
}
// Returns an uppercase letter.
char GetToUpper(char letter)
{
/*if ( letter < 0 )
{
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
}*/
return toupper(letter);
}
// Returns a lowercase letter.
char GetToLower(char letter)
{
/*if ( letter < 0 )
{
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
if ( letter == '<EFBFBD>' ) return '<EFBFBD>';
}*/
return tolower(letter);
}
std::string TimeFormat(float time)
{
int minutes = floor(time/60);
double time2 = fmod(time, 60);
double seconds;
double fraction = modf(time2, &seconds)*100;
std::ostringstream sstream;
sstream << std::setfill('0') << std::setw(2) << minutes << ":" << std::setfill('0') << std::setw(2) << floor(seconds) << "." << std::setfill('0') << std::setw(2) << floor(fraction);
return sstream.str();
}
// Adds an extension to file, if doesn't already one.
void AddExt(char* filename, const char* ext)
{
if ( strchr(filename, '.') != nullptr ) return; // already an extension?
strcat(filename, ext);
}

36
src/common/misc.h
View File

@ -1,36 +0,0 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2016, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see http://gnu.org/licenses
*/
#pragma once
#include <time.h>
#include <string>
// TODO: rewrite/refactor or remove
extern char GetNoAccent(char letter);
extern char GetToUpper(char letter);
extern char GetToLower(char letter);
extern std::string TimeFormat(float time);
extern void AddExt(char* filename, const char* ext);

11
src/level/robotmain.cpp
View File

@ -29,7 +29,6 @@
#include "common/event.h"
#include "common/logger.h"
#include "common/make_unique.h"
#include "common/misc.h"
#include "common/restext.h"
#include "common/settings.h"
#include "common/stringutils.h"
@ -2420,6 +2419,16 @@ void CRobotMain::AbortMovie()
}
std::string TimeFormat(float time)
{
int minutes = static_cast<int>(floor(time/60));
double time2 = fmod(time, 60);
double seconds;
double fraction = modf(time2, &seconds)*100;
std::ostringstream sstream;
sstream << std::setfill('0') << std::setw(2) << minutes << ":" << std::setfill('0') << std::setw(2) << floor(seconds) << "." << std::setfill('0') << std::setw(2) << floor(fraction);
return sstream.str();
}
//! Updates the text information
void CRobotMain::UpdateInfoText()

1
src/object/auto/autolabo.cpp
View File

@ -21,7 +21,6 @@
#include "object/auto/autolabo.h"
#include "common/make_unique.h"
#include "common/misc.h"
#include "level/robotmain.h"

1
src/ui/controls/button.cpp
View File

@ -21,7 +21,6 @@
#include "ui/controls/button.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/restext.h"
#include "graphics/engine/engine.h"

1
src/ui/controls/check.cpp
View File

@ -21,7 +21,6 @@
#include "ui/controls/check.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/restext.h"
#include "graphics/engine/engine.h"

1
src/ui/controls/color.cpp
View File

@ -21,7 +21,6 @@
#include "ui/controls/color.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/restext.h"
#include "graphics/core/device.h"

17
src/ui/controls/edit.cpp
View File

@ -27,7 +27,6 @@
#include "common/logger.h"
#include "common/make_unique.h"
#include "common/misc.h"
#include "common/resources/inputstream.h"
#include "common/resources/outputstream.h"
@ -73,15 +72,9 @@ bool IsSpace(int character)
//! Indicates whether a character is part of a word.
bool IsWord(int character)
bool IsWord(char c)
{
char c;
c = tolower(GetNoAccent(character));
return ( (c >= 'a' && c <= 'z') ||
(c >= '0' && c <= '9') ||
c == '_' );
return ( isalnum(c) || c == '_');
}
//! Indicates whether a character is a word separator.
@ -2920,13 +2913,13 @@ bool CEdit::MinMaj(bool bMaj)
c1 = m_cursor1;
c2 = m_cursor2;
if ( c1 > c2 ) Math::Swap(c1, c2); // alwyas c1 <= c2
if ( c1 > c2 ) Math::Swap(c1, c2); // always c1 <= c2
for ( i=c1 ; i<c2 ; i++ )
{
character = static_cast<unsigned char>(m_text[i]);
if ( bMaj ) character = GetToUpper(character);
else character = GetToLower(character);
if ( bMaj ) character = toupper(character);
else character = tolower(character);
m_text[i] = character;
}

1
src/ui/controls/editvalue.cpp
View File

@ -22,7 +22,6 @@
#include "common/event.h"
#include "common/make_unique.h"
#include "common/misc.h"
#include "level/robotmain.h"

1
src/ui/controls/group.cpp
View File

@ -21,7 +21,6 @@
#include "ui/controls/group.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/restext.h"
#include "graphics/engine/engine.h"

1
src/ui/controls/image.cpp
View File

@ -21,7 +21,6 @@
#include "ui/controls/image.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/restext.h"
#include "graphics/engine/engine.h"

1
src/ui/controls/scroll.cpp
View File

@ -22,7 +22,6 @@
#include "common/event.h"
#include "common/make_unique.h"
#include "common/misc.h"
#include "graphics/engine/engine.h"

1
src/ui/controls/shortcut.cpp
View File

@ -21,7 +21,6 @@
#include "ui/controls/shortcut.h"
#include "common/event.h"
#include "common/misc.h"
#include "graphics/core/device.h"

1
src/ui/controls/slider.cpp
View File

@ -21,7 +21,6 @@
#include "ui/controls/slider.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/stringutils.h"
#include "graphics/engine/engine.h"

1
src/ui/displayinfo.cpp
View File

@ -23,7 +23,6 @@
#include "app/app.h"
#include "app/pausemanager.h"
#include "common/misc.h"
#include "common/restext.h"
#include "common/settings.h"
#include "common/stringutils.h"

1
src/ui/screen/screen_io.cpp
View File

@ -20,7 +20,6 @@
#include "ui/screen/screen_io.h"
#include "common/logger.h"
#include "common/misc.h"
#include "common/restext.h"
#include "common/stringutils.h"

25
src/ui/screen/screen_player_select.cpp
View File

@ -22,7 +22,6 @@
#include "app/app.h"
#include "common/logger.h"
#include "common/misc.h"
#include "common/stringutils.h"
#include "level/player_profile.h"
@ -388,30 +387,6 @@ bool CScreenPlayerSelect::NameCreate()
return false;
}
len = strlen(name);
j = 0;
for ( i=0 ; i<len ; i++ )
{
c = GetNoAccent(GetToLower(name[i]));
if ( (c >= '0' && c <= '9') ||
(c >= 'a' && c <= 'z') ||
c == ' ' ||
c == '-' ||
c == '_' ||
c == '.' ||
c == ',' ||
c == '\'' )
{
name[j++] = name[i];
}
}
name[j] = 0;
if ( j == 0 )
{
m_sound->Play(SOUND_TZOING);
return false;
}
m_main->SelectPlayer(name);
m_main->GetPlayerProfile()->Create();

11
src/ui/studio.cpp
View File

@ -25,7 +25,6 @@
#include "common/event.h"
#include "common/logger.h"
#include "common/misc.h"
#include "common/settings.h"
#include "common/resources/resourcemanager.h"
@ -425,15 +424,9 @@ bool CStudio::EventFrame(const Event &event)
// Indicates whether a character is part of a word.
bool IsToken(int character)
bool IsToken(char c)
{
char c;
c = tolower(GetNoAccent(character));
return ( (c >= 'a' && c <= 'z') ||
(c >= '0' && c <= '9') ||
c == '_' );
return ( isalnum(c) || c == '_' );
}
// Seeks if the cursor is on a keyword.